chore: Release v1.2.21

CHANGELOG.md

@@ -213,9 +213,22 @@ und dieses Projekt adhäriert zu [Semantic Versioning](https://semver.org/lang/d
 - Klickbare Links für Telefonnummern, E-Mail-Adressen und Adressen
 - Docker-Container für einfache Installation und Deployment
 
-## [1.2.18] - 2024-03-19
+## [1.2.19] - 2024-03-19
 ### Geändert
-- Version auf 1.2.18 aktualisiert
+- Version auf 1.2.19 aktualisiert
 
-## [1.2.17] - 2024-03-19
+## [1.2.18] - 2024-03-19
 # ... existing code ...
+
+## [v1.2.20] - 2024-03-19
+### Hinzugefügt
+- Dunkles Theme für bessere Lesbarkeit bei schlechten Lichtverhältnissen
+- Theme-Switcher im Hamburger-Menü
+- Automatische Speicherung der Theme-Präferenz
+
+## [1.2.21] - 2024-03-24
+### Fixed
+- Verbesserte Datenbankinitialisierung und CSV-Import
+- Korrektur der Suchfunktionalität
+
+## [1.2.20] - 2024-03-24 

README.md

@@ -19,7 +19,7 @@ Eine einfache und effiziente Kundensuche für medisoftware Kunden.
 
 ## Version
 
-Aktuelle Version: 1.2.18
+Aktuelle Version: 1.2.21
 
 ## Installation
 
@@ -144,15 +144,16 @@ Aktuelle Version: [v1.2.17](CHANGELOG.md#v1217---2024-03-19)
 
 Language|files|blank|comment|code
 :-------|-------:|-------:|-------:|-------:
+HTML|4|13|37|436
 JavaScript|1|67|28|420
-HTML|4|16|0|382
+CSS|1|72|16|353
-CSS|1|63|0|324
+Markdown|2|79|0|300
-Markdown|2|77|0|295
+Python|1|71|126|280
 YAML|1|0|0|14
 Dockerfile|1|8|9|11
 Text|1|0|0|6
 --------|--------|--------|--------|--------
-SUM:|12|302|163|1732
+SUM:|12|310|216|1820
 
 ## Lizenz
 Alle Rechte vorbehalten. © 2025 medisoftware

app.py

@@ -15,7 +15,7 @@ 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.18'
+app.config['VERSION'] = '1.2.21'
 app.config['DATABASE'] = 'data/customers.db'
 app.config['DATABASE_TIMEOUT'] = 20
 app.config['DATABASE_POOL_SIZE'] = 5
@@ -51,6 +51,12 @@ def init_db():
         c = conn.cursor()
         
         try:
+            # Prüfe, ob die Tabelle bereits existiert
+            c.execute("SELECT name FROM sqlite_master WHERE type='table' AND name='customers'")
+            if c.fetchone() is not None:
+                app.logger.info('Datenbank existiert bereits, überspringe Initialisierung')
+                return
+            
             # Erstelle die Kunden-Tabelle
             c.execute('''
                 CREATE TABLE IF NOT EXISTS customers (
@@ -83,9 +89,57 @@ def init_db():
             # Zusammengesetzter Index für die häufigste Suchkombination
             c.execute('CREATE INDEX IF NOT EXISTS idx_customers_search ON customers(name, ort, fachrichtung, tag)')
             
-            logger.info('Datenbank initialisiert')
+            app.logger.info('Datenbank initialisiert')
+            
+            # Importiere die CSV-Daten
+            import_csv_data('data/medisoft.csv', 'MEDISOFT')
+            import_csv_data('data/mediconsult.csv', 'MEDICONSULT')
+            app.logger.info('CSV-Daten erfolgreich in die Datenbank importiert')
+            
         except Exception as e:
-            logger.error(f'Fehler bei der Datenbankinitialisierung: {str(e)}')
+            app.logger.error(f'Fehler bei der Datenbankinitialisierung: {str(e)}')
+            raise
+
+def import_csv_data(file_path, tag):
+    """Importiert die CSV-Datei in die Datenbank."""
+    try:
+        if not os.path.exists(file_path):
+            app.logger.warning(f"CSV-Datei {file_path} nicht gefunden")
+            return
+
+        app.logger.info(f"Importiere {tag}-Daten aus {file_path}...")
+        
+        with get_db() as conn:
+            c = conn.cursor()
+            
+            # Lese die CSV-Datei
+            df = pd.read_csv(file_path, encoding='iso-8859-1')
+            df.columns = df.columns.str.strip().str.replace('"', '')
+            df = df.apply(lambda x: x.str.strip().str.replace('"', '') if x.dtype == "object" else x)
+            
+            # Filtere Datensätze mit Fachrichtung "intern"
+            df = df[df['Fachrichtung'].str.lower() != 'intern']
+            
+            # Bereite die Daten für den Batch-Insert vor
+            data = [(
+                row['VorNachname'], row['Nummer'], row['Strasse'], row['PLZ'], row['Ort'], 
+                row['Tel'], row['Tel'], row['mail'], row['Fachrichtung'], tag,
+                row['Handy'], row['Tele Firma'], row['Kontakt1'], row['Kontakt2'], row['Kontakt3']
+            ) for _, row in df.iterrows()]
+            
+            # Führe Batch-Insert durch
+            c.executemany('''
+                INSERT INTO customers (
+                    name, nummer, strasse, plz, ort, telefon, mobil, email, 
+                    fachrichtung, tag, handy, tele_firma, kontakt1, kontakt2, kontakt3
+                )
+                VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?)
+            ''', data)
+            
+            app.logger.info(f"{tag}-Daten erfolgreich importiert")
+            
+    except Exception as e:
+        app.logger.error(f"Fehler beim Importieren der {tag}-Daten: {str(e)}")
         raise
 
 def isIPInSubnet(ip, subnet):
@@ -109,76 +163,6 @@ def isIPInSubnet(ip, subnet):
         logger.error(f"Fehler bei der IP-Überprüfung: {str(e)}")
         return False
 
-def import_csv():
-    """Importiert die CSV-Datei in die Datenbank"""
-    try:
-        with get_db() as conn:
-            c = conn.cursor()
-            
-            # Lösche bestehende Daten
-            c.execute('DELETE FROM customers')
-            
-            # Importiere MEDISOFT-Daten
-            if os.path.exists('data/customers.csv'):
-                logger.info("Importiere MEDISOFT-Daten...")
-                df = pd.read_csv('data/customers.csv', encoding='iso-8859-1')
-                df.columns = df.columns.str.strip().str.replace('"', '')
-                df = df.apply(lambda x: x.str.strip().str.replace('"', '') if x.dtype == "object" else x)
-                
-                # Filtere Datensätze mit Fachrichtung "intern"
-                df = df[df['Fachrichtung'].str.lower() != 'intern']
-                
-                # Bereite die Daten für den Batch-Insert vor
-                data = [(
-                    row['VorNachname'], row['Nummer'], row['Strasse'], row['PLZ'], row['Ort'], 
-                    row['Tel'], row['Tel'], row['mail'], row['Fachrichtung'], 'medisoft',
-                    row['Handy'], row['Tele Firma'], row['Kontakt1'], row['Kontakt2'], row['Kontakt3']
-                ) for _, row in df.iterrows()]
-                
-                # Führe Batch-Insert durch
-                c.executemany('''
-                    INSERT INTO customers (
-                        name, nummer, strasse, plz, ort, telefon, mobil, email, 
-                        fachrichtung, tag, handy, tele_firma, kontakt1, kontakt2, kontakt3
-                    )
-                    VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?)
-                ''', data)
-            else:
-                logger.warning("MEDISOFT CSV-Datei nicht gefunden")
-            
-            # Importiere MEDICONSULT-Daten
-            if os.path.exists('data/customers_snk.csv'):
-                logger.info("Importiere MEDICONSULT-Daten...")
-                df_snk = pd.read_csv('data/customers_snk.csv', encoding='iso-8859-1')
-                df_snk.columns = df_snk.columns.str.strip().str.replace('"', '')
-                df_snk = df_snk.apply(lambda x: x.str.strip().str.replace('"', '') if x.dtype == "object" else x)
-                
-                # Filtere Datensätze mit Fachrichtung "intern"
-                df_snk = df_snk[df_snk['Fachrichtung'].str.lower() != 'intern']
-                
-                # Bereite die Daten für den Batch-Insert vor
-                data = [(
-                    row['VorNachname'], row['Nummer'], row['Strasse'], row['PLZ'], row['Ort'], 
-                    row['Tel'], row['Tel'], row['mail'], row['Fachrichtung'], 'mediconsult',
-                    row['Handy'], row['Tele Firma'], row['Kontakt1'], row['Kontakt2'], row['Kontakt3']
-                ) for _, row in df_snk.iterrows()]
-                
-                # Führe Batch-Insert durch
-                c.executemany('''
-                    INSERT INTO customers (
-                        name, nummer, strasse, plz, ort, telefon, mobil, email, 
-                        fachrichtung, tag, handy, tele_firma, kontakt1, kontakt2, kontakt3
-                    )
-                    VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?)
-                ''', data)
-            else:
-                logger.warning("MEDICONSULT CSV-Datei nicht gefunden")
-            
-            logger.info("CSV-Daten erfolgreich in die Datenbank importiert")
-    except Exception as e:
-        logger.error(f"Fehler beim Importieren der CSV-Datei: {str(e)}")
-        raise
-
 @app.route('/login', methods=['GET', 'POST'])
 def login():
     # Überprüfe, ob die Client-IP in einem der erlaubten Bereiche liegt
@@ -422,8 +406,8 @@ def upload():
             customers.save('data/customers.csv')
             
             # Importiere die Daten in die Datenbank
-            import_csv('data/customers_snk.csv', 'snk')
+            import_csv_data('data/customers_snk.csv', 'snk')
-            import_csv('data/customers.csv', 'medisoft')
+            import_csv_data('data/customers.csv', 'medisoft')
             
             return render_template('upload.html', success="Dateien erfolgreich hochgeladen und importiert", version=app.config['VERSION'])
         except Exception as e:
@@ -453,18 +437,8 @@ def init_app(app):
             # Stelle sicher, dass der data-Ordner existiert
             os.makedirs('data', exist_ok=True)
             
-            # Lösche die alte Datenbank, falls sie existiert
-            if os.path.exists(app.config['DATABASE']):
-                try:
-                    os.remove(app.config['DATABASE'])
-                    logger.info(f"Alte Datenbank {app.config['DATABASE']} wurde gelöscht")
-                except Exception as e:
-                    logger.error(f"Fehler beim Löschen der alten Datenbank: {str(e)}")
-            
             # Initialisiere die Datenbank
             init_db()
-            # Importiere die CSV-Daten
-            import_csv()
             logger.info("Anwendung erfolgreich initialisiert")
         except Exception as e:
             logger.error(f"Fehler bei der Initialisierung: {str(e)}")

static/css/style.css

@@ -0,0 +1,87 @@
+:root {
+    --primary-color: #007bff;
+    --secondary-color: #6c757d;
+    --background-color: #ffffff;
+    --text-color: #212529;
+    --card-bg: #ffffff;
+    --border-color: #dee2e6;
+    --hover-bg: #f8f9fa;
+    --shadow-color: rgba(0, 0, 0, 0.1);
+}
+
+[data-theme="dark"] {
+    --primary-color: #0d6efd;
+    --secondary-color: #adb5bd;
+    --background-color: #212529;
+    --text-color: #f8f9fa;
+    --card-bg: #343a40;
+    --border-color: #495057;
+    --hover-bg: #495057;
+    --shadow-color: rgba(0, 0, 0, 0.3);
+}
+
+body {
+    font-family: 'Segoe UI', Tahoma, Geneva, Verdana, sans-serif;
+    background-color: var(--background-color);
+    color: var(--text-color);
+    transition: background-color 0.3s, color 0.3s;
+}
+
+.card {
+    background-color: var(--card-bg);
+    border: 1px solid var(--border-color);
+    box-shadow: 0 2px 4px var(--shadow-color);
+}
+
+.table {
+    color: var(--text-color);
+}
+
+.table thead th {
+    background-color: var(--card-bg);
+    border-bottom-color: var(--border-color);
+    color: var(--text-color);
+}
+
+.table td {
+    border-color: var(--border-color);
+}
+
+.table-hover tbody tr:hover {
+    background-color: var(--hover-bg);
+}
+
+.modal-content {
+    background-color: var(--card-bg);
+    color: var(--text-color);
+    border-color: var(--border-color);
+}
+
+.modal-header {
+    border-bottom-color: var(--border-color);
+}
+
+.modal-footer {
+    border-top-color: var(--border-color);
+}
+
+.form-control {
+    background-color: var(--card-bg);
+    border-color: var(--border-color);
+    color: var(--text-color);
+}
+
+.form-control:focus {
+    background-color: var(--card-bg);
+    color: var(--text-color);
+}
+
+.btn-outline-secondary {
+    color: var(--text-color);
+    border-color: var(--border-color);
+}
+
+.btn-outline-secondary:hover {
+    background-color: var(--hover-bg);
+    color: var(--text-color);
+} 

static/css/styles.css

@@ -1,20 +1,121 @@
+/* 
+    medisoftware Kundensuche - Hauptstyles
+    Version: 1.2.19
+    Entwickler: medisoftware GmbH
+    Letzte Änderung: 2024-03-19
+*/
+
+/* Allgemeine Styles */
 body {
     min-height: 100vh;
     display: flex;
     flex-direction: column;
     margin: 0;
     padding: 0;
+    background-color: #f8f9fa;
 }
 
+/* Hauptcontainer */
 .main-content {
     flex: 1 0 auto;
     padding: 2rem 0;
-    margin-bottom: 4rem; /* Platz für die fixierte Fußzeile */
+    margin-bottom: 4rem;
 }
 
+/* Suchcontainer */
 .search-container {
-    max-width: 800px;
+    background-color: white;
+    padding: 2rem;
+    border-radius: 10px;
+    box-shadow: 0 0 10px rgba(0,0,0,0.1);
+}
+
+/* Suchergebnisse */
+#searchResults {
+    margin-top: 2rem;
+}
+
+/* Kundenkarte */
+.customer-card {
+    background-color: white;
+    border-radius: 8px;
+    padding: 1.5rem;
+    margin-bottom: 1rem;
+    box-shadow: 0 2px 4px rgba(0,0,0,0.05);
+    transition: transform 0.2s, box-shadow 0.2s;
+}
+
+.customer-card:hover {
+    transform: translateY(-2px);
+    box-shadow: 0 4px 8px rgba(0,0,0,0.1);
+}
+
+/* Kundenname */
+.customer-name {
+    font-size: 1.25rem;
+    font-weight: 600;
+    color: #333;
+    margin-bottom: 0.5rem;
+}
+
+/* Kundeninformationen */
+.customer-info {
+    color: #666;
+    margin-bottom: 0.5rem;
+}
+
+/* Klickbare Links */
+.customer-info a {
+    color: #0d6efd;
+    text-decoration: none;
+}
+
+.customer-info a:hover {
+    text-decoration: underline;
+}
+
+/* Footer */
+.footer {
+    flex-shrink: 0;
+    text-align: center;
+    padding: 1rem;
+    background-color: #f8f9fa;
+    border-top: 1px solid #dee2e6;
+    width: 100%;
+    position: fixed;
+    bottom: 0;
+    left: 0;
+    z-index: 100;
+}
+
+.footer-content {
+    max-width: 1200px;
     margin: 0 auto;
+    padding: 0 1rem;
+}
+
+.footer-link {
+    color: #0d6efd;
+    text-decoration: none;
+}
+
+.footer-link:hover {
+    text-decoration: underline;
+}
+
+/* Responsive Anpassungen */
+@media (max-width: 768px) {
+    .main-content {
+        padding: 1rem 0;
+    }
+    
+    .search-container {
+        padding: 1rem;
+    }
+    
+    .customer-card {
+        padding: 1rem;
+    }
 }
 
 .result-card {
@@ -73,19 +174,6 @@ body {
     font-size: 0.9em;
 }
 
-.footer {
-    flex-shrink: 0;
-    text-align: center;
-    padding: 1rem;
-    background-color: #f8f9fa;
-    border-top: 1px solid #dee2e6;
-    width: 100%;
-    position: fixed;
-    bottom: 0;
-    left: 0;
-    z-index: 100;
-}
-
 .share-feedback {
     position: fixed;
     bottom: 20px;
@@ -209,14 +297,6 @@ body {
     font-size: 1.2em;
 }
 
-.customer-card {
-    background: white;
-    border-radius: 8px;
-    box-shadow: 0 2px 4px rgba(0,0,0,0.1);
-    margin-bottom: 1rem;
-    padding: 1rem;
-}
-
 .customer-header {
     display: flex;
     justify-content: space-between;
@@ -224,12 +304,6 @@ body {
     margin-bottom: 0.5rem;
 }
 
-.customer-name {
-    margin: 0;
-    font-size: 1.2rem;
-    color: #333;
-}
-
 .customer-actions {
     display: flex;
     align-items: center;
@@ -286,26 +360,6 @@ body {
     font-size: 0.875rem;
 }
 
-.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;
-}
-
 .general-search {
     max-width: 800px;
     margin: 0 auto;

templates/index.html

@@ -5,43 +5,62 @@
     <meta name="viewport" content="width=device-width, initial-scale=1.0">
     <meta name="client-ip" content="{{ request.headers.get('X-Forwarded-For', request.remote_addr) }}">
     <meta name="allowed-ip-ranges" content="{{ allowed_ip_ranges }}">
+    <!-- 
+        medisoftware Kundensuche
+        Version: {{ version }}
+        Entwickler: medisoftware GmbH
+        Letzte Änderung: 2024-03-19
+    -->
     <title>medisoftware Kundensuche</title>
     <link rel="icon" type="image/x-icon" href="{{ url_for('static', filename='favicon.ico') }}">
     <link href="https://cdn.jsdelivr.net/npm/bootstrap@5.3.0/dist/css/bootstrap.min.css" rel="stylesheet">
     <link href="https://cdnjs.cloudflare.com/ajax/libs/font-awesome/6.5.1/css/all.min.css" rel="stylesheet">
     <link rel="stylesheet" href="https://cdn.jsdelivr.net/npm/bootstrap-icons@1.11.3/font/bootstrap-icons.min.css">
     <link href="{{ url_for('static', filename='css/styles.css') }}" rel="stylesheet">
+    <style>
+        /* 
+            Inline-Styles für spezifische Anpassungen
+            Diese Styles sind nur für diese Seite gültig
+        */
+        .logo {
+            width: 200px;
+            height: auto;
+            margin: 0 auto;
+            display: block;
+        }
+    </style>
 </head>
 <body>
     <div class="main-content">
         <div class="container">
-            <div class="d-flex justify-content-between align-items-center mb-4">
+            <div class="position-relative mb-4">
-                <div class="dropdown">
+                <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">
+                    <div class="dropdown-menu">
-                        <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>
+                            <button class="dropdown-item theme-toggle" id="themeToggle">
+                                <i class="bi bi-moon-stars"></i> Theme wechseln
+                            </button>
                         </li>
-                    </ul>
                     </div>
+                </div>
+                <div class="text-center">
                     <a href="https://medisoftware.de" target="_blank" rel="noopener noreferrer">
-                    <img src="{{ url_for('static', filename='medisoftware_logo_rb_200.png') }}" alt="medisoftware Logo" class="img-fluid" style="max-width: 200px;">
+                        <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>
                 
@@ -136,5 +155,28 @@
 
     <script src="{{ url_for('static', filename='js/main.js') }}"></script>
     <script src="https://cdn.jsdelivr.net/npm/bootstrap@5.3.0/dist/js/bootstrap.bundle.min.js"></script>
+    <script>
+        // Theme Switcher
+        const themeToggle = document.getElementById('themeToggle');
+        const icon = themeToggle.querySelector('i');
+        
+        // Theme aus dem localStorage laden
+        const savedTheme = localStorage.getItem('theme') || 'light';
+        document.documentElement.setAttribute('data-theme', savedTheme);
+        updateThemeIcon(savedTheme);
+
+        themeToggle.addEventListener('click', () => {
+            const currentTheme = document.documentElement.getAttribute('data-theme');
+            const newTheme = currentTheme === 'light' ? 'dark' : 'light';
+            
+            document.documentElement.setAttribute('data-theme', newTheme);
+            localStorage.setItem('theme', newTheme);
+            updateThemeIcon(newTheme);
+        });
+
+        function updateThemeIcon(theme) {
+            icon.className = theme === 'light' ? 'bi bi-moon-stars' : 'bi bi-sun';
+        }
+    </script>
 </body>
 </html> 

templates/readme.html

@@ -3,56 +3,104 @@
 <head>
     <meta charset="UTF-8">
     <meta name="viewport" content="width=device-width, initial-scale=1.0">
+    <!-- 
+        medisoftware Kundensuche - README
+        Version: {{ version }}
+        Entwickler: medisoftware GmbH
+        Letzte Änderung: 2024-03-19
+    -->
     <title>medisoftware Kundensuche - README</title>
+    <!-- Bootstrap CSS -->
     <link href="https://cdn.jsdelivr.net/npm/bootstrap@5.3.0/dist/css/bootstrap.min.css" rel="stylesheet">
-    <link href="https://cdnjs.cloudflare.com/ajax/libs/font-awesome/6.5.1/css/all.min.css" rel="stylesheet">
+    <!-- Bootstrap Icons für die Menü-Symbole -->
     <link rel="stylesheet" href="https://cdn.jsdelivr.net/npm/bootstrap-icons@1.11.3/font/bootstrap-icons.min.css">
-    <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>
+        /* 
+            Inline-Styles für die README-Seite
+            Diese Styles sind nur für diese Seite gültig
+        */
         body {
-            min-height: 100vh;
+            background-color: #f8f9fa;
-            display: flex;
-            flex-direction: column;
-            margin: 0;
-            padding: 0;
         }
         .main-content {
-            flex: 1 0 auto;
             padding: 2rem 0;
-            margin-bottom: 4rem;
         }
-        .footer {
+        .logo {
-            flex-shrink: 0;
+            width: 200px;
-            text-align: center;
+            height: auto;
-            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;
+            display: block;
         }
-        @media (max-width: 767px) {
+        .readme-container {
-            .markdown-body {
+            background-color: white;
-                padding: 15px;
+            padding: 2rem;
+            border-radius: 10px;
+            box-shadow: 0 0 10px rgba(0,0,0,0.1);
         }
+        .readme-content {
+            max-width: 800px;
+            margin: 0 auto;
+        }
+        .readme-content h1 {
+            color: #333;
+            margin-bottom: 1.5rem;
+        }
+        .readme-content h2 {
+            color: #444;
+            margin-top: 2rem;
+            margin-bottom: 1rem;
+        }
+        .readme-content p {
+            line-height: 1.6;
+            margin-bottom: 1rem;
+        }
+        .readme-content code {
+            background-color: #f8f9fa;
+            padding: 0.2rem 0.4rem;
+            border-radius: 3px;
+            font-family: monospace;
+        }
+        .readme-content pre {
+            background-color: #f8f9fa;
+            padding: 1rem;
+            border-radius: 5px;
+            overflow-x: auto;
+        }
+        .readme-content ul, .readme-content ol {
+            margin-bottom: 1rem;
+            padding-left: 2rem;
+        }
+        .readme-content li {
+            margin-bottom: 0.5rem;
+        }
+        .readme-content blockquote {
+            border-left: 4px solid #dee2e6;
+            padding-left: 1rem;
+            margin-left: 0;
+            color: #6c757d;
+        }
+        .readme-content table {
+            width: 100%;
+            margin-bottom: 1rem;
+            border-collapse: collapse;
+        }
+        .readme-content th, .readme-content td {
+            padding: 0.5rem;
+            border: 1px solid #dee2e6;
+        }
+        .readme-content th {
+            background-color: #f8f9fa;
         }
     </style>
 </head>
 <body>
+    <!-- Hauptcontainer für den Inhalt -->
     <div class="main-content">
         <div class="container">
-            <div class="d-flex justify-content-between align-items-center mb-4">
+            <!-- Header mit Logo und Menü -->
-                <div class="dropdown">
+            <div class="position-relative mb-4">
+                <!-- Dropdown-Menü -->
+                <div class="dropdown position-absolute start-0">
                     <button class="btn btn-link text-dark" type="button" id="menuButton" data-bs-toggle="dropdown" aria-expanded="false">
                         <i class="bi bi-list fs-4"></i>
                     </button>
@@ -74,38 +122,22 @@
                         </li>
                     </ul>
                 </div>
+                <!-- Logo -->
+                <div class="text-center">
                     <a href="https://medisoftware.de" target="_blank" rel="noopener noreferrer">
-                    <img src="{{ url_for('static', filename='medisoftware_logo_rb_200.png') }}" alt="medisoftware Logo" class="img-fluid" style="max-width: 200px;">
+                        <img src="{{ url_for('static', filename='medisoftware_logo_rb_200.png') }}" alt="medisoftware Logo" class="img-fluid logo">
                     </a>
                 </div>
-            
-            <div class="card">
-                <div class="card-header">
-                    <h2 class="text-center mb-0">README</h2>
             </div>
-                <div class="card-body">
+            <!-- README-Container -->
-                    {% if error %}
+            <div class="readme-container">
-                    <div class="alert alert-danger" role="alert">
+                <div class="readme-content">
-                        {{ error }}
+                    {{ readme_content | safe }}
-                    </div>
-                    {% else %}
-                    <div class="markdown-body">
-                        {{ content | safe }}
-                    </div>
-                    {% endif %}
                 </div>
             </div>
         </div>
     </div>
-
+    <!-- Bootstrap JavaScript -->
-    <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

@@ -3,73 +3,113 @@
 <head>
     <meta charset="UTF-8">
     <meta name="viewport" content="width=device-width, initial-scale=1.0">
+    <!-- 
+        medisoftware Kundensuche - CSV Upload
+        Version: {{ version }}
+        Entwickler: medisoftware GmbH
+        Letzte Änderung: 2024-03-19
+    -->
     <title>medisoftware Kundensuche - CSV Upload</title>
+    <!-- Bootstrap CSS -->
     <link href="https://cdn.jsdelivr.net/npm/bootstrap@5.3.0/dist/css/bootstrap.min.css" rel="stylesheet">
+    <!-- Bootstrap Icons für die Menü-Symbole -->
+    <link rel="stylesheet" href="https://cdn.jsdelivr.net/npm/bootstrap-icons@1.11.3/font/bootstrap-icons.min.css">
     <style>
+        /* 
+            Inline-Styles für die Upload-Seite
+            Diese Styles sind nur für diese Seite gültig
+        */
         body {
-            min-height: 100vh;
+            background-color: #f8f9fa;
-            display: flex;
-            flex-direction: column;
-            margin: 0;
-            padding: 0;
         }
         .main-content {
-            flex: 1 0 auto;
             padding: 2rem 0;
-            margin-bottom: 4rem;
         }
-        .footer {
+        .logo {
-            flex-shrink: 0;
+            width: 200px;
-            text-align: center;
+            height: auto;
-            padding: 1rem;
+            margin: 0 auto;
-            background-color: #f8f9fa;
+            display: block;
-            border-top: 1px solid #dee2e6;
+        }
-            width: 100%;
+        .upload-container {
-            position: fixed;
+            background-color: white;
-            bottom: 0;
+            padding: 2rem;
-            left: 0;
+            border-radius: 10px;
-            z-index: 100;
+            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="container mt-5">
+    <!-- Hauptcontainer für den Inhalt -->
-        <div class="text-center mb-4">
+    <div class="main-content">
-            <img src="{{ url_for('static', filename='medisoftware_logo_rb_200.png') }}" alt="medisoftware Logo" class="img-fluid" style="max-width: 200px;">
+        <div class="container">
+            <!-- Header mit Logo und Menü -->
+            <div class="position-relative mb-4">
+                <!-- Dropdown-Menü -->
+                <div class="dropdown position-absolute start-0">
+                    <button class="btn btn-link text-dark" type="button" id="menuButton" data-bs-toggle="dropdown" aria-expanded="false">
+                        <i class="bi bi-list fs-4"></i>
+                    </button>
+                    <ul class="dropdown-menu" aria-labelledby="menuButton">
+                        <li>
+                            <a class="dropdown-item" href="{{ url_for('index') }}">
+                                <i class="bi bi-house"></i> Home
+                            </a>
+                        </li>
+                        <li>
+                            <a class="dropdown-item" href="{{ url_for('upload') }}">
+                                <i class="bi bi-cloud-upload"></i> CSV-Dateien hochladen
+                            </a>
+                        </li>
+                        <li>
+                            <a class="dropdown-item" href="{{ url_for('readme') }}">
+                                <i class="bi bi-book"></i> README
+                            </a>
+                        </li>
+                    </ul>
                 </div>
+                <!-- Logo -->
+                <div class="text-center">
+                    <a href="https://medisoftware.de" target="_blank" rel="noopener noreferrer">
+                        <img src="{{ url_for('static', filename='medisoftware_logo_rb_200.png') }}" alt="medisoftware Logo" class="img-fluid logo">
+                    </a>
+                </div>
+            </div>
+            <!-- Upload-Container -->
+            <div class="upload-container">
                 <div class="row justify-content-center">
                     <div class="col-md-6">
-                <div class="card">
+                        <h2 class="text-center mb-4">CSV-Dateien hochladen</h2>
-                    <div class="card-header">
+                        <!-- Fehlermeldungen -->
-                        <h2 class="text-center mb-0">CSV Upload</h2>
-                    </div>
-                    <div class="card-body">
                         {% if error %}
-                        <div class="alert alert-danger" role="alert">
+                        <div class="alert alert-danger">{{ error }}</div>
-                            {{ error }}
-                        </div>
                         {% endif %}
+                        <!-- Erfolgsmeldungen -->
                         {% if success %}
-                        <div class="alert alert-success" role="alert">
+                        <div class="alert alert-success">{{ success }}</div>
-                            {{ success }}
-                        </div>
                         {% endif %}
+                        <!-- Upload-Formular -->
                         <form method="POST" enctype="multipart/form-data">
                             <div class="mb-3">
-                                <label for="customers_snk" class="form-label">SNK Kunden (customers_snk.csv)</label>
+                                <label for="medisoft_file" class="form-label">MEDISOFT CSV-Datei</label>
-                                <input type="file" class="form-control" id="customers_snk" name="customers_snk" accept=".csv" required>
+                                <input type="file" class="form-control" id="medisoft_file" name="medisoft_file" accept=".csv">
                             </div>
                             <div class="mb-3">
-                                <label for="customers" class="form-label">MEDISOFT Kunden (customers.csv)</label>
+                                <label for="mediconsult_file" class="form-label">MEDICONSULT CSV-Datei</label>
-                                <input type="file" class="form-control" id="customers" name="customers" accept=".csv" required>
+                                <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 gap-2">
+                            <div class="d-grid">
                                 <button type="submit" class="btn btn-primary">Dateien hochladen</button>
-                                <a href="{{ url_for('index') }}" class="btn btn-secondary">Zurück zur Suche</a>
                             </div>
                         </form>
                     </div>
@@ -77,11 +117,7 @@
             </div>
         </div>
     </div>
-    <footer class="footer">
+    <!-- Bootstrap JavaScript -->
-        <div class="footer-content">
+    <script src="https://cdn.jsdelivr.net/npm/bootstrap@5.3.0/dist/js/bootstrap.bundle.min.js"></script>
-            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>
 </body>
 </html>