chore: Version auf 1.2.19 aktualisiert

CHANGELOG.md

@@ -211,4 +211,11 @@ und dieses Projekt adhäriert zu [Semantic Versioning](https://semver.org/lang/d
 - Echtzeit-Suche über Kundendaten
 - Hervorhebung von Suchbegriffen in den Ergebnissen
 - Klickbare Links für Telefonnummern, E-Mail-Adressen und Adressen
-- Docker-Container für einfache Installation und Deployment 
+- Docker-Container für einfache Installation und Deployment
+
+## [1.2.19] - 2024-03-19
+### Geändert
+- Version auf 1.2.19 aktualisiert
+
+## [1.2.18] - 2024-03-19
+# ... existing code ... 

README.md

@@ -11,10 +11,15 @@ Eine einfache und effiziente Kundensuche für medisoftware Kunden.
 - 🏥 Unterscheidung zwischen MEDISOFT und MEDICONSULT Kunden
 - 🎨 Farbliche Hervorhebung der Kundentypen (blau für MEDISOFT, orange für MEDICONSULT)
 - 📍 Verbesserte Adress-Links mit Location- und Route-Icons
+- 📤 CSV-Export der Suchergebnisse
+- 📥 CSV-Import für Kundendaten
+- 📖 Integrierte README-Anzeige
+- 🍔 Intuitives Hamburger-Menü
+- 📱 VCF-Export für Kontakte
 
 ## Version
 
-Aktuelle Version: 1.2.16
+Aktuelle Version: 1.2.19
 
 ## Installation
 
@@ -52,7 +57,8 @@ Die Anwendung kann über folgende Umgebungsvariablen konfiguriert werden:
 - `FLASK_ENV`: Die Flask-Umgebung (development/production)
 - `SECRET_KEY`: Der geheime Schlüssel für Flask-Sessions
 - `DATABASE_URL`: Die URL zur SQLite-Datenbank
-- `STATIC_PASSWORD`: Das Passwort für die Login-Seite
+- `LOGIN_PASSWORD`: Das Passwort für die Login-Seite
+- `UPLOAD_PASSWORD`: Das Passwort für den CSV-Upload
 - `ALLOWED_IP_RANGES`: Komma-getrennte Liste von IP-Bereichen, die direkten Zugriff haben
 - `LOG_LEVEL`: Das Logging-Level (INFO/DEBUG)
 
@@ -107,23 +113,46 @@ curl "http://localhost:5001/search?name=Mustermann&telefon=030"
 curl "http://localhost:5001/search?fachrichtung=Zahnarzt&ort=Berlin&name=Schmidt"
 ```
 
+## Benutzeroberfläche
+
+### Hauptmenü
+- Home: Zurück zur Hauptseite
+- CSV-Dateien hochladen: Import neuer Kundendaten
+- README: Anzeige der Dokumentation
+
+### Suchfunktionen
+- Allgemeine Suche über alle Felder
+- Spezifische Suche nach:
+  - Name
+  - Ort
+  - Kundennummer
+  - PLZ
+  - Fachrichtung
+- Filterung nach Kundentyp (MEDISOFT/MEDICONSULT)
+
+### Export
+- CSV-Export der Suchergebnisse
+- VCF-Export für Kontakte
+- Direkte Links zu Kundendetails
+- Teilen von Suchergebnissen
+
 ## Version
 
-Aktuelle Version: [v1.2.4](CHANGELOG.md#v124---2024-03-19) 
+Aktuelle Version: [v1.2.17](CHANGELOG.md#v1217---2024-03-19) 
 
 ## Code-Statistiken
 
 Language|files|blank|comment|code
 :-------|-------:|-------:|-------:|-------:
-HTML|2|56|0|416
-CSS|2|51|1|265
-Markdown|2|66|0|236
-Python|1|51|103|225
-YAML|1|0|0|13
+JavaScript|1|67|28|420
+HTML|4|16|0|382
+CSS|1|63|0|324
+Markdown|2|77|0|295
+YAML|1|0|0|14
 Dockerfile|1|8|9|11
-Text|1|0|0|5
+Text|1|0|0|6
 --------|--------|--------|--------|--------
-SUM:|10|232|113|1171
+SUM:|12|302|163|1732
 
 ## Lizenz
 Alle Rechte vorbehalten. © 2025 medisoftware

app.py

@@ -10,11 +10,12 @@ from functools import wraps
 from contextlib import contextmanager
 import time
 import threading
+import markdown2
 
 app = Flask(__name__, static_folder='static')
 app.config['SECRET_KEY'] = os.environ.get('SECRET_KEY', 'dev')
 app.config['ALLOWED_IP_RANGES'] = os.getenv('ALLOWED_IP_RANGES', '192.168.0.0/16,10.0.0.0/8').split(',')
-app.config['VERSION'] = '1.2.16'
+app.config['VERSION'] = '1.2.19'
 app.config['DATABASE'] = 'data/customers.db'
 app.config['DATABASE_TIMEOUT'] = 20
 app.config['DATABASE_POOL_SIZE'] = 5
@@ -193,7 +194,7 @@ def login():
     
     if request.method == 'POST':
         password = request.form.get('password')
-        if password == STATIC_PASSWORD:
+        if password == os.environ.get('LOGIN_PASSWORD'):
             session['logged_in'] = True
             logger.info("Erfolgreicher Login")
             return redirect(url_for('index'))
@@ -394,6 +395,57 @@ def get_orte():
         logger.error(f"Fehler beim Abrufen der Orte: {str(e)}")
         return jsonify([])
 
+@app.route('/upload', methods=['GET', 'POST'])
+def upload():
+    if not session.get('logged_in'):
+        return redirect(url_for('login'))
+    
+    if request.method == 'POST':
+        if request.form.get('password') != os.environ.get('UPLOAD_PASSWORD'):
+            return render_template('upload.html', error="Falsches Passwort", version=app.config['VERSION'])
+        
+        if 'customers_snk' not in request.files or 'customers' not in request.files:
+            return render_template('upload.html', error="Bitte beide CSV-Dateien auswählen", version=app.config['VERSION'])
+        
+        customers_snk = request.files['customers_snk']
+        customers = request.files['customers']
+        
+        if customers_snk.filename == '' or customers.filename == '':
+            return render_template('upload.html', error="Keine Datei ausgewählt", version=app.config['VERSION'])
+        
+        if not customers_snk.filename.endswith('.csv') or not customers.filename.endswith('.csv'):
+            return render_template('upload.html', error="Nur CSV-Dateien sind erlaubt", version=app.config['VERSION'])
+        
+        try:
+            # Speichere die Dateien
+            customers_snk.save('data/customers_snk.csv')
+            customers.save('data/customers.csv')
+            
+            # Importiere die Daten in die Datenbank
+            import_csv('data/customers_snk.csv', 'snk')
+            import_csv('data/customers.csv', 'medisoft')
+            
+            return render_template('upload.html', success="Dateien erfolgreich hochgeladen und importiert", version=app.config['VERSION'])
+        except Exception as e:
+            logger.error(f"Fehler beim Upload: {str(e)}")
+            return render_template('upload.html', error=f"Fehler beim Upload: {str(e)}", version=app.config['VERSION'])
+    
+    return render_template('upload.html', version=app.config['VERSION'])
+
+@app.route('/readme')
+def readme():
+    if not session.get('logged_in'):
+        return redirect(url_for('login'))
+    
+    try:
+        with open('README.md', 'r', encoding='utf-8') as f:
+            content = f.read()
+        html_content = markdown2.markdown(content, extras=['fenced-code-blocks', 'tables'])
+        return render_template('readme.html', content=html_content, version=app.config['VERSION'])
+    except Exception as e:
+        logger.error(f"Fehler beim Lesen der README: {str(e)}")
+        return render_template('readme.html', error="Fehler beim Lesen der README", version=app.config['VERSION'])
+
 def init_app(app):
     """Initialisiert die Anwendung mit allen notwendigen Einstellungen."""
     with app.app_context():

docker-compose.yml.example

@@ -9,5 +9,6 @@ services:
       - FLASK_APP=app.py
       - FLASK_ENV=production
       - LOGIN_PASSWORD=changeme
+      - UPLOAD_PASSWORD=upload_changeme
       - ALLOWED_IP_RANGES=213.178.68.218/29,192.168.0.0/24,192.168.177.0/24
     command: flask run --host=0.0.0.0 

requirements.txt

@@ -2,4 +2,5 @@ flask==3.0.2
 pandas==2.2.1
 numpy==1.26.4
 python-dotenv==1.0.1
-requests==2.32.3 
+requests==2.32.3
+markdown2==2.4.12 

static/js/main.js

@@ -336,7 +336,10 @@ function displayResults(results) {
 
 function clearInput(inputId) {
     document.getElementById(inputId).value = '';
-    searchCustomers();
+    document.getElementById('results').innerHTML = '';
+    document.getElementById('result-count').textContent = '';
+    document.getElementById('exportButton').style.display = 'none';
+    lastResults = [];
 }
 
 async function searchCustomers() {

templates/index.html

@@ -11,12 +11,46 @@
     <link href="https://cdnjs.cloudflare.com/ajax/libs/font-awesome/6.5.1/css/all.min.css" rel="stylesheet">
     <link rel="stylesheet" href="https://cdn.jsdelivr.net/npm/bootstrap-icons@1.11.3/font/bootstrap-icons.min.css">
     <link href="{{ url_for('static', filename='css/styles.css') }}" rel="stylesheet">
+    <style>
+        .logo {
+            width: 200px;
+            height: auto;
+            margin: 0 auto;
+            display: block;
+        }
+    </style>
 </head>
 <body>
     <div class="main-content">
         <div class="container">
-            <div class="text-center mb-4">
-                <a href="https://medisoftware.de" target="_blank" rel="noopener noreferrer"><img src="{{ url_for('static', filename='medisoftware_logo_rb_200.png') }}" alt="medisoftware Logo" class="img-fluid" style="max-width: 200px;"></a>
+            <div class="position-relative mb-4">
+                <div class="dropdown position-absolute start-0">
+                    <button class="btn btn-link text-dark" type="button" id="menuButton" data-bs-toggle="dropdown" aria-expanded="false">
+                        <i class="bi bi-list fs-4"></i>
+                    </button>
+                    <ul class="dropdown-menu" aria-labelledby="menuButton">
+                        <li>
+                            <a class="dropdown-item" href="{{ url_for('index') }}">
+                                <i class="bi bi-house"></i> Home
+                            </a>
+                        </li>
+                        <li>
+                            <a class="dropdown-item" href="{{ url_for('upload') }}">
+                                <i class="bi bi-cloud-upload"></i> CSV-Dateien hochladen
+                            </a>
+                        </li>
+                        <li>
+                            <a class="dropdown-item" href="{{ url_for('readme') }}">
+                                <i class="bi bi-book"></i> README
+                            </a>
+                        </li>
+                    </ul>
+                </div>
+                <div class="text-center">
+                    <a href="https://medisoftware.de" target="_blank" rel="noopener noreferrer">
+                        <img src="{{ url_for('static', filename='medisoftware_logo_rb_200.png') }}" alt="medisoftware Logo" class="img-fluid logo">
+                    </a>
+                </div>
             </div>
             <div class="search-container">
                 <h1 class="text-center mb-4">Kundensuche</h1>
@@ -111,5 +145,6 @@
     </footer>
 
     <script src="{{ url_for('static', filename='js/main.js') }}"></script>
+    <script src="https://cdn.jsdelivr.net/npm/bootstrap@5.3.0/dist/js/bootstrap.bundle.min.js"></script>
 </body>
 </html> 

templates/readme.html

@@ -0,0 +1,111 @@
+<!DOCTYPE html>
+<html lang="de">
+<head>
+    <meta charset="UTF-8">
+    <meta name="viewport" content="width=device-width, initial-scale=1.0">
+    <title>medisoftware Kundensuche - README</title>
+    <link href="https://cdn.jsdelivr.net/npm/bootstrap@5.3.0/dist/css/bootstrap.min.css" rel="stylesheet">
+    <link href="https://cdnjs.cloudflare.com/ajax/libs/font-awesome/6.5.1/css/all.min.css" rel="stylesheet">
+    <link rel="stylesheet" href="https://cdn.jsdelivr.net/npm/bootstrap-icons@1.11.3/font/bootstrap-icons.min.css">
+    <link href="{{ url_for('static', filename='css/styles.css') }}" rel="stylesheet">
+    <link rel="stylesheet" href="https://cdn.jsdelivr.net/npm/github-markdown-css@5.5.0/github-markdown.min.css">
+    <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;
+        }
+        .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;
+        }
+        .markdown-body {
+            box-sizing: border-box;
+            min-width: 200px;
+            max-width: 980px;
+            margin: 0 auto;
+            padding: 45px;
+        }
+        @media (max-width: 767px) {
+            .markdown-body {
+                padding: 15px;
+            }
+        }
+    </style>
+</head>
+<body>
+    <div class="main-content">
+        <div class="container">
+            <div class="d-flex justify-content-between align-items-center mb-4">
+                <div class="dropdown">
+                    <button class="btn btn-link text-dark" type="button" id="menuButton" data-bs-toggle="dropdown" aria-expanded="false">
+                        <i class="bi bi-list fs-4"></i>
+                    </button>
+                    <ul class="dropdown-menu" aria-labelledby="menuButton">
+                        <li>
+                            <a class="dropdown-item" href="{{ url_for('index') }}">
+                                <i class="bi bi-house"></i> Home
+                            </a>
+                        </li>
+                        <li>
+                            <a class="dropdown-item" href="{{ url_for('upload') }}">
+                                <i class="bi bi-cloud-upload"></i> CSV-Dateien hochladen
+                            </a>
+                        </li>
+                        <li>
+                            <a class="dropdown-item" href="{{ url_for('readme') }}">
+                                <i class="bi bi-book"></i> README
+                            </a>
+                        </li>
+                    </ul>
+                </div>
+                <a href="https://medisoftware.de" target="_blank" rel="noopener noreferrer">
+                    <img src="{{ url_for('static', filename='medisoftware_logo_rb_200.png') }}" alt="medisoftware Logo" class="img-fluid" style="max-width: 200px;">
+                </a>
+            </div>
+            
+            <div class="card">
+                <div class="card-header">
+                    <h2 class="text-center mb-0">README</h2>
+                </div>
+                <div class="card-body">
+                    {% if error %}
+                    <div class="alert alert-danger" role="alert">
+                        {{ error }}
+                    </div>
+                    {% else %}
+                    <div class="markdown-body">
+                        {{ content | safe }}
+                    </div>
+                    {% endif %}
+                </div>
+            </div>
+        </div>
+    </div>
+
+    <footer class="footer">
+        <div class="footer-content">
+            Proudly made with ❤️ and 🍺 by <a href="https://www.medisoftware.de" target="_blank" class="footer-link">medisoftware</a>
+            <div style="font-size: 0.8em;">Version: {{ version }}</div>
+        </div>
+    </footer>
+
+    <script src="{{ url_for('static', filename='js/main.js') }}"></script>
+    <script src="https://cdn.jsdelivr.net/npm/bootstrap@5.3.0/dist/js/bootstrap.bundle.min.js"></script>
+</body>
+</html> 

templates/upload.html

@@ -0,0 +1,102 @@
+<!DOCTYPE html>
+<html lang="de">
+<head>
+    <meta charset="UTF-8">
+    <meta name="viewport" content="width=device-width, initial-scale=1.0">
+    <title>medisoftware Kundensuche - CSV Upload</title>
+    <link href="https://cdn.jsdelivr.net/npm/bootstrap@5.3.0/dist/css/bootstrap.min.css" rel="stylesheet">
+    <link rel="stylesheet" href="https://cdn.jsdelivr.net/npm/bootstrap-icons@1.11.3/font/bootstrap-icons.min.css">
+    <style>
+        body {
+            background-color: #f8f9fa;
+        }
+        .main-content {
+            padding: 2rem 0;
+        }
+        .logo {
+            width: 200px;
+            height: auto;
+            margin: 0 auto;
+            display: block;
+        }
+        .upload-container {
+            background-color: white;
+            padding: 2rem;
+            border-radius: 10px;
+            box-shadow: 0 0 10px rgba(0,0,0,0.1);
+        }
+        .form-label {
+            font-weight: 500;
+        }
+        .alert {
+            margin-bottom: 1rem;
+        }
+    </style>
+</head>
+<body>
+    <div class="main-content">
+        <div class="container">
+            <div class="position-relative mb-4">
+                <div class="dropdown position-absolute start-0">
+                    <button class="btn btn-link text-dark" type="button" id="menuButton" data-bs-toggle="dropdown" aria-expanded="false">
+                        <i class="bi bi-list fs-4"></i>
+                    </button>
+                    <ul class="dropdown-menu" aria-labelledby="menuButton">
+                        <li>
+                            <a class="dropdown-item" href="{{ url_for('index') }}">
+                                <i class="bi bi-house"></i> Home
+                            </a>
+                        </li>
+                        <li>
+                            <a class="dropdown-item" href="{{ url_for('upload') }}">
+                                <i class="bi bi-cloud-upload"></i> CSV-Dateien hochladen
+                            </a>
+                        </li>
+                        <li>
+                            <a class="dropdown-item" href="{{ url_for('readme') }}">
+                                <i class="bi bi-book"></i> README
+                            </a>
+                        </li>
+                    </ul>
+                </div>
+                <div class="text-center">
+                    <a href="https://medisoftware.de" target="_blank" rel="noopener noreferrer">
+                        <img src="{{ url_for('static', filename='medisoftware_logo_rb_200.png') }}" alt="medisoftware Logo" class="img-fluid logo">
+                    </a>
+                </div>
+            </div>
+            <div class="upload-container">
+                <div class="row justify-content-center">
+                    <div class="col-md-6">
+                        <h2 class="text-center mb-4">CSV-Dateien hochladen</h2>
+                        {% if error %}
+                        <div class="alert alert-danger">{{ error }}</div>
+                        {% endif %}
+                        {% if success %}
+                        <div class="alert alert-success">{{ success }}</div>
+                        {% endif %}
+                        <form method="POST" enctype="multipart/form-data">
+                            <div class="mb-3">
+                                <label for="medisoft_file" class="form-label">MEDISOFT CSV-Datei</label>
+                                <input type="file" class="form-control" id="medisoft_file" name="medisoft_file" accept=".csv">
+                            </div>
+                            <div class="mb-3">
+                                <label for="mediconsult_file" class="form-label">MEDICONSULT CSV-Datei</label>
+                                <input type="file" class="form-control" id="mediconsult_file" name="mediconsult_file" accept=".csv">
+                            </div>
+                            <div class="mb-3">
+                                <label for="password" class="form-label">Passwort</label>
+                                <input type="password" class="form-control" id="password" name="password" required>
+                            </div>
+                            <div class="d-grid">
+                                <button type="submit" class="btn btn-primary">Dateien hochladen</button>
+                            </div>
+                        </form>
+                    </div>
+                </div>
+            </div>
+        </div>
+    </div>
+    <script src="https://cdn.jsdelivr.net/npm/bootstrap@5.3.0/dist/js/bootstrap.bundle.min.js"></script>
+</body>
+</html>