Compare commits
9 Commits
Author | SHA1 | Date | |
---|---|---|---|
33ecb79e0b | |||
00bb197620 | |||
8e7d3da07f | |||
35e0d0a783 | |||
40196fa28f | |||
7b5e90e3bd | |||
3c48988e88 | |||
869acdcb18 | |||
91af1dfca0 |
16
.env.example
Normal file
16
.env.example
Normal file
@@ -0,0 +1,16 @@
|
||||
# Flask-Konfiguration
|
||||
FLASK_APP=app.py
|
||||
FLASK_ENV=development
|
||||
SECRET_KEY=your-secret-key-here
|
||||
|
||||
# Datenbank-Konfiguration
|
||||
DATABASE_URL=sqlite:///customers.db
|
||||
|
||||
# Authentifizierung
|
||||
STATIC_PASSWORD=your-static-password-here
|
||||
|
||||
# IP-Bereiche für direkten Zugriff (ohne Login)
|
||||
ALLOWED_IP_RANGES=192.168.0.0/24,192.168.177.0/24,213.178.68.218/29
|
||||
|
||||
# Logging-Konfiguration
|
||||
LOG_LEVEL=INFO
|
67
CHANGELOG.md
67
CHANGELOG.md
@@ -5,54 +5,39 @@ 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/).
|
||||
|
||||
## [v1.2.0] - 2024-03-17
|
||||
## [v1.2.0] - 2024-03-18
|
||||
|
||||
### Geändert
|
||||
- IP-Subnetz-Prüfung korrigiert (CIDR-Notation wird jetzt korrekt ausgewertet)
|
||||
- Debug-Logging für IP-Adressen hinzugefügt
|
||||
- Beispiel-Umgebungsvariablen (.env.example) hinzugefügt
|
||||
|
||||
### Hinzugefügt
|
||||
- Benutzer-Login-Funktionalität
|
||||
- Login-Seite mit Passwortüberprüfung
|
||||
- Umgebungsvariable für Login-Passwort
|
||||
- IP-basierte Zugriffssteuerung für medisoftware-Links
|
||||
- IP-basierte Zugriffssteuerung für Telefonnummern-Links
|
||||
- Google Maps Integration für Adressen
|
||||
- Version im Footer angezeigt
|
||||
|
||||
### Verbessert
|
||||
- Verbesserte Fehlerbehandlung bei der IP-Überprüfung
|
||||
- Bessere Dokumentation der Konfigurationsmöglichkeiten
|
||||
|
||||
## [v1.1.0] - 2024-03-17
|
||||
|
||||
### Geändert
|
||||
- Verbesserte Darstellung der Telefonnummern:
|
||||
- Separate Felder für private Telefonnummer, Firmennummer und Mobilfunknummer
|
||||
- Entfernung der Faxnummer aus der Anzeige
|
||||
- Übersichtlichere Darstellung der Kontaktinformationen
|
||||
|
||||
## [1.0.6] - 2024-03-17
|
||||
### Geändert
|
||||
- Verbesserte Suchfunktion: Kombinierte Suche über mehrere Felder möglich
|
||||
- Dokumentation: Beispiele für kombinierte Suche hinzugefügt
|
||||
|
||||
## [1.0.5] - 2024-03-17
|
||||
### Geändert
|
||||
- Verbesserte Suchfunktion: Ergebnisliste wird gelöscht, wenn alle Suchfelder leer sind
|
||||
|
||||
## [1.0.4] - 2024-03-17
|
||||
### Geändert
|
||||
- Verbesserte Adressanzeige: Location-Icon neben der Adresse
|
||||
- Entfernung des Google Maps Links aus dem Adresstext
|
||||
|
||||
## [1.0.3] - 2024-03-17
|
||||
### Geändert
|
||||
- Hervorhebung der Suchbegriffe in den Ergebnissen
|
||||
- Verbesserte Benutzeroberfläche
|
||||
|
||||
## [1.0.2] - 2024-03-17
|
||||
### Geändert
|
||||
- Entfernung der Wetterinformationen
|
||||
- Optimierung der Suchfunktion
|
||||
|
||||
## [1.0.1] - 2024-03-17
|
||||
### Hinzugefügt
|
||||
- Wetterinformationen für Kundensitz
|
||||
- Caching für Wetterdaten
|
||||
- Benutzer-Login für nicht-autorisierte IPs
|
||||
- Verbesserte Darstellung der Telefonnummern
|
||||
- Responsive Design für mobile Geräte
|
||||
|
||||
### Verbessert
|
||||
- Optimierte Suchfunktion
|
||||
- Verbesserte Benutzeroberfläche
|
||||
|
||||
## [v1.0.0] - 2024-03-17
|
||||
|
||||
### Hinzugefügt
|
||||
- Erste Version der Kundensuche
|
||||
- Grundlegende Suchfunktionen
|
||||
- Responsive Design
|
||||
- Docker-Integration
|
||||
- Erste Version mit grundlegenden Suchfunktionen
|
||||
- Echtzeit-Suche über Kundendaten
|
||||
- Hervorhebung von Suchbegriffen in den Ergebnissen
|
||||
- Klickbare Links für Telefonnummern, E-Mail-Adressen und Adressen
|
||||
- Docker-Container für einfache Installation und Deployment
|
46
README.md
46
README.md
@@ -1,14 +1,15 @@
|
||||
# medisoftware Kundensuche
|
||||
|
||||
Eine webbasierte Suchanwendung für medisoftware Kunden, die eine schnelle und effiziente Suche nach Kundendaten ermöglicht.
|
||||
Eine einfache Webanwendung zur Suche nach medisoftware Kunden mit IP-basierter Zugriffssteuerung.
|
||||
|
||||
## Features
|
||||
|
||||
- Echtzeit-Suche über Kundendaten
|
||||
- Hervorhebung von Suchbegriffen in den Ergebnissen
|
||||
- Klickbare Links für Telefonnummern, E-Mail-Adressen und Adressen
|
||||
- Responsive Design für mobile Geräte
|
||||
- Docker-Container für einfache Installation und Deployment
|
||||
- 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
|
||||
|
||||
## Installation
|
||||
|
||||
@@ -18,18 +19,39 @@ git clone https://gitea.elpatron.me/elpatron/medi-customers.git
|
||||
cd medi-customers
|
||||
```
|
||||
|
||||
2. Docker Container starten:
|
||||
2. Umgebungsvariablen einrichten:
|
||||
```bash
|
||||
cp .env.example .env
|
||||
# Bearbeiten Sie die .env-Datei mit Ihren Einstellungen
|
||||
```
|
||||
|
||||
3. Docker Container starten:
|
||||
```bash
|
||||
docker-compose up -d
|
||||
```
|
||||
|
||||
Die Anwendung ist dann unter `http://localhost:5000` erreichbar.
|
||||
## Konfiguration
|
||||
|
||||
## Versionen
|
||||
Die Anwendung kann über folgende Umgebungsvariablen konfiguriert werden:
|
||||
|
||||
- v1.2.0 (2024-03-17): Benutzer-Login hinzugefügt
|
||||
- v1.1.0 (2024-03-17): Verbesserte Darstellung der Telefonnummern
|
||||
- v1.0.0 (2024-03-17): Erste Version mit grundlegenden Suchfunktionen
|
||||
- `FLASK_APP`: Die Hauptanwendungsdatei (Standard: app.py)
|
||||
- `FLASK_ENV`: Die Flask-Umgebung (development/production)
|
||||
- `SECRET_KEY`: Der geheime Schlüssel für Flask-Sessions
|
||||
- `DATABASE_URL`: Die URL zur SQLite-Datenbank
|
||||
- `STATIC_PASSWORD`: Das Passwort für die Login-Seite
|
||||
- `ALLOWED_IP_RANGES`: Komma-getrennte Liste von IP-Bereichen, die direkten Zugriff haben
|
||||
- `LOG_LEVEL`: Das Logging-Level (INFO/DEBUG)
|
||||
|
||||
## IP-Bereiche
|
||||
|
||||
Die Anwendung unterstützt CIDR-Notation für IP-Bereiche. Beispiele:
|
||||
- Einzelne IP: 192.168.1.1/32
|
||||
- Subnetz: 192.168.1.0/24
|
||||
- Größeres Netzwerk: 10.0.0.0/8
|
||||
|
||||
## Version
|
||||
|
||||
Aktuelle Version: v1.2.0
|
||||
|
||||
## Lizenz
|
||||
|
||||
|
229
app.py
229
app.py
@@ -8,14 +8,17 @@ from dotenv import load_dotenv
|
||||
import requests
|
||||
from collections import defaultdict
|
||||
import ipaddress
|
||||
import csv
|
||||
import sqlite3
|
||||
from functools import wraps
|
||||
|
||||
app = Flask(__name__, static_folder='static')
|
||||
app.secret_key = 'your_secret_key' # Setzen Sie einen sicheren geheimen Schlüssel für die Session
|
||||
logging.basicConfig(level=logging.DEBUG)
|
||||
app.secret_key = os.getenv('SECRET_KEY', 'default-secret-key')
|
||||
logging.basicConfig(level=logging.INFO)
|
||||
logger = logging.getLogger(__name__)
|
||||
|
||||
# Version der Anwendung
|
||||
VERSION = "1.0.6"
|
||||
VERSION = "1.2.1"
|
||||
|
||||
# Pfad zur CSV-Datei
|
||||
CSV_FILE = "data/customers.csv"
|
||||
@@ -24,7 +27,124 @@ CSV_FILE = "data/customers.csv"
|
||||
load_dotenv()
|
||||
|
||||
# Statisches Passwort aus der .env Datei
|
||||
STATIC_PASSWORD = os.getenv('LOGIN_PASSWORD', 'changeme')
|
||||
STATIC_PASSWORD = os.getenv('LOGIN_PASSWORD', 'default-password')
|
||||
ALLOWED_IP_RANGES = os.getenv('ALLOWED_IP_RANGES', '').split(',')
|
||||
|
||||
def init_db():
|
||||
"""Initialisiert die SQLite-Datenbank und erstellt die notwendigen Tabellen."""
|
||||
conn = sqlite3.connect('customers.db')
|
||||
c = conn.cursor()
|
||||
|
||||
# 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
|
||||
)
|
||||
''')
|
||||
|
||||
conn.commit()
|
||||
conn.close()
|
||||
|
||||
def import_csv():
|
||||
"""Importiert die Daten aus der CSV-Datei in die SQLite-Datenbank."""
|
||||
conn = sqlite3.connect('customers.db')
|
||||
c = conn.cursor()
|
||||
|
||||
# Lösche bestehende Daten
|
||||
c.execute('DELETE FROM customers')
|
||||
|
||||
try:
|
||||
# Lese die CSV-Datei mit pandas
|
||||
df = pd.read_csv('data/customers.csv', 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)
|
||||
VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?)
|
||||
''', (
|
||||
row['Nummer'],
|
||||
row['name'],
|
||||
row['Strasse'],
|
||||
row['PLZ'],
|
||||
row['Ort'],
|
||||
row['Tel'],
|
||||
row['Handy'],
|
||||
row['mail'],
|
||||
f"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 Kunden in der Datenbank basierend auf den Suchparametern."""
|
||||
conn = sqlite3.connect('customers.db')
|
||||
c = conn.cursor()
|
||||
|
||||
# Erstelle die WHERE-Bedingungen basierend auf den Suchparametern
|
||||
conditions = []
|
||||
params = []
|
||||
|
||||
if search_params.get('name'):
|
||||
conditions.append('name LIKE ?')
|
||||
params.append(f'%{search_params["name"]}%')
|
||||
|
||||
if search_params.get('ort'):
|
||||
conditions.append('ort LIKE ?')
|
||||
params.append(f'%{search_params["ort"]}%')
|
||||
|
||||
if search_params.get('nummer'):
|
||||
conditions.append('nummer LIKE ?')
|
||||
params.append(f'%{search_params["nummer"]}%')
|
||||
|
||||
if search_params.get('plz'):
|
||||
conditions.append('plz LIKE ?')
|
||||
params.append(f'%{search_params["plz"]}%')
|
||||
|
||||
# Erstelle die SQL-Abfrage
|
||||
sql = 'SELECT * FROM customers'
|
||||
if conditions:
|
||||
sql += ' WHERE ' + ' AND '.join(conditions)
|
||||
|
||||
# Führe die Abfrage aus
|
||||
c.execute(sql, params)
|
||||
results = c.fetchall()
|
||||
|
||||
# Konvertiere die Ergebnisse in ein Dictionary
|
||||
columns = ['id', 'nummer', 'name', 'strasse', 'plz', 'ort', 'telefon', 'mobil', 'email', 'bemerkung']
|
||||
customers = []
|
||||
for row in results:
|
||||
customer = dict(zip(columns, row))
|
||||
customers.append(customer)
|
||||
|
||||
conn.close()
|
||||
return customers
|
||||
|
||||
def clean_dataframe(df):
|
||||
"""Konvertiert NaN-Werte in None für JSON-Kompatibilität"""
|
||||
@@ -61,6 +181,7 @@ def login():
|
||||
|
||||
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)
|
||||
@@ -71,92 +192,72 @@ def login():
|
||||
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':
|
||||
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")
|
||||
return redirect(url_for('index'))
|
||||
else:
|
||||
logger.warning("Falsches Passwort eingegeben")
|
||||
return render_template('login.html', error="Falsches Passwort")
|
||||
|
||||
logger.info("Zeige Login-Seite")
|
||||
return render_template('login.html')
|
||||
|
||||
@app.route('/')
|
||||
def index():
|
||||
logger.info(f"Index-Route aufgerufen. Session Status: {session}")
|
||||
if not session.get('logged_in'):
|
||||
logger.info("Benutzer nicht eingeloggt, Weiterleitung zum Login")
|
||||
return redirect(url_for('login'))
|
||||
return render_template('index.html')
|
||||
|
||||
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)
|
||||
|
||||
@app.route('/search')
|
||||
def search():
|
||||
if not session.get('logged_in'):
|
||||
return redirect(url_for('login'))
|
||||
try:
|
||||
# CSV-Datei laden
|
||||
df = load_data()
|
||||
if df is None:
|
||||
return jsonify({"error": "Datenbank konnte nicht geladen werden"}), 500
|
||||
|
||||
# Suchparameter aus der URL holen
|
||||
name = request.args.get('name', '').strip()
|
||||
ort = request.args.get('ort', '').strip()
|
||||
kundennummer = request.args.get('kundennummer', '').strip()
|
||||
fachrichtung = request.args.get('fachrichtung', '').strip()
|
||||
telefon = request.args.get('telefon', '').strip()
|
||||
query = request.args.get('q', '').strip()
|
||||
|
||||
# Initialisiere die Maske für die Filterung
|
||||
mask = pd.Series(True, index=df.index)
|
||||
# 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', '')
|
||||
}
|
||||
|
||||
# Wenn eine allgemeine Suche angegeben ist
|
||||
if query:
|
||||
query_mask = (
|
||||
df['Vorname'].str.contains(query, case=False, na=False) |
|
||||
df['Nachname'].str.contains(query, case=False, na=False) |
|
||||
df['Ort'].str.contains(query, case=False, na=False) |
|
||||
df['Nummer'].astype(str).str.contains(query, case=False, na=False) |
|
||||
df['Fachrichtung'].str.contains(query, case=False, na=False) |
|
||||
df['Tel'].astype(str).str.contains(query, case=False, na=False)
|
||||
)
|
||||
mask &= query_mask
|
||||
# Führe die Suche in der Datenbank durch
|
||||
results = search_customers(search_params)
|
||||
|
||||
# Spezifische Suchkriterien anwenden
|
||||
if name:
|
||||
name_mask = (
|
||||
df['Vorname'].str.contains(name, case=False, na=False) |
|
||||
df['Nachname'].str.contains(name, case=False, na=False)
|
||||
)
|
||||
mask &= name_mask
|
||||
# Protokolliere die Anzahl der gefundenen Ergebnisse
|
||||
logger.info(f'Suchergebnisse gefunden: {len(results)}')
|
||||
|
||||
if ort:
|
||||
ort_mask = df['Ort'].str.contains(ort, case=False, na=False)
|
||||
mask &= ort_mask
|
||||
|
||||
if kundennummer:
|
||||
kundennummer_mask = df['Nummer'].astype(str).str.contains(kundennummer, case=False, na=False)
|
||||
mask &= kundennummer_mask
|
||||
|
||||
if fachrichtung:
|
||||
fachrichtung_mask = df['Fachrichtung'].str.contains(fachrichtung, case=False, na=False)
|
||||
mask &= fachrichtung_mask
|
||||
|
||||
if telefon:
|
||||
telefon_mask = df['Tel'].astype(str).str.contains(telefon, case=False, na=False)
|
||||
mask &= telefon_mask
|
||||
|
||||
results = df[mask].to_dict('records')
|
||||
logger.info(f"{len(results)} Ergebnisse gefunden")
|
||||
|
||||
return jsonify({
|
||||
'results': results,
|
||||
'total': len(results)
|
||||
})
|
||||
return jsonify(results)
|
||||
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
|
||||
|
||||
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")
|
||||
|
||||
# Initialisiere die App
|
||||
init_app(app)
|
||||
|
||||
if __name__ == '__main__':
|
||||
app.run(debug=True, port=5001)
|
207
static/css/styles.css
Normal file
207
static/css/styles.css
Normal file
@@ -0,0 +1,207 @@
|
||||
body {
|
||||
min-height: 100vh;
|
||||
display: flex;
|
||||
flex-direction: column;
|
||||
margin: 0;
|
||||
padding: 0;
|
||||
}
|
||||
|
||||
.main-content {
|
||||
flex: 1 0 auto;
|
||||
padding: 2rem 0;
|
||||
margin-bottom: 4rem; /* Platz für die fixierte Fußzeile */
|
||||
}
|
||||
|
||||
.search-container {
|
||||
max-width: 800px;
|
||||
margin: 0 auto;
|
||||
}
|
||||
|
||||
.result-card {
|
||||
margin-bottom: 1rem;
|
||||
transition: all 0.3s ease;
|
||||
}
|
||||
|
||||
.result-card:hover {
|
||||
transform: translateY(-2px);
|
||||
box-shadow: 0 4px 8px rgba(0,0,0,0.1);
|
||||
}
|
||||
|
||||
.loading {
|
||||
display: none;
|
||||
text-align: center;
|
||||
margin: 2rem 0;
|
||||
}
|
||||
|
||||
.phone-link, .email-link, .address-link, .customer-link {
|
||||
text-decoration: none;
|
||||
color: #0d6efd;
|
||||
}
|
||||
|
||||
.phone-link:hover, .email-link:hover, .address-link:hover, .customer-link:hover {
|
||||
text-decoration: underline;
|
||||
}
|
||||
|
||||
.search-icon, .reset-icon {
|
||||
position: absolute;
|
||||
top: 50%;
|
||||
transform: translateY(-50%);
|
||||
color: #6c757d;
|
||||
cursor: pointer;
|
||||
display: none;
|
||||
z-index: 10;
|
||||
}
|
||||
|
||||
.reset-icon {
|
||||
right: 10px;
|
||||
}
|
||||
|
||||
.search-icon {
|
||||
right: 35px;
|
||||
}
|
||||
|
||||
.reset-icon.visible {
|
||||
display: block;
|
||||
}
|
||||
|
||||
.search-icon.visible {
|
||||
display: block;
|
||||
}
|
||||
|
||||
.customer-number {
|
||||
color: #6c757d;
|
||||
font-size: 0.9em;
|
||||
}
|
||||
|
||||
.footer {
|
||||
flex-shrink: 0;
|
||||
text-align: center;
|
||||
padding: 1rem;
|
||||
background-color: #f8f9fa;
|
||||
border-top: 1px solid #dee2e6;
|
||||
width: 100%;
|
||||
position: fixed;
|
||||
bottom: 0;
|
||||
left: 0;
|
||||
z-index: 100;
|
||||
}
|
||||
|
||||
.share-feedback {
|
||||
position: fixed;
|
||||
bottom: 20px;
|
||||
right: 20px;
|
||||
background: #28a745;
|
||||
color: white;
|
||||
padding: 8px 16px;
|
||||
border-radius: 4px;
|
||||
display: none;
|
||||
animation: fadeOut 2s forwards;
|
||||
z-index: 1000;
|
||||
}
|
||||
|
||||
@keyframes fadeOut {
|
||||
0% { opacity: 1; }
|
||||
70% { opacity: 1; }
|
||||
100% { opacity: 0; }
|
||||
}
|
||||
|
||||
.card-actions {
|
||||
display: flex;
|
||||
justify-content: flex-end;
|
||||
margin-top: 1rem;
|
||||
}
|
||||
|
||||
.share-button {
|
||||
padding: 5px 10px;
|
||||
border-radius: 15px;
|
||||
font-size: 0.9em;
|
||||
background-color: #0d6efd;
|
||||
color: white;
|
||||
border: none;
|
||||
cursor: pointer;
|
||||
transition: background-color 0.2s;
|
||||
}
|
||||
|
||||
.share-button:hover {
|
||||
background-color: #0b5ed7;
|
||||
}
|
||||
|
||||
.search-fields {
|
||||
display: grid;
|
||||
grid-template-columns: repeat(auto-fit, minmax(200px, 1fr));
|
||||
gap: 1rem;
|
||||
margin-bottom: 1rem;
|
||||
}
|
||||
|
||||
.search-field {
|
||||
position: relative;
|
||||
}
|
||||
|
||||
.input-group {
|
||||
position: relative;
|
||||
}
|
||||
|
||||
.result-counts {
|
||||
display: flex;
|
||||
justify-content: center;
|
||||
margin-bottom: 1rem;
|
||||
padding: 0.5rem;
|
||||
background-color: #f8f9fa;
|
||||
border-radius: 4px;
|
||||
}
|
||||
|
||||
.result-count {
|
||||
background-color: #e9ecef;
|
||||
padding: 4px 12px;
|
||||
border-radius: 12px;
|
||||
font-size: 0.9em;
|
||||
color: #6c757d;
|
||||
display: none;
|
||||
}
|
||||
|
||||
.result-count.visible {
|
||||
display: inline-block;
|
||||
}
|
||||
|
||||
.location-pin {
|
||||
color: #dc3545;
|
||||
margin-left: 4px;
|
||||
font-size: 1.2em;
|
||||
}
|
||||
|
||||
.customer-card {
|
||||
background: white;
|
||||
border-radius: 8px;
|
||||
padding: 1.5rem;
|
||||
margin-bottom: 1.5rem;
|
||||
box-shadow: 0 2px 4px rgba(0,0,0,0.05);
|
||||
border-bottom: 1px solid #e9ecef;
|
||||
}
|
||||
|
||||
.customer-card:last-child {
|
||||
border-bottom: none;
|
||||
}
|
||||
|
||||
.customer-info {
|
||||
margin-bottom: 1rem;
|
||||
}
|
||||
|
||||
.footer-content {
|
||||
padding: 1rem;
|
||||
background-color: #f8f9fa;
|
||||
border-top: 1px solid #dee2e6;
|
||||
width: 100%;
|
||||
position: fixed;
|
||||
bottom: 0;
|
||||
left: 0;
|
||||
z-index: 100;
|
||||
}
|
||||
|
||||
.footer-link {
|
||||
color: #0d6efd;
|
||||
text-decoration: none;
|
||||
}
|
||||
|
||||
.footer-link:hover {
|
||||
text-decoration: underline;
|
||||
}
|
@@ -7,183 +7,7 @@
|
||||
<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">
|
||||
<style>
|
||||
body {
|
||||
min-height: 100vh;
|
||||
display: flex;
|
||||
flex-direction: column;
|
||||
margin: 0;
|
||||
padding: 0;
|
||||
}
|
||||
.main-content {
|
||||
flex: 1 0 auto;
|
||||
padding: 2rem 0;
|
||||
margin-bottom: 4rem; /* Platz für die fixierte Fußzeile */
|
||||
}
|
||||
.search-container {
|
||||
max-width: 800px;
|
||||
margin: 0 auto;
|
||||
}
|
||||
.result-card {
|
||||
margin-bottom: 1rem;
|
||||
transition: all 0.3s ease;
|
||||
}
|
||||
.result-card:hover {
|
||||
transform: translateY(-2px);
|
||||
box-shadow: 0 4px 8px rgba(0,0,0,0.1);
|
||||
}
|
||||
.loading {
|
||||
display: none;
|
||||
text-align: center;
|
||||
margin: 2rem 0;
|
||||
}
|
||||
.phone-link, .email-link, .address-link, .customer-link {
|
||||
text-decoration: none;
|
||||
color: #0d6efd;
|
||||
}
|
||||
.phone-link:hover, .email-link:hover, .address-link:hover, .customer-link:hover {
|
||||
text-decoration: underline;
|
||||
}
|
||||
.search-icon, .reset-icon {
|
||||
position: absolute;
|
||||
top: 50%;
|
||||
transform: translateY(-50%);
|
||||
color: #6c757d;
|
||||
cursor: pointer;
|
||||
display: none;
|
||||
z-index: 10;
|
||||
}
|
||||
.reset-icon {
|
||||
right: 10px;
|
||||
}
|
||||
.search-icon {
|
||||
right: 35px;
|
||||
}
|
||||
.reset-icon.visible {
|
||||
display: block;
|
||||
}
|
||||
.search-icon.visible {
|
||||
display: block;
|
||||
}
|
||||
.customer-number {
|
||||
color: #6c757d;
|
||||
font-size: 0.9em;
|
||||
}
|
||||
.footer {
|
||||
flex-shrink: 0;
|
||||
text-align: center;
|
||||
padding: 1rem;
|
||||
background-color: #f8f9fa;
|
||||
border-top: 1px solid #dee2e6;
|
||||
width: 100%;
|
||||
position: fixed;
|
||||
bottom: 0;
|
||||
left: 0;
|
||||
z-index: 100;
|
||||
}
|
||||
.share-feedback {
|
||||
position: fixed;
|
||||
bottom: 20px;
|
||||
right: 20px;
|
||||
background: #28a745;
|
||||
color: white;
|
||||
padding: 8px 16px;
|
||||
border-radius: 4px;
|
||||
display: none;
|
||||
animation: fadeOut 2s forwards;
|
||||
z-index: 1000;
|
||||
}
|
||||
@keyframes fadeOut {
|
||||
0% { opacity: 1; }
|
||||
70% { opacity: 1; }
|
||||
100% { opacity: 0; }
|
||||
}
|
||||
.card-actions {
|
||||
display: flex;
|
||||
justify-content: flex-end;
|
||||
margin-top: 1rem;
|
||||
}
|
||||
.share-button {
|
||||
padding: 5px 10px;
|
||||
border-radius: 15px;
|
||||
font-size: 0.9em;
|
||||
background-color: #0d6efd;
|
||||
color: white;
|
||||
border: none;
|
||||
cursor: pointer;
|
||||
transition: background-color 0.2s;
|
||||
}
|
||||
.share-button:hover {
|
||||
background-color: #0b5ed7;
|
||||
}
|
||||
.search-fields {
|
||||
display: grid;
|
||||
grid-template-columns: repeat(auto-fit, minmax(200px, 1fr));
|
||||
gap: 1rem;
|
||||
margin-bottom: 1rem;
|
||||
}
|
||||
.search-field {
|
||||
position: relative;
|
||||
}
|
||||
.input-group {
|
||||
position: relative;
|
||||
}
|
||||
.result-counts {
|
||||
display: flex;
|
||||
justify-content: center;
|
||||
margin-bottom: 1rem;
|
||||
padding: 0.5rem;
|
||||
background-color: #f8f9fa;
|
||||
border-radius: 4px;
|
||||
}
|
||||
.result-count {
|
||||
background-color: #e9ecef;
|
||||
padding: 4px 12px;
|
||||
border-radius: 12px;
|
||||
font-size: 0.9em;
|
||||
color: #6c757d;
|
||||
display: none;
|
||||
}
|
||||
.result-count.visible {
|
||||
display: inline-block;
|
||||
}
|
||||
.location-pin {
|
||||
color: #dc3545;
|
||||
margin-left: 4px;
|
||||
font-size: 1.2em;
|
||||
}
|
||||
.customer-card {
|
||||
background: white;
|
||||
border-radius: 8px;
|
||||
padding: 1.5rem;
|
||||
margin-bottom: 1.5rem;
|
||||
box-shadow: 0 2px 4px rgba(0,0,0,0.05);
|
||||
border-bottom: 1px solid #e9ecef;
|
||||
}
|
||||
.customer-card:last-child {
|
||||
border-bottom: none;
|
||||
}
|
||||
.customer-info {
|
||||
margin-bottom: 1rem;
|
||||
}
|
||||
.footer-content {
|
||||
padding: 1rem;
|
||||
background-color: #f8f9fa;
|
||||
border-top: 1px solid #dee2e6;
|
||||
width: 100%;
|
||||
position: fixed;
|
||||
bottom: 0;
|
||||
left: 0;
|
||||
z-index: 100;
|
||||
}
|
||||
.footer-link {
|
||||
color: #0d6efd;
|
||||
text-decoration: none;
|
||||
}
|
||||
.footer-link:hover {
|
||||
text-decoration: underline;
|
||||
}
|
||||
</style>
|
||||
<link href="{{ url_for('static', filename='css/styles.css') }}" rel="stylesheet">
|
||||
</head>
|
||||
<body>
|
||||
<div class="main-content">
|
||||
@@ -264,7 +88,13 @@
|
||||
function createPhoneLink(phone) {
|
||||
if (!phone) return 'N/A';
|
||||
const cleaned = phone.replace(/[^\d+\s]/g, '');
|
||||
const telLink = cleaned.startsWith('+') ? cleaned : '0' + cleaned.replace(/\s/g, '');
|
||||
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 => clientIP.startsWith(range.trim()));
|
||||
|
||||
const telLink = cleaned.startsWith('+') ? cleaned : (isAllowed ? '0' + cleaned.replace(/\s/g, '') : cleaned.replace(/\s/g, ''));
|
||||
return `<a href="tel:${telLink}" class="phone-link">${phone}</a>`;
|
||||
}
|
||||
|
||||
@@ -321,10 +151,17 @@
|
||||
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) }}';
|
||||
console.log('Client IP in createAddressLink:', clientIP);
|
||||
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>`;
|
||||
}
|
||||
|
||||
@@ -332,9 +169,46 @@
|
||||
return number - 12000;
|
||||
}
|
||||
|
||||
function createCustomerLink(number) {
|
||||
const adjustedNumber = adjustCustomerNumber(number);
|
||||
return `<a href="medisw:openkkbefe/P${adjustedNumber}?NetGrp=4" class="customer-link">${adjustedNumber}</a>`;
|
||||
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(',');
|
||||
|
||||
// Debug-Ausgabe für die IP-Bereiche
|
||||
console.log('Client IP in createCustomerLink:', clientIP);
|
||||
console.log('Allowed IP Ranges:', allowedIPRanges);
|
||||
|
||||
// Überprüfe, ob die Client-IP in einem der erlaubten Bereiche liegt
|
||||
const isAllowed = allowedIPRanges.some(range => {
|
||||
const trimmedRange = range.trim();
|
||||
console.log('Checking range:', trimmedRange);
|
||||
return isIPInSubnet(clientIP, trimmedRange);
|
||||
});
|
||||
|
||||
console.log('isAllowed in createCustomerLink:', isAllowed);
|
||||
|
||||
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() {
|
||||
@@ -472,7 +346,7 @@
|
||||
<strong>Firma:</strong> ${highlightedCompanyPhone}<br>
|
||||
<strong>Mobil:</strong> ${highlightedMobilePhone}
|
||||
</div>
|
||||
<button class="share-button" onclick="copyCustomerLink('${customer.Nummer}')">
|
||||
<button class="share-button" onclick="copyCustomerLink('${adjustCustomerNumber(customer.Nummer)}')">
|
||||
<i class="fas fa-share-alt"></i> Teilen
|
||||
</button>
|
||||
`;
|
||||
|
Reference in New Issue
Block a user