elpatron/medi-customers
1
0
Fork 0
Code Issues Pull Requests Actions Packages Releases Activity

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

Browse Source
This commit is contained in:
elpatron
2025-03-19 14:07:58 +01:00
parent 465a6f058a
commit 10bf964911
2 changed files with 107 additions and 84 deletions
Download Patch File Download Diff File Expand all files Collapse all files

89
app.py
View File

@@ -138,23 +138,28 @@ def import_csv():
def search_customers():
try:
q = request.args.get('q', '')
if request.method == 'POST':
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')
conn = get_db_connection()
c = conn.cursor()
# Basis-SQL-Query
query = '''
SELECT DISTINCT
c.id,
c.name,
sql = '''
SELECT
c.nummer,
c.name,
c.strasse,
c.plz,
c.ort,
@@ -168,29 +173,43 @@ def search_customers():
'''
params = []
# Suchbedingungen
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 q:
search_terms = q.split()
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 ?
OR c.tag LIKE ?)
OR c.mobil LIKE ? OR c.email LIKE ? OR c.fachrichtung LIKE ?)
''')
params.extend([f'%{term}%'] * 10)
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 ?
OR c.tag LIKE ?)
OR c.mobil LIKE ? OR c.email LIKE ? OR c.fachrichtung LIKE ?)
''')
params.extend([f'%{term}%'] * 10)
params.extend([f'%{term}%'] * 9)
conditions.append('(' + ' OR '.join(term_conditions) + ')')
if name:
@@ -210,26 +229,31 @@ def search_customers():
params.append(f'%{fachrichtung}%')
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[3],
'plz': row[4],
'ort': row[5],
'telefon': row[6],
'mobil': row[7],
'email': row[8],
'fachrichtung': row[9],
'tag': row[10]
'strasse': row[2],
'plz': row[3],
'ort': row[4],
'telefon': row[5],
'mobil': row[6],
'email': row[7],
'fachrichtung': row[8],
'tag': row[9] # Tag-Feld hinzugefügt
}
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,
CASE
WHEN c.tag = 'medisoft' THEN 'MEDISOFT'
WHEN c.tag = 'mediconsult' THEN 'MEDICONSULT'
ELSE c.tag
END as formatted_tag
c.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)

4
templates/index.html
View File

@@ -256,10 +256,13 @@
<div class="card-body">
<div class="d-flex justify-content-between align-items-start">
<h5 class="card-title">${customer.name}</h5>
<div class="d-flex align-items-center gap-2">
<span class="badge ${customer.tag === 'medisoft' ? 'bg-primary' : 'bg-warning text-dark'}">${customer.tag.toUpperCase()}</span>
<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>
<p><strong>Adresse:</strong> ${customer.strasse}, ${customer.plz} ${customer.ort}</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('')}