Compare commits
5 Commits
b89dd1be80
..
main
| Author | SHA1 | Date | |
|---|---|---|---|
| 746686b2f4 | |||
| 6cd737d988 | |||
| fcf16bb91a | |||
| 5989046b53 | |||
| 5b20729877 |
+9
-3
@@ -1,9 +1,15 @@
|
||||
# Kopieren nach .env und Werte anpassen. Ohne REDMINE_API_KEY startet der
|
||||
# Server im Trockenlauf und simuliert die Ticket-Anlage (gut zum UI-Testen).
|
||||
PORT=3000
|
||||
REDMINE_URL=https://redmine.unicon-gmbh.de/redmine
|
||||
REDMINE_API_KEY=
|
||||
REDMINE_PROJECT_ID=1
|
||||
REDMINE_TRACKER_ID=3
|
||||
CUSTOMER_FIELD_ID=5
|
||||
CUSTOMERS_FILE=./data/customers.csv
|
||||
#CUSTOMERS_REFRESH_MS=300000
|
||||
|
||||
# WAWIS-SQL-Server (jdbc:jtds:sqlserver://192.168.1.16:1433;databaseName=wawis)
|
||||
# Nur lesender Zugriff (SELECT auf kunde/kunzu) - Kundenstammdaten für die Ticket-Anlage
|
||||
DB_SERVER=192.168.1.16
|
||||
DB_PORT=1433
|
||||
DB_DATABASE=wawis
|
||||
DB_USER=report
|
||||
#DB_PASSWORD=
|
||||
|
||||
+1
-7
@@ -1,4 +1,5 @@
|
||||
node_modules
|
||||
data
|
||||
# docs
|
||||
|
||||
.vscode
|
||||
@@ -12,10 +13,3 @@ node_modules
|
||||
|
||||
Thumbs.db
|
||||
.DS_Store
|
||||
|
||||
# Playwright
|
||||
/test-results/
|
||||
/playwright-report/
|
||||
/blob-report/
|
||||
/playwright/.cache/
|
||||
/playwright/.auth/
|
||||
@@ -2,9 +2,10 @@
|
||||
|
||||
Vorgeschaltete Webseite für die Ticket-Anlage mit verpflichtendem Kundenbezug
|
||||
(Lösung #1 aus [redmine.unicon-gmbh.de](https://redmine.unicon-gmbh.de/redmine/issues/6)).
|
||||
Die Kundenauswahl läuft über ein Autocomplete gegen die eigenen Stammdaten.
|
||||
Die Kunden müssen also nicht als Auswahlliste in Redmine gepflegt werden.
|
||||
Die Kundennummer wird in ein Text-Custom-Field des Tickets geschrieben.
|
||||
Die Kundenauswahl läuft über ein Autocomplete gegen die Kundenstammdaten aus
|
||||
dem WAWIS-SQL-Server (nur lesender Zugriff). Die Kunden müssen also nicht als
|
||||
Auswahlliste in Redmine gepflegt werden. Die Kundennummer wird in ein
|
||||
Text-Custom-Field des Tickets geschrieben.
|
||||
|
||||
## Ablauf
|
||||
|
||||
@@ -37,13 +38,30 @@ Danach http://localhost:3000 öffnen.
|
||||
| REDMINE_PROJECT_ID | Ziel-Projekt für neue Tickets |
|
||||
| REDMINE_TRACKER_ID | Tracker (z. B. Support) |
|
||||
| CUSTOMER_FIELD_ID | ID des Custom Fields für die Kundennummer |
|
||||
| CUSTOMERS_FILE | CSV mit den Kundenstammdaten (Nummer;Name) |
|
||||
| CUSTOMERS_REFRESH_MS | Aktualisierungsintervall der Kundenliste in ms (Standard 300000 = 5 min) |
|
||||
| DB_SERVER | Host des WAWIS-SQL-Servers |
|
||||
| DB_PORT | Port des SQL-Servers (Standard 1433) |
|
||||
| DB_DATABASE | Datenbankname (wawis) |
|
||||
| DB_USER | SQL-User (report) |
|
||||
| DB_PASSWORD | Passwort des SQL-Users |
|
||||
|
||||
Die Feld-ID lässt sich per GET /custom_fields.json ermitteln.
|
||||
|
||||
## SQL-Server-Anbindung (WAWIS)
|
||||
|
||||
Die Kundenstammdaten (Nummer + Name) werden beim Start und danach alle
|
||||
`CUSTOMERS_REFRESH_MS` im Hintergrund aus dem WAWIS-SQL-Server geladen
|
||||
(`db.js`, Standard-Abfrage auf `kunde`/`kunzu`). Es wird ausschließlich
|
||||
gelesen (SELECT) – es gibt keinen Schreibzugriff auf die Datenbank.
|
||||
Gesperrte oder inaktive Kunden (`bsper`/`baktiv`) werden für die Auswahl
|
||||
ausgeblendet. Schlägt eine Aktualisierung fehl, bleibt die zuletzt geladene
|
||||
Liste aktiv.
|
||||
|
||||
Zugangsdaten stehen in `.env` (`DB_SERVER`, `DB_PORT`, `DB_DATABASE`, `DB_USER`,
|
||||
`DB_PASSWORD`).
|
||||
|
||||
## Nächste Schritte Richtung Produktion
|
||||
|
||||
- Kundenliste direkt aus CRM/ERP ziehen (DB-View oder Export per Cron)
|
||||
- Authentifizierung für die Mitarbeiter (z. B. LDAP/SSO im Reverse Proxy)
|
||||
- WS-Nummer als zweites Custom Field automatisch mitschreiben
|
||||
- HTTPS und Betrieb hinter dem vorhandenen Reverse Proxy
|
||||
|
||||
@@ -0,0 +1,49 @@
|
||||
import sql from "mssql";
|
||||
|
||||
// --- SQL-Server-Anbindung (WAWIS), siehe .env.example ---
|
||||
const sqlConfig = {
|
||||
server: process.env.DB_SERVER || "192.168.1.16",
|
||||
port: Number(process.env.DB_PORT) || 1433,
|
||||
database: process.env.DB_DATABASE || "wawis",
|
||||
user: process.env.DB_USER || "report",
|
||||
password: process.env.DB_PASSWORD || "",
|
||||
options: {
|
||||
encrypt: false,
|
||||
trustServerCertificate: true,
|
||||
},
|
||||
};
|
||||
|
||||
let poolPromise;
|
||||
|
||||
function getPool() {
|
||||
if (!poolPromise) {
|
||||
poolPromise = new sql.ConnectionPool(sqlConfig).connect().catch((error) => {
|
||||
poolPromise = undefined;
|
||||
throw error;
|
||||
});
|
||||
}
|
||||
return poolPromise;
|
||||
}
|
||||
|
||||
// Nur lesender Zugriff (SELECT) - der SQL-Server wird von diesem Portal nie beschrieben.
|
||||
// gesperrt/inaktiv kommt aus T kunzu als Text ('ja'/'nein')
|
||||
const CUSTOMERS_QUERY = `
|
||||
SELECT
|
||||
kunde.debez
|
||||
, kunde.debnr
|
||||
, kunde.kg_id as kg_id
|
||||
, kunde.kugru as kugru
|
||||
, sydat as sydat
|
||||
, datlv as datlv
|
||||
, fibuk as fibuk
|
||||
, RTRIM(bsper) as bsper
|
||||
, RTRIM(baktiv) as baktiv
|
||||
FROM kunde
|
||||
INNER JOIN kunzu ON kunzu.ku_id = kunde.ku_id
|
||||
`;
|
||||
|
||||
export async function fetchCustomersFromSql() {
|
||||
const pool = await getPool();
|
||||
const result = await pool.request().query(CUSTOMERS_QUERY);
|
||||
return result.recordset;
|
||||
}
|
||||
Generated
+902
-1
File diff suppressed because it is too large
Load Diff
+7
-3
@@ -8,10 +8,14 @@
|
||||
"dev": "node --env-file=.env server.js & sleep 1 && xdg-open http://localhost:3000",
|
||||
"dev:dry": "node server.js & sleep 1 && xdg-open http://localhost:3000",
|
||||
"start": "node --env-file=.env server.js",
|
||||
"prod": "NODE_ENV=production node --env-file=.env server.js"
|
||||
"prod": "NODE_ENV=production node --env-file=.env server.js",
|
||||
"stop": "pkill -f 'node --env-file=.env server.js' || true"
|
||||
},
|
||||
"engines": {
|
||||
"node": ">=20"
|
||||
},
|
||||
"engines": { "node": ">=20" },
|
||||
"dependencies": {
|
||||
"express": "^4.19.0"
|
||||
"express": "^4.19.0",
|
||||
"mssql": "^12.7.0"
|
||||
}
|
||||
}
|
||||
|
||||
+20
-4
@@ -20,8 +20,26 @@
|
||||
<label for="customerSearch">Kundennummer oder Firmenname</label>
|
||||
<input type="text" id="customerSearch" autocomplete="off" role="combobox"
|
||||
aria-expanded="false" aria-controls="suggestions"
|
||||
placeholder="z. B. K-10042 oder Mueller">
|
||||
placeholder="z. B. K-10042 oder Müller">
|
||||
<div class="suggestions" id="suggestions" role="listbox"></div>
|
||||
|
||||
<label class="checkbox-row">
|
||||
<input type="checkbox" id="advancedToggle">
|
||||
Erweitert
|
||||
</label>
|
||||
<div id="advancedFields" hidden>
|
||||
<div class="field-group" role="group" aria-label="Erweiterte Suchfelder">
|
||||
<button type="button" class="field-toggle" data-field="kugru" aria-pressed="false">Kundengruppe</button>
|
||||
<button type="button" class="field-toggle" data-field="kg_id" aria-pressed="false">Kundengruppen-ID</button>
|
||||
<button type="button" class="field-toggle" data-field="sydat" aria-pressed="false">Erstellt am</button>
|
||||
<button type="button" class="field-toggle" data-field="datlv" aria-pressed="false">Letzte Änderung</button>
|
||||
<button type="button" class="field-toggle" data-field="fibuk" aria-pressed="false">Fibu-Konto</button>
|
||||
</div>
|
||||
<label class="checkbox-row">
|
||||
<input type="checkbox" id="applyExtraValues">
|
||||
Erweiterte Werte übernehmen
|
||||
</label>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<div class="customer-chip" id="customerChip">
|
||||
@@ -35,7 +53,7 @@
|
||||
<div class="step-label"><span class="num">2</span> Anliegen</div>
|
||||
|
||||
<label for="subject">Betreff</label>
|
||||
<input type="text" id="subject" maxlength="200" placeholder="Kurze Zusammenfassung der Störung">
|
||||
<input type="text" id="subject" maxlength="200" placeholder="Kurze Zusammenfassung">
|
||||
|
||||
<label for="description">Beschreibung</label>
|
||||
<textarea id="description" placeholder="Was ist passiert? Fehlermeldungen, betroffene Systeme, Ansprechpartner ..."></textarea>
|
||||
@@ -45,8 +63,6 @@
|
||||
</div>
|
||||
<div class="feedback" id="feedback"></div>
|
||||
</section>
|
||||
|
||||
<footer>Der Kundenbezug wird serverseitig gegen die Stammdaten geprüft, bevor das Ticket erstellt wird.</footer>
|
||||
</main>
|
||||
|
||||
<script src="index.js"></script>
|
||||
|
||||
+72
-4
@@ -4,6 +4,10 @@
|
||||
const searchInput = document.getElementById("customerSearch");
|
||||
const searchWrap = document.getElementById("searchWrap");
|
||||
const suggestionsBox = document.getElementById("suggestions");
|
||||
const advancedToggle = document.getElementById("advancedToggle");
|
||||
const advancedFields = document.getElementById("advancedFields");
|
||||
const fieldToggleButtons = Array.from(document.querySelectorAll(".field-toggle"));
|
||||
const applyExtraValuesToggle = document.getElementById("applyExtraValues");
|
||||
const customerChip = document.getElementById("customerChip");
|
||||
const chipNumber = document.getElementById("chipNumber");
|
||||
const chipName = document.getElementById("chipName");
|
||||
@@ -16,8 +20,42 @@
|
||||
|
||||
let selectedCustomer = null;
|
||||
let currentResults = [];
|
||||
let currentQuery = "";
|
||||
let activeIndex = -1;
|
||||
let debounceTimer = null;
|
||||
const selectedFields = new Set();
|
||||
|
||||
function appendHighlighted(target, text, query) {
|
||||
const words = (query || "").toLowerCase().split(/\s+/).filter(Boolean);
|
||||
if (words.length === 0) { target.appendChild(document.createTextNode(text)); return; }
|
||||
|
||||
const lowerText = text.toLowerCase();
|
||||
const mask = new Array(text.length).fill(false);
|
||||
for (const word of words) {
|
||||
let fromIndex = 0;
|
||||
let matchIndex;
|
||||
while ((matchIndex = lowerText.indexOf(word, fromIndex)) !== -1) {
|
||||
for (let i = matchIndex; i < matchIndex + word.length; i++) { mask[i] = true; }
|
||||
fromIndex = matchIndex + 1;
|
||||
}
|
||||
}
|
||||
|
||||
let i = 0;
|
||||
while (i < text.length) {
|
||||
const highlighted = mask[i];
|
||||
let j = i;
|
||||
while (j < text.length && mask[j] === highlighted) { j++; }
|
||||
const chunk = text.slice(i, j);
|
||||
if (highlighted) {
|
||||
const strong = document.createElement("strong");
|
||||
strong.textContent = chunk;
|
||||
target.appendChild(strong);
|
||||
} else {
|
||||
target.appendChild(document.createTextNode(chunk));
|
||||
}
|
||||
i = j;
|
||||
}
|
||||
}
|
||||
|
||||
function updateSubmitState() {
|
||||
const subjectOk = subjectInput.value.trim().length >= 5;
|
||||
@@ -46,9 +84,12 @@
|
||||
item.innerHTML = "";
|
||||
const numberSpan = document.createElement("span");
|
||||
numberSpan.className = "cnum";
|
||||
numberSpan.textContent = customer.number;
|
||||
appendHighlighted(numberSpan, customer.number, currentQuery);
|
||||
const nameSpan = document.createElement("span");
|
||||
nameSpan.textContent = customer.name;
|
||||
appendHighlighted(nameSpan, customer.name, currentQuery);
|
||||
if (customer.extraMatches && customer.extraMatches.length > 0) {
|
||||
nameSpan.appendChild(document.createTextNode(` (${customer.extraMatches.join(", ")})`));
|
||||
}
|
||||
item.appendChild(numberSpan);
|
||||
item.appendChild(nameSpan);
|
||||
item.addEventListener("click", () => selectCustomer(customer));
|
||||
@@ -60,8 +101,13 @@
|
||||
}
|
||||
|
||||
async function runSearch(query) {
|
||||
currentQuery = query;
|
||||
try {
|
||||
const response = await fetch("/api/customers?search=" + encodeURIComponent(query));
|
||||
const params = new URLSearchParams({ search: query });
|
||||
if (advancedToggle.checked && selectedFields.size > 0) {
|
||||
params.set("fields", Array.from(selectedFields).join(","));
|
||||
}
|
||||
const response = await fetch("/api/customers?" + params.toString());
|
||||
const payload = await response.json();
|
||||
currentResults = payload.results;
|
||||
activeIndex = currentResults.length > 0 ? 0 : -1;
|
||||
@@ -75,7 +121,10 @@
|
||||
function selectCustomer(customer) {
|
||||
selectedCustomer = customer;
|
||||
chipNumber.textContent = customer.number;
|
||||
chipName.textContent = customer.name;
|
||||
const useExtraValues = applyExtraValuesToggle.checked && customer.extraMatches && customer.extraMatches.length > 0;
|
||||
chipName.textContent = useExtraValues
|
||||
? `${customer.name} (${customer.extraMatches.join(", ")})`
|
||||
: customer.name;
|
||||
customerChip.classList.add("visible");
|
||||
searchWrap.style.display = "none";
|
||||
closeSuggestions();
|
||||
@@ -123,6 +172,25 @@
|
||||
if (!searchWrap.contains(event.target)) { closeSuggestions(); }
|
||||
});
|
||||
|
||||
advancedToggle.addEventListener("change", () => {
|
||||
advancedFields.hidden = !advancedToggle.checked;
|
||||
if (!advancedToggle.checked) {
|
||||
selectedFields.clear();
|
||||
fieldToggleButtons.forEach((button) => button.setAttribute("aria-pressed", "false"));
|
||||
}
|
||||
if (currentQuery.length >= 2) { runSearch(currentQuery); }
|
||||
});
|
||||
|
||||
fieldToggleButtons.forEach((button) => {
|
||||
button.addEventListener("click", () => {
|
||||
const field = button.dataset.field;
|
||||
const isPressed = button.getAttribute("aria-pressed") === "true";
|
||||
button.setAttribute("aria-pressed", String(!isPressed));
|
||||
if (isPressed) { selectedFields.delete(field); } else { selectedFields.add(field); }
|
||||
if (currentQuery.length >= 2) { runSearch(currentQuery); }
|
||||
});
|
||||
});
|
||||
|
||||
chipReset.addEventListener("click", resetCustomer);
|
||||
subjectInput.addEventListener("input", updateSubmitState);
|
||||
|
||||
|
||||
@@ -174,6 +174,55 @@ textarea {
|
||||
font-size: 0.9rem;
|
||||
}
|
||||
|
||||
.checkbox-row {
|
||||
display: flex;
|
||||
align-items: center;
|
||||
gap: 8px;
|
||||
margin: 14px 0 0;
|
||||
font-size: 0.9rem;
|
||||
font-weight: 600;
|
||||
cursor: pointer;
|
||||
}
|
||||
|
||||
.checkbox-row input[type="checkbox"] {
|
||||
width: 16px;
|
||||
height: 16px;
|
||||
accent-color: var(--accent);
|
||||
cursor: pointer;
|
||||
}
|
||||
|
||||
.field-group {
|
||||
display: flex;
|
||||
flex-wrap: wrap;
|
||||
gap: 8px;
|
||||
margin-top: 10px;
|
||||
}
|
||||
|
||||
.field-group[hidden] {
|
||||
display: none;
|
||||
}
|
||||
|
||||
.field-toggle {
|
||||
font: inherit;
|
||||
font-size: 0.85rem;
|
||||
padding: 6px 12px;
|
||||
border: 1px solid var(--line);
|
||||
border-radius: 999px;
|
||||
background: var(--surface);
|
||||
color: var(--ink-soft);
|
||||
cursor: pointer;
|
||||
}
|
||||
|
||||
.field-toggle:hover {
|
||||
border-color: var(--accent);
|
||||
}
|
||||
|
||||
.field-toggle[aria-pressed="true"] {
|
||||
background: var(--accent);
|
||||
border-color: var(--accent);
|
||||
color: #fff;
|
||||
}
|
||||
|
||||
/* Gewaehlter Kunde als Chip */
|
||||
.customer-chip {
|
||||
display: none;
|
||||
|
||||
@@ -1,7 +1,7 @@
|
||||
import express from "express";
|
||||
import fs from "node:fs";
|
||||
import path from "node:path";
|
||||
import { fileURLToPath } from "node:url";
|
||||
import { fetchCustomersFromSql } from "./db.js";
|
||||
|
||||
const __dirname = path.dirname(fileURLToPath(import.meta.url));
|
||||
|
||||
@@ -13,48 +13,83 @@ const config = {
|
||||
projectId: Number(process.env.REDMINE_PROJECT_ID) || 1,
|
||||
trackerId: Number(process.env.REDMINE_TRACKER_ID) || 3,
|
||||
customerFieldId: Number(process.env.CUSTOMER_FIELD_ID) || 5,
|
||||
customersFile: process.env.CUSTOMERS_FILE || path.join(__dirname, "data", "customers.csv"),
|
||||
customersRefreshMs: Number(process.env.CUSTOMERS_REFRESH_MS) || 5 * 60 * 1000,
|
||||
};
|
||||
|
||||
// Ohne API-Key läuft der Server im Trockenlauf: Tickets werden nur simuliert.
|
||||
const dryRun = config.redmineApiKey === "";
|
||||
|
||||
// --- Kundenstammdaten laden (CSV: Kundennummer;Firmenname) ---
|
||||
function loadCustomers(filePath) {
|
||||
const rawContent = fs.readFileSync(filePath, "utf8");
|
||||
return rawContent
|
||||
.split(/\r?\n/)
|
||||
.map((line) => line.trim())
|
||||
.filter((line) => line !== "" && !line.startsWith("#"))
|
||||
.map((line) => {
|
||||
const [number, ...nameParts] = line.split(";");
|
||||
return { number: number.trim(), name: nameParts.join(";").trim() };
|
||||
})
|
||||
// --- Kundenstammdaten aus dem WAWIS-SQL-Server (nur lesend, siehe db.js) ---
|
||||
// gesperrte/inaktive Kunden werden für die Ticket-Anlage ausgeblendet
|
||||
let customers = [];
|
||||
let customersByNumber = new Map();
|
||||
|
||||
// Felder, die zusätzlich zu Nummer/Name über die erweiterte Suche durchsucht werden können
|
||||
const ADVANCED_SEARCH_FIELDS = ["kugru", "kg_id", "sydat", "datlv", "fibuk"];
|
||||
|
||||
function applyCustomers(rows) {
|
||||
customers = rows
|
||||
.filter((row) => row.baktiv === "ja" && row.bsper !== "ja")
|
||||
.map((row) => ({
|
||||
number: String(row.debnr).trim(),
|
||||
name: String(row.debez || "").trim(),
|
||||
kugru: row.kugru,
|
||||
kg_id: row.kg_id,
|
||||
sydat: row.sydat,
|
||||
datlv: row.datlv,
|
||||
fibuk: row.fibuk,
|
||||
}))
|
||||
.filter((customer) => customer.number !== "" && customer.name !== "");
|
||||
customersByNumber = new Map(customers.map((customer) => [customer.number, customer]));
|
||||
}
|
||||
|
||||
async function refreshCustomers() {
|
||||
const rows = await fetchCustomersFromSql();
|
||||
applyCustomers(rows);
|
||||
console.log(`${customers.length} aktive Kunden aus dem SQL-Server geladen`);
|
||||
}
|
||||
|
||||
let customers = [];
|
||||
try {
|
||||
customers = loadCustomers(config.customersFile);
|
||||
console.log(`${customers.length} Kunden aus ${config.customersFile} geladen`);
|
||||
await refreshCustomers();
|
||||
} catch (error) {
|
||||
console.error(`Kundendatei konnte nicht gelesen werden: ${error.message}`);
|
||||
console.error(`Kundendaten konnten nicht vom SQL-Server geladen werden: ${error.message}`);
|
||||
process.exit(1);
|
||||
}
|
||||
|
||||
const customersByNumber = new Map(customers.map((customer) => [customer.number, customer]));
|
||||
// Periodische Aktualisierung im Hintergrund; bei Fehler bleiben die alten Daten aktiv.
|
||||
setInterval(() => {
|
||||
refreshCustomers().catch((error) => {
|
||||
console.error(`Aktualisierung der Kundendaten fehlgeschlagen, alte Daten bleiben aktiv: ${error.message}`);
|
||||
});
|
||||
}, config.customersRefreshMs);
|
||||
|
||||
// --- Suche: Treffer am Wortanfang zuerst, dann Teilstring-Treffer ---
|
||||
function searchCustomers(query, limit) {
|
||||
const needle = query.toLocaleLowerCase("de-DE");
|
||||
// extraFields (aus ADVANCED_SEARCH_FIELDS) erweitert die durchsuchten Werte um Felder aus der Abfrage
|
||||
// Bei mehreren durch Leerzeichen getrennten Wörtern müssen alle Wörter im Treffer vorkommen (UND-Verknüpfung)
|
||||
function searchCustomers(query, extraFields, limit) {
|
||||
const words = query.toLocaleLowerCase("de-DE").split(/\s+/).filter(Boolean);
|
||||
const startMatches = [];
|
||||
const partialMatches = [];
|
||||
|
||||
for (const customer of customers) {
|
||||
const haystack = `${customer.number} ${customer.name}`.toLocaleLowerCase("de-DE");
|
||||
if (!haystack.includes(needle)) continue;
|
||||
const isStartMatch = haystack.startsWith(needle) || haystack.includes(` ${needle}`);
|
||||
if (isStartMatch) { startMatches.push(customer); } else { partialMatches.push(customer); }
|
||||
const haystackParts = [customer.number, customer.name];
|
||||
for (const field of extraFields) {
|
||||
if (customer[field] !== undefined && customer[field] !== null) {
|
||||
haystackParts.push(String(customer[field]));
|
||||
}
|
||||
}
|
||||
const haystack = haystackParts.join(" ").toLocaleLowerCase("de-DE");
|
||||
if (!words.every((word) => haystack.includes(word))) continue;
|
||||
|
||||
// Werte aller ausgewählten erweiterten Felder, unabhängig davon, welches Wort den Treffer ausgelöst hat
|
||||
const extraMatches = extraFields
|
||||
.map((field) => customer[field])
|
||||
.filter((value) => value !== undefined && value !== null && String(value).trim() !== "")
|
||||
.map((value) => String(value));
|
||||
|
||||
const match = { number: customer.number, name: customer.name, extraMatches };
|
||||
const isStartMatch = words.every((word) => haystack.startsWith(word) || haystack.includes(` ${word}`));
|
||||
if (isStartMatch) { startMatches.push(match); } else { partialMatches.push(match); }
|
||||
if (startMatches.length >= limit) break;
|
||||
}
|
||||
|
||||
@@ -103,7 +138,16 @@ app.get("/api/customers", (request, response) => {
|
||||
if (query.length < 2) {
|
||||
return response.json({ results: [], total: customers.length });
|
||||
}
|
||||
const results = searchCustomers(query, 12);
|
||||
const extraFields = String(request.query.fields || "")
|
||||
.split(",")
|
||||
.map((field) => field.trim())
|
||||
.filter((field) => ADVANCED_SEARCH_FIELDS.includes(field));
|
||||
const matches = searchCustomers(query, extraFields, 12);
|
||||
const results = matches.map((customer) => ({
|
||||
number: customer.number,
|
||||
name: customer.name,
|
||||
extraMatches: customer.extraMatches,
|
||||
}));
|
||||
return response.json({ results, total: customers.length });
|
||||
});
|
||||
|
||||
|
||||
Reference in New Issue
Block a user