diff --git a/frontend/angular-clarity-master/src/app/models/builder/ReportBuilder.ts b/frontend/angular-clarity-master/src/app/models/builder/ReportBuilder.ts index 0c6ee59..34b2279 100644 --- a/frontend/angular-clarity-master/src/app/models/builder/ReportBuilder.ts +++ b/frontend/angular-clarity-master/src/app/models/builder/ReportBuilder.ts @@ -1,8 +1,9 @@ export class ReportBuilder { public report_id: number; -public report_name:string; -public description: string; -public report_tags: string; -public servicename:string; - -} + public report_name: string; + public description: string; + public report_tags: string; + public servicename: string; + // Add SureConnect reference + public sureConnectId: number | null; +} \ No newline at end of file diff --git a/frontend/angular-clarity-master/src/app/models/builder/dashboard.ts b/frontend/angular-clarity-master/src/app/models/builder/dashboard.ts index 00e2948..9f8c8f5 100644 --- a/frontend/angular-clarity-master/src/app/models/builder/dashboard.ts +++ b/frontend/angular-clarity-master/src/app/models/builder/dashboard.ts @@ -23,8 +23,22 @@ export interface DashboardContentModel { component?: any; name: string; type?:string; - // Common properties + // Chart properties + xAxis?: string; + yAxis?: string | string[]; + chartType?: string; + charttitle?: string; + chartlegend?: boolean; + showlabel?: boolean; + chartcolor?: boolean; + slices?: boolean; + donut?: boolean; + charturl?: string; + chartparameter?: string; + datastore?: string; table?: string; + datasource?: string; + fieldName?: string; connection?: string; baseFilters?: any[]; // Common filter properties @@ -37,6 +51,11 @@ export interface DashboardContentModel { drilldownParameter?: string; drilldownFilters?: any[]; drilldownLayers?: any[]; + // Compact filter properties + filterKey?: string; + filterType?: string; + filterLabel?: string; + filterOptions?: string[]; } export interface DashboardModel { diff --git a/frontend/angular-clarity-master/src/app/services/fnd/alerts.service.ts b/frontend/angular-clarity-master/src/app/services/fnd/alerts.service.ts index c2d1510..83f3c14 100644 --- a/frontend/angular-clarity-master/src/app/services/fnd/alerts.service.ts +++ b/frontend/angular-clarity-master/src/app/services/fnd/alerts.service.ts @@ -69,4 +69,13 @@ export class AlertsService { } return this.apiRequest.get(apiUrl); } + + // Get values for a specific key from API + public getValuesFromUrl(url: string, sureId: number | undefined, key: string): Observable { + let apiUrl = `chart/getValue?apiUrl=${url}&key=${key}`; + if (sureId) { + apiUrl += `&sureId=${sureId}`; + } + return this.apiRequest.get(apiUrl); + } } \ No newline at end of file