Version 1.2.2: Verbesserte Telefonnummern-Formatierung und Dokumentation

Dockerfile

@@ -10,8 +10,12 @@ COPY requirements.txt .
 # Installiere Abhängigkeiten
 RUN pip install --no-cache-dir -r requirements.txt
 
-# Kopiere den Anwendungscode
+# Erstelle das data Verzeichnis und setze Berechtigungen
-COPY . .
+RUN mkdir -p /app/data && \
+    chmod 755 /app/data
+
+# Kopiere die Anwendungsdateien
+COPY . /app/
 
 # Exponiere Port 5000
 EXPOSE 5000

app.py

@@ -21,7 +21,10 @@ logger = logging.getLogger(__name__)
 VERSION = "1.2.1"
 
 # Pfad zur CSV-Datei
-CSV_FILE = "data/customers.csv"
+CSV_FILE = 'data/customers.csv'
+
+# Pfad zur Datenbank
+DB_FILE = 'data/customers.db'
 
 # Lade Umgebungsvariablen
 load_dotenv()
@@ -31,11 +34,11 @@ 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."""
+    """Initialisiert die SQLite-Datenbank mit der notwendigen Tabelle."""
-    conn = sqlite3.connect('customers.db')
+    conn = sqlite3.connect(DB_FILE)
     c = conn.cursor()
     
-    # Erstelle die Kunden-Tabelle
+    # Erstelle die Tabelle mit Indizes
     c.execute('''
         CREATE TABLE IF NOT EXISTS customers (
             id INTEGER PRIMARY KEY AUTOINCREMENT,
@@ -51,12 +54,20 @@ def init_db():
         )
     ''')
     
+    # Erstelle Indizes für häufig durchsuchte Spalten
+    c.execute('CREATE INDEX IF NOT EXISTS idx_name ON customers(name)')
+    c.execute('CREATE INDEX IF NOT EXISTS idx_ort ON customers(ort)')
+    c.execute('CREATE INDEX IF NOT EXISTS idx_nummer ON customers(nummer)')
+    c.execute('CREATE INDEX IF NOT EXISTS idx_telefon ON customers(telefon)')
+    c.execute('CREATE INDEX IF NOT EXISTS idx_email ON customers(email)')
+    
     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('customers.db')
+    conn = sqlite3.connect(DB_FILE)
     c = conn.cursor()
     
     # Lösche bestehende Daten
@@ -64,7 +75,7 @@ def import_csv():
     
     try:
         # Lese die CSV-Datei mit pandas
-        df = pd.read_csv('data/customers.csv', sep=',', encoding='utf-8', quotechar='"')
+        df = pd.read_csv(CSV_FILE, sep=',', encoding='utf-8', quotechar='"')
         
         # Entferne Anführungszeichen aus den Spaltennamen
         df.columns = df.columns.str.strip('"')
@@ -103,48 +114,65 @@ def import_csv():
         conn.close()
 
 def search_customers(search_params):
-    """Sucht Kunden in der Datenbank basierend auf den Suchparametern."""
+    """Sucht nach Kunden basierend auf den Suchparametern."""
-    conn = sqlite3.connect('customers.db')
+    conn = sqlite3.connect(DB_FILE)
     c = conn.cursor()
     
-    # Erstelle die WHERE-Bedingungen basierend auf den Suchparametern
+    try:
-    conditions = []
+        # Baue die SQL-Abfrage dynamisch auf
-    params = []
+        query = "SELECT * FROM customers WHERE 1=1"
-    
+        params = []
-    if search_params.get('name'):
+        
-        conditions.append('name LIKE ?')
+        # Allgemeine Suche über alle Felder
-        params.append(f'%{search_params["name"]}%')
+        if search_params.get('q'):
-    
+            search_term = f"%{search_params['q']}%"
-    if search_params.get('ort'):
+            query += " AND (name LIKE ? OR ort LIKE ? OR nummer LIKE ? OR telefon LIKE ? OR mobil LIKE ? OR email LIKE ? OR bemerkung LIKE ?)"
-        conditions.append('ort LIKE ?')
+            params.extend([search_term] * 7)
-        params.append(f'%{search_params["ort"]}%')
+        
-    
+        # Spezifische Suche für einzelne Felder
-    if search_params.get('nummer'):
+        if search_params.get('name'):
-        conditions.append('nummer LIKE ?')
+            query += " AND name LIKE ?"
-        params.append(f'%{search_params["nummer"]}%')
+            params.append(f"%{search_params['name']}%")
-    
+        
-    if search_params.get('plz'):
+        if search_params.get('ort'):
-        conditions.append('plz LIKE ?')
+            query += " AND ort LIKE ?"
-        params.append(f'%{search_params["plz"]}%')
+            params.append(f"%{search_params['ort']}%")
-    
+        
-    # Erstelle die SQL-Abfrage
+        if search_params.get('nummer'):
-    sql = 'SELECT * FROM customers'
+            query += " AND nummer LIKE ?"
-    if conditions:
+            params.append(f"%{search_params['nummer']}%")
-        sql += ' WHERE ' + ' AND '.join(conditions)
+        
-    
+        if search_params.get('plz'):
-    # Führe die Abfrage aus
+            query += " AND plz LIKE ?"
-    c.execute(sql, params)
+            params.append(f"%{search_params['plz']}%")
-    results = c.fetchall()
+        
-    
+        # Führe die Abfrage aus
-    # Konvertiere die Ergebnisse in ein Dictionary
+        c.execute(query, params)
-    columns = ['id', 'nummer', 'name', 'strasse', 'plz', 'ort', 'telefon', 'mobil', 'email', 'bemerkung']
+        results = c.fetchall()
-    customers = []
+        
-    for row in results:
+        # Formatiere die Ergebnisse
-        customer = dict(zip(columns, row))
+        customers = []
-        customers.append(customer)
+        for row in results:
-    
+            customer = {
-    conn.close()
+                'id': row[0],
-    return customers
+                '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]
+            }
+            customers.append(customer)
+        
+        return customers
+    except Exception as e:
+        logger.error(f"Fehler bei der Kundensuche: {str(e)}")
+        raise
+    finally:
+        conn.close()
 
 def clean_dataframe(df):
     """Konvertiert NaN-Werte in None für JSON-Kompatibilität"""
@@ -233,7 +261,10 @@ def search():
             'name': request.args.get('name', ''),
             'ort': request.args.get('ort', ''),
             'nummer': request.args.get('nummer', ''),
-            'plz': request.args.get('plz', '')
+            'plz': request.args.get('plz', ''),
+            'telefon': request.args.get('telefon', ''),
+            'email': request.args.get('email', ''),
+            'q': request.args.get('q', '')
         }
         
         # Führe die Suche in der Datenbank durch

docker-compose.yml

@@ -4,9 +4,11 @@ services:
     ports:
       - "5001:5000"
     volumes:
-      - .:/app
+      - ./data:/app/data
     environment:
       - FLASK_APP=app.py
-      - FLASK_ENV=development
+      - FLASK_ENV=production
-      - FLASK_DEBUG=1
+      - SECRET_KEY=your-super-secret-key-here
+      - LOGIN_PASSWORD=changeme
+      - ALLOWED_IP_RANGES=213.178.68.218/29,192.168.0.0/24,192.168.177.0/24
     command: flask run --host=0.0.0.0 

static/css/styles.css

@@ -109,21 +109,31 @@ body {
     display: flex;
     justify-content: flex-end;
     margin-top: 1rem;
+    padding-top: 1rem;
+    border-top: 1px solid #e9ecef;
 }
 
 .share-button {
-    padding: 5px 10px;
+    padding: 0.5rem 1rem;
-    border-radius: 15px;
+    border-radius: 20px;
-    font-size: 0.9em;
+    font-size: 0.9rem;
     background-color: #0d6efd;
     color: white;
     border: none;
     cursor: pointer;
-    transition: background-color 0.2s;
+    transition: all 0.2s ease;
+    display: flex;
+    align-items: center;
+    gap: 0.5rem;
 }
 
 .share-button:hover {
     background-color: #0b5ed7;
+    transform: translateY(-1px);
+}
+
+.share-button i {
+    font-size: 1rem;
 }
 
 .search-fields {
@@ -204,4 +214,25 @@ body {
 
 .footer-link:hover {
     text-decoration: underline;
+}
+
+.general-search {
+    max-width: 800px;
+    margin: 0 auto;
+}
+
+.general-search .input-group {
+    box-shadow: 0 2px 4px rgba(0,0,0,0.1);
+}
+
+.general-search .form-control {
+    height: 3.5rem;
+    font-size: 1.2rem;
+    padding: 0.75rem 1rem;
+}
+
+.general-search .search-icon,
+.general-search .reset-icon {
+    font-size: 1.2rem;
+    padding: 0 1rem;
 } 

templates/index.html

@@ -81,7 +81,7 @@
 
     <footer class="footer">
         <div class="footer-content">
-            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: v1.2.2</div>
         </div>
     </footer>