torsten/yourpart3
1
0
Fork 0
Code Issues 1 Pull Requests Actions Packages Projects Releases Wiki Activity

Update falukantService and MessagesDialog for improved data handling and parameter extraction

Browse Source 
- Changed the join in falukantService from 'title_of_nobility' to 'title' for better clarity in data relationships.
- Enhanced MessagesDialog.vue to directly extract parameters from parsed data when no value object is present, improving the handling of character-related parameters and ensuring backend names take precedence.
This commit is contained in:
Torsten Schulz (local)
2026-01-21 08:33:59 +01:00
parent 7765067d1b
commit a76aae3d12
2 changed files with 19 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
backend/services/falukantService.js
View File

@@ -2483,7 +2483,7 @@ class FalukantService extends BaseService {
t.level, t.level,
COALESCE(AVG(k.knowledge), 0) AS avg_knowledge COALESCE(AVG(k.knowledge), 0) AS avg_knowledge
FROM falukant_data.character c FROM falukant_data.character c
LEFT JOIN falukant_type.title_of_nobility t ON t.id = c.title_of_nobility LEFT JOIN falukant_type.title t ON t.id = c.title_of_nobility
LEFT JOIN falukant_data.knowledge k ON k.character_id = c.id LEFT JOIN falukant_data.knowledge k ON k.character_id = c.id
WHERE c.region_id = :regionId WHERE c.region_id = :regionId
AND c.user_id IS NULL AND c.user_id IS NULL
@@ -2500,7 +2500,7 @@ class FalukantService extends BaseService {
t.level, t.level,
COALESCE(AVG(k.knowledge), 0) AS avg_knowledge COALESCE(AVG(k.knowledge), 0) AS avg_knowledge
FROM falukant_data.character c FROM falukant_data.character c
LEFT JOIN falukant_type.title_of_nobility t ON t.id = c.title_of_nobility LEFT JOIN falukant_type.title t ON t.id = c.title_of_nobility
LEFT JOIN falukant_data.knowledge k ON k.character_id = c.id LEFT JOIN falukant_data.knowledge k ON k.character_id = c.id
WHERE c.region_id = :regionId WHERE c.region_id = :regionId
AND c.user_id IS NULL AND c.user_id IS NULL

17
frontend/src/components/falukant/MessagesDialog.vue
View File

@@ -171,6 +171,23 @@ export default {
params.value = parsed.value; params.value = parsed.value;
} }
// Wenn kein value-Objekt vorhanden ist, extrahiere Parameter direkt aus parsed
// (z.B. für character_illness, character_recovery, character_accident)
if (!parsed.value || Object.keys(value).length === 0) {
// Extrahiere Parameter direkt aus parsed (außer 'tr')
const directParams = { ...parsed };
delete directParams.tr;
delete directParams.value;
// Verwende formatParams, um die Parameter zu formatieren
const formattedDirectParams = this.formatParams(directParams);
// Merge mit bereits extrahierten Parametern (value hat Vorrang)
params = { ...formattedDirectParams, ...params };
// Backend-aufgelöster Name hat höchste Priorität
if (n.characterName) {
params.characterName = n.characterName;
}
}
// Weitere Parameter aus parsed extrahieren (z.B. branch_id) // Weitere Parameter aus parsed extrahieren (z.B. branch_id)
if (parsed.branch_id !== undefined) { if (parsed.branch_id !== undefined) {
params.branch_id = parsed.branch_id; params.branch_id = parsed.branch_id;