fahed/hihala-dashboard
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Support both link columns and plain foreign key columns
All checks were successful
Deploy HiHala Dashboard / deploy (push) Successful in 6s
Details

Browse Source 
Production NocoDB uses DistrictId/MuseumId columns instead of
nc_epk____ link columns. Code now checks both column names.

Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com>
This commit is contained in:
fahed
2026-03-09 18:03:07 +03:00
parent a720b4a0aa
commit db2617f37d
2 changed files with 6 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/services/dataService.ts
View File

@@ -182,13 +182,13 @@ async function fetchFromNocoDB(): Promise<MuseumRecord[]> {
museumMap[m.Id] = { museumMap[m.Id] = {
code: m.Code, code: m.Code,
name: m.Name, name: m.Name,
district: districtMap[m['nc_epk____Districts_id']] || 'Unknown' district: districtMap[m.DistrictId || m['nc_epk____Districts_id']] || 'Unknown'
}; };
}); });
// Join data into flat structure // Join data into flat structure
const data: MuseumRecord[] = dailyStats.map(row => { const data: MuseumRecord[] = dailyStats.map(row => {
const museum = museumMap[row['nc_epk____Museums_id']] || { code: '', name: '', district: '' }; const museum = museumMap[row.MuseumId || row['nc_epk____Museums_id']] || { code: '', name: '', district: '' };
const date = row.Date; const date = row.Date;
const year = date ? date.substring(0, 4) : ''; const year = date ? date.substring(0, 4) : '';
const month = date ? parseInt(date.substring(5, 7)) : 0; const month = date ? parseInt(date.substring(5, 7)) : 0;

6
src/types/index.ts
View File

@@ -149,7 +149,8 @@ export interface NocoDBMuseum {
Id: number; Id: number;
Code: string; Code: string;
Name: string; Name: string;
'nc_epk____Districts_id': number; DistrictId?: number;
'nc_epk____Districts_id'?: number;
} }
export interface NocoDBDailyStat { export interface NocoDBDailyStat {
@@ -159,7 +160,8 @@ export interface NocoDBDailyStat {
Tickets: number; Tickets: number;
GrossRevenue: number; GrossRevenue: number;
NetRevenue: number; NetRevenue: number;
'nc_epk____Museums_id': number; MuseumId?: number;
'nc_epk____Museums_id'?: number;
} }
// Translation function type // Translation function type