From fe6dd92ef4ef8b0a1663a8d081232f95efc1753a Mon Sep 17 00:00:00 2001 From: Gaurav Kumar Date: Fri, 7 Nov 2025 09:19:05 +0530 Subject: [PATCH] dashboard --- .../src/app/models/builder/ReportBuilder.ts | 13 +- .../src/app/models/builder/dashboard.ts | 39 ++- .../modules/main/layout/layout.component.html | 26 +- .../src/app/modules/main/main.module.ts.tmp | 252 ++++++++++++++++++ .../services/builder/dashboard3.service.ts | 21 +- .../src/app/services/fnd/alerts.service.ts | 9 + .../src/app/services/scheduler.service.ts | 46 ++++ .../src/assets/i18n/en.json | 6 +- .../src/assets/i18n/hi.json | 2 + 9 files changed, 396 insertions(+), 18 deletions(-) create mode 100644 frontend/angular-clarity-master/src/app/modules/main/main.module.ts.tmp create mode 100644 frontend/angular-clarity-master/src/app/services/scheduler.service.ts 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 36e89e4..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,6 +23,39 @@ export interface DashboardContentModel { component?: any; name: string; type?:string; + // 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 + commonFilterEnabled?: boolean; + // Drilldown properties + drilldownEnabled?: boolean; + drilldownApiUrl?: string; + drilldownXAxis?: string; + drilldownYAxis?: string; + drilldownParameter?: string; + drilldownFilters?: any[]; + drilldownLayers?: any[]; + // Compact filter properties + filterKey?: string; + filterType?: string; + filterLabel?: string; + filterOptions?: string[]; } export interface DashboardModel { @@ -67,6 +100,10 @@ export class value1{ export const WidgetsMock: WidgetModel[] = [ + { + name: 'Common Filter', + identifier: 'common_filter' + }, { name: 'Radar Chart', identifier: 'radar_chart' @@ -111,4 +148,4 @@ export const WidgetsMock: WidgetModel[] = [ name: 'To Do', identifier: 'to_do_chart' } -] +] \ No newline at end of file diff --git a/frontend/angular-clarity-master/src/app/modules/main/layout/layout.component.html b/frontend/angular-clarity-master/src/app/modules/main/layout/layout.component.html index f12d961..9a2e3ff 100644 --- a/frontend/angular-clarity-master/src/app/modules/main/layout/layout.component.html +++ b/frontend/angular-clarity-master/src/app/modules/main/layout/layout.component.html @@ -39,6 +39,14 @@ + + + +