Version 1.2.2: Verbesserte Telefonnummern-Formatierung

CHANGELOG.md

@@ -5,7 +5,23 @@ Alle wichtigen Änderungen an diesem Projekt werden in dieser Datei dokumentiert
 Das Format basiert auf [Keep a Changelog](https://keepachangelog.com/de/1.0.0/),
 und dieses Projekt adhäriert zu [Semantic Versioning](https://semver.org/lang/de/).
 
-## [v1.2.0] - 2024-03-18
+## [1.2.2] - 2024-03-19
+### Geändert
+- Verbesserte Telefonnummern-Formatierung: Führende "0" wird immer hinzugefügt, wenn der Benutzer von einer erlaubten IP-Adresse zugreift
+
+## [1.2.1] - 2024-03-18
+### Geändert
+- Verbesserte CSV-Import-Funktionalität mit pandas
+- Korrektur des Login-Prozesses
+- Verbesserte Fehlerbehandlung und Logging
+- Anpassung der Spaltennamen für den CSV-Import
+
+### Behoben
+- Login-Prozess funktioniert jetzt korrekt mit dem Passwort aus der .env Datei
+- CSV-Import verarbeitet Anführungszeichen korrekt
+- Verbesserte Fehlerbehandlung beim Datenbankimport
+
+## [1.2.0] - 2024-03-18
 
 ### Geändert
 - IP-Subnetz-Prüfung korrigiert (CIDR-Notation wird jetzt korrekt ausgewertet)

README.md

@@ -1,6 +1,6 @@
-# medisoftware Kundensuche
+# Medi-Customers
 
-Eine einfache Webanwendung zur Suche nach medisoftware Kunden mit IP-basierter Zugriffssteuerung.
+Eine Flask-basierte Webanwendung zur Verwaltung von Kundenkontakten für medizinische Einrichtungen.
 
 ## Features
 
@@ -51,7 +51,7 @@ Die Anwendung unterstützt CIDR-Notation für IP-Bereiche. Beispiele:
 
 ## Version
 
-Aktuelle Version: v1.2.0
+Aktuelle Version: 1.2.1
 
 ## Lizenz
 

templates/index.html

@@ -16,45 +16,52 @@
                 <img src="{{ url_for('static', filename='medisoftware_logo_rb_200.png') }}" alt="medisoftware Logo" class="img-fluid" style="max-width: 200px;">
             </div>
             <div class="search-container">
-                <h1 class="text-center mb-4">medisoftware Kundensuche</h1>
+                <h1 class="text-center mb-4">Kundensuche</h1>
                 
-                <div class="input-group mb-4 position-relative">
+                <div class="general-search mb-4">
-                    <input type="text" id="searchInput" class="form-control form-control-lg" 
+                    <div class="input-group">
-                           placeholder="Allgemeine Suche...">
+                        <input type="text" id="q" class="form-control form-control-lg" placeholder="Allgemeine Suche" oninput="searchCustomers()">
-                    <i class="fa-solid fa-xmark reset-icon" id="searchReset"></i>
+                        <i class="fas fa-times reset-icon" onclick="clearInput('q')"></i>
-                    <span class="search-icon">🔍</span>
+                        <i class="fas fa-search search-icon"></i>
+                    </div>
                 </div>
 
                 <div class="search-fields">
                     <div class="search-field">
-                        <input type="text" id="nameInput" class="form-control" 
+                        <div class="input-group">
-                               placeholder="Name...">
+                            <input type="text" id="nameInput" class="form-control" placeholder="Name" oninput="searchCustomers()">
-                        <i class="fa-solid fa-xmark reset-icon" id="nameReset"></i>
+                            <i class="fas fa-times reset-icon" onclick="clearInput('nameInput')"></i>
+                            <i class="fas fa-search search-icon"></i>
+                        </div>
                     </div>
+                    
                     <div class="search-field">
-                        <input type="text" id="ortInput" class="form-control" 
+                        <div class="input-group">
-                               placeholder="Ort...">
+                            <input type="text" id="ortInput" class="form-control" placeholder="Ort" oninput="searchCustomers()">
-                        <i class="fa-solid fa-xmark reset-icon" id="ortReset"></i>
+                            <i class="fas fa-times reset-icon" onclick="clearInput('ortInput')"></i>
+                            <i class="fas fa-search search-icon"></i>
+                        </div>
                     </div>
+                    
                     <div class="search-field">
-                        <input type="text" id="kundennummerInput" class="form-control" 
+                        <div class="input-group">
-                               placeholder="Kundennummer...">
+                            <input type="text" id="nummerInput" class="form-control" placeholder="Kundennummer" oninput="searchCustomers()">
-                        <i class="fa-solid fa-xmark reset-icon" id="kundennummerReset"></i>
+                            <i class="fas fa-times reset-icon" onclick="clearInput('nummerInput')"></i>
+                            <i class="fas fa-search search-icon"></i>
+                        </div>
                     </div>
+                    
                     <div class="search-field">
-                        <input type="text" id="fachrichtungInput" class="form-control" 
+                        <div class="input-group">
-                               placeholder="Fachrichtung...">
+                            <input type="text" id="plzInput" class="form-control" placeholder="PLZ" oninput="searchCustomers()">
-                        <i class="fa-solid fa-xmark reset-icon" id="fachrichtungReset"></i>
+                            <i class="fas fa-times reset-icon" onclick="clearInput('plzInput')"></i>
-                    </div>
+                            <i class="fas fa-search search-icon"></i>
-                    <div class="search-field">
+                        </div>
-                        <input type="text" id="telefonInput" class="form-control" 
-                               placeholder="Telefon...">
-                        <i class="fa-solid fa-xmark reset-icon" id="telefonReset"></i>
                     </div>
                 </div>
 
                 <div class="result-counts">
-                    <span id="generalCount" class="result-count"></span>
+                    <span id="resultCount" class="result-count"></span>
                 </div>
 
                 <div id="loading" class="loading">
@@ -63,21 +70,19 @@
                     </div>
                 </div>
 
-                <div id="results" class="mt-4">
+                <div id="results"></div>
-                    <!-- Hier werden die Suchergebnisse angezeigt -->
-                </div>
             </div>
         </div>
     </div>
 
     <div id="shareFeedback" class="share-feedback">
-        Link kopiert!
+        Link in die Zwischenablage kopiert!
     </div>
 
     <footer class="footer">
         <div class="footer-content">
             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.0</div>
+            <div style="font-size: 0.8em;">Version: v1.2.2</div>
         </div>
     </footer>
 
@@ -87,15 +92,45 @@
 
         function createPhoneLink(phone) {
             if (!phone) return 'N/A';
-            const cleaned = phone.replace(/[^\d+\s]/g, '');
+            
             const clientIP = '{{ request.headers.get("X-Forwarded-For", request.remote_addr) }}';
             const allowedIPRanges = '{{ allowed_ip_ranges }}'.split(',');
             
             // Überprüfen, ob die Client-IP in einem der erlaubten Bereiche liegt
-            const isAllowed = allowedIPRanges.some(range => clientIP.startsWith(range.trim()));
+            const isAllowed = allowedIPRanges.some(range => isIPInSubnet(clientIP, range.trim()));
             
-            const telLink = cleaned.startsWith('+') ? cleaned : (isAllowed ? '0' + cleaned.replace(/\s/g, '') : cleaned.replace(/\s/g, ''));
+            // Debug-Ausgabe für die IP-Bereiche
-            return `<a href="tel:${telLink}" class="phone-link">${phone}</a>`;
+            console.log('Client IP in createPhoneLink:', clientIP);
+            console.log('Allowed IP Ranges:', allowedIPRanges);
+            console.log('isAllowed in createPhoneLink:', isAllowed);
+            console.log('Original phone:', phone);
+            
+            // Entferne alle nicht-numerischen Zeichen
+            let cleanNumber = phone.replace(/\D/g, '');
+            console.log('Cleaned number:', cleanNumber);
+            
+            // Füge eine führende 0 hinzu, wenn isAllowed true ist
+            if (isAllowed) {
+                console.log('Adding leading 0 to:', cleanNumber);
+                cleanNumber = '0' + cleanNumber;
+                console.log('Number after adding 0:', cleanNumber);
+            }
+            
+            // Formatiere die Nummer
+            let formattedNumber = cleanNumber;
+            if (cleanNumber.length === 11) {
+                formattedNumber = cleanNumber.replace(/(\d{4})(\d{7})/, '$1-$2');
+            } else if (cleanNumber.length === 10) {
+                formattedNumber = cleanNumber.replace(/(\d{3})(\d{7})/, '$1-$2');
+            }
+            
+            console.log('Final formatted number:', formattedNumber);
+            console.log('Final clean number for tel link:', cleanNumber);
+            
+            // Erstelle den Link
+            const link = `<a href="tel:${cleanNumber}" class="phone-link">${formattedNumber}</a>`;
+            console.log('Final link:', link);
+            return link;
         }
 
         function createEmailLink(email) {
@@ -103,48 +138,10 @@
             return `<a href="mailto:${email}" class="email-link">${email}</a>`;
         }
 
-        function highlightText(text, searchTerms) {
+        function highlightText(text, searchTerm) {
-            // Konvertiere text zu String und prüfe auf null/undefined
+            if (!searchTerm) return text;
-            const textStr = String(text || '');
+            const regex = new RegExp(`(${searchTerm})`, 'gi');
-            if (!textStr || !searchTerms || searchTerms.length === 0) return textStr;
+            return text.replace(regex, '<mark>$1</mark>');
-            
-            // Escapen der Suchbegriffe für reguläre Ausdrücke
-            const escapedTerms = searchTerms.map(term => 
-                String(term || '').replace(/[.*+?^${}()|[\]\\]/g, '\\$&')
-            ).filter(term => term.length > 0);
-            
-            if (escapedTerms.length === 0) return textStr;
-            
-            // Erstelle einen temporären div-Element
-            const tempDiv = document.createElement('div');
-            tempDiv.innerHTML = textStr;
-            
-            // Funktion zum Hervorheben von Text
-            function highlightNode(node) {
-                if (node.nodeType === 3) { // Text node
-                    const text = node.textContent;
-                    let newText = text;
-                    
-                    escapedTerms.forEach(term => {
-                        const regex = new RegExp(`(${term})`, 'gi');
-                        newText = newText.replace(regex, '<mark>$1</mark>');
-                    });
-                    
-                    if (newText !== text) {
-                        const span = document.createElement('span');
-                        span.innerHTML = newText;
-                        node.parentNode.replaceChild(span, node);
-                    }
-                } else if (node.nodeType === 1) { // Element node
-                    // Überspringe mark-Tags und Links
-                    if (node.tagName !== 'MARK' && node.tagName !== 'A') {
-                        Array.from(node.childNodes).forEach(highlightNode);
-                    }
-                }
-            }
-            
-            highlightNode(tempDiv);
-            return tempDiv.innerHTML;
         }
 
         function createAddressLink(street, plz, city) {
@@ -236,154 +233,129 @@
         function updateResultCounts() {
             // Nur Gesamtzahl anzeigen
             const generalCount = lastResults.length;
-            document.getElementById('generalCount').textContent = 
+            document.getElementById('resultCount').textContent = 
                 generalCount > 0 ? `${generalCount} Treffer gefunden` : '';
-            document.getElementById('generalCount').classList.toggle('visible', generalCount > 0);
+            document.getElementById('resultCount').classList.toggle('visible', generalCount > 0);
         }
 
-        function searchCustomers() {
+        function displayResults(results) {
-            const query = document.getElementById('searchInput').value.trim();
+            const resultsDiv = document.getElementById('results');
-            const fachrichtung = document.getElementById('fachrichtungInput').value.trim();
+            resultsDiv.innerHTML = '';
-            const ort = document.getElementById('ortInput').value.trim();
-            const name = document.getElementById('nameInput').value.trim();
-            const telefon = document.getElementById('telefonInput').value.trim();
-            const kundennummer = document.getElementById('kundennummerInput')?.value.trim() || '';
             
-            // Sammle alle nicht-leeren Suchbegriffe
+            if (results.length === 0) {
-            const searchTerms = [query, fachrichtung, ort, name, telefon, kundennummer]
+                resultsDiv.innerHTML = '<p>Keine Ergebnisse gefunden.</p>';
-                .filter(term => term && term.length > 0);
-            
-            // Prüfe, ob alle Suchfelder leer sind
-            if (searchTerms.length === 0) {
-                const resultsDiv = document.getElementById('results');
-                const generalCount = document.getElementById('generalCount');
-                resultsDiv.innerHTML = '';
-                generalCount.textContent = '';
-                generalCount.classList.remove('visible');
                 return;
             }
             
-            const resultsDiv = document.getElementById('results');
+            const searchTerm = document.getElementById('q').value;
-            const loadingDiv = document.getElementById('loading');
-            loadingDiv.style.display = 'block';
-            resultsDiv.innerHTML = '';
             
-            const searchParams = new URLSearchParams();
+            results.forEach(customer => {
-            if (query) searchParams.append('q', query);
+                const card = document.createElement('div');
-            if (fachrichtung) searchParams.append('fachrichtung', fachrichtung);
+                card.className = 'customer-card';
-            if (ort) searchParams.append('ort', ort);
+                card.innerHTML = `
-            if (name) searchParams.append('name', name);
+                    <div class="customer-info">
-            if (telefon) searchParams.append('telefon', telefon);
+                        <h5 class="mb-1">${highlightText(customer.name, searchTerm)}</h5>
-            if (kundennummer) searchParams.append('kundennummer', kundennummer);
+                        <p class="mb-1 customer-number">${createCustomerLink(customer.nummer)}</p>
+                        <p class="mb-1">${createAddressLink(customer.strasse, customer.plz, customer.ort)}</p>
+                        <p class="mb-1">Tel: ${createPhoneLink(customer.telefon)}</p>
+                        ${customer.mobil ? `<p class="mb-1">Mobil: ${createPhoneLink(customer.mobil)}</p>` : ''}
+                        ${customer.email ? `<p class="mb-1">E-Mail: ${createEmailLink(customer.email)}</p>` : ''}
+                        ${customer.bemerkung ? `<p class="mb-1">Bemerkung: ${customer.bemerkung}</p>` : ''}
+                    </div>
+                    <div class="card-actions">
+                        <button class="share-button" onclick="copyCustomerLink('${customer.nummer}')">
+                            <i class="fas fa-share-alt"></i> Teilen
+                        </button>
+                    </div>
+                `;
+                resultsDiv.appendChild(card);
+            });
+        }
 
-            fetch(`/search?${searchParams.toString()}`)
+        function searchCustomers() {
+            const q = document.getElementById('q').value;
+            const name = document.getElementById('nameInput').value;
+            const ort = document.getElementById('ortInput').value;
+            const nummer = document.getElementById('nummerInput').value;
+            const plz = document.getElementById('plzInput').value;
+
+            // Zeige das Lade-Icon
+            document.getElementById('loading').style.display = 'block';
+
+            // Baue die Suchanfrage
+            const params = new URLSearchParams();
+            if (q) params.append('q', q);
+            if (name) params.append('name', name);
+            if (ort) params.append('ort', ort);
+            if (nummer) params.append('nummer', nummer);
+            if (plz) params.append('plz', plz);
+
+            // Führe die Suche durch
+            fetch('/search?' + params.toString())
                 .then(response => response.json())
                 .then(data => {
-                    resultsDiv.innerHTML = '';
+                    // Verstecke das Lade-Icon
+                    document.getElementById('loading').style.display = 'none';
                     
-                    // Prüfe, ob data ein Objekt mit results-Array ist
+                    if (data.error) {
-                    if (!data || !data.results || !Array.isArray(data.results)) {
+                        console.error('Fehler bei der Suche:', data.error);
-                        console.error('Unerwartetes Datenformat:', data);
-                        resultsDiv.innerHTML = '<div class="error">Unerwartetes Datenformat vom Server</div>';
                         return;
                     }
                     
-                    const results = data.results;
+                    lastResults = data;
-                    if (results.length === 0) {
+                    updateResultCounts();
-                        resultsDiv.innerHTML = '<div class="no-results">Keine Ergebnisse gefunden</div>';
-                    } else {
-                        results.forEach(customer => {
-                            const card = document.createElement('div');
-                            card.className = 'customer-card';
                     
-                            // Debug-Ausgabe für die Kundendaten
+                    const resultsDiv = document.getElementById('results');
-                            console.log('Kundendaten:', customer);
+                    resultsDiv.innerHTML = '';
-                            console.log('Alle verfügbaren Felder:', Object.keys(customer));
-                            console.log('Telefon-bezogene Felder:', {
-                                Telefon: customer.Telefon,
-                                Telefonnummer: customer.Telefonnummer,
-                                telefon: customer.telefon,
-                                telefonnummer: customer.telefonnummer,
-                                phone: customer.phone,
-                                'phone.number': customer.phone?.number
-                            });
                     
-                            // Erstelle die Adresse mit Hervorhebung
+                    if (data.length === 0) {
-                            const address = `${customer.Strasse || ''}, ${customer.PLZ || ''} ${customer.Ort || ''}`;
+                        resultsDiv.innerHTML = '<p class="text-center text-muted">Keine Ergebnisse gefunden</p>';
-                            const addressLink = createAddressLink(customer.Strasse, customer.PLZ, customer.Ort);
+                        return;
-                            const highlightedAddress = highlightText(addressLink, searchTerms);
+                    }
                     
-                            // Erstelle die Kundennummer mit Hervorhebung
+                    data.forEach(customer => {
-                            const highlightedNumber = highlightText(customer.Nummer, searchTerms);
+                        const card = document.createElement('div');
-                            const customerLink = createCustomerLink(customer.Nummer);
+                        card.className = 'customer-card';
-                            
+                        card.innerHTML = `
-                            // Erstelle die Telefonnummern mit Hervorhebung
+                            <div class="customer-info">
-                            let phoneNumber = '';
+                                <h5 class="mb-1">${highlightText(customer.name, q || name)}</h5>
-                            let companyPhone = '';
+                                <p class="mb-1 customer-number">${createCustomerLink(customer.nummer)}</p>
-                            let mobilePhone = '';
+                                <p class="mb-1">${createAddressLink(customer.strasse, customer.plz, customer.ort)}</p>
-                            
+                                <p class="mb-1">Tel: ${createPhoneLink(customer.telefon)}</p>
-                            if (typeof customer === 'object') {
+                                ${customer.mobil ? `<p class="mb-1">Mobil: ${createPhoneLink(customer.mobil)}</p>` : ''}
-                                phoneNumber = customer.Tel || '';
+                                ${customer.email ? `<p class="mb-1">E-Mail: ${createEmailLink(customer.email)}</p>` : ''}
-                                companyPhone = customer['Tele Firma'] || '';
+                                ${customer.bemerkung ? `<p class="mb-1">Bemerkung: ${customer.bemerkung}</p>` : ''}
-                                mobilePhone = customer.Handy || '';
+                            </div>
-                            }
+                            <div class="card-actions">
-                            
+                                <button class="share-button" onclick="copyCustomerLink('${customer.nummer}')">
-                            const phoneLink = createPhoneLink(phoneNumber);
-                            const companyPhoneLink = createPhoneLink(companyPhone);
-                            const mobilePhoneLink = createPhoneLink(mobilePhone);
-                            
-                            const highlightedPhone = highlightText(phoneLink, searchTerms);
-                            const highlightedCompanyPhone = highlightText(companyPhoneLink, searchTerms);
-                            const highlightedMobilePhone = highlightText(mobilePhoneLink, searchTerms);
-                            
-                            card.innerHTML = `
-                                <div class="customer-info">
-                                    <strong>Kundennummer:</strong> ${customerLink}<br>
-                                    <strong>Name:</strong> ${highlightText(`${customer.Vorname || ''} ${customer.Nachname || ''}`, searchTerms)}<br>
-                                    <strong>Fachrichtung:</strong> ${highlightText(customer.Fachrichtung || '', searchTerms)}<br>
-                                    <strong>Adresse:</strong> ${highlightedAddress}<br>
-                                    <strong>Telefon:</strong> ${highlightedPhone}<br>
-                                    <strong>Firma:</strong> ${highlightedCompanyPhone}<br>
-                                    <strong>Mobil:</strong> ${highlightedMobilePhone}
-                                </div>
-                                <button class="share-button" onclick="copyCustomerLink('${adjustCustomerNumber(customer.Nummer)}')">
                                     <i class="fas fa-share-alt"></i> Teilen
                                 </button>
-                            `;
+                            </div>
-                            resultsDiv.appendChild(card);
+                        `;
-                        });
+                        resultsDiv.appendChild(card);
-                    }
+                    });
-                    // Aktualisiere die Anzahl der Treffer
-                    const generalCount = document.getElementById('generalCount');
-                    generalCount.textContent = results.length > 0 ? `${results.length} Treffer gefunden` : '';
-                    generalCount.classList.toggle('visible', results.length > 0);
                 })
                 .catch(error => {
                     console.error('Fehler bei der Suche:', error);
-                    resultsDiv.innerHTML = '<div class="error">Ein Fehler ist aufgetreten</div>';
+                    document.getElementById('loading').style.display = 'none';
-                })
-                .finally(() => {
-                    loadingDiv.style.display = 'none';
                 });
         }
 
         // Event-Listener für die Live-Suche
         const searchInputs = [
+            document.getElementById('q'),
             document.getElementById('nameInput'),
             document.getElementById('ortInput'),
-            document.getElementById('kundennummerInput'),
+            document.getElementById('nummerInput'),
-            document.getElementById('fachrichtungInput'),
+            document.getElementById('plzInput')
-            document.getElementById('telefonInput'),
-            document.getElementById('searchInput')
         ];
 
         const resetIcons = [
-            document.getElementById('nameReset'),
+            document.querySelector('.reset-icon[onclick="clearInput(\'q\')"]'),
-            document.getElementById('ortReset'),
+            document.querySelector('.reset-icon[onclick="clearInput(\'nameInput\')"]'),
-            document.getElementById('kundennummerReset'),
+            document.querySelector('.reset-icon[onclick="clearInput(\'ortInput\')"]'),
-            document.getElementById('fachrichtungReset'),
+            document.querySelector('.reset-icon[onclick="clearInput(\'nummerInput\')"]'),
-            document.getElementById('telefonReset'),
+            document.querySelector('.reset-icon[onclick="clearInput(\'plzInput\')"]')
-            document.getElementById('searchReset')
         ];
 
         searchInputs.forEach((input, index) => {
@@ -408,18 +380,14 @@
             const name = urlParams.get('name');
             const ort = urlParams.get('ort');
             const kundennummer = urlParams.get('kundennummer');
-            const fachrichtung = urlParams.get('fachrichtung');
+            const plz = urlParams.get('plz');
-            const telefon = urlParams.get('telefon');
-            const query = urlParams.get('q');
 
             if (name) document.getElementById('nameInput').value = name;
             if (ort) document.getElementById('ortInput').value = ort;
-            if (kundennummer) document.getElementById('kundennummerInput').value = kundennummer;
+            if (kundennummer) document.getElementById('nummerInput').value = kundennummer;
-            if (fachrichtung) document.getElementById('fachrichtungInput').value = fachrichtung;
+            if (plz) document.getElementById('plzInput').value = plz;
-            if (telefon) document.getElementById('telefonInput').value = telefon;
-            if (query) document.getElementById('searchInput').value = query;
 
-            if (name || ort || kundennummer || fachrichtung || telefon || query) {
+            if (name || ort || kundennummer || plz) {
                 searchCustomers();
             }
         });