Spaltennamen an CSV-Datei angepasst
This commit is contained in:
16
app.py
16
app.py
@@ -89,18 +89,22 @@ def search():
|
|||||||
if not any([name, ort, kundennummer, fachrichtung, telefon]) and query:
|
if not any([name, ort, kundennummer, fachrichtung, telefon]) and query:
|
||||||
# Suche in allen relevanten Feldern
|
# Suche in allen relevanten Feldern
|
||||||
mask = (
|
mask = (
|
||||||
df['Name'].str.contains(query, case=False, na=False) |
|
df['Vorname'].str.contains(query, case=False, na=False) |
|
||||||
|
df['Nachname'].str.contains(query, case=False, na=False) |
|
||||||
df['Ort'].str.contains(query, case=False, na=False) |
|
df['Ort'].str.contains(query, case=False, na=False) |
|
||||||
df['Kundennummer'].astype(str).str.contains(query, case=False, na=False) |
|
df['Nummer'].astype(str).str.contains(query, case=False, na=False) |
|
||||||
df['Fachrichtung'].str.contains(query, case=False, na=False) |
|
df['Fachrichtung'].str.contains(query, case=False, na=False) |
|
||||||
df['Telefon'].astype(str).str.contains(query, case=False, na=False)
|
df['Tel'].astype(str).str.contains(query, case=False, na=False)
|
||||||
)
|
)
|
||||||
else:
|
else:
|
||||||
# Spezifische Suche
|
# Spezifische Suche
|
||||||
mask = pd.Series(True, index=df.index)
|
mask = pd.Series(True, index=df.index)
|
||||||
|
|
||||||
if name:
|
if name:
|
||||||
name_mask = df['Name'].str.contains(name, case=False, na=False)
|
name_mask = (
|
||||||
|
df['Vorname'].str.contains(name, case=False, na=False) |
|
||||||
|
df['Nachname'].str.contains(name, case=False, na=False)
|
||||||
|
)
|
||||||
mask &= name_mask
|
mask &= name_mask
|
||||||
|
|
||||||
if ort:
|
if ort:
|
||||||
@@ -108,7 +112,7 @@ def search():
|
|||||||
mask &= ort_mask
|
mask &= ort_mask
|
||||||
|
|
||||||
if kundennummer:
|
if kundennummer:
|
||||||
kundennummer_mask = df['Kundennummer'].astype(str).str.contains(kundennummer, case=False, na=False)
|
kundennummer_mask = df['Nummer'].astype(str).str.contains(kundennummer, case=False, na=False)
|
||||||
mask &= kundennummer_mask
|
mask &= kundennummer_mask
|
||||||
|
|
||||||
if fachrichtung:
|
if fachrichtung:
|
||||||
@@ -116,7 +120,7 @@ def search():
|
|||||||
mask &= fachrichtung_mask
|
mask &= fachrichtung_mask
|
||||||
|
|
||||||
if telefon:
|
if telefon:
|
||||||
telefon_mask = df['Telefon'].astype(str).str.contains(telefon, case=False, na=False)
|
telefon_mask = df['Tel'].astype(str).str.contains(telefon, case=False, na=False)
|
||||||
mask &= telefon_mask
|
mask &= telefon_mask
|
||||||
|
|
||||||
results = df[mask].to_dict('records')
|
results = df[mask].to_dict('records')
|
||||||
|
@@ -336,13 +336,20 @@
|
|||||||
card.className = 'card result-card';
|
card.className = 'card result-card';
|
||||||
card.innerHTML = `
|
card.innerHTML = `
|
||||||
<div class="card-body">
|
<div class="card-body">
|
||||||
<h5 class="card-title">
|
<h5 class="card-title">${customer.Vorname} ${customer.Nachname}</h5>
|
||||||
${customer.Vorname} ${customer.Nachname}
|
|
||||||
<span class="customer-number ms-2">(Kunde: ${createCustomerLink(customer.Nummer)})</span>
|
|
||||||
</h5>
|
|
||||||
<p class="card-text">
|
<p class="card-text">
|
||||||
|
<strong>Kundennummer:</strong> ${customer.Nummer}<br>
|
||||||
<strong>Fachrichtung:</strong> ${customer.Fachrichtung || 'N/A'}<br>
|
<strong>Fachrichtung:</strong> ${customer.Fachrichtung || 'N/A'}<br>
|
||||||
<strong>Adresse:</strong> ${createAddressLink(customer.Strasse, customer.PLZ, customer.Ort)}<br>
|
<strong>Adresse:</strong> ${createAddressLink(customer.Strasse, customer.PLZ, customer.Ort)}
|
||||||
|
${customer.weather ? `
|
||||||
|
<span class="weather-info">
|
||||||
|
<img src="http://openweathermap.org/img/wn/${customer.weather.icon}@2x.png"
|
||||||
|
alt="${customer.weather.description}"
|
||||||
|
title="${customer.weather.description}">
|
||||||
|
${customer.weather.temperature}°C
|
||||||
|
</span>
|
||||||
|
` : ''}
|
||||||
|
<br>
|
||||||
<strong>Telefon:</strong> ${createPhoneLink(customer.Tel)}<br>
|
<strong>Telefon:</strong> ${createPhoneLink(customer.Tel)}<br>
|
||||||
<strong>E-Mail:</strong> ${createEmailLink(customer.mail)}
|
<strong>E-Mail:</strong> ${createEmailLink(customer.mail)}
|
||||||
</p>
|
</p>
|
||||||
|
Reference in New Issue
Block a user