Korrektur der Feldreihenfolge in den Suchergebnissen und Verbesserung der Tag-Anzeige

app.py

@@ -297,22 +297,138 @@ def index():
     logger.info(f"Erlaubte IP-Bereiche: {allowed_ip_ranges}")
     return render_template('index.html', allowed_ip_ranges=allowed_ip_ranges)
 
-@app.route('/search')
+@app.route('/search', methods=['GET', 'POST'])
-def search():
+def search_customers():
     try:
-        # Führe die Suche durch und hole die Ergebnisse
+        if request.method == 'POST':
-        results = search_customers()
+            data = request.get_json()
+            query = data.get('query', '')
+            tag = data.get('tag', 'medisoft')
+        else:
+            query = request.args.get('q', '')
+            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')
             
-        # Wenn results ein Response-Objekt ist, geben wir es direkt zurück
+        conn = get_db_connection()
-        if isinstance(results, tuple):
+        c = conn.cursor()
-            return results
         
-        # Protokolliere die Anzahl der gefundenen Ergebnisse
+        # Basis-SQL-Query
-        logger.info(f'Suchergebnisse gefunden: {len(results.get_json())}')
+        sql = '''
+            SELECT 
+                c.nummer,
+                c.name,
+                c.strasse,
+                c.plz,
+                c.ort,
+                c.telefon,
+                c.mobil,
+                c.email,
+                c.fachrichtung,
+                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
+        '''
+        params = []
+        
+        if request.method == 'POST':
+            if query:
+                sql += ''' AND (
+                    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 ?
+                )'''
+                search_pattern = f'%{query}%'
+                params.extend([search_pattern] * 9)
+        else:
+            # Suchbedingungen für GET-Request
+            conditions = []
+            if query:
+                search_terms = query.split()
+                if operator == 'and':
+                    for term in search_terms:
+                        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)
+                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:
+                conditions.append('c.name LIKE ?')
+                params.append(f'%{name}%')
+            if ort:
+                conditions.append('c.ort LIKE ?')
+                params.append(f'%{ort}%')
+            if nummer:
+                conditions.append('c.nummer LIKE ?')
+                params.append(f'%{nummer}%')
+            if plz:
+                conditions.append('c.plz LIKE ?')
+                params.append(f'%{plz}%')
+            if fachrichtung:
+                conditions.append('c.fachrichtung LIKE ?')
+                params.append(f'%{fachrichtung}%')
+            
+            if conditions:
+                sql += ' AND ' + ' AND '.join(conditions)
+        
+        # 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()
+        
+        formatted_results = []
+        for row in results:
+            customer = {
+                'nummer': row[0],
+                'name': row[1],
+                'strasse': row[2],
+                'plz': row[3],
+                'ort': row[4],
+                'telefon': row[5],
+                'mobil': row[6],
+                'email': row[7],
+                'fachrichtung': row[8],
+                'tag': row[10]  # Verwende den formatierten Tag
+            }
+            formatted_results.append(customer)
+            
+        conn.close()
+        return jsonify(formatted_results)
         
-        return 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 init_app(app):

templates/index.html

@@ -76,6 +76,16 @@
                             <i class="fas fa-search search-icon"></i>
                         </div>
                     </div>
+
+                    <div class="search-field">
+                        <div class="input-group">
+                            <select id="tagFilter" class="form-select" onchange="searchCustomers()">
+                                <option value="medisoft" selected>MEDISOFT</option>
+                                <option value="mediconsult">MEDICONSULT</option>
+                                <option value="all">Alle</option>
+                            </select>
+                        </div>
+                    </div>
                 </div>
 
                 <div class="result-counts">
@@ -277,6 +287,7 @@
             const plz = document.getElementById('plzInput').value;
             const fachrichtung = document.getElementById('fachrichtungInput').value;
             const searchOperator = document.querySelector('input[name="searchOperator"]:checked').value;
+            const selectedTag = document.getElementById('tagFilter').value;
 
             // Zeige das Lade-Icon
             document.getElementById('loading').style.display = 'block';
@@ -290,6 +301,7 @@
             if (plz) params.append('plz', plz);
             if (fachrichtung) params.append('fachrichtung', fachrichtung);
             if (searchOperator) params.append('operator', searchOperator);
+            if (selectedTag) params.append('tag', selectedTag);
 
             // Führe die Suche durch
             fetch('/search?' + params.toString())