Verbesserte Tag-Anzeige: Badge neben dem Teilen-Button mit farblicher Hervorhebung

app.py

@@ -138,23 +138,28 @@ def import_csv():
 
 def search_customers():
     try:
-        q = request.args.get('q', '')
+        if request.method == 'POST':
-        name = request.args.get('name', '')
+            data = request.get_json()
-        ort = request.args.get('ort', '')
+            query = data.get('query', '')
-        nummer = request.args.get('nummer', '')
+            tag = data.get('tag', 'medisoft')
-        plz = request.args.get('plz', '')
+        else:
-        fachrichtung = request.args.get('fachrichtung', '')
+            query = request.args.get('q', '')
-        operator = request.args.get('operator', 'or')
+            name = request.args.get('name', '')
+            ort = request.args.get('ort', '')
+            nummer = request.args.get('nummer', '')
+            plz = request.args.get('plz', '')
+            fachrichtung = request.args.get('fachrichtung', '')
+            operator = request.args.get('operator', 'or')
+            tag = request.args.get('tag', 'medisoft')
             
         conn = get_db_connection()
         c = conn.cursor()
         
         # Basis-SQL-Query
-        query = '''
+        sql = '''
-            SELECT DISTINCT 
+            SELECT 
-                c.id,
-                c.name,
                 c.nummer,
+                c.name,
                 c.strasse,
                 c.plz,
                 c.ort,
@@ -168,68 +173,87 @@ def search_customers():
         '''
         params = []
         
-        # Suchbedingungen
+        if request.method == 'POST':
-        conditions = []
+            if query:
-        if q:
+                sql += ''' AND (
-            search_terms = q.split()
+                    c.name LIKE ? OR
-            if operator == 'and':
+                    c.nummer LIKE ? OR
-                for term in search_terms:
+                    c.strasse LIKE ? OR
-                    conditions.append('''
+                    c.plz LIKE ? OR
-                        (c.name LIKE ? OR c.nummer LIKE ? OR c.strasse LIKE ? 
+                    c.ort LIKE ? OR
-                        OR c.plz LIKE ? OR c.ort LIKE ? OR c.telefon LIKE ? 
+                    c.telefon LIKE ? OR
-                        OR c.mobil LIKE ? OR c.email LIKE ? OR c.fachrichtung LIKE ?
+                    c.mobil LIKE ? OR
-                        OR c.tag LIKE ?)
+                    c.email LIKE ? OR
-                    ''')
+                    c.fachrichtung LIKE ?
-                    params.extend([f'%{term}%'] * 10)
+                )'''
-            else:
+                search_pattern = f'%{query}%'
-                term_conditions = []
+                params.extend([search_pattern] * 9)
-                for term in search_terms:
+        else:
-                    term_conditions.append('''
+            # Suchbedingungen für GET-Request
-                        (c.name LIKE ? OR c.nummer LIKE ? OR c.strasse LIKE ? 
+            conditions = []
-                        OR c.plz LIKE ? OR c.ort LIKE ? OR c.telefon LIKE ? 
+            if query:
-                        OR c.mobil LIKE ? OR c.email LIKE ? OR c.fachrichtung LIKE ?
+                search_terms = query.split()
-                        OR c.tag LIKE ?)
+                if operator == 'and':
-                    ''')
+                    for term in search_terms:
-                    params.extend([f'%{term}%'] * 10)
+                        conditions.append('''
-                conditions.append('(' + ' OR '.join(term_conditions) + ')')
+                            (c.name LIKE ? OR c.nummer LIKE ? OR c.strasse LIKE ? 
+                            OR c.plz LIKE ? OR c.ort LIKE ? OR c.telefon LIKE ? 
+                            OR c.mobil LIKE ? OR c.email LIKE ? OR c.fachrichtung LIKE ?)
+                        ''')
+                        params.extend([f'%{term}%'] * 9)
+                else:
+                    term_conditions = []
+                    for term in search_terms:
+                        term_conditions.append('''
+                            (c.name LIKE ? OR c.nummer LIKE ? OR c.strasse LIKE ? 
+                            OR c.plz LIKE ? OR c.ort LIKE ? OR c.telefon LIKE ? 
+                            OR c.mobil LIKE ? OR c.email LIKE ? OR c.fachrichtung LIKE ?)
+                        ''')
+                        params.extend([f'%{term}%'] * 9)
+                    conditions.append('(' + ' OR '.join(term_conditions) + ')')
             
-        if name:
+            if name:
-            conditions.append('c.name LIKE ?')
+                conditions.append('c.name LIKE ?')
-            params.append(f'%{name}%')
+                params.append(f'%{name}%')
-        if ort:
+            if ort:
-            conditions.append('c.ort LIKE ?')
+                conditions.append('c.ort LIKE ?')
-            params.append(f'%{ort}%')
+                params.append(f'%{ort}%')
-        if nummer:
+            if nummer:
-            conditions.append('c.nummer LIKE ?')
+                conditions.append('c.nummer LIKE ?')
-            params.append(f'%{nummer}%')
+                params.append(f'%{nummer}%')
-        if plz:
+            if plz:
-            conditions.append('c.plz LIKE ?')
+                conditions.append('c.plz LIKE ?')
-            params.append(f'%{plz}%')
+                params.append(f'%{plz}%')
-        if fachrichtung:
+            if fachrichtung:
-            conditions.append('c.fachrichtung LIKE ?')
+                conditions.append('c.fachrichtung LIKE ?')
-            params.append(f'%{fachrichtung}%')
+                params.append(f'%{fachrichtung}%')
             
-        if conditions:
+            if conditions:
-            query += ' AND ' + ' AND '.join(conditions)
+                sql += ' AND ' + ' AND '.join(conditions)
         
-        c.execute(query, params)
+        # Füge Tag-Filter hinzu, wenn nicht 'all' ausgewählt ist
+        if tag != 'all':
+            sql += ' AND c.tag = ?'
+            params.append(tag)
+            
+        sql += ' ORDER BY c.name'
+        
+        c.execute(sql, params)
         results = c.fetchall()
         
-        # Formatiere die Ergebnisse
         formatted_results = []
         for row in results:
             customer = {
-                'id': row[0],
+                'nummer': row[0],
                 'name': row[1],
-                'nummer': row[2],
+                'strasse': row[2],
-                'strasse': row[3],
+                'plz': row[3],
-                'plz': row[4],
+                'ort': row[4],
-                'ort': row[5],
+                'telefon': row[5],
-                'telefon': row[6],
+                'mobil': row[6],
-                'mobil': row[7],
+                'email': row[7],
-                'email': row[8],
+                'fachrichtung': row[8],
-                'fachrichtung': row[9],
+                'tag': row[9]  # Tag-Feld hinzugefügt
-                'tag': row[10]
             }
             formatted_results.append(customer)
             
@@ -237,7 +261,7 @@ def search_customers():
         return jsonify(formatted_results)
         
     except Exception as e:
-        logger.error(f"Fehler bei der Suche: {str(e)}")
+        print(f"Fehler bei der Suche: {str(e)}")
         return jsonify({'error': str(e)}), 500
 
 def clean_dataframe(df):
@@ -329,12 +353,7 @@ def search_customers():
                 c.mobil,
                 c.email,
                 c.fachrichtung,
-                c.tag,
+                c.tag
-                CASE 
-                    WHEN c.tag = 'medisoft' THEN 'MEDISOFT'
-                    WHEN c.tag = 'mediconsult' THEN 'MEDICONSULT'
-                    ELSE c.tag
-                END as formatted_tag
             FROM customers c
             WHERE 1=1
         '''
@@ -420,7 +439,7 @@ def search_customers():
                 'mobil': row[6],
                 'email': row[7],
                 'fachrichtung': row[8],
-                'tag': row[10]  # Verwende den formatierten Tag
+                'tag': row[9]  # Tag-Feld hinzugefügt
             }
             formatted_results.append(customer)
             

templates/index.html

@@ -256,9 +256,12 @@
                     <div class="card-body">
                         <div class="d-flex justify-content-between align-items-start">
                             <h5 class="card-title">${customer.name}</h5>
-                            <button class="btn btn-sm btn-outline-primary" onclick="copyCustomerLink('${customer.nummer}')">
+                            <div class="d-flex align-items-center gap-2">
-                                <i class="fas fa-share-alt"></i> Teilen
+                                <span class="badge ${customer.tag === 'medisoft' ? 'bg-primary' : 'bg-warning text-dark'}">${customer.tag.toUpperCase()}</span>
-                            </button>
+                                <button class="btn btn-sm btn-outline-primary" onclick="copyCustomerLink('${customer.nummer}')">
+                                    <i class="fas fa-share-alt"></i> Teilen
+                                </button>
+                            </div>
                         </div>
                         <div class="card-text">
                             <p><strong>Nummer:</strong> ${customer.nummer}</p>
@@ -267,6 +270,7 @@
                             <p><strong>Mobil:</strong> ${createPhoneLink(customer.mobil)}</p>
                             <p><strong>E-Mail:</strong> ${createEmailLink(customer.email)}</p>
                             <p><strong>Fachrichtung:</strong> ${customer.fachrichtung}</p>
+                            <p><strong>Tag:</strong> ${customer.tag}</p>
                             ${customer.tags && customer.tags.length > 0 ? `
                                 <p><strong>Tags:</strong> 
                                     ${customer.tags.map(tag => `<span class="badge bg-primary me-1">${tag}</span>`).join('')}