From d8edd81fae81382d8d46fa5995d8f506f6a9dc1f Mon Sep 17 00:00:00 2001
From: Gaurav Kumar <GAURAVRK215@GMAIL.COM>
Date: Fri, 7 Nov 2025 09:15:52 +0530
Subject: [PATCH] chart

---
 .../modules/main/builder/dashboardnew 6.zip   |  Bin 0 -> 296729 bytes
 .../Data_lake/Data_lake.component.html        |  358 ++-
 .../Data_lake/Data_lake.component.scss        |  491 ++++
 .../Data_lake/Data_lake.component.ts          |  506 +++-
 .../Data_lake/Data_lake.service.ts            |   12 +
 .../cron-job-builder.component.html           |   13 +-
 .../cron-job-builder.component.ts             |   62 +-
 .../Data_lake/dataLakescheduler.service.ts    |   47 +
 .../allnewdash/allnewdash.component.html      |  275 +--
 .../allnewdash/allnewdash.component.ts        |    6 +
 .../chart-config-manager.component.html       |  630 +++++
 .../chart-config-manager.component.scss       |   60 +
 .../chart-config-manager.component.ts         |  658 ++++++
 .../chart-config-manager.component.html       |  495 ++++
 .../chart-config-manager.component.scss       |   97 +
 .../chart-config-manager.component.ts         |  710 ++++++
 .../chart-config/chart-template.service.ts    |   46 +
 .../component-property.service.ts             |   42 +
 .../dynamic-chart-loader.service.ts           |  125 +
 .../chart-config/dynamic-field.service.ts     |   46 +
 .../forms/chart-template-form.component.html  |   33 +
 .../forms/chart-template-form.component.scss  |   17 +
 .../forms/chart-template-form.component.ts    |   22 +
 .../forms/chart-type-form.component.html      |   33 +
 .../forms/chart-type-form.component.scss      |   12 +
 .../forms/chart-type-form.component.ts        |   22 +
 .../component-property-form.component.html    |   28 +
 .../component-property-form.component.scss    |   12 +
 .../component-property-form.component.ts      |   31 +
 .../forms/dynamic-field-form.component.html   |   54 +
 .../forms/dynamic-field-form.component.scss   |   17 +
 .../forms/dynamic-field-form.component.ts     |   34 +
 .../forms/ui-component-form.component.html    |   46 +
 .../forms/ui-component-form.component.scss    |   12 +
 .../forms/ui-component-form.component.ts      |   33 +
 .../chart-config/ui-component.service.ts      |   47 +
 .../add-chart-type.component.html             |   76 +
 .../add-chart-type.component.scss             |   65 +
 .../add-chart-type.component.ts               |   70 +
 .../chart-type-fields.component.html          |  222 ++
 .../chart-type-fields.component.scss          |  128 +
 .../chart-type-fields.component.ts            |  181 ++
 .../chart-type-manager.component.html         |   75 +
 .../chart-type-manager.component.scss         |   71 +
 .../chart-type-manager.component.ts           |  115 +
 .../chart-type-page.component.ts              |   22 +
 .../chart-type-templates.component.html       |  175 ++
 .../chart-type-templates.component.scss       |  128 +
 .../chart-type-templates.component.ts         |  176 ++
 .../chart-type-ui-components.component.html   |  312 +++
 .../chart-type-ui-components.component.scss   |  156 ++
 .../chart-type-ui-components.component.ts     |  309 +++
 .../chart-type-manager/chart-type.service.ts  |   55 +
 .../edit-chart-type.component.html            |  160 ++
 .../edit-chart-type.component.scss            |  163 ++
 .../edit-chart-type.component.ts              |  159 ++
 .../common-filter/EXAMPLE_USAGE.md            |  687 ++++++
 .../common-filter/IMPLEMENTATION_GUIDE.md     |  219 ++
 .../chart-wrapper.component.scss              |   68 +
 .../chart-wrapper.component.spec.ts           |   39 +
 .../common-filter/chart-wrapper.component.ts  |  111 +
 .../common-filter.component.html              |  128 +
 .../common-filter.component.scss              |  192 ++
 .../common-filter.component.spec.ts           |   89 +
 .../common-filter/common-filter.component.ts  |  197 ++
 .../compact-filter.component.html             |  122 +
 .../compact-filter.component.scss             |  224 ++
 .../common-filter/compact-filter.component.ts |  441 ++++
 .../common-filter/filter.service.spec.ts      |  129 +
 .../common-filter/filter.service.ts           |  199 ++
 .../dashboardnew/common-filter/index.ts       |    4 +
 .../chart-config-modal.component.html         |    4 +
 .../chart-config-modal.component.scss         |    5 +
 .../chart-config-modal.component.ts           |   10 +
 .../editnewdash/editnewdash.component.html    | 1061 +++++----
 .../editnewdash/editnewdash.component.ts      | 1370 +++++++++--
 .../dashboardnew/gadgets/bar-chart.zip        |  Bin 0 -> 18577 bytes
 .../bar-chart/bar-chart.component.html        |  353 ++-
 .../bar-chart/bar-chart.component.scss        |  278 +++
 .../gadgets/bar-chart/bar-chart.component.ts  |  530 ++++-
 .../bubble-chart/bubble-chart.component.html  |  314 ++-
 .../bubble-chart/bubble-chart.component.scss  |  192 ++
 .../bubble-chart/bubble-chart.component.ts    | 1044 +++++++-
 .../doughnut-chart.component.html             |  335 ++-
 .../doughnut-chart.component.scss             |  501 ++--
 .../doughnut-chart.component.ts               |  755 ++++--
 .../dynamic-chart.component.html              |  281 +++
 .../dynamic-chart.component.scss              |  192 ++
 .../dynamic-chart/dynamic-chart.component.ts  |  391 ++-
 .../financial-chart.component.html            |  281 +++
 .../financial-chart.component.scss            |  276 ++-
 .../financial-chart.component.ts              |  593 ++++-
 .../grid-view/grid-view.component.html        |  287 ++-
 .../grid-view/grid-view.component.scss        |  182 +-
 .../gadgets/grid-view/grid-view.component.ts  |  856 ++++++-
 .../line-chart/line-chart.component.html      |  292 ++-
 .../line-chart/line-chart.component.scss      |  192 ++
 .../line-chart/line-chart.component.ts        |  427 +++-
 .../pie-chart/pie-chart.component.html        |  298 ++-
 .../pie-chart/pie-chart.component.scss        |  198 +-
 .../gadgets/pie-chart/pie-chart.component.ts  |  721 ++++--
 .../polar-chart/polar-chart.component.html    |  302 ++-
 .../polar-chart/polar-chart.component.scss    |  198 +-
 .../polar-chart/polar-chart.component.ts      |  574 ++++-
 .../radar-chart/radar-chart.component.html    |  291 ++-
 .../radar-chart/radar-chart.component.scss    |  192 ++
 .../radar-chart/radar-chart.component.ts      |  424 +++-
 .../scatter-chart.component.html              |  292 ++-
 .../scatter-chart.component.scss              |  192 ++
 .../scatter-chart/scatter-chart.component.ts  |  678 +++++-
 .../gadgets/shield-dashboard/README.md        |  125 +
 .../bar-chart/bar-chart.component.html        |   20 +
 .../bar-chart/bar-chart.component.scss        |   70 +
 .../bar-chart/bar-chart.component.ts          |  140 ++
 .../data-table/data-table.component.html      |   78 +
 .../data-table/data-table.component.scss      |  107 +
 .../data-table/data-table.component.ts        |  117 +
 .../deal-details-card.component.html          |   36 +
 .../deal-details-card.component.scss          |  102 +
 .../deal-details-card.component.ts            |  119 +
 .../donut-chart/donut-chart.component.html    |   21 +
 .../donut-chart/donut-chart.component.scss    |   70 +
 .../donut-chart/donut-chart.component.ts      |  195 ++
 .../loading-shimmer.component.scss            |   45 +
 .../loading-shimmer.component.ts              |   19 +
 .../map-chart/map-chart.component.html        |   43 +
 .../map-chart/map-chart.component.scss        |  135 ++
 .../map-chart/map-chart.component.ts          |  109 +
 .../quarterwise-flow.component.html           |   20 +
 .../quarterwise-flow.component.scss           |   70 +
 .../quarterwise-flow.component.ts             |   15 +
 .../sidebar-filters.component.html            |    3 +
 .../sidebar-filters.component.html.new        |   25 +
 .../sidebar-filters.component.scss            |  216 ++
 .../sidebar-filters.component.ts              |   16 +
 .../sidebar-filters.component.ts.new          |   16 +
 .../gadgets/shield-dashboard/index.ts         |   10 +
 .../services/dashboard-filter.service.ts      |   84 +
 .../shield-dashboard-routing.module.ts        |   16 +
 .../shield-dashboard.component.html           |  493 ++++
 .../shield-dashboard.component.scss           |  220 ++
 .../shield-dashboard.component.ts             |  596 +++++
 .../shield-dashboard.component.ts.fixed       |  223 ++
 .../shield-dashboard.module.ts                |   44 +
 .../to-do-chart/to-do-chart.component.html    |  334 ++-
 .../to-do-chart/to-do-chart.component.scss    |  289 +++
 .../to-do-chart/to-do-chart.component.ts      |  503 +++-
 .../gadgets/unified-chart/index.ts            |    1 +
 .../unified-chart.component.html              |  296 +++
 .../unified-chart.component.scss              |  307 +++
 .../unified-chart.component.spec.ts           |   21 +
 .../unified-chart/unified-chart.component.ts  | 2096 +++++++++++++++++
 .../dashrunnerall.component.html              |    8 +-
 .../dashrunnerall/dashrunnerall.component.ts  |   78 +-
 .../bar-runner/bar-runner.component.ts        |  100 +-
 .../bubble-runner/bubble-runner.component.ts  |   92 +-
 .../compact-filter-runner.component.html      |   73 +
 .../compact-filter-runner.component.scss      |  149 ++
 .../compact-filter-runner.component.ts        |  245 ++
 .../dashrunnerline/dashrunner.service.ts      |   22 +-
 .../dashrunnerline.component.html             |    9 +-
 .../dashrunnerline.component.ts               |   59 +-
 .../doughnut-runner.component.ts              |   93 +-
 .../grid-runner/grid-runner.component.html    |   23 +-
 .../grid-runner/grid-runner.component.ts      |  205 +-
 .../line-runner/line-runner.component.ts      |   90 +-
 .../pie-runner/pie-runner.component.ts        |   92 +-
 .../polar-runner/polar-runner.component.ts    |   92 +-
 .../radar-runner/radar-runner.component.ts    |   92 +-
 .../scatter-runner.component.ts               |   92 +-
 .../todo-runner/todo-runner.component.ts      |  109 +-
 .../reportbuildquery.component.ts             |    2 +-
 .../report-build2add.component.html           |   14 +-
 .../report-build2add.component.ts             |   26 +-
 .../report-build2all.component.html           |  181 +-
 .../report-build2edit.component.html          |  132 +-
 .../report-build2edit.component.ts            |  117 +-
 .../reportrunneredit2.component.ts            |  949 ++++----
 178 files changed, 34087 insertions(+), 2683 deletions(-)
 create mode 100644 frontend/angular-clarity-master/src/app/modules/main/builder/dashboardnew 6.zip
 create mode 100644 frontend/angular-clarity-master/src/app/modules/main/builder/dashboardnew/Data_lake/dataLakescheduler.service.ts
 create mode 100644 frontend/angular-clarity-master/src/app/modules/main/builder/dashboardnew/chart-config-manager/chart-config-manager.component.html
 create mode 100644 frontend/angular-clarity-master/src/app/modules/main/builder/dashboardnew/chart-config-manager/chart-config-manager.component.scss
 create mode 100644 frontend/angular-clarity-master/src/app/modules/main/builder/dashboardnew/chart-config-manager/chart-config-manager.component.ts
 create mode 100644 frontend/angular-clarity-master/src/app/modules/main/builder/dashboardnew/chart-config/chart-config-manager.component.html
 create mode 100644 frontend/angular-clarity-master/src/app/modules/main/builder/dashboardnew/chart-config/chart-config-manager.component.scss
 create mode 100644 frontend/angular-clarity-master/src/app/modules/main/builder/dashboardnew/chart-config/chart-config-manager.component.ts
 create mode 100644 frontend/angular-clarity-master/src/app/modules/main/builder/dashboardnew/chart-config/chart-template.service.ts
 create mode 100644 frontend/angular-clarity-master/src/app/modules/main/builder/dashboardnew/chart-config/component-property.service.ts
 create mode 100644 frontend/angular-clarity-master/src/app/modules/main/builder/dashboardnew/chart-config/dynamic-chart-loader.service.ts
 create mode 100644 frontend/angular-clarity-master/src/app/modules/main/builder/dashboardnew/chart-config/dynamic-field.service.ts
 create mode 100644 frontend/angular-clarity-master/src/app/modules/main/builder/dashboardnew/chart-config/forms/chart-template-form.component.html
 create mode 100644 frontend/angular-clarity-master/src/app/modules/main/builder/dashboardnew/chart-config/forms/chart-template-form.component.scss
 create mode 100644 frontend/angular-clarity-master/src/app/modules/main/builder/dashboardnew/chart-config/forms/chart-template-form.component.ts
 create mode 100644 frontend/angular-clarity-master/src/app/modules/main/builder/dashboardnew/chart-config/forms/chart-type-form.component.html
 create mode 100644 frontend/angular-clarity-master/src/app/modules/main/builder/dashboardnew/chart-config/forms/chart-type-form.component.scss
 create mode 100644 frontend/angular-clarity-master/src/app/modules/main/builder/dashboardnew/chart-config/forms/chart-type-form.component.ts
 create mode 100644 frontend/angular-clarity-master/src/app/modules/main/builder/dashboardnew/chart-config/forms/component-property-form.component.html
 create mode 100644 frontend/angular-clarity-master/src/app/modules/main/builder/dashboardnew/chart-config/forms/component-property-form.component.scss
 create mode 100644 frontend/angular-clarity-master/src/app/modules/main/builder/dashboardnew/chart-config/forms/component-property-form.component.ts
 create mode 100644 frontend/angular-clarity-master/src/app/modules/main/builder/dashboardnew/chart-config/forms/dynamic-field-form.component.html
 create mode 100644 frontend/angular-clarity-master/src/app/modules/main/builder/dashboardnew/chart-config/forms/dynamic-field-form.component.scss
 create mode 100644 frontend/angular-clarity-master/src/app/modules/main/builder/dashboardnew/chart-config/forms/dynamic-field-form.component.ts
 create mode 100644 frontend/angular-clarity-master/src/app/modules/main/builder/dashboardnew/chart-config/forms/ui-component-form.component.html
 create mode 100644 frontend/angular-clarity-master/src/app/modules/main/builder/dashboardnew/chart-config/forms/ui-component-form.component.scss
 create mode 100644 frontend/angular-clarity-master/src/app/modules/main/builder/dashboardnew/chart-config/forms/ui-component-form.component.ts
 create mode 100644 frontend/angular-clarity-master/src/app/modules/main/builder/dashboardnew/chart-config/ui-component.service.ts
 create mode 100644 frontend/angular-clarity-master/src/app/modules/main/builder/dashboardnew/chart-type-manager/add-chart-type.component.html
 create mode 100644 frontend/angular-clarity-master/src/app/modules/main/builder/dashboardnew/chart-type-manager/add-chart-type.component.scss
 create mode 100644 frontend/angular-clarity-master/src/app/modules/main/builder/dashboardnew/chart-type-manager/add-chart-type.component.ts
 create mode 100644 frontend/angular-clarity-master/src/app/modules/main/builder/dashboardnew/chart-type-manager/chart-type-fields.component.html
 create mode 100644 frontend/angular-clarity-master/src/app/modules/main/builder/dashboardnew/chart-type-manager/chart-type-fields.component.scss
 create mode 100644 frontend/angular-clarity-master/src/app/modules/main/builder/dashboardnew/chart-type-manager/chart-type-fields.component.ts
 create mode 100644 frontend/angular-clarity-master/src/app/modules/main/builder/dashboardnew/chart-type-manager/chart-type-manager.component.html
 create mode 100644 frontend/angular-clarity-master/src/app/modules/main/builder/dashboardnew/chart-type-manager/chart-type-manager.component.scss
 create mode 100644 frontend/angular-clarity-master/src/app/modules/main/builder/dashboardnew/chart-type-manager/chart-type-manager.component.ts
 create mode 100644 frontend/angular-clarity-master/src/app/modules/main/builder/dashboardnew/chart-type-manager/chart-type-page.component.ts
 create mode 100644 frontend/angular-clarity-master/src/app/modules/main/builder/dashboardnew/chart-type-manager/chart-type-templates.component.html
 create mode 100644 frontend/angular-clarity-master/src/app/modules/main/builder/dashboardnew/chart-type-manager/chart-type-templates.component.scss
 create mode 100644 frontend/angular-clarity-master/src/app/modules/main/builder/dashboardnew/chart-type-manager/chart-type-templates.component.ts
 create mode 100644 frontend/angular-clarity-master/src/app/modules/main/builder/dashboardnew/chart-type-manager/chart-type-ui-components.component.html
 create mode 100644 frontend/angular-clarity-master/src/app/modules/main/builder/dashboardnew/chart-type-manager/chart-type-ui-components.component.scss
 create mode 100644 frontend/angular-clarity-master/src/app/modules/main/builder/dashboardnew/chart-type-manager/chart-type-ui-components.component.ts
 create mode 100644 frontend/angular-clarity-master/src/app/modules/main/builder/dashboardnew/chart-type-manager/chart-type.service.ts
 create mode 100644 frontend/angular-clarity-master/src/app/modules/main/builder/dashboardnew/chart-type-manager/edit-chart-type.component.html
 create mode 100644 frontend/angular-clarity-master/src/app/modules/main/builder/dashboardnew/chart-type-manager/edit-chart-type.component.scss
 create mode 100644 frontend/angular-clarity-master/src/app/modules/main/builder/dashboardnew/chart-type-manager/edit-chart-type.component.ts
 create mode 100644 frontend/angular-clarity-master/src/app/modules/main/builder/dashboardnew/common-filter/EXAMPLE_USAGE.md
 create mode 100644 frontend/angular-clarity-master/src/app/modules/main/builder/dashboardnew/common-filter/IMPLEMENTATION_GUIDE.md
 create mode 100644 frontend/angular-clarity-master/src/app/modules/main/builder/dashboardnew/common-filter/chart-wrapper.component.scss
 create mode 100644 frontend/angular-clarity-master/src/app/modules/main/builder/dashboardnew/common-filter/chart-wrapper.component.spec.ts
 create mode 100644 frontend/angular-clarity-master/src/app/modules/main/builder/dashboardnew/common-filter/chart-wrapper.component.ts
 create mode 100644 frontend/angular-clarity-master/src/app/modules/main/builder/dashboardnew/common-filter/common-filter.component.html
 create mode 100644 frontend/angular-clarity-master/src/app/modules/main/builder/dashboardnew/common-filter/common-filter.component.scss
 create mode 100644 frontend/angular-clarity-master/src/app/modules/main/builder/dashboardnew/common-filter/common-filter.component.spec.ts
 create mode 100644 frontend/angular-clarity-master/src/app/modules/main/builder/dashboardnew/common-filter/common-filter.component.ts
 create mode 100644 frontend/angular-clarity-master/src/app/modules/main/builder/dashboardnew/common-filter/compact-filter.component.html
 create mode 100644 frontend/angular-clarity-master/src/app/modules/main/builder/dashboardnew/common-filter/compact-filter.component.scss
 create mode 100644 frontend/angular-clarity-master/src/app/modules/main/builder/dashboardnew/common-filter/compact-filter.component.ts
 create mode 100644 frontend/angular-clarity-master/src/app/modules/main/builder/dashboardnew/common-filter/filter.service.spec.ts
 create mode 100644 frontend/angular-clarity-master/src/app/modules/main/builder/dashboardnew/common-filter/filter.service.ts
 create mode 100644 frontend/angular-clarity-master/src/app/modules/main/builder/dashboardnew/common-filter/index.ts
 create mode 100644 frontend/angular-clarity-master/src/app/modules/main/builder/dashboardnew/editnewdash/chart-config-modal.component.html
 create mode 100644 frontend/angular-clarity-master/src/app/modules/main/builder/dashboardnew/editnewdash/chart-config-modal.component.scss
 create mode 100644 frontend/angular-clarity-master/src/app/modules/main/builder/dashboardnew/editnewdash/chart-config-modal.component.ts
 create mode 100644 frontend/angular-clarity-master/src/app/modules/main/builder/dashboardnew/gadgets/bar-chart.zip
 create mode 100644 frontend/angular-clarity-master/src/app/modules/main/builder/dashboardnew/gadgets/shield-dashboard/README.md
 create mode 100644 frontend/angular-clarity-master/src/app/modules/main/builder/dashboardnew/gadgets/shield-dashboard/components/bar-chart/bar-chart.component.html
 create mode 100644 frontend/angular-clarity-master/src/app/modules/main/builder/dashboardnew/gadgets/shield-dashboard/components/bar-chart/bar-chart.component.scss
 create mode 100644 frontend/angular-clarity-master/src/app/modules/main/builder/dashboardnew/gadgets/shield-dashboard/components/bar-chart/bar-chart.component.ts
 create mode 100644 frontend/angular-clarity-master/src/app/modules/main/builder/dashboardnew/gadgets/shield-dashboard/components/data-table/data-table.component.html
 create mode 100644 frontend/angular-clarity-master/src/app/modules/main/builder/dashboardnew/gadgets/shield-dashboard/components/data-table/data-table.component.scss
 create mode 100644 frontend/angular-clarity-master/src/app/modules/main/builder/dashboardnew/gadgets/shield-dashboard/components/data-table/data-table.component.ts
 create mode 100644 frontend/angular-clarity-master/src/app/modules/main/builder/dashboardnew/gadgets/shield-dashboard/components/deal-details-card/deal-details-card.component.html
 create mode 100644 frontend/angular-clarity-master/src/app/modules/main/builder/dashboardnew/gadgets/shield-dashboard/components/deal-details-card/deal-details-card.component.scss
 create mode 100644 frontend/angular-clarity-master/src/app/modules/main/builder/dashboardnew/gadgets/shield-dashboard/components/deal-details-card/deal-details-card.component.ts
 create mode 100644 frontend/angular-clarity-master/src/app/modules/main/builder/dashboardnew/gadgets/shield-dashboard/components/donut-chart/donut-chart.component.html
 create mode 100644 frontend/angular-clarity-master/src/app/modules/main/builder/dashboardnew/gadgets/shield-dashboard/components/donut-chart/donut-chart.component.scss
 create mode 100644 frontend/angular-clarity-master/src/app/modules/main/builder/dashboardnew/gadgets/shield-dashboard/components/donut-chart/donut-chart.component.ts
 create mode 100644 frontend/angular-clarity-master/src/app/modules/main/builder/dashboardnew/gadgets/shield-dashboard/components/loading-shimmer/loading-shimmer.component.scss
 create mode 100644 frontend/angular-clarity-master/src/app/modules/main/builder/dashboardnew/gadgets/shield-dashboard/components/loading-shimmer/loading-shimmer.component.ts
 create mode 100644 frontend/angular-clarity-master/src/app/modules/main/builder/dashboardnew/gadgets/shield-dashboard/components/map-chart/map-chart.component.html
 create mode 100644 frontend/angular-clarity-master/src/app/modules/main/builder/dashboardnew/gadgets/shield-dashboard/components/map-chart/map-chart.component.scss
 create mode 100644 frontend/angular-clarity-master/src/app/modules/main/builder/dashboardnew/gadgets/shield-dashboard/components/map-chart/map-chart.component.ts
 create mode 100644 frontend/angular-clarity-master/src/app/modules/main/builder/dashboardnew/gadgets/shield-dashboard/components/quarterwise-flow/quarterwise-flow.component.html
 create mode 100644 frontend/angular-clarity-master/src/app/modules/main/builder/dashboardnew/gadgets/shield-dashboard/components/quarterwise-flow/quarterwise-flow.component.scss
 create mode 100644 frontend/angular-clarity-master/src/app/modules/main/builder/dashboardnew/gadgets/shield-dashboard/components/quarterwise-flow/quarterwise-flow.component.ts
 create mode 100644 frontend/angular-clarity-master/src/app/modules/main/builder/dashboardnew/gadgets/shield-dashboard/components/sidebar-filters/sidebar-filters.component.html
 create mode 100644 frontend/angular-clarity-master/src/app/modules/main/builder/dashboardnew/gadgets/shield-dashboard/components/sidebar-filters/sidebar-filters.component.html.new
 create mode 100644 frontend/angular-clarity-master/src/app/modules/main/builder/dashboardnew/gadgets/shield-dashboard/components/sidebar-filters/sidebar-filters.component.scss
 create mode 100644 frontend/angular-clarity-master/src/app/modules/main/builder/dashboardnew/gadgets/shield-dashboard/components/sidebar-filters/sidebar-filters.component.ts
 create mode 100644 frontend/angular-clarity-master/src/app/modules/main/builder/dashboardnew/gadgets/shield-dashboard/components/sidebar-filters/sidebar-filters.component.ts.new
 create mode 100644 frontend/angular-clarity-master/src/app/modules/main/builder/dashboardnew/gadgets/shield-dashboard/index.ts
 create mode 100644 frontend/angular-clarity-master/src/app/modules/main/builder/dashboardnew/gadgets/shield-dashboard/services/dashboard-filter.service.ts
 create mode 100644 frontend/angular-clarity-master/src/app/modules/main/builder/dashboardnew/gadgets/shield-dashboard/shield-dashboard-routing.module.ts
 create mode 100644 frontend/angular-clarity-master/src/app/modules/main/builder/dashboardnew/gadgets/shield-dashboard/shield-dashboard.component.html
 create mode 100644 frontend/angular-clarity-master/src/app/modules/main/builder/dashboardnew/gadgets/shield-dashboard/shield-dashboard.component.scss
 create mode 100644 frontend/angular-clarity-master/src/app/modules/main/builder/dashboardnew/gadgets/shield-dashboard/shield-dashboard.component.ts
 create mode 100644 frontend/angular-clarity-master/src/app/modules/main/builder/dashboardnew/gadgets/shield-dashboard/shield-dashboard.component.ts.fixed
 create mode 100644 frontend/angular-clarity-master/src/app/modules/main/builder/dashboardnew/gadgets/shield-dashboard/shield-dashboard.module.ts
 create mode 100644 frontend/angular-clarity-master/src/app/modules/main/builder/dashboardnew/gadgets/unified-chart/index.ts
 create mode 100644 frontend/angular-clarity-master/src/app/modules/main/builder/dashboardnew/gadgets/unified-chart/unified-chart.component.html
 create mode 100644 frontend/angular-clarity-master/src/app/modules/main/builder/dashboardnew/gadgets/unified-chart/unified-chart.component.scss
 create mode 100644 frontend/angular-clarity-master/src/app/modules/main/builder/dashboardnew/gadgets/unified-chart/unified-chart.component.spec.ts
 create mode 100644 frontend/angular-clarity-master/src/app/modules/main/builder/dashboardnew/gadgets/unified-chart/unified-chart.component.ts
 create mode 100644 frontend/angular-clarity-master/src/app/modules/main/builder/dashboardrunner/dashrunnerline/compact-filter-runner/compact-filter-runner.component.html
 create mode 100644 frontend/angular-clarity-master/src/app/modules/main/builder/dashboardrunner/dashrunnerline/compact-filter-runner/compact-filter-runner.component.scss
 create mode 100644 frontend/angular-clarity-master/src/app/modules/main/builder/dashboardrunner/dashrunnerline/compact-filter-runner/compact-filter-runner.component.ts

diff --git a/frontend/angular-clarity-master/src/app/modules/main/builder/dashboardnew 6.zip b/frontend/angular-clarity-master/src/app/modules/main/builder/dashboardnew 6.zip
new file mode 100644
index 0000000000000000000000000000000000000000..72d0003b4c8d0fbd62fdabcaa44650a84d406dc5
GIT binary patch
literal 296729
zcmc$_V~{Ujv*-J3+qP}nwr$(CZQHi3-QBxwcki}$+t&R*&p9*qoSB##F|Y25%C#!$
z#WyoQwW=zzR+XX*2q-GxU+peQQ|I41|JlI-2mz)>E|$g)M$V@8W*!V`s&D{^8`lrZ
zyMOFoqnjrT00{I62mtuEgyO%YAOVp7O={^MIgEd#3=HIiL=;ps8R!lEtLlFf1<w56
zL`@9QOe_qI4R7US)o&5hBNYRI6EQ(35OIL+gbBg#7+4U&a7BcJ3uP1Iu>@`7%0rQe
z=(BSRYBDqx6H}@+G_y5RGc}U4GA0!(9SjYPOzq6=ZPU%IZH@7AQ!;byu1rr%uPu*^
zi!Kf<FH3EVuZ`<3{+e4CUmO{mUt61-?_VAmj{^XTG7yk}p%}yPf0FrELjRHKzd#W?
zDgQTWSpO?E7dK}!69;>HGZWYUAV{hFU`g|j{cHR`68x{SjsLhI`L6{3E5Cnm{udAb
zrujb{{9n;@!b1#s#legOjwd1#QY4oggC$HCR2hmy#E_evTalrq9G6<5p_QYRo~D_Y
zmNBDT=3s1OY-Mj@Y+{v@XK!<#rJS6TYcu~3R1szl0F!^B{#WGxFDiB`TdjW%{LhB|
zzo9a*G&6OxHTw@vLf|YGr(fd#w*Moi|El?~6GQm_#pyrg{|)JXsQ+I<`u~5*{p;!y
zbXWVIQx3@r0KolUIf@#&8X4Fc*_aWs(0f}s{ztxwFP1|8Y5xn&<!+NiJGmCRt#-T3
zzRiESe{VfL9d`dRzd4s37lhrKSO4woBqbL0S~g+{v)S5Qo77%ZMo8#iyCTGbN-%o@
zu#^B`fDwoV2%ilI4T?9KnI_<tbQ9v?XyEc@V+0QyfOrIj2-q|5XZT^@L=4dTL9#ew
z5P5@<P*4yTl$4js%a^~|CHz4t4*Z-75My1GU}Ik5SRP1AQtu1XfXjG+h#muwOZ)=w
zB_Rg%)R+hYMv#zUr!(RcMvgk*so}&)OQ)u1Yot{&5)`UcRpwL`<TYfbC36xPI+oTr
z7(1Bc8d+yrXW4ou)g@=AntPjDIlEbRIHm_U8QbXFnOQlhTA4Xn8u~h0S2@@_R(?$U
z?YLe!m>eO0&r=RG29!PAi0<mCe#cp=;sF2)0osiLJtZv7ElnLQY)x+EEFSGm-xz;D
zoEc7jhQDF1X!2>s<eq=?cT`*GhSFdmV-?@6m(ptsL?5<gooD!@bv)v0x1l9Pz8Xm)
zNkm1dck@)#71Qn2QR21hL;m>g-+>)2LXn}1BL!yKEEK=lx%@Cf+|38GqBLOwN#PGX
zW+@wr*{|83WOh46ulsE1GQ#9yUNZDIguW7m3%ur!M!`HlNBreLNhw0VlOW*h7ISXq
z)A<d?K;${My$gPuwrk;J#CJLD+y7jupHRYuA)_prrFfQo0lTQ{BKwH?w=v=g;V(8K
zi4<So=>+GTkJ(9$P|^JR7W*Bmmr=qoRE*Yk1QEz3&Jj9nm&BfC0|;wN#C`!LQwxv|
znAOdrjh10zfml%mK_dytmS~6n5wZ}P70ZP@>~IzvI3}at44A{P(g1<Nm)j=0=<R7?
zl(4Ss>mCS$5H}A9%a=lU8K4}mQQxUxkg>9ffWl5&T5K;2jA@%r7U(FYV1q`y_?OEb
zV!{@ul!+DOQ#7yBXYrx$yK*$nYomf<N|6A{l^nuWFCQBSEEWVuYNp7k3GUhO%p8L3
z19}1a+6b<|oEj)&A`%qRwW8T?*xnAF)d>&F16|(Np1#8kM?*ZI4^xQ?Sc`p_8~GT~
zvHQk&XbDoU(}Vro*-dE6L<=$oo1nLQ`V{J|a7<}5-!~bsbVP@(EnUA2D(u2>(<I(7
zPLj}jX+Pgj6#N!5nDwc6^C0CtGDJ~TF+f$KSfDR@y)KbLpZs**8u~|z<QOM7Z6Rlr
z*FBsl3Gr);e|}|Ek5Br<#1Oqyb=gJ*`)XEF=@;Ya$uAwPs4LQz^%{lIY|<~ozBwZ>
zJ_xouO>eUx_bJTsk=y(2A{+NthD7GV(x>NufXr-$7|n`seO!K}p=v0NChBsgU5ciN
zT^Fp#nLyIDBa2_j498)eMwKGil3-3?0^2(kU26~E!k_@qCFFkTq9{GYh?UxdYMQlU
zgM^l`%(#mW@#TmI8tbSs;**v$Ga^boKQNS738!AW@V1Sre9tr3kc)eBn+xpPL;Su#
zXykh)C0lb$cCriLW0A^q+2<Q#(K{eoqG2wTn&FrA7KEhur~ONh3DJ0Q(8<b=x(mpV
zOgP@8W#s<!NZ(Ox3K<RZ_?VG!uVsS3Mj_B5a2l!%;rGB1ewRv-i;@WD6pq1AiAboL
zk6~u@YLJj3X`>LP-;s>Nu$(U{XO;y*_P>10V|&!mVhv>x1V9I6M;y19QCor_Y(9?w
zjMs@UOtG0h&r6J0q7StVGV4QHQ@{xeTS$J1<VUZE&LLnU{YAdG3m~A84BRK%(2gjw
zeu{sA9Uw`A>p`N2Z-6?C4I_OMMQ1OZ&VQVaEs%0|;E}I5kMV67aST-lnp;eg4ra0S
z%Q#p9I~`M$*%WFBso66w<N_CTKPTVLCpNZdr^oae=h9K;dU~S;=)!rKq`PIA{XFgQ
z=m%|TGY@t$6eB={R`2j>u6hND0wQ}tOc_NWi|c3#JNDpyach4nmOP}o0%JRNIao-8
zkMFA?-U^K38_<!}X*>8@Eh8Gs5nZXGYh<}oDFOM$K{X)dwJhD2jTA{0Rdwm=TeDU)
zy`==FnIYaMPa}l{BoxyP!%pJ6Y8a6u5&SeMu=wrejyXD0UQvoP7;xJaaC8PHdEH6O
zx0`4WbPnLVk{Phq=A}-8BcA=KI0$)E&Vy}iIY6dLbVclKOVtX<Z^P{e(9u*p{<dp?
z<Ekgk_TOR*YjWB7eUQxhvlO&I2;GSOXK}1wJKr2mR3OPuSpwyI0-i1Uj(r=0DBK}2
zMXl9l<B^?{6<B(()k<Jz`8T@^B#W(FI7-6?8iQ5N>65E(MFU(uc{&XoZ8WIM%HN~z
z7(DN5-PHWr&dMArQP4O{3+Wt;0f}<lY{6DO1(HcL1kD+^iy8;YohI9c{F%ew?ARBZ
zd3=ASe_l4R7=T8{lwHRqSd6spE7h(e*zy8J4LT^r`*ROK<<E*ZP6&p$6Kn;H^{>z4
zf+!QLIJc`}e%%~tphxufOe?{|X(l`ojgcUErhB>y%T*cSR_Uk1OR0KIUI(jT!wNkw
zYJT)j?u;K7MR(ASBm??f<Av|1(wCD<!N4ZSq4E-Tk;^nL+>=-$i4-sz6elllDg=-#
zGQ}8T8B}Ovnvlv9newZ;PAJXn!-10c+4mDLWh#Xn!gq7$c-zzdQmU;rL!3}9n4=lx
zxmkj!^fgqfV6#I{sE4EJz)idQM6q-Ql<(m|DCX*quGT}JVi7t<aJ0H=c6v%fR?MN>
z5~SyvQ&ul~>qzIkLyV)+;~b#iE!0C}-ps3<Y)>UHdaW4dc}-7b>Yq)7iN$In(vZ>l
zEL{G^ZRTi_!&@N_k!&G--O0|ch<tMB#u`B6-w=#>+!kjVgGYMT5Mk>uMly9DCmat^
zUg+sOxTo*((;?W}o|eyx_9rAV{|%M~Y*kXPNf=O2pj!*PqN@_gv5(7*PgMW%n0UZ$
zWVl>z`iFqjvT=lK0SD&x0|IQs#q%%wCWkGyde4%;#lHVzOfl)xr!$(7ZQEE36YA2F
zgn=RXz*ZWV;vjL9lBBia=DhuMvxL45jfWE0?{J#23E1r775d_jIz6gosq)!(wq&~O
z88*>CoO4`92i>63fX)Omet4vrB?>lJi(U6SiDTqcs~wpW839zM6ds8{-@_NZqJ)J~
zVjCG3;V2<nr3-F2PZJlFyzR0y#I#b$kDLI$TCgz|+9%#|4bRJo))s$$fyFB{KNPs$
z%9OA>ykt~uf4%JC-}~wI#a)AKc}&ubLURx&OGDpD1OCv1Us$vdNxu?nUjtnc(MZ(E
zAr9G4L80PvZ19J2R=RZT$-cYqC5FdtV-tN&!BCmf6a2eHYe+fxIln<Bx7eR@n7!HZ
zKQ0jceEKsTFe9w-CAiJVW8*na1veLd@fL$!bS?p{pm)J$=dn?AaJtUH4n9zA&BfLP
z1!Ktf8AyAJ!sYf=DVGO~O^&kP#^^a;q)~w6N=_v7PHh#>K}|DOG-ZQM6T=QN=w~x!
zYj#{N=Fuq<fu65PLPw~1K1+Vfx8IZ6&UGYc$hBg{1<&AU16@-(=t46Dq8w^>p2$<c
zxlZr9%tD7VL)ZALuW5QAzHy9>JVz@#l0(x!yIZ->%5W%7j=L5kQw=K_oO#K%i7(+h
ziWl`?!((bh7Pi59W!hHtv2E?3^kDZ|4+@mqqrb9Zv`a7xJ-ZToS)Z|m16#WVuBm64
z!AlweSGx%<XnQI;W>q?NWYC83$sq_ce>I?n?!6ll3S)W)r5Fx$n6EW0=pMr7&WYsT
zyES#)MO=u`z25u*U>pcN?8VlHyb8<*0&$W^Z(zkghnd!?Oo7j{9K)|}V~8$^DQf-n
zCdDG^MaR|$r!~QOtP*Z$;6MktVtCpQF_l)|%%xcz76i;tX-v~XrZ42pd;+a<!Yp5b
zJ0J*qu7z61geEB*#7Vz*!y0J^11sr-_p33qf)nLWV?t1CwoKm3qcJG3Ei4x)C3J?Z
zFnD3ItjbQH=|7%89DN5Xb`|HmDk4=;W0kb^#-4GkP$IQh)>QQyi#pc#bX%PX@!wco
z>G=6?+>-6gx2?3Ia~@~cn%<es2D7}>`gA&-eO<t?_|-Tt<ob{2`YRjmq9_VfvfSx2
z`@2~j@|8WxK`?|_EKmLOaP7@LPNr#8+_?4lG?Kx*A|jz2@KN5>NYZCT*rJxo$S)9H
zl&4#)U#@}!)~7Tt%<>g#*2yjU?UB)VHpTB6(q4PeXNc#3+Hc`W9{$KBx0G89a_Cb=
z`4Ji)Svo|E2g4Z=A{tRd5bZCM7K4?bm?i;Tv50+-^G6MVR%D+nlbgQS75J#U8!I=V
zqqm0Rone6olVV9bPZGLq-7Uickk+Z@a-{>4srmU%D<%sU2^`T$Cu_)lpi?0_Z3nlH
zBE{wj*|z5?%}0L?ROrhjm^L>b1XOAV<%Z?dOiXn|Z!!=T8`=lbBa+8w)260=J1-j%
zg~w52bgiaGS86z<&?zjmt1K`A<}!|_cEHafpgoc_<F_hVQWZ%AtK9Qi!*DG{sp?b}
zbb^e<&@|Cw%P7q+!N|UJ^@+&DmcPENbB2%hhQ_gOU#ZDCD)tx$l2ZLcVJd)A&hw53
z8ZPUKk>`>Q{e7OEIi}*yzn+pY7hjQj_+4|Y{JT}?MPKhPRS4AMy|!)8oo{E6k|g%K
zX`3SSICcY57AHkvB-h%V>8^el6THUC%sON<$FXGD>*^j}!=wD6Yu%t2SbY9enVTqK
zQ!!><c_wYY3By<qI}nhbXEhqh>oxmi(bCtkEx0Xst<3d#u3y;Z+T>-D%pzawN;RH_
z$zk@UxYi~3)p&A4w4ZXC?xD%HBtEk|;mp{x(xASZtrROqN$z1$Svd7%lbY!WTN#hF
zB@lowwi+5_5_Wn9Y*r4mZYIW23N44tW;>ax;8#+(w$zk3egnnEl9DihYmzt(t6p5E
zj+IIH?O`v)hw$Pgkoco)&SPWyr#0wzZ_uDsG~U7=QLR{bmJSPupUs_>2Oc7vxr7hz
zgNQy<?CobPhWH4+r%C-yJH8j@l4!PiqUv$qqbZ!_@ykw02Ax$RF^<qg!WlMkyBvbG
zV3r)7!BPI(#^1TJ4T1FwPx_g02hCE%v3$Pf6Ed=mS=bpYQ;n@r%x!>Af2GUQGJjTv
zlR&}6RuKByG2R^>j$W9*vn?~Y;F^Nt%d^7khP8rw?j4ZRH`#~HYa{y|8aRJ;P)*#W
z1{(zu&IdzHVb-i^)3bd1s^bHF&+MNiM6(m4-)Xue>hCUNH0IcvGD|9k5q4+-0K5t`
zaIu|0j)x=sdRaUHIk^lIafGRq!9bp>p_+8SzXqk@TsEqu)Lt6Dhk=0hNeRmu@`z`W
zVvSZScV=-1@%nD2QtbnV)B1rpQ8g07fB43^mgS$>p~zs#e2aQ}>E0Zus<h>nNKG~R
zl;vsHK%g%eF7t(7G8HAGZ%6AY=f~=n@YmQR-q8GEF)W7qo#HBEdVYZe_2t4)>N9^n
zxnj>CF+xyA3qz=ag<Gj$n?VmqqTukn!wbI(!jv|D-`4GPB9Ar2&onjCf@rCqpHrr_
z$&N|)-3v?i*Vr*fb#bfI5w_~?p$F75s9{EBa%`58xwNatM}B3f&fZ6(&81jLOmM_;
z<IvlytQx4^WXiNB;BJNclweHG$ZV>uoDi9|%^^_Vg}$t4wQw#&hp1S&c`Mioa(}zF
zW5O}N?*;qV!K(aSfT{!p$Lt;Df?E@IM3~<&>ET2x&YN`1-{bOv+wGljFLos>ycPCg
zpGSPXynL<e>K&pFCd(jJ0VaUJ92Pb==~%>g*)c^z!niI$uk#skD~Jlx_^f=~#CYdr
z>yZn95P$+tn+Si~u*B}Z+pFFwofLfJekUSeQxE(5h9t;ewwv(F;7M#SYrk)wY1;fX
zk{7H(#QZoW%0d+#61pkoNw)6NW!$nhY`^zuYq@AXV<I~npq`kjh#5VHQ}LXoX4!(%
z9ALnrU#!B#PEd3Pmazm?hYPiQe(<BP+M#qUmka>wuFMwSxllt|#Dabmm6rz-mz_Ss
zGSW@k4O&N(Bj{np59FOedbEa>Ku_fmD@mufR74Dk-&RZ}5po#%OFW~>AvDR6m?qK^
zr5T%&&s>ZJML5ma;uMTW>!}YA!gkcEPfkM#bi{?VjrtD!l|RG9305D|Xe<Na_Ve83
zh6yiRs`tAwhZNC^<bl+jk{wi8>R07e-onh?K6&}>)l-TUc;c*3WPV$mt%fk;RTM#k
z-zhlu%*&K|Z-UE@ot)#%s3T=iMD0g(iFe;NvM7z4uXG1vXr<hUhg^g(kcO~ut+V4+
zkIo|&kfM4*N=A;f@nTY(ODFVPv;h+-*w#>DNcfB30>T1Hd@8kGC^M%iz5+D=u*SM_
zyA0BE@q`};`&{DJsO<<cMMcJ%MNm4J&hOjHS5YiKf>9lxc?XXbU)bogAe0j%1t(v9
z<i_m%`XJFA(pbf~qnjd;N4!e4$QSW)h<?k#>DSC_wlqHmF|?9y3y2lU_Db?wNNZPq
zyG?cSv$B{$YQw@8E3)p_QL!J@=>2aJt*u4+46b$>H&>N|KKVuU<lzstAQ6UmFC@Yd
zMhf&Lk@#wk03565V@L+2ZgJBuP6GM-C>@(aYI#N~&6}*;+P*c9E+Ob8+RH(%=#H>_
z^6x^FO?VV!h$H1j^gW?ZL@CTMvf^iS0|J3;F`8=11ri6SsIM(*K0~R>UqcNcoow<Q
z;PTTK<w1j&q}0MSYN4a~`1asRow2}!)#z*egVa4=SbvD!xkEbp6CFhS8NA{SrDXng
zMGMaK8<SPzd!$vL58&z(jf<;%%Jb1?pwnic6pp7<T8%?qC01<{mEGJUQtj7R9h9yw
zmMApQ&u!uQ-k_i6pEI9;%)4s!fXsTLq}C@V!rOtV4ZhX96Do(Aj04Rs&Yju!ir<;&
zP}(;O!$>V-?L*<jTaE=4!G$=UJ(+zFLY6qr%zvSGQZqZm=44pt<aX^~C1QD-LmeQI
zU6oI?En@Q!GAP$LvcXIG#qz`Fisv2FkrrVZ`t|CK1+p_#UG}a>WYiZ|u>v%1<Ze;h
zV_I!G-t_qTmiTNOyi-12kKKAgN<ht<3rM9;5{UGwd++$$=lD5iy-o6VF4#o|@8Y?e
zp+JB~sdgP&3Z}s`om%~UZi*HaKp@{S<TDSBfl9aD=><bKMv>d1l=HN5xQ!97P;Fnx
z+nlq{Bi)A&93i{QbP~v_zo^DU7V2h0lj+3;Q6c%+)DFG|KiQ2)u!qbr7EZJu<%@-N
zclliR!m6kiv72b-tiD&4pxdi}>w5NOIb>FQvB1r01!Wq}dIg2Mj5ZnEObIdJe*Pd$
z&RIQ4ZJ#asf6hHZw$G>KkdenQypiKuLHV;L<~AS~7hYG;)YY7dB^$Ft2H=N6$D?H&
zA7G~dj6a{b<oKGc|HL3Yf>Y60ahyS@l|e3*H`p^QuKRC=DhGSR@uir?ez}^jS+Ey(
z<AuG6OVEznns}~>)4(-2GFBR3kzbG3BHl2n><8P8s$d%K%&D?{h^(Fxfi>B(c+QSd
z;*2lgoQET%iZ!h@h@Ls0z#VwR2!r2^6->~GOPY})qd6NtojQCf&SQ*avT8$ky!hc%
zt1x5?gaI3n7VB!4-CnysWRD#df+w8K4i)uAOH_5)wZaoe6ja0nc?(V1Csb9MQj9of
zy_CpF3o_`(vtB<xfP>bB;{a;!+ppf(xQjYRvDFbU=KER+U_eoc1=?CmdEL+r4*hEL
zNAOV-84iD|y6d#v+6}(wY3&>Q4i@<I&*pvi`lbK1zPBmz+15P7F1FcF9^w7ExzIAi
z&-mhJ147|-f$imRLCDV_kL)e>XEV^6ppuI|yng~>KtTbwALwP^g741=q5d?%r2wJ+
z^Tyk1=MQ9%lYP+Fn>^xkaQXh8JZuMuFBtd-t{}<Y1Afkf-3#XC6&Y{yW?3?vVjEIn
zLxp?7vz#Jkp;X<1V35qiaTN8ZYbOI2RCu!5j^KI93_G=SWS$~|$sbEe-N|rnU$jx&
zFnsit%qd>vfS`GD&{XI~+o)y{$qOGBa*0%E)(X7}>A%vg8J->4vMuC^S2Dx8%?OTY
zJHipu9jmD!&RJE7eTm}?tbUBJ9*$qA^vwC>#j)Rq#O8%MES+HmoLcWtH#8mZ&A*In
zLfA6|(*4c~NNJt^<}cYtv$B{;B$@BzI(=64bj>TAQ$iqT_%2$o(y~?)v~X~vn&&#h
z4<Kg&6K#;>vvD2b3&9T4xFF_Nag8{S{^cL9(WEUVs_@068p~bet^w8q)aF#pF|ZSD
zc^8D(VUd~gfpuRV2b#P1KFJ+>>oiOV(@mGD=l#(DBdaf`DT&ogs2&ku(P+GS4_Diy
zwBA)y&fvyzj+uJxY5X({Gkxk6n3s<(xmUe8(i6txN~iKo)z-=x6n(X?NVU`sx)1N>
zkhK`=ke?Q9zJym3Ehq6xd?<P5t%>e%Z4h1mL8W~3l`FS2>hH-Y5mph5k+Tk#QV(&}
zy6JY>FyWG22aip;Q8e*ha#?YHi){T9E-tfQznYB}rn7{wI=+jd<7Zmz5LJJrW>OLI
zxaWxG5x}_7=4r#sGgdS5(dx#@y;E9Qz7W)XlMshjNk#Fb%7}M~BOg7=44>f?RT+&y
z^`1Hymzt(to4FyXsE>i?^EWhM4kFosqHUyHE*j<oPoY|x*sg0c^+Sw~ux}Y=HH97e
zT8euKf5CV*$O>HU5{3SG3`(^V{lLudOw?WeB^Au^vcb_NeA1USR(cFpF&BfldybTN
zv0H!yCocN>T(_8U-5hZg{k90qs9MzRTb0QQjsyIbV#-Q0w_thc3dY9!M8AD9P^#nX
zbr<{DYouvANF`7-?>5OE*mUYOVuBk#)X8#|Oo$!xnYKm^PBCN8F&E|DmS)`?_9p3R
zO_izxyti{0JSEDg_S2q#NpVgPSR2_8Yrk_U63&aq&mf^`yP>2Pdi<OABNvQ7nRAGZ
zLL6q*y8pb{SzrvX?QuyaUMyd|&$n9-d^TjJoPnCB)VaGi3#~HG=XcuN;afm4u-#^q
zx^eI-=@67s*!p|BEd2n&!}SXT<YIiTJGw^O+OeNjjQa%Ctu{s3gwAEDOc=4YD`$2*
z+NwA|y**%ax=AsYw}lhxTn@@{1a!xUuin(#Zq;KCc()Z<@*Dgdy}Oc9ujBU(S(>r3
zc3yIAlJ2rR?Lw`!3vAh>oh9sbR(@Y_^MhBioo)w$Kwn&{pWU7M@$fJCs_Q<uU@W{+
zj)zk1ctPs2RF}Z5hjaZ+X&7qqOJf9;vWJf&*o|Md^uJrJi*8M3{un*V;K>yp_cP{|
z<v`YLoRWW8b8C_`L5vxRt!Trb6eaVp7DUr8kHeah$|{Q6P<m*lOuAPKiX7xK>9nGJ
zC|$MW;x1Eu?`hN4(w1(e746oTi(uCMO=XOFQMA#=26(L9ve-F7UCSHHsA*H2iNyrJ
zoX0e|!wW5JGU-KrC{u~q|5QEJ<VnDQ3-LHrUR>N`&bt{ozXE`!OtBr|<u2vnT3sem
zsbylp(y&~ZWhEZTSqZ;>Sr(pKm4R{fvExL{yXVF|7gvSr`xsViUFRXCD5CO5D6r5+
zVCfB+NXW%YIEJ$XnLU`xvAxj=^~TX?Y(s9DCIRc@FI*90UhnTJHBML4EgBT?X|5F!
z>*U~{4+!D$31bLfK2ouyC5cY_VMWeUBKlQ3g|aSG^-HW`TNw2)CDCD_Mg_TH2tWO=
zE(r%qk716ksDN~Pr=e;&@L}hOZp?|5;WpGy>X3H1{h!A4H<^{I&VOouS2GH~!&0@k
zPE{{bSH@=TF}?ZmV=Xj?rY%*joFI%9MY7%x54?}>6Uo*QyLq@+z4R1a_x4p=%^Ivx
zb15?<WtZ!7J>I9aede1iBaanPxR6=O#YnqCo!M(4FC6cv7@#D0hlQNgtN6H-n$&s?
z<Hn_4S;+Qyq*7^)ipsCwWuwmG*9*qI^1kDfF9^50z@`w9`^3bv0;Zz@^n%}Xa*N**
zWly_l<3EL6-wmzfKNw`|Yd?i-A%_1fW&cn>rORtdDNJn4-VrE2q;H3KHO+*)<xdB!
z=`LZLMqnz6o|g&_>y3?0lQ2VPmQF%Mgm7KJWK1e)N7G~gh)DR0Za>D>F)^=!1cCya
ziuC%ZXqeNi$_jg;*nX?pmpTt}U;(AGFl!+Jh@PDoU{DU@fPb~)geh8Vd?*E=HE8m(
z1wqy#+1dS`hJ#zP*LUT0iUU9zSzi2f+g_YEnfsG}LDpzT+mj|iPOXCy_;PLV`eGX7
zcDQmOxp3vW#@dW8ozu)Qw%Qxp;E|%?@NmIVYYm+CpRBADGob9JbaT|bJ?@yDS?z+!
zD|m6(ZF_fV{~$LHI-IW-uI4!OTqUouIa)XW69R(O53;7|^j-1y&J2QbDpLCaty?qB
z0(|fX3V{th%egNf9f_NV!L2oSFdo+18iYDCHso%jZa0*!fD;CXKoDpF_~hNJlw<kd
zph6vNHH}LF)lUT@fZQ4?kBEJB0Et5Q8;YjH<QHB?$lV+}+phr8(}J;?FNWcd0<-G?
zg#BHs_kgr&xOGUOhRRPBfb<9G*Y~f>qCrAntV&q!fbS&D`Teg;+Mn~$0Upe&uN(Li
zlkWn{4|#EU`JV&R{<9FTL4)U)PlE?pk<sf!v?2)K>4d_3V*F6;+B8p7F%IMz-TE=D
zc#EL%QYq?S>0)xItE=!-)#g;;g|;+|kz7U2{KfsJBV+EJVVpn(#uPX)=57Oc(Wue_
zd~rauhcX@V@^)WOMTx|rr6gU^Ku9U}xPuRbpnhY9ZrO%p(;bGRTF;HnU8NeQ@CZve
zcUILM<p<#lkZ^Ei(>L+w{HdwEN>$+y><H0GP480*lvctm5P&#?3P^K>htdPg;O1Iz
zttJWMYA~sO?n9dB0XGSB0@8k<o(tX}?;9Ppj@t@}X+vTjRUlnQkrt`3t+8>s9}QF0
z6r=dn)4}xBF^c%ka<Y*l@khxv&}UQJBxNf`WRSI9_(Sm_qNY17bMyt$Q*ATcbKLPw
zSFOTc4?d<7TBl^S$dk8&YcNm8c0ovZAvwUL#h-bQZogIq-#4GlWzXWbb5lcW3Ad?{
z?9ftiIY*Ga8)R?2wI2s@edpR<wvL-{bF-OH=_EF@5(p_XbCQ2Vhj9+`oaC~zf=Zo<
zaU*H^CaOUXc|jxQ7T7caL;dOszXE?OhLait!TA@SC>FIQzr5*L-pMzNNZRKsrAGZ;
zWv*7$i0#?&iOJN#uWeYG2J3)D;E6<0v@^2soGM;+I~NahW5bu33{Nqfxs}5xg9{*j
z4Q3ALn&@LHYuGl)H-4F|gdFaX=_|j9(yBHN;Y^$g{#$W8{^p1Dvju^ZcdHMp5t-A?
zRH`n!tH+$}=?~Ce)IDw#S>+l=^sH<p44AiY?6iRLVc}&H&g7DkR98RxiiTpETQCSR
zt_Vdhv4P4B&VFJ4wM}+2EZ-DKSo4Cs!*?TtV<1ohO?+d{8#azDE}ZZlI%-X0_%i-c
zTt3f#?%n6sMHzEEa5!@uM$QLha}xw{+<>NSs|Q2k8b_L}WoRjdN;%5Jky>Qz<7*X}
z1@RRy9rIm#9{Jm^+8Jmx>l#{KIa-=QF}&@Jn$4zegEZI=D_^$N&cvkoqh)Kj;6dI>
z)qqMHT{sPAtHA4$xK83RBCak9rvmOh(w?92tgcJHqGoOU*rp>4g4Uf)l{FV@tv~V3
z9Eh`{Xp4eTz8M277TMaNA<61eU2-_Jbd4QUgr$n}$C|nvo06H==hB23z;S8Z{PY;c
zkn-bF)ZT43eunw$N@H7<Nr4NkQ}qL7ccdiJDdW7<Fa-yVZZ>pkT`f&(e`=UVl^ETw
z-CswlpfIT<1iQ-|C#r}<Wd_N(n{*2tv3wVNN4Y!hPNvd1$czPJ?(aw=PI-PT#MUs9
zWr4mi7(EGvuVf9KG0XS1tXr@hWZ;!|HM?XnVtb!6!5sg@wpl3p@;W~hNlr&0o<_|6
ziR7+aZpwUoj7^}~ZJSAP*)FKUcyy*(`{l<e)fSpLGcrAi*Fmt<t0P8{y`S`~oRLNn
zLVGPlDpD^Na|t?ZfFFsr)%)!YcmJo=#F`NlhBqB8#aKUBfgdRn$fs@ak^hxpLzRz1
z7YIDgwpCJeTluDzJuB`;hL1DW?~XI2z@;xg##VX82xm$UKmN9BZJTR$7aPCN(09A}
zc5K&Iq@l$N92KDC+5xLrllQ*KXl1htD>vSWr+qD*N$tXEh@zE{-4`)LND}Df>%5^m
zJ_oGVzR>;tq((%3uSFy(f^P4o{E-T8L`<Nt%@0k&h}+o8>=vNgqy5M=&6&2`$m`+2
z>E67P;04W+NbEWN=uyfK{1LDhH2#!L@69mjh3%|)RxeHQ(6L-l=HapxaE0*fzy76{
zt23~!Zz=Sn6#V1m^gVFx^R1Kj9Z+}k=0lh*`B~B8z5Zk6!|dGJQr6bWQp)Dq)X2{6
z^f|WQ2h*qW@bb@xM{foAJ0Cv1pBW;7e}ACXrx#{NcIHD?rx%7^2?}!puEqmyCIjYv
z1cc&#&>_F)1b^g%e;~Pmz7x<73a;km$>ZzM#mQY~<$uEQP#+bVbW~d}*)bJ;N8n!_
zp=kw;HSJ+t$+^s=**U1y?xjf@<$<J4Tvqoh!*=ZP1xL`dU`#v04xGN^`xYcb<hWA@
z)iDzbV?@d}z=+Z$v%ZgrnUq^-7|R9Sz`DdYU@M8nG_3=B=<uMs^D20-wpnJzD_#yx
zkz^=ynOqaauzTFsmZ>vM3%BgBjO`+vUE%gZw7Ip+3|B)tP?_TeDkJ)A$IE@LRNo)$
z<{2GOD}RX5nDqL)FH!Bh&W_wV(`%p^T+e{xDy|vJY02dGG*TM>_A2XjSoh>PBxl&c
z$Kk|VkVZHtSXMHoGm8?U@NeadTOi~Gi3}i(i~tfVY}El~N~l$K<<29de$sQ<tnw-j
z(^GhU?c$V!`Pm`+kuINXsi4HUgd{(t^Q9eIx$VE-!(ud_lo3wh$W#EyvrUxY-r0^}
zZzth+Ybc1O9-}&R)=a&Ot=oqogKA^i2UJJ!xl8s(6@wG{{L||6NeE^n)rMN6n*nnz
zRWhf|l@Sfwp=8O5=sK@3C_tYH_5*qKPp566rol<`!Mn~OK^W=@Ye3-JcwJ3z6Ag*b
zX2ROcDn1Yl7;#7)!N?xt_<v`X;=i(`3e5TlMT|qn=d%FV<HHWTH{Yn7k9RtAC0xAW
zb=m`~QenUzg%;*@y%rv-luQB;tl``G{opJac+#5<S7PvB%$-YV==zdX3*BhZ&S%*<
zZ?Pw>x$hajifdB2_jr>Gfe;4P%JvrNQ%?;L^$91Q(;wZ1>X$QLCJ8!AcQJn1Lj}s7
zQETPbiTJ;C3^2izi|GT>STF~owLplIort$s{&GF~)Faq=rb`-ozh8rw?1Z5A>x9hF
z>NN&8(Cw{Vd+cYo4<n943zNb6Z~6TkuQXh~47(D~3pjrkSp4jk1>FZ20RK=R4E@*~
z-#9#@Lmm8#>K`(Ye4ozs=O+b~G}Q!^gas8n4czswax*!&^)pe-bG<e6mRVDd{;fj&
zZDC$@hI&b6Nm^_{R&Hu$YDG#_W=URJMnS52t~RNF3KS@LIF&|AO6u!^q5{eWXNE_;
z4;r=pDycOtGy`;W1_@F<|2^XKSSKx-74URd;Pb=5(EVd~`JEy9Z2(KyelhUlLZk?L
zy9WGuqu=nI_L#60^Y+vD<L>xp((b|IvOePy!7&+*&CFWLX)c3TV+*W8G~I5Mq$O;V
zwxYHW)d{_J+{>8x`o6aS|JN{KN2h4S$kfw28beYFJ$S4DAxJoDjefIqGW#3l8AaMH
zuWa&$Byy5k@l-=KR6-a6!;I~FggI>&)Pw|QKSQz@&bDcc-LV!@25i<Ibl+vaT+jVJ
z^vzM_WKT?**`Y0WtBBlgx6&k9Ep&gb#j6-|K`t{-QVoT8ZLRP_5ivPn5%)wX#mfvu
z->SFuc<z2OEOoA<#vsKkEXse!nkt0^)}eJt4jpHLn!Vqg+~YXSM|uA&b9#j<_LWb4
z2wGT*X}qg42F`^}+qBzzg9@FNB=JkoV6vHbm)s?S)3+u<7FWw-(k|&YykMynIu)5Y
zKBbf!exaF?ci_N;M0Lk{j-&vG`GZ`Zn#GdxVu~2#1OTmA41q)W#^cn*=ZaYZ*BM9-
zPO9^MQCvTWdNT`W)E6mWnS`&1q%F?ii(k3g0&J0l$S5-LJ?%QI-<H+v(P$qzX9eup
z!)PS`{9Bt4YATc{Gs-2HC8z+QaRh%zRegA;No+x3#>9~uip!$Cm~v@r0xqLG3S6e(
z_0s%U+d0FozG1AiqED>Ls9shbP`9Fri0LrytL$2#fmVZee+!zZkEf0Wmz)t|S}u;p
ziSbvssIT>;JQO;Krgeh+nl@Q+36kDZF1n!P2=0(Vd~G_CdJDKJg2+Td5S4hhaMu86
zgOwG8xY}u>+x^<>*ot=7Pd0Gtu^SLEXP&t@0_45-#7bSgahq`aCg*`k9GLtX;3~Cj
zrY-$G&8oUiYHxcC3Y5D4DJzlM6LMlE9<_T@r!hnv63VKbSdLSb+R<cCFD0;rJXk~K
z-I?-AaJ46A4T}3j(NK!P8cDO?LZ~VI3Vi<5q`zJoROfk;#_bPCLsrd4=~`cMwJ-|;
zRMMqDxFkQHlw-)@y}XS)?jZE^Cok(CT^cqVdg{lO{JQZ->6}aqR#CFE38A`#17$4L
zk|jz_A-O0bn(L`LcTQPGN=<A8I>~1y8#V)B7mY+B&%6-s@1H5MZ0z-7Hgh>3run?0
zR<g7Er56%?-BUI-v@m6=YPyu{-_x&yBFq#_e^*?6mlZB3gYv8;8i>FW5`T6m!xtOg
z(9aUiut67ZLlxV1YzpHY_t<8mGJhj8^T)Z5-{_GT&KM6bHP3E^7Mibwylte47ADC$
z{5GfySRQzcz`f+S1_$HYU2^fk#{@LgG?V?+zFhH5ezML8`HwmF5-dIA!$H+?#oOu(
zSsN}hQgPyH0#c8V43$TtcAh*kcqAWVRqLOjXdZYzzr`)t-wx-ldmQyf<zjh9>>`vt
zEb+J5%IcR|epupKTbNxk^K>hbb=?C@s!iEkmDRMEn*I`^J%O$5qb3B27QCLdy1>37
zzvw~OJhDKsvo5%TO?Y$ZYC%n{8j_U6YyIqSmwpWEq(G?~ddY=Vy<ge%3=5@Gpksc9
zo})<G4Qq>lMKga70lyk!HlvE*DB~!^|Co^ixoJc6iI?vGTJgu;aWc(gPU9xtsvJ<(
zo69-aZZov6Tk{;Q{v)SUA)CE1YYNoO^m8J_4e|yJtXZ2OY0EcTdQ?Cn_Rkv^NSe%K
z?O}9U7uviZnM`jPYq83?Mv9&ZXZHd5-lIEyov;=bP9ycw_rM%&KhlOIN}FYxp370c
zBc(BE(;KHV*$oa|F;b({bHWCo6uAkbPt@>GtjEmXA;Ixh^SamX8d+7-hh8S*ylos;
zO#|0miW&W9wa>#Sn@RX}!b54x1gvOlkVe$kr7FPTzZ5qMk!hTA*On343Urs$YxH8r
z9u}+6?0vAix`)ikJngE|sv#6K*7#y2bw*2_miD`zd1`@y#{98eeGN)<bN7@f)#j1W
zx=(=gZK%24;C@B7F~G)xxg~msfl_l_X2h38B>3v)ExR4VEVyO2lxD$Hf7~BYC@6ug
zOp1p!1B47-Zl+isKv&XlPgcfFr&Ojoy4q^amN}=m`1bYGn?Ux=Vvbsu7@XJ);d;)<
z60mbvz^-L4b1P9?qyJa|oBh=<1}J{^*2}${9w_=+nq_t@;t~ndz?g$;D!!H78jb1s
zrD7O|qkK@>Z$S}^6VwUA!`@&A6~J~wJP}Glw{iphflOu4GcH+B^jNRY8mf|H7Q2~$
zxQLlB@GcG<I`wBeFrcrcr9F8B5KV{?jWD(6Rhh_2IAljvSlPL!#G?vx!-iHy)}f$)
z93Npn!}ot%@ahtD8m9Siqi^0-A!VJ=%YV)dkD#y&d1s?Bv~tS}%BNaqH|_^B)15mO
zi-h&;9mamOV~+bAIc4b1iU*VvFlgZ^xte-9c^S{*okb&sAe|hZRAdi&`7q6Ktaq+g
z03Kpo2g`I+5YOEH7$6jv=ah@$y0=Q{C$pDP+4{3!;Zq7$oj?<6F2IVODI^_qh-va5
zWbqQ7XMoviR6hgSNzI#u43jJ-r@1U*elTf@`-I$rj5n>s-M@{h99Y=Y6RAN$H#~Si
z9}S>-a>3adA@XqQ_kI>oZeJg^d=A#eI~Khgoi?`?1APn%3Ix?$2Z``-)HHx&n_u#9
z1D}z~e>Mk{dVKZ4Vnug*N-$m7XGo$}lN$f2+Y~jq(PxFdxfPg=E{GwnC+boIO*Dw^
zUkN4LRLX=kbjVPI%dk@seeRzE3(}(oLi?_Hh&vIW_LeHASLgB{&<E@JFBKUldK^BF
z6uy!3+9u3-0;h;fBh_}RWI=Lxg#P$(cYw(#9|wOAE{`jlp2OD`$?i5*oFeCwR)Rtp
z5jbjXa|GdODQ?f`hU*5US%q-)k$`)MFG~?cQo=d^=8BSTp`r#uN;WoBS`KXGwrwJ*
zmnjAxI06=N&Q~AopnVX3PzhkG)BVKZLVwRKM_l2?N*n=8lVCzk9}J~z{XX^NpF}#)
zM-g0NZnTalEo?T4b57d<bXcZF&3(@3;|AktR~;=M9j!BvAjPFnEaWW|8b4)e?H?<<
zHvyf@nCbR4YOb^re?p6*uXkISc`*n?TKK1F%c*+kym|xO!#kZb;E#yeRylP2_9eyB
zr5^h|8BYF8wMrztWs=Yf12@tNH!>pJiRwE74TpnrU;O4MAU|Ig2<R)e@(Tm5q@WIX
zf^^X|FA{j6h>2QAkvP!LYrhd4Jxf5VCm0-s6Pr7>WD^mc`}VRJ^eESpiJsJHj~`y4
zG)D`Tr=usCXj$Si>q&I{cpNVwb`nOSy3H3kIVzf~jj%I5NiN?nOo(pS{|eopMTA6z
zh-s%l=F9Q|f*=Z+&6-luIcSbJ&Tpo@0TLp;<UR&o4lInBl-RbS5w!rC!RS1J&&k2)
z%p-XsoIU$G%^;wksFDk(Z+D<CyCAQvTp3t92Oycgz1(k<tM7E23(h=5J24yB$HRzY
zDGh_f9c?%hvlU{pi~79UVEH%Q;}fh@GVGf0{&10LAgK7k{fx&O{=)0C!0h0a-$yS<
znpV)X<^WzR-`q$+S_&ZV*&rK0&zbS1w(=59q3rYS5(A{Vm;@Z$N$$cJj*GF$OuRtx
z?Q3+;OA-p=T2s0j;fx8F-mrc?si}L!=$sJwAOkQo5Wr&gFg1aRP}w>T9r$~P9LZy&
zV^6bQSJ*{3=jWF7KR<m~GZzszmKy@rF`CGBrYD1-0%L)xF=5lEk-`A%2Y!e>#`7HN
zmR+vT&})~J3EaP?J@@qxZ@?OPi_i<1%KjkcbcUGJC8;Y|Ij?+<UW5wj^{zz}L(DF1
z8n?Stq^UpJN0V@#G>HkhHO*CAQSgDuK>eu(YpfB6?;i($QZ3N>wBVjK$O_oCT~V(R
zD~!K*u5nFa1GSw#w~=>lqnTE$7)}7#ZURh(alh%Otw|%NM$<!a|5Enb**`Qbq$?&b
ziO;L!ZsUn=96{#fULmV|E(#-Ed7uYc7pNvz7E^>4j-u)c|Mi3pjGG1Z3$opGHS<Qo
z3OBNb|KcX+?N8hA$u$YsL1g@PP$cd8H0>cI?6jX1tY3tRv~OA?$G&Zl>yS&YP8|Ie
z-S8yssztQ1U(;_z&x+lF3DNI{O!ENL;9d0kTn?DziP_DcKp3f(R6HA*pE}gIpLWSY
zFkrzAntUOmSJkMf1s+eZ<isb=A2o~O<{n5;9~35vRT|jLf8)L73R@c@#8jBss5;?j
z?rT(jM!8J2lz46kGQLyccMT77iMGGxs*E%h@|SgYMDQYE-m_fFk`J!O$YO^f^N0fk
zGw51U)c$qo60sh(Qfe;UeM7UR4gP1Th6)R5iM0G6)G^G-#oM)_e9ULi)J$z*9qZUy
zV@i=6q=-2;0}L%vzF1a?;7>%~(qS~)VBd)tFUhZpbEAYB)Bb6+ctEtDH|AGyqk1i7
z)G}%9tgg$17LyJKCr*gO)csZI#bP^I0s#5<f`&=dc+T(8<q!#=zlJL_pI}L+;bDw5
zt7HLqQn$3n-mK_69Av0_92vD;T2^n{QG|V7;7(mZ4n4(Ckii%@oAp!e8MHW-W{Ld=
zNH5SoQFS0;ijp4ZcB;|W1Evh4xFsmZ<tTsc<)h9l0NGN5en`A=3D9gq1GVvaI}-;u
z!0V?FcE~j^84Pho#jvQ;gJ3~E_A7tKRf#S3S~XOi6O2ez@3XjO)65dSqov1W)%*ll
zycd<|Wf5+EANM0^#L$4+<Dyz*f5t85epe0`{I$g1^F*$h49ehOTCU4c$$h`S>-WAZ
z$&KID-|)JUByPC_0bpT`Dn?Nv%rxG2^Ln+LxK|4L;!h4au64p3&J;`Q5yYf;N^f2+
zCYNpImG_O_16rT|j_E`amd%S@XDNhrpZ>U_UdJ-g%GezAZ6BINORGjrx841QUKLkp
zpEKwG`O-=~957_NB#)iJQ+2U)>8S&+8X4;K*&9bVMt~@Cv14p(RZXPzW|r6mujf6a
zpI4cgnk;VoG4z&I>omjU!Lm9M3e%^T!alf)H8G=l2L@tL4dJ2|(W1t~^D>yIxG@Ek
zt^2R;RoOM~feFK%>W+GQfC^kGS0Q*$zls-A@Fc%aZH(~(O^M0^n@L=a>OV@KPash?
zwx!8b<+JTJ?8=YSyG>3QH!6{dp)?gw*&<JG^cvN9u9e%@v=z^QPqx!Jx7<S7Ot$|j
z$cc?fSS)nKcNWVj8@EuCQZowI^SY!QNwU0}PbMn-%B_cY#Z?MyCQ5kI%(E#~4ouop
zCS0OHvePF)w~2dSMK5kY5QLLM@lZ2x@n6R3TeI@oddb*{{y;<Q&613c<&^(EGN&Az
zho&KZ6yG$9kkoR>YGFQ2_%3GBScRM_qbp&KDD*Dn`WE9cjMR@I3vaAH>FHg(AFD;S
zu%?~HPd&k^^dP@k8FmrEaVra`@ZRE=N2ii|pFctGh~usMs!N%H-a$CBHi+;{7x;~v
z-aFLMRd?3lDlGE|`v<`D#dHOpPUatW-b;ihdQ}^xXuIrroXhQTin~QT+6K0+0)k^6
z+goT(L4&E3aoQ+Qj#5WI3uR?^mUG&W#8N%~$3G^No9=mS(#Ml1*>vq*$*0fI8;qD5
zf+tio2v#*Kh&Fy@#_5ZHr$5yTOw`|WqqZe>WQg8cf(bgoSFgzdFgHizE~wN(4o)_3
zV>}Fuh)Ub?_BjcCA$}^RG9{1ks#!jP90igd5C@NZGGS(}q9Y@C%Iv<4C^`Wvg;4(z
ze!$l<3qA|}E38=xgP7~1c95Qqcv-K=&2m0vu@y&j-v2f9Eng=UuL{k{t?NdWM3&6M
zfU71QIKuSI4QpitvE<K?W_SG}o;&`OGk$~?=?~!yWwf<jTkFVUnmi1W!c|gLOl-83
ziBEz`4)s2glrzezppnd4u4N@UX+Mt`d+3kW@XcYW=bO>)Yt`oG`qj?e`EARep@h|$
ztCQ=6E1#dw>oemEw;!vc?eE5Cb_biW>u`Y_K|xg&R`O@%R0C7JXnEG*#Br{uXyyJw
z$!OsTq<@O)(x~Fk*yO_Pkb!y3@SvY_Cd;FgcCgxDxp#BG^zjfW4G#A`>_AE-44wcU
z_aCFbdnx_lGDG;>(afDM#}&bhb6oOL32<BTTk=lYtGp!my~x^>9oE9Jpk9PAsT)|$
zcknXS<%wIK&6(ZMn&pSe^>LASXxl0uU*abuO1CRXVDzW)Yh(xs&hD&`99-Pu#!c-e
zufb<0p4yDZDPlSD4iLxOT%Q&OOc#cS9JXOtPvhu5S?%!dTUsiF_L`&apAZZjUqFbk
zScjyjhtHyeHChnN5lsi@(gW^HQ@Ye($h25u%)d&asPhzM-66Ci7Vu2CPTeADs1SB_
zmuTK-suO$@Ql=^T9=0K2cb-V^f<sPO-Uf{?(kJb?eOc2i^5a(u)bQn6?<_Q8Y)c+0
z7)zDy#(jEMp4%?M?}=1H+SKl7)X_;wm3%g1-^)trCPO5a%y9)#dj!ej^dt}rz_vk6
zN@#_ny5gchLLcvmpU)R@dZS;r5k%p&Uwzx1L~cnQ%_=cyDh(l!yX{QC>!sjk3U8&^
zl1lX}7EAW(n0#Vns=0)%lCdS<bPA`7p03{#$nhVFc|5~?ENlMycb|(@fbW)%9Ccc6
zfUR{SnXL3JIcvKnh0Ofbe+7=0{iOT6(;UR#Lyhd>9Q9d+pP(+>TfBb3%QuK=X~^so
z(_~Gaew77fsdNmSZj|(_nhjMjEq;p_kKS%}^V4iA$+3`Dr0H+j$Ua?PrI`hW5;aXR
z)uUX5&dW3T#-y-NGzrHRJG{Lz^I2!4{;sPHNPiOT`Xh_0tUyU*^OO+tuo>u)y>m#q
z1})R&dH0|fr=zEFz9h!MW}2UCab<f#CoI=z(j-#P*LXEO=+{tw!b(L}g!d@Ci1#u2
zR8$9-ur8^@)hhWlL{ow?N`6DWt5M${^3OjA!Fw`DY<iprkEfO|p<kBO1X5y6=*-d8
zA(en3DAZ1+!mv7Afs^@i^zB!1ia*EmnSE(Q6}?>xNb~4A9@~yxx)t7@+EKev11VYy
zZ(#O2W)KHj)7`~J#<;_dIYvG2?mV8bf6p-WlRMdyoNNbDvqcnfm=t7k80DCel;(`z
zhg+-Nq!xhL;>(f|?!rd5p|_ReoSyFA8*F6bslC5+w0V$|I$0%*JQkE4by*WEGP!)5
zz$dMYn3Hx*G{fGmm81x($DBzlh`?A9>hY20qPhzngHDlw>nEPHg-gC$dufs8Mn0X5
z=x)r`s>H6#=RY~&#HNcvne<KR02^i?*MYVOfso6_3k_NY{bC+Wg&Y@Qe>usMK{Snn
zqW;F6qn4i_Pzt{*?_%0E;PrxSi@q@UJCb|H>ivSai|h6=;Us}Oj$RXg(3~g$aR)QL
zd<+2B$~@qa@s{j7=A{-20&7r>+<=#D@Oy*1OySM29s3*qNcqk+&s@Tgc**(_(dsEA
zmZrI(Vlc-XdPy>;`I_8`-uV=~xH$Bg6Z3aiRQwBC^(jZ`|Do)jf<y_r1yQ$c+tzN|
zcJH=r+qP}nwr$(CZO{JC!<-v)ZcM~vJ>=_(sFhi(Dpr0a!8Y8CZ*7=J#@!qV3&QO#
zYP#oM#qyWeVNqdYJq*-J2OQKu17rym#WtGjo|C7RfeEu;ror{RyfG1hMI-dmU=GHm
z8po)b8@IO4Pg^7wT}l~_ztmHunQIj}*)(Et$D}Q!8hnrqyrz0rhgwFACpARFr;zYK
zB_{-(x(?1+EN$9Rxdn8<o}~F}ZQP;E0=Ck^Cp1h@WJzQ`tksR)x4yqIRh@+{LP+{N
z$CtOsLChHn06RF2DN0#B`6~bbuk(S*Tb7;;q4~LhO@U(Dsz|;$Z}!_%?mjkFp!a;S
z{eD{4d-{CxIc9e@EV$98-SPb`*mOsk*-tscE%%#J^71QrnC8h&ifNXM#|`}spY2{p
z6(PA*Ci`o$)jl6afQ<QX09mDLALwiH!iFl_+_197kVqyo{O^q0kf>HWU4ogMs+3G3
zfcOu*FOk!}5@ym@UXSYg`vr-6qXC(`-~bGex-rr5%ZyI?pu(s?{4VowRT_h=Tz(~`
z(9ItrxG9Od2)BXBs|t92sfP*mRN4l-<L1WL$9vFqquHE+S^ZwODtxbZoN5PIV;Kv!
zoRbr1G7$6<16}PnO)l^7T~3qpze9}Ii*uj6xbdac%oJP%zM)}|J_XDB37rOw67Vy{
zK~QaL4AIO4?@xVf)8Sd=*o<|l83Ydluy}@8hj-^I7UOgGAtiLt($IMz6#HDxwddw4
z){e&rV{TynT^HG&eE{G+@_*5HhGikMqjxTdw2->D;x4Y^mh->d3SK{Whu)$a*(@5%
zjb?H+TGw{Cs@U!vMcPUF>8om6)@8`t4S;P(bWrGx{bf=JXRdno!vMle75a(~{7(M{
z4gNHB?|f*(ymF9Vdk8rfJBD0kM1A`%YdNbaUB2LjBp@ZJ6j@?m{cCeiz>5Quh=)7B
z`P(7YA=J@{4PqXbf&@~;<r8|k<w)nz{d(5^n!B50`ohiRd*xc)y~1XBeXD+}*+g>Y
zL3#PfP6-g5q`cl{(}&r**clK45wf^G(5ImnFG!rrOat;O`0U2(^!I0O+Aa_EoK}=S
z(N^)d3%jxh8ZfJIoRxA9N`Ad)W?(X>3^}Qx&W;_HjU;LpydYc;c?RAKGvUKM;G}X(
zGd&q3vOy|lv1bYVvHAJka`yQfM2){~uMKqI@`mwEIy#2?xSKiW{)ovu@6z6siqCf?
zg3h#safoj`{0qrLLJe}WfAXWgXEUU_BU_Bt$wAq7I71nSE#>(u2*pLpn}d%jUkBS!
zxC@WTU_1dG3*h3Yl!XH_jqco5vp%yvXch93!A3yOuMHCq4@wd#4SpqRLZ9KX&90tk
zvkW0CAVv3tg*k(FX-jp-F6{+$I!{k(L46k;vDc7dc)})`ZpGGYczyF`=hCBetUzHN
zlRy9ro2R%kLgQO!-2!>=E+2YC3u}g6kPCT3Z*wqQD(AyM!4O@4SB@&N_9;zFEFYG=
zD;0W2!;{V-#e&<&QpWQsMo@Zub=}aRKSyS^ok_E1*mP2tIn-z*oGqFotHiw(qKq_E
zPg6hjm5SEB>eek}rTJaq7FwF6*H)}&55ud@rfUvD2o<<5TR#N(eDH{2&9Q_HHg~&}
zp;WVFa4obh@h#vK6ZlF7O8170c_lnw>BSE+ObEKk`P(z{qfv!LCs@0p??_iKjC;lO
zc|0#ve14}~VaZip!Qs4j<*4zLY2^MPLjB+M*Wj(8GB?J}dU81<OItZ6#`7hBTMtuR
z(S&pW5b2(dk5vQGR;?X7A}&#^9f^DEi%K`NtlYE60yf6NtHF_~G2T;UNMi`<;8QIU
z+Rc?Oawx<nB07Z8G0E%roIw0KZ9<^fR&bs-Emlv(!j%XzKqp;(+sKm_7vlOd<w!SN
zkJ&YVU{jYTF|`7`btE1cmDlB<mkcg2Ai`Nyn(F&GX`P*x&9w!`@0?;#v?gq1QsXHZ
z!f3_+vO+(P5-?TZ!nLG|n(@Ph=Uj_od-ATwowY;}ZyYv4#U<`cZOZ17#Rl;u<C@f&
z&SilXta!^OTx~_m{v(l?Qspaat2-9>-&dK=djX5`W2uL*n~Cy277^CS7367TqyiNJ
zFF>ISQtgL+8#nrbjnS?p=~7y?-4;5+1@4YRgh5x;<`uj9?z@vkNdBB3oJPvc%@9;j
zO5@Ko`i#)v4)#h_Ufc{<Oao|He~suJ>Nw@%m9C^m&SSE0<w4{1aH2wB!-?BtL|>WY
zm-Cu53QO#Sj!>A1C^LgAqN?u5FA<qms#49r8Xuq9Gs*1o1N9<+PD#Swy9&AMcyaK>
z2NI=>whyj|rJm_BK7>f|RxpMrBNR2q_Z_~#4NG`d1#ljW8R#Fd@e(E(ORta0eiWB*
z3u7A?l5pgoI}tq(z@g;~sctyS<kLe37h>AeEg%GT{<aY&Ex*P8X_3=p{e(e*Y1g)P
zM<sdeB0P4`wzWrcecfsUfW~j|=f()Xka?0Cgdao8ZaH5mC`~?JS%KCVDC+#z%p!_x
zS}3C$3R5E{lLI8QtpwBn?y^fb6l19YPL|nzK+BQ)0Q8();~y(Xeni9Q`gwl>c<H#{
zVrr}`f?~TkT|Z@UJvD`Nh)&wBw2tq-KIZJ4pA=zNGME`C64B(|!MJrA@d=G?uv>gm
zuQtoXb3~N0UN;qF-He(@L{Lj&N-f}!Z#nN?!hJ_WpP>E3Uy{oZWj7~pnyEPUaHiz<
zhmsw*6DHJHBlYXaNV2JUr(>uzxJ6XW_z`-8!~q5J6rHRIr*q0Z(5>Xy+VyPp4jG4J
zqr=V}ao{MSzu$r67BP?+9~fIX#ViRARtt^PfVIN(!8L{&4-})eofqUf>lmrU9%d?A
zlY&I*8SbH2ha)s1N+~1ksp^zDa*AjDRWa26$%m4~yXdk<S{8lcsRvN+X0A4G=(TuI
z#rT5wcxltEyn0YQG{mCgN@5!TKIY9qiosjTs@t=|WGogO+7u6A2>C!Gf}NppsH@c^
zWt(WU&`PpYnSN(&tE1K1rQ4wgpNSneIY@cR<d3@FqsDJeWe<{jhQn4rGJNr0(+hnz
zKq_JGPZS{1-i@k`yr!8+aOo>W_(|#Oud;&_FJ4g76mTk$&|C3!-P*l=pXP<AKfxQ5
z>L7P2f3)qUbEp5EwrXS3XP%5nWGC#tW>Y^$S8BcFZakIYaJ^aWYTABsBYZb_nZt%8
z@$t_qRnayX<-n6-<B%8u_2}FGG2@BTlVW!a7;oX4=cScDscB}10kztwGTvWZU)%_{
zWBqNY$hjvyfT;zNmDGcP*S6N?@LxTN?{dd@@&BUIzX$VqRb?r9BSd=K+KYNvh&Nkc
zJA>|9PUIyaq-Its!2NZgUWVp*T<-A;maxaLTFizY?W%XFHh=2Lztr@ud2#a){)1Uq
zuB|$K-<@xO`=`PBx?8}MaxF$AchQfGgIIp%>MNh{?0~xs^#idvWU6_=-HIDJmiSp$
zLsv_!T=Gm+L<{8M+zc7?6LX6vF8r*OtaQOS_0`tW+3*n=A?|hR$w`m^0nV14m5QWK
zii2XFjv{J?-SKR(;;smZvE4SO+FlQFqRp%|JQtZKpJOq3plo7qZ1<w=nw23cUB!51
zQ>tB6?|xuTe|!>ahsOKyh~LAMsf{`3RT0D$S9e*QHln=I__o-dHF?qD)A=W(uv%(o
z1L;=$gT?{Z$n2<F19w(WeXG6taC3EpVYSehyQI|6Vm$W?LbGM2fLw&)gPS7T`58Ed
zo9ZlC;Uzc`U5BN!nNkMV#0AA*rC-E8C>c5Iy@<E%b77x(_+Qsk&XrUfhw$XuG0_R#
zDtU_CN`>0H@vW%hzsG*LPcFkii96SmyG@OX28MKkTN8v0%lO;9fjqbOOk7Oj>7`d}
z3D+eXh2Fxmp5=wd>`ftc{78KB0QP{m&=>3Giks&JWrXo0mqIR&NCND#vOc=CrQEP+
zk)kel;5$DtBu!pU!5a~tm>{@~k`5TO4-Gy$V$Z7;W~|nR8J7GNBZ7Gk5C@qMwpp)S
z%<gRm7<P>aLj*lPA3+$deJ=*ry9NG(K$6{h(xeM{rRDOcIUHbY;sG2C5$ANLDl%}8
z5L9whaRXA;F!N6-aPnr|X>d!tTPCUByHW#?-j9=0kwnUx1^|s}Nn@Ey(kIxmo`am^
zCu)5T9J@LKa=G_LUnG}HVbAZ5@GUbF=W8g^#lQ_Z>1@H<hRIETAvzdA4DUk9(;VJ6
zeF(#{;@;68K+h;(Wk-1TwHJX6eXKcGz-X8`<Q7^O93)@cikOgL=axh9)5;dSb{}U8
z!ui~bu7kQ=_Nh<tUD^_FHc!~NhbB_rGt~5*Lm7Ye$<EB|2D?{!<j12AGga5?gs+W4
zRpjK|5RgGUeNxq%DjR)ArZ!v7VE1Qy1hj_v%<xaR-PbQ>AYTo~@y4Lnj!ho0VIyvn
z4tHdmuBmWo+<dUA8S7MMl-RV<RRj@?%zgrD3O6%k+n*9y>RRiOQWpX_CG;juSh&(F
zlx4*gdj@MbR;V8wRhjn9WrnpLsD;gvx}+e&538+eB;l+b6hVG^>0oq?LxOw(R4Y>0
z+6j^@p@$5YP;z`=nGdM5R*|;3F5M_7ehvoH-p>Z=29aY))xl6%us=f1DZ22~)5%Ba
zMhb*D2N5fJQOS8HnKQM2>Jf>xk`2}O2@3BqXH?s*$9EF(-$uMfT!I+xa*fFQQ|Oz@
zkh;Zq76h*sJEek`=F<1+n-tExSImaVS#$_o=~H>bUO=_1lqyU^@Z^*Bi;fm~lM2@d
zjWF0IbRl`**_my&8%nCxIf=pe=H<i5B6Z^Xh6_-MG+NyWkbz+OF`YaIEj}dfhCV?d
z3|G-Np9NTWPF%WnF9~mC;FI7b5fA~nPrG5WJuN~kREOa4UMEE<N$UXg$HI{4*xeM?
z(dSjYkX!*)PaoMH#VsupJ&KNc<#4~<@Xk#XAit=Qhj*jNzJ0SsD_m3F7JYHG0Q?U5
zW|4h=2YYv5&^KTMEiP-p*m8Hbqu`7cAI({#DoJFZ-DY)|Xlw>!OB8gemO~x|@*yVh
z;k#EfBuPv85+X}alPZg}*b<IMgdyy)JkB5{pS&9`Dm0;6JR>MP@j=TkmcL1*zfYTM
z!HE98pQ$^%pXC0LX`Dn-)XNbjzkNi%5&?0RncJXQ=z@eFULkSEeGa)w9$5gn7Wg!R
z=u%!-o&Fe*>`J%h2dlO*)B{Hj6@5G5IKODu6zeOdk7)%V1*B7StH5hw4pK5(&;$Fo
zwXR11s&`21j^Gt@+ht2MP!SA1)2gZ$I67+<0?rJBLvqBB`?&loCAuSk5L<LSgkTN#
zj3BT_Hs`$*W3pZ;Z{{W4hmndS<LNL)J3R08xNTE3Tg7FK!bS(7)k%bUFZu%$)AW@>
zQmsn*%}?wTAAu?VMvw^xC^-a7fCU0XN1Z-{l*yxz*Dmwd>ht$uPMoTfPmR4Ky;WiB
zC(opPn4h*>HqJtyJD;taQg_rU0cSb0_S%G|R%ITrBlKO1&BkA#U7j$yK^0@FqH_vC
zomAh}&ClUq9C7#&Ls>y56G9L^CVVVuh06ztH5r<S`7v`ImbKVpw`D^yU@cAQM9{`E
z33^`Rg4L?UAes}vD|6oyuR#09G$yyAB|T$@LQnIq2d-pN<jHZd+iS}mH*N$aq$<ki
z^rV=w3Z`%huW(j#ScnXFSuS5a3PjJF#Ef?li+fHPnn*$8o>SCEf^rsGAqF(zijxo3
zJ%aW1HL`0T6A=uGiFlL}kYmeypDnN)*VqJ1AoH^RC_N*dnWab=oX|HUhNU1`PwH4V
zw%t#}bMXz{oC4<&u4t_WWqi?#0XZhd%?tVzj5z$jL|QQislaKBafhbeR2aK#B?L+g
z;dnQh@!u8@GoUBfd*tEnmkQ7%PdeP@4fD%y`(q*tEZKcw;YFFwVd%!?%#u&J;b+vR
z@5|G~?C$3&TuO=oGr=j?Dh`vmd7gzEvmjYguI3X+O*XGj<!n9g3`q6Bf7B^XqYTzq
ze#TIn*4WH8QaZRSag*_L8ys?R|E<?@v60h~+Put0;mUL{BFrFIH>@_8jx!>GAD$GH
zOa3dSg}OU%%BtT&PxQFM4I$BPT-jIL)7^6*^CK%#kiP(H@)_(!rO0$1t1%j(w~MDu
za1i50lo-Xi^EKhFt=x=a8;}=b^A!@IdPbBL%XeuiyECF@QHd+`NHpOkS}nfq%#+R@
z#jkxT-3(28ObICC-)_@`Hu49qJrmBL-wETLM%@e^SP|$rTddM}*F(;P$Kx1Y9)m5d
zXvMk2aJL>raGAXsN1Zh!V^#CvwmizcyV6WkIhzHn^^bf4);v;06ZIS_K%PhJGkn^_
z6AJqFH@?FPrgP4Gv%Y$mLQ~VaIdU4w?Xk1yfCL^1MKUCnm$p|Q(7ZH!UgOfj&376(
zkmFX!hCe%fIA0763nUC(;cB46hyeq%Z;Jgd{a}?f8OJ)mY2(#kyG|`EtUy!1!P+Dr
z2bP*A4aL1ZUF|2kmhB%I3o3?wm0?jW#p(q*niMT&j^te>MZsqgs(Layq-+ty(5S5b
zLvh{GnUyT~SbGg4uvjA`oOOnXkIK@p8%-pH{b@=wv_&>6{#Oq4GG2);ri5yy;cU2v
zS$``)URNB;Ce6w<)KRMDWXUQERYdkFjg$2*-L*c-NfCLBmYxVpOxn4?5s=X|fj3L%
z;3`l0B-J-DM&s1sEw#HExlWqtYd4bt^y&}wvB?;#2Ov5Q!ypq~$`npqzWfm^TU4r3
z$31WIzu@(aC6!YNHfxiEC;`}{`OnHV9@K1?VaAO*J$N?^T6yG1$Y+H=kTk1jp7~b!
zclM0c_v_))0;=7hVnwHD63uS^mex|2-sn32d<FvTR0yue!n}P4I(mo<cv0G1QNKpI
zz}w&Hw8D$B8fFXPHlz08cp8h1FiR_vLIh$JLc5X5ih^w~U+1x#K2^ZhsV*-Kp+ZWN
zm0iHx2xnU0m8fHfvyGyaB?8;OL!!}}Pt)G}47XlvjEdzquW-u}It{qbS&^~0k4)5R
zy%;{*)mizzyLwBq8F&2eUU??NjDs>s%Q3C48oQz~+>n(K<MVW4kXGe~8OM@C8kD*}
z?k#zEy~hE!B_6O{qUL-2Z{4EbZ656efB;&)ogUv35k2LaHoe`xe|t>|3FlZvVRX4v
zbCb37@1M@N)$C1t5at^h;NdY!qO?^=;5Ln8q=V}(_t0zcC*#I;ca5*rs55IFvF>)E
znqPr!&PGA|T8404YNH>6{Pei7#=4MUc*z40Ezzs1o*@FDDdd^8)$0BgNx0zH<!GXd
z3hM8X!XOXLx)&eyC!jjTQ5(I~+61(SX6t`iy}<c0U_8@?m&E$z)eX2pC1G39N#<}u
zlk*IDYP&JQ(-|Yfq>7=$Q%Bf~pXp%sqHIrZ%gc{)l#{2f5(mK(UFONUG?oN<@JUav
z5ZUQCa8Gqz^xRTMRE^Do9>QpM6o4dAmC9F!L)7i{sYY)XOU8(I)LO%O7T?N8{Bl3n
zpPE`YpNsGBpxK_~WkCa+f?Rq_NID$kZ!oz=$!e+Vhbpr|EbaSc7)oEl$oO${`wf1$
zVc@Ba2E|DHDhQvle$1@&_rDN|Gy4Y(LxG43&q(<FL)zqg2tL2&v6EYoj*#;#j#cjE
z&TL)3b06Y~<Va8AL;AAa8kaJfOT6&7td8YxV1mhU<pfscR*&X`TS)9E@(P)yk%0$~
z->Bcdi&ujmTY6F^NOV^Dc3l11$MdHgKfXNDcA1VxIi7Idc8}(AK^il+%I!b&;f<)c
zj82BbF1TxpvRsuYXU*v6IRV?SCpPFjeV1S!I}ibghwwr=ud8ye5@Mk^kqQC0;)8g&
z?fu>Xa><B;>!?Re!|}=|8(q91q^M8sBYJtnxgvedu$<LI6?-ZaODL55yTGG--W~*t
zP-rAVKyUWHs#Su{K-<$Dl+7d&stQXuJP$|`Bg4&x4P3jEuP&6FjQ-}TYwRieUCU~k
zq=1*8R34Zeh=rV%Bl_fd@Du>Yh1YH2AmEjY;KoI>q;C~PmbWsK$86<%w@Loy8-#nD
zNu@CUMT*~rkyeRG-!~uHe$XT2aGbqRa2Yt9pxkDs$96c+a!gk(CVYk2QVV2fjQm>%
zKWU@&&iFONNTD%b;e+@}#_qy@foGMrD|C0bH}&;`_G9n)^GCj5^(&eETjNmnQS<QU
zS>+J!VE3ubd<#6`*J{h~zz|ul-sw3xvQxPRU00>uaI}smK*e-gij?^)&^snOm$&2x
zzSf9D&rhxHS10N>_V8hR`dzi?-M9A!|KO_?AF$3wcU9=A^>H`;qBq)(SkhjzCg2H8
zupJy3X3sY-{+DORI`*umpV}MbZCBD@E2KxBp{?51&mEd`urLeZ&b5i62fVFXj{gnT
z5AweE{<>5I*~V}?&cb%lx;GjdYg~8u+Vly&XY}*cezNc@xa}LJ`1R%B1JUy(*6>n-
z7j>`qaN!5}Ol)Y?7pPwm_=mUk#Z*Aa7vdpNYtvWs66}Z-IsPuw3|0P@oy#Z3^OI-g
zdJ4chP#NH7a_Y^!<j{HzTVuz10B@bG?$*rr?4VWwrWd^Hn*5v1FT~0B__VeG$kuSz
z%58fGiuea?Gw7#Q<x_X@zDKO{n(__1DblpJZspgb@tXBc=Fsjl-TyF?Zw|Wsw{79K
zQoH81x^3Ip!P`)z`eL{Fz%)mtr}fY!@VOdSb@sOgmv8aj$9D93MC=Wl>wv{44es~z
zL{=0CZyyZlvvsv{cK|8R{qg$uzcg)yI~sI*H2{GB0LK3fhf`$!w?Pg<008hmh-f-t
zMO{TFTL<I+LXCxkKh2EG-_8Cr{~xIFwK{|CB0q+As_1}u@SWPwLAb2A5)c|#)<jr!
zK?FvcStd0kQMlBBAUeq}&<_BWF9698ka!pnG%yT3pn;*D9$5Hn54_Xr7RR`-$gTP*
z`uJ_*?&+sjX(s>zHJ1aX8VCZveH#EZkd0v(!ykEM6nLwBJQ7xV!Bw9>@c%VpePQw`
z?4~~P@bJVihTjkvMyJ{h`d2NdoN397V$uvxwCeS=quXb2=tHLv9jCIWPXwgy4utL!
zL2LgCkKr(kG8JF#+ZX+<+CDWOraQ+tyL{C#ZC{rC+>~^AXqQ@*OEhXswGp&N^73#x
zHD0VvR<vyG{CG61s}U0mo_*xg?tscgt6n@!TX}MCX2%u7ru=X!D&h&uY!i{k6oHj#
zwZ&ex*nS+8>h#2~xn?658N(!o`L$@WBFNujv|tl&_TOA%^ole^zoOc{tu5ulx?Pzl
z)l7DfEZ(n0<NVsTh6V3-n)A=dko{|t;4nq8h$1x6SzscoorSYsmJ=?&!kK|!T>cf@
zi+IC5lpJeQeDgbgxcaE8dHm^8aSUV881Qi51(W@dc@sxBICiK0`(UD#|Jm95aj|Kx
z+-gY05j=5+T&4MiQ<mb_U{<JU(kg^%tipAYVujU6^f0^Cik6)vY5MY^zI;jC!Ac_2
z`DFusTs!6Tns=^pf!C|c_xdxu;Zv+Jlh^XpA>_Vi?TLdnMX5ov@|(K-`TOs#{4xmh
zn3Gc5!OsqBa22%tkOM4Z0}6f)-pyHqyuI(v{^GsC{s(>^Flm1f1Nw*D|4YdK|5SAY
z001Ba`2QI9|A)~2KeP5f?D+o^JzkIf&u2&Fp8`<aC+PD7W)BGh5lBa+*FO7COyCgE
zVSVf@|DyO$B>x@bmyg8%mcmy!|F2Rw<Nubzo1;(7s6x)nB>tyQzpQDjq^;i2<94@)
zx3x{!*4YW#+13f>Dq-ikx+iNFx_5J9LwF`tBDTQ8v$%NM&F6Si;Ye3CT=QYEx})sn
z+|q@D!A`X|$^wuy2lVCC{|_@C_=x%FNclh$eWIGU1EBEU=21+%eK<Tng8KJwfnGpB
zfS-rg2Vcz7<=5HSLup_1rQ5@^iwOvbamw<=#q%HUG2Li2^mjR8tc!fij5Ex$>`C#;
z9O8<Qu}?oy{ebx15x{l=BEPOOJvUf?YLc^5Qru_2$lZlr0)X&1I#Sw3W_fL1sup1x
z9uXco30g7^d-0wzQ8~HYr3v<pE%txq+a8GwAsy55*U*;LCq|oooO6@8Rl2EuUT>yh
zzOUZL`PrHRyqQIHtF4E{&NDE^5_M6Y-R)lQz&rTd(d#b&RvtJ2!uN!}@2{w-nW3?z
zp|#PqxaozN@jLn&`@Uz1Z{ltrZ-29$nn7om1C<-#JYS(j0J(Nt^`81)lxoS@J%>b&
z8s{}E5F~<8lJP*|6ZI4gKE5o!0HGnHc$nRW5^8$NJIBJ-pjWK6pc@3D5CiE196Kmy
zwCrFy_K3nrk^v_bn4mD!(vbVyOg!CIzEBZormI70MnZL2t~*)D;x?pUY4z4DEqKO>
zzk>L2T(juh&W#+r+o>*%ggSTkEV4|y*gnZPr}ShGY?aQFEz4{<@vR+B+rBe{<1Upt
z*u><pEe^Qnm5aJ!BT0kN<DC&55|N9PMS-uanPj8`NtqzPo=q|odt@5O>k33^lh+Sq
zjeR0LhmbwCk<NNiUe9NGVI<mF%vQZMd@6o`?HXaB<C#41PeI!19b6WEaUh7>%O^R6
zWP0#5MZ^@Nw*+QmxBS2zXtNvnGl|8KrhuhP1G7kCVPt><e=JK-x3!KswxtETPK2W?
z3FpY{5|iAIJx6TT-jlM}sdMZ75w(Plj(eMfqay^YF;fTCOmNvG^yZddi)l~I{;c?q
zKLep?gdfK6oAK}B3D@{S6JP824O>nN{52k%wkCqJRr1bbxxrp#Ki~U1*X5Q($R%jc
zhxzKvC`3ULj-;ultJNgK@^nTffH4Jy95`g9)KX`{(J@d6l8i8bRAfGl?efFxHU=)U
zB?<P;9n(?%QgSvX-Ltf$rx!f|Kni6Q$)QPtO!BATgEtM9Rl$SB==oH%<f7cAZVK|-
zAAS=U6K-lQCq3J$4eHBu3h@S^U15{!>ox0kDq4tqd$<>Z&0!)3au<+7Tot%yIg7YS
zw#Nr}PdLj5^5<-Q%=~u(9RXn2*J3UC6SUkDC|(U;*Sj;9%P4^wCDW1K64PW(0?*Zf
zbGfm;G)KxSn1g?gS|>*ap!~*wi~vpciYoSD5J<~&O;crPiO}1A%yn%t!FI3gDP!&?
zntzm!;>Pq%9ekM{kTOx?z5l*2HW|0llyg_fVG7^Cq+eZ?(JxZ?z#Pq7AX9V6D?D?p
zYAY&4C}ce={Bhhuxk4nCY4e9@i!^}(4rmLcOu+P|W9CmTw+=a~vBx8g-9`fi5Y5i0
zHgZy{8nkc^rG3Ulq#f>#jYEi1vk9W}gv0aXD77?y`jR8aB3@~yI2G_}+7uuoLu0GE
z;6`CVq?+dX;E3>5J1FU4;#=1q)FaSomexEOdogSsJl)d-@i+JZvK11(yfXt*+7b+y
zlbtf*VdA$$`LSHOnRrrw{P4@Wo>byTEl$^8!aoIHiKdf9eAEJn{nRJby+Fe4YiBm8
z(kksy-5!N*ti?Vx_1g(k`#jEfYZN1(pg4YMrjdNyKPGS%>NE7og=iu}J&)ycRT_@&
z`rRJIS&}FEZ4HAtbyU(_I}Lq#{Zvzn50B+=>7z$1?D}n*Fu0QI#sPjA{27RAX?+&D
z@dI|27Nmn_9vF73(V_t-Wo~lbeCYl}r{CKH3()QEHs~I(PvqeQ$B~lF+(xxGYJNBn
zZ1o74M^MIC#pVeh<*S;mU07rxmV~xYl?81+*%F<fE(pKr(09wgLzufG5_JspZ0G&J
zTv4l<T}wB`U4yVBRNM}?nN*|X=b?lAHoDCn*;23wXZ%xC_x!kffsV+WhgGrH8h##)
z=YqJcQ<nu-r1%aI@H>&3SE-`0Cdzlc&S&w=e|2zXLRA^B^ShxJ!&h*<S7kv4QF%o+
z87=eIyYnnQkP^-JBHPBeQ6rBtR1D-$R^zJ0wlIn1d(^d+d;+mJCbRgkSE}yiKV?3$
z0g{JOY17h4=I&Gi8Yo17zLNvtvmG6v_2(pknv9o-`#+-UH|Zsp3zY66!aJm+=yy%h
z1i>@d$eltV%~OsRY@X)8mXAV$8xeCfzA?)zGvZ&SFeV#X5#;5|MFd;y9VX3Q)^No{
zzgOxaWL0>daw@I$abK%Q<#cG@rWl|k&uCvYZne8MJNcz=Z6)xZDZB(Q;?P2&Jw64v
z`29%BBZIPWS!J10bAuf29X1O;_OTna-%{c9ZlnRuu>GwP2}!NS!QyBFNKw{=qe>On
zIl)dA{(y1HE#tKhmF!<mNMl<BBNJ-m4b$)wElhH}RoM~RF=!Y>LbyA(##vyh0s270
zz^UsdL~Nvu!$n-~I9ATumVX~;vZp=>TEq}^=%L5e7JVYIg6-`x0r~@0gzWcSi7x9K
z4ij}JwM`5m3Lk#YdjXHBNf)h{^kH)b3ph{wOovT)kN{k!tkMV|qG3>THV&t**wYu#
z^1Y@ziJY_D;W)OyY+MM-6Bx_kC?tB&I3B5=Bq0$Hvzga%%_iblRa<%iqtt>FY34b0
zD%k7d6GK0?#N87(UQIm~owiPVh^r9b9d@Ig+PS=A9V9#WVttCIMMbY2%m*DrxVXlV
zC);0TrIuB_?*Qh%Y|6+lcpuio$=f+$6oT&yZO1+5fd}2sd0u@;j{0?22SYJfy-l{c
zU!`ylJhkQNKu%oo1d;VXy)cGC88zwbj{ZSl-q+#XNxHBD<%FYqOEH~)Ow#?%Uc$Y_
zoDJf{%;D+;5sYTZ!WAss4S;wBT`lWU1|;6n4Iv>j*({hD=W0<e1z=em*LK2cw{}Z1
z!e^P#zNb9|htB~j4Y(G+)PKyjdw=3Tf?p~Yy(}&cz=DVuLIIpI>btJf$wBbhAL;uW
z2w5`Ign$pTZ04Pjg%4BWgl<6<$%lf0Y0CWPaqyDJLKHG0#BY@LidA)9ay-X}#rca;
zri>Qab>Qmx47SFDfG6PSExCPGNV-Rtk4<X|Hr*}D$ElTHiu{aA`C$0z-@3SiKy;JM
z#oBS~ex0+W2aI-6LR+g%V}m8>v~AeQZ-21a>@d97Wd^K()N`-JYE0-)IRyARit4Eo
zw3e$7FLxJq<w=}Nk3Z6?#UT?u+u9|X245oCCUqhUR9;{5J7^g~45*3eWn&O1Ea_Ki
zC#ZSD5@l&z<JOVZ=I1%kRH4q}f^Dh#oyh0rmx5^!7er5(p!Nl>fooDc2V=e_230vl
zNWKSmuYYE&xt=W$e#3fa^7hdX*9p5A-%^r3ZgAjW<L2iV?U>slt$?tC4&^BSrawYi
z;Fb|;2uLv=yt?)&l-W+aNKk2cjvaly&6VM~Bk2M-XH_Y7bVW|F^#?0fg|%JP%ktsw
zlB%5vdg-bs$kk81Z+6=-t??`NEH-v6{@i7D&0>$s8hhep(D-NkJ~ZtlvkSB|kNm|<
zNm%W~PD<cAZ9{h7>_$&hsM)sRSW=nwSiEF)a|+|4y7-dxqP+>+SUSZ7qJ6u#ZH-NR
zDuuEoD6J5Mu_uJ!2}>lw)))pxvOY@+oK@Mh((RWs*4p18u2v#Un>=Y+p!$eY6A#g>
zbDPlDWk-|~7_)o`qZm_f4D+sEz?hO2z^AKKIH$AE$meZ#JM9ymL2GX<zeHnk8WJ~l
z6N&JtpA<F0B%88CK;d3O`nK0EZLGD~*r@JexkIC~g}fkfv?e#fSDg0JeE-X;fD+0K
zCAtJj42SXIuKml8bbg0PBi1ZRHE91CK2~d<gKct4iCWq?P#^1{Y{d%gl5Y@3L}ipo
zwlQpQUi5u#^m)Sxi*An+@giXrEMyv{by%1|QOzp-8{e(oOh*qkf>EXt?B5*B0=_oa
z)?edYuu5>BMGalm8tPf|c&PGbp{c$0C!54w#53GmZb|Uw9%LWKw+UfOjpOr<Fn_p-
zci9OcnHO_fM4CJ8g#ES8M#oufZr|B<+6jPx#b)XZO@<E7gHWZYCz~^Pj0#YiL+-9)
zI&DC<8?oLQg9(#XyEKFsT+#)fuOnF7tNpBE8^e?wA)R7}_m0Dqv5BcKZLC(+Bx2Bd
zzCyrK<`N~Kro;3QZiA^@vT*X$ZBrlN3qW2%<ALDCih#v}2!L{3EvP^O1ED~<V#9`|
zC`0z_p&?zw4J5z6TcxZAzUODIRtk>ZcL;-Py=Y$1B5N0Y>R2)`FK+T;Vq@DUQYW45
z$T-RQ2as$BwLoSkCdih{;u=|(1$uLmLi-^M&I(S#$Eo+qGpyK+0x-GW8B{7CdZ*UN
zcB@DUFh1yAyv)<E$TR%BLn$P;XhhQ;l6!oIiI;RgotImyt|MO(d*Ph`7b2~AW+AzI
zI%_;02h$5`vjx3;(nJCh79PrwmpdBN)W;5dF)L+*G+UMmPF#XPO`nnPOMzH?=&>Y7
zP%{liZK~PutAv3|&TpBPNysdky?seMW0Y3R=wYi3bd7hI!)^p5n56xbYj~BU5^>L;
z)k8`at+aO6??g4WaPX)*++%_u7*Jxi4b}Ft%viGCMV1#VKHU+xrfjXqWcwi)uSgap
z5@XCi96o5s9O|4&9ymYU%Z$`#<}7BO6PD!1A{DbzSi%`oHXp-S3cUW+A}Me`^NTcw
zk`QT)(7EH6i&=-TPhtf?SdDe4?&-+bK_!r<%P;9d@o6(~76n3wH7d>BH3RDf(daV)
zQhoi#ff-8Ox-W=1Qtz-2qFb8QWT6%^G{`9=`?bts9D$vx6Hz>^5w7*L&8m%gX$k)b
zaldz)zP!W2s3J-JZ}BOUGH_2iOz_LG+Qq!+K=O6=bg_UhwNZ5rY$autPKZC!7A?g~
ztE`8vCRS@k7e6hQiJJ#zqCGwe<1l%fh^FOGxDJ8MmNnY*c|hn1?6FoL7<6B;isUDx
zdNcyl2=Q|JcBkx_RofM`>Y_8%slsGyH;d93xo)>LuiU)6;X9X`c|OJ`&ec>+|4K^5
z6069LA`y4m%$wA=G*Q_Xjj>)z)v3MWca)Zj7l8QS(1$is>+2$|dE!J@_-uybq!eNS
zeC0omHTo|_E21A0eE3^~);F@7rcqo_=?*eaj5Ka&KaGq4U@fXJ^GKN~5OmD1ih(|;
z%bS{1P~O$jVe;#gSe9!lF6+!p3_eZBRsz8_?>Krd)xksx#`=PIC6N{WOm{5Di^*E|
zM%2Yh((-)~8ysO|tE_|9iE$kjP<9{&foT5grWj?O!77cbjyBC)E_hr|uiBtsyMZcR
z>6WpMr?to#4dBWX%)%2*-UwL_AQ|H9LDaX!oHuUzh^Li)^;0H~zwB13m^J1hNYdaX
zq~=2&GPPbKhX7?+=e>B*%g4GJxG0WXLSGne(Wp7<=77vv{0`zUz-~hI*Z0X$_zR-y
z?Y>jg+txRX+U|^Br!6v!rgOK^DP-9(+gyhQkbtLPPfo3M(a%YKm3PJRQ)Av=cJw_U
z8g@0Gc&TqwtJ_^wZ5%qsmU8nYuuvNjM*(ex;HriTfoPpwU1n%zZRO2_dva;!UWjy!
zNC2_=@APlnd0yCSOA6sE!qq0X%cJI5PWMmk&5io?$@i5(m|{U`<x;h3%>%o?o!xqI
zg7AE471ag3N?`AE(w^%KDgwv56NDW}=xUKy@Q|{Gd#tRsn0FVH@YS`(1*1?ezQBkI
z%;hC7l6MWyPgZWlT?JfgboXeyd<+H8fWP3ke)J^McNfopt_E%&;rK8hH*z6Ud=U`%
z<Y|9n0^V$mbfyZ1e{cNB!hVC??dhHD-k`4(tF;w5v$YiiZXdAMj_noprC@45XT5mx
z3yx(V|IoG=#T>~z&jQ&}2Ug0nD4f9WjtJXMN@F#9ZYdq0p4<=hC)OXgM7GG;+3w_5
zu}~N+ha9zegiKv<q@d2~<WU6Wx)o$bKTX(-{MB+aMS5Y@I9yYV_I=pSSXK*RTmjQx
zh665k;_982HhpwDR|o;T6hyU!04Tm30tF!%DQ2Pyc<sf)F`hqph2_`IUEDVIK?oT%
zDT84m4}-wR3K<P153FT}%eD#Gu#eY8U>kU-zwlX2Am3Em5rJT#s!k+Ll;4#5i#doN
z4OgGnPuEBImK=g763UvWD;AyOYE9ZH_}Y}M@^p3Guyh#&prb5d+8Yfs+CN%<(;l-R
z;tJaym`7guxcV*UEvRdR^@xn2WkyKS>8=<b`mL@THIugUs2#S4Aw$cK?Ml$KAik~+
z5hF+?8z45uC%~v#2P?^+Ef<bgq+lE<SDGlsYVqJngeux1+34tfb}Y|7n1)|=YI@2r
z1!EYmmTWRzD`PdxcI3qF2wM3Twi@fuQ`F*$jq&kSqtM(pA$xv-Xb)HTYiNkfeW`w=
zrMlmIavy(dW>6X#_%2FUAL@}8O@XteF{5Cxf~|b%1Qp<2ab4o672GN;hXqcmWI1AE
z9k6Yw6}+$6C6ospKor;t=G}rFm*>Qe^!8`zfvjt~;S?~}Qz3x0;UMYVrqM<?Y5{t9
z3|lVCs4f*7B0F7X82*iE;y&Ye=kRmG38FfhRh+(f5@r-|U2!xsn~xU4MU82@f$TiP
zTB&>S8R!$S1OJE+qL|+oa&8xXo3GpLmonma6YVw@di-pan`x#Ntv0_qnx(ou8nD_w
zF`aa7><9heUEFo{>8BIto9kem_y)hm`*Zu;_Gh?ePtWMq%EV0g^eys_<&&$-FIg{U
zr>w*XSu$W_^c&D`Htv&fGwu6A0So%%RFhTvC;65bE7#aZZDe0!)@UvC7p`%?NCcjr
zt)@--6QD@5a2?)-P}3RYaRQ*;76YlrOX23UlbWc%usL()L0k6K(ob_;_8hkg;~1FJ
zF_UFNPhue@Tah%rU!?Al@Z?o&3l5}`5=pduKz)Ui^!30dt(uJ(<sht1BPDQgtf<B7
zM-@<)JL({lHhtLch&`luMa;$CY(D>0JngRbEo3;(oew}AN@*=T2_vYGB3Aq+2iY^>
zeS<<cjObfVv=aCzw{vtvgCb`vLNci{FU@|g;c%Bk7bU0|ILOEo<waQ}%HbhsH@c%@
zZ--QS_*TAdLz$Ao<#|yqOEJDdMtv0XK91Q6$=3qn!p?OTQ1EXM5?4uOt4ml@njj<o
zxE<-9-2_9kChJuGp+~8mhZCyeS*p2J<N7t9OBp0^H=t-iefx#jpU;&mR0<m57sTP2
zQlYJ;<po-%!XDd^%fP(+47jH#z!dSL%}Nl|Tn&wL^DDC}KXA@l+-cpV8AkIjTD<-_
zG-9^d$cU;UFtuh?l_o@6r#kV~jv13b8kd^64cd1@qSrBkb4rwOT{Ydl!iVQJa{UBj
zfAa4?1s;iIDSzE~ej?xAZ8al%x1*VRpzm-0U}_6_d*(Ivbf@?DAMe`#t_9jO`?4iU
zCM&|sDN=^T#>g*Hu1U^`3r9&rjZKU#h$~3W!$?TMOOz>9pj=Y{@k<m&Bu$Z!bTJwn
zfU>|ET}vYTBdFfR)yD~?0Uw-#dWz3{>+uZRK_pIUS${6OlWyQoZ+3y+ZL|1sYJIIr
z7>)dH;ob@*&ua4!iC&};dnaR0ZTWrsc^%U%x{UBRPNB_Zs_p+uHM-teMMW0=SjA!-
z#ezPv@ZAIgIva_hDoShc92k3c&gik6CxBcj@u8QLto(axOqYEZb@Ne*AXle11B<%g
z-7#*w<kC!6Cs41=wfkH$xfExx>CtOGU$2-czowFwplz-9u1&CD8_^*$xCUy1FW^Z>
zj=9Jyv^%hKdX8_WM^e7$suSxe079NA%|XIsAgaQwnXUONc?k&m`cRgkpVPlZ@!|qf
zlv~L+Az_>*{)g=0SdqlRdb3DNBn`QOJ34GFJ}!l0hu$Buu(+KA&C&?ig?U?Acnt<&
z>pOMYeLg9g65!GEX<j)t9HJY+sTg@NVM?g2qS@fpUP8N3KcOMmX8Sx?XzC5*($fuQ
zS0ho7R=A7}jz4e6d6MX%F-_Q8ZL5I^B~f4%26V8zwYG<Dz$V(8M`T7GU)ktP7U`rH
z{jEUpayLORvya0ui+3S6I`>r|!<^1bJ?_Js+aA%yipC2(8EScRmX40Qnl7Ak&8A1=
zea)FER{YSQ@a)umqdE;ArRu0?LIh+i2hF&?&@JGZIL}A~JIv&W(3;r@m(c)i^z-4<
zKE<`Abk#arFo;9*hD1(gGj9ZEM%#A%`6D=Nk`d>iUwsA(X^%)f7t&7%<l#}{w6(??
zsCNGt26Ld*vp4$j?M*Dg;6Yzy6DUl#+@{EDSTZSUyA>D>{phW%8yJr`R)s$i`*v%N
z-^I#^e@Kd41^qmGJl@(BO8W(Z@=BVCFgv>f9nqkkPk4bHjfAfOvM;$!;3<%CM}@%O
z*wl`4s|7l5K!>q2SP7aMA&{v|LHyDTG>6T6yfii-J4W20^U%a&=8-3z<sn@+joxIc
zHlBE5e&Ap(Y2HvFR#mj03Dp2_{%@ZD%1DWVi%ZIK-XL&VqBmg9t-^lm!)k1iB^a^G
zpqkWh-HGhQmw6uv++~>p#8b=s-1k)yf@s&7bf8|I^&?nF(z?3SISXg{2z*)g9|L+b
zud|r?Kg2U?eNYfDC3y9cNp4>fH-}J+%Y})!+SmFg$|sHom`5EXrT!%w+<;Vv_1=fK
zBJ>c!{$P;r>6ldVcvJzR*y4MJxH}#gmu*}b0cM>G*nykW<>7n6UV}h7fJ&mX;q_MX
zhvNMt`#A#y*n)FO=<N~=qyaX;67oXQfH>0|382Ym8T8TJUr^<(3;F?`_C<~Pk2jVP
zsb-4^+8LrXlS#x6YHclQjm|E`h2((l81{}6Qs+o@_BZi{I3+(Byw4_U{VG&-oheps
ze^u&M!h)cUj}0n(euOXuU&EIur7~|!ogUS5ai05<9f+KmQf}shN~rrro5X6EX$-fP
zm@rR*$f>>|-1|i&H#xd;%9v3imk}>R5u?V<o4o7Dr)}j43cz6lh+P8x<To?7N`q*c
zAJ9xm!o7^x%E=rz&B3pdhckJ#E{IqJ_GM>UCVi?H;E2VQC2J`l^%^=UL)zX6TCiN>
zcn(CRzGlQiG!P*Pc^}?8@o2WtA?4g&^#J)!YQc9_a#6VNo+Le2h&ySWZaXqJxU%BX
zrzYHJtCo0_z@$LP%}?ux{#1-BtWJP0d`eHtct;6l<`l@nc$wzv_7r}@kq`6eB&?QQ
z4Be^}X!%$-!xop5=*_3l?FsPG^~1phiKI~m+A7ZPB02Js^{Fa`C}N1#A5r<S!lk2l
zgJ>Ii`ehb@VdF1(X`RgJ`V<)g!!+~^S`@Z9Ca&kC9B+#J%KwCgY?t!roiG5+q{s%3
zJHaauXvbJ6)g2Ga2YvAV(N7a+>Y<1}Z0*Zya-e#AcG#r42$uAnG~P0)D^Kd$l(647
z(-wqXq&|@~CSii=FczEinBYGU$s^0s(VK1}n`V$ghUC^WqOp2&T>36}o$geBdp>~&
zzq4WaP!TPB6q|dY=^E*uy>6{Fhv>o-Ji9WPfIP(Q5rC0xFQHegZX>oaC5f5ZXLiO}
zR9~h*(P#%T#?Moa5*KXmcF()|6E;dX_-|MAq6r6hq{s~?jdz>MMXC|KBm*4H5Xoez
z^^?E`>6jwkLzo4gB~8?*<5)&zgn?d<Tru?&x3x8*^<FD}!sb;~DJ!ApL!>r~J|zo%
zaYX>@VbGW^0DC;cjfEch*>HgM_N4K1HmHXuXf*sjd$&f;^t?QDOY;-D-yj8nI%h<C
z)8<t^58PRL5@$ec*|EeYthZ^LPqoQ#6VHJcEW!$Naoi*JT<)8PHVsf>LwAmY$EPP!
z(2p&omK|5y4kA1MXiMLfs$LzKjKK!QKD-Z1d4s9SG~(wD&i4K$imM+DcBS2tk5y;x
z%gKopV++XSJ!$wsoInwa4Ad@hT!zEQMX|1dr)2Ugv3|BI_YgumAxbuOb~VwNN@8V^
z$47YM=BczKi*bwX0<Ie!xM(xas3ZA3)6p}uoq*5Lxh2_|&BV7<Y$M&(>oW^L7vK^h
zyHg+_b&!JdnN@cA@iHs>aazc;aMo&Etj7qul=t&&Jq1@l{NMm2ZyzgMF<9&fM!_rV
z>_~d3j<Oiyhpkxb0ZIqBJ)!^nFzI3*tN1mZ|Ew3Bl>9Rp2gD$fja7D8m;EUn)ys%-
z&FpHgu<P6Y2|AyWFFBhX6V4H{UpI>$bA6NCKP?6m6lWzmk-yW{|3~G^?=%(yrtB~Y
z4^2YmTeoaw!sZfQsyAofobBj?hLGOLwF?1Goy&Kj*sL6gHdYcc^f^#J=9tbQJ*8N5
z;45REV={TmmZl2e_HY-X`xI_1yE4mIpS{K9mu%jXgZaW;po4sPi;AH4N;JBzAdD+v
zwYs0EXaXhM4jeX|77X&S1q;9J{URX1#AK3JKOEZMJoid7hu>t4LAgZ<1yFSZ)wOM;
zyys*%-phWOyBx)!)}Nn!I<zd4h(1tN;kmZlbUY=M{(eAQhPeSLl18Pw6$2?DKRyLC
zc8A8pn4XRxyJTyKx==8i2FK)6bdScf+3Oo<sK0v8d<<XnUU%Hq1704@${?GuX1X^Y
zLPB}vi*XLm68IQ$Lp9lqD%DBTN5C6*D2B+CJOz&zWR~-Eew*atsm9ZW(HgcS$9OWL
zIiH?*RdEzNS(;0v!b8?!l7#cwgJ^qJt8AguBdZ~xd-|rBD2i%GCZztnC@<#BeoFeA
zC*xGL7IVuqCk0cZOnE(mzGq&C7J;HvkiJ91S~r1XFW@u#CmyymrW%#wiiytegb>1r
z%6n*lR~^bC8dpc!|LeRZf_JL!WX^}1kpgYj>?5*F!w~@N`B1Eevu*Qkqr(lMa=dB|
zlzgT8I)8L;>LPtLK5zoySHs6Obx{<dKJ#e_Vh1nuVQ8>_=*Sh~+tk3+;OMQg7&$Dk
ze&^iCwdPeZtbJhWecpIn_A(!G?DftVj6y)t(6E3DqZ*ipNLYO-s@T0M?_Ow?({-Ms
z!Z=Cxfc#FQlScGgz(x<uT>A31GgYbrt4p8~r;I7z`ki~gkwVNC6iAoAC#h^of3dQP
zz89sSSGVAYLZ|!}=I}n#;<>k8_|F?;FCZ8|-~H`-%<j)YZnpo^HsshY=y`7Te5H+X
z<Iu|ohtMkAfbAGo@}$+g<Vl&1WkVDrl!EvDh;MD9hKG5)Fk@?(3h`xebQ?Q^O4{Po
zD!;Ig+hTsN@oiuvMiLMsjZ+})16oA5OXIZ}4Guo8Bg1aS%L-B_5Fq7*w%`e>@4K;;
z(JxN)BABwcG)e}YzMU6D{dH$GN5*B&dn^JRrs-&P?gc}t9H2XMUrU&dXpAevD7<hd
z{7(129MKt|f>9er6vO(6!!mw&(5Xx+Au&Fxt8}>Iap)u6c#;4-MltrlW0%6tN|7h4
zOKW-oUyKx`Jw#B4mX*PqsxW^J2IyEiX~1OfJNG6qev<R0yGVpE@nLRIF10|DP5jZ}
z?6*dz(0LynQ#LOu^5Y>G!@(l~S=$n0AZL&hII0JDYpVi9F;u!6r(BV!ywS88NnZ4R
zJ}Nq0&J&$lBqK%;l2f{L=UxotNHR?1GkwPn@-WG1|GS>ZCvr9*?x*B-U!zG|Y5)DY
zx%9F>Y6mvmoALk^VjYs2^euUo;r!cpVyV~kJt{WpcC<h^wzF0HBe^r)Sghp&*}nsj
zhr3$~Q);_F4ra6mou=7+vzH`gdk>-Fa$dK)Z5O$VpXBz^;{gtdrAT}AyihMYw?%95
z&3HRit{`YJ9C(8YHaUgluaT7KPSB<{rh^fn)J*AvV_SV^-j*HL0YU<HXAn5626h_8
zP3O@|x%b+<^Fl#AGPkBFnkucI5Z+h<)Y86qKzXM-Y8GyPC}zcEpDMb_5dIf;Zy8kC
zl5Gp)PT}tE?(XhT6z=X0g=^vN?ozmW;qLBk1r+WM4^F@CK7CqV_q{*9d%qR2V(kqP
zGjooanRDfiF>-3}-wshh111*|bPn`ql{1mBY3Zh9@<HwploW~1xGt>{m{mI*^~iZw
zd&8Oswk-1%6>ty5^v}{-wreN8TDMxJs1f)EiAtOz%}{=>NXoof7$-#bC=6JERcg5d
zQ!K^1YS%g%2y7>crZ5(5Ib~L!vojF%MP^I$^v&*PwvwWmpxHsv<4+vn8ow%!@BQU8
zV|trg0F+WNdpIxLBh!2#<diH~qw-5xA=}k`wJUS!t#4e%RrOPm+{mwbskcKax^ex@
z>}?=OE=@=xe3X)M<hUBe;;OIo&9z+j+#`MO{NrRw#jR59g3|$MQ=PdYIWJ6wQ*=y$
zth$Wc3<2Q<pe6#QPzz^)#z49ts;Gyj&lhARa4DJ#BZK8-Mrb$fC5qs%Kms}ABr_O$
zPV@`TxaydgMqg(F)&Z5^Sf2A(JAr#t?>JmnV#%?`$1EuahtaRMeZc!KhboDDG9T2V
z+<rm(wfL0+dt|_fS@#WCBjTCrBr%|M?g$%-kh{yWQRah;qHQh(UVI--9ajS2F<Y8A
z5!kC^zgbOzBjfzUITFom{490U;=-ar{oTD`FnH8#-SqnVWFqixxSDhYhDEqCn@6`T
zyT<6#sadPSNv{M~tJbw04HKQz<9263<;<*kz~^z+suWj8haR(&o9iG{DPe(j=bjtE
zh;f6l?!i%iukSfbi96DQMu<yEcNjXx(~XIlZ_-C~ID@W}C3JTP!vdeyl+`w!9iv3V
z&F$(9H!Z?1j3P$`-BN1<<MJ!Mv`IN4hI}<<?MSGIFVti8r3GUy*8&at5lbPZ87-!x
zGQ|$<R`k4B?vcv%bQBuX59(p)uIVwVjIt)#G7)62l76(CrdaS3islQtRE(YoH<{1N
zdgYlLHj5@@+-yr}f%6TP?b?@Psr2?Tyxaxko)T$JUNRTiB&-n<FY&scTQ*=&T%X#%
zY;0u>t1Kp-8~1xW%-h)PbhlyGZqav3D>@u~Mtto}A^)LYs(x~z>;vS~Ak~yO5z+X$
z>f1nHOhY^W?UfN^DE&P%flRcUQ0R0hSILaPi9q<7VRN;qzHs(9X}zMxWL`_g@V19+
z+IGf_lXoeOSo#K}UY?;MX#Qxb{Mn0XUnV{5U=Fl?|H*>pTVrL0n=9pps+aTUBDChI
znoZLttKvw$XZiZILs{$&!&hfx%Cngx;)GzMx4;(Mw9+-mq$7NkaLlyj0++L8B$e*f
zszJ58%g(ZtEK+Uiv~p>we&LL|rZT~35o4hDAN0!&!P=WxjPI$g8|<yCnv(Vws&P{?
zv}WmMJRdCAh2jItU+Lcu`On&?8UNMIRcE-JFC6Q;+<9=Sm@jH&v#GrKZ9=_Lv$aEU
zJ#_A2@Q%nm0<6dDr_VEq*o)V#8yqaaj~5-2$_^LYH<?#;iOrZJ<F7co+bB&+)PyN%
z@<60Ry>cOy>^n!$-N`OpP-9y^#$qZNuP(djlSMM+F&_NtT`G;s`wW<miHBK`uP2E)
zu*;YpjCE}ipNL3;&rG&`m}g!b&A<PI1s5||h1)Z%YB@`pLYyC19atV*C~~M#d!P~q
z9l4J1$tfd2m{6OkD407ER`$zKslP3NpGnbW0}b!V$G%Y>FSSM9Op5Wt8TxJp7HRQ_
zWk;??C6B(F>Z7@|uwe?s`^};7_8g9N&Y|2?avzRLPXXy>CV$Bqy%T?c%JornRFaM)
zXihVYKpxagS~_N}reIlWC`N4F;-)rdmPei90^GUOUaFzq5<j!iiZ$iZfr6Ii@JOCp
zO&ZhfNZO%f^QYi#K!eHTe5eCWYg6MBpHw~{nx|I`GH2rXL5LN2-Fb?2e7Ub}?Iku?
zXkeUoq+51thMJCdlP^y8-3<?!XNHO$T7{qpeHpj<y$@P$450|4*wXiPlID<Pdj!&c
zF_7A5ZNY1VXIh`;r4}j+@1KQX8f|n?ex|I@Q^YDsSmX;S{W*RRPp%;V%%UM3k$lp(
z{Q0}PW$L^y1qpk@u)AU~dwi1#^?uKY6dia%%h_*9=#TEeFo%^FS6mE+1@w9+69D_o
zg@xMo8kM8EoC_@A{K5Js3jCQ3qONAZJ`lBH2I+38hV69zc|Q{H3vThl`<oqrF@gqT
zl6-$eZ`O*11KXdqt@=!f-!EU@3I9Snm!s~I89t(9yB<;zE{=v#Bw9!33H_oZg_NfV
zXYVzEf)_#5R=z%eD7l5(x%c%k$0Sxf_}9B)r%3$nuDE69h}x$7s>BC&*OH0C-&ol^
z_ej65FW$5bgA6W{5nym&880eSnx!X#l2~mVZ-%sCc?G^Vqk{T$I%2^}K^hz7yT7E+
zg@zK+LhkNEii4AWrO8hnPHu|P2VVDGbz$U7ZdX*E1m+(~iuu+SeyQrd)Ez(ujo;Zq
zn`@(_<(*8|I`0`cXtR<1P4PRVyUygsFI^BGUM`=rj6-DaCPrtns8);H(N0bHP)_5Y
z2ip0d?xsdN&`v{&CCqfc^CR6114bml=7HhW3A1uH_xrJ=)J;5f#P66IH8XK~i;&QP
z0);}|R>HMBpSU63+r2RjXnSGY*?{YKy`ll!?Av+vb!@z`4d{B!pYM!CWo<wbJW2?a
z(-A>zzHL1Z+1$K@2j8kZhQ<KAb)029mpzKv?C*bitjtLyd_$Oh+x-@`@#|?pK4R(>
zWcDpz>dk@sRa@xUW+B9ff^+k29`_BrAFpjZt2Nuk>svL_%bn+AR^y0w>5+-I;;ZBW
z%}>0?E55UuS7%IbYgEKH$rG0OGr{NDlQC~JHpdP{)rc1{_BTthOOrLe<b*5^G(Vlg
zik^o&mdk<i&JFV?42qk|y5hK(5R~_0{Kh9jy$!!-g(*d5A@4tw#J#QDTzKayd0F&L
z?2WDHsQJp?b<}V3QG|J03{0dvFF2brKHHq!%So1QEMGVTqC6zv=wNuWVZXkWLby^u
z40c%NZty|N19alfL}k5#f6$c!P+OHnr~v>zNXh@0u3Ys_WG4F;lxkr;M?D=&JqsiJ
zzh^E3zmu!~AO|qeMKLhZ)z>|jk^XWH_a#`~2PhgHm<%2Z&<^LFSdE1q3=~N~ARtdF
zJ^+M|%CFQN44))9J~1anO+F|wHzGkzOF<(mBOyU8q5KH~jA9nzF&!|sHP5Y=pZPcb
z^;wDgo#uO&Kf3)Vhu%K`u$Wn@eLVks;k-NaH`MU=@(PZ|HuhH5MlK(Jr~6ISzzfD?
zvi~Cb+x-VO{)*M_P0zgB|5sT3p_RXB<UhjdLJ%M9f{qCu6kABpFIze~5`*6|qA&n~
zfHpNft29YfK02;MMKx75K3OF;C23gxyN#}{o}rbowPm8Qxurf%dR%h4)rsLx!&B2;
z{hXt1)8l*#{ZsvlqXXmj)nZrQ_|)9kc<XpufA9lE@OO52m~P;^a~}@=)ph3Ip{n-I
z%cuGys=tSr*1*Qf*2db%+L6}5*2sX?(cw4udEPN5y?8Xe4edAi1IAV{W7huk@BwGs
zee3j!ATFl4lx9>nlUR)<;0AQMA&W6>--~m9xQ}I-ef~5kzW!kBTsDqo0BLQ@_$rrI
z$mUeAzWqtk(NP%E<$F1Y(DSI%jLWKVx9aHN2IX3>2y*eai*79q4C{javrgzo<~Z+D
zrD_-$h!9y-Wr8p^jEhgIKu^G{gg&1j{n$5HX?`}lsgu4nuFn)6Z{`7fR(*oiX*ON@
z1to>Y+f<>vgR%FyD=5Y@$PyDMn%qMoJ${NdXhJ5d((X1Bd50q?;Kf`o1}V_40WxJS
z2dXkl!lLnP8DRkkFI+Jsz)!Z^Ti(%f7e?(lC%CVI#gj~L_<WKZK$}i`2#8N&2)nwD
zr=E|>^xg~bBN*YaPL0Tb001A5|KnhMgo*WE%-R1SF8>RMrO@xh7C7tx0GNLqmVa5Y
z{vx$d3ICJS;^X;;QTQRXz%iR{XYX43?P6K%TU*oeZ*2vGMHKgeUw!{5h5xnP(8Pr-
zC1Y)A>E+dOLun0de5>58q_iZfG4x9;D6kl?2OpTvbc+w(Cv*S={?Wm{!Os4{<#+`x
zSX=-j!zvTKSDAJlEgoG!{LKY?fKHuP?L)dFe($H}rtwiWfv1K@U*8{9-*Zb)iTt}Z
zlAg^(#*)2Nr+VSndRHeG&o#AWcd!+R1StTRaiPNzA<=gI0w6AP6Coji<USLV>(KIk
z(ikLdVg^Y`CSc;Kq?D1O;4M~EqEe#b&|+dBvJx*|U7wsB?4GCY8m68hUAQOK;NYMe
z`PDmY{~@(V_pUQDR<g9RtkW>Ha@4(eJXq|9H`Oy~vavJ2+2W!nH{Go=eLH`bTA-K)
zo>lS-!2klpW?|pn*}#zAHhj8uE_9}aL8WbA_4bXxYBRZDdq1KOiQ8h|C~|~qVY(7u
z)P&jUd^ZfL{yB^i@rI-MN9N^#%(#X>KVf{YBZ+OVei~)#eh`wpZE&wg%@)=zwh^ik
z0dM&2fwsZjAdY^o_$WmUu=UjGW$mB{8U@S+bMoo3FT_x28F`LF*v>@8gu(@n^iu#O
z^&l(LIFM3J3NA6ijPnUu7I?~Du@1I;3r#%ljcpV6n#zqWzBU9@!+6ztnnz5^CL<AK
zgXJZ)Ej?qJa!uRyqBm_n&AFv2RuM5=;|=<uyFp!~UqNt^st1a9Mn;)VKLFk_yO6A3
z0Xrzz?LoBquviUgdx0dg&UIH-HzwR(BH#0?XDpKg^>tn?WR0fCW7SN{)K?19U2_cH
zME)+rM<iLTxzl6@K~CZBpgZm6*lyX)l1IW&!Er)T!EwiI3yNbc_2&n$`+3_(B0<Zc
z-h*j;L8!zQNShI!hK<;mistEUGw2SqcG-zmDDEBRL$6`+G^OFSP8b{F3+VObZh@Zs
zdI?&?iUz4nLdMrgw#W8!Q@Wv)z8#?JZ<Gr(F$X>|NWuDVsK&Q#^l2NZwZV_kMf-+~
zugUZLVwX5)AP<}Ji+-PfK#~cH@PTgZ!xV~(Gb%?;w(o*G1)>?G2`kWNsV3*|Z$tMw
zn$ySQ6_^PlBofeILb88*+$6wrJpYv(9@@Mv?b1Nf`xDaG=o>KB9Qbzyy_IryeKmYg
z`1;$fW4mYvOnj{M`Wj|w7r#9jOxRv4xLwZL_Vb~mpPfpmoCXmWe&n%h>j*9TUS>w9
z9D5`zl=H*owxrI`*@QZ<%@*8Z2g!nj0JcQq9<bhfGs7n!I1muNh@31B^30*DOd;at
z!r$xHCeRrAutIuxk~@Hy4oU*pSmO3(9;;JSej!-|2kV3)2GL)pg)K!Bvk#T(|7sFx
z8Yjnf?kyuAq8LnKr(y)LWe&7DxGT&?vZH)z7I4;!pyvMtV^3h)9bmwc6u4yV$64`B
zsLX@Cm6O!=Le(R~ehux*d_>+*T$)oFq%AppTI~?v15Swy`cUFZo<3ghOg_I)8o(Hu
zYa1>!6<Ji)%*fUA16niA;%9*Q_Mxm0^W~EO14v4(q9=Xsz{ZtTe3s)yV$CZaKgshE
zMTH_5t<GywblU0CuKFS<U+S{-Gf(`CN&4Os%M4v4gIn$%Mu;Jx_U#ZzfPF2VNwVg>
zaJx^mFc$j$;EIYT@8yhP=#|u%BfzgOnDLbu{f5jEWYyk}8Sj}Qz5~@OoqnoJf0@Lm
z+xBPrS+ciYEEv;Sid-oKyuEe;+dx(HYi%G0^7D9M{dj%j3RBZ_5ge`tiEEAzFg!Fi
zMbLoDmuyxR>6ve-7sTmYl_S(xj$cq0uz2St2l-$YoH!5`#3Wc&;xQW+MIRP_aLpB+
zXFkHnVxOc8`lx%RP?k}oTS2kX{#aJ2;9iYU9$-#H0$shyk1OOVS)5s>6U?T(Zqw3y
zl{8bn2F$zYvpA%$591uuNAAcZ_92A8D<%&bCHrM*9_DCf&xcF*EQ(q<k^B0&VQ=W=
zQ7Q5+1HY>lZL<_SxYoB^Nq0v#)7~FEGFe;$s7_lMsE5Yz*K=sQl@pRuc#i@;+aylr
zehskjBfLY&vpjgfrbn-J)6q`reD*6gnEb#AG}w1{jG$FT|2xI`CuK;3hk8NoaXh2&
zxx_%JO=TM1=?&3CGW77aV`AT}h|EHptlIfQwb`os)MOLv;HF;AjDV9EtwZ71RYhI#
z<qUGI+9i2yhX_=z0d+>Sn=elZxB}zl^bywwsH2vgrjFnWPCuYxri%QVPF?%@zN3|N
zU(eMMZHbObtk9RhA~K&-nt@S|(!11B#{k=~k--Lr944aFR>Dq!v!Dd^LBVHo`lXm+
zZ4jQRF{+?h66EGgg^F43peoOt*tLX*gO=+hWqE`i@hq%%^S(AEGC0+v(@#(nS~X2u
zG`d{ap8+uxb?}&swjNV;`=ldlqRXXg2h(djf-}m>E*fSK5-|QM7_mAF4C4ASa4<!y
zJ7oz$?rZD&5KS2=4K2<)#Ykz1`BMo68yLxA?!EG<lD`W=vB-4`=18FNl3@U?DJWKS
zz_UFrFP}QHW^Cpxr>MjTQ?3B+7u7+`I4OeYvIYvflCWP6XU!*ExXan`&Zm3Z!Tm(R
za8+UCD)yemSitA))cm@^ffCGB*~$is(gmyZOwF`bAXAp!WxeQ(kkHLLG(J88uJU0m
z-b{rR7#N-Hdu(E#BVqd^yUcl(8309VP<C0;@(9HMCRolo^NU0f;S^tbNw|y#S>;k}
zL}*|c?K5CouekgArm9KV`9W!@7hZD@givv(8A6l!xj^}#7RG_RWhH_HeWYo&8F*un
zlhU4&AUZ~$X7a_hVX%9h&saahy;E%UmsSlLx0zXRbW8#YTaPZUpXLobW6uM~jcvAr
z*o2(@*WrzY+S$jPXbEf@5-dpUHtFKfY?s4A9AbOi3W}j`;g>-yI7%}t6eit)@x%xY
za$kU+i|aQfZ!*>(t;P{izjuJNnm4a9Wra91@wj-yM>5YiJ48xv0wNqi+kD<v04G}4
z@g*kNTg;`Q=55d^0;->-Q@6)yHgk>N!e*j*L{_B%!R3XO1zt&bi6OF`ez^gbpr7<X
zZA;1oGshQ1P{5{7gKq5cauwtr4hkuTM3PN2p<zKUUb|qfr$?7PAzA*CVNcG@*k!4V
z6Y%D{OJlAI1j4PY7M0LqZQKQOeSL9cId%8&H7-%yVBxEJPB;W3lFAoAxDXP77Z2Nz
z1!Tn`QAnQdleKI*7V#weevti6gWj!XU`)_)SWg{zT|jjlvogDEHMR&Nw~8yBTz3dd
zuCIE~T6KV!!MdOo>Q_viUt$3T<41j~a?i4uqiaJYtodZy2Ez(=zd2_jo1AY8XhWDu
zcgUQK1C%z}fb?0&k%DPuoU^cr6&3U-bl{i2Ac`=xUOVUdHN-m;SG7ni>VjGJK`b|u
z3acR2Xf6Z9_E#DLpTe3p{$eq`rJ_7OCBUp@CmFgiUq5j{Bo0_6sr3|S8T1NP$M9gL
zW`PR*w(!i)ZykB?Op?lO$(4lCJVU?Bd<mo_6<AXtGqO77Rr-=f7Gbmo)Owa=v$3J}
zbw}z6(Eiw}^rsD()mNW>WfdB33;K!;x>sctlU(=L#psDDs(_Z~j9Qh>lD3jxD<v;n
z88|AmhAL1!3!}~~Wl+yJjR_UeXIzM8(k0|+ZQ-TlS<r3b&p4jnisn)qR^V>xE+O4`
zz@t80^b@aU7tF`*Fc)o%As%+Kd2qG07;-C<`lMIjF?9Lk-;&BCnH@$$Nz|IiL-T2P
zo&mt}Ww?KHiFz)^?UKx?^4BKu8C54;P8}0N*zZno#1xbW($Q3#ij=XR{o+nfhh)%H
zsNME{CSc<2>|+5FG>O>pdZDk$^CSXO#1INce;+OQH<|ckA3N21dH3$pzKqj$HYVpx
z7MvV5+rANbGFJ<(kSEpDFDvFjP}PV{yBG9`70E-LgDyv+;EaPo6T06pBWjvySLBEV
zte`#U-R0Dp*6L|JXG>!p9;(9Xg+5;(tT;lR&X15~$dRoyX4PK64`d%?5%bv{!YP<{
zOvh(0_#g7w*I3d6kai~nvK%o~H&*QfVl6MQ%gBW<8}eSw<&4SNPT2U}$9J$Z$KQ+;
zjA%~jY_G=EDY@|pG!<ae1UAl(@$?onXfT_o!Q?U+XSYg8ew)ET!(pd2Jq~6kx?vp;
zh@RdiiL{zR*)oXN8^Gi+R|u&@?3z6fs$7YpI%7_YT^6ZUoMdvez_QChy@u3N<tm&N
zFXN1KZ~;~jS4<bof-WL#6&e-ybK5Iwen073!*Rh;jsP8#*Lt=6T%vN}72fv82{(k7
z&v!~PhiFIEXcRsSzjQrP**Q|M;K}mogF2k)K?3KumJ~S;keso`FNO6VQVSb?$SSv9
zY`&#@rq5Pdi)a+vV}aR<qi@k2tz-TQD%`s!souEYaod0w+CwqYwp?B(^}4`V0}Bj+
z;Rv3Kf;F)LUZ6U`d&uN^Hy2JuSX0oxbjTo?HJCoC+lYpBZFZM!b=bg|aSJs_I6%U@
z$nB$Yhxe#(aA?PwruL*TfP>)OiE0iobKI`A-x!Jf<rG$Aw{4&n8Hw_Ga#i8v;yTsv
zesnq-8@ddcOj8LmGDYxJtKvkmhDM(weO5dSQ2?O&>M{zU4juY!iRa2*WI>#%M0)R@
z2fD9ld~De_V`dfDgj#-((cO2(&kAapVEw>=EgpGDRFvjGV65qp`Zdk8NV+CDI($@v
z;uCEP>Sv4n_#JrHZws50lvb(ECwbxcHpEpDzM855{Nk$(!MqMK@GZqbpQiU$Glkb?
z<frK(T_s9pnUkhIQ(k<6fp?!Y(3EzOOlm^y9n=k~<LIKB0u=@%djN)40EO?dS4zTo
zppiZAuECUp<OV<c4*z_dQXOjJRF|Poeru$71^om0F#c)-SgE$WXH3ul=E_lRs3RX2
zktx}6BhSp3f3xJQAKze%V<UaXZgXmCx}Soedqb<%^sDK9v5L~vZhRFp!0BiZ;S-b<
z%%Q<n$=&$RTAkH|YPL}kmPD4aPX3VN#4jK#1y8KXB$dY0)9*Dx)3r%|t_O)oLx);U
zv8C7>#7m~!sP=cXZx#_{XWC2|12?e^{o=_nMKmCBGii2u>_Fhbs=(c|dP?tWTlH#e
z3<P^XHf^FgAYw2sbcCiOOFj4;9CxQzmDk35)E3%F0m&=vGF+g53;9{19g|+CYrm=7
z^$P<Z2}r(?{R?Zx#M@!u4;jxcZr!o+7Yh!3fY$Gw^ckkaSrk64=qcAVqDL(EPmA<s
zcs*pInh$K6{SJ-=1wak(kjVzT#g<K78fHfI>{B}@41`cKQ7W&sm9{$C&P%P$&An=H
zu7yIJ?O#fKX!mKNahImYE67f<X<OvDZ%vlpl@@1H3X^ww%wgH$)lx35sJb;Y;2A;a
z_##Fy%VIPITeHP>8d{Vr>HyJC+GToq+IA%}@@F*_1WSmm68`l({&hUi7WU#+J`zP$
z&0G9%ZsmEC4^ea#%4-}5hh$N_zlPEZa&f&f9kXG$szKZ92}^)(7_ma;H2AR2x}|^0
zq2byET=SOitNw`OWaQ4pgx7SIZ`nxaoZ{L(;YpW>PwmJ8JzBvyhqCnFGBr&+<OQs6
z2KJocC*BsOzP}i8ztk-izvYbp>*tUsUxl{SW7Ry)Ufg?S`lPe*7}kSwdY8H^vlXKO
z`9nU58KLwzP~ITxjBXvOQHzCr6S_dQ{e{w8kL(k652P`yvw$~GU1d48L*Vq{X{F98
z$Nn$8>!q%k9tnmj3}bR={T6~5=QXgTu=y)0(uc4uaOg4R@Jc5=Ku0F8$k7{l61LFb
zQ<ehf?I$5ZrsS{XHjUw+Fmr+P3zzh<!jEVC!pfsqrZ0*w*d8A0*>k)YFwT-!ok{t9
zj@<BGXI%I&Lkt2$FVkB0FYP^dksvQou!%ZY@O*XZugcKd-qlz7Dfl-oaCHLDTp4I4
zNGAIooxF4J<sc_F>hT{*JAAd`sIl5c17^KZ4}cT04Fx>R+DN?f4fPyR-IUPQeF`(0
zZ3p9$t7!O)mJdC(f^@!&X2HmHDa=w#aSS!OhPBM+`mG@=9Bd&mm>ei-F}V1aV0&)+
z>v2q%R;7sFq|im(8<gTyAdU4Nb(V9SppY~1z&p2*%bQPJrTxJEgm(vLPOpnMnXfL$
zkI`}gKwvh+F-p1lGU;z%=_cq)V0v@~)>;OqZ_6(2r0_+UVM?gy{OdXLdHp~PlTD8E
zY65D3bTzQ0yLJN_Ro%P?ejsMt%tX?J)i1IVDP+k`AJy5P$UhMu1P6jk<g&=}D~HId
zZi}<$H|yfGx5G_DP$^i1`GxvvOo<kZ&h37fw3nI>Noic*9}nGP7rzzDIeu=hCr%j3
zz!fYM!-qCvPkt#q#0ab0{Kj5!c%7T3h6YsU{BvCYE4RG}C%51bWX)c#kSgV}pm8^T
z1Q@u-Cx66HGmS~4X7o_2hP(kGx(-IppWXbm@MIkl+Q@0wCD`r~O6uS_kd0R<;HoE7
z&t9`vMq_PhlY{$7PM8G^ktHfo!B@#ImFg>-OB4G0eDR+19K2B2Qb*1%4a?+&H}g>S
zNk0A>RGP9QWRq1RIfTnaOV+IeN<Rr)r+L5Ut1(@9&`sC&YoNA~(1Wy)6Y_pFSlzDz
zgdFyvlDSX#GNid#-t9Wr8kM4l^)O`a$M&$WUC3b+8(&UVamh|a(`#LZst7LF%yMso
z;t2_S(ki^rub!`FzZ(?io34grv!+cK>bO+BT2+LlYCYS*d=C7C+hQjP-&>R20djB_
zbebi*?j5}SR=@k=g`f7iYSRBg;VP4Ud~#5J9B~+-MPubtDBHoD83l7oecCZJ)nU%<
zPWJXoJ<~>(?4C@yYiV|9Y`QnTYY$C_74t;>S;njO7E9UniJG+RE*~v`4o63tm0g~e
zZt0?CY@B@dYg@nju5EzjYYhlDg~xLZ`K&UIcEvVq)5_(j0Stu=q3_K+X6}G^c?=}r
zj#L@5Bj$?Nh>sPfWUNdh#kYkq39MC+l^4H_FSvclImXU1q_*bNSE=bFpPHCU$Q4c;
z>-GfmD`*V@u_Co9ZMM+Y%*LFVL~*Rbdvn0zxiHO^k7{8r(BwnL9R`T^Bz~eKPNC0`
zrHg%A%u{WC`9VhMg%1y|TRNzQCvE`gEnp>ico4fDMBOP%#EXvfm310E^Zr^-+AnU|
zDj=V;?MW}?9Gfc!|D**98yG%yu_(8aL|Y&j?<dt^v6EApD^6=qlciQs$wPIT-MF7!
zu+co}e7gH)`KJq06=9Po4N~MSB=hMe->qeWOGVNpLF$==sw;|xYwH{Or1pXG%fl&U
zeKq;alow;U^ZT4nqhYZ0j3;Ar_@bb=Ql|2%!G1&~84E#Qmr9j25(_<DjNhdeF`VP!
zqXevj@hhdm^_44J=!e*c*uLP8?X+KXSSBtH{L1mVCX@8pCPqfAjKCLfcs-|ue#{S$
z>O9%9x=c;2UVPq+q~rMc71_5!z-jYt>CK%v^VEwP2jqc-*^AG#eSqQyZ-0j`B<rnS
z^Vy1J`js@lBa0D?R8*FqjfhN&$RMp_=T+O^`r7MGf>J|>rBghQnuS$%B>Na&h75;^
zmM0g#lAlb7Mv9G?jE%TlyGXme6bOJMicY0IKJj)$MjBy?;frmVFg(E)GO<ZfKotNv
z13dT_z2`o+(F94uhmPg@2@8rIy!BRZ$X)LXu<geeb?H3{fDP<(G3gJfMZ2%aGbzLy
zgd6hysB6njtkbS0eJ)Yylp52@(9(PPh?Lt5Bz;wS*3qQcU3P=z#R|8?-ecq5k#X6V
zF0e}@v&BO%ZEBn~l9xE9m(+-Z*n4TbP}@mO^a#)QA}P3ZIJ^5k$ZZ1p88c}(L?~ZL
z2w_o8N*{|pmC`53co@sJm0<EDyPE~egwX-PXOL^!v4CmyP6r}kMwazPn^9`}@jxXe
zr8@9=mc=I#cV+H*?gJLI;3~RR1{5OgA&m$9+7%amt=LM)wXA4fRZP`|RK`4O@cgM9
zj#B+N6Wm0E;aWe!0-cQR)=(t%%^6TvY+yz+y$8LE>T91QfYw+zR8`eLviw_e;3RaH
zJPQX=4`)Ep6tQbo`l}wTq-f4)Em@Iea6+`HCtTKH1rg7*db;xt0EpypHfJGmmI$HG
zSS`K^39#dsFmbB$)2|W4<N5m}rFg+|29&}~M}{2tErplD&0Fcm&!<Z}=`pWB-P`OO
zi4O-T2<jWi)As54#P_tAPMDc4r>D<2r)H1rnZ7L~>^8=DF=WI8^y6VSoK@TLRwzam
zz27J@6OnDVA9^D6vyq9_#f=m2PwG+99gvbpA0;2{RGb@3=5aKMdYe{kjAUung(A4J
z+*fTeZ^L50>~j|R)MnJ@clXusApr&j$D=w<*l<4v#B8F-B<D7|pOM}J`x%f_fmCB+
z1LRL)Vx{O*%^1es;`pKzd;?6S^Bo{JsHY<zbFMhVZ)LS7P~4ry9EP1hrf6stq2mjs
zJR7aT&&n`QKr(RP?VWCpH|Dm7=uvhPd>2}5%o6&e>|RoCI6~!hY1g=kG6z${`7xQv
z4;>x_W;PyD?uGkiL=K+2ZtXo#L-49KK&fjbGwsusDG*Xl_iRrqGwDys&i3`x#_Iu3
zDd+&4j8Yro;8<bu2Z2`=J_>qh8+X|xl;I7reCj_ItyYoHpUC<FSqL1*>md{;Vb~NA
ziLm=Ulzw|a7Xj?5JLjvectqTok3wsj(YDY02_Zrpt<M(vKI6}D*s^$2n@5CJ#RR_O
zW8P+FIVyslzW3K40nZ%zZxR>&qcD?#QGCLlgvB=9D%f$VFsAA1u}P)4XXUi|Exs_k
z>w7lA&5@0HM1Jj5jSNjM6jZS3!nUf5bOHU>95f+BUO*h_)XQQphC<h%HzEpd`USxz
zYHrW)QV<IoJSo$hFgVHc+5~%LSk2@yZHAZ4gP@fx2~yV>!El^~xKy)5l8awIEjrj>
zm-fpFhBCzM&m}tK>&3O{4>VKzIRT~8*mYaY>A6_3pXXTWoxq2nm0A$9`1u9di=54v
zG9|IKjiaMp>a?Q!m7?~e@6vAMg^kbpMIA+GnynDKneQ=-g~`l=B0&3usW{m`@JyMO
zel{gwg(FH<m_7vElvZ2I79@tj3>r8N1l(z4dyoxTN{ug@7@P*7sHh#?Z>)u5KcZv>
z{#xIQ)sw5WhW*8F5h+6~`basaI7Ao9?R(%o2tk9oi~Ntc0ZRXOr3EK^2!S>vm^(K0
zdQzCoqjxV@JEa<2n;9>K=jK_$m6_;;=JC=^jjcUz4t-YKoyPO^&m3A!PHwHrWEvw0
zCEo@Kig*THH?K!!?)U2PR_X^*MX{+kZAncj+7ygHg*RjZY||`~7NutjE0jWs*yw_|
z@v%xcTl|Z?s`j94%6?W=sE9&9PP@&0x}Pa41rOpB1{p-@>l(rD2Qlp+1j<Qw;rtUs
zTUa~s(^@UrC|lUnG7gqbX&<8`MeA^M&H%3>5o{Z;EyhfE34<7s&3l7ZsBvY?PoUw&
zLOMv|vmKhDVMi)*s?{s)z87hgK{u#%xkIyNsCh7vkR<Bzms#2MEtdycO7vB2>(5Bz
zNVb5?`ZB>-rBCH>8CwwfgNKKU!FGgo=v;Pqae#NcvYrC0*G>)2J6diXd_zj}QM-58
zhegDR;Zp+f-?4<X3%$bW-K-NMr5Yon>pfYmi*a3Ts4xIq5#3|dxU2F5c05ABAeZw4
z|MfbJtO?~Y)zULCj81=+x<t%)I1p=A4R(#oXnV|Y%~7hJd@PXt1O!BT2z0JV+J+OP
zA;qzfA71O>c}ny!R_`YRP*kQc(%PaPAw5r~XtWlR8$S3-yDbkiGv}dBf3_a7Ynx7Y
zlBKhX4Q-I6dIn66y`=N7YPEfC)s`BJ=v<-N8o*DY(*@Q+lT++QpPq?PjNio|3<aNX
zT#fy-ER+N^ghwV>5plo{$6K=ifZb|KG<@l}02C6|6F%g}Bm14FK=%$gL;qmM;3h%K
z#!n@g9+s^K4X7LjU6pO(+t*OeCq~Nj)`74$wX#x-QV$=dB8V(K5IU1p&li+<&<a|#
zB9FTgB6<>@u3-p8F95BH+bzYNRKj5`){WcS(Gourceff2;%isq@lHjk3tS`c&47qC
zr!`hHp@-qp+4Uho2=1aK<r1B2;-Pj+sp7umC2YPxuT;T%i{i3-Sdx1lo12HLoRIk$
ziLk&EyB*mDMe<A+iuDt1cyX)U*3YZq_GhF=GOf<`U$eV@+5gmH84Io^{oJTT1BLK<
zqt~^66jDOJ@>(hN8dcxY5coj)IXFeVjvsjcB-cc-TTTeF;tGvy>?Nr+FZh%6O`tXm
zb=i<~kf*OLcH?CKLM1%{Ayjg4kXszMnAJCciAwn7Nz(6a<ufafVrKItHmPu>?de-b
z^~j*qMD#a~o+P+64(?X`bJ}p~NLd)LSRg&Ay(*`?dHiAFHzbYjk!*Pz($W~b_)Rx`
znP|E$?beYIhl}G!vMqP^rlb3Q9&(BGLaJtcaj08yQ0wA$QLJg-!K4I#oj{9YONgUq
zf(dStUW1~n9VaUNVx$8a;qB9^w$+|xkny$TMzFa>(W$#Fjv4QZQ51OrYNpn&thQy=
z(tLK}NM@+BWI{Z_?i*%A^+IlLcJ@+lzA1S_RWk2~-bINa@+0Zc{3)_KGkS!~!u&n1
zug9+weHEqSmM)K9^N0FtV(f)nSC-_m2SG{C*a;)qbpY#U{P*%hUN{HRH9?nvC#7<=
z^3ol}&Dk&5{UId><S9rzAQQZ2Ycr%<k2NM<l<u&FDOMwiZ3WbggJOID5rT9|4SL$f
zBisZ>SBA3D38op|Js?gr`|bmk^$N@gnU|whWCb?jxC1ox9#fv}_hZ{USB(?XLgkdR
zqL7g{zx?={6MY$&4?$zcfYI8lBO;HRZ*VLr^s+7h9O3lvXE=!FWie{xEz-|phvVhg
zZo(BvBZ6d+s`Vu93z_l|Q*DIaf924*X!mUmv383C(&tLRYd#omZ{)c~&s?AnL+1Jp
z24RhOY0qZ`8uMd(C=}uTKr_ynJvs3LG3QPCQaU!)w%#1kj(&(QXnTIg3$t20yq-9R
zv&V^t5oHgzeHooa+Q~yxAH3FJGml+@m&QSvfy;Dw(&S|&Krq7GT%{Q4>zWqp%qzVd
z{f=d#(?({(@FS}Cq?^g|542By>r>xm4cNMKbO_p&KF@zoQFcz&2|hSenmyZ1xSeq1
z_Uifawm{KBfDO=jQ~89`@zR%-ds>aTd^>_D?sZjvn2o4-Ox@nrkROXuauxkmc%dug
zu3J1%fjwp<q{ccpT|rC70nG(Uve%Y>GuO3J^uZPDP*e>XMvtS~6Q{Afv*UcsyM0*B
z)oowO&Xg;jny~CATV}OgN?*NIhIHzBXQAo<5s+Y-d`$&kxwKj*$`E1`r^UfJ#mf&+
z82AT4zxUI|o`JJ;(^WT0EB(=5s`5g1>2LK_bNW`z8@CNNtDxAryUmqt`zeqy5fd)^
zH&;}R!>5218E=6;>*+>)i4flf9r~0@9uUzMuzQAMXBk`U3GO}!M0l4(-VfpbiwAF!
zp?EOJX68m--#mgJ(z&HI1!ERmoC_v31t*;!wh0$m;%Kniw@xn`69b?r_lx2DFahE-
zXp0<i!&jY?sfin!yY=_&w=BGIm5)yXKinV-aoCXFM9)Fe1IzxciEh9|a)X=s!>4*t
z0ylMgTG5LbZg;rJdpFqZAjB2frbL`8<@!|qjTAe1T3Y9(xxkL*lAuuU4Wl)?ng~pJ
zF6^X<I9i3E^l_*#H(<GA>^fDc-ct^s^x#m@nYG@n$Pywiaw4mn>cF}9pJ0c?_O~nO
z-N2}n+RHu$sU2XndWPmi(%A0!*~8w5zMV*-ddZVBRolfy*4)U(KM#lZw7-gQ>r`#l
za0GVvP2l%`eFf}=6ZPo7C1t(m#buo<h!(gzS&1u>8T7Dj#OGV-6y|yuXZ7`GD^B>%
z=HPodY7|!fFdBw2QX+pRm}->#go#x@-~vzKd_RFVLgF~@$+=<Fr~@{@iVerQ`Kd$;
zGJi)<s}&)#(}q=&I*`j955LF>9(Psx%uJ+XROgEwT+6ApYX$}>QbdhT%e|$byY-XT
zQZti^e8z*KL`hF<a*=RhqnxN(SF}^Ey|aq_e%Z~McH}i0^>n?FKm#nan;wgRVbWcn
zKOt1FC7c<uUt9_*^8nHOe9}81<sgcw=N!{s@fY`kZk$deVOn&9$%15zxgaTL7HNUK
z-V%XM)U<)GX6mE<SUs8tDUn&tGRiC*&JK@?2IzyiUc@@EA>`+_mtDf-PXudqt`-Cq
zsP(>~g|f-ktr8U9f=l#?${rrZ$G;Y2JGaljWMjiEhpgw%Fu?nfS{&{|AT01lfynrR
z08|iuEw25Z8TXQERr)mOp$Fj>O?imIEA*oX;uuEN%D-SC2u@(rg|ltnE8A@S0EPw`
z{6;G*kz(=Z4{V$W>{}Z6COjTHq|_OP3%0SqMPT;I^}YG5h;|Ee$rArDtL>h~v5+8&
zs62?3atALdO~t&H0=sIQ+LxA5@=Ye+k!Z{ZuGFw5WtLN#J1rF&jB)<*qV#~-Z0)-<
zBe5zbuU|mNN!yneOF7I>^~cD9zyREDc1sUWg9pQ=6WfPr9v!cR=N^&?Dlo>~zxb}g
zC~2^0NXIZmeRj8p4}ocA!E_v9YoUgQhYh1Yb=c79G0r9`g;f>(;7eP7TAm%6`YdUR
zMVHcZTNoJ|=IHTl^^;Hv{0~>`kb)vV9i(0(%?%M8McG-Dy!8lBtz%850gQdWu=EIs
zInZM5>g$MjNGavYpinYxcPEVi<`}VG;Rx;kaQ?Au&TX2}M)pRA#qut(#6Z5yp+d8}
zUjPD*DbU+}SQoH~Q9T9%5FoH$1_>b#w(hZj*tKqvMMZS&gq`#BTujO9<5Q17xyHC)
zGirvb+kuYl(=&ntX1~qF4ethMHWV;D<Qjxcu~14E(2&-tDBR9O;g_Cze7{HCVm^b|
z7cAnU@Q`b8cb(3aMg`KCXeeE`#SU<{@!VQtGv!3@@c!=fAbu_qdxp_a!55-?j9Vt<
z+<s6nU=l^Kc*|q}EDN|H%NNb%Mw-uV+YP*IQcG=0p?ur6W%dkFE^JmqWy{G)v<$sY
zJy1a?xGTR>J`AWB-DG#H&{gp~@G1HXLBIekAQ<Rjul>zS_}=fC4dLRBqqid%;-$&D
z6_=2>y0-Oud^bwW35MBCggSh<QG=r$^)ggy<@(y%4dqR;@z2tMX?WQIHA4xBn?2pA
zBA-tL4GS8d&dx~UItxPN3g<y!hst8C3DvFYqp2m4+$61qHd??G14c;Vi7V^SS5J=N
zLy~t$a$>r7AU~%n4L(`mVdhKjg^o|lz$#;3bZS>~sw?zNnXP*+B_Z_w*a#>?s-7ML
zQx#vlBNSAV^d6@6Af1~5ff!<Bu5&m*vVSr?X8wBnL%l}O+bB7sQLWx$z|kSeLshK(
z=@8*ptHXX5(V5BHukH<((_uD*H_yZ?IBjG4dnT_}hv%T5SZ^FpzHjo-IN)CUd<L%G
z`+R0<hfBJq{0`+UfG3q$g*1Q%X4v<k<pma(OJ}#<dMpQXBDIg+A_c_IK%ro_6B}sv
zD;LDiFV80Hxc5eD9c_H)L~(*oc5D2_Hv4b8R(^Oa9(dVr?CN9>0zyjoOdmw`jeGCX
zGcn<7zQa;}u;;hPGw;tYZ6dEb_?IT%mC3z9ZZ=ZV-o9+`1(^rFl4ZYg^^D`~T-^N(
z_2!ZdprHqNTZ_L?3EvPC<@*!|;nlquaq-0aa#s}DF?W;4SL{9Q<bM<N`g|9p+|d@n
zH?Aq}t@woT<U;VeL^0J7iWQiJ%)0rEFwV!d_@Hoi2fG}lp^}^B*wOWphyAc)wPaKO
z5*&X^W~GkoO(^vG)!|vAk55sg0uLDt++5*x<oUkRxqwgo;)UaZh-d3zDAaEGZ8p?9
zDF1an5-)3)Z>3t`Eo=GWOg`_OroMyp<(Z5N1pPOfx>`UiHOQ_`=t1KI;cVlx!Q<=9
z+i#Rti9#M6UkU(#4?5?cD6j7f*S}+RqyLfUsb^{V-zRhv{tF`QUmN)U6PNn~Tk=0*
z`Oi4R1`dBEa(|GyKM3=GpwI&Ui9`Nw^_{W&+x5?B%S`_Q?SHom|I0YbABa4sDF5Yv
z_>b=xe}w--I`B7RIU(}S^w0Mn@ct{hzc>3q3Mcv(=>D#S-v;xajsGu06XN|W``-%_
zcHZ44{Ue(HWF-B+H3?1=JW$>I@SvMsvJ7jKrqctY*(z0tVRlTIdT)yu3TpN)2K+Jx
zZ0EeVHWj>mWvaGV15~#1*yrhaVl#?OtJr(X{iDXflU`%F0J&8Lr3`GQ<ONP*(^-Uj
zwC8JO{hCW;V#80zqKb14@=J2cbEPhEXr3)>iC}PV&8i3v0eX<n$%PtXgiUFO8&sgW
zK4>3$00MhdjOceSKRo?w=zovFN9Y;;Md<%MIR2Lngm<3-eB=LG#^mEW)*lDLyC}uV
z#+t_1%+k@w{!gl(7S|`!*7y74`41=7hatyMmA{#<D1S6;qGxDg<mm7xlgg-%reEIg
zkLN!$`7vmJZ}KBxc>f|`|JV9&^YqWg{}+Zw!dLNcP(=G9ihogR{0YZ6>nqdv_xt1d
zPjURc(b;z#|5ZJZzu5l`$v>O_&yXa1mts}Y|BV#O|NkY$GPN>}F*i=N%+x<gSBTF_
zGe0pm+dVei($7BHHnx1%V(I<Nwa_~>tvEWi)HO7<);%yiHShkI-rx`jfnnZ3?|yyw
z_K&AK-ur+4-TZCpXl41E^B=i8x{cN39|*B(DTe82Bxt5VV>yaRoLL{gd;HcB;)+kv
zNbgO3H204?@-dA63km)2`t+X#<o|PR+`HHR#=EJZ;os!*|B~47U%s3ErGek#`)B+A
z%dq@d842zFx=ete0|0z@{ri+f=ip>-WME@$ZDim`_qQc}$lq({OekNOemwuMVw@z&
z$o9~~i}D5G7YG8;sk!xq%Gl_Z*!pP$EaR&elPF8vae$Zz9yh^J9X|punNxbPM(AoA
zwhd<5k=7s&0L+>y!2-f&^V_oWlYy>$QbW#eaNySWXE~)8S>s8XWO`oCXhtce7mF*~
z@Na$As%^rHEV{8rL8R607+0M);!vAK8h^8Yy!E)rDEoz`R;s4C_GQ5OdA^S|xu9N$
zw;<2`moy=#MJOR>CLM&|q|0Y{JNrdO5P<`N*C$<5sm89*9gGYyj#SpVf)(AqrttAY
zzxlcxnl-Siyn?Uy@*XwYkRoQwlec1()DUlhdH5%HZ$~ft-U9Hi^ptc1dk|URemKwC
z7MiUO;{1<9o$cw>UR1nMkFZvUtg2ohAY1Z3fIpU-(6a6fBEa{eOYgw{b(a4=Bwyc$
zJIy~$R(}&4oqrsi|7cA9#|4-^rX#7*fcnSt&(}wC{ij37M$gId|4M-2e+rp?i9Rq@
zdB6WKe*Ox^?~Q-xjw$|4Fn(+2x5@eEX8t1}{!TCrgP-`DU>Z&4FM??*Y8h(DQL3R)
zDI@Y(Hu@_1I@VhHYGxT()_Ui0^5F@YdgDK3l^`P<0E73w|E+HN_nv(~_u<(;h3#Vl
z@%w21#WUTA15@kw``-repXZF<+o#p}LyLdY;Qu5jKNhjyLuvgECF8$>@^^0jPB;DM
zt@g)gA$!+ML;O9aup<KR`x6+@Nl!ThTNUQD#;?F@5V*R79_D(fFe%7T+iMvo{sS1G
zzEl_B6gDl>F8EOCc2Y(fPNcqI9*2})MosK@jqYW3zNO;Oel1jY_vpaAb7t@TOwgt8
z&T^7cz_PAXVE6dj!XV$@F=F!W$cHokd@k_(n{(mc^Z0*qP|MzN_z+$H)A{jFU8J?r
zv;E81WjB}jM}c(;um0pu4<r26SKHSuTEv{|-TB#xKQW9DlPfd_`d7yS{ugVvBCa;r
zc1@aM{sqG1iiE{%cfaxk36bQ)KxQ<Q!~zCJ;2-FBC*SZ5c#$JrsY!-*Vg2^!gBEu@
z_!u^;l!7m|#$6t(-YVug_&yeXn*uZJkJx_r_0Qug@ZXK^-#Pz3ImYilKmPVY`ya;G
z;oq3KGg1;`5;PKXQzPOs((mha<xfR<a*1;CDVfnB>4{oJaoI5{37Q(PP}2SVT{JZc
z<bpy~hdFz|_t=0#9M>Y{a=iELqksQAR=oeMSpA(7|I-2$AENM=-6SC5e<@IZ*?Ck`
zU7CK}1vHm`Oj`viRyHfF@UN#jc1nEghq;5YD|)t;u+}qrfGrLDoXA27Fm>Wmnq~^w
z-$~69-`aP=v@_6JVK@1wV_e{(Tqf2cek$@4imTE3CFlo`mMoWLd%}b$ULwvjF64aC
z9O8!EM(ET$|0;{GWZ4GsN}?l?Lau$Fh75WxF(k=!6S%L#OXnxILq0T86)lN`prB|>
zC4n4~pDP`~2hK2xlp~lqh&>#RY>8lK-{bcccW&b%W)n_^*Ye?$vW38OCS}uiWOtIQ
zbdnZjuBiOZH!74U(L9bl9gCt#<{zK)$&>8|PJ_cGuOnXCX(aL?yl)uejVHDX;I($>
zqt5eIu(pirJhC$P0plOlH|>~PrwI_a$4s)nrXJ38p7msuN?LGp6ovW7V=~{BICSc$
zlD8B5;sjt92a#*XruF;m6)hzR_X#Vz>ZDunv(d!2k=oj2!(Gey#Wjv);AXzcI7Au6
zJ_?WS#@g!$;`n_E(O_FSbawDB_FW*4K~qBU39lRgXOyKBu+RdCi4wjH$P-u0vzGo@
z%>HEBD<WM}W8}<Ol5g8q-4_=OO~7-puCof$tEtUlMXqj<G5z##vlK`q{_WrJ+ncMq
zS2SEKi@y3)HxtwKSd_CiyY!u<Lxu+7M5TqTN0*+*DrJmqKIAuXvQ%fJSv8Ylmv<|*
zUct#?s6mEP<XI!E8m21-c2$!GUpGW_d~a?3cA(n}kT=lPMuNrqDuAsUAMVUw2aG$c
z`O_igjl8V(%bbhf(|gU>r3S*1EUQfh+PI9Zn{$juXVY<p_82&j8To`@g$iE?y=lht
zb{4A1deP-T+46J(?=`Fp8qavpp(7`W0?A@ydGSmGkxnO#eWUoJ><RJ8iy7Z8+tEWk
zA%jqbO(RpKatS1EhF@Y+huPZb$X4erk+%EQFh<(?0*uX;uw;>WQ(JGl=+&h4ck@#r
z6F9eL2VFoZIL#(tN;@u1Jvr)nAt$jvMkk_$S!!w5hO*9sg?KIzN8|~l*1WuqAEz2x
z&RcnPUnDL3PL;h$L&1#HNFb?3XnYQT>Dq(LnB1T3F3|<S<>74B7x&m(`M<VNH#ZaZ
zko%Q8HFY7Qh&!^HjW3)*&CeK`KZLQueICA&AJGSk!+%Yduq}?Pe-ZIk(NNeniXDU+
z%gP#qPtGsXIis);3~ox;p9O=L+%D{0FMdF|wNj<lE5@5iZ%UAQ!NUiv;<@Sgv99no
za)iV3raXxgqhh_M*rPpZ0URZC2Zrl+>K-J(?KDl)Ld6G$Jy{3B_f1a-v^Q3kyo0eG
z^|B^!+QkL8US}Yt%D+Wq37z&^A5g!#GN~V)?%d)JYZbhK{&mrwPcN$_8ttCZ3M2e3
z`dE`n$Lptg_3tGpUvW86x@}7ddKfVj15uRkd%ZosVGA<obCS&!CNH2LOHD#UmxF!I
zF{@1tOtq-(s^drZk12$sxn-CW-qX+td~7|}I*H0&IUBtNWhA$N+v;N5$t!;{_0*c+
zE7zTDD=V0lhJ`j3h;|O~1(4&Ms0eYDQ*`d?U@*KsG-O|F8iR4T!g6>%Q|YKBqa5qx
z%)ri&j?|WpER2I3FDeuO!UpKFv`l+am$KOWS=eX)<7dfiVU}N(o|`+go=*7bi8vO@
zV(d+#S%^^W$%_0pKt@NSR_D#(dArxRtoG5eqd=yksEB;wrmiEoE7ReOl-6UHr1}bu
zI>od3YVm=!N=!gvI*H3~lxiNV&FTznNzO%TrHq;qZfoa2>n=RU1XOczj;vONHsJW$
zlwjT?!;ur`F}f$Si0S8S)b%rNI}&XS2G;q#*(WRX1Zf$TQOBRs9n@DI-Hc}z8kidC
zGz{v?>N;6}^qAsobamH13OtAIia&XV{yL&7ohw{`=0X8~0mfeETUeM~YGg<r(qdK(
zE(Cdj`$&p75-pAepa1|Lx!|u!@%LHcW3%($ONxJ&F#e|{#cT!1za+&GU;qHRfA<a5
z!N}g(%)sc+=QPbl9{jfFIF9<eeOyHJh;=tTyvW@{sM=@AX!7+S*kBp8ddgpz;Y^?^
zktdN>vy{Uf3&dLr2)JS7L!)gDKO?Ej3E)shZ_uD77NBwh<rqowkt)~(?DV_g3wMNZ
z>*&^3QewZqR6Tg@^hz!4Q%U75u}aF`vbfv}l+17<hHH#qPs>6%UWnDuP=-0mrmMf7
z=L?vjQ`b#Y=ECohSv(ijBAU+1VKiC-(iyun1QgahPC#Pdkvi)S;*D7-zsjKsBB)mv
z*#O)mnaeVtUWET6XEb)zE~;vEe{>=W>6^Rc%Fh9a2cz^Y{J=5|PgN=ket1!pFSZj7
zn~yH?ELs49c;fyWl5FPDME{4ncZ{yI&DMouqhi}mDptj|QL$}RY*cL9w(X>1yJFi;
zPO5kBe(Ut^x4*OdoNtWXKh{{!`nA@Y^P1P3_tb5kHlZw|<h+z}+Nd?YT(2UqIDsC9
z<(AGwH_-Bk&xW$Us1xe7m`#1fd1He!o<XTLyP&+71zw?8>&K~0$WkC~$eJZ*%WX?H
zbTCp?{Z_&dig2#+fLbx)0!SmPJK?i(1w1PKK;9tz_LoR6aCei|6c7O5moEPR_3v8#
z1!|6eA=3L3h5t_j^ylC|qC7Il|EO#IH^cG2mif>ru1v^3j?w=h#tT;(v09=3)b>n;
z+94{8Q*4Yui^#+`DWH%gE#m_pHZ%l6K8<fm#+T)FenpTRqhAN!J3D@MV#k)_(yFrD
z1MaTU6eGDz@)E;C+&I}Cs!U_BAjksF=b%P4Rx=lNPr_QiE24+-S`L>$)BS#U&2hSI
zx|>Tla0ELeqE(yC%VMoEPh@%~LkfQ{TAf*drI~2ZNhcMY8Z((NQq%uZI)H+VAhyH;
zK4wNjQhFL!Nj?TCX;uktdKHP`tqWwEPc>BatRx>xgV0d6293NMi8>codlvFN-7-Li
z^-i-%L!o=7-$DT^*3x)QZ{X+47c;&vvHQ<q5KRi*vcTp~_6`EjLgb0CWt#yIy~?$^
zL}ALjJI^zy)rF@}+v@FB@(@0e<ACKkg0lY9oCy8&*-YVbdLhqb{5K;F^DvH=62i^5
zp<R0kMul3>iUsx4Rz9r)tk`L*k6LcEd^QRwYkN!}=(=;WNx5-4Rc035w&I+&8jgG2
zwjG>IGldyg7CsHfX&W_=WHEG<Y?RWk!&&-HtH`f+a)R$%>DeYpjxHUlkA#I`h-IHj
zhDAUS=thQ+6wghc%Lv(FGu;Q!kO~}nFJ%t+Up{~BDzq2}-`AjZO&-pU9t4*~cTk(m
z@6~?ilD~K0r+pvTM0aPY-<zPGXt$|)Lp9e^Vxogv#JX14)nCq$*`T8bg6cNVcdpXv
zUFe@AxVumugu4dcZS5M1w&BYFO|1+Ztxf1KL%1A&ca|6uU|SPW$Cz~Zk>q7cY|Py@
zalU#@FLlyzFsB@O6gXYIx`{$V%zg#N9mg{knxnX*<9vOJxDGaU5x66AS5%S*Af^I&
zjFVwMe%Kk3POycgGQJ6I^W-HJ*LGVldfAiefI-U}2bhW27=F&%mZ~a)<~tKYx0<{i
zn{1CU0@wp5?^n3T%`A3;C9}8MzfDUND||K+?*Np>2s9T$RuD9T^mXB(o%tIoNZu!4
zI&gxYwf-f?Qne?>T#W}VL!+&*vY%dZn&=X|{Js-@?MbZmp;L9?Dh|3n;aei75BPeY
zu*PVP^DJCXjs7xIovYHar2WguHhv!4B>mu`U#9p6AN_8mzxasjU*MxZ_67c(z5Y*Q
zq~9}p@gE&7|3VVz_l=1EB)exB^ItY1Dt&B3RA^S>W-|hm=!-ZJl0v>bW9}rS0SB3O
z?MTNUnn1IJIJ?MMOXL@_z7j9*#@R7B3<h<O#q<cgNG>h0Y!dTlNs3ApR|-)3G?aXK
z=)g}E;ETFS7>RT|Se>-boyAKP#zg?#2(byL3i7cJ5!f3H64kP$nISbIUO(zayRMLC
zuKN*yP4}>;-A<0t%38dP1^5Dw*0iFZL^i(+n*uNOVNz%XA1e|FnOs99El-&xpz_qJ
zBdAxCsVz|2z;9%+rf6bX$g8|uN{T}FJRD<Zhr+`A8USoPFIEQMi}Cyiq6$#$ZAKIC
z5nuf?#>G??G3v5<qZD9nKu{=f*Kt3^QctAbw8*HG#O;{h)BaytBD%+hR!Ba)<S%vn
zfy&<%^$V5%ce$&7q_h8N&}8{-Lnrr#Ea*S%@PBuf`X+`3juwV=_J4i&E#3V4ALRS<
zHJyghJmw#Dw0>u=?<>>-RnD!DBm@C)=||-bvU#;6HhK8z1SC7HDsM8A_{2?aozCZZ
zm8{1QxHdJLhLe*)9SY|*;LNTZIsRl!<5~nB`vs?*XHdF0sK_PDb*AyeuDb5f0X63~
zhULp`7xpx061Gv|H$8{YHB8e5oH`gM@E4*09K@;th8Bur++$4c82#TuiGy_DZMsSG
z*zL0y_rN6X=*vtUux@UV??>QZSeOAtk#z~u>X<wHGl#aFPuz^=Tqb(EJ$pHK>gsDD
z=&2SC_&60BxIHmtRw3LOhDi{iIEpV!50-{7_8<~T6I>0SrF(YXYfJ&!)_p%N#iS;4
z>s!9fdt;fjdHYMR;vna4)W-rufM4?d1AD(~;#XOm^UoRaKUG4j{eP&G{}$^0XRMC>
zdvW}i)v^Ei*Z&bP|LPC^2_`MaJAaiy1~0i~qEC@;S{Cv*h=OC;u#M~Z&)^f0<Lu6@
zXq3?!yY2-Z)&!)5Z2LS?Dn#X~x9an}3+yjhs;I(c0!HDoo>S%^g83!26ila@(i*qi
zT3{rN7@6~<mMCzbWtLbZ>O8;cy1{aNog(YZu5)>k=?_g}oMoQW&p2KR+1MoVni27a
zqWk3~*?uhShka=Mm*)Q*6Mw$4^>5PnhnV;~dHkEh;X_1!DJTD*^VEN4*M9-x*XzI8
zg8KJZWcyc5^Y4GhzqumN{=16!TQcOA68^N8sESH@TvUo;OiYP<g6;>ca@`bN)i%(F
zS%5<T+EQ#|e0=M#Z~k*L`B(MxUw+=dp?-efHeUOY+xq23{x?JURTBSwk@??!{@uO*
zCtQDZ2K~tj?s`Q{>lu1vkIcGv9Y=g0MKUQ9^d^2F({s^_F5qQ9r1d<b3QG%POTOoG
zwvcp|Q<jh*p%5g^^+@~icIgz)J*@IDfm&j*!BlnV@q&gLmi9uUhL$!_>b)A}raZ9M
z_BP%(y;U>5dyqLGr_%0u54{0c#Rw{~D7lrY>(cs&1vd?fLtYNwvI3M1#8p&Yu)-S0
zkGt0Z2<AAtNj?$B`)^!Nwm;>&A!d%8R9opyCNMUV9<-<)0M2$h4rL(ln}ZXDBTTAp
z>u$9x-|J+2PxfeT=3DQ0d-#$%@2bR-Q7jvnMK!NoiV%p?7t$=QzQ!zEAJZSqz(%hH
zY(3wxc$FqUny=r$1S{5HewJfU9~9b1AW;kg?IeY<T|+<~n(SA(>(zF!6jbXPPwxrm
za1197Lwrq5cNJM3{)4^}<Hrr08VQ?#3Q848Zmfp|`F1&pN%T&D&lp9KklkAHHm8Mk
zk!e$(w5jjU@FIbQ+WxKE*-FKZ&{U#81zKjb3p>T>o8ZxBwB4=3OZp5rCpd*}EH9v-
zbU(NC_DrkFO@)0YPP`5bM;p#_>RAA8c1aOgI3fiXp_W~CTH{*Flq)GMWP9Yq#?shK
z$i%gf!F<`dHAe2Dl0mF0Y`}Q4g)v)r7PfCQAy#0Xjc?ZdFZkX%Gkh0&my>r0sQx@w
zGUC@RtRmeU?ca$U-Y1H|FaMHOZLS7u{PYpq{DR*fM*2H2e|b6KKPAz>LnPgQv~m1~
z*?)%7e{++Sf%v~N*}pN^FO&Tff-R5N{xI23UF-K0a6I+!1gGe3i_@Z5lKlMmdEsRK
zlw?j=r4=~r<1L<U<F?bJ;o!h5#WRoYUhbWX&SJKJ@oN$t_*CT<b=!KHi&QSGshW&(
z@iAwWyyO(fousBQ`4`d3LIuUTVrlte8X9@VVoLI$&3Q`o_%TKr{MS4&w5oB#DY3L8
zrjs<x=Glb9DoKuCs50rtaF9?tOa@{Xg$6(Zx>rfLIVF-@PCoCt=zM2@>4v=rk7^4c
z-1w2gT~@awEO!(q?Ev)M!`YND*SYUJ?B0$hmnM`p`>W!LiKi#M2)H(-@L&xGrG!vp
zS{}Ig1<HchYSNuX0Hry!Z#Y-?nM9w#V=M`PG&9R1gPeJgh_n~&5ScUvtF?^fC%bWI
z8e40=v$$QbKx4vJ_0(-_vA*D~%xai!MXt&K1gB2wa4pCXi!-@hri(FiVFxhx0YI=|
zu552P2>CARuEQI5I?`R*b;c%IX&b(C+Lt})z)NjhErn;-GTO__Hf!98F2++Ys1Yiv
z*_1pr8e(WUYc4L=2{t;Hj^P`H!RAYt+S{*(-a`~wJZq)zG$-BAUTW%JzoL<-t`YQ)
z9COmPK~!M1i&t(cSqYj3C@-2sgxV(B%J^eS1JaWgq)b3;-0~m3$g<q@27HxR$6r)^
z0vF$+JwC3B_1xvOWT7f{wv27pg(-9LD8~`qq;-30XPEKRsw4>#`JQXaN3JhXni$}u
zIi-M6#4ig5c3F$J7CLr-sWgGprcX6&W?pY5bBq==9;*iW5b9vLHcL!DoIk`m13Gn-
zu$MX<m)FRO_hnns3cHuDlw$>o6G|P^XTp*P!gW2VrD|P5m<A8b%G|z|`L4Hq?gi+V
zPk%L0*A4rii(k<H|C=uUi+%i?(}mTC+<w)k{#6hE+dUiq#K}AU^#FhG{>K5{2X3t`
z9`3tC184(s9-|cG<5~RsaMBi^sLi?O`I%U~vp!^o4a-};+>8=;QEgKY5Kg*m545<s
zdhpNYik83?Mf6aL$C7EKxN|2nBaOVA=|$!3$ejwfA#YK64GBaBbJr+Ava%L}&<4>d
zTveDLA}(hDSVaFfiy7|Byxk_%JL|c|^6}hE$c?~`Kr~vj2A5v!$aUVtlB*;=$(@;@
z3O<(a0K`z47-WWZBOB%;M{ZG_TkcJTa+_66syqIC;|**`_<dUlNERVa0-Rgw8$YO`
zMad5|p0$Ms!K8U2I+3e~<_gS-!}QBM0Rixw*FP@WkRD2_s=}G;gf8Oo`i0y=HW;8^
z_iX&q!k;5o?Ej6U`v<D}Hw15a*x29NY)7B~0NDR^@c#8s>xnG+m%8JSndE<I#8Kw6
zUg3gi-&cX?=mV60KFjJ|_5f|@t<qhq5|9O{ks^Ddl*k|^gZ}<<FBh}BD6NdFD$5iz
zbT1g~F0Z;KYB&V_h;K{Gn?&+R_yy8vC`3_w-rz0cyX8o+ICQa2M@lt7GZoB=0`M;D
z5~eEReLk)2k8=3vb&@$@Zr|lvAXo3jw+@E!&o{4;N1C+7l!a&NC=`|{iqDSedo<f5
zMRhR2d5i>_DKXb)vM2sKc5d!WbuONam4~*h%Ruk^@39m`$mN@3eL>#n^y5G8Q9`th
z{7p7w(ThKS7Ky+jPcF_Y0mVMC-Is7+kY&X_z7(*%5uXl`kq7B9Fg82GU&d~}UBFQ5
z{5}~le_gm_%HX$tmIhj=9vj4v1;1qEClF4AvpkHOV=2Bux09e4XRf+AEs~W4#HnW}
zEckWbQ+cFj_o7&%*$<^PT%x%{lV=Gf`8{%JF-ad7b7?*rmQX#0-1x2&2rCz7Do_Y6
zd&QkmX!A2cH1dn66K$9YyXuxCuj<8~xrE~gELH_xoO?wRmwz+Z49ja@95KkgiXDrZ
zY!+;_?n*OsdlV4!)bi0_xLpj9mV#O#J3P)(4fMCWJG+vi6Mln?Ppup}qe^223;9fN
zgAyEAp&jd4&YY5lu~Gp$3<f@!oMSfB4ITAcLc(`3@fH2p#Y+t7{%}3wt&a|V2GD!<
z`$%-kaL3qc@V3d4by?v*#bTL|H(hb6r|;wF!gr!{z_x~*S#kSLg15WCP9TDAnoeI4
z8nII>2-|L5b7&4Cu3e&a@Q(SbvA58jb3<30=>U1)2G!__{KCrWR~~i<Z7^W7)AO4S
zVvZmR!ei53gM1!8Bj5oxdo0Llz}n2EuEM>sbj=1lob1=Zgk{ZA`Oh!wuR1%|*j)Bi
zW)5(wQS|xgyuBKfK?T>kk%!EHoXKvuWo<vguk)|9nX&VXPe>Np*1X_EL9`fub!%~q
zBc^zh8_z8yDG>zx0&W4nZpgyx0D7Ov<N-Xlo|Leo0)6x_H%!<In;L$Ky+28AO7}Hx
z-Lz`6D9%n@(qcf2J0G+EsIuqmu2bPVZnaWJlbWyf#|k-a%FA~uur~K90q#8vdg2EM
zu1P(#!Q*|BB_7QICfc*>BvXr3nQ&S(O>}gj>AFQty1sG)5Z1Elafi@_TTl7KsT*<i
z9`2xf*!=@pzxU+m+z!6DL=Lv~u)F4#`%Z3__N@y@vh}__0VT_m5rY0jqA%-+@>~ty
zEYH`n)5fhiJCv$YFohr7!feCd8nuL%XHNcdpeVYpNbCD3A^jqZKX~?cD*1Jw5d43_
zvwz1bApe~U%Km3$PE8%H{&tmF&By4~uer|uEk5{TCY|n&$KTFWe+!c6I+_3M5Yevo
zA3csgwY!V)(j4S03XiMUt3w-x8vxcYsVS84Az;MwNGj^cqZAQYN4(af<B;2zBK(>F
zV?+tRS#$m5cIHCF4#1{jz5^0tfHY)*pX|+z%tvN5Aw@hjAI=jcw7vrBo<J~;B?{9M
zGuA)Xb`Mt~S1S>D?FgdHA7YBfQ@gq~JJGy*(#?5M6b=8Dse=LzBr%N^BfHdkMJhs&
z_yt<XS20Y1<4%vE@S<7UJxBzmv&$Cen58^MI~>2IRiJ%a&jiyT3`=*?OH?9_Jc3#1
z{$8m;#G`x6>l%G%E2QeU$CLQVnpj$a(jIy)2-ck5kbNE(7WCe$IIK79;dUq5w`UZ*
z$0MsPWkTj-`DAzZmz1Aoc=o6yM8s;y$Gt5Od<D#^vC-8*keA}tQ;@#eJn<G0yFDMB
z`8(7vEu43R*#V<5{y);!Fln;pSJOp5Z)r2SDy*cpj7KOd?3RRikQpSd!rFGzu}c))
z<Clv{TZNlfB*rg)b7ZaYbhz3*nOR4hp~IW#<dXXVTMn(T5Sn@=S?}?-c6llMdEUL)
z{hQpTSk-_L))Yw_jtCwfM}nZuS+iS-Yg;<rBgG&=c);b(upHv!$DO!Tqa*HP-+qi{
zw9b@Wp%HmXw-*B~H}VXbex+tRQZZQ=wUX{DCFTft;3Mc77Wjc8<hX}RU+1^yg3*q1
z8TbG{P(%qKLY+$1Eaa&lhg2m}xv=;-DKn`#WMCr}vAt&IUB`dRdj>vXV6in6g8*52
zAI2~0o(6Lq+zU;CM){;{rGv6Hh3|>En=DefIILm@Wa5wo#XT6@3qyKcTj8h%25DG%
zuB_@CDbCb(ydu+Rl7TCORDKde#~cnfxKYA_+W7JFF|-eI#MtacctOELb|GvN3Ti2`
zM!`?<UC)bGX3TN_G;QkX@}m2n-UtpA)#J02nv+ELW@}caC3TQ*U$2ItMLg?QvIBEq
zEu+q@H#~H4r84*ckIgohtEMIkh%lW*ttkP>W+)64yvfqc;wYjNN2A2vt?yB?kXmY=
zowTRTDN(p^U7K5sU`@>TocU0D)9k*m%Tv&9Vh#fC4!zwr1Lk{nF{<k+_aN_V^g~ql
zWi<<Qi6Th2OB=iT2m0OIed05b<ByP~R0YZ(%2pAQMceYHZ`T)GHU^1O#Ep`sEy$c$
zUR)McW{8h&I3%8{Zsn9{%D{w8mxAQV^Cc^@3b-PhEb<?mKia!eC$GW!5yLbiN(X};
z?_K6^Y-@!MBatTIue?F#-8?$ro49%lgzXug<tZ6#D^B1>bZqwAaK*RHa3Uo<^>sFs
zIDg}WXf`(P=B(Y2b2eWUS1d)GS=!p%k;;IrynKJJV(Er6&KJQ)X)_TAr37-y(SQAB
zqDO-gTA)Pn8(f)BmPM#<dN(d+M<5S)rB`6CN@aTayVK#koPaj8uoGA-NvMYVdO~0`
zB5q7iLIl6fm^{4ha21|@{C6ga%~mF3=0x^P|Eu?ol*CB&yt`4SzO8tc(<%aNRg{I2
z7JVqW@9J1z&_8j3GVFd;U9TY|Ne}!=_*Ih|OTjdUTcuU~rv#8#sumvW7pKQ8Unp)A
zaceWGPl_4)=5#t}xjAJe%o^k}nf)WnJxYdjWd@AB$+Dw;EU}Q`Xb<*7)?l{F8ulE|
zano?F1r%2WQPh#o8zMwZHU;lws0xV;oUX*y9EZuv<M|VxdLlA18Yp)ViU=UeS>+(=
zu{E<CBxFK%^#@49NhQHM;bVZlefB71-9u~1KWCyQ4sgY)@#u7+T)7XGdhn1QR+t-I
zohB<*tMc$oVPB~?+gl3^w6Dxi!aGe{j<)<xz4IxT4nTjbsmZjf*mZ;|a|FQC(K}P$
z+Y$x9U`6$!c}~^Txm!mWgYt)}Iy~s9uu3!~9+4iAlg#Q$P1HNNSV~n}=Xl00%wb2v
zWS=C&S`mNf*{8rHe^||%nyZtp3yg>Z_GhE4ahoa-xL!i2x2y0L`sB(71D~wVuQ!`I
z=Q>sQMpdlXFcqsmJ-`%-O~rR-%dCPrNDqxJFYpiE!o>1nO+<Kd2wc3i@xbg=gugNe
zC)H~dHE2MGH`5U5^wBV^lqs{2d`&oAEP4vu$-JI7@U)aY)>1d00PV)s^gSNt8Ot4J
zZ&hhPGhc6}(mS#5u;hjVHQA+7?4)*w&x#j~*4o`DJO=8zx&r1yy#;eK{C;(s9&9ZR
z&J(`uXjLDJrw?fu-Q-yG1f~qvKF(t6sX2w;zbD5X9`R|sj!n?e7R3g^6BHoZfbH(7
zE6!}r*xrU<E>nyFyf4@h{k%|YCp!t#o9)gM$K@ap0cT|pt|O`)8n%d!yx<A84Bn3-
zKLhi}Oq#<=q+iI=pcCPF#Dw`+J<5tdp(e8CzA@wY;i|?LwqxYJM$3$H)xor3fYMV{
z(lMY5FNMoDiC*Q;D??w_(C~x|s)HVFtNT2i*)2Gy@|uRd6&>L$_`PYPW=j`nFRQ4V
z(y`&r#W^&CElNJSG<AEsXU~&Kh$p(J<~z$yhMIZ~+B>TlTQ6WcX!CO{X?C5pSvYV5
z-%qz7nQLz<QHKpwaPKj_cq8%3<5*SQ5RTg_tI@NP7w&A7)hMXgIzKwD{h++CRk5Iv
z5g1?jk6T?Y<}h(u!2tk%#Rq>xRKG_KzapwXZ_4>2ZurQ~{_)|T1rh&-k<{-g>vXVx
zA(HyrM9e=)t^_EqM5NMx@~E8kvOy_th}T0M%5N=uB2mJFVcDRqreQ=FuDCj92GqvS
zO9cno4~sM&55ocM@5<Ia*gi%x@a&TI7VD*oCKxNl)B<nYMm~ZeX;n=ZE{X%P8GOou
z*{#VY%81=6pS~g|r!^p|M<}to^5|5{C6-zsUn4e07MXY+i?r=WpP$2CL}|H+gm47}
zl<eZSgQX$}&M(vLnwJ}c*v(N_l|{!XDC9H~ZU;j<g6P~VTdWkZRNUFlj5NLc>d3$T
zz$XSPsA_yP<zslq>(D=T#%Y{dP3^T!N|TR1C5TKdzz=0~=;z)!GVC^rql%lo*`pIO
zTpkZwSTwz3fkh(IR1O)xW-wJ>N#n&jBAK|jd5c8%j8kRb-T%yx^oT77Y5D%yp7k!5
zxg<cAmf4V_$iR2ILw9ig0h=eRZ)WBczv2fQ?%_z&%$>do0$6d_(@zUFdAU$<OYvpQ
z(jR-rsYkT}!B@)6J8AK-*E;V$oKlMOJO%W-DJWg}Lv<(ExA%)cbQ4Y&wIMU4g*l{{
zRflO31Nru2Yq{Si--rzuQV=8>;tbL0RZoqLl#u&j&#7gAZ%6u8m5d3IQj1ToB}`IN
zQ;kEVk#n*=RZi9j>S$psZwgPhNOE(g9$be!$jSjtW6q}03LP0O27rVc<3<V7z-{Bs
z>aaYlI|w}Q{9m<4osb?j;d^_zSP}uQChcdAD(a=q+hxjHn%{wFo|jUf>%DocDQdH1
z^}p#nb0fX8imW_hzy4*?(ljZ3i}xc5^$VnbnDg)O{l7Km|AORyb90vXkQUQ__h9sU
zztcalXiGWHU;R!$U#YBWVY+{wlGZ^|I2`Q#YIm}ymi=gVG8G^4s(guoy#45RI(N*R
z-8IAM#(`sLgTZuFVLigO$`Y1wi@We1Sc1;0TutK~(<CVC_3cqiwpS+!Nn!q3$MQhb
zY@Mraun!tJqcOUjK|2LqC_OZd;@JY2(Cq|%55h~tmzQAfH0N(NK=Q-OyuB>Si2$Sv
zGPP<UIy8YMg1+$+VXAPtA3rzko2g-8bT~dh2%%!HnA*0)gSzb_Zd7C$<{1UP1sZTr
z8hy{w_rAVx6p*{TTBavmE?c6DVba8pOzC7Go!|sm`WLY#<m%bRh8e^G5Seh`jZ@4d
z>LX+JCGPo(+&gE4qY1oUnNs}`7Cd-B0Dxa&|8s!y{OJk)4;S-i{^lR)=HDEnda(as
z8sj%f{PFmk-~DU;;-A1XUis_Ccp|dreI@=2;WwpS?vaa09kD5{JgQ}wULABWnrS%j
z@3W#m#B?4y@1u|n#j9~xA#}9HcR3T!Wy?zPKbu6p#Z@6HCc(UtoPjbPc(aHrlRx_R
zH*Bg(NfeuW#;VS;Q^0KK4U9RjVPFzC6KS7QIOCdkk5k3E^((=lGA+b!pu-Dq1zb8r
zcHDZW7h;7{aVW}GV()k4o_o`fS%BU4FFCZI99k(|d|s0fdu%Nzigzu2!|K6Qs_~Vq
zPw_<JbcxE_R8*LmRUxW~;3%YD*L$r?P>n8yjmbhtex6lgUyJ-S9XB&As+0vH>E4$H
z{bX?)17ihSZU(pe`qlQ+P~qTl8;sEvnSw1@`50AWP780SeNW3Qhgt+&EP{uvZ9KMl
zxE03|Tt+!}AxkAkT`p)Cq|d7FsU8hUp=uWUvQEWeS!iGkQ0PKGq7|xy+b9XCq=mki
zFKmOn)0n90Bh>1k+o*MSQFe7r%mk0R%+UAoskg}tfs^sZwR!P3aDE_H`sJTUt=ZyY
zhG_Z7lc(Y3d{AGh_Rs^k3}vV6DBaxDU=Go&hN~35vyN?#0rvVzi=eF?!muv{Z4AlX
zB+UXA(IcIz+4@3x2xOcKc@Y{Q9X#|xfb`F+@T4P~kYU(rZe*pB6<pJn+Bf0^Mq3v@
zq6$tAj~*_k37qd}Sj}`qD|g}emNsiQTkNZEsPl-$E}&x{^e07M+8Oy+%$JgV_pzlC
zcHQ9T0Tn2m<gWV+Fn-h>QdnQ0&Pd^{B)>_+4a>y_uqv{llXL9-$&MGq*|JI-aG>}=
za~fPPO!7|TS<W%{rophGrrBz~MbScPW){)Xch9TN@OW^8*7#H?tl!Sa%Gw@`QIyV8
zn>GeQwk9pTiiK%X{fmE<yM~<E20oPe5GEGZD9K3Lje+RLEz{iopI0)qc%4Z7uLctn
zXEp|U-CvYA{0@wQFb2(~2aUI#Fnfa$Vwh2^wBT}2_liIZF^`z>1rQ%Zw|26EK`7B&
z1{-)+kcGKMUHGZH43bY#0up^s4|1s^t^h;opUKZ5CeaJZO-h)RqJysC$cq+xf=#b{
zqVHD)J*@x}ZUfYf<qpuWG2F}XD9%=a6QsAwp6I~d>()$Iv3MANUX3>J2gZO6b&A)p
zG``IMVp<R>1xTg5KzqT%H#U~iX_r9ZjtuXhr$jq#NknVG7{hEXF0;vTf9w$z&$S^e
zhk0F>y?q*ktpn;SiI-Bdt~03Lm1iJEbNA@$XTIVr-&JaA+e8e$lbAdrs<YA&!q*Uc
zQAp>{dFG9nxLy4+ZLH-ZO6v*!ga^o=66_3)WIg%AxC0AJdQh^C^b@AQLI8q|E9ST1
zi7-1my8+z&sog0%cbS!K0o5wlnuO=N`$|R^s?8Dk!jQ=CS$8@!Hg72oxM}SyoEJMc
zh49!XuM+_nAdT6%ibNnvD$;}x=kj|fmFVJk?XdQy!51mnHxbZiBM0<PkiXcTP$A_>
z3j_e*7lHjb+yD6p(jUb3XKep>Ecb6t^zt8G@xROj{OW@F&;3uoJ^x1a|H$S2gXLV7
z|DgT)kLqp2NA*?=;xE-(f7efltL^LUZt{tx)gUr#=<m}-hk0kSYOA~<5qIR9pz+LT
z!92|stqCiV=%E-N)mujm!RQnWkz&zpDZ2#_ji^El+FixbTU`7p$kOqlEoS~Uz=SR*
z@Ck@4A>XVqm5&U{S7zFn_phh=QuWtg0LE1xcOx{IERrGZk$=`#D4rthHoZ1RYld1_
z07a3ze@Tm*q7BNdXXq3-rlJURtASWC^c9juUtYr0M+`!5a|fcS_B0jIfOb!f6(>e^
zFnN*5(FZPU+@cerb_zdKhs+IVoCUn_ycI`%5ED0w%s(yqMxFKc@|Py;&S)`W#E*#N
zm+b!>qkldC@S95h+Mx7TW&M9B=-&{kUBB%}v@QJy$Kc;(@!RunlK88=(z`yJFnqjz
zz5m^=pHpsg`&E{h^;;^Fxw&z2jL4I`y9%c|Y2}2IGN)I{5w*d>X$ova#@-}>@o4Pf
zTCLanW2-hk@9V0xvg57g@IakhKqkyre&Er)&>FLx$SE<%PAFw2zXL;CWdkV(EU6MZ
z+}k%qv>8KOl^`*->Yr0uq@`RmrH|W&358{tlfCdt%^G#bQX5K^%3RVZCmdF)Pc0fO
z7N4dvOEjx<>}vPml@jJ<o#attElSLSq3#Q}Zdr}eSq(K<=h#atYW<5T`)_(*1Ait}
z720xRCECXG1H*pW{+3+ho)y}Ey+WP-`Awbx8xDT#eeBZEgKh7IU6KUM+I+pG-9BpW
zr5=2(QQ&gC@0qPa+Q@dUh@JUTTK|MI3&@oOBHs%ZNv*r50Xx#Z0g&G}mMt8dXL-hs
zJsoAlh<i(s7i#uSAK<Yhcwems&<c)RE>*^JRHl}YHimk9VLL-q)@SY8-L_W(3f3eC
zIJu9~`wfwMyrs8ww3x$@3c%N7>mChgkXZCvYo751+ZM=isBRGH?MA%)Z-}hqWb=CE
z>{(sr+>Z>M6fz^XCaG7R>QH$D);!{IX759bQe?t$miLu_;_pxwo~z!fz-p&Z@h#$T
z+x`3!v0~A_#0ZmL`0UbZONv>0kdTVt#gy?>l-lIyjF%jQ`*_oBT+nd}O=m|{9XiTX
z<xxQ;Fqa4ibw|yx`mz+u*Hb#fzhIODmhT&0GL49(ing@EK4pioAOSV;5I{T+r=+(J
z*8r5Opz=nbjc}30+-#R{1b;ablIu?~R1&-|av>)l(0)JGMtH&5D@$UjJ($WBnexkR
zUukdeEPA^^5E!#VH&+Yi#iB*MS4&|AZRO*h!s<E>97AI-TE#2H#t#e{a9f+$EKA-8
z(PAyd);*SUK=7}KZ8_6CTf;r+=DG6`P1v#36p>+S6Iw|d+f<>U35#@_MBe%$AtG0u
z7OCdw??F>IlNO$1tF}i?TNPYK!Cx|cAjcGPowB*omqa4_!}iUt`#XyPaY3e^h<m~(
z$FyE=A2x5ZYV3VAL_WGwloTc+%SG(N1tUM&xK5NhADg;WyQ0j*;pb>mVGRv_){kLr
zLeDO*tnc0s+~d9o)?uXJ?}ii(45<b%WNEC9{i#O?eWzVPp~RMg(<6}~J4Yzx<Fs7z
z&d%8}X0F^Uir+MoWP8g8ubSKpwxtF@TWX-e4+dauvRXnTs8F4A_=`%>vslnEmgLj@
zh=OmE{FP7mNtm+0(JpR99tExd8xyJBFXs1v;q(bXqUfa!bsY7S8shLO8P8Zrl2YF;
zS$37wD+;ko4j>%s@Ssa}s1%2Rz+dj|WJW^md~)#oi%&bF1dD%wfv`#t8P2RsPXgP>
z?~$K;6ijTTs(LoF;pu6W&8xW`rZhD$`DK*wcbTr9#mg}PU^qa;%Ln2Sr^3x2$xJ$|
z#X4SnDjbx(n`jZeArJO_!bPFcc~CRQPP3{=GVr8^a&2WX_!lDw&EYvkah-E7T)g3c
zNRD10xU~F2yQ1v@xxRRH<Af5d1NC0EWWixdG(BE|v;jF+NEM?dnRR*{;@b%(<0(yM
zJ48jp9P{tkOJZY-e}80fdHE!0Q%qeYN8ATdvV*A!t`w8MMJ9$H3F<#d4v4xzR)(Dm
ztBI=muCWJIo1XVoCV0gq+IB>V%RbE{T}#+D99CPSC-m!ySP`&TGTpwAF^@FFj$%Y8
zmZ63dBr6Qf%It}yde8R-93r8ZS_&$8P1T7Xsa&|Vt3F?qt%eCJbP6!1DRMN}O<IaV
z2HEZLe;CHogMW=>Ce=tt0WtXY<a^9g3-zg(3A57P;o|1{=t01U%d-kEJ$YsZKlEFz
zyh^6BT1Mfnl+ULuxI`sMUOl_d$|A3}8nxuc3)DOt`tgn#$f6+V2upXs&%4#Vw3CbG
zEOeD}r(#JeF|%IArA6a9fP$=LD%B>C@G}R43lniOiYtp=H6rCd)<J)0tHn|l=V*zT
zO-nU|5n?|nz-Lmy2x3(uPId=JXs0jHI4f6Tu&mPOk^v>>EnOS_G`PQZ2^d-6QG+wh
zASj#3=yTF57v>)Jb-baxkt*MB*TVxGTIkez6^6*FKL~d|orBwg4bp}3i=66rYltyg
z%J=USVz4RI_##bFnKrfd8S)TC6pGi`+u1?@hIodzKt&=9{00rBf0+oXAaZq)6JY@e
zkaqXd<vG3PO>o0-HbQF!#l^<MAZXn(s&v@J;FOS!X4$q(j;hA6R{=!4TRoc!tIA3!
zS~z298c_17oVc0nVm6L6Ir^wSZjkv2JolglL`vckHpNB0tp|F8&^=*JKrYJx(gefX
ztyVp&BEukSUx<My!t1j(Qz=ryej)u_E`+)fRF}IW;{GGs006LceiuJvv+8^;<0p&y
z@T`syoHz)V6eSItg(i^iHD*RY<a+c-SFGfCuUmn`XwxrU7s~0cu~g-edi2H6v3!MH
z?i2;1hn=1b*v3N3gFV1%ROMTTiaMx5(Q7@tD8>rtfJi^TKYs?rY;QA)4`OMH?;H?<
zVj&-B)N!iXc?<hq^2&>Z*g$?x)C8m;AYF@jGXj+i+_m*Wsx=2?mXQtM{REGPE>t;!
zMY(0QH<e*TiYo%Fl|!cfqqij(O~;){K%Rm3$BiiEQOoEOJzb$k?p1fR@P5TTfhtd=
zig7V0Pg&wNM{y0q@x5&`u3%(`!nF=d4c!75dIpFKu{T6&4QclM!=P(&evYC;u{fSq
zcCXXrhJ5&-spP!hK%dN1Mvi-?63Q|={(w;C?&{<^aA?(MRB}^jJ#)5xRc&oJC3GLO
z{?8M1hFA#{CY_&Q_+@ZDLv!y2+M0ASOA0;*&?BGn_ugD*Avom~e$$m&wyv39lw_R7
zsHZ1AmDiPD4#0B{DELP4(?wD;Y6RUP+$2y?%G)(;K)x$@6D6ytSf`(2cuPG6u3kf*
z@#2YWT~;HN;o>fyb6ayjUuT2vhcIWEu+V4aNnwe2*l)n+ISipq8Z)SRw6Hry1Ii|Z
zx#vl>@N(>Lphe>pPE_+rir<=+yGzI3hTXGm>RVQ2U0tHpX4a1>%*56|jkIxpQy#!I
zw~0}5^aJt*r1``z#^qY+7ECu`=~jJi-o1Thgd}T@;74I)hP4^8{c0E1nD7iW!$GBx
zwy??yRHxvfi3F6CVwTE5J{Wo3wjQ(AQ&2D16uMnUlPlG|!s#3mhU1?<gXJPeLBng|
z3QTW1lTlQLYBJdn9Mcqh<l@VPk-|J>jb6mA(g;j&>nC1v52B5vegm);u|duTl)EBR
z;p3r`;uB6e-@DtV>#J(=$<dFhTt{-^Y;Rk2g2GZ7xovun1ILqxDhC~=o^1ikkr?}N
zR)}@?Gq_lHioxEt!}6zo52aNL!+1d`D$LOVENlmO;WX1^n^<N>s|Mi(+YUvmEC!qj
z5XhCWTS?4|)1Lh@)#bK{5g*NSjL0_J7x3~emu2IHxT`$BM{o|Pd{`)x^shFgIxBH8
zHYP5g^Z*4qgBCAYl{99Nlwr*oircZ4fw>e++{#&Ol2la$vlRQJY+=*|PUR~$g^ITb
zxYw;Q5~kC9isMjj;;2iZwmnyoW{2QJ)JiBu!X<PS%ouv0N9RDt+{2HZ)$FBZx+DSj
zDs7ZE8K^L0r@~=BCDm85w}ie@uXQphW8b*pc7i)ca%fb)gZ?yS<J?re;Xvg6Ih4Vi
z!UCErYy=~Ir{`;qK1#AK4RsE`J{OeTiM?IJ%gDc3mD)c{*iD&nn@R<<hTA-c%$gLh
zE(_-65+xz<G=!e0IklVysf0JaJD~72=d5)t9<^D{VN!Dr-LJv|8P{Lf((%oDpH3UU
zcfM?0*e3%7c1wp*-a#jL9wv}cVHPt)7!Q9CY$J`zG>SZ+IZZ0Jb8eL!jK^QDNe1-o
z7-GFEC3%M`HP|17%4)h|$;Vzbh9b3Zq>bT(88;oIQcHMBPXFn~-5tlcxn2^W>b#!+
z?E<_~jNsa!BNP`Kor+}?yTt+`-5rsv_6r#H2`HVL9lW;Y&CQT&Vp8TdML$=%)_GSq
z!Z*Hl;Oe!nZ|CzaEzCw6^PFhbwk2p(qqyHyh@*Hd{3L;Hd%Ke0sj)IjZ%vR~qj?tA
zEnX3qQCAd-`E8C>*;YH)wP|^g+P^*ClhKX8Jr5rrq;C2h%#Ae4Xz{Rz<93E>VRy1W
z9*@+b0hBd6`K8-^McOlL?wb4bX&<B+<Jv_@xD{antf{!1t5OO2C|!nvgfXE_L~Bm=
zd<kmKZDCT-L)9lsx*G_@R@X7+4qi%d^Xxhx=TPqkHNjsRS0L=}iWe*HCBKZ6s97(R
z3#<@ng>eVtPOr`GDKUgw5;(mPS{PjYIrH>(M^|(X0WWe5R_1kF%u_li<v7V?t!!mp
z(IkgE0tGWwocj_zMb`WWL-7w#A?2qNff%}B#}NCAqUrddaf9L_moBL*{g88t_`A7^
zhQ%VJ`3JS=8hE>NQ*YO}-bjB6Sn1X`iXy&c@c~C(p*4kirgp*UVpl&Kw4T|IhDa=)
zjSW5z&fZ|1EQ@Xrh(mUO<aq7bBB&f6k$E_MWY|Z2?J#T&JZwt#1HzyLOnyTd>l`<>
zS1=_w;+$`7pF~%Gh_?@Qx9#<!3S=eqQiH*lF9_;`{cOYB`EGmPmmhn=e2&HBJb}AM
zPi6C_Hbwv^X{=;zv^Z{7XlGiiKb?yEuAsjTVjhH2GU9G^1~z7)vt<=tqee3X?#;8i
zV^w8uUN}QLJSCPvmxt87pvIzB&KPc~9}EaqXIEYP*uyI&EODex7BP}zrYibPDI|gC
zal?Tznlux199A}e`Jwfe3xFdh*r$N9k(-H=lsmxK5%k!g*}H?0`6_{`0?e>!M;+zb
zW9&;SivUY_!fjI|l!L*7(~eLe|J~ZqNCyMe^#gFed^+g-&->o*`4Uy0&j2AfLUvKB
zuDGm>QNnnmXadVf!_$6%E+lQym?xJ8sJG=m&8E^etol2m!`pe}#U+A?WGVxjj8|Ca
zbon`hy|B@RP)_mR3e`Y<?D{;m*<}dbi;${yMBu99+hPB_5ki`d1ued<Mx0Lr;JALS
z7<|{xw0=3Yke|2+kDJ{%IE8tl3kH4(slugXQ>*6_59{nQoD}cA4ST<QBFP%ZcIOkY
zCV_VgthkQs6>uIGbr(Z6Ddc`O*(i_=Li4um+J+|dqqAOVgc$|7z=ti1rO^I_&?dHz
zOS$-XtXr;=QTXUPv>}yze+WYL{6!ROA7BzqFqpTeGYI+Y(FdO)OhD3EDwxOf3x6Fv
zwTp=kt{X(eItRd`7_!SlmXxnG4<2OOej=A*RU|*?VOB)82cO0yhr<>|$Ct)wOpXDi
zi+7aWd;L43%xArh4JbUP_N;JdpC90S-35tA5n^}y1h358MvO_htJD5a(}`S-3lUer
z{_DDJLp#=5Jj|aah4qZm0s9<A@Jx=&xY-<;FuCW<h9lBc;&@D5vwe_d0WBgbJ@!B^
z{Q(0h>t$Jrd&|+I@(AOfMXOgyWHANVA0Av3ystANMfwO)fYNo)yL5mYvNnp7HQ9*$
z1M;ZqrS>-TC4`o`7)z5y?V`f9Z@7#x`XaLD;A44k_`z+5V$aM>n_ih2@z3-2kB|p6
zVY>PEFhWOzI0g+CmdARot-o9&_%x=^$%WfmBu!xn6KLCqs)suSN&W27x>0tUCBU?7
zmJ54E{iZ3*RX5;#AHJhp%Mic7rO_w#`5D|u_m)T9G-30O`texm33~;yaUi=w8r6Qr
zs?mrF4+x&>oBB>jTPthPF|bOLdDZhvvUphN99UAJUz~WG+q<G;qgzJ7PY-p4^9B=f
z1ikw`YGkWef}e4%`spVo*gY#PZqk|@J#%Z7^I~nV3qLBjZwMAkQVB!cYqhR=eOjI6
z7g(Rr8B~|{?jB-+K$ZKp3`pU2#<tXhGlTIKdhTDvsfPlp;lSn63XGPzowyY^k3Gzm
zRwwEj7GTwnUOeCtNC+TTgsi8k<zaG{z{5lNSH^uh9O%<$V#T61mtT_>+v*$80DD31
zmml3L&VL%ADz}!dDJzxkd*VE#WG8QO=b1JUXA5N9rKF;}&=>mN57+4G0q;D_Vc=@u
z26I{d2!g#6$e(XkZY$-B$3X(wNts|UqGa*GNZIU8RdB2OVaEtjXkqV|6vFa6=bjBY
zf4u2+i62(2Ae`#i5@W-q*d1N(t9A_*q<BB)cFKoD$iYAoJ?R(93&*F6ej$!Zc&LVe
z$+4NIHN)Evsy$#Hi`VZ&JwcJRP$P0P8BJiOG#%pjMefkDPx{?PB*#OM6I2yPhkIv1
zE8>N7w<i{rRqVzU8{_3(<g+q@!usln5;)*N)pLz0FD3CtOQ-Q+)cf%_r-EM2iLW~|
z>RDg+u@-~i$`$oE&0S0LfIiA9Orfq0E-v==jBSq%(nf~K3MmVlbhiYmH)@Pw$Nl&C
zUoc$PBeM<?Tc|4(u~h6@-%2RH5r~98|AZvru!yEQmXcp#zC2MGy<cX0OHxRbEeXgO
zqz%EtZ_GX5sK{Y2EufC#&AI{?WSQ~K^fmno;}0t~vyUNrz?4E~0zi0wWG;K{m$8NH
zO4j2A<=>cFod4v`$*Zlb#1hg2Uc*u;REA_-^PTRHByOihjYWJR2S_6YYEg&%E#I#a
z1s33BYcs!J+-j<dVj=|T$+d+--ylHWlo5J%!CTW~4??i<^aTgGnoFpI7dXCDm&{yj
z>zWkc5n;psQNd}Ra66qe?#)USoRZ@hytbvS=*9S39Z>cxE`itU4TD{XKhxwO9*)GC
zJpU}%K<s#;SkIAb%_uBv-ctdc&qb-}@lETuj1nL<$8;%O?AK5a&r|!f{pUpBi%7}@
zft7_5DfZ81q96O%)Y04rKq)c?S^b0AK!X}>0bosF^b}oYRbVN#ZzcIir$XaOuXkPG
z{6^$6bCf9~Gvn!LId0L(8XyZ7fidhId4%nWStei}Xi_V96WCPGs_iXWaa8CAh6ICG
z_{6s4B`Wkn$l`kM$ro?iBwOVI3snyFVoKfE`XfyBtKJcuuDYDqw6iM}HLtz1P_0jU
z@ulI`%vt1G!5ap;yo8~5j?VpR!PLu}dx+d*BgefB9D9$9-iJ)LdXF+qScIzrtIhzt
ziqtOfOaKSJOTIYj1I&7w0|;-Qy5H;oTR|F1bpWA-_JIHFGK8T+^^GZ>(-<*ytsBrs
zv=Q;7Ud>bw_4fm{c_Eg3vO?xrf(r=PToXqB>8K-X+gz`ToEJU}ksTn5j(-$L%-FGi
zzJ!@ao3?+JFMY#>Ux&&G&S}TK5YFd+;lc~N0RI&&RBhGzJH5$IS*ad7fBuz7MQfWi
zD9#odI5+hM5{`h@Mxh_gvwZl{NT|ayoEvH|2x?vWygJ5Gg<){W*WnA~hT*nhf}rd>
zni8KAbS?ThY(pJW>#W-LVbA$XUrlh)BxE<KKp_?n<MbUAl+X1iH$ib|5D3BhQ!owt
z&-`R1qC=={2OrCg#!@ZDyC4qk;nTMH(ln}thy(AF2fG|y5c5r=)TN=goc!Rn^-V&~
z`ns@^P9`A$hGu-w@XNWi#`5zMzZye1-q5jmZ`cYhHEju{OIW_l9?h?!qHS`HKrN(T
zf^sCAPyb+lIido2g_`A8=!eWO1?<^m^2Qmc(3hpmvq+aPfDr<m)!5)ZaM{u1O}V~D
zF$R?-S#W?!v<fTA#Ukc(y?Alp5=M|pbCD&XxlDr6BqxMF=O}`|KQKX<XeCD-DImS}
zPHnu=wnXaavy~HBbCR7Y?gkSkumoL;v5ih{>I$L;e>&B;&&^dE*A(Ko*lS)Jf;)Y*
zBAYJwgyM3pXUF=$-S~Ma8KR>!JWUe#K7uI18+VrNfke(7=AqT&Fjg2UGP^aCDT?xD
zZ6nWA2sC3QQ!x-sGxvr_)2;Z&#hWl_>8|%Orj>ON`1vz3t679DO}hwEi^UD?{!?pm
zS}36h8e@P{gr5pCD2pd}i$tcUrpYrD`MZ_XfjIelpv3};+@{A|g@gzw|8axd`cE<(
zxSOBcM^3|h+e-#@wgDC;mR9(;t9+Qt9(e=JTUD^IU-kzQ{Ai~1TV@dYNu(bTzhQIj
zHK`xc#3wr7&0lbTo%0Z&#VzV0!*zE|V+DpgM?YOG;13AAXJtc4BkwGRG`x^mkVSZL
zsUA{UttbXQb3aGd_1El$Z?)sLapK4^H^UY<70f{Y!YRZE&ZT1u3jJ8bH3P+JO`cki
z?y@TgY_(N#a4#+B7aVoOPo|jfqw4;70#?SSR#ltTu&_>Ow&-@ic>MLiV0==F_DJ%8
z6E|f;1@-c|{h?e2x$NP}7td~%Cm26?Z<iA)^d>{R%uM}-4-x*goz}nQuuzA!f%xGa
z(L5wWpDSZBmW2GaK?>82#nFw6k(xWV+9LxXY^tvkBbXue^~O64Z6(47gRUYSh)GM5
z6V$9N=?jI9zFyl%S9oKgGhWvvORYZspc-H&Kd-S==u^e(SgNvP8*8LBo|b$n>`s&~
z3;ok-1SbX^YdBARe5A!xp_p(hNUr;`n2;<lqMnB#gW)y11Y--Y(vm1jZtD**!Q<5A
zgXr~wl3i0vkf65ia^4~X*4>8Yy=8uDTUqq9Qmeev_5dve)p;}IZXBSOqA`NbL1eE;
z3M(uHMKp>|Lqdqe9m6rm(N6qew65u0u3cEr3nO&Qjkf;tQc1qq9%P`RD0o*mQ1YLa
z5|GkUZ{OU<?t}zoHCocP2*40gT~Hzi_|8`A++phKWw1P^8){b1rHrUG_bgzIF1xqX
zdGYRYDg(-8(E6PlN!_QpiNRi1df{b#d86)Ou*klg=xg5X<NK;$fm^@Svurn460dx0
zlhyKauKLDM<*147++Or-Y@jI*jjns_cfW1lTD>UlUoFeq3DD(IX^-i#(Lx2{P(ndT
zX}XYEl8QGaTXboseZ<0#)z{zL8KOdv61>3Tqr|F%543?~ng+n**NsDH3{MBK565Z6
z!#>N5$l<XwbI~|pQ9?Z`NOFE<Eof>G=fQ89J-*BInaOot7o_Ck@SaQIsLbRgxdqeV
z6Sup~r*H?09dfS1wn(<(5z6yx)z&%2XDE%dlCFRyL3Q7Q$ByHuq~<Z_sucCa8ZnO@
zQubU`<n!g?!2wv)6+`BC7KNrIVk`QnvHiv5U4@_)%9QO9!z;3e<6(HI&Kc6q@9EQv
z!!<T!O&%D}!XdY3&AL1a&5zGcVIe=UEDYP~Z)Z{->ER4lhXZ@TY(a8|Vf8?<1XAUI
zx!iZzL3FKIT>$#TaxQD+qH$`nn<DeZPc0@>%Qc+r0v_Ig=yN$>;0wrkx`{H9_hSuC
zD-j#M1TQ@4Xdz=@eQVDk72LqGX#`h>QUkXR`T_x9RCvLHqYg~p##ui!)mV=*>pCEo
zn{Zg*PtWFB{W`t`XV51X6x;*}5ABpig|O2E-vTi*5vew4O|1Dy6;zk}Ep*?=j{in%
zRfQLVSFG$%iI?bmtN1afM2%Pix<~!o4&&=#YYJT$qxK-XUvNO}6g@4|XM(Uf9~y_O
z!$JBtJH?8nO--fai9(ih!S_o!g~NIIMxMr5nhcl1DzWEUzofnL&hy2Ob{jYp*r~_K
z?EN1O;J#iLvVeykKzLQ`yPW8NJmBHp^wnm>apveR!rQPIIBQhSC!_*wVCC;zYv;nJ
z3Bs0C`#Y>P7OyiNB75bTGXoFxQn^yIUGB%SMY`pp=Gl4MKs@<GpIxFbAcOP-k|3Vs
z=`a9aPDXf%vbjywDk@4?I=KAzzp)b>T$Dg;TrFm^Wfvq=n-n;P*4HVf3mp5auYhhv
z#kU}Z6dUC>bz~lX<vm+!w`L}5*)&(k=fijH3v;&aQ<LLVBn~fYC9P=993dKW*B#$_
zLO175h{qKQ^6GfVJg4n^JF^K6xs5q9szL<cP@W~ip9#}0KX(X*GA8l-t^|VFy%%9G
z&8+!69E9HaiTV2l`PRV&JzXqYX1pWg(+sQE)80iJAZm+i!W`_nl<OkxH<yR~JPkd}
zE@#ZsB$8ch`~5F~G>f8Y7Gf;Q#D+iQQ-s=JlW@J<JqjvPk2o1Etu?)|U7_PXfk+I`
z05bU=2r!s>Fq3uN8-+rpuFhU%A#u&N3~dM<j!tlN%wYk&0DCffRy)F72MzY9MbrL(
zsg>GI<n1X#+q;Sqjn<BtW@DHM`2uCMd{1BsG$-YJPceHPjI82tf)8&XTv?b|F6}|8
z1)kRy+I6@UQ2ld1sZXCCog3KgHl!1-gA*B>M0mKnbKi>&S4)_P;o|lz>jg9SfsnK9
z6P|7#(6xYWpBxadk?y9*9@J`D&-sFnS7D8`*^3RfR(`sklbX`Nu;iAD1e~_qPf<A0
znL)GX%)6j0{}&LszLio#@dZ-P|3%$9g=f}nTcb(EHY&DlR9LZX+g8Q4ZNEvywr$(C
z?c~(A_Bnff|K4lueQ~b-i}}oX`9A#}qmMpXZ@sltW&$0X=#eu&uOi^v#Vp3#-i_c9
z^2y<tZO0-_v$xB9xQliab1C}QbW0Pi@U07S>=CR{(Zi_>&JmX(?Nh5AoDAHRLB_*-
z$2z`Dg5fFwadu{7atHUp9Z=jxGOIG(HN})RV=`kn9bIgx<*doot~DZX!p>cJZte$e
zJ+qCB8tVKkwH`uu$w9YcUc~Lqk>!><e_h!5v*sc#2KI!|$5~)>-L#Yf-XRC>_Uz^=
zT_P?oC=>Q7jR^-6*0nax@39<P+8>2bt{#)RYFP+XuX?gBP)w_eOW{h(DQn>0&??}q
z@xECpUxdmzb$dI65-|j3{X`+ht920}i$~A9qTtxc+SaooT8_HtMPcnqn=^5sxv!M{
z{i&+5lkER2WM8LYl!{!9Y|j3!LPH}zEc}?T;5+Wf#Hac`R%>(ca^7I(f~VVL25^AU
z-n=eG2@lLJW$Y9^K-9HrKTaCIBR=sIisA)G;})dJ=$F{A!At}<iz(elOX;^65)HJs
zaeEtTdfVcWLtLDzOX6;4Rn&~%47$nmQPaBSXB_b&WbZ98)@S<+vPl3f?CT~Jj#Po3
z@;XdUPJJv);bIydLHPBa>ox9Ya>&^dJ3n?)AP@0#gOveqwpKJsPGdim@7Yk@F%;s`
zD^F<h8S~zagjOizPt<>(Xu7QE-b5%*n)xP@v7n9f-V#0kKDqUU{vLJYE&ITN4kvfk
z@)2}J?|1X_G*VO~i_?1aB(alITZ4B9o9a<l+-+AN7Xi=4uDLgA$yRIX6_v(9YSxYx
z#)#mY!u~3QqgpJE&AXJje_=Cv*pjhr`SCZ5pMH8((<V3L3VFn0UE@irWIRB9!klgT
z*J`S#^po)Pi0ljyLat)#2Rx22_m4+#UEdL<WfK&ext<){XPJh2Y7h(1E+}$$c;An=
zKlSG!`u4YMihF9(jprDGFRQwA`WZo{jVX}0dX!`viTE-V_UXHvfTVu7DU*JipG7n2
zhl-e@?(Iz;Ul4y$x*q71*fI!#fd1lt{F5&8cV@`{%rO5OE#%+QW&R6E<o`mZOmx;i
zO+O#~|AoQG-^1{?@4qo+{&V<Nh~w4l|9k!`S4R8GagD9^i^m77v{Ul@NviCk!S?c9
zm|c9`g(;yi&2d&WhJ4OXNK8;F&XdGg^yuvC(*-ydl>a(Ih;zhp-kc_(+o0xcWq=Ny
zWvcV~hXXp85&AR>556>t$cK8Zj<op8LV-B)M%*t{6P@I15@?Kq5#nz-b-uEb6zXJF
z-n{Ojw&q-tZkbt;L&OeQLT8br^uOHh9zC5tjDEl<(nrTff*a-(jhPFf_~4N8N@lm?
zN>7>y?B1xO#yg1{y6|d<P=luoy*NKh?D$~TI3Ewz?2)(+nXIIO14m0zflPt4GJuoq
zC!Hs_m<kkUphOq>hYG*t&_pX_3qzTD9jh+ukgPx1aJJPQ^Tnvxqt;eKJSp$8M1$}a
ze2)=~c>l5^h@D2GF3E{1&=dS&dwV>SHf1ZGZv8EH=Z*#b_%QIAVVjT}4U;RQvJQ4|
z<R+zODO3O1SP0&P;d)}{g(3ny!uO-U_n{{*ppQc>Bc66RGwJ}7wXf$(C-WLjnr+og
zeq1nioeJ7#8<_v3c(@oCHd7Wno!;#j%qlx8wyG<9E9a0*-Y?<URzg~VES{wnP`6CR
zBzSoR1M>Qv<ZB4uAN1bxO!iPf$Zsc*K3Tn|<{EgyKkbL+UH8%oDi60Lb9*LjS{FR#
zDczS&EQ%Us(e>}=FlPCB0juxFvwb<JMe$<yf%Rr_4mmwl#J4#+y8}OlB=f4dFHI%o
z7JR+{sZXtT9@A4WZs}+hHyE;>PqotHGGdrXyBLiDeeZ~*(}~8Qq4e9LED(;}wkNVP
z=inM;hYEuO^nqF=PBpo6z6U%<;`RPD1%YwSqkUj4078Us5)yqR=jfpP@SevRCM+ZH
ztp4($Bna?OvLmoR){u6-j~v4he-XCLOp~+V!;vQ4aGFBpQHD{b(*rTmLP~g1EK=S$
zx(JkxU>RA2(zbs;(aLKCV|LglW<9p&Jl-+OuhC(|Bsrk<)0g%bT?e&+@tC8LC~)=3
ziNWlx4`qm6t?9M|+At85Om|m=&f4go890EX_&9dM6}$K6umTyEe_Bu_J)f2@Ca`h9
z9XOVoYdW^+XD1w{P+^KRAnlvIkUBXx0gli-4j=`UcMz-%45s{zm~Q?&K6LFisIrgs
z6(oN>Gz?VP3|CG2J~Bs=hb_%F%NZCkd+qR+-}%MWI{X$l6a!Xccz0`NU@&sQ5GZmT
zA=?L*>e7)wda8gvzzHispHQvrG^PWD0WmBAGtO^!QY$l6lw)b4)n_TY$ekeolcK#`
z&q=*vM+Y5_hp@-W5f8@%s^j6p9JN`{KvEUtO1cEG^DS8f9f!(o<(1qlkWG#5%8gAk
zy50}c%sy<C9{sgg1OXt&WRu+qWXWGl<7<XS;Eh4b&d}Dj6&EoBY8FpJ#IKA9hCNt>
z67Wa#xWmXSJeEc5JQ>`Q#pwQ0@!n2>|KQ3nAt(B9F0G+gBXz0{e`d*8yBw@H?>j;(
zi2X}N1mOmJ<n+m>jxRat%=n7i%O4KLy=iurpQfh@&5yW{Ltt_6_4e4Oa1M4+10*1<
z37uSrnS<W`9D4npc#K3?79^Z<B3K2Tz`Nt>&_d`CSpVtg+K&S@*HkLhNn_*YLr<s?
zdJBEI&!3voOpm;GX5AP&P-(!}G$nBPNEopo`t!vno=7|aV4#K!?<dfaq;_);P6KuF
z(t6~b0m5%A1wsX%WWm(1@pMQBBWcp)w^Wg=jNdkX4118|Huhd)wL^Jg#68mcvO7^y
z-_wRFP3wDKF$MfE3P$N}xUC2m2YooubxZ~mpx^uMK6NC|aTLJ{sw%kWTh)aQ(=g+W
z_42ao3JwpdBJ&64RkO3liFK>>12`%}f~yaqZz9h&`Q-HmIKV9ysG31g)^}EFxazY$
z%_coPuor!|=(GwhKSJrf+GqXTwKEv?v)6T|`qmz&K)-7isH94eMib_r6NE4;GOdm>
zFJ)@o{1IeFbn=u-D%4*y`TLMq$z9=vv@19`03J&Xnov5}E>z3^@}LQy1IBX#1D<Z(
zK+X^SVS{u{>6#=+)5QT&v2BHht|D)+4#(7p4&0PUW*h@a3_!xpHC7wemV@`Y(~S8F
z(8CB1f!T&=Mw{OnrQ~1ct;HCA^RO>A(xR!_-})je4MB1&Xf6AZ6?Fg_WtqI%4Fgqp
zSXa1@?56BUdT`xbRHYcqMX-X*OkjS1HQWj`4P27n6#k2L<73Y)x>+bFfqrsoBmuuC
zDnXaC&BOo3PV;ODF<fYtl;<Qyr!2|tCvzCTDZ@1`P5tSUIVi8&LAaoH0ZhEguJt{l
zWcG%15bvh8;NJ2~8C$c^n1sHteo0^HEp`-o61zjSB2*P9aXPWxgEBH=1yJPJadhZD
zHR%tMh`?8^b0*G!5gbbqoF?`bsBM_d)AhF2mCJ7BK5HYjB_9k<-a^z53az$9(O(_%
zPNipT3XV?BkW%%hv;{i?=+$5_A6$tgZD^(1L?M~Ci^Gmcc47*Ha`eJ`B7T?3sg%`3
zEe;%QyE?i87D`PH{+E{zg8kGR#%e9|ze-%N-YRSGC1|1+M__lABYlTSFZ<Z~y_JW2
zQL7ar3>Q|D)^K;ffy+@f{g~8?Gg+w#?S;4e)=eY=vn1gA!jCEdRET+n1swhkN6deI
zm{F6njbX@F&PuW9g8}C=mEd&5kW@XHCq;~pr<RtsER^;mit|@OGeZ~&d9Xlb0=9WX
zt*vs$sk@`Zyg^)ea1HJIQ`IL^`VaVGb5Hl=L6*#V>zKo!r0^T8o$Pg!nOg@MNMC;V
z%pWU|C``4kK0tVJ>OEA*zowh@It=D|m68UWkZdt-%rgSr@~Reo*Nd-?ORbJulFV<J
z2sK5NPV9p#8WIF~rM|g8z}rq28eMUQnS@^DbRM0U-DZUFg>^Rt)ww)Q#TA&IQKFBM
zNTwP!IyYy|z>ZOu4w*Sz-?<MU^K#QvYdk=It2pQk+wc6<Ce%>U9ArX5-J&L+-dT}*
zyco3<<ZgP;7vuj>I#eV8|CM&Ug#DG390Hv86^_w;;`^a0&yRA;qF*ms+yiSuys$Py
zB~idjN&_TqL*bM{8W=WjaoYQ<`I@OQ93-9b)_7%T)-$MLB&ptTBC)i72+O_#U9O>0
z8sco#%2*q_$ypq(ya;LV#F(_M$Vjkro7!HDVw|dtn2Xel4qO#^e|&3R&4ICLzt}nU
zroA+~`b*nU&4QY+Ufny$rVDbcRjE&GZXALK%~{()#;m*K0_NJ$Cx^Y^@g!8cx%z5%
zUm4I!W;U!X(nG9bs5qb(oLiR#QU9*|f-uwFQ?2*?O8HqhdQ88pM3lDgR;5x5Wx%GI
zrLA1wGx?x)b&)G&$l{8*y6<%Vd;LPi09mWrQ*lS@Ny#}gv=*<|gJ2e@q$U-POvpo4
zOURmh%-9v#<F=_`^Rh8_Cr$AL+M2^rRvcPtIKeLhcvvQU&sBdi@9tS89A<Gh#OE1Y
z5_Fm|w`MT}>ac(g8%)!K(9(R(&yFjdXMXIhKAST0VmRHhI!oH1g4(_(!phyxP>#&v
z=fpHcqfE<0;+>vBOV)Y%fjknY);!q&3M02kvx(1T2h~Z&x>qj%d#@d97D7{v5*P+L
zP7p4I8&3jMGZ?+AMs}rz47b9TXnMTS!}xEP+d=gh`;+U{qmpSmQ5=r^<iWmLLBs+3
zc?Hi$&fle=&L?41))G3mERO2GFD(E^{5g8ErW&DiJfy#9`hMngR7nh?mJ^B~2Viyg
zWyW^x*ecpj<6H{3rHBB7PU$iY-k#y1<1d~-y{Obz;MBf3e7e3*oiLpjG~W3FN4cJ{
z?A=8bPgZ0j4*xJ6&!|0*uDMPORm9na6tl=aU^tF&Qigi^%ue_s(%qXSrdzY-#;s87
zuE0s3yB<Zb>=^#D;)rT?P<42~vj(@0$In!zx|EmvR!Q%<mpqk>3^^>qtiQWh@2Dyt
zbS)+!<OaVcfc6G%ASIld_0#?Wilr-X-UcbXIwnIKcxDRbBGOMxlKi^c4K7ds)S2L^
zbj$Q=SD&BI9uQe3eHPVLmHdh&?u}tlfsdMlb3-HMda1CH)U4j;s354~h8E(^6_0^8
z(mDT@oGPHIw~+TcT`k}(y~Y^Tm+uEYW$|4ZPHD85E{V#wAY9PrC`n(0ZBU5XuFdG`
zNi=vBgEA5_4B`50(RU@>vG^gIS90pDW9qu(uKls<b_Keb&MVu5HBWBy-K`%wtMNRZ
zTAYGALJ@9V8WHsw&G{pPM8?LjrsG!xnunOyEF*l7WT*R}w?BtL=|>v`=H`0z-_pWF
zbSByb*=k}tw(^}5oSR((N@ur9YO_#0u<qE!8EPlKsa~^xd8(_DvL5MbXTS=T5@G?R
zH7%D!Yviev{C3gAP~KR`+-0+Oj{D@atVX-HketM+?h=a9O3jm}s<pR{ddZiDTvM{+
z4qj;#D>ad8lDz+;gkYd5)+2R}tZ!9h4H9;ODD~3g=<6(lGTfn8ns5E0w~C}c6tPEK
zJ6`*2^rMK8&*bWa3LcZL*|3nw8^@@aS!}h|=#Si2mbb*=OUC+AeYs+?jAo-EEf(D2
zlV%9qqQss|(R@9=CJA~e;<~G3BkVgal+cx#cZT9nsNO)3%j7dVf~BdO-Had$uipp5
za^I;Dqez#8*^^CWyxGxaKoVAXi7qGYL1_v=t3iEK8DFvmYh9u8(?@-Dfj@ayOj73n
zCNL?to`ekHbPWcN`Zw*R6PS&7DKXmveBX{@%4;!#{0Fd`pK7F1I59F5N*fWiXJDuQ
z_C|M^i`t|AIu9ze^<W4Eh6X&LUXxp-TZTJ<LjCf)Vj^V3$zv6og?1A)7CI<itNU;J
zPoyLy>SP`z+8Tm)V3=^gFn(pN8qzVrf$&!1;SttezyhW<4uYy#`OjjMyd3Iik17tf
z6T_6*y~-egwMSv+X{2y(Iu!IA1bH%=ojdy_7!Qv6Jn3WNay+b-XpW`xjza8M9qI3t
z57m2gBa;DWSZz}E3U=#+;Hbp7N_cjs=)p;_&`h*9YSw}wg>tnVoLI+DI0{K88xq69
zMouJ!O`drYRUJ$w59A(JooxigY6O2qjQw&8&4>K7yX7)WQvC8FQ9Oi#7x-?go3;@g
zJtXVhLCuPu0yrhZ^mM!~tE&_p4H_vG-&juHmvB--$-gy?4)6dc*;&S6JjJLRMs=>u
z>gM?D>GGBC02(H3dd%@jpF}Rw5s=%GP9092=TZPFoNr+~Ew6&^ymn0#GKw9%I+i0i
zeDF@wJC^(Yj;b~kHn5u1LowR)>>FY_3`Z^l>#1E43$zmZ`HIqr2UJO8W$+tMG-(j%
z%a1BN7*lGT7Dtm|o?@D)3ny5L<rV2L2ET60zo(0g8~?m&s=NvVZmJ4C+t~PSE0+#r
zQnB<-%lqm4;Zk<qz~;J9^Ft>_NA$xMvC#U-uDYks#`uN~)k0#glJlW1stkPXcSQn>
z0sLCCMPt;2j#a_W56!F3k(I%P>qdRstQ6AKTUm<TX_xvfEn@6dYYeT0?z$2Joe;T*
zA{fApjPf;Ep-WkyPp#gCGFH{VEj&XqkU3@I5@C}hTswIYA#o$4rXs8@s++a|PNsiD
z%B*=?T@A%$ts{n`=0e}buBBvBR>$g`@k|AyaivQ5!1)=^&nj}Wn>j5+dKWhE%HW8!
zjL-UCrERJM1F>}13jh{vzi^L`V0G@Y{rq2F+6n?{Ymr+WQqlN4HRVInA)|&vtIdhU
z+*3|r^N6NiQCjs?RS9Eh6A$^%ZLj$p-n@4D?Wt3E5qk!(b^M=|CH!=&SM|~s{Li87
zmQ<A12+}=A=&Xf@aEQfiX4(wyXrtPoSX6-gmk^57JyVQ>^FJ+IZr930>_voX?$Rjn
zriv(-Mhij3UsF){5WcU(+rVcB&)*A8qH}B@9YkP3Lg$njFedP)doHYmH91?z*qa>x
zObZpXc>JmoN+XuFJL9zBO79$7Bds6g`KryBFiB{)IPJT|#lNGdg~Y7ljq6g<@lx<g
zk+`uy4vjx#5xcp%oUscgPd(ejTj1~~&X3yDyVEklIq}1cehYbSvfgo6BbczYW7M4>
zPqzTkn$=YKwU7heU&ly=afMn{DnJW;vupWQ3RU7}8!;`hx2EGXMrTvs`4WWM^wM>`
z;1yAM<<EGRd$9>sQ1`y016RO!<JrcZ#sPKjRu(3+vwLSLoxaiXegNDZ%ZLA?J75#O
zR@rUZ8t<l(zqrxrqvl8b$2tSX6Z4vL-D$OKb+KtfTZjLM)B5E_;K!G>U_iv^Wod^j
zjV?Cej%U6OqqXRb&rP4wEM`i=X+|Rt_z7GNta?yq`UryL@yj<5m~9BS#d<c4@1hTO
za@?9v7H^zttVd<4?y&U5k?-fVJ^qU=`^?27&Z8%Xu6ILi<Kn*CSpRa`04w>3CfP7$
z1Iw<MjyC1#*FR?WzLzDszW?!T{0n0HCm8v6@a-=!^56S5{tbEiw_xOd!{Pofgd_hh
z0D}Ez9+&x#zQX^Z1o-zr{O$X1aO8i}{rDFHrWJ}a5`BL>05IM|d?BIF7G0<<1|V*j
z`$Jg5tku%7XWJ^MKHJ38Crf`K(Xxn7wX{5Ct{F|{vgQU2LO+b%AlV~;fHjh|iR3rq
z<%ZWfTk9A6LS9L5`sI;AD~d;h0lz?}?5p#^V46Dvka?E^peOeuSImnO8*S)`*RpJ|
zF;0bw)5<G6WQQliSq*(qxJxzb=}}5dC)8RQa#v0IIwf5wh1Wt^f@-QxhmaJ+{1}UP
zrxJ>$W135VPu$-RgzDUN>Lp8dXgQIHpS<f0XOoKnV@z}`v5e7m^UM_O1T?x7AxViR
z7a?5BI9LgS$n?2J%J0rJ5Xc%T2~qP0E(+_4yl<q;n*`M9Ptan*b4!12>^H&t=-b+o
zWMSRdk|*k6#ta{Apa2IY==4v7Na8n+EJHY4IXtL~nH}@+ez)J7TJ5t^a}3|rKSZ(s
zBjtmcXrHyBclLpm*!3n7hqxcxsC9Nu#u$i<?E5u7W^9V;b-VPlWi3$&difQ>n`eeR
z%M;$fFg76Ar2QZJqx{o$KkCnH>tFx*KljJqSHu7R{qf%x#{Y%;qb@`FKdn!}Q2v)0
zY!PuOC1C~KpRzI{;-bn50!retGP<J5;zGi7)<()oa6k~FaZhHHf9xXvdjA*1-b-!G
zW=#aq>qr&WC|4XzeHicyX&XYc5e6d)mqaF@8*&$|g{g_Gg~rufoZ|J0rw&8Mh|`xA
zdVQlMJB_o9xK%DF369peLFLJsxO^7vW3yChR)gJ%OsaD>f8_Xwq6)jXgOkuwOzkfv
zhlKV0(dmvgnkHvLC1Z*u?Ar8M0z`vM@V$OOiy6)0sD^57ZLmf`sYh)~Vfh?MRuSjM
z{tZLL8kO;wP~Lg8ko+-Rj&aR&(gl@#DQcDLjjw7V6t#bNEp2&egiQX%!t8h!_fe7>
zTKmvYFUd$0*$Dm6V1(BlhWM?!%u+-7A6X-3%n=3C{M?1;SwR58jOt@7stfX`P{W;Q
z0=wgDCR-~7#au=>&)!7BPs;SzI69({HBMT`G~VZqqs{Z}5m5h{`dQ7RWAo$(n_a>P
z*hw8#^Q&V1-uAPVNS9WCQg<)S8S)PNuc4IlcvYAY;u;i<hQ(g4=KAwk0^#%+&>4}H
zb#XPzNlHys_SWPm<@g4ip3^+7*X4@Vfr9H-i9{w&_|P2;pul|~aBIjrNzSgEsbgWP
z^7f^POR&y6I`43WrX;VMG8AC346P<a1?UX$JNLZO-DVa%P4F#+?^2wK;H=dJd;=2b
z_qVN&p~fYjXg^uc^?#_VpusBP3F^|-yf{cFHR6PdDxu$2oA!tR6H<>nPl;hRX;u5v
zk;v@BA!gG!RzwAUJ?mZxyQ@L*7R;SQt!uQFpDxN2Lm}bL)y9Ql#tI}ap;rB}e1FAI
z4T42MX9?wm7`A;W&4Ac*oX|7n9HQ=7^x%w)Ke>l3F<$3W&J04+>%9Jrk995nIafMp
zEo7X$yF9FsD?!jHH(0y13g~_QIMS4NAcmyJ;J-Tmu;L^vG;#o7XG|T}*}T}(MP|*Y
znxB*G2xiDstvY~h@rIr1Tw+_Wr&D$DhQ{Zm0CuTNe^~om_$PD1KC9WY*&*vH#85}0
z;pYdVMV;&PzhlYspGd4m34yqOoF>iPTrQMB4q>t)2rb+9!0~h%yG=VQpJV2X<v>iP
ztr`>Fha2h5_Mf@&+)c6XytwpcG@o`5AZW`kDX>IpAu*l0C)d_SIwLy2eBvOpS@?E-
zwlyrlyq2%Chv?zw?_XZhonZI(Cdo2U&4IZlmP=RI5(dnw%jv?%Op9%0fYJUWKKc0?
zxwvfq$SMkKSRt=bo6`lxnK?O`t#OCG$<314Dss5<lF8Y*a)HhKgOAM&@};=cM{_!a
zLu2p#9sLk|)E+SX3x0AFj2#DKmjlVShKnQs#kiR^GfLn{JTL}(3TWPlVG3>3E`=W9
zsvHES1LGt>C`?O*<4Qh}MAuP0stA8t{r9x9Yd1N(opRzVc;im%7u7J=huaE5O>3NG
z1Av?Ua%dy7dDn;n8IP``Ey4!-&HXlHvW)wD`L1aTO~A=vbPb+k!}fvqi+_nzK=s-9
zs$w}iSCk-PE7&_Q>`3A_XhWXhR>AkEHqMu#3hgL^(tG<Gq42jKO-vZEb>Iz`me1-$
zP4)pjV)8_);O7-Efc1QknsS=(Jl0kkwf-Ny<rx8lh9u>tm>+S1yrTw(FGMhBn0wQd
zIC~}gkAs9O5yMGVLJ5c5SGykL-|At3$rTO>Y|K7OB(6DmF>b$6_6(n(dI?$9e_AZ{
zL|Xm~_-X5)p1Ap&^Mj7s>|0RQ%-WtSu~@oGhf2wAJwvS|9JU>_L*!nyji*83bQ+6!
z!89EnpvtoNtAHFiH`lC<x%kR0>b8VQXdMZHIaOHSVxq76ZJR@Gi!ZbPZuEZKn_qg|
zmx)k__V<<D4Un^c`j(n>{Y?NW8dHN!1o>SAnl4W2&${8nR&!&={d!b{__3wu2&rOB
ztgT-~0Tf*AUh&m;u#)9F^~<5SLf01Ul97ip+l-ssM_~tR{xG4I-(fBAY?_hu>qo{x
zj*4bzi*Qb*m@7l(7pKvVbtv%g2K^>sJP7J#n~xYjz&5KlUqA{D=an5rncKnvI7WHb
zuan$+IbD2+zf0ffm~CHCTzYr|({B5tQZd2r@I<j!>03T_|IqxJ8vP;~#9G3LUF?Rk
zSPTOoP=cgcW*xZ5W?IA8T{sXr02pzu7XwwrtHZ6%7^{Sg*ln!a&i54IDuZt*LXyeT
zEd2a6XVQ3pApnr6NI}_E2_75M1a;?Xextq&k{Lol67L##9kRh*`zA=KC2q6$o94Hz
zy>xJp9P^D+TTBz8H7+~*0WY9}Pul>b7y9F){w*kC8g$SFhe4Q4E1#79H_gM+`>Hpm
zGSBaze35&WOc9cmH`lYbBgm!+ss?~3YGAQ)GY77;nSCA~8uG1;;4hOYv!icZxi1#?
zTowmsBl}0U?=(CFH%_*MqxVbxhAAfm*g0DXU+#hfQoDw#*=A0^pY{zHz%2CLUW0YP
zh(cpmd^DiYS3!={i|o&Ew)H&uTAY19J{2b!SFh4q$Gz_%d`1PqLvYbr21GgD#`0*l
zNt>RJ``_?W2D^#^@x9lpsrZqamF<BS-HEZYzgIFox|S-<8vyuO=gnUG@zZfGC*J?z
z*pOvfmKXR(_wujP{-2f6-)Ri$f9fXo|5_*iahkQZwV^dJw{kLepf@zrcW|P0b<nr7
zGj{k_wenx`7QFvj=0ZE>qO^|yHu&p`>YE`SH`gdUga@n4995l&LYu716?x+ZI0UOf
z{L{_ECdWieYpo2__iSvSkWN?ip1exeiuMY8#c5YC?QTu+#J1Y(86#PFzdQ!G8YQDE
zjNG5rs(Adfi?7QVMy)+NsV1=9;u(%pEW%}aYahuC=%K>eSrn#NLS&_J{!P`w{QzV5
z%jQoY2D8hK)RHw;!phK~HI@nP1^MxXV|<F?oTjiP6HeVLk=6Pb{5NAA`T8%Dmq-DO
zeY$C7zig%k=BtN)Fhk_5m^~-|T(|xT+&@Fg15o?V(hB}huv!0?kp4Zue+%jVO9|mi
zc{3CJ^ZfPxFO?NQ?LUObvvqrb!AO9k{k@!HD>P@Fz#3i5R=pVglakFc;2yrkI~b6B
zUbXE-2vIrIvb+#Qw5J?hx*^E!D6ff0Uyl3&>9SBc`~ITj^SkAj4g<irj@Y9%URpT5
zsb0s`e>5RKj)s$GSLdxZZs7_SgEWEp?pB9Q`%TRjOp{8f{WQ5Wwtb<!#KZpA6AyCh
zz94qr;je-HWQ_4H@0Et~rEysm6Gl}P$a0*Hi=UELF_7|7)q?B}GRUiqL&A#6(q2{z
z@!uiMR2uv(9+ks6H6lrFd$GsZTaiTsPO|vTS;-^F_m%UM9K7nMqL;Iv$`O?)rGA92
zsks+|8eo+B>ssXFU<R`y&{Z7nrf0?tJeYR{2&W<dx}#K>23UUkqUltDplO(O8vA5;
zbxGriZ9oAtJ@c2OZ)n8D)Ejgxe-}qyXN7-8M;29*Q?kQYY<7j-1v|G`(Pva}!@XD4
z&pIlo9f}|O<@TsY&%EMCWz#$wqU5XERy)3w8guWRLwL&btz?O9$efLQEjVSee<UoV
z(@2ON9-VR}Jb+=4%`IGTa!tnCN(>1R!{0;EwtX=kU=x=4v6~sAq(7AM&a$a%aExh?
z{({S4@N9P_JCM&}QnSqOQ@bSW7?j)_T7EKg<75qm4f%{u#Z^?kEm^(h_%1QO6NjMB
zy%%F20xbti{ls$mL|`5bjn?@BUT>4fmx|QNI=7f0v1fQnq35JP-V0IWB^n_OU4{w!
z<F*p7cO1M9Xucjn%`doDM_pk+;#;7WlL8TTO9Do{o89Rkk0TvsQs9O?APzrL*v#3N
z*6KMYdCSl54!cqD<hQgVed+_SubNs^jlYp{o$-+hT#z>0V}ZuIN-__0zYr#-t6vn9
z;c&KPLU$LYg~jAm=Cu1!jGxDE&B~tUxk=V_Id!{CXfb;6QW-NF`U0cPtGHpet^1e7
zcHSQxy^lVUBgYdb!%UA$HT{QfVLKiqAW-))PJG1WbQiL<K8txai<UP;rqooZ9=&vS
zG(qp}-T57XQU`kmshWc+yv^Y25?HGfB0)IJF%O5KLzzVNhfxUdHxq)~O|`&1YS=L^
zfE?h+U_S2lO!X>YfoT3{ZvSL}ZAf?MPc-Kc+pntNc<W*;Q;S^R>wL&ppY#D~=KerL
zwl?F}pIH;CM)B|zRY~UOR<9N;{`{#ThpMUX^?pVjw0bx0;2{~xT3u`3(k3o;U~Zdp
z#76Mz>4I{Ec3T6wjVgE(y~!L%GlmC27uuxKSz*>QV5s?e(PBkG&#Lr42-w;tBs81#
zu{_acmyc169Q$FZg+uA}UYI-a`Ze9dUb^LHLQjXO@HC&Qpo^b4(ZT?26yfwHCwh<r
z!D#HT=*iL`O@<#-R+DOh=XGfk6#YC}3nt#xWb^awh#rxEpKGd4V<HK@8Q3KbhH&1X
z@_aZ^o)6ZzUcCFU-&1jGOFTAyLQCPX*<qb_nH8Nj5Vd_gMIM0V1oB~PAaey$Z*S;Z
z;(MX+WSom%P@G^)%ck!17@DhiuO9(>rG(?-h;Qf#->lhT7HxyqlAAlBo-4!VyDa&v
z_;r24`{KQrT)e*>;<XS~WvsER`DAd0p_zUQjPIw1Y&Ck$`$R(2g4ewvqrhy}6RqRU
zS`N>~8=VAd31PQjz+onw<`v_1;{w=^eZ{zBOlP+zT8C?_)Js{|Jd+uPKsDOewjEUw
zYa*KF(XD7}xqB`GR>V}@l&ka-2~17BUmZfNV?tECzs2q4gd8?{(^#dL{xFXCG4<2+
z!z^PkKcf4QwH6+{_F8|}2UW^fUNPpk(RSmq6MEz8C*MD~e{G%_x_`X<{>tP3I>UdV
z0s+zd&l&zd&Q3Z<V+R*=Lu0!CJ+U{at~so+A$mQj<}#<nrpq6=mbg?(pUD)t6co{8
zNrS}Y27(f)10`0BzCY2~kPyVzrWbi%hj!~s(zzg@J87b8<%6`2@FfWCq7nZV`A*+R
z;U0G9JiyQ;1uc`m0_I#>H3EKR)^oHVK^Zl3A%WNlllanS3e1I(l5$KtVkQ&2j+iJ<
z1|{mCi)=4|SI_g{w|Nq^wJ=4E3TUU8+vSa!CJt{zOHe`t&%SpJCw<8VVaw+u{l#!r
zt5)^>`@Oj1bIwj6N7sbEb2K~#<cw2z;697))HZcNAQ%j6733WT>T^kmP6ZmEP?%1K
zqh-J$7-+W5pBMwP_g8p(H@{_wx-dV)kq7N((QfAcY<Zve2+(Pf9_0?b2IvESy`W%n
zFi}>SH16dt%nG-m<ep}l=ZebD@_q@Ob2EwA3{PlsO;o1V-=dT5z14`5Oo_nKk=EU;
zDRP{=<x0Q+E}m7I4N4Ld#bpQoZ^I)W_HiG2I5f#iHwK&v=5%Ff1!0Qb;1&))2S`}h
zdh%%}G4G@ONZBUPb0=LeGA5TfpX;}sJ%6_$J}e?hZCxhF*%O^qiW`rF5zK~IJYL<u
znwKAT=b7Jz*PN++Jl(toV|DW^$`auPnyVJ^lZYN1shYxhBQ&t3@i&O+km|AF`Kefc
zv`Z)kI(rUcl<%^ziWt=GTSXU{sZJ{`0a%Y^HX%d(Zf71C<}|$4IAdkoQ>DoAYHEay
zpci&N_#448@ojb-I*<uE&7Ti7_1H9&OE{RV8w8nE_$H?pSVzgWZ`;bK_qQXnLwQ+j
z01tf5LQ<$~5;@>3f{yZ-`KLl=;d;%gT#SO>IkG@35c<&*;-vg6cgDi#v_i*ZLjCA*
zixi<{?hB%MLZR8DM5F{i<t(!baIw{;o5`bJbV+tdTnw>ri;b;P)_zE3U=j=x%;tpR
z6ppgS=~NTpNpn9%QaP*Nyr0OengGZ1r!tCOw`vDE0y;bk9vKpgrUSd-fL{(g3ohx#
zkGJ|ogD*?g32JE%K9T7-V3*u8aOTY${l7vJqAH*k94_5Jm&MtJFQw+q7%kX(;L%Ak
zgNr8cZvCr=puE}x5z!l)C$_>--i=+1X0d-y*0{;>j2$TH;u#9v&c8cpyYwdD&P?9K
z>yr&b1+dK=rG^s~t9T??%RU(G)uRWPr0!{(+D-omt_E^v$G{1NKBpV!7}A`TJ;(Cx
zK*5l(`Xw{OO>qU2`AYZQlkX(ngyOQ*+Va9k#vRqPQ)eqv4-?g>!py6mrZjC;0QkB8
z_ZgWhv(qqf(;&k*0ueuI=A35VlaBj1+_jPax$q2}Gx}i_y^3R#b`M-B2z&xpCJwuQ
z(8#Yo$V1T+@%i+WTtAK5<1?wH$&<72TGS6^q)t)NL&P8xP6E37(@SuTG{zu9K)<)5
zf~&+Zce!r@^Oc2N(nbrTC)XlfP?i>-w;NxGT|(5|PD7<GNN0+CUrqG^N_mYf0tHYJ
z_)IXx!VMN7D}-{3cYQ1>k5BZf@q}BC1nP@bg(WCv`>>oQl6)Q^gg@5-U!Mme-jsX#
zv=q%fOpR|^7;yo~k0|gRBM{<eFK>t`iQWU=XcpE0uaI(LASc`?!LK4!tfd~AGjUD4
zmASO-T2RTGVpE7=t&if(ccURJYA$RBQ1_oE+pdN}VJ~DBLfaz8-?|<g3n8CVUM{Nq
z<c?u*q8i5gQK=^$!IvqVmfkPz%P)aiX?ObDJ-nyW!bH&>FX$gXIOusW5=gl$s}^{(
zN8NQ7&-7#*WRH5}%ek>1WSjF)Y%%LhG*o%o=bzk$-F4wMQ_<Ed-6u~os-1Kd3!EKd
z$3C|R$3yH`CQ}i9g2lvq>C<p;4K?A;Pd>e&6|B7sc6q1Xc`ehG{zuz|a1tgv`p-G=
zSGND>Iq>((QydHs&|k8i|3{PIzg(XFO{M>LG0VRs0y+LXf4%=px!<8IZ9B)0*zu$~
zJ`pX3+e}vPucV}u?@Q2~cdCDu)en>5T;C?6nfK}XIQF<|KZ{NX|8hIt{_ASOD5ZiO
zFn^6bDRC#AJAHI6ql!FK%?~&d+W}6l)%tlG9I8AJmbnk;4`Y)jQyDoAT|hhnXiZTM
zQjXTV<<UuM*n>QPiC3<m7lgD`OJYafzyh2pC%-RIV7p6eo474M-^`L4{mPoj+c(ga
zw^5IlH~%fqt49@0QL0soEtSyIID$Egl=)}ugcv9qE8S&IKf5lr>E1=g71o<a&1H2_
zc)VDfFqp0z4y*4PcO)Y5w?~}lJJ2w#ertAajR?)k=)Kl+-V0PAFIsmSpvdlFdAf2a
zFVMh7M1+Mpr~*52mc-Vm#n^=M6#gQ*KfhA@v2WO`*_<gFE>%L58N=STM~TCnRDz^c
zS{C9vSg46p5idc*nj>K%S+Dy!_Q2a*qv0<3A=d>Y=7fRGcVTOVN$9#w%w@jF_5D;C
z6y-#;;%#%+WEh|;HuUy9mQg3pp`dan`!0k~xw~(EO@0mtvsS*d-Jo-kc2gRh4@h5D
zL0o~e@`Li_PBY9j%+{U~t8V6gWpJ!a$8~-Ivo<X$8IQxAzN#LDl3FR6ET<4jvSinb
zzxE0ae^Pz0D0lAq<IOuh+;SPRtV++>$>;tyXZ(<b*p>%bOW*#=9=O?5e?DEcyc^oe
zorhi6$@^i769ZSk9cG&yLx&}kxlVA!dSA|6l%5t%Xg?C{v1?D^X@~H+cm*P|#_F))
zzxNZ@^@1$~<{+w`b_Y%HQZ};(gkbf!UuS#gQp$km@x?U+HU5XqEbC+KxX(aia0cq)
z?}+$TnueAylG$kN!I5RlC9*JtM;Ee*or`^zGG3b(=Zo{!&bfir*K8~MXo^Y5BQYNa
z?eid9E@LG}>Zb`@l~bx-w}j7ygn^m+*hCI{)q&18ek2bPXy|s5`FAAR;W@Ll(J8tv
zGM-FRzqVf!H>N3rNY`E-qZ6bDXT0$ZnoKG9xvy*uR`BWbMHk<liboK)hKuonRE`No
z333__M?BAAC(iz1m-fy92qXAom-g3g{MY-`1pR*pIsVN){m;JW|DfeLq4pmN<5yK2
zXyC&-#2yG9&{i0li&kLCR%W**`+i8~n!jnFi7r^g?zTMK62!z+&Ru9#a%+U}ve#T~
z<|9o!#2ktGe@MKzj71nF9mFe(kHU!8`YX@uqII7;$9DrZ{kkyoo)bvi`waDDZSFgH
zgWocAF)-3=c<4+NwU|7fxGC-X@VZjKw!eg|9%R*xH5GV77$oj!J~*;P0~PuVSsK^l
zMAKEpgGc?BW8)_Zn6|>q7&BTQz}`hllB^45qSPurP#1LD9l$>|8G8zSv6Dw()m@}%
z;Dm`_g+ci+&YsHLz2fT(XxXcMbu&M*`c~`Eri2Xx^f+$=4t}fY+K=Ae;9^C5dmJ|_
z^sFWvNY6uYkom2S`$BU4!rXtuQQ9MP2e+mH3%v_yw3NNYZKcv!$Lt9nu(D`uyEoe>
zt&(FKWfTF@T_H#6QMhY!1Q&@YCKr8tUq9r^z-l;s>LJJ-Jsphzo>&x##{lQ?tEQ$v
z0NDxP(kz=162OJX@@*#cFzH}MMEzER3{wdcN%yJ|lfOP<q<y2kl3Rr#z)J-neG4>$
z@RO^CDCl8bsf8TPEVSx#l&bk<q)dG;qbWnYQ;iPAwc@%<fN79YBn628XWRlO0^314
z0opS4UARIQ!a|mW%n?WxL9Z+`<-ia!4T8VG2q+6;Qy<5=8%X445x7}lO7h`J_8^Q~
zwF^}mHJK%jq83kT<FR$r?AV6S7&b}byX2NZj#0d|7pl(hl1hujLbJGo{p<s-ukl_X
z`ePcU`JNl^->d}Ehw9G(pzF6hb<WEYBW94+2+g%b1}J)GXS0IyLsOj|A4llSU{VLW
zm2eLbt%4ItYspvcRF$kEq(rNh>~vZi8%c@7(Ho|S)UVI5-Uc2jV&neZ2!~s<OmCv9
zf_}Bxfh1t0ob=0_!xlr?9#l<WjPl5>16pfH=uX-^=uOW}nqwZr<^z(W_|-t~`Z>{D
zjT;9{j;C5BDgC+jnR53A3Y5k9YM#Ler!T(?;;WW8@!A%;yhK+gj5%UI7e{V%QnspK
z3NR#^asrD36L}eM6o-P8rfEFOAX*2ir|6iI=kT}dlHwi1r|$i(wwaADAMAW^A5)XS
ziJhRD6G2d6bcmv2T#K+dI~>67UT_SCxK--(OqWp5LwqR^#RkOa;mL;jDaDqFS<$Z-
zd8LHXOdU{j1`Ihu4zzu0-l;Mz$jc;QfqNtr@?2POLbCv+2rWl@{O#4u-0w1=1-`7}
zu6aLmf4Ne?eb;chiyd*AvtR~>m&h#LkSUsKPosj(fl)HV8yF33-av6jmI8}q6&P?R
z0E?#0Bi=%jsOMxuyw<i=2hk$u><Q(vSqp9^<N5tD?KO1EX?NChGID;;p7VJYqg`s+
zLMCvk8LK{{m<qVu^v^_CyEx6&{owWRw?#1dsJUE#9nE}@BJaVu=5x_zHqJy&d`LxJ
zVq7eDzPiRMGi=QzTeSAJ4=@(9AT?F2n=QIS(Kta|Kx1mIms)g#E6WRDN0bfR#f{mL
zsSiL%T(dDh3Q`bl8!vx(_<&+ra@3rk@<qGH0bk$`*MM^4ReF@gPiRx7Y=-lOp}MN(
z^TC($G<_cm%|wJjXIsnjVIhNHT7Z2lzUTAG9g(~923iBEbLyLod3v9doIsMU)p&6X
z><A4!m(IQ4=-?)tcM!W?{o?#dx#Bt1eE2{fMNI~(UY9+k0495S1=lmK=2N5;p#PCq
zt3{wH2^6S+<A|4**&WpS{Bzz@IEvpv%-*TD_I2154X-q?tz5=rZuSkx(7W?b28V!*
z*2PPc{!@AVmAC(OM%VZQYX5Jr^}osJ|Jlj^A7JY!<%{T30>qCiMJWTD+Kl0%%CeRD
z;vOdJmXvS6?h96)PeI8lZ#xiC5++5=N3f>X#EQxQl93iWGqIw=0<C<%95COaNPG3d
z>dn)+O>B6UH&sk!$>d(9t>9ut>b~h`2Cr{rpr+MEk=i`{a)Xu`y{Z{S`9<6DIEjv>
z5<ARLCbnOp6cU9rf<Suf76Mb0``<E}fIk-(Z{F8)g-;Z!(@n(S|BMIJM&<cq#M^}=
zRb{+Tuv8c-wF4I2Myu3nVI&AwM1K|q-omD2Ocb$dqwk>bTLz$Kk)ksXB}H<YjDd>Y
zq3K#+Vv<_vx&_nn3p7l{9&g&EXh|XH$-8lQX_(!<kZ3O(3-!)^i4pxy3DvTJACK2c
zqZ)i_>~$lQas#uR8oLT3-{FDxq8HK@mmSU(Io&k7P?`p)2@Dtu%i3o2Kk0#;t+#g}
zc+_<~l6^X9Kufop_f`1E09-GtDoer{p{6*DXpUT@gN=cXqMPw?+|{ZeKT3!W;TdNF
zxY*a=i*g}QK@xR-;(>D#(Mup4<btjttS5XoUovLgkZ#?b#2OK*2NIps`VK_yqjSit
zN`_K|WX^6MKvd-#BB|Y`oLPy+@q^PMHu}{G;(kx0ngJwu^jmS0pqi^NQwy$0D!yaR
zI_y*&mon-%)4C0?7oi-ukSo&=wT0fB?{SIp@n=RV5PNMhrO&QQtQ<JR=7{h$55ylU
zM;9!eYZn?nnNb$Az>2!FWaAr}_6{)qTDNGCT@uWH1lIpro&S2>!u+XG{<q%1ziGGp
zZCsS;UpHH#RHPH;I1vB%KeJQ^SyOS4(@jcQ{I1qaLIGj!_REJJP_e2B$06a2h5o!+
zi#OJc&Z^*CNq*gP?pn&K{>V$jnyjX~k(SFlszwTd#=ja6VR-WtO-ep6-^BJRY~%Da
zxnFA4`{7sxm=1)Zx<R&B9&teE!A1Ht5T;cKDC}_<T=hg)Pyxi_vQP_~()xVKb<Xfb
zT2kTv{!yFgqH<$kI%T+^l{<7^8GxQ`3KZ^;eyTu*7~8kwtbtgf`xXBzW6U55BK-s*
z!y>)S?G3zcbPh>LF0sLjug0gl@<tiq9}f$+oixnO?fN{-Qk;e0j%KTJ#C-26x5N(f
z!>WLe;rs#Bd`*$BaQMy9O&_jpv&shj^Fb*6@}cb{V3u5lPrMTOIXntC5wF-<)-Z_*
z%`;<RCi1g!T`jSi?NAr%EE<Uam1AQs1IrQ;mfKZDUmp~{%~8rXbk4!amM^g*P?KZH
z5N2%|)G|(L-wXv)I9Hy0ngP>=GPR(YWHv>LqAB12J|`;5>N&tjR0*+gQ;sA6sYPIz
z`WYmD7e_yBXx7n6=^R0j2`2(Z)=Ai)W^`1HyB%_FT#zX<4f3o!s$dwKs+YpgaD-_L
zBwC<HX<RbC0zxWqrnXB3u8`J?CS$p@<#LzHf?lu=H*nEM%Vb|l%fCiID~!%E0)Qv-
z(B_Ra)fHZcu7wYHT*;vFZjH{P+CGrHj>)<sP4tt^bdWHD8K{BcHaKQk&2|z<vsewt
z7;R}+;Td$A(L{MtquKV`EzBpv+<9gpKD^wt_1V6R`~r|47+V%Ggu4RXGYW-6m+ab3
zOM}?t$E(SR6kgG2JK@4D1efp7WxS%2DQBXRxK(5_?EVPPrVI}IJh;PW>`eu#D!mLW
zLoN_9M>SzbpX3Ygywz{N*_-X~^{mj<TPkFrvd2HNjjgx$)%aD6nP|gtS|u*z4ySi!
zY^=ng4c(B^-(`>dkz6lp5}<iH#Nfw3^;SVW@F0jkS8fZGC*u#}>REe(6P#m7>A!Z2
z+YhksXv!WzwO@m7YBEI?sjxfeauVZR;nK#R{d7G}FNN@W!55Edc4Jd`BA6Fj<>?n4
zxy4cc8A((eD<5SRsT1co*N5jUfQq=RsGXQ*O*}_8UiiaZtY&4v5?fbT2QBpjhKzt{
zIv9CSHWwFb3gl5pDbVpfrKzHR!07FW3iQw2af)jSUWrG823vIo3_GAzt|9)CL>Wxa
ziAmJ$`RCKVMAj9zQ&jd~%GE6W_NpfD!#{ep`?COs)<4&nzf#1%P9A_iKm^nO3^#~N
z%Sj1K3(F||3%=H0=iR@_9A0XgihCUBe>{@pf-1mTd%fK8W(SnO%!-b!!HYoF5KtE=
z8sp8@;(o;AaxoA1Y+d1~N8<`A@*A8SA8U0w-X(K1-L<gpDjWeEb}e-FEh?obC8HL$
zsIy8)R#uVOVGhtWc*sXKq&)K4oPz3L<lG5`!-dHmKbl7SNf;g^bxT_)Olwh@rY`C*
zl2j)nX2a+G*AESJ4glb?ag&AA9oOk9h4PKJFUY1@6-CU~Q<<4E2bhVhPo`PY$}RMl
zCRCfCMLHgKH3<UoI2RGFSN`6_3Pj3Rn_)cmc%W#!<zX!>4y6+;w-fV1*wUv0v<XlM
z+R6@6<Ng!hBt7ZNf$2@$XT&i2kx|aXGQ+Y}YzEfJ$;U&S(BL4ZXf7jQF^qc<Ik4FS
zK0H|;OXduP2g^vo0BKZH-dL?pMUqL$NdbG=+1ZDq6M)J1l7s=N^(@kFe0?F&Ja_|}
zo3^{>`UN^MJD>@fe3{}y3byN=ZqMaW?jB!zebStYmav|=&7RGFOw0n>j3rE}07Rr}
z4PU>F$5iU;Nw?Rc$v|b%7?+!qX@@?Qy<^XXtDAV*73p9WFdDaqI)@L`4!kk?kCGg>
zF`_zRe}QSTOF<X6Q<?8fNwfec3KJZKxfP9bp@$&y^xQm16}tJvI!P;)IqSZU-I3JM
zRIjageFF_v2QS2a(9)G4k(sy<Y$)lxhK5uXLNg>s{73<XO9WPcJ7`4En1<4;7rq4f
zxB{|y4PKQkx8>L?AW+L2jy@){>TO0wTIV`G5Zt&uv9k(1da&de4lEQxhLwbHq^^7H
znQ{XMz8TXn+LJi?&b^cDIepx#Bez>s>G2L;3@P+9h$$AYPkl3=H}Tto3E!9YvMQAF
z7b>1mJ%07vsy+fohXi<kfn4RhRZ$$(*rJYM=UHkt(YBgiVcY{rJPF?f0m;TOxj1O8
zDj*A_$tVS2XW<WHy8Ek0YHy1lc9lBeP`Rje7TUTsSeu?2qco9gwLQ9kyFVwyNLU{?
zuxjox>lF$4ER;H$;s*9nSUFhA6L`+}ab=#x1RAT#At|`p(FN}(m(jW<6|<jjjMh-?
z-C&;XGqV2_#w>@HV!V0@3B|j;5o>Y66HP;wAR-xW9h>Sbq$T{h5z%`c-JH4{juoI;
zh|@@$^NkSUIY5n0FWSr&(}|fbX6Y9H+i)d(XQ@7GI@WxB^$aBqZuXnsN~qwSu2Ec7
zRo--rv!=~A1oea30K^m2M1yl9+-AA+Dp3mtj5s;x)Zol?5@&b=ouGTXOaiWf9krsZ
z5q4}hq<1K#hIfz~qiV<3k;!pI!3XYb^FKfBti*Y2j_{)Cx{iqQU_OWU{@Q;2Y;MT@
zDlQF)1t-l^Skmt05K5qUC}fD-BSiH1gS|>{x7x+2-PJ(|_FJ?{NCW;iV;E<RR*9f|
zw=4Pi{vrJMUSf^#1O(0ewGFR>{sFrJkswNU+<2Y2COOn;ZxAF*Mp2tx^kcS^?sO5<
zL@A}!Zyo496NNcZ6;9s^XarmQV6+SpM=83+=N*elirZGx)@$V`$!O4x9qi;V`Wz1G
z0$1DORp~6p=3leIeWoRktq2-N%GSJoNY{^Y!)UG4T#IVuo?T15HzuSYjGWH?aVdM<
zZGL?`Kw`!P=8BLHy?ZpE72BV(bSA<I4Y}BH(Y4B%>AJfRMXtArY#bi%Om7<h(;5JA
z2oR_mcQ=L%Z=n*tU8c;`L9`>kz+pHp3e>)tl8jG1iE0saUs=Ho4O;k)4TSMt-p(&M
zj_~H(2sL_vk(6^`hcTRyz+N}yod9ql%9Ziivs4X1L#8>Cd2u#<0<rBp-v!wseBcsL
zeQeUiC-i?KuW*5q*&?_p%MLe!JU8sH0<;I;=$0)SGjA=yO@?%%H553uPJ94Pa`>Wb
zKKXBm*cI(hl(r&@<QVimk8Xl!X6Mvx3ETyuZAFL3yV}1RM4QhU%gyO`xoDWH&0pH<
zq#z3yLNBT{0<f_WI${zPvsk$vI(Vax(9szbU!(sY^4>bAvm{v*hQ^)7-QB%$cXxMp
zcW4@ScXxMp8h3BpY24lQ(X%nTGxK)u-Fx3Z-^NG8i6flf$*Qc(thCC)cv`#1c?9S1
zV{JH85odv<*PeGYBhuoS2nT#t{JL!!@d{9aLu$^6gN<|73mMClxq*wbbr}F>?&oPe
zbFNxgk2NbKq+7vhPf|k1m+CiNw{D=JY>$v?0*sI4YDQn2a7=(G&2vrF^TI7Aa6&Ve
z%w1VfHXbX?iHIzL;g_2<S0)nl)h@g<u6NLD)uNr*H@%uL2=c8dUof<B{T!rDKD0!m
zo(KX0l#KD<wL=K38<SucC~gmcT?EOSY2nbtz5c@u>hK*LC@d-=5K<0%QP0)}W6)L`
zFYLo5y*a<4K_PjYKVv1bJ?eLsAAH5sH>7Vy@alFSJG<*tohVTO5l1D~C}8}(VL2Yi
zQGK+byq3i~hcCyvpM@Ph$k5=<gKN40GQ^Z-Eh;R1JNLL}3P~8Ok-!+p>yn>4?=mEf
zAEQb+4;&7)`=RV80#KxFF925Ki4f*!Jej1pouO&72nWvP=NnFnJCb{0YHC|pVQa2<
zH1w>xwl{QOY5##U)YjXm3B7u%qp;nxOA!>bpMk8U<hc(4vcK>s*LEEyDK8ux8P0L)
zM1k`AfMb|Sr|_|`wjlx*SurM|(G#zXfif=A0GqIu9Drtp99sn?bBFPEIGIB-s!QR?
zN7R*HCw}Z+9EJmoHDEzVXU^6CB+rz}Jk?;HN~CBA93t-rod*1%BvTHSwx80F_H}W|
z6JOzdnNLXx90)@eLrG;72n&POD29@mEVh2B2De)*hOcMH1tjMg){`TBQ}NdXogB)p
zp^3reYKFJ>Uxv?F#o8GsH~_#e4dtKfE-oJ_Q-uGu?qX(bXyp2Pr2JPb<d?GYPhuhx
z6=XxS6mnDYqLd?(O0o+xGNWVUV$?q<rKu@KC8d>`_QZu$V$!qH(z1%6l)!h8clHbR
z5_FYPV^kG$HMHYZWxY$0KAH&zZsm!BFZ|K4Uyb|c&4&8$Li~3To_}Gl{hJY<00kMF
zWjdtJYx4DcF)<?Jvub7JwbEO<+mE_T6tDws5Sj8EwK}G9{VrLEn4~#+9R2|39UGk{
zqe<$RzAnuRXKDOGa90r+eh!P-1<ZT4zC8!1qG!z%X`yKWQ=q6jrSb{G<|KrDnV3&j
zu3C8^wsz^%f*S8vN0`a1F3|WmhC-%ZIc%ane$%<nS!z1Ah;>*MboN1J3}R_x_~V;<
zDC;Hw$OwY1yY&-F2bArvyFt9)r6bqw9DsI5Yd({r>IMajo^qf*$FJle0DT2`NswSC
zJ<F8~pu*lC2zpW2mkKDc0U45OX10x0Un1s|Ia;0&aIm`J+cRCBh$*&OupMbtX@XJH
zOK&o3Jfc_=0SB>m4*_MnJw4112Kb!kat&Cr@s?NHr<4{$igDIi6n6v%DJ}w9J12`d
z8lxFDlOqm&B%_wpp3hX{v8Kr8x|G)o=xyT!g+pu<euMF)Fz59WBihROV;i)?Yz+T>
z&<b7(F;uEXZtfCC!{`8=9j33D0tkF@qdUnIS+jXSTvf!T-(d#{R4w+wcs4QQ)~-u?
zUQ$bhZyQ_F?x&O6oDFX-dsdt>)}6|ENcr;iOI8@uEqU0^fzHhCH#o0_0Nw?RfmXkP
z{LJk9MPc<q!uiX9A4>fP9sP3(dk_Nvp!}~HLr9hHms+o*q`)Wg_th8wg*JbxzGlDD
zjQo9HA$xl)HhpMp<4zd8XnS#Dpu(U{`G=+{6N?}}0%GXSr+mwbiiLxj8?z@OE-(Nw
z?_7hZwvI(ut|jD<&TBu1?+&oR*!I!XNowNUePZ3L=oLcUiH1p7Yg0y<bXP)CY!2xe
z*!H6R`l)g_F^H`bBRzJNm6hrHZ8DD@XR8h1-y-tZD1%*w4n05e{IA6ZH?YS%MsO!E
zai@I88NZXfzwLLD7;;jW%0a%`gMZ!eEpz~-eb)P2g|<Xp`^c$>$mS-PvzyM?4T+Y6
zGZairMa2M1jaoWL^5nRi%$OAirY%K&KIAbn-0geyDf8!sSUSTkjn1UO{LM0Agv(Xe
z@j1igFa!7Qc_)FZ2zQ<s3&Ypk7V@o)iKt;f*T9EfirbRJP<Zdn?2ZRK36snAo%-PJ
z2Ijy`Z|o}yJg{^=5%wx!+*-Bt0ais(I`VloMEt1h9=A(htRf78SyR`Ey7&T+Vb&0H
zs#vHgqBp5nM}E~ZJVrJFXy%+t|C5*+fuRb&9|P0T%{ibzE_f@(^b*x<`)Z1T{YGUR
zISPrq_daXk&;k~Hb(|xW3Tvsm^7;7aZ6d*NoD$oz%|OYShW($AyeDz%hzWUOba=rN
z^?RSGo@qoPuEJ4!GP?BBe8wB1ljpYB{E#0C=9Dfu7%-WeMj6QU@nbB~emW!yr*=DJ
z21tUxvZ(jDO%Ql;8bWjts?dTl!KlS{NuYLqJ~)mgEO)*NU!#tktoFlV!A^+GF;c0R
z<qHz;vz`v_FPPJgnYy4MZ*a_m*O9j+vB75Q{akhm5gvgAB@Db>#%dU8j#JVEaG{fu
zc5&nSZncZcvE$@TDR#`GOrqh|&0{KGO9RF`vfMr_4pU2>$Yw4?O{j7ST}P652}lVy
zQ9%Vhp6zf>8l~31YTqJMO-0MwRHgIXtM2&<`6Z4WOrQ)yr(^x=^@tNol-l=YIr)p&
z6i6?`gXVdFemlq!S=HGHT7?l8fpjGQx%_N+*fu^mB0c_qE?bHPtHg-Uvmd3rhSWmS
z*t~VnfC!*I`u}P6dt%Q%r?#Fs{zyq~IhK`SJB1^^1)*RMDlL7{MZT8uwMExVDLTvH
zBIX)XHHm6yxwmX*4{z40Z%D5Iy9$HrTXcCX>ksXKy&~6i26;nwHUtXtgi$K}&#Lwy
zZsaJTHfvTkMP5LR29u>J3d(L!OCCib3o~qKe7Ow(OxZXm4M$54SA3l+tC@!Nu%Ou$
zzAT&*s-J0ga9E(kmR7K>U|v4Kq9vwp7g~Ur^7H{3f5g<GpBM3O+j~HmKPu(DeGiW-
zR_88Cr%9O|fbLm+d#vHF#PFN213<9XYLMh4Twl7ubalVTsGvNM%YVVsJ8V~tcG)S=
zIiBCaH11JvN)vB-0$W^;BCv()Ha|)0*F<W?4G|Z!^9SX+nvuz0n-|NngacBGGHsq3
zTM7Kw0w|N0pF{q~xjl!c1(TT|W?J3U=$M*K1Y6pZ+f1@rkvP9ny=lS0_vc$32vDs?
zMRP<VLS`NFA7}&87<;m=%qKD)9{G}lV=2kAd^72ZV){+Zl@$rXq|KbsmWR3u94ezo
zt*21xtr21Mr#Dr3bu$2TFdrNLXkgA*aoJF1JqUI(GI=4$!=JE&QWOppyw-pI{91l#
zgy;`Bwg#5KOXK}rqjMPW%k!6->a_V4scIwgVnFXowb4^|Cg$wy5daQ<k{Kl4<tV0z
z>}G&`KLEmHF-8@;<`}3Vi#aO{ygJ(-{57~hc)p#H%39Z!wpEts>T&=N5F_=U#}-Dd
zQ=?xT@V;D<MO;yVLRTCEqFqK*nj(g6%v^8~0o${d1u}A_@3C1|?thQ2c>>|w-us5A
z_QY>hIJi^=q?oN!qWqYY2y*|9WUC}3+OTr<**WD<M9$tBO9>*MpGg;bJc;a@cxkM<
z2WF8)7RHMjT_<lRa#dpS7L*Yiu|=xb3SLUFQsKhM3ULqkkcX|(+%UoZxtmQ_BV^Fh
zbP@rDZUW!OmS+kL!2x=sWq2N*X`oaI>o&`vkD#6&;#Iz}@i|AZ)F4VTB2qdMmOIX*
zNxmcvkW(zfdMGHYPUb@S*vsLzaXs-EL=jGwLb&v9=1`^|xW_WVde$JFCO&~|whtB>
zroqGsupANs4Jvi9Ws*$`tR}h>((G$zFGoaai0fccGFGDRqq3xylA5<Ccp}ri^3Zg`
z^NDkVUDeAbCR*b@>?+2qdZ{e>>|CA3@LnJQKHT1j)0a1;j$109(-=84dG%@uYSK^N
zNal9tf8s?yx?Dq^%@O00EDIK%Ms1(GPVZNVh!pkBosctNCY@yAute}e?|K2R%s@jY
z6<VX(w4U3ApMI9|oXKtLu<o{o{1gRTYR}Q+0h}N%EWlm#$>?<Jl(`Y8&^~{EQ*7sW
zFfWX7vx7@4C0xF&s=e55F%J_ZQE0b>4AMksSfP)fP8F%}$~ZtV^MwbGgtspnWA}@-
zpQV6G9TXjrY(UQaeiCiBFQ8M02Ek|JV4iM-Pe>Vc>`ta7n5eRGsXJhLFTiDXWC2WY
zKQvsOBg(rbRX>gN;V#C}dBF@Xj#&~cIZjd_gpVm5DF7_Z<nzQSzbTyV7LwDKxoc&-
zLOwfM2&$kF6rY`z?p*@3C`o1Oqvw3u+cnSpgmCLy9TIqVp9PUPT+QF(zfu_kQeGD9
zKF*|*p><$zq#BLn`04W(=^eI0?!lo3A~7n<k=#H@!j>QQ0#DwFU#x4G@%Z2+Qx~Id
z7lANhh%t%Dcom0j6r^<h6Dx$Ip_<_ibC{q3^&m6N)C?ua9_Vc}Rm@^SbtAf*=*n2`
zyiNE|N>7C{$2pCT$Gj<g^SSBKq62*6=t6qW{VOgEyN2aCS-VhV8lk&67K|ecZm9RG
zi{F@PiuS;ck_}$$5j1J)f{A^YR!Bs>Vn_+)i;spx!gd`K*Lk=p%<X<+cB93YPF;F2
zmo=pIMR~Tc;^#SG&|F*`HqEPDBuY1su|iZ=RaV@n`Cacg02k<nxHvJ#)>;rT>Bk2_
z%^fNIu--?#N4C{!2~cZ#g=JoWGiXz@o~!o-K{i=9WSg`f2y5V+*k)~vd^rV#PuJR@
zLDb`bT?z4)5~@5(Gl#+B2`Zpt^@U_fvhSPg8sk249MqO5B;Zkn$UJtkEtjiYrWdaB
zB7spN7sD&pzp{ir!~<~zJ;hKW^}+79OQYy%<%Fqs2zn+bR|~Zy3UTuiL2kcnYWIZ9
zk@PmyZE4W*BmVXiVsA5=q0cN{3rIci$3nIy84CH{>NhuM3;Q2aN^bs{V6e*G3t;KH
z5HKk>l;<e1Zslgk*w_#jvz2fGu8r}TP&k<e2;RY`j+x{XjS`tJQ|K$X;7f;J8vK4f
zBgh}8j+A#s6K<1PLCz8PweO)R3}_{Ln^<P5yR4o}0#kOR%2jj9Vq~s73P%FxO%wI2
zfKz9Blzg>%j)sX9!XB^-oVVoyRMJfI#$RgATufKDa#~$O2Xk37a6GfgxI<HOl?X<`
z;UxM5`<?~m9rQ`-L`5>ysIDWJd!OORWOt!q&}nuugHn~$C@_nKo?#LnGIyL=>B^Zd
z#$p{&76-Yyz^Cz1A&BN6)9I!kE5%b3?<Yt2A(o`-z$)>!1cpeYt~a>ZP$@SN+>wte
z&OQ>u3@v{lytBc+%VLGxsSR`mb9oe*#+vIaHD-*@n#(!680<0J*cdzf2^MsiDi#bS
ztCbHx4Z6rON|}ItDl$Cki49(8C9`eXCJ2Q_Jr6-JY%aDUts-&L>rcHfiUVs=?oIrx
z^1wzoNxd#VB-L3@mZe<pGzMS~gv}SF9@LU}*`+m;>dn30WbsG)%!;jGJ*VC}Gjcoy
zlxX@9NI^p}axi>gS~KzeWY?9VWB<V9<g&aZPI_)%=HVvU9(&=qH3HCh`F033s7VB8
zM8bxt*2HWc7ch?3wW7DP8QkMk>2LQXozJryUkQGDr11Og(K+|6OIGmZ!p7H+%M`qi
zH~#kMsZHj$HxUnid*k=pzx?oTkDpZzet+pb$R+Cy=$9#SRdxf501W`}%i#FurU==`
z{^j)lwJGwKwD!N+xc|ap?^j-tUg7;%4o<mOP)is?X_KwEn;0ZsVVcv9r$~L*w`9Hz
zbL@o2|Kf3v;ej0lAXF*{ev-1p<}h)x?D&0?zXwrM4_}5Zz$6)xJLmvvxGwhdv`ll?
zcSW-Cx&zawCw~Ydgnr^sVkz5=*EZ?%+alu}l|_JrmL&ZcaQ7fPq#faBco*Fl^vpW|
zG;v$<AU%i%z%FcQ<P3+{u`LQP&PVN@Yw~e%AC<)OFPVwZ+eP~mF(D2dy{;L2*F4EX
zti^`DPN7e^43VMev}&d10tC^bl0X9h56x2^&Ep(g!!j4*@%D|OO_oCPx5EnXtostc
zluFZ!%FGI)L2lGY4p611KLmp7X|*sBPC0bNW85rr-?a(DSMe2st#SB8D^X1Caf}QT
zGhs};y>KIuH8k>Q^kta!#QISjF&4~FL#yB>WtT4qoMWWFpe`FEo7fxgh6Pp7fAQ0Z
z$l6HqS5o4d%yMD|DpfWaWPzu~)1r~LI^Vfn?G3LE=tjA=ip+zM=n?mfx@Ak*W;teV
z{P}eMw58nX(tND9;vdmGPu+))AN>7F4b}vU@LaZoJnlznwUD|<AO9D=91T)u*-9xV
zACM7LnbdjxT7|1`v&&WJD{vL!Ie?MSlMI2hGx#C-qf-3!tgwJGr8OsJDdJN4^6`u8
zs6tLi))f7BKs`+ndi2W+uv3Fk0?c635;@ZJxSYi0i_R;PV$ux$0YBd|uTzSzW9({{
zFHC?g-qKkB_hl&_2zKEf2QJbX=W;jMq(Z-7>wnYJjx9K+yHTysN#1SN2C5|I_Wx2C
zN9s6H$Rg#CqyD6jDZzhzH_p|f)6HCxl^7mZA7MSJrD#@eXrwuDGb&*~aqHaH`m!jd
zRi`dvvDU4AZc@DNr(PijbH(nk+IzTlixYsJp*^un)26-=FJ9`kkwm6kjmMuc`R;Mp
zxLP&WXIWN8=vA7uIlhIlMCMf(#2kJ<sDiJh7yV_e7`cD%YwPaM70;tH(Guoj?R_XQ
ze??0XziB=fIz=9H^y^t#7?CwUy`Awp28<}$`u^L;5BFJd_CWkxtnUi%J>5KvCkBi;
z^~sQW)8$G%T_y9yJd9%7wtC(1p>o!5?u2n4;(noz7~wBY{TmN|c&-5cSn1-|J;7gj
z*hJ6J#K_TsR^Lfq-_nTsw*{TFztwQy0cAAVe--}i_)F^XKV-xozd!Tw{a;I8babTn
z1Y{IcY5$b_{5v2Toj-#56QuvZx*5c2|5)4!Oa=ge^RMtrBdDOG;AmrS^tT=dJe#_e
zJeu-+od1H`)07&S6<PR!^8$2D=!zh5XeyjCaZy7PI<hrNBYtl|UwlFFt$LV>R-;3C
zd}ESXYwR}0>h9$N1Ox$&>T1VBo~gQx>E-b?#uVR?ud%OUm*-pO+E<xZ`T%rg&vr0)
zzyNUNV0B$1c?OcmSHzsq^FWrpI7~m0q1&w9Iut1q#0%u5)CN-bWxfQ87qt3`F9bz%
z65y(RaqQsN9-jl=!FLnnuC)#>i&h!ty7J~EiW(A`H=Aatf24CX5#T^Vj1JnF7Njmy
zyca)Qf5oq_)q2+Vde^qFB<=7C;MTfQq%B#{Sj!Jk>6jcIyHeWr6e8Hxi1q7O%{aBp
z6f(z+LUGg+k#2b#?cb~0Qonh9*j)-uiz3~EYWZp4?hZ^(B-#{nm<P9e0(L&?ivLXv
zX2q|raB*<qhAHTUgD7pv4>ndGHH~Mje#)=T_q0o{+Y>fQ?_<(FBV6D+AK^O5j8_5w
z8n0Z_5wD2+{P=09+-y4mHnN+boo~aZsUIh^;!=_R%S$#e75YXj)!wKjD2FJA{n*@F
zKpzA;NTSqm?FlPvElyv2&?qNyB%uK0Hmfkh^@IpTw|2V4^|G(zp2NI!rxwp+^qN-w
zHiW4$=U2~;kPR4<br>Cz_Y{>cdBi_1ftl)P#=0%q*ZXd5g0liBuVd0s>^UeGPa+{n
zI-?YQCDStkPP*GAL$|4?dR*%q>Cd5LOMVTF6X{Ktdh#2A2My1=N{Qlojby`maaB(i
zn6H8Oy9M0kVk<eoy`OjJ+9`LzLgJ>4*2hqBR|EmJzAwDKzplT(gZ`TBd-1rvwLemk
ze$necIQfs1?E1mU<o^aI|KCLYi-rG3Y+Qp0@ArVrI|iWe6R*n~h&9k3m@fsHPV3-T
z+rYq~g1cCmKU(vvMgM54hJnoAmsAJi0|0#N{r=~L7QYJ{L3uGrNkJJE=|2~%`Mpd{
zlhFBZWomw%|H6hDYRA^A&B$+6MY@){29wLR8ToA$HpR5Vm4Kv}MA9n(KlND=Oaj40
z5JX4r@X|V8*Y*#$Z^YbT#pL4q>_}jA4Fz#<GM^tstz#vI1BOO}d^O|y<0s9<m}#Nx
z8;XH7s`=9<iI!H0I@cK8CYJ>48TUhXjFh)Ihf_v~vgm|v(qmSyN7-LogK%?{h*>`t
zU_l`J8ahxgm#Zoo0WyVN^w{T_bCZ{hg{V`EqmZ}wOyg9EC*EV_<Ar^!Z>Btm9p;TR
z(=rql0a=i^>bgx=RQv%l!>cS;;7U)3UUA?L1Y%+iCPaa2+pH`}fmEA)?<vd-RAQ($
zxo0?$lFyKK9S#YvppaW%&Zs3(C~r_1ri@u<W^owhq?8~}3PHh0oi+|CoIK;vDF4|8
zI1!g*m`{A7ga|dTf8LdUw^HxRy0muwPAclyB*eo-9Ie7tW|IT5O_4U>s5`^w(~~|=
zcVC`@9Rw@6+2yz$>n_AsV9a;|_=+A{o>vEP?kUdX#E0FY_w?8(^tpqQK;9)AnX9Du
z_Mafs46u==!G+_&q#TQ2W=SAg7v;$FULF`X%cY*Kw4<S7&{0HgQgv<{8t^qK#STdz
z6$&bQ0&;WeKKldPHQLG~K@=G$ryvM@%0%BfdfuBFH72T{AgzbthV!XF@<7<|6)2E6
zLZ>p7UgD5~(8}?&!nbfuqBOaLE}omf*S{>yA>?S=<Sn%nMlLi%I~Vj{-N7QYcX05J
zq9-{?Ah#H%+UMAs$MI@=&L%h6nDLnemR@Gvulm}njzS>^7dR%LXeB9gBk7-ol^s5a
zrG5oP3CRNZSv!f{0DeK2r|LZB>m5NUP)stbt2JU2J16gp!fjr;#03O~daM5lAwBwQ
z?`4lXNICG2n2N7>DYE@1_l=jcHnEd<KAu{X#L2MGcz&;OKR%}zwiY6ic*;5|k>?P^
z2Bv}wENOj(SP`_G(h9C+qS+vlou$#uY&UY(-kV=aGaPYbxliP6)L0qD!~&KUMpyjQ
zky23&mP$ZsL`wta6=~%tdM1$>M+?DsNlOoiqUxg3@7|UW*DnfC1_HHHt8@S!_!w_#
zcHxe3%gV;ah7Y!4>_OPY#@<krnQ~kM8n(g=oLWl_Yn-G#ylBT1#q!)nRA|hEG>X=L
zjxRKa5=@g&g%x-~Y5tnP+gz<&;p*P7>=S{UjIdu7n$G3xE`w&3)XvH<I@R2rt1yIl
z)eDE8wVhesNKoL5%*eHI$AYE)rSYWE$kPPmA$5@lldF>#ydG~iGZf=WCNa!fXqdar
z^fLb&V?623<F)k1j;axHDe1AV!e;~K;+-`0ny~pS$JSY!4HB^F1VCz>3rvWd&tvu+
zmxH*{Bg)5c<p@j$_?*4xZshj<dfpI|>pC$qxRn{pNSi3gEZll|nTHCP6A}2W_D;wq
zLdts)x};~<GeMMaKcC7fN;_VACl%GT8t)=)-rd~qw-47Xi|WRmRh$&^HADD$DE*hw
z{lqM8K*7G%Zy$!6>999}_ME_%Vac!Z&e?B#1xnG>rf-7Yv;34G)D8WnS<{m?H0~k=
zDzH*gN_tmbolr=wx>-hhkfyu{g^4fQ@U1|ICfl4NIba)D9z~D-Mo1e#elQZlBErvH
zYYtI$W6dWeaE5Xj)d6&cx4z!;XMQi$_fJphoOEF$<RrvY(7<6N>Al9P5~`3iTh%NN
z*kVFSuQV#zPxLM$wZ(-n>LSyMErGkIZ(1XEC#Iqn%k@>kR@>iU+*&xT{pr6puLR0X
zg56;SmcVxT(dKU)$Uj>(FvWi+@}UFZ&!;Uyq;7;o)T@RB^LtvRm~-Cu<${&v)n!dT
zE4xq>c#Oev9N!m!lnpYRL>8Q&;MJ{x0M?`gR&HTaO7bh*0`L+*^nsEFz7dfOfv4t-
zK+WWbKGq9#lI>-0*0b8#tOj}uQ$Js-OKwh1enlrVu<QZf<EQi|v+#*0lMHbk?u`TF
zRYQz;d3QA|IDIn8dW76x=zrt#K(U!LT{+i$SbW&wSfJKOV!qARK;8_`qL=O0TmYul
zU6xP;^{l@-WM)zzt(mwgl;YjS*lJ?I7!&pDREL9f$;R{-Nkh?l<Ua9)F_pyU`t8(v
z_Ty%TqP&+&P<77y``l6OTFDY+E5Bgdx-_-$6$%q+kGIQ-EQ;?jycN^E+ddvic7)5B
z0w0G1sSPWUa_ri5t@0}t4nR0f6M#Z_R2R&PRy+V4JT1^(7hSdN6qxwzveBIBW4@1y
z#Iyy<aR>)M#Z+5+OAr4&^(3_Uev1PyoC>RSEP0{L$X=lS=FYm=rKG6vwGnU;=XeDs
zm0ax(P~`G4H<bM6q@(qSemuq8cHdyPA0f{oVoZ>$0m+xS_j<s}LRd>ds`!DSw#^oi
z)R$JW8Khqhd+WQ+JNX=lR++nJ+Q1;UOS!-TNFf*eq&zg7Zr43TWSu8E2)h)M?+c}z
zX@CbiaM(!{#aksqTD0rOdGZ3dXp_4R2*2~$LRWIw@F`gE&ud<pt1)WSU>-E&pjCg6
zw(WT>L6x}nL5BfcqV$)OPeDB_wequJTU`+}9C@^>rr!15o!)V{qqNZdpzNk5)ZJZT
zS8coQ=n2Pj?)Jnk+yI<J{yKXxgX~-f$CRr)p4h2WAzYJb#~bSzzyrQ*N!4)l7k;Lo
zV^RVoIVV&4pwmp<qncFcg{s2mtgyqZ#zpkpTQ6THmKCh&S85Ulu@O&^W7-_6g~&H8
zGTkt&ZGmIPwDiM_9LNFfbM3c(t_3v|imiUh^`xVS6js>-rWtY)yPiIn>L>w!u%FZ_
zTu)u!WWA4@BV)#BXfadErH%ec8t~|MMD8GF{?Il<cL2MqJCLup+QEjFSKBo|6sAE?
z=W^1Wp_$M@WQ`noTWI&5GKD_RiQCS9cm84}KuJlxY{CyjxC*P~NEaw?%puN*YXxE8
zsf`)&6ouNnk^=uz0HD|~6M~mGc)+fSkyYws_m0372r%h;B7z`2Dm6EUJKIm(hUA<K
z4)t(d%wwCD@n~cdbw~O=;lQYNg%J?$s9e8FNRMwnJlKS`znA%-cnRE)FD~igF_97p
z$7*(iqN(oAhUPo_g06D!=(gOdyflNXukC31pe8}$X5l{-wD7uT*8+fek`N-%g4D@0
zXI1jbjvGs-<iF=*X1i%{2B#)93}Lq61EJQIHY}MM(oMKkG{9t~U3_iPgy69Hj<z_h
zMTL%5)m5-Y^H_^nk}Wa8SlVrFjW7CKeMC+qrp+TC4tjMwzH&S-(r7k*%TF}O)=8SD
z@661#6ujozuLr&93nOYtR?%ImRo#|YAd6WfI}k-G%vEc2_3ha(FOA>pQ4kgQ&Djbl
z-`-3a@oMAS>&muh+hGzdW&RQ|*be1Z#5Px(nd7@@C~O~@MMTuGcJMp=F;#S~+S1a2
zD;%_I=-vzNFYVNadK?uW5&+<r4*IWc?*A*d<#+AW(9K%U%FN*Z+32SJH&pdM!TL|O
zx<3p702VV#wO{Ao|M35n{_ki*ZD{jH{PO)fPK`f){+CnZR}RL1=hXNEq~EanJD~rO
zF?7j~2YN}%2oHiK!0($a86AnvYZ+1K{~4bqH9e~=NmVvFu2e-eRW&|YB{n5#M7G#Q
zS69!_%Gla6(b(KlA3HrRIo;~iaL@3}bVonuc+2!8-$MUPzw-FN*gW@mN8k9&+}QZ%
z$(H`m->fTuo-p0Oj}HFo<Ui>5kKO-;VcdU(U0bt1IgEJ!H@N+G%*?;T`3<wbgZU4{
z>>s^lzc5SuuP|$DX02y!V5VpJN80^gIplts#{V7d{sr29x^xiyLoM6?l798|?Ei@0
zhv<9L-;cj|1ODN9_~XZavCY3jzki4G8)kn8@gGRPf0YdXQtsO88U7i!zl+0P4&{G|
z+dqE(-<7+6fb{<xxocu?W=QR9X5{iWNB!>t@qdKde}``W4(C5z?*5Umen|wpe<gP<
z&8+|5r!<OxL*)Jg(0@8^|2n4;{VUuW+Blh*T01%ZQRM!wrZk#=1HXR;_8X3WhXwNC
zqW+5rGSEdfFwxc5y^xYrzJOB>mi7J=jRr&tj|uqy4UMenYuvx5@7mf}{#ouSTp5@s
zp*)!?e;j}5^uJd4{-wd<V4&ytQTFwZBly1(?Ej9z@+Vk-67BzC0|*WP4j`TKkMjDg
z_5UPbA*ko5r(>ySVMP1)t3T9!{d=Vu$%uPXsgL8=`7gtH%5`eL!W!G@Qg(+8e=1ER
zMKBy0*GBz~Y<F>@{61Ea0=KSdcchi<b1Z9)D2>?CJh4}#N4$r(N6qm7Dj<A3nOdsh
zF{cuu0^ZbtH50~K1gI-okRh78n)57L{_J(op(Q(Bzrmoy%tLDU7TNiZS@ghk^YnY~
zIRqQD-&>9d2{|@4v)659yJa${*!PWN=BJ(6Q7#1ctV6xYW8Ay!BV4a<i(vvU+h8iS
zBHvb9q&tXmO1w)tFayoN-1lflssim6AL~3Jsz^P)&XKd7bjwUvg2AA6xh~_Wal;+T
z5f*)M8-((+tC#tq%Q+0kbm6C#Ir#aJ9wQ5=MS%8Jr#coC;w3L|{~4ygpOfI?8>yII
zNz%lU16^Ngg&rC-PgBlgU)aD+lDBr#vJmbR6hVNK5f7a232<wxZ>slRp9H|T9mWH;
z@~7|wn5W%F^_g5Sf*j~}CPn}<agX%b+)chB0pQ0B=@3GRp@m|cLEJ5a4I5&!lgU6g
zkljz6MCmCH*jbs%*{b2ycSsR>j(Mw41gWjfOZ$$mj(0v-o$gBT1A>C!f}TP%a%eg(
z)^{OaMh&!Z;AwGpU_|^hyQ*d`%NDQwOkWO*KVKDrwwTs@IX4pxV!K_rph27zKdA)b
z$vTNEap|Qil=I>(<eUAx+s47cgB7m|f=CL{fuGTrBQx`zyGztvy6A$vXea7Z!o3*0
zkg^aU1!5KOQ~t^+!o>a9^g(rz&zB9nec&SUgYX;gKy+e~PZ4iPv?sf#72Nb}hNOB%
zJ$myKg)zEMquzns)eY!w3d?<Z%p#dePZFC7Ht;_X=dX${jSwEV1I)Ou0QxmdZ$Z_Q
zh7@(5Aiu1C5h$b4uVd20t%@>hCQxsPY0Zzx>f?*wfZ(tv$+iR;w`9$EqiXN%5(n47
zSj8_7O6nZ&yZtN(4vc3B(XCU*s*cNM*>TpD>ki^1GhoIk0eUUrF9aOB%w8J~(DAtJ
zpKN|k3M{5QHmtMp{$gzOeL=``bGLVR7x{ae-^+JivK>@VBMt@2#2*p>NZqB5=nt6s
zmmc2kJwEG7UR~eY`w~!KICyPgKG)(|2KTu*3Myd0kbiO30lcVyo|=LRV$`&H9sQhW
zWlxe$w&;JGv}VMz>8&NRg#n~kt8ykPJnT-T*0kfA3`Tjx;76xQ#U^BwI>ohRn&qbl
zOkykQz%c5a>?-JAvjU$N%B(AUY1Io*SQ8wGuPUZm5GD-6ry%ytq;}2R^do7|_!SRm
z)Et%*`fwajFH)M6H~fAWzFayLhmKHjF+;}LIW`R_Z3cirqJ4;ls1}j#aZtC7;odCk
z1sxCGOz0euI~dHLO<jmS8=FWi8r%B@fLqtu_q9nT7fq`dD9{>A8L+s;V~XrP9gOXc
ziWM|){Ip`v(J=1eX_pGRThVM7@{~czAL(>hC6>>kwX?3X$-zUT{UDGDV;}JcsRzdn
zo0)IHD$#TPQhNurT}hB71)~hBRAN=1AS!Nc$r<s$@QZ-wr!n-t%|_D$iBy?v(8q_f
zgs{vX>AbcXoM+I)yhYC{@VYHNwTn#4%yqBYEEYqB46R9!C8aHu^%MXbA&cg~UpKBS
ze(IJO9?F&%CJGrG(v;6GhG)0ujq!M86>Tczk$0ho%UDT#3Rs0RF+(YO_NT`+iM4PC
zWV8x=MoJu*(iB0pAGNw91PP?B26bZZqn0y+iVil6Z`J9EG(yPs0HMKGCGgZ$me9bq
z@*{?)kUAhXAZTM;o;$Fa({oB~+|c#RaHYaNKqxB<--w{`Gobb92SufAeAr~qpC=p)
z9oljQAPK2kEijVXP^m#PXg&0pegG;@GpLWV0+lgME<Uhf!Gtwa-fLuww+mj&-{!N}
zr(at0`<8j~s`1>l)$BlCD;kThV65F4Q3p`rd6UY|KEk1(I!o``H+FqJJqh6i*f;KH
zk{A;`*fp0S{BA>+zY4*2B9+;KxgBcHi8a8;yZz#b3m^W~+?w&B9)CZ6&?58MlBPS&
z%T0=bH!DA$&2;dQVM;*zn)O{=cm9VGhbw*6Qg@h}))X#cC&?M($3IBR@M%3%Bij#h
zK(7d%tU{7|`>IJ)N<L8pe7Q;OPXQmCt%=Jmt<pELGk+^pG}}ZqPB?(@s4!CVNtH2U
zDY1}Y8?GmWNXvB))a&5<{s}qq()&I8I(+&$S>zLwLTrdJM1*@{fhkgvi@pyerFHNP
z+AOl)qy8KF9oHEK5>nZj^p+`7xJgM+YZXfOSmq<ln2D8KyoLT@hk==97jXvHbPDc{
zFZtd;dQFUIo*q1VaD&Td3ukw6fz+9TwY`%4bUEcJ&jooCA3v$BhCzPS5w?b)fj%8Y
z;q9DQlLt-asoU(7vCYnOc;tvV!D5OMH7aotyYv;082jESKjJhop2xhqF+yvb4*IXS
zFQ_1Sx-Nt0tUK^sO+o6bk?>Mp((uxt)U?hnI6O;kFP8h4XA=`e!taFe=`sF=z#1qV
zNeJO{<4Lq2>T7b*#%u$C!-TaS9un+(7P`%M^ZtlYW36t`jcictpRlm}$A+(S1H#r&
z41`)1mz^zZFy$1K4J}y>sJ1yV`Xl3^X!Fga7dtZmN|{74@<<Gbmo;nCY!Me1fn1aU
zF=30bQvJrLHS=f&TuTLpNK{!~`_qNfIePK1108*?4BG&8w|`=Y4ugktbxQQ@xi=jj
zC|TAqPJ2kb>IQz^;>_S9UCw;TrFI*YXKAR90WgTnYmA}=tBq&M*_SjGpjZ#RxC7Ml
zc(p&lREC9n`iwoEcG$)1L!^6HRYwIU>|kbi`6ZExSBG{xesHdXXu9V}XP69}&;6e9
zsGxTku$zK!X9m+=&^IvS*iQ^gNuP;nCSnyCUX=Chgd6{AVfLI;iKn*Y&fq>IW9!m!
z0lAUssjE8CGQpJ_mb=h9yG`Y)ghus4ykmL|fN))LjMY5#bxTeg9&F7(B*ub?h~zI3
zO@<ura+}pY7|;CVQ$KJ5t>JNbaA|}JTi*75E$frCtng+``vE-GFn@;A{4KBEYQfKr
zjN-Me)Gzal(PVQ0zfD{}*%%<^QjgEru6LX1c8><lSG8M3Fr>|^OAh!)2VchO)JA7m
z)$S;p$Kjoa1pFj{4%i5eH(N>>P{o<%ybx$jt2D(J`3OdJL_Q%BprY3plXdA~H}nWB
zEDd5L?6VeMC_&*+V%%a4u7cx0Lb=*5p7BA_m!xi3J$MepP#<>)thQc#ZSz~*4u5Os
zq`Phe43Tvv@cmjisvbc+s8$Nl<|?zy0WmC4wGLPYYd11hQ)Sk!I(<P8ll`Dn?@Kv;
z*e+=BK)Ub1NigA;S#<~~dr@1CM*+9l+L)ZUebs?xyq8UYKcYdhU=7avc%M;#0N6tc
zS?P9u3P@Wf7ImAX%4{vU{t!+ULS{L5{K)2B42!ISk+unT(jeYc?GFTZ6}WB0)}^ZH
z$&q8@QGA?IESYEukk<N<F%4Gx1Ehlttl1C#Ngc8&6k0ZpJ1p*XD}Zqp5?Eyp>OwWw
z5}0r_W%yIhqD7i#tY~qfk-8R@YRCnQZo&1Cp?X55;EX3PAm=N9(kaczvw=`q!4S3i
zNko^iT7igJQ$_hHJ-lPp>3Ks3;!#Iq=fd6nvKQg9wzaw?-#*8NlEsTD3-;8F_Ws7P
zC+Vz5#<!~LbEh{F$G1f2mjvWD%5?nu)Hm&!I1ecu<NnUj!YW0bAjId{Liajr*-g)2
zFwy*hE^4Ymy0eD9j>P5#g!f!^ek&avSGP>(rN{;Z6fzMz?c__s&GG^T-lxKKSGKi#
zj2&&iRf}kks4Jb-JWl9B1LyM(f<Ih|zdBZ<sdX$SK`j;FToi1l<1ugdcNbJH_bnAQ
zTp|D^Qr3s5yxaP0M)E}}2Wr#I4Ye>+vn+}jO7!(hWO%L7xTab0oe=@ELiSCh6KOhi
zF_l!H&Q=e@$7U^n>px?SPe?h4duAFhiiQ|0*XgK>#MPvip`z_^l>rl$`r)VKEmT!F
zn}i8Q972JzvKQfP;B_w3t&eLl5{d$bH<LX-c3!n`+74&9{=6h@=MwF-t_Q#G#@Qd2
zAnY~%bH^;pX*hNnjltDoS`Tg{0;!@D(_yhhipJ{MFbaD`F^Goa`bPsh1EGR;dEFi|
zTdW(>0CF6H(E8`gecftc0b1yN!%d@EQe8UwC+-<HWjE6x+{0;yP?Fi}$Hz1J@tE^(
zdLSwN?!yK!b0!l=)or*wgT;u0Be3+;$vR;)#MN#?@{x|9kw08VQi6Jw`Z=9h*JC1x
zACzNNVtRrOJ(34ZGSUX;mDt)(W|vUF#0q1ztD{qS_k3NhN`(0};ptcO;Rkvr2h8@?
zia0P?!%nz~%ePgpo2xRW&s}>N>$Q4MhkiKko8_^)x8bQgtM#ijvJWp$;`oWXLbskM
z<VE?`@fWgOjR}sYR9Pvh#n(~SHkR#ZVNHNGvns0f%d#>ympL?3);6y}<uoo=FO4au
z0fNLBsHH5M`&}Ir%*IJTrm9NT<=dI=wlXA0=5L|y-$H0ppo#o!f8Pxo0OE`y<_il*
zF&GHZrOacuAHF!b^}27Xo4JPDxq0ZdQ+XSt*J`${v**0qRBi0FTQl;gHK|<Y9H5EJ
zMOMK@3C~D~^0H&^rw%|4^wwNv)^-AN%0INd5^U^-h`b+9@eF7kS{_DR%dVaz!QR4S
zS2)Lpn67j@unbL^C{zu^8Ir+$-RQ;n#-a@-$1v)|TAs~!<wj7c*OzvkOAieUlhRS}
zIRHNhwEJ5W#!Jh7_49l`dKHs~H{+mfVju$0ooWcBN12w1%PecJU&G0WAH(b3s!Tgp
zX-^N&@HLUghvnvk%N9EmRtD1z2I+ZFW2DCmi5b1t?!wj&)cW;`&<#_b&KI0RRg%*_
z006$px`3^NMq{@CA`KM`LJd~*(j!hEpVn-J^X*C)JmlMDo5|g$NGmWM=S?FMIw;vp
zUM;@iC8^k+=qo%(kX>heBz5~ahP3qRGSRu|YQ(|O`K$xvehUssUcUHUZKnKv?(>G;
zM88_lp5i>HN2v*Q%_!7xn5QF6l?(dEt^vbo3YK66-p>(b!M<iJ208qX3RD&z9>Xwh
z@RD(?Ai_I$ue1pQ6KlfUtI!U$YI<7bJ@fGjub)t*9?gu>i1<2htzpz%VP`*?-)OKB
zF&i(DluXm~Iw15``8&xfRNRh9JjY+vg<5fN8nZA^JfY88->`A&Zw?+S*3Yh$m74~T
zRNh@HMdM$Ur^#SZUIwPn>U=*S{-otiV~tiLr3=Qt*+e&n8YMS(N@_awc-in(U`<@$
zsQJZ4K)^zeGH9NrlC2)Yxd9BNt()X!3h7&8pdw1xr6SK4dfy2h*2Lmsh_)>sT-;gO
zym?7{I)K0|pX5V`wpYGm-7CdX7praGfC5-5TI}}2y0moRW^jyd8gB+VWf}t)uZnAb
z8BEZ7wR#M-sG|318||SgW6zWUg&PsxZJH2VJ8nAOwHRICmB&Hc6KQDs&k-9sVA&Vk
zC7}=JV6s`TgP1K*79?yY=BQ}2dw_TSKhwR5A*7Ki38au9a{0az+R#(Ue3bjAbofGM
z??bWXQ;>{WN?JVb0@$@hCc<A@xDv4R5Z6m(BH<H9Ty!u?Z3NNkg{cn#cFR?_;|Kkj
zD&})}9fN}6OAf{s0m^Jq^B7ff@yQziv>y(0X0}vW09AT9D<2nAunkI$KG_kKK|qNk
z%7`f7mBvU&UyrjvqJQ48<(6VO#F4M^Wh0XOPkIIeKKO2UYbMyfd#rLOUjNf7Esq>u
z(VbwhZOm6hM}Pjoaa3c}B}+P(D~v4hU_u;8^OOli4bYSkTr;{)9u$QN$YR?^$0u`3
zL5x>d`z}=>D7<Be{MSoTxGs>n6{uIsN;<GV(Qcv?#NTixlVK#@K&{b+4SICAgAzPk
zPIZ^$A6vq1Y=M(TqS~N9LIuc&MH5_G&P~X_arKf@4Hgv<i>c9&4nF8bkBg{JmoD^_
ztGmwR0TA90h^sQh%Y(z^@g-uhz6Z}|dJ*ESOI)>M3ijIW&6Lk^a)15$R;Xr)64A3b
zI;WyPveDHN3e?#!lZcwWV~4fJmm6P}1gdSaWh9n9hQL=XzPaZV@&Lsh?7ov$k1ZMW
zqi@RKCk%>WOa2d2khelS52mlkf?0Ml`AesFvn!dXfl{)IsPF01j&Ji49pu*Op7=l1
zS4pLI&WW#C4E5sB+9C@mquTL|%E4&5d2yNVG8H{_2PiXdN7aZ@^uwB_MF=xZotqog
zh<&J_a*pM!?S0;BE$ZlGQFafpJZyD13CCU7w(Kblkcy#x!j56Kt3a!*k+V+(`3ID*
zThb#)9|iPCELQ(u04WQop963bvZZO$-H?BrHPSm7L!WE3j8NayCCJ1NR#w1U)a25)
zUSV~*R+z`h;1HRW@N3K%Vry|YX!k$R64=@N*lhxzr%^*4(4LS4cC9-4!3O?a8{y3v
zwDnfhHKd<P(8_+7#^-XJlH_qNXIyOV&UeXBVEP1MWP?**Yaag|@Zg*gKntVfz3Osj
z<e~ek<Rf?C7#FZrW-&X%$Sx!ddtM%_d1ssLrE<yZUd-n1EOp2cd+<}FL8}Ya7&WLR
z^V`=tTWXqKjqv&JCQ6qE-#>;O6JjFqOu?k47Q?P-O9Q1m!@VhjRkOd~_!!KHY9}ek
zBymy3Rj%yQ(r|N%33XOn(a|>YOGo}hDyVbwF=NJ;lf;wO%_D`xBODK3)TL|ar|qWw
zy?6#Hpg1a)oUj&E{urT|n*dx}!_n_v-@JPL6Fm&1;=6fu)8FB<UL6JyA~gVdFCj{=
zT$H<vkLjY7!6aOJDwlaVN1e6F*}is=iDTn$macZCA?MUqlWc|ha1b=h_JSyt`7@fu
zW7-{qKAjB!%i_Hx8%GeK`mG~G)c7kdY)`dnAJ_#uKakt6;_4dHm~ojeSb(;2%XH|$
zu7#4$w=2{=ItIoZ!z->>ydgn9wgk>cG2?edgB+-*_iThWoXlB5ymZ?Dxfz(gDs#on
z!!fV)#seGjO)cqAz#7(n_o`U)O7*`11*`@mU>?NgGQq@hn+$MnSvW~_+8s?;NIpy6
zt0+VmH-2`z7f&bSB9P+Kt@}PgM&CnkcG8O!+)j~~YqZORz&ea`vU*v22M>c}$S``L
z?*@N^p8Pq$dN`RL`r$-Ly*FrS7D@oyCY|eGguI><O|Y(S&p;S^?NW#?Yf3+6E9kNZ
zZ}c%|aF9q^ELJ`%Qg^Nw4xo<ABD1@e7>D+~&MIJY(wdXVHLG6Lq;2Q(`K?&mOEI42
zS!`r+wTOHBhk{33DQdYfcDWgY9YCuhXQ$51R}5i7MM<sNNje#NZVH2<P8bQI`WzYo
zH1b1fkuS0XCyCp8Hx~{j^oMYG!%Wcva|GN{lkqnuT;}dKSH)Yik=vin@YW{Rw%-Js
z-=8<qz*Y^s-%YN)HNcx2+?uWYSJpXKq5M5++?uoC&x$CTPb`Fvf!=+)IxTSyHT*p&
zH`#gE8@Nxt;hlW5#M#G%KZ8pP^6<BfVu5Rlvc-+O_8a%(Hq7p|@;<{At8eOx?IjF(
zK=J0$?ZUMLyy^{tJ`G9>dby?Ke|u`!l66uN?)uc`J9vPKjy$Hnlq&So_Hdz&j1`|U
z1(AYP&P?Kk#V#^Jn4Q7^d%|>3T;72qd>hdSixwW!h|eOHaE;J50GJA-bdH7_U;E8}
zIYW>NBDcY?Oz=#+hxo9HTBp{hSu%GlI}oa#aO=A$fYFS*e6fSHle)|&Waczff$+L*
zR2gCm6fr%)Dh|kNbL71@8UvQyZx;@W-;*ZnEb6>LtHy?5S;gX+A{Rm|NPdpJ0K10>
zr>RX$;?lrq65I=3h?>1|2y;3@&x3n$dWtHSyy;e`hGfr%)wi64C$aWy&JaZwm-K7K
z;rNlBr0J-~-wHBUK5VI(J!>|=vu_qafI8-nQBvvX<u$VQ4QR@Cpqfl8ub)-vgTa+4
z)$!Lm^qae>De<;m6;_3MS1f+A4}?8!99^(YAn;wG{@UP4<9{AZk5WZJgYQrQOZCtg
zpXbhQS&2*a<tMA3Yde4cS1Vzp^L<6b42s>a{rA<QE9bYxl7~#+bBoE7<W)^Jl)m;X
z4u%iKgI{QN$zr#eDYB<7d?8h$G(9#Ja~mKp%YPDZZDg-{qNy6^-B+<IbJI9aY)x(V
zZ-^j{qF7HD5A+rJ*lr41)&{6d^)YFA7lmh(qe;+H;ya;c@{h=PkCZxxs>Jiv#N^Ml
zvvo==){iVrI?MYLj>^dpS{PSs6m_L+&O_@MO1BA`bU_J8^Nm<C3<+R7E^DZ;3C~Y=
z#4nC2KN?pkj%~L*sLF^mWY3c?=e2+!B^LZ|HIcCQk{LG%W-_*nQ>Y?uu`!?bAcHkN
zpM0+yNzZ5>GXsib2)3j<5~8M4EJ%c6JrmM=AQckVo(^j;D!8b24o72|fFJsS11$ho
zA*c<ggz;^Vo0cb8W#jYFMHSPwxWTua(-t`p$sUEI2b1pGa`r1o2C(1*Zn6<y$x@yH
z^0q5}9O?scuob#Z^GX#1<V83v$M_uU@-Gv*H^_QxN)$g|J=ueM6N%wIc;OBc`2@tb
zF&3KPGe;?*K2OK<<F>}t*7>ub6u`XyvHw|>9ehJ-lvthCV}>x-YZB1Kz;=8j`nVeY
zo%^9LU5IqjqMT!=^8@ab5Iyb9TPa8P`voG)wjI6f8s}Sb7n~%8CH_xpIRQuy4?t-s
zZsEf7*vk1v`<pW4U4AI18Yy*lHV=IoWd7<)@QSqPTB>;k7tAKUh3w>&g)xY)^kAn<
zkOLM|8Wv|(y?f5k?JK@y=uonO^9oXRbKFo;iN=MMDGBNcg)Kx94azpV&`O+F#t<H9
zxOph+Pe&PsbwA;wgitarG-xWk=vXM!zWxM5j||Y6xKS)cB$iaj+>#!5dB_0JfsGA3
z*}_t9dAVGnHaD3HH7=jaeOa<}AAC{65ox?APvdGM!)y$^j=z}<RVeSmwp~=T)Wbz7
z;f%<mXACtqgB<V|lvnG^9nhn-n<!8hy<p9f>coE4c->=%GKo1mmkcWnE%apU@UC0u
z#VR@?N#NVlnwAGU&#8VJ(?14xqp#vBsulC3M!{A79%1PifTXi-{3GgBst~dHz4Tk<
zG>Shk%AQ?SXPaAhXlqI{G%(P3iY~i=*g8T_6Z?39g4m!h$qpO+82I<->Mze|H5AAz
zD83H&b%ww+Eq8-lDD(HwSFGe;$GoFr^Mhw`X@+IdBTKk!Dai2g53oistRF0?M#JNT
zTRAdSjlhg&C@^Ii-H!d?uK^qc%B-40z4h1vbR5dkHR)jh8&uH3v>-+H9@3H-Nfj)O
z!_XNO{7l>3fgKcboi&@yg)p88_+~uY#PQ2)VTljbv(mE)*2qM3BBcro2Bpi;cAA@Y
zsBd}}9dVB+t)y$l^lO-n%FjkjD!`*EI_Mk5tx86uN<v`*kk#5Q{0ELsDmV+}#*10?
zJSqB0;oTy1?0TBQ&}TNmHqh5u_A^=8nlj<6Cg~a_lthS4xvIADRh|aRzTyv)m5o%;
zX$>OuTl>0XWHpvFp%ysl5omGeJ#x98H?p-6S8<8;v>X)nL{!%JQ)puovKrl$A4$qw
znGKy$8kl53Jo5ZXgLSfD)o{TA0QeQz{70tLA7h@gA4wO#YNh@2Otim;JZWik{(k*m
zg+Kpi5nzIkq{=F~KP6TA{dY-~rdGx==EkX(nfj;ca`9Pd=BMUnJ12%e^|Oz+j4eO1
zD)shqE%XjeE00esbq!6ebq`F>%zOTpRrxtE>|4-BhkteYAL!sPSN{8&HDI)Vl7sU1
zp40w$Ssi8ggK6{lgQ;xf!~YfYO`@0a<3$VH5CGN3M#C0M$7XNS^@|HD^ef9rRtMrw
zrAubL5W#u@jC=zH6L}Bz<Kd0;sEFoQ&{V(mh#ie9JO|r=aTx@Z&Ev%QL<0aea7UwV
z$C_Au&|zPEgdWt)7h3JO_(sJC-w58}tR+cDyKrh{@Vb|bFYHe_wtZ;JDHb;tkA+pC
z5SPyfKTxs`mLAppe0_X4dg<;o9d%TD>>l+!Wu?A!I3{7Kt(Kn@F@O9~*Qk*@s&41!
z;c5Gki4gZug3aC9bl4l0K)v$D*!=VNPS=w&gP17yU5zIcFVvACbjwDVj|RYZ{2%Jx
zIl9trTOW*5amBV#v7L%-+p5^MZQHhO8x=bhn-z9)?!D*x?!oOoeS3^wpFPIj@4Np<
z)}CuV6KlNBoRi17UK({U^j*DPv&_ac>i(!#h0b_}`D~i{Y=&DC&2CPv-JPsc^(rt|
zV<qoZOCH7Ft1mL9Z0bGk{J9J7ix-+9_^yusK!6T}$D-?g^9u#<a}Yq?6WPX)(_)@S
zD{UeiAm0*F)+eADA5wi406!`uKlJpEHTYSN_|Iv<e^RCPKUU_ygy8>IHIjBte^3sx
z(f?)2!Cyxq_{lw(kX=2Qd|v;Sa-b?{wafgq1AN#EubM0xgi^SXa9~j@6vafk!(N(e
zmcX!1JcL5DA`a#E1u?N$A(@<GBR7%>zCbj&&Ev0=iD(yh0G{uuEJ$ME-O?cPMBOyd
ze30B@%Augn&g~s79jbeM$}!z7MCCwU>l*+v-#bYa>-FVo>4D3dJ%8s9nFoI@xkpza
zF)|op?d9D08Y5(&GY8lAGL~6a_+56AY#04e=Et2ONr%7=06d2g9$48&Bc>9b&dr{-
zM}4<%J9}ClPm8&X(*&YK1K8bKCRjXGI%|;MREYBkNuK@2c`=;)A_;(h2na}Sn}b1y
zw!w>xbcP1^7swF~CG@)kdGAH~I5(}-)=59u<V;}8Huu#(JF1uqtG*3@mo=@31oRhA
zm$hnDWiW{-vec^YibQjo;9WUI=IzAf&3o6@e~hHO#GkUug3J2B==&0~knbsBs{)Z5
z5py@E=8mUT9ssAMRNW4bE#lU@<WwFLuV9uFs<?zmPy>O8NTAc=F4v^MH4wJYQCDdj
z>o11kG|tnk#v>pMdjfsv#?kn*%asT1K}5;TgK~QVUXlWahaFL3qrUq@Pcb_>%#p)C
zEMrQ1E?r`we%~zLcQeJ@t=yY9M=T&#QDUC<VmymQ!^D}15ZHP3AzIGD_2>R5{j!h8
zndHUCRQlosW!g%FY>#=)+f~hc#^$bg;>5}ee)N?C4><i652+cm<nVVBouuug{Q2W`
z@`TK$W}4M@#%(-qGH}gN2JxTJrm1RSC$rgls-=e$K>;ceZ1Le?@>(9J6KCNixZiul
z*!z&Vg<dIH*j@t$t1au&bl-?Xd()4OvAr<QvH<*d%y!Z2x9V%I?Dc}3=48##`x0*>
z_HNt=iO99oQHy8n`VD64(Aja~r)BnrY=Bs<G`P?a6*=V%EBPfxl}BYsB7WlQXKqu9
ze+#SfH%q@<w;knqUz+02)li(h8(olx4cogeR<UAsJ}c<=Qhlwha3CR~%BWQD1%tj(
zEPqx}J?k&!PzBva8E{05La=j=<2<mzigzA_o;>Y*pfF$PjWFXC>HV>_rJ`-uFuxw=
ztSgX?&990S`XqB@!Z1Du3n`(PaGBIwnPY8{gHI-_#WuHWyb?3f))qr54jL)GzhBHx
z>mQR5m-lGhdBZrmp@P0rAquT#m0o>G<w`=3B$~Qc6g<vm>C{-Lcx7R&zEx&`C2M5g
zZbQ$m1{f-hN4zF`%C5@)jf_KRbfG%t)c>UZh<SSDw<k;1xS;Mgq~|+n9M74<MJ-PV
z5?MHUU~u2Bm6N{lLFnJ7f7UB=H)J4m4HrwcLCa_in*t|I{&4k+jz+BC6^!`B&;G2r
zG@t@1zAr2>G3nvRb8c~GUv)VCfLbi>=(`OorW_NoI+t3y;q-2lbtz{@)j!Z&=&-n_
zo5tCTpvN(1njWJ^?*d=K$?dIOBct(cSQ#2`mdmVUOxW%Foks|~&sL>BjR)>SIz`6?
zhmUS8%QpmqcJU`>i`3eu`3@|)u4t^Wm+4N|ITrEypp}I-7hAZ@^Y#q;H&vHTFrIcP
zxcxVtzQ?I7T{3_$>PuS4kEs;v&`C>gv~`HsE$Ytl=!(-=V54cbYMr|RAOnC|JkseL
zi1&PLmf>1D)nx&OGHC$>eWp%T;@jjlL4wbB?H;lN&}=Z@B&!Y`+ZuG(jM?RtF<dt<
z*f!Fh_PKIX5JI?&bvDGGeY@Y`fJn9LPC8GDxoR?)sm}_>ve#7ZB{nmh>9>13pRGRQ
zO5-cb!?%xipP&BtkGS$@PyN43l>W|X|4U)!>i>MA^bu77;0;CpnkapKC;MAM=^xQm
z-}Yk^y_uEXH$4Z_9|j-u=>NhKJkdTddHQ&NUjHUy{l}(%{?`W|x&OAx-_ch8SjE`Z
z%E4OC<=ZD6`af1!wYo7``*?p||G!+pz|g|#|KSRstinIbF#0i9=I?sN{vpF(@BVh|
z@TUl$;r$<o(x9mR*?!nlc!vio#}p)j=|Wd?j9s!|b){4>t1txP0H823V;Po`|M$fW
zsE8bMj?_ATG`81)JL*uNVT%ITA}s<`exL;FcL;f6hQmw*I!abqx&+8JKgTeO9%aM`
zGgWY>`Q7hM$H{j3*9?;~$(^`agrc%Xv@Il|29E6&m9mB@NLOom80&#-Z9TZ4W_IQ&
z=oP^YxpX5pDnSn`Qps)`rQSR%RE#S*D)hvHMhhQ<2Zb6QTDfh`rOSeI9oj&nDO(K4
z3khR*l|@Zk&y<$Un=WVSWTff?qxz%iNa31eYDx^m^}dn_?5<CsvIb7VqFxALqXEc}
z*UN%3$q9ZCl^oHD?~>ET43bo8voeS7e|#;#9G`|}i?XHfivtmek(9aPtJ7YnPnu_b
z#fC3?sD^cil*|E1W}6d6K8QI(|Lues)#2l3b;MmRWZFO5x8C7_#!<yw;L7g|oYAcB
zrOM7)+|N=hnhj|oBx{x@)qTyiszvQEr;V#ohanhK6q!qp{uTUCtJ_NJ$IH2>Sd2dZ
ztk*(~t{X;&+YTD_6{&&AFZzHI1^jO$M%FfN4yprAIR(xT9Z;(WE!!1i9t+xjdW5>6
zfs;N|5W8<U?%fHns3VuId($|yYn5J&W3oBUK=+L5S@+J!kiuRzD72fMJT=A+8|0R+
z>vL?fB(MjI4crjoLsg4p#S#@4Gb!~+8PyNId1nb#z*&O+d@f#(^ZtcxNcZ$#+(6>3
z&1kIr94XPS6`rw)-%fy?VgMPE71LZB`@F6%2hnpT1RnquQs`dunSDayu|k|vXxMZ*
z&UY=i=7}OYx~_V|p8RIt8vT#V95DRPP2rZVH(~46gT9jF1d8guJA3}6S6R{E%|z@+
z_mWS*|KUUbYzm(~l=)vgZ2rwK?*Foie>ea6=@tGQPCi-VwEx_H{?#jJ>+9MYIO^J(
z>V7nV`ma9gpBX>-KhFIBv(LK7<P;^fthFeWX!w-qxRj(6l^D4=)u@ETsHkGKV(~9I
z03hP%VtG?hQP0fSgzsv4QZ}Wq-w9ZFh?z)1O#o!5@qNlrKC}q_1$C_yUh?C|e*WM;
zwEAaJKDEm6uW9vvl<MD6wWkSxoatUF0RTRE^#85N)?XF+4{7B8IVNl`=s!+$pVz;M
zUT2yoPOFWv@19df@7)Hgp<)JXrdB-jle?`_vxTc9T#_s6b&+w?2nKaIBAT(adF*eS
zPDYm)oFbx@D;;i*ZBfJh=ClA{UFgtYzujdQENoM-lrGDV3^~LylcdMmB`af9H7DYF
zcxtchRSoXW^GgSG-s8IVTgS&J%vYWQil=TuXn&8*J#c(0U`>I8lx_0dD9k)H3LCH_
z>|$v{|AkS;lW`qY%j_m^a3Qd}K)1mpI^zpY$}7ff3RhNJQKlEqS#tcFPt%z4_f49i
zmW1H9_s7P{#4y=wbEUnx@`~fZm&vkg8_m9?XgUV6B~}Y=&&|+U9|Cg@PRgRT?+53H
z&UTJ+hIdFD0Km8UOvnSMd=YjpYp0pR8>dnZC9H^~(YBcjE{<{nY`+7ItxF$4P2ANc
zOB=Y<d#f_AY=zwJ^i;z{6%+LkBtoy8n`%m4oazfNRvc|q_PSG+;xneoY#*R&o9*;s
z-l^VNkS4$wY-4uc&*tfQNOdVlrh`SirAHnnSX8-u=$6E5Z9zlcX(=f>UiPd+XM=%U
zWft5%Cf{$;rQ?LtHXz>!#x(3CwJzBe-3ll(aGM_ljIY<10o5_PjmQfBGMZ)d+m(KE
zWcv8y9WDpVU<(WmP-qW`>VmI!j|+zl(nz~Vk4DRliYaSRQ|UDmwN>KNoc?#QcPR8N
z#cO&la(i+8<Em;IZrBX(hsmRR6ZlH0VPW4&#zJ2WY{3`=ULXVJa!x;}#Ht(N8ERI}
zS;dKzFJ7cTi|x)3P%Ihy(=jNXXFb*PE-vizJUW?Y=ecCON5BhVAay0Rw+~cRY0T(r
zm?DrmiG5ivY{(Zm4)RyYot#+((KgLAb&I*0iv^=@yKk=s2bR~-$fk*;vB9^KBEK+5
z+?dzziP9Q!JGF$1$zCB4p<1tWBw1*G%C9GY|2z!+=-bi~=7A3VgVejamXCaG6+&vA
z)11^8*5Q_Ty(0;y!_(T`{88s;o^+x!**jOO8<prG+V=hTU<7a!{~iUqKoP-`FKyA;
zqbJ8Zpdp}i#5I5*np(1u6Y|MtxyT}hN{qdpUYr5M817ujQW;TZvOTRO%FPXD%P^6%
zVH9Zu+UfKTOqx<^>PI&LWCKVl&k`Ch(Mi;F1uuofI1+{AGGNatN}PP1%+kF1o^g^J
zA#(Q@hiIc^cVT@2*9e`^r;UEvaNCr0<pYW@RB3H4V9o9Wd+Ue^4%#6~+f6=--IoCS
zOI4r%VH%7}me*rbJVbbag`l@tU<K5k^BoSZ#pYnDVT{l}DuS4T2R2LN1T31%AqF7E
zuO44>QD7|3TAgFRY{_y;Dn_X9=B!<|t6`>H^KaC{hLp!=itpEw{b(5O-UHXc8$V1b
z7KCWaROcGiANO_u-z`{m$)_K{WE&41L13vZ(NNQZLX49@B$~WE<s5^;dh$Xo6QbGV
zmdortKZ-$QL{<mXN+daC7zr&0Ic%nqU0jzwpACH%ork&n@-P`9)@#~8W!L?sP(iMD
z-s0(3&WKAUvJ5Q^>R4jaGo@!FgK2HK?icuZIjN5UPc;IigN5G}n=f(S?L>?3lR(2c
z#Lr0{kl2#a%VU>o(}x{0n<&Sn$v4XxG24PpR~yi$N}&=$*w5|NVjQhq)xzWnxcPvN
zk~AEd_gh4}M+?Zh;={p4B>R}rdL|tRzS_)ufr~AR$*NJERBc4PR3?&l^c<zfPUjyh
zB1p8!OrqM2a!HxmWtyye;MBkGWFQQV8!u7t3^o*O8KvLJs=;ZJx0!r~mN$X?Lgqp=
zX}5F8YiT%SByoFK>oY^>PQLGrbL_#PW2E1?vujo8)ge%yE_RIK;29aG;Ox4fm2Dca
z1|+VmzI?NQO7qM)X0gyYc(gx}{Jrg<xJgT>1p1=oxHjov;?!VjMrhrD<WVv#2W%ht
zdxddSi7@x85cmqz9sW4vunKJbHutH9wCqZcLQNVsl}Mgrx24DvP>!E`i9|j?&t#c<
zDWD3sxE#=8Wuy176)mla#<q>$vTmUJ`_AvWD}pjic=D>5REmRA1ev9ZiNYvM08xU5
z0h?<;ZcNk#Q;ZTbvKvjh3_gDL^-z|B!J^z(^jOTfFZ;e#tUbO_G;3TqvoU?rAi2_!
z(2yd~Wpk@d^5f?(D!~FR0RZyRS98a?1`g=M#cm*Vb`k{KOnH88m?l}x>o`$+I6?2<
zWW8WInE{px#|V^kfJ6>qwu(h&tzaNSR1mFnz||F8mW5)azh-r@RfQVH^J<7%&DXlb
zNlU`6C<E}>p~UUYg8JxNS?9t_L?DItP%8SQ(%XuRtGN*V97T0HAGR0azfJo}7U<FT
ztM3Gg8|&i2hi6LK6Id+GN(lpIZc82>raCB}PxAOhAYYEgO9vG_>+GC9))gVrN9%hs
ztl8`b#ULD}2BVSSDy|94tsby=V*V7xHoGI!i;F2D&5SyKB?xII>S{b5Jja${p4#%B
z$|=Y@)18ZPSx#v2?rP^|>gPl4*L_pBL{5=&T8Ng+so{_z^uvZgzVd1!nqE4mr)EKe
z9L&meG+-ySC3Z|j%yFgO^uBEC+$1Q9F+|fC$<kUC-G=N1Dax66KNRMt^dDblC4eL!
z7o0(|JBiJ2M9@?rm~H5%-<1{4+Zwd5c$RUMnRgRZ=N3!1B;dp`wka~ERQFgP)!2D~
zEECyyk2gW*B;qjy1E_72fd*YAZQVPmR@`ODWanr@;AgyC``M7aNDQBJtT|^l(beoa
z^N=X}-75Ht6}XxynBXav6Y_6^YPf-f7zGTMs%}MQwW09dLgHAkap1THG0%0|Wb&6x
zZ`e`|8fLV})u{Pi-M??A!nRYx2Ey&j;KZI)>&hvbS-IQLh0n>h>6VuyC1zSWc+2rk
zrdxOPiD|z|-Kz^}ACEJ51!~dV9dXF=?v7~G8zWQoQ^b@@(KG#|O3f4f9?Z#(CXux$
zK%uXC!3b3tJ1@6?AXVChT(MZkMUUA=B7%xsA#RfQF@=HTyXgU$i#+m{>7W{v$;(VN
z(jNR}9SHUcp%Qw~cO~24a(K<@s4KnY^a8FE!o9SD5|o=`PWtg=*+Q3wm<|UT@}wI?
zS*M&wvJ|7X))U|-6UXHzA2ZphZOS=h1!5c@TRG)2DGOgp(()Nm{8}}ysJ+{j*!MW1
z;KLISrVJt}C$J#$(4_*uToJa(SQRt=d_iQ2u`*v(O;h3Bt7I>Bu*D3her*717)pg)
z9MG?n@bkP}{uEZ+Wkil#(?(5conO$2$@kCCqa_@5q9|sTschjE88S*XP7~G4P@GP9
z=n_WIOJ$tSvFHo|?4OU6eI+0J`d#R@6k^F8XhW6ser>qE!3Il?K(~04AZEcY`7?lF
zL$9eILeGy>7<<JhiHK-rV^t+ycMGIY06vGXK}e~sMUWYB1ky{_H5r%|7zjBODu6Qv
zy+`JtFp>`=_rR**=#2)!RTJ%OdFr_ALE~6Gz=fxC0G$lMG;%@p#u_p40CtD(GEbxl
z>N;}jpSkm~&32EXr28>>lkm~eqPL8XW5ht~Bw?H$S=d^;RbP<wS<ls=j@9iR$R64c
zT(4c<NZj1GQ>a90@_@^*`jGpQD5jk-@SxIq#M+o~yGIY%1;yiuP4a2lQy8I7n?N0@
zRq2%tVM!2O^q0oK0)z8#4RA7cg1>ALWIPoi<`G%No4V1kmFNT-3>Nb2Juky(*|(QN
zrB|H`Plaz^)Xwga1z50m?^1IH?aA#P<$-9TPM6_Vfo=mI13OsgBn28kAA}CB$>j@1
z>dlwVdp+^K(o#aIJ*~tH0m&v0LlhFgVDA{g<i)7x<tHgh$Q(%(UZlqr<`j|55v68r
zU6DdJVY$x^05M5sJRbVa2JYmD&(~s9gz`nf5sr{6ixM9mXex;SK%f&}5-#@AmGvBr
zPUXUj-3v8Hpn=O0%*o)Aav(`L%%r;@EvQWC2B%}MWF&f(g5t1?@8bx@Nb~y5;gYG3
zP&Lw4LK@3hjIbzN!=%P>ngf$<b^hjq4Yt%y71tQM2CHyh1j>(?_p#ZS?kZ9D8vlYY
z$9`MfS`hV+XSe_){7`y(2G^~ivt5*ADI4%!>H7HExOoc*Dnpc?121A_Bi1`C3CniK
z+_xm8p0TMxio0fMhbck8tKkaVA^J@jJ1$mA$%e@Qiu1hOjvYLgFbHu;rBGB6LqEa!
zVnUQ~nhR_@u?JQ{cq9P8P$pD0XH9UtI9XrOL@zOmdfA1<%KYRvt|p+@Bu4WFg^cr8
z$3hsD?hxgniJ*A&kOz{^UcXGmX3cN$F#)4l<zTuj2EuDkZQ)ft)+~o2Nz&JeVD12z
z=ph^@N5~gO<wDES6vQRoQmqQu>kxv#5p0`@8M}_e+A0OJoO8q`zAL`F>mm`SAe~jC
z$uDYkctENF@0!1}+TpkePT9YY+xP{G)l;w57#SXJOfQPpbai;|TH<>m)5#u?5rf0V
zGO<Sj(<hV9EFJ5uNP*)<4Cbj{{s589e*#%K(5VNufdgVNHhEY9__a5?6^U1bJPWx9
zYD#e5k~|Yl5v;ZV?w2f?;Q>Q+O!cig8CO#aJFX0^mmx$DpB(;1uq`y@K@aR^2w|^h
z(mpXG&m8oJ*npWPml`b_2puCP+Ji!!RtVklKD#^%gI(=p^~@r-;u-@KOpR;%=^z1S
z@S}6fC~k&{v)z}t%khy6;6;htB@nxv82f<pbb5ov&7VWO`EN&h`V3w&fCiftd|NkD
zal=0`Ux;*<s<61}LZOa=8xbmT?#cX(zI5^jiNR;SG6D%u+_tDJQwy0mO7WnLPz$#!
z`nn&9VfrzHQz|QQe)$$djS1^fdqcA5R`nhZ+z;%aOw<dSPj8+f1&@53O~E>Gbes^D
z=NdBOIpP|~atOn;5L9|Dn_O4zg~CvmkF4gA+bQm+F(;XMz>}>$QyH8SRiHVzhnSvE
zjW5bnCjjG7fi-o!KXR2VO5b)b|9UdvMKKAdxm8()B@X()!|S^fl0^Yh2a2+Iexf|L
znspwjK2u-rZ6o~ddg!MHV~ov41ovQaa;((v{4Jnb|5uCU@w>Yaep0TQ%<ZjK@3zj-
z2+Gl340eq8)a>)a1et(0(hcDyGguQf$@Whjv#$3UF#sUUE9{;?(rSlxsLp4A8pNvK
zPf7f8y!Ny+`#31}k{RA+Mv*V}ZWzb)sC#2+{BeleSwAUJ6K!9Yfu%-MGGM)dvlU{T
zWTzlpgF>J#=&J9SiM7S(sLR6ahh2NOWSjSE+_7knuziWahfBm+e@og4Actq&4ksgx
zl`P5lYMrTHVQPlkiaBd{*zq<{GL1n5FAtuJ_bdTCd2do|{!m5I$S~B0ii3`D;*KYI
zq;w1N*aisE$KqH1R%Y|9s?Wo?F9t7s`fj8)z_I_MUDO(uxKqv%HRpO%F$Zk}`Y6mL
zEXQ!DWA(O3bfXI#W}b>&As1rQsIRUj9q;Z=s&D%qsX7R>0nbs1*#bdWtDe9TzurSU
zD^Luq+EVIeA!=j^!q-z+ek@vt+9*EaPFdy=DSB;Y=MYG2IDrglk+-cH@4LI840{5U
zddZc#3@zspJh}|{8q3;<`D+a3IkYmY6dEUxtdr)=0Bt4&7>)F^7a7fk)pZ8jmSD!M
zQ3q3B_e3snm*3O#C<ATOKlM3>^dRgMuJ7gGK2lp)Ppy=iA+O#mtEpP%WRPO_;uFT=
z^<T5HMf?IsSNhMy)RjwUX1T*r3#yv%T501(OcVs<9Jp79tQ_oS-gx7qeQRW%+TQhc
zcF;qTZ*7O#@tV7b^fXYcO*8Pg89Yg>Z-w94w{59uwhM!kQJP`|t?5FergJN;>k#1i
z(2ym2(AdPbg;hM-z0famQr{$4D=zd|5f=)|n}n(!Z|RL}n?0V7EwXi5#Z_{Iw64g$
z5<oINy*kl9RmU*b5^y9q>!eEWh58pHazG-dB-idK*ob35FX=s;+0<AjOR=v09Nyh{
z(z@iH-u|5`HSg;S*qkjS?{3&Me8-#Iyw$qqc>2KQz2w(tFqnt==uA?DHZHSogqNb5
zZGCgnNa$E0GJx5adba%oYupl0FU9mC3UEns>*TKcq{|;YSyJD!eyty2!O#t%&}Nq-
ze_fFprfaWZhWw%4h+pr5sMu4<Avnlubh-c)j@D5d*N~$N_w?mwMn=`<nrDNZISY2A
zHg*SlXS?g`vfuNArTg2qqMiHm+`30w+QycH2w_Ap+6aN$uesPz#~Pz_&LJoW)f(0@
zMy%9yLlZDWw68|0Qrp_$fxuoWY2<-{qE=C{8M3xeN_S+U!Vpv!d9t>gV${NiRQIm&
z?#yE6QL*58dmCgebYk4N#JGX}jsROqsCw+M%tnsy3xd<LPXQbW>3NmhVpIs@QWT5J
zf-E(mQnj_^Uvy;B(h$ocVuE)~aV}Cj1|ENx0B6cHZA>zgbE+GBVH0F#6X$&B4GC4_
zlkZzZY0GO*$Uzu*ZgcM`kC&H;ApyG<-x~CpfPpwlfYlkdq%IeB@^3d7@-*7rcf_9J
zZUtDE7{8X2V4+WVQw@}pO7Xu-O|C2VX(1jJh=W){4(6UJGyL+FG83OBkp)m{OQ=hB
z<RY1Nl%+#=Cwez&b=5WPj6PS<oDf?WDPOk<?`1g#^HTA<+h|~GPF(VJ!8=fp+Kq#8
z(&lBsfwT|{qBe|$b?KbsqCE7{-?iK^E$|zHu<*rUwZDNSYK<EMMx=LWQ;%s~6;TIk
z8MR1l%|tYjiN2wYh{QYyj?tX*WBkF3UvPS&@X3im4gd9+Yrr!T+Y2i~5;aIl#y*ib
zuK-h7?ZgI$rmaTUUIlPDMfcainq^i!=LewPjrN7-I<D{e_Yc#3Fm~a5pcb|AHg}F?
z)VL}VvkqM2{s!Bm{n!r`JFDTHO8Lr+PNJ;Q$N|m3d?36w_Wn}TwXGmI<bA5QP2-p7
z4^r0IJ-Oc{nSw@IdP#Jo{QQIPHAU9?Ne<890jqY$XoQv9(zeM3&Dm)WYMuy+7h+}d
zgGXv7ra*zkP>tCn0$mz?O>2Hkw*s`2k`mhYde<(3FXIZWHW|9aBBMi8>g?rbH^FQ)
zJqioD%B`<+VH2>^t8-AQNagKQ$#Hd_B{iNhO4d0<Vg^*YAoiKVd09-!sFPEQ+mvdU
zwuBfp1G3D(XXV0Yl*eugY7P_*m#r&LRB#;iVOACPnNPuEI4nnH&%hiC%+ZA3vK_nI
zr&8Q}^x20e8Wq;_`5}3Jy6W$8|5l`e!SW8&D=eb(w5ys%o6`6?-+;f&Y_(~`k-NDQ
zrRoO8aOiPN6s}^^I3|Kh+qA5!T*txDv5L63gK&e_()QcGufi*|wOWr^y=D1_5PqqE
zWHbEYHdvl=Sbz?gH}U9I6yP;>S3a@nP?B)9n>o5m`30TUGM;&eMa4m`J2;WBL>W~P
z*zOn#^bg&6tQo6${MljU)<}P!vu4>*dKoYmJSQ(L*XF=O5q`K>8V+pT+a<TlFV(V@
zlUxg^MWbaP7wRl;DJCEc0o1N)r15*tW_ZegKP7y(Vi8Tu9T{F!*WJD)fBSCP(oEug
zEF@wlC!d4zRcl`c2nYtxNVD1lu+Tn6(tksCR#&HKi3^+9ufH5NojQ!bO7^hF7KpCZ
z`&wXjoJS%4HRhImP8<*>sMN-9!8h5`@&fj*L{PnhpH#Lx;?XZ}QinGldv*)K*S<l}
z9}>I}0Xelg#};1?+Xi|mLVkW)=Do?_zAUgAV+9Hh-C6O_8>YTVbz0+m^DCB|s}ra?
z;VR^Ja?3ipnTTaH!3P<<dSj+TWRqogstG!tUobvjo5VZk?@C+o0S6ls?yl+pE$4yk
z6~gIf=`%}da3jiuyQ#H|NwuRo!f}kTTNkevPqf0jqyjLlo6APIsihN{yd9|sI8nl)
z2DiiqSZ1a+C`r}*TlDxBuelwr6n~5_m{`CkQWUV8(hjPcE*+V0X`@vP?Wg<2bIR4{
zmNp^Jbz|TO2yY0D9w)OH=<+W`+UV~2sGF8aC5-iP(j-OLnhm<49DKik;$JNLDcodr
z*7<h&)&Y*o%@cVK#TRtkKKXF82wm+OQV;dusEhbR+D!|uvfw<X6T?zETN{6QB}T!}
z$|<DwfHcbBbbTo%7JBTY&2zUVGc<n2NizHB67-_AKEJZ&Kpm%C6r*T0y%6xN*PI(<
zSK(?RY6kkG6d@0>h!&a}a|y<M3*cp-4G|^;%4Lw99ZO1S7buKZknQ;-P1JIUIb8&e
zV0kdYwvz6uy%zl<l(x}mXLxY6?&ssrhC(Z$vch&+TV44s#wCeo1R16Q5!xo30uJB%
zK;DjU0_<fss^1r4akT?;j0j`CL(xWw2W2t95M^@IKHq|7VKmNCd-e|EHI<`~woy1e
zjgLswpbQH4NDjp|LbsgyEjVi0HgruAJGZDxT`|XF3l7y&(8w5Csc=gS_pq%QHpzmv
zuSJ+9acO=vWm0noB`OR|=*IiVXW4Ns<EoXFvnFh%-(o;KcFn({fg=9O3lILqL5&mo
z?t|K_Bkyj_^LqytefjaH+vVL!)oa^!%yw%D0e+WGo<m&Im=s%UlFEC$kKp}62FL7G
z_tT_fKm1WdO<(S*|Em+XFgidi$*3Rk0Ur&N-o!iC#>=MLZ<>lXmaLw_@^r{X)9W(l
zIBk!3k_ddG2oadUl}H9~WHfno!8W{SCguocrgpaoRiYcZN@LRWFF#X8-)K5&tNjM`
z_o`I2e_eFB8hT)Xxt}fwg1o>{)l96wtR*dp0ebs26(Sm-cC7KfmDiK&8A-SSiFVBk
zip>NiRE$Ib{%YR^SbkjG?|AE`6OT_7ZBQ8r;=YU`(3Y_`84o3=DdT@7cfcXAsS1Q7
zGEkFDw7a$?>gpSsO;3ca#yTWV@wv#IrXxVSaTnJM%TkzIU{%-AdGD*kiiel2j;*~h
zN=cU6=}5*>x^YpGnkmrN?QmHOHMHmM+KF7H2-DcuWOhe?<S)Aj*#XA5Uy|Y)A@q1H
zlJ_etyYBW9;|JT4uvmUf9?IORHbmRfB4e@7;jfcRRw;97z0#0u*23IY41`iF6?5Kf
zWZ30L!#FygV4us0sys-|^A}+{RdWxc&^JdL`kFb!68Xy6Sxr=SD44oagI;4iEBX^o
z6qVa&m$mBJL%y=nIeo)xU-Q<x-SAzyPkz$33oAoz*Nd3>%=A(pU)~ghy+TWATBZ1;
z&Tv2iG~;?<$;1_!+Tgqz=O?EuiuEpo@F|%V%pwZnw=T|<gNk}Z>s4PwMqen;Bl!G%
z_{=t!UpbW-Jq)#0?V>+wB%#-aNh{s^hhX$PDn?On*CV8AMC-4;eSW|Sv=)z_mYbh1
z5U6G$Z;eLk3b<`V2c6II+xk4Tus^MNWb7c4PV~XmInu4UH9VU=9Nv`~J<MJ8d2!(E
zPVK6%<ip(6kVnm7cj6hu&-liLwWlkg9&W3SN(UCV;#-T%c(E$iL}u;l?m^`u+WpX@
zlHbfQBTSytkRSk&B;C<%=1k8JZ-faGC5|b6Ib1GIvzJqdaF+=c&hB4a2Z&#<!PXTI
zORHk(5`HQVy#>L`%XgUzGsR<=6kH!HBgh;%>f>t?zI}-Ojr3c>XwtaMWX%x~dW3ls
zdw`xDFXPyaRtWY$PoGw(FLe_6C{}WwrTu!)Nd5qd%7ho`##=%=`#@_m5f_VtvGk&H
z0MU;p<=DONxHT@^Ibl*$;du<SKoGQpq<BBpYO^rjvy4LR9=db(CY}#V_l87h$mFp&
zh{q6p^-wWPIR1haM;ER*4EpS?wY61<JyI2G(jg0a88|q>?f_EVlz?&?b0?EO?+bbm
zS#Gf_x_=A~cnd3{^Pq~3HLZ&W5O?YrK^G@6pGg3wD^&|0-6890p*eOXWue-Sd1lwP
zY5l7Pf+F-fo$jTxzG8A!r1^P7KFKqlFHhs!460nc9}i~%v&yJwD0lDk#2r+*f8@jX
zs&m!U>|9vW0_-dd=&OkP(By@knBQqR8p>}QhlxfH>ChBat_HGnc3O6H6#cp<3yYne
z5Ittr&ugWA?urR2eVDC~>~IRFROm#5j?kl0pmSIy9|*AQGriWmzMm6++ZW>?&?2^q
z<C0kLs=yUk7hzNgZNViu>gNcrhRiVU^Lo)uirBOZp=b9*9&jTK(7=8T)0!Z`FQz^1
zqB7pu%7-r!dq{N~!ft`336e@u9D*lGs~3-+Gg@w*azBn)dQwaD3Wy9cyRHLEU(~KY
zD4_1dRsVf`h1z-gY92w`kr@ItVcd8L6JzNNRK)G}s#VMOgmK#14NP+CZ8{0U@3?ED
zV(!-7fhU$Sr*;`?acesc1^xYqX>1;IvIVS`U9u?hewKe*NLdRTfjP`<m$rtmHUfs!
zf|M$d=$Ck?<USJu7ZQU+{!rgW@+xTzT1@A3)KK2hUitnw3BD<}Cu=G#tlkeDS|K~t
z1P)i=#_xs##;|CPi(yAP(?;Pf>X&nEtzCTG^PSnnF-Z-lt7@7++pHL-gsB;W;h=rB
zNsr?L@pnEP$bBC5`YvZ{>_h-noA?Y+L(6VF)VHeOo^JpzEhxE17|g)7uJqN3O}yMS
zVJ+Z-@(vMx_Uai1#MBaY>V23vc7V%pZndgd-IY>~Lcj`c9$q>um18A_wS4^UDfX4I
z8;9%?g!N_QyqO+7imWUhio>WYb15xA#eP4{)Cb6Z!x)xe$QxTll~=ywcJg>Vwrd`l
zLg@PyotarX&mTWH3J`RU_D4a6#~JX)+#|Ag^S(nE@`%sxA4z&+G@198J6KILu9IdO
zMB`qAC4D3=s$#uO+ZFlz?Xa?sCKNQN;(DY0u^g9MiLYV1CUA@QdfHNt;`Naq)g)|q
zDa)frL9PCgzh~kLPuy#%NUsZBH!86_w!ZciK5%98^M-7Oo!NeWsHDPd5KO&I7bO)0
zCaosTOz_iEm?q2%T8jwcf!yb<LXx4!Q~RcU=hvnU!@d)EwQr$E#s+<)x|ojG(*pq0
z%2A*0cPh226O(icdugFkN{ZKIMO-fY+@8;lKBrSeX^m*rO*~GwiWu_C7Ki)oEBQhE
z<HDeL^v|1`cmfKwtr#m0S}O?wN$Bm|rm4i8lynb-ev{nCl&*aE&L$Kmz}20C+QTv{
zlaAaI!s;9;<?9ScK4xx_D~b6`sbesjBMw^io6%(voaGtxM`=~Uh;^x3jyL~Mk47?I
ztV1?BbT2W-;jbm$eZ5}wVVvp;OJ%X@U|4t~ICacPB+#-?x3#jUp7gJdR<vq8z|71h
z?Qt|ujFM<N-1lEphgSK|<qZz)(YT6qnTj?Y=lxGDR!SRl@-Wv_*tL@J%ex)ozu|g9
z;&{lp&I!9;nm!L@vODE8z-6|0S={NwpFU>YsmwRR33{vv=hmz0wt?q9{aj>@;;+#5
zQ0IaknAyj5MJlDt^g7^|nIUYp(5_X7s>L$vCCy|e!!<dv1##VsgM<Zt0Uu4!(pEiZ
zr&fp#k&cZdESc8tPf^v1uk7Yx)*4RT<A7UY*JdvAi*$}Mn1o?Rwm~{P#x`)_wli(e
z0)W%N_09~Xb?g%u*2~*F2U{<sqe5(~O&<z*Q9SAjTW@e)7()g#>a%z1c|w3wCb;74
z1w6u&>UcPxJLqKT!mp8S94L_!hLDXlP~#EJ>rbJCRe!R?1`(jNf|<`XNGPW$2(%A>
z)RQeApD(l-q%k89jO5#qx3JT$$fDip3bYnQ=>*Wh>G#{P^58`X_h0E&Wd$DA17dQ#
zp7WxHgdFi}cNl`zdQi!_{E`r7JOx>4bD7;M_HcFzUta4I8$o6`^&ROZ!(!d79??k}
z%#Ets=}@G^`=pU50Kly7w_cPKIc|&-Y4y`l*ug9dJ@%l&4?{Z>!Z&Yo2kRjD4kx*t
zV)wl1x$zXLYlRyBYf`kCyghDDo32jaTXI?`CPpR!M_cpEo!Rb=@cI3%-6vZ6sdmX=
z!+X-uuk{36%1<VSzh-MlAYnY5#nIL)?8n{TUz+>wWVr)6J++U{BkQ`xMy`s4jk1Lg
z%V(_#3mJbfFc{)iVz==jM?s`GoIBeTO50Z}eZyTo^1Z>MNMxiTK)k3wsROTV<!ogE
zk4e=KJax(i_<h<zwE4>Jc2IVbQwCKuo`t6Na#s?4{v%p;Dj$3w136Kv>(cBtUH-@W
zZ^)2I_>s=!ktJJVZaQ{+P?mg`p-uyqID6KM#!>kVGtbzhYtvX9vvK!*>N)r}l_vf3
zT52IK&$f+<$YfOe*!)}9iWKB+%~H|vnsg&Xj@>BfMj1bQXn(OFAs``$m*9r&;-v9;
z><8vE8OMd@ht37cA>@2+ODEQ;y&OIJTkFy-ovCbwi4|_kal$-+hjc$nksOAuO2KF^
z4h9mhaT}a~-DB&fn+IO@xf|RC-k(+^ocl&b_w<$*`Wqyf5j1iIa6b`$7P81MJ>`^2
zm%+G^oT|(h=N`A(X-eG<3l5*0LdL2>LRyaHhtPeYr><#Tv=&AdzL(Ir*&N!R>K7U{
zF0`lb?c**d6yAf04Zn^EZ@GRUTrv`6i)~URysG736D-f^BVC%&@h`TijS#bh^9Ijk
za`~ds?e*+JMp?)LvL|iCx9%OlSAD@W7j6lf5dxicA=4e81xTJ~$IulWu{lBoOX{Ja
z6QPB3BB`SC?tdq(_roOYV%O~PCE*rD$x3^9ePt!jINNGV5{+b(_%1c>*Y8@l*kka>
zr9_uBXlV+Y&4HKD@<1vUC!vv~Yclbcceyg{QD)O*1^z~<=dcBHjj+2rY~usMM}iir
zxtOtQRZ`pV{HR+b%wk`kyG-G&fpq3uYWLnoq!4Fv6dsuMj=0sFT~zJ#eIMZHQVha#
zwYS@2bpqzO!V|w=*{WC$4n4|3cshIfleor`CdD4>4b{lFTVC&&pR_yz@x=vb5&(ct
zve_TByg$>>K52QZ{~9gtPnCUt!$|vg<mCOi|MASnEResOMW<_EU}@;|Nz<eG<M!|O
zfcs;50_g|a@;-F%Z#$%CC{0DBu_ATeD641y$%(bjo(GUAu9i45m7OUak7wq7LH~i!
zG$_<43MP2d^{@;E<lpiG7UH7lwew*ERYg(Ua2lCQ#2G;$ndylH2bAFuIYCUx<PJVe
zzprKmNp5C=S;u2IOHMHha}Yw&ob;u@Kz?&5L1%WiTRK43_y^f<YE1s0!>`59y!*Gi
z!^R;EveF6}s(e8JHtsIQ>4vAzpeORwH3W7}6`?SdClU9q9U~s_n6tt}84$CexZno4
z=HAhT=_o>_NELWP91_9VsF=-aehbs3zhsuZLjCw_TT<e3rQ^~i1~QtMzcp2|3qCic
zJLKFQe{CNG^sos)#xjrKhUx6P`>HT$3M$=dmD6FpzL$>tWxljQQp~Di#TOmcBN14E
ze6(N>396o-_*beL>iQls!*pd$ZEXJbZA`vOy}GiC&1ikkfON+yZn@Ae9)ObZdZvZ1
zEpTU8{^m%(#yu&`#%iRSjka?*$kK#;FmhxdH*ygNrVFgO<ZMVxsxE&KD=t{~4L*g%
z@`zK@bd;Bv9`n(H+$G(lrcWS+n)#hJRGe16@rz#>AR!9FeJK_bV*5=2vG01&Tj}%c
z^Qb%BTVH1Vs6ncyB2w9N^l+z8u{Tiqo?N2M``}q<j%p92j5NRPBvJhxj+8T=nY|ga
ztVNsl$_-mIsC)F%f&AOjG?%u7A)U7aEoosKJVjaeP~7URL!W{O;Mm#{SC~u%mTGqS
z_#EAS^IFG@yx@xLi0`+Iy2<{4@fL!PyeL!eB24Qv+SwI9MBryuy#5&)J*1*TD)b|O
z<sZ>~xtsXBqa&z=CMDS{nyq^x6F(<OLz}1<zXM~YTDydki0)Wyq8H)ZcSyrt5(~H8
z%~<pY)-rIw%S>o7rsG=X@fK4fmBGaAY!sW$&<;qXEr=zC(-2=ajiHGipa`Q$C(@ov
z5W+UsO|a_WS1>z59k>o%IjQM%jSrs^Q4WKAY}koTU?f48;d?i05er(4Tyw;|l+m=7
z`69{*8F#;jt;w~X?+lQAW>urZI`#Oh18|;qR($h?KCL%2)cwO;lNaI{YjA=EBM%kq
zQ(fyf&|ceq?sR&bic48&*y7w@M52$2Ah3Cf>2y{m2ZN(62@ur`2u=ov7w6(P_?Z$K
z@knr?y}5!mQQ=5gx=Oi^u6EbrSzp|ZgiqSw5Fb(ZIXTO#LVMq7Ip&O0Hrz=U;J~vB
zo>D5htf}jslFXz6*)}B;Ygb1g3}_o_+tUJAn~AgPWOpuV!X1Gyb(0v2WCf~wuFm<R
z&K^~aS0d4OymG-Gf5S%=%gGIxJOF;fKCIXs>|{ghj2=;8g_Ew8(E+qFWmoGFhimt@
z*Mmq~s}us~RrmY3h5G4~?{2vUp+EotKE2H!PWjJ%=yQ0&KQFib!wY@XTmSLppSz@g
z%`N{QpJDS!g1>RJ{G^iq<#i4A4`!GDA@@J_%71OSjnK<v9Noce{15zcM|@9Y8tvD>
z3ztw;ZN~?lm><eqrwFhW^Y`=OZe<h(-4IIQ5kKZYEFRW5n2Df#DrZY65QcH04zhk%
zlXm7J?Xc?#<~(-lH2QZibGRW3I{?L#gf+K=pQw%eG{{THbE9r7aPwvv+t<hc@lEv^
z;JawfBcbRHm5XaD^&?nO30#t?QRqq57PPz){ZLlcE}8gFar@9xqY<R-NVz8B2t75v
zd&w;ZV;l^r@ReOfXiA052P=f6PHhof0epT?Y*q~QMPp9<w;A*=lh^?Q>i(!a`^W$~
zXtOWWkKlOsI?c9)0TIjzq&`AC{#I|#Glzw5og_W`z!<?!yh*w$ro}VQo`$W7=Avc3
zodLW3O7;#;wnH%3i1U3<QMB>{6dMcdjRif=?dLjJ{z#>kSiyP-@EYob#zSzC{;8XU
z$a(w58tLr2UBfOVhCOsmrWAhrHs1}t;O$-el78p*nlO_XyKaXUYG$s8*!Z#xeDf>k
zj=+G>WUjl)F6|08CvD>ReGW5&(bA64jI^F$-GY09hC}Zoz@-CbBN<hzA#}TW=WzgK
z1EHdoj$<`#AA>B>=55yXlGu&!ZSwar--tfDEj3{kX|JqjY4o38?h#KprEovKn|B_c
zDcL4}KXMSO!kma_#0tb=DM4scG_ieMEVq#=;|{X4W!FuS_oi8hxOq+NmZTQ!Y|})n
z*r;)Lvcoi+vQBnXC)MOuIT-j6r`RjmZ$?;M)kIiB)6<Z2a<7TERCg)KagA4V=ai`Z
zY0i<;xGdj43R*s4`iD9H8Ni?B%=u4qtUn?7pP2LCVfo+Cp#SXN>OM*+>HfC#;ZNJ}
z$L*hd+FxrU|A$1YK|#}Mjuy!ytNvZb0nbN)RMG^k`8$y5g~(+$@JHm_%r~mE_+f0p
z_k6(`lEHk&91<iLf~dI}WjEO&mFoEmvm%_oj!1MUO$}<Yu(6i8qsXYSwOxejSFKWW
zKG<tVJMWv`ni<~%$O4dKS<j+}-XM%ZB&BGy>}vH*SwrMcHx2S5UUuK|LgX!kH56X3
zqFM*35fuRZ1@<1|uS5y{TQ}1kPX%rWS!1U)mU`2P3{515tty9r^F0p3negAu!3iVa
zr&V@!cRG|FbTUIzJX%`#Hap)QxziS16`3<jWCF7(7q!da1F`!<TEx`WnS>f*2ZHHX
zX|;f@7CV=&)8)ns^cxvrL>tY|a}64T!kX~KOF*C;CDC_l@yWtc{Hpf7+7Fk5>Rc0O
zJz?!nV8x(`Zm4LkqiP~XX{*pjZ(&u5S^1TbtBLdCJbsYvRuG%S>;?EtkQWQuuBYsB
z{IDuEZSI#c_1%al=KonYuyZ$GrO+9cMi?kh&4hYst1x>TJpPQjzf*KYn+fX(E8m0Z
z1r(Iw=eF6AWm&Z?f8fZ0+llUA&2d3B55UDHAuIz+DDN!Ty3a;!TxXGbEvbcMhm_P*
z7MBH)v>q~4AhWQ}z*Ss2gjtORm|*sE!Um3+)nzWk63nyd&1&EU&s%4X@AB8x^gTR^
zKaZuf*o`xba1VP&D53rPR0;SM+^2cA)POa8{V>l@(EVYae}?1#);#|Xng8bIDgLor
zjQ_HES{v&BSK-<JV4)VW9OiwrUpHPUE$g6rHqJ=uA;|5Ae^uDa<kx+(&d19T6&v=d
zdWnU&!y{_GaLAh9H>2tSh8^r;G<#BTI;OJB77%uezw{qXh3dc1_^CN&K@vU?{-SWi
zPMs?<fq^S$)-HOUnvJq#I@rgEeA8ScZr@wVQ0p9kYvoN`z1~9zWD<iXbHmi8_g!%p
z;dfWVhLQ*eF3?tZ!sf}aU>}NbvifC=LxEY9Ok`MA_^Fx!;TPWA%LQvWp*E~eWercT
zJqGeXH^?um1Kk9q(AJFvbT<5;nOsLy5uT>P8c^;vqQnT0?2K<vGc|lg(mOPQRE`lx
zY7qLqNrQlwo_7)`w{h{~IO40aH*H_;4*mjASItRyI6we^&u#zb0Ok2##1FfFpqqa~
zjFK1*sr_e42w?uPS)Vnc|E+q?&cW7D-^$X`P~V=$O4q^O<Uc<D97O)K6JLMvn|vPF
zm7@>;wv5j3KT&$~Unq_DM`4er-Vg&9WM2gmhMY|y0eOEIy$}Y+?{V5Z$**M5hsd;M
zek+jucswC*VFQQG&Yt5BW@}#gwcS>89=WN87DfNMcvdj_+|g|Qafc}(ZdxE*Zw~0=
z0Z1az3`80AurCwk5-`-Zwf_NZ_IKZqgdewax_B4Br0*2%<p)t4$XmWGQSXC-Bh79m
zHP*meT^chgYX=K06zwvLPOpr$mC<*300;q_V5Eli;#+R3Z$+5qz30cRWssyxHPsWF
z{;M)$to#hD<1tjWsftT0b#eYK`kAaE<8ANLk<BQ{)Yt?e{=Sn1?|K@-^8G-{sjaco
zX;s``04`Xj4B|Y|V%T(zJSvB%<}?4&F-j=FiWmC>v!81C1G9ftQ1yqV`2Hzo|6Wtn
z+JDj5|BbHxCDhtrfAxFBL<<Ir#K-58ArTpZ#!KXt?+yNnDmgi|AWlU#EV@8RB}pYV
zPB}6zZb&xILR(E+&s;}a!zd}m+~7D#HaaEQVDu>=_?I9<D**iunLg$E#}fbeIMUJo
z>yXs9v-?ZegZ}}J74otlY0X#9i>hiR{2oSQNmEAa2Jn0?-{`=va3*k(9-<Q(t4pw-
zX$=R*NUA6(1RoC8@AI~{i#85aABs5@H9Kj~i7zo96kfP+MvQxN#(bWHQNQ3(459XQ
z;+rOFfd#DMY7*a&aF8L;X^b7%?s8+eI=$GIbG>>J)N0N7Q2@e043TD4pQ|@s&9qkz
z;@!ZQGPCXbjy5=I^j%5+%zgO<{aE;h8lLW~{>+ZH7W^jME_e15!tXTXerD9?>Q)?t
zvN4UBF)icTv#o#&mb5*`A+u=5w$^^ghn4^fN(XpD1qy|R`Qx&{6vbI&9qtSy2rK$Y
z8mQo<9!G{P<%w4EG8P>IZ29(X2<1w#<DkO{d%~o58l}{<wPcA2L1%S4VLKGdgI?Db
zEmjFRGwecI5A%VUNnrzF5V?&@GiPKv2CHN+?@6a!UweCC^&_jJ;>{O!BJY1ek4(H`
zz`<4`?wtGHqK*)55id7`b8B|g9NYLJLy8SO?G-*YdbX68Leb+?EzSkyORPAlnNyy7
z{UpYhsyAUms(-F$P8sp$m9N_Ddw|U<>@V?7oU6&E;|DTXTi_WLKNhm_8aUg&c8{!{
zgnI1G=rhQ&+SFFx7?8w2UEE$}toe$Mq<%j9d!O(VW;g2@hzB2r^$Dhb46{!Fa{aFi
z>u(YF|7W8LLIwa}_}7i<uP3HYtJ2UD{YOr|K}FqahZX6=s#w#Clvd&!S4qVPXA;kp
zI68`_gBHvbQ~IMNA~G5>a$cU<9CyBc{~|+2=<wyLMZ42Zf~FIs05x384Y8+zr)Y$6
zQS)*4^prwOVRSeb3c?toNLgzd6I|LJw#nBH<5=KQ%NXmH{mRgKUY>mWD}C;K!_aUt
zef9hE_?O!us=UlO1yoK#+f?hU83;3O9&sL7MV`<tS%LbWbiT56(2?hdAR{?&x~2do
zfGN3T5MSI;cQ^Tl1o%yU;D?hRc5#v=i_ii021J(ld!}aM+<D%33|nmIAW0<SnM5((
z=kZNr8mr|E61CooAh}E~*ZlJK@}xktH`wNzhDy0bWJFMqkc-c#l}LHOcKXUWE{D$)
zI5i3lNz?N{7faWA{C1bS7bNfRo|<hsJ2nMajv8;?;vEvr&=)~7LD=2(Yga3j>h)r!
zj?rreYDxxAQjuzfXrP@{l?Mv+#yG|c;yf(%_W>#~8~xsqkjG&O(k2~)w1H5Ejw-2+
z)-8Ktb#L+|;~aCgBKI^DBBLZv1Gu*+gejGZfb5I6`M8c`r81;{>AF(0F|Z%B8l+LM
z1sc@3ljVfHr_=P69|(RfMZBn)f^*OMH53-qv*?m2dRXWg*DhU5yf+L4O0rJz+sioc
zI2^a84r}urpBz;K+yYi+=pfjGa(J291?ydbY#IDW7gB=pX7X{Ll(*=2Rgfihq-z8!
zLX}&knJu+^&F1mvRoSxup2HP?1Bt$9vy96UifU383nX~~Ac+g26r)%)IAj5~A=4S9
ziRFsKcU0T1R1e9%WGIrtupE-@Ak^^c^q*$9E=YzdK>)u=2jXwS>8eWEV+kVq+sUH}
zMU{T=hPb%&!1<b}i$GcG<I_^Lz_alYDqj+1zcW9TWqjF2dc%2{ld|Wp2`38g2j5pG
z3laP7Op+403ULuju88r3`30WG;wz;n)#x3ssOC|sCz@PAy4OiWyD}xeIgNQ<9{zKG
z>SZSG&+m;J!_-)UGRz6@T6AW-uc#rwPl)1?#H`j^+m;2#Q1zRT=ZS0~?HSc;2wj8?
zcMHFj_uiDH*$!yh$thgM{8xY7V9yvxREuY1XQWSI*<e@0(f19~46~vl@I#&3puVrH
zQ3{^#XsI1rB?~VM{a@_8b8zO{)-D=b9ouHd=-9Sx+ucFOMu#2S>KGl{wr$(VP1gOs
zz1LpY=bUe^du#8i(^YT1^-J|1zju!D3_SChV;-QYXe?kGRQ%j_F0$m5xY~I>MlYs(
zVr#eo!Bd~uM504)S?1&p8}Ki!?mMya7whqV?pbXCK1<tp5MgqfGss(&Bf)g;s~N82
zvd||2X_<Is1n!Ge?9I|fbCaqSCl5K_uJ?ItH^n(x7IgiLTbtTagL5NN2kTIl!t86~
zJFa_qe|$N(0HBG(JALr<rA@_ozi!s%n*6kxt5-e0XmNi`hCu>@3%1*`;nNSNt)EmH
zy4Qo72Dz2ig4G4^)4t)8^iaK_s)^NcVrtg)66jiX!I&SmNoL9)Ky2!opzotBECN}Q
z&x}y~DNQe>@Fi8tGdYX+hP4q;*RTsO=(yhIFFdY~_v!Lp?*c%JTEk#{d{Al>c2L2-
z6P}+#k|^gAZDz&a`+nwtc4gT)g1TkdJ?uQS6qcyer5R97P%AWz?d-{%Ih1La_XVS{
zbjwI!M$1~w;6}h}Tvv5b`G7TR*#%jm5skJ<K5pYUdB<zbNA{VSKu6IsCO9ZQv~wXc
zh_Z?`716oZH8)K>>bx&UqmNdSB=?E(l_3(z>PjaiRp~2RNxg<IAsGvaT<n?I$?Ini
zkws<HokDFint2_(w=;n6N$Hy?oGIyB`}`h^|2!#i|4T{fcM<#FIV&ao&$^Gd#7k?X
zXZyEukInoK6H{FDFmwk#cEBsz=tQnW^`y-R_rBtX4>*Q%m=ap^;2)k(6B`<4&>h`8
zo|+?}xX0qs9gBz$T<9kb>_ZxapJC;X>{nd$N$g1)I9(h|m^*mxr0UScNG*p2+b=ld
zg4GBBfB-@H>4D23%OM8ms>XBp06t{KiQyX}qO&<(JF%;Jmp~QzcCZKM8i<?{gzb<<
zp!ri?JjQNJ=?tvKekBEWwm*=xYw)<mIo_msI(eH9+WbOCVZ|C=VzwhWk4E#<5{EJY
zLA62N-rJLJ=%mhLIS=xzCKh_V%+PA~9k>3TOe+209_Sa(TGfTweJg0*7xd3P>tE|5
z{%F<z-JGk*UE*)k%nl&_fF1pP!}QyB>A$w(J*W?UnFsd%{hQ%1;Yy3vZ{t2aZdD|2
zg%C6PD9S;hFle2Vtrr32t)p^0Abq^zdl>XW6hEJn_8qK#%CU(x!l!C0XJQ>maS*+z
zRaoetdNQ-R6|=~-8Fv)N^uvu;uleS#TWROBZ<f2D+`k_}7&Gs8%J>7hSuB<%knTd=
z-i=nlAmyTQ;`m2ID5le!3~X$`X|su>K{Dm8qSC#SdZunbZHVA$-!2R8hV4?AS#u?G
z<?MhhX?!}?X?e=>IDq?3@vcwbBt&9~Jv=TNk;+ZIfIM$!FFcwDdrVA+3;+!DK8}_k
z(}@n*!8vYgt9;Jc2kcP<`T}KgjiSiIzM`@e!n>yh0?$a?l?};+(jdB5EM4l1y;=*>
z7{>ivFHqS_7;$bQd0t^B`EZH<463h0hm&GEDhZ=OLy3sFcME!Gz2=s5>Y>U^++5sY
z{u{ekQ=%?@=%sI7Dx4o5$S7Ru1x$t~zq#S}%WBP7;8K_-@68KE#7zVsH>#LS89^U%
z@QXf1!p3yjYRlTQ95qO+?n3~ix5+PgY;A%D;J{8AOt>YESSYq<Rdyul#1>|8;QM~A
zLoO$nQn{aZpYv%SC&D|_grJyZluPZ9bs(jmInN)a)*+4@EL?Izeu#^lw~w2owWfKB
zuQUi9ibMwDR;emtLXJ2FiB;%z=n0=g^K1f5RvX6~eS8HabPPjOMfhL_v;u3n@4{GY
zA$p+;d3<NW;jdA`UTUq^Uc{`5A`!A<X8YY*6To~Q#BT*+g{!Egx0DpBpQY(Moab&h
znRBPBL3qK(-S@UAOy4EL)fR3Jqyal4bEo8k=0fF801b$?sCzA%VSA;~==wH)hUL)#
zgi%Rr7N6Vc=j9G`XLWCyO~SywN-~<oVWjrr{i%p{&@~B&nGOknolAB$wasYt!u3T~
zw)znKf>UT$m*?45Je#twZr_EVk8cIopr0^oYdXx2M}1{Hfn*;tY7J41%&Mgavvbp7
z4#HibU?E8@D4$u!pA&{5T<K6ZMoK=rWEZvFOox;K%5&oI)zdBP1|Cp2{cPPDIB%|-
zG@UBAAF!&y+(PMLI2=L%i)PApyL{e`+-~ClGWCPD1=gIP*}s171R!~(7VSBlZ-`rI
zt(bU8iyr8Z|Ipe$&%o0vw}blXU`oAoiE6R2tr?e2OSf8JPgBYh269&>8UuI}BTvk`
z<M$j<F@m}$VxHBE<!tr(3yp#-x|<#W3;^&B`M-z1Uk8KtZtu^xj(#5%eov$PCNBKD
zMZRBiMwM?(@Bg6L`y2oMPbn0s$Tte5c~?bM>l?3nub7$Y+vOD#D^Y80fXD5@WQA(8
zEVWfue9xz0m*c1v_yktS-Q$<ZiL5$d%_<ru9>k%XCiyCU0QBW!er>pZIwe({vPS9>
z7VG_^VF-mjlN)Vf#d@v6_^FDN@KTC1wj0N^?W+$6N^Tk9%pWATh}p&gN(oK?B=x5}
z!e(HkAuBxINENa-Ql+l<D8Yzb{Q=l%xov?0gEeJI(Z92A|BIuXJ?#QSc8fyO`1rZx
z!W{Tnq&ym)wM~D1qz*S7Sl#FWoRP&LdqZ?*RgbEkq-}YLki+WdMJ#qC85XfeFvU8)
z*5a74`8n8~Fe&B6@DPDo8u84={*qdC(lJPixP3MXa2_P80zB2ci{Yc6<G7!;9@w^-
z4z%M3&F`JbtF93*NplxtbZerwiU1p;H{8XVzZJo!Am3MBlt0tBMy(QCa!)QR-$`R&
zmTqoMlUp4~sUeTjq1SXz*zAHB*OX42RqJCketUd?oZfJi>_pVVD;z88{D8MEhynG=
zjEmhQ;n#S0t`h>`G7I?uw`==sgkZF}^yBmuUu=cg8)>O6kAKyhb6@6JQBq{V@Kw8v
zu1-F&TDW?qw&7KSFL@`*ysT$n$~m3X@*4|10%r00x?7|hZH0Hnwh-`#PFQwhK&FxV
z)=H^<Wrv(sIp-nIUn<#iQ2c1%w_4-f)BX;)U;E%Y;QqBr_IK_G_J49={r}ITrSscD
z2>&yF#mLai@z-JIH_yM~Ykx~C>4yJ~S1(okKPNI%?w*#HZ<kXQK#C*{%!aw{nTZ68
z)|hxcPMFU982`5N1~@`W3-oj6??bCU5tJM<I+7qr84$72crAiH0aT@N4TXqp{R|yX
zN@;VJqXG^?x4>UF27P#Zn+n3c`Ubc#O(p2M(@3}7X!;ewJvDA4E-(x^tViG{v7`CM
zWGwr~^TGV86{4$XhJu}qmg`zZL=>|_jKskw;!-TxV=&;7H1hB=+E1(r-X~zPR!+|L
zn&L+4!UIRl89ooe6N9V<_?cYF{Z4in3;Dl*i-mo9Mj}=~ypF8hoTOjVOH<5~Gbc@A
z8dMmy`wd(k@$Pb(B#U>_CK@LiMyAyfQL|h%nLFG1=lVVcG|G;jpwQ=8#5-R}9_jqb
zD+H2>j)=C^YuK`z*#+$F-Y(<zJ@l(@#D5mPfT$N^Iq{Yeu^IYur0ef9QOV6t(Nd~I
zTYTUXHduUpMMx2|lRC2y^0=xb7KB8i4hwnA9WG_efIl{Mczf2|Sxiwum9bq-V><K=
z0Mq0;@*?`D+>(x+TRmqwQOP9`x9#r7x!uLvS$riJoEN$h`h=ed&WC65m`_ldbM_)5
zba=l2Zf9Ud?F0}2;N8#u9B^{~Tdm`7T<=Z%^qar@6KDK)#$f$hKobAUF!;L;^AB(s
z7tI&hfsgF>3T?8{9a@pE5@NxeHid4$$<&8A0cu`|Y4CJPI3bTUX=u~gln5`nf}`bX
z=BI4R+10n_&|lBDiL(JNm*~)+s2oyd-d0Ury-|dTZVc1G<vr^j88wh2phi)Zg>Yah
z1L4Ih=q;N9$Ofv~6OPSpHcjl~H>QjTktj6tbbf7xWSOY8n6na_CYF-?<rcNm(ah*)
zk(^k9LWq#7qASH$GBR5BTjH58n@j_rrk-?<e3sPJS7`A^F$EEISNWIqnWwP<3sWEF
zbK3U&A3FVw*0+_{tc*)eN0}|^&Obc6@#@?rTD2p|-doLln2p}Ex8VN1+JEkeO8;MY
z;_poI@9d55sZr#w@y6d}!as1uQicCpnEl_v4B~&UFq8kw(fK<U{db1uB+_37&EL_j
ze*n$54KkU{w+*s%9Xl2od@EDE&-(m1aHYoMBQU1q@Ws<m?7@qMw#R+WU=OFabHM`9
zq!g+C;$uwQ+}}?%xyksxz=_*nG+!zESiA-sA1dm!;Z5%M5-YG1EkgIP4YED&`ST%n
zydBi<;XvX{5Y+o9HrfgAJpdV)@FAC$>+SOFwwK$)@g0$pj5Nl{>7NAlsdnk(C`nwY
zJENv1QHGc;A%0*;*%-$IXPqf!vbe?wv$$TUvg9E}UTyFnp5Zu1F!eWK^d#GlZq(bw
zLtqhT9mPq8E}pgo&XP|B_OHBD%JqFR1SUYdaQP5W)U&&(8?Hp7U1=9Y9ol$!zGDbi
zUgN{)lRm?wg2Y8*JMEUp?!0u-_{}D3iiY2*rRt%O+;Q_K>KB|K5zot*K-`-7l!^V&
z1TUA9E!##_=C>ZQZZe|<93pu!JrUWI=lr}qaH39~&?@%iV9PVr!^2hFZ6}bZIu%JE
zb`Gp?7H(O9)}jcKfYsgw#lm9DNmngY)&PGslaak&bpwF#oRH^3f;>%E-=pYs^`-5+
z6*TMTbKCLp*ND3XWav*Xw-ec_9FXH%IaJDxz{3Tl7IX=c2(hey<e8N5YSu$;>rdO@
z*pQD>b9UhhomFiae8eQW>m8IxFvIE6Ty0D1(-{0p9b?sF(5p=pW07)$gLzm;yCTP0
zSV<QmN`W^Kg+fQrsz$LSUa7*F)P0x(MUzFIvxKc)mzB$@Q+!nrn;KC*X7$<XChnz0
za*97|B`HQgOT3k8X^H7SP>K%VkSWDn=Qqp~waS7VGmJ4wH|Xj&H%}6KUUiVnJW2bm
z;R<1(Qt{qP(cd=d4p}5g=ky_+cWL1z++c{8Xjx$LA{ni>%lJ&z%j0S1^5aYAs^s#X
zmYpSg%|Bm^+7YDGp3QEY+GWZhABuO#bIP}fL>Ev8V9D<}YTBli7EXM`Lg+d-m$Ndg
zDOzP6urCfbwv&vrKR>R$<CBsusRXx*h28#1Gsy@s5C`Yjh;yP_*oJWs>RW!W9;Ok@
z`4X1f%dkaTpH{b!xe?MlrORp(T=!`ZM?y6ioQR<fzQ#+aO-M_r$Bi*x0PqAQ&fSms
zmVmxjmC%Rl2pLvDehTq9XzFk|^Oe*OeR-pYjNpTf?e`y$U#NG~w{?d;(~RReG_Qy_
z4iE0=RXDIXVihCl?>A9qN#zAb28*bEJ>NXfC3B6+rn=gjgFZc0@}Mo@s_gAl#=ME%
z&vbl9+!#j;Z)`WJulDvb8ltb{EN26QkGWlKbu8K_jfiCa2;AFhT>F(P0Ts<Xmjh*)
zk|*d8Yro`f@feDSF22!nm;C%@$J+AR)6%ZC>44xN$r4Qmb+G&FVS4y@1Ttf|tr2IY
zt+A-+wVSCF`-<@#5E~|1KbfoOh0-F%B2YPS&X73zLz!t^57m9<w-OT$%yf0X+cb<j
z;^^bXb-c_Ak26-^YCUEhm9DA1LLC`&P;R~XBpu#{E#sm$7$P+@-*$c)h#A4>3Bu>!
zx}^QkB->7ogJW#c@G+(XqX?F5FXN>t-UV(q?No95&RrPi&@n)8nA_Qv$bZ(?akn&v
z@<^|K#MlpB%Yp(bEx{h;0%#^$K7wU5Z*pfaS2zggi$jsU`_Jy)A%>kv+SwB-6Nl@f
zFKM^j(eOOq78zJi-49Zp!Qbmc9P+cqgSXn}J;?rfefZaBpx;H}f42<uYdX^6ZGnXT
zn&R+RyyUwI?+^AX{1pbR7e692JyM~zhyo!W&~^$fWCf-G5g+%TdFRbAd<a1n6))Ah
zTWy@`%!?)jg*dBV9Gq8^XDO|~r9E376VJY3=R72%;nG|;l>+W3nsv&rr}3*uuvE6s
zb4Ss>Su(iR=ZIv7iFxj;>ij(9eoPIO%?$M#Qu`gqhPnsJC6a+PAo$5uAwgRi01l-)
zoQ7cC>d`Ci>H}Rr<VJ-V%KoDfN~Y>LTxVCxw^a9Ru#ig=l(RCw<$M^j6p5Q+i`otz
z0XcrV-L>9m+ZY(dpB(|p*0rq21jUGsv)E(SrfAm1^}8gt9sx9(WsahWDRo-p%vQ&1
ztS|xbr_W>`+kp6Y!no9W2)$#Pw|O|CO{NMCLlS=ClH{vFHb+h4ryg;M^_te<sC0%8
znXUYcIWO6cXSJ@2pZ?N{ah8dg{f$B)|FEpoCw6rrUAM1dWY=$gC#^;J_4r9K*N(iN
zAsrmJzl1ves-o%Jjv7%WV+d|a`GuDmX48o7qY<IZRReSmg=8`XYO&55X~Pwwu$gdV
zP3|iab31DP38_0J6Kc$v!JQKUFfqGeG(ZTDHaV|~8=LJp*h<%OVEilu(W(=FhC{D(
zJ2~}@p}UmirS=TpC9S&xW<Phnh<=o3;?a3N1rZy2rR~ncFUO+xZ=oR%0pB!*|3DS|
z+WX$QIoZFw1pJL7{=32N*W_fyU&j>uS`+-=yt&@*89S%wVQb%y2!5xW-76pEL0n9;
zD3vI$$FS;(z<afQNc2T+vPeT*Z<D^7b_05ErP`SE6dVq#`j9nYy#BWs7Mz`fBg+pA
z>P-yWV((E%WsRgqO}Zr$*W#y!P!MGo9g;Hpj=Q99NQBb1T!^7|d7xsyh_-D*kx#sY
z%6Zxt0Sdn9PUI&qR_Rsm`R2Z6wOCTXuOPKyK;zwY{g)&bpzUjYRt06cFxtU}*yq)e
z{3s{?5<Jjv<nCWnV#jIye;l{8eBwiL`cX!twC?zJ?A+KqtMw+nC!o4KeOPUaNnvj0
z1`f`l3YWfZXYt_|O)QN|H)0`Z+>1zijhGO%V{Rc8WOMkm5YXE5PMqb22z?^aPHo-=
zz3;;AFaEpayv0KH=D+Vo`tt<x*AonXWXXRwCti<J`P=^Xt-}9%5zIeGw@vg6O^h5J
z==7cR-)^v>F)-D$cl?KkUvYc?1=tbF2h;Gk%rW`){hOWcW^4<aMd1rK&u%bs!hPxZ
zRODk&=TsK4m|}P{`7JwB-7N%hO)*Jwc@g<qf5F#hW8+nLdB>x)s2O4xXJ;2<=d{KV
z<-<zzIkcN<zkDCG;e=+&kq{Wqbd*EbW^OIgZl76$8&Zu@2U?x^h~Z-UZm`z2LsFTd
zPBpdj_Wo4KO-)jz%WCSKd3^;EDP>fH^W)hZG4qwaIu#2`hCAasyNkkFx#y&*L9;}~
z{aYJXr>NojfU@Fwy-IDonGH7&wq?W51I3++E{T0Cyso=w&137|KZQ+m?pEcMM9c$x
z!<J;7G#i081@on^X2n)cVS3Vv1Mb@z14|e}F6ysT+Xm5LUBvc2G;m&l(;hwea<)EV
z?HH&t4rKCKe)b5GPohXnRhU?(U7-{so4vypvK1jcfXMm!j?&leFmE8FJ9xRWMq^Ip
z-u9&(&>Rt+bAe0988B+2w7Q<uLY+gwVFay7G;+S0+93`3D3*CT;FIljWz$d$#ptI@
zh{ckjC<DZy?&xfouEmMUIi_<`{zg9Bx>DU##r_c1Ci8sRhC*XI%pu0Ke7el9*k9F<
z@%_rdBh)I?q&_=!z`@UNGSwuh28@lts(Y4Ja>@)20xb^jAmZ0B(t+NW@SbpBCy;$U
zMpO~t(Kb0%56aYgv5aGZz3}Ae!vj>Co?wQU%$a2xbIr>TPBUSzZf6s#;Ccms25wLm
zEypR40noGI5=4VygvWyicxvfSKEju&{n&8zp!wMwhp1CosnTeBiJv0C7Gc%}VD}3n
zXt0SwHhT^WSA^;6B_9PQI2-x_oVp;Fg#8lZ1F(V02$n%HjNzr}k-Ip+p4+WP%rG}m
zR_c9y6+rD*$Qh>=HAA7}^?0cM`ySP#>5LIQ+yd1eYmLqyyq{qF5K*VF<`8bq4nE*H
zli9sVvCFPK!R_G%C)bFf!cfoW=p*>?P4O!rgw=OcJ+n{y@*hPEh^b$S&c0`b1KxQ9
zcp@D0fE>enB17OJwE3O_dwrFC6fpNRRp%)HFRTGK=?49Q#iVpJ|CLoO=KM>BZeIV<
zWfmo?(1RlRDPK(jX(u>OTXjTNYky>RJ9_X#Qht$&nm36GSKfVqh2P+XkBSUX$)ObJ
z&V;XhxguxWusuoY6iRg?UGObFaazU;kNXDs0uRD7UhRihf|^(Kv$D{7nE}FO3AKdp
zq-A+WJX9m0<W^{Nm67!tX}jA-Xm&KH<MMr-d-8Ekz#}L}!syVokh}+Ztg!CTibNhp
zQWQT`gF?0lH6Z*OhsM<Afhy<oioEm}v|HBDL?!hM0rx+wyHjRZT7}wLx`N;v^6hzm
zKnzj>YsGBI+?;A!?9)jg(pIS6DaJzF-x2oPuR92ZRqow$%AnRSIDs<qnjloO*L!`;
zuGGwyQd5}+mH$|rera3_f*EoTf*ysLanE;}+4xEExjKe=`CxNw64yKDr2K0I0^FXh
z;}Gotb=;?Xz%Md8Y(GgmZ2ct0QgiA!Qi4}|t+ChjJH<Mt$UZlq!)?IPtIOrtdg~5~
zV8%d*<hcFZ!pEP-CV{XrtJ*qZTm|YLVE!S?USVY4Zgi>$zXHLdE=datBz}eTFm$qP
z;F3xg^I3U19Dt{y+;UU37BJol4b^@?fck2_onL369G#Ux(5NASh5NDrws70cU$s;i
zy!5&m_Qz?Qf1d}02}mnFc3!7%yr_Ov6s}{hC9$A8OQqdumjB^0eF#7hJmJDk#JPzk
z)AG$7#8+p?;=?-^n6nlSuiIuYgb0UT2q1iJKU3&l*^cv~zPd2vB-zD8S=|1TdE$m3
zux$MppCYk&5^ywNMfc9=rVTMlImp8vg!wbtLP-^)O~t^7o%@IBX@av8Q(#y4TW0sL
zBZ<3(+Ts?^X*jXug2iU7^J<Nks~t?VfH_+@MiHXpZ|r$%W}oJJlR8S)zIRo5GlAjE
zh`F8{W<MGC;%82_W3k*)+jX}$6fiR3i>1x>AbzoAW``ltHF2OIQPX3`DQ4KVr{G_i
zF)b<z8>$ZIm^S0f0?d|%bL)zb&4K8+E+l2ALmfsWfGLGdWWr5Wl)T%nArxfjwO#sf
zRJ&~v3HFt8#j>d5+iG@jd0)LNf`#_1SWPY{Rb^1KNOE-aR|pCRH(IG`j~rI3hW&6B
zrO?>IhQYBR3<PXVTb7mr&O{885(XRN@(S^W#1FmFX(F~G2`j0j)tRhaCu_PAGC)Q$
zJ<;U@B^Xl~R;oUUKo$guci~VR6fpptnX3YB_dFU3$?lX@`fTX%!b53xk71UFaF>X|
zA7b(gm5zKi_^o1h3hAM6$xD({(u&u<hK3ZYm$to_KR{k$G$Jiy;sc&=Nf-}irX1`O
zLB}P8nkLE?!R->P(jh{a3BxflcBU;hj~&;!rK);3Kg`>zhe50If|0Hz%?O0MOjVli
zOkV2PXg8-oH1zFgKzm~d!ZwFOJ|V^6SKS5rSi>WK7(v_isa<WHrCW2ED3_4MvZS2K
zgj)ms&a(C+r82TQ5e}`XJ!4Zr3zdQEh4GkBGBVBcw%f9JnQKA(0IT`v#M{vR$+-Vs
znqPHs-{j_8ySeaA?F%N;3AaxyJXm8SnVb&@7M^m@m6woU-`P?<q&m@lg7`jZ25k96
z4!wU^W)-i!z8)17)f#rTu%>~Y*N>Uu8UBpM2tGOHHA_vOD!K1Ks(BPvxkn<Ok#v13
zTxv-b)Qap1hCnKMTMm4<fzQ*4=wrSxmYOKBYzxo?3q<LAds%Ls@&<zc;Jf!Vk`kZ^
z3u{}=MzXm@1ecbPA*da7_}WOh^<7NK72ETvH<3yFBlZo+6%rB`p}>bAw0+EKV!w3e
zMrx`dWdQB+rYh1^X|NGL;_2p(t9GE+ymasdRp2}Mf!8%>PK&zd1{(S*JgPvnfiJLI
zG`qD()RPzql3rTI<ZR27KHYb~>Tv}UIbXelOBbF4Ca)9oYyG=xlAMLx^?0KoDb2@D
z%`Y>1wcA|gfi<FgM9iQ8kA4(0pUGX5aAqyiKicPB2*nmEM8<ttx?XQ=HP2m^(~bNB
z={J{co@*mP|8=2-`=UZ-EN0I*BlX4_w){ny$ST)a!;%}W2gjHGbKlm|whg7dfs<cz
zyldf8(iX&!<e4`KGn8FK|Hul+XlvBWh<j_WE4vPHRp||u+_y5mft7(``7hC6;u6{l
zOJdU1q!}x@^wXaglgxK1Be*$=zxPy5><DNp8BLq>7C5oF2DD0QqB9c%jR*65f9~27
z3enJNahLZlrXq`weMy^UF00>oT{eu14sXckd!>t#gf~CQ-LmpaB^;Tha9Xcm2V`c~
zqUem}Z$iz82GO=%N^6+$&iOQ^3eRg=qa4(8mK}reLril<5l;?c31L;j{}pL3aDiDf
zC0S-%vD|z5L5MBCF{I-{EL{=AeC1L2H2YczkCmAI#T9sugZYK{Le-~HKPs95ssmMz
z^^=iqEq%f*ZJ5(Wr~jl0s-iB+a$G41om&kdH(^i};kL@aL@(s$HeA{EgEc@9^(w<`
zAW&z#=7~Z9MXG_?F&+*SGlIiOnUw=WXGK-1MfJdxU?)!2f@@N^qa=&T5vU-eN+!1B
zZv=?3w!RY+GtG`p@KVPd9iMoZrz;=3dI*}usrQ!p5OC$zHW158wR0zQx#d!t&F%ZS
zHCjB4Uh0D9*v3htutIC9xB5XwV-w93NRmD_D=r<+h1_gq$$OFd<n7Hv&1=;ZO{bom
z+4!*DQ<YwP*;1Y+{gG@Uq+sP6F2FVVsT`;L@k>;D7}H8W^{8?BXG%=3Y|_~sh;ux8
zLVQ$Vh;Mo)_}QMsC~B}BI}+VE0${MODQz;(TJ-b~r6kqVUIC7zlB&n4)4i0paWfUh
zg_VNm;dz!p)q>+R`MR}s38k=`WhZlP@EJj7y(^D%LHx;wr1eLIZ|r5#4BRt4hL0Ez
zUB1$}Q`*p8M$rmaRv@)%KniMC$j7_55TI?<J`^mKA^MBlpA;B#y~=to&fb+uHR4`C
zwWR$}lKphNHd5!7P+bwkD#yf#So(=mkrlH@)BCYFFODziB6u$^d$tp2KQV;k%baA#
zu)-SabQg&})8ws<#&FY0aI(<cQGT|{Cu@emac)oD(!0p<K}gt2P^G6cHY&QBDs=a_
zeHcm^il_{`zc6f-CbkPqat^Iv93wA+j`~bkU^}B%RU~w$X;lD4)B??TN*-NKfGe%`
zgKs~p25aAHQl23bCbZ6fC(n9fVoEP+qdSI$v&e_g0;YoL<a&U7mL_YDBfxmOW{_-_
zCJkgoceJDTdJwnPFR?>p%02;8bjoz81ao5Jqz9THgt$%_By$Xb1>ap$US3v-vEU3K
z;yfR=0l^99noHA=ixQ7z`glQPNxu$#zZ`#K-eeW=lq$A5UTi}MarS$#qUg<(h-UA~
z*%KW__>ytJFr8k)R<>uo+4%-(Zm0&G=97|9Xfi6z%SN=&s*g}P?9JAqjbeSh-24WZ
zQ0QSib(vI?4W*VK6q=R#_6~FCq5{D}wrsmxb?umz8btR99o3R_miUlTTCsA&QJuQ4
z>Mlwc*ay5CTsf1LO*eUnm5LTDa`MOvV)*q)ABB?#uO+MfhQ(Q1sAG)`x&<=XC&!y5
zN%5^>I0O%%3CLvC)%sW!<+|;F(#mec8*w1zG76Ll3@>0Vq*}`Mh^cK%8(c5eNWvzd
z(KJdK%6vFg%F!zXTs=>w3bHXfwpbg3C}1ZL#B5mlvK+j1V&IYy_rA;dq`FuV!W#a*
zeGFMQd$^$0cG4CO(T_x;s(c<=fVGw4e2vU&4VKG2rISG?XyoBXP^g+DX0?T>TvO##
zC>Q<PQ9T@^+`4(a6ZRMQ$v`7>G65X&bT325!RC8(=dvS-w(IP*0GSDh_)T<W9-MWg
z;!$7Zv;%Pc4B@qA8lqpYf)<szed@(vIJ}@DE+~*O^UqFUzDf@Bt=!06WvXb7i!|)d
zx#*ZC9-SV&oMi8#y-fu}ZvyKOy7g^&yl|VKCcDH&XUh?pLojQ=jF?+J+Zi)uHLe5o
zMf-Ntzn~IuB{(c1{!}O-xv}~@-gXtaDlH$RUkXOF9L(_gDTxz?zBg~Tu4}h|c&$r3
z7sHAMDly}(x{>$Mw4OZpYfgRYqA-fHt45LITuTzsx{d7qodJx#8lBT|FvAK$+lYjH
z0HBDA5`Bo^RA!dwPsCSJSqloBA}j2~2qRo4Pro*GTC<vTw}`pre!~fWiDaX6KvxOw
zaHQ7Kf-6_rXkT({aE}xfBTwy1U_0ssjFE4}*V3rkVo0;w_3@mXvuSY|y&e3yP3paN
z3Qqm$T@)oNM^%MRx8zE7&`Mv~e@aUQ^wm*rn>iGD+ER`rIBbX8E#v}b!kLMDFsY=S
z?R3qP3yWXKHm#fsA~KQmUtE!IuPg3P#VSl?7{71X`fjff`b1t*VnQ*>N91fCL`Vtp
zWqfws@S8W#wq!p6$ry{j`XOIY{-VWN<GB_qu@Aneag}B>Zn`K0D=KEDLh7NJ5Ul_A
zE*NPt&iL7wXi{tzbcUWqS`fFLW}BH$5=!G9SU(Rbt%ns%&lIOP0yVe#Z?p)M>S_h)
zLMAwkz8JsOfZEzMG!2oJIR@V`MKOQoC)%0LaxE$La*rOuY$7w{sw*T`QbgfSYpSLs
zgMDJmCGx0Hs4lD`f_l9l4}@HYhzrK#ua8d^s0MQ;M4!-WluYQmE0I>l2Fj)B0Vi=U
zFdUt0qImRWx9`tAZJC2+AiFY{AR_?~prRMB%ag*!w1Z$&wyt3`Kk5l@Nf4U71<AA=
zC%wd7M(2v)z2`WT3X)`(_42Y`SvmgbGFewoT6@c2b*>IXg7byuZSwRPuuSrt;3Ep-
zVsVKqT3y+~P>e1YP*=D@iX+0lV{rRmpKB4ZFX9I{v_><d+-j-_m0}L~+BM76IK64>
z#HlaX9{dCBz4Ko@M=IRtAL_yPZg4UWxdmr$(Y0EA9iJm6v^GED7|bx2kxQMfgiEEA
zJ*<QeG0&W>w5*_3Ek4Se2#uZyx!%H>-1sQCHAn6(Z++9IYJM(4o2?x_z<6v}bcTav
zvp+6-fZMHc<8Z;~JhY|HMdaEQNs<aAKJRqLO<RrTkR_gD&v95nzg7}iN?JmH?dT3W
zq;kE84dO|oI=u@l6D@|E1&gVr$={g5G*Zm>A<zJGxK~m38P=r&S>$!w;qd$NVc`@a
zmh*N?^|QEn775A=+?fFGm&*%}_zAnx61+95gYB^rcjWz@hdwjP=rvp#IjAhtEN|N!
z2NmRPR9?5hNH?IqZ|RSyuhfnPWe%iMTEbULEgxP7=j6*!${MVN<{P%J7&w+f-%bf<
z8IP?heyQn-8Rg5MKO-Xgg!uql6~mQ9K<mKU`1*^E&Ml?)`v~IOwfAr2+26^<U(;%n
zZ{+y9l2b=VicdgBL6z=*&9Bkw{F-k2bB68zh)q2Ix0oOH>-jD!Z!5$5wle?g1^JWZ
z`1J{*_t_@pqklL~jJcN{&I=y~bgc0SLu;u%#125d2C~{OB=r2GvcCCtEzh_FsFf|@
zCcbZNc9@U<UX8z$x)*(|+#xS>&R~csm$BMHTD=IW{~N~2FM~mRUQ-Sw-`@TG{r_(B
zU;naqn@jvfHvgj^`5$h0mbc}3KRofT82*>TdhbRj{o~o5le6;5<Rf%6;?mbrZxbbk
zB;a8$Dx@f-#0SKtrA9=lDaR#7Mrry+C5C}3Lqf0Zk)V;QuYQ5Fo{hHM`y0N0{@lFp
zQoO$c(*Lc_{_mgiA8y+Cw@sFR3DdvcHR1Vl^IApm*u3q3b>F&&EPj-S`ottB6f2JN
zvqA|cjJ*x9g6L5eNyz;+={3iw+;acK^LC}GNwbE)wN0$?JHOEBg>ZN~SB@z~JGMG`
zSc}(fkJ9|qk{>@7OutetWwUEt3=+}XMaex1-LS*;pE)6_TAm1he!<TRi1?O`B5d5(
zMB`TnzSFr55sAYa4svN(-N1mm7}73wHM)2>Gc~>s&{uAIGNP#%w%CYRJPhy@D3N4u
z2d79N5hxKz&h4}^)fb@bh3yX=8Z$K@d{%=q;<CE*@H}los5PosJ9OGq{i0)LA(t(|
zM%@8puTE}h;Q${%BF4(?6Q6!B8()uz{^J&e9TCc&Nok{sS8S*%&iViw3{nOU+^eoQ
z*^qG+UX&~$DWK>P=wO8IT|xn)aDz_)2mtVIoIm&Izbat;kp=(5z4|Q@{4(3)e;ly>
zCTDzi>G#j>v+!@H5d**32K?>7834eWnSS~A=e834i=xl(-s?ZmP?*tDf7`>Hf72+u
z4`KNq8|rVWpQfuL)Avt1#p!Q%F>7L^A{XArlRl$VnZe6a_*kK;gQ^xTb5+YPHkW)U
z{E{#yQ2x=`Fd0Doe06pN&9Q$)efygsC*CO|W154Uj}y39Xb`l9C}&RMlqJq`3t)my
zH~kV80m<wqP^@7{zYU+vNwAIj3rLKW;-^LX4;7{KIhttasp8SL(3=INQ3M*h!Zs+8
ziSY|LXYoDjiG1EE&~f=6DQ+0&GWz{P7>`p{a%{QadL*%=Nm=^3XYy>3EF*4cg(>Xg
zfG)fHhbWJ=6KP~?{J*O=xQY<!G)(PAxr3E@5sSI^K~~A9c1$YJjhwUL`FBZ$TONW^
zqJN~A`%)i-98V}BqQkkTJ7>qr79C&azwgR}>~^QPuEk=)`O?R5RDGh{A-5Qa9INa&
z9!H#WF<}KkUd?6$$vXxrJ^SqkJwMEBuK_Gu5u{E#vtd8i0XPvS?tq))9ee@11SxCG
zEAKO~zmJZOGn(aP)avHhc-gZI?9yagKuLGXms+iTug3;K0{WOKxm(LE4CiToR7Z}~
zkqq@=N*2&{cYF)~I?VFYak49G{~kVv&u)g=%~SJX(V3Lv4>uY`@`^L7nQ3^1&zq+Q
zESD$KYN80!a3`{3tAUX#6W9kGkfqunZ{p7dqc)%YV%q+@YxZXZyr#?I{H3#{(=xTH
z$<ag|u3F4ZOTX(wjCYg<LV#?)zD3k`fBQR1f9;9yCE#C$(%(7de;`Uv^kx2r(v!D|
ztnYL4{t%^xpRM(*%nbfZYVZ$Fzv_hkwj_Ikr>3WGpZD+Is10fqrEC^I!Ze?%l&{DV
z15f2hgu;%1m)8WM?9Fuk)C#~g46X5}jK-%BtHOWvh^F}@Jqh>85&}qdis&9!$iCwa
z(Vnj~mDG}EKV_GguF#HHWkQa2oVZE_Acly4ZNioyL0v3?Dxi&Ilig_mfB=QG>kCzA
z@uOKZT^QfKdZdMBmKO#LQn@vaZIU6=SMo4*(H#XyBYD^G&ND3Eyf8bp9NRLy-jDft
zYte=S?94Ljj_6^D3^1_tvFH9$>(q1D+#LL%bcRq3G7-j_cDF+%d6i=Br~XkW7g>&l
zkwkOom_XU%eT_$k$|VYOmT7TS%hF&3wnI@goP3bYnrBa$JW|A37d{+MTmCl>r6=Sf
zYt0s2)n8WkMebz#KT(g^-f@qb4mv5>2TI|{e-q!}QxYbK&A0aTRc_Ki^lF1nDH3YQ
z`2dk(U02h_S9%8807mmu!^xojyGS>Q(-mHU@%`S@(GyR>%Z3}4r>!QAX)=sEUSQ;z
zRz%W%L4JoF*+;WR&N=f*%PQ~X5BxT<+0K+V`Xw;a93x68B{sS0-m*-{Te@X827<_D
zax}?ot!M=O%)_#CNZysUB$D|G=pE<ujs)xeZ~!9mppU&I+djs8DkU1<eWo>)Lo;cV
z{Ku*e3o<4ksfpRx6JZ<`D+GAtXq7+%*wrPV-IePUiFHN0s*7}pOH6c>0wKr1F3|kU
z>y&~kZ?>IxTMWJ{G~~?Gm39|pAt;C#%UIlB0p6^d-t3}56*C6BVvyhKRk=Lc;I7dK
zoAt)Qd<#oDc*v`*hNzpFYiPOdy^&U&I!QY$1e+{2zfz+azcMgU0XJ-B^>h%OT@}&p
z;;Q)M_-)v23S~LD!+5-lr7s2Km2APbRbfWV1W>MjD&>{G)!BHph7R$h=O^6lFPB2_
zjDY!<yygCPc>F!6{2Dm#LFN5K+COhR{sA*@r}6&b`JZ9vKQOHPy6aATTRZ-LEv)>u
zcKwr!Bb=gm-lwH@yL=5<q!u_h5<?P?M&)q4ROTR`m`9zH|2D!zaM!5va$0@zHZHYs
zwfQz@AhZI+g$?s{qF`T2tFW@(2LuO4mLIl|nZ%Dy(?qHLSRFmo;zB96$`%X6TsOr!
z>AN_#gSFXK_~p5}^EKHxQ<wgpDLP_m`9T=9rk@{`?uVlrTX+B{V)Q`PL5(^OorQ+^
zr}Nt;w%S{HfRThRp+7XY!WxrNtCj(tlBqB|&Pg4M7)B+2zRh(ifil#h@)BG}+RO=a
z#=3hV%luK>7_m@1EQG=qj}wZ?>U5>CsHt>{<Q&5gnnDVtp}8EbCq6lPo3rn>QbSY*
zYP}n(|2CD9Q_AG7K=uQ)mUR(7fByRVCBWI2^BBvmHw7LrX>HaMi+9o`@O!pY7}qbP
zddrsY2Ku{W|Jro#jxF_<Irbk}@ju+R-}`}oF=hU)*8dlKkiRYv{qD{F!;QuIW~}#F
z1^+^Q^WU`4d$0H>LFkVeuEHUSp<&6He@<~-Qke6<zvTPp&jBg+mjUv(zve&CzQ3mQ
zrxgB4m-!FbmhK;(ewBOw*IL<OYzv3Qp7W|}s*%J9F%~A`hGB`2l)m`o0;i)eocwds
zB{1R$VoL~JKv@Qh%T^bcQ*Spw5F#=P6HCPU=H|xbW{(w$W=&M1;gzaD(5HdV+L7~B
zPn<IAkNL4WJeoOb492_n_Chr9Xm;GY(+SO@bl)+)M_P6o8`<@Pt#)iuh7LZP$z8Oc
zYZr~vZB%-yZdEz9P;PS2TvWKapw3pDS8db?vvhwSPaf#H1i%NeRlhJx)wY988$Dgl
zrBx2Bs#li`sh51Y@cFK?U+w*4VBfPz^F(FCqlQPVUHx-I`W|hRC9t2{syP(w>M6bQ
zIZO}T01*oSu}h2-u1=l;y>~l0fH@pUh{a3g5CG{y9e!3JKPt_^U>JwuHHX07L6DYX
zo62MnX4A@I*v;K1^-ZSG;*eBGTQL*Jp&+sEXT=km)0~F&VK%{4ogds>9%%ieihoL8
z-dD_5vS`eK-*0ZzfGYOJgn>7b^(o;i*2gKU<U2{2n2+40?Dl_1Mi%PXOi3;Osc8pY
zrj9(T#<{LWhOC#2ieWG1Gq1`J>uakazg5h!BxtJAw^NHky~)tB#Z0$Ip;$6tmH<{2
zYtpZ<hu5RC#cu6K$fJLMVBaxlP}@2x9n)p1Pr)z1YRXPENi7j_h`pG6OwLPbp$&B*
z7qL{s_A#_-fV3=tTPu%F<4r{CY5gvuHUHEHkNYbTEop`XZa&7Fh}N#9#TEANB3jRP
z5p9SuE-fy=ooC$i{xY?8=T`J`!v)AEumGAt*Wr*vZ+RF!g0dTg{FyTWogd=kTu_Be
z@Ro68?(sXE?81UxnCRvF9&DQN`zQrmc{K%7jUp|SxZa*Cy07lE)swc4U1cFm1k-{{
z9d%|Yxv$$t9HnS5!r|VQ)g};m+Br&0o7aw+R(-a98<pN)5o;7(I}7i)E5pBYk<x<t
zaSnvs+m2-^Mj=TOV1-S~V8(;x7V>DG?Q6u3eB<kj{L((J(PBJUsd`Z<%?C`UkDs@f
zx;Ji-8QOh>s9Pe4H*Vp)3)g7X9Bgc+HVyPN*H#H<pysAJqopcZ@u<32<L|#xt!Jhf
z6*(ZQK-#k7ge7nA`k)#v3|)HO0{f$}%43VxkJ)E&4}LP!pCo$BG6(e}A>0pQRG7tD
zt6FvyCmX`+3_r{25S=GbXwn)!^336T`9e>&ftSiLaMJ;^muw3T(c6DP$Qs5Ifb6Z}
z)L@)2%h{C;%(w{3zos1VQ-=$Y0xBZan{}79k4Iw;t%~jq76jdiIs>j;x0*;YyH;h%
znCU8nqZz(j_bnAzo1XwXJ36&+#hCkkR%@l=amPE^A(LE?+-!Buq~YnjgNYh2W{dhJ
z$uxt+);KFqJu;Bei@&tknCHdxg##v$M4oTmHU}yrLntFoFp*#w7x6CG*Ov|I0ZekI
zm!s8sBH}uSp?0|Rs}R+W3UozyR%%%a!U&5SdXA|=ssDs;a>nCFdz}Os(?Z!U+l}I@
zYdnAkDlCeUjIve<u^FUAtG6H3p(wQ(cG%wr-LulJz=&*MQ5;9V_q7WSK1l`ZTH!|B
zxcGBYGF2>nyIXt?iX`mEti~T}!IizRMo69Cc-q<c+~PZ&^nKmH!P9*ydQa)LZogkV
zQk{Fa;<v(Y-!=ofc^o;M_Fl_39(cI{oYH$Xp(H>-0khk(1vYEct;8JhKHc7%7~IUO
z7~D*^CwP2@Xypm~dUo;y{70`O7)QDnn!j|{K3Tna_GL32Ai^u(u7Ds=>Zu1{D?Cs$
z9`9+hMs)=3kLsfF{Nh2^2W4`^<*Td!mozkS8#S#UTCgn67V%yE+qNEnK)djl%_3?(
zpBg#$jvuxWglT{|;C`2xUJN)Ieg>Vu00btfX(C?b<O<)uvwd3Za8Y-GnA-^BOU?I}
z?H7c1q=WY3Yz~=}6m0WG5W8|u>2@IQtMn6#MuU8DfD#-I(GLdGVIQeghtqAUaT%N@
zD_eZ>nYG-3ff#u#DjD+#giTTkzdf4sCbhMup17AxieqB!`>IB)dBClg5x=(>Ptov-
zDc*Qs`q{J%zj5Bf*^4Cz-*P{MA#Jq%9y~~xo%M^-CcP7t)Fb;3WP%Nh9<O*3%Qq-t
zdy2zhezdu&5kOk+*xYD`yC@17WTsJ#5<<5?#2DZp$dRO+XBvlN<}y=BPwRuKOCVu(
zDUBHZ5Q^9tb4&SY5{60nKFzqgLi~zJAfoihM^|gJ#D*ys%g49$r_Y>l2LF1DIYNBm
z3~)ISdni3OvofK#4!MWeIn_u1mcX5dR{A{DW{L^-UzD^dZ%W!BSAZRow`Sy%tXZS{
zAd5JyVnG`?RIzb9l4kv>&qa|kRXI;`6W?Pq`%Eb=;@V2K>reE7!n7q;+2Dqt_#i|<
zHu!sY6cZ}$$_zEeBma5mxQzM3xxK3KRxIgIJ3#0@UXXT6<|$VZnqp&GuGg21`AN|}
zAr1{Jh$OzLvE*-EJf;&2V6U=c!`?t0_c;lZFK+iwknX+AjbP2~r2KdT0Gf7YpdUsc
zAN^S-Us7fhhFuj<8pH=Z1r{Ny?8&}<Sv@Kq##xX!z~Qny@iMh{H-UH%=0|_r$GRCz
zg=#9j-0HGedIHktMz{22hm+eHT74)N&VisN;tlGRGR=&OmYyZQCcdDNdXN;w07ECH
z0Ao1=#X9^XoLk=&R&7g&1@iMSK}wlfb;JTfwum2K@G7D3`!a|;h^47yTHzpAG)1|t
zOgf}}q}DNLD%eIk36oq+lHw#o>RBdgk6xC$cT^)J4J{`)Fu)8mq^Z6ksAptEDvl&4
z8#_Co3fbTiO>wzSuh9v^{Z*iYS&}aAk>p)A>AoMQ5dK;8_YBJR)q*)ExvX2TAc>(Z
zqeD~OVNt}Db2I9|HlV9!^J5w(UU90!j_Z%JU>(-kG~9XnsOjP7i+7L$U%@95?HGsR
zt<zw<G4*9;LTU-LeNah-C1I0PPi=qFW{)36d`~h$u%+?7PFXT>1rJz5tVa1-2a?Ck
zi0|l8zbh?DVIJG)+hXYyb!AZ5Y#q7I<Fm`vJH^yJP7TP#*I1PfAS8!u=>RggkVE(V
zBZ*C9$W-N0!KqMC4ktl6rU8bjKUr->?G#v+!&(j*ULp-<Fu8{^VE;#A1yIUxa?x?G
zGwdy%WUn7f8u*o11N^nc=mpF#UnTf@cF!G4pG`7OY)Fuv<2(v!pa~`3?h&DH7Rd}m
z1uZS&uib&4I>OQzzZpMoW@;L`S~KYztR&YcWvqb%k31{xpL!dU+~#;BZTxBdA-WWA
zoSXFRuniBJj(Rs^*jD~t4GLq0>FB+(n7D>|smGOvx{~N%^s7l+yg2XhRz?BA3of52
zJookbxbus9Sd&lR)4|lYv)<A$$c8D%PGSePV^A%D`N$i6;~0u^Fw8?hh~p^xEMKvt
z@ruaXAxT8(RdWz$xL%5g7uY=!>99JsPn~6jx<JL(p|)BsD8Uz-+zq5mE`i|{{*ZEt
z`!VP|BLEzy5$US9&gCl9A;{rA4BJa(Doh^_5r(L+de}ttJNIJ{C~e_RmS>L28q`0$
zB6fXFJ9DWIT!8%ieK~vSXxR-xRAw^{3V5CX3>zu5;B7n>@7Gtst>-WmolnIv*9_}L
z3AE9piL$++U^OdUX|T1&r=Q`X%#&PA$mIon5LYso!i4A)#z$qZ=#iY=tLzkFX_6I>
z=;SB53P+yd2pGD{SW*|^I0_sKBtBV493FpO++GQUAM!v8enzoGWS@|gkZ4gXSDr6n
z3D1U{lt6lkaL(sKDvdRZvB=~MjasTus#Z?@*(n3Ey2VlRa1<4!0+n5ax9!w$!$NS~
zwAbeR9p^yk3*&@qwpqON>V+T^z+!S!3CTW>Uyzq7IstFlf^XPEl;Tz^L^2hJ8!QIX
zlK~KqU7hq4K2!WyB>?6`(nme!IvqUdRh69Hq}+ibf0yh^k%=PE+gu;DK)o5#u;!mc
zyYs$;c{uE&o5IKo?n3QGA}(BQjIG8C;7A`6@SQ8uN%9|9XXdX@K5%W>p{Gy!r~-oV
zDCjj|LpSJeK(VWpDb9k%A8PpD&qBu*jw)4RmrvUz8QdGg4Osb*XhCd=l`V)7vvd)b
zNmtAQPw)F3fAu*3@%V$MxfO4^sVLAp*8*qj8cd{Jt$cr(6HUQ(*9=<=!9A{t1!-QI
z60LDf+WsTEJRd|7c9AOmXueR^)l{&%`~6cBI}ffQhQoHhd)O~Z+sg{(G4g_Ur7ds8
zj9%rN($><dAjGun6VoAiK?MP>hbHZt(pC)nU1_VGjhtBJZ!8sFnp@aO=nrjW<*HaC
zHIvPM|FSG@-H5v6I4n_Rzbn63=Fc)}bfiZ7h(f}k(3M1}Hs;85U70amueM#%O#wGM
zge=9a-W;|eIp=+5&u6BkbeDyQQa@^=yd|KhG<IJebxj_fs8}~(sF%E~pZC0wXppI;
z(Nvl@qb_Grn6G9DH8oMIIFT|{)N_+OHTLq&F;ipT+`jCgSIR<@wb0fh<zYsuSfjP9
zw#Ln<SVw5n_&RKbna1YOy-U0&++2gT$Z|QOtj0mfVmE2#mF)HF<xk~|qUk(W8|~2t
z;Odf_QN;p`5)P|E_RovsrL4~*6oN_^6J~c21K;qyKG%t>@bg9;;z*JQT>40DLFzsl
zS_k8JQY*qVm74P1S>&XC>cK}oC?e{J-2wW6LYx{(&^U<5M@$%nBRCO<Xqi$Kzu+q`
z>b;MCRB>s044$+I-y1+8xc}WbOr2X(dW~i!XWd5@2bfC#DCG>pY>s=<DNYZownc#%
zG>=BelLJW&26?YhoX))PyZ|{G8_R!TvwfPKpvS>e1slCKZz)LZE+Bi(SEf7aOPLFH
z+MRT$5=y~Y-{viL=eIHsGP{i)ffA{xa*^;K9*ozkJdMN|!S3JvIRm8%wWSmHcDkIF
z@8AhtX$l1<qADWdyY11Xi-X1y9gw9^k?hv?a?7V_a%HMuW(#>2D3DT46+CI;5=Ft<
z2fm=PQZw-j+>`t8XP`AhlQo-Sg^_`Fh-XMa)sVI-$u!Qk)l_P^fODD%3!l_-LCbUn
zVnN4^ne|*%`+!aK&$${cD}0`$D|^;!CJ<;k<}Wu|Su}2@S43GB%p9cMU_fptf)~;=
z=@SyyJ#?~k0+x3qq8k{`+ub>Kfmmp0LZ>Pdff8YiHxlP3BAv<l9A;6&8PW~wy6KWE
zEl)yRgi#E=W<PN-l9n4|m|XOe>In_}2T{km1rjp|MlntRK6Ku7kjVn=P-2sFKut{}
zc5z?op6>+-VFv=UgN4%rY7%q$m_MS&dC*B!$aE5rcmOx~3YWB3ebTOfq-4WaFRx0+
zkz+Eq!`engEAP}zTc@>o0#3)++Ed72Bz1EFV3EdzEuPMt6{DnLD(TaOp*RFO5D2W|
zk4W4`fm##SOdrz*M6xaKJN?UuG3GfTNU7%Tv~s_ul-4j%t5I)=M`lMRsrDYJ!xO4G
ze-y-fB%Y|P5?#)ZdPoyFa3L&QP0YcOCfRooyMvs#x;Y-}+DCmpZqpQi{W0XGOYo`X
z8A9<4LD9>lb>l3?<*D#iEk8NM**v!{`D}M#3WG}^ebI`{$&2Wd%XA%%%ZZuR!{uqX
zf2{Z!F|rv8PL^NfCwAACP%4=yU6b??y{Z`%96JMhgQrb;g|gG4e#C}PX*8#IE<tb7
zP8ku>WdRYNH)&^Vz7LTC7~^Ng#YLDr{*O}426r9>WG!R}UeSTv)L#KRDL4j5mhjdB
zInRAzXvze{d&MHy0auIEVUpt_ftD@P*~N5=0l09~vyef?L4Y@TcgqR}X!oz+$m&31
zxq0enUZPGBj_u7yw1v+A9Eo0LGjorSTjs5W#{Wy*sf#`HrtWl5`cl(Il%u^wZ%ahN
z$nj8C4<uB<#j#;*tV~Ewutq^U`TtP&)=_<B%ep8U9D)-F?he7--QC^YCAb84C%C)2
z26uN0?ry>DLZ5rObNBA_e)sJC-grF*YpnI-uQ^xM{N`L$^?mhXOFZMdGT8RS#m}Qu
z*5)sB5+kfmw+UMZRZ0<?$TDdWs4RCrhc0U|*SQR^F(rk;u|2Ylm&;{^X9}lg2vi}X
zJ1h)_S~@;mR_l}YfI)l1WMSv@4oKJzW?ex#AcUzQ>2%WtexxdkB!KUpvVrbnCD&&9
z4q7JDNA{$Nc+9I_M4*a0?6)9#Cp&!z^lPQ*Tkz?RnBC7|skb2dzfL*-9}%g)$PWEO
zgz9e?vimu~p#1u7{>|Lb&xM$8VcB0*n-0=KdeJ}&t~Wp0IoKR3bZ2%KfF{QZg2JC#
zqST*uxLVs(m-sM)B&LPUzwaaEmc3JvEmcvZ#?c;NYu;Ik5XZDA#N;q3B%`3BYx&Lc
z-o1=3lCR@`o5LTL|9N)*+4RYuP4sVQ{+|^}h+bPdv-~O|Z*N7ZZ}q?H4Sst5=V<Ml
z7S69UaTFx1UN!t%AC$zY$uXoq9?f(BK~yQXb1zXYA{kfC15<`mFd`L3%YVc@_dK;G
zP>H6r0`!bb`P%oDDI$lA{1B+6BRe;W2T}Icv`%p1WmcX+3L8r2dQa|_FD|av5>lu?
zl@hlx-=x&9d8DLk%d)b8%bRi)1pte|u%iivAgjpIr#0%Di2Mtbi0F<N2pQ1xKK<ts
zE1_$LS>VzTX;a6W%!!FPtF<KstMt$5ZdxCepxm~B=qOtPh#wX>1?S{^+L7bvFY=qD
zK>3EB(@d1h)~?nSCh|C$4X&N^#OUhUU72pL-8YcBB{$6*ka(Ooj8+D7L6OTqs#P|z
z!oIhUs)lv86N8ua2BlLU@q}O=V7t(&8akLO?lKBYknwR@#mr9YtaMj69G%uelCARx
z0WLfEn;%zwhPCxmeHJ~xyq!gxOs_Ho&ZBbLJ6XF%!OHpgm0RExv}Xd{ds?Of>G54(
zgYk7Kb9^yOi!!0g2cdh%I!T(LlBZR1sX^v~WiJv{vt}(KyWr5T+!3)kPu327>yLbQ
zTqubgzJol8@62H{xt)98kr|QO^F+Bpo%?9iuv=iN;?@_6An<^-?HJsi0eU2rl-O;%
z884p-l8ms6+Idetg8NDJ5JFN*Njq<&503YV705*NId@%v*b9EJ01=iYrWS8HV{<W0
z{-T}luE)k;#De?q<SvRaLJTtgm=&u)oJ_a=2s+!bii5XAZwis!A+Yhu?<1dLck#fQ
z_n7RYNs!pBsr^(_1*PGLNWMjxNl0p%H)`h%M!W2LU@`)%P#6mSyqfCrrcz#bgZDQ<
zSuf&hl+E<vT{^)Z%(HT`36)Lygjh#C6+s?@%AT3MBOtV@ey{+ir7)A(CU*fY0mENr
zla0Hsqpwuxf!|V^h^!@0y13X=+wZ2{4=B*!E1_TJ61#>9-jHH$)jz|daj!X>_KZhS
zS7v@3aneJVqn`N&ZvEb#CvsNsIGSv1VxlKA8E`#_5#Sy?BcGwG(=^D^`4FW3>>auq
zA1Qhkuu3QIvm9b8+q#J)mcG;3*^*<~Xg)3v^StVijVz_RI>ijf#!=OLX(k0Gq<g&P
z;6iPG>WOY}itHQ`Nx>PZMK2bfM$l|~E<3*BccGxh0*5{4nVc*|7q7)lH)2njl|Dh%
z$9lzZw0&0=%h8vs+8M?t`Kxd&sVrsADBA=*iyKkXF1D!h;ziV>USU1xfL!+u#Nq2&
z&v};&o&t_U!D_f3oQ2B~H)O4ASSr7Wn4^gQB62vz%XhWDO8&ng#UCL1Glsl@EdReu
ziTwm1ubb;nzkUrTe?x3#G%^3Z4gB(JR-f&Ej;+5}a`C+GslR9lA1BLU)rIqZ`I21H
zUU-r$tf{Upmnx1dSFNrH*gM1>@*R|Q9Lb<3HO`X5_gtN|&2ZP#W#8e;RNnW&Yzfu&
z+C9)Xm&mpY$M-eL5ZTH$38n5cxxr2mSGVj(bNC=j_%$GGC&FG`Rf5MKz8_wU%%_n4
zSPP@qzBXBoyrh1g4Z;!`?=0TA(ch9H%$g2?wYF~yQDbXQNq{$>&dls7i-z8ttz{#S
z>rp4K=#e3O!>l~zQiCxWkizjv8C+naV)$#%qT41TH?{F+g;+?xDslut-(qJ(lLEm$
zA13#WV8anGgVe!_#nDC^x~ZLak)ifeF1PA?7hS^gL*?xsx@nD(P?bLr(mFqq5t_?2
zI8hG<<(e0*38v=>`Uycquv$^fd{5hH>$M?`F_T&53N@2=ZMM=0e`!d3di7;6aQbhD
z!EAs40B@H1!?%C7;hS&&Ym(AW-uz47{wH((&At2e#r!+o{d;M{n|Hrm|CdD<|L+*-
zpGNgJH&W26WB;<?;%Be@>G>x-{<&W0%|^c{xOnZ6{l+<2dF?*jB@A&i&aW`3crYGT
zdayPRri|yPk8PS2_@W8C9u?hDmD_x3;=qa_X6@^HP92uSIqhc}V%9%Cfkj9ksb=T1
z7I&Cc))3}bi58PirU9~Vn)@z%xaBL~0A-jyK6CJZdCo$h<HsPKl}<udof&wQif%A7
zZCrCFYc)W5VH&&`V$*$h(o=kb5NT?$;ZZgKX5ACMRy&zbCuOR`@_@J0O7zp~t%vH!
zX%vSTx1Zj+5Es98AwCU^`LsxQ_EZv+ZdnV_Tztr@z#NVVwe(Tqc6I*yBnPfJu^I}C
z1ciCw(nRNU2H2`e-plRuTN~n0g|{}u?8#JT6KQxT4U^MxUsl??0sz;xkD|=C;P5}W
z4x3ACJK&j){r1HY>35h-^a?m{cKJ2n{OkIXpUm}3!1*)d{mtE(;T3aO|K~gEe^=Z5
zg)9GQ?GWX_oW$$jUy|b{?r@FYhWB>;+Ols_q<>wb`v1hT|2U7oxm6WkU)jF_Qa^u{
zzghNI;fJ5duIg`OR~+RxvTN2)WLF;=wnR<JC|rtS-|ma*ZdH|V+IF2?aXyWwJkHe0
zE7I540|B3*^KYH7!oMi=i@gr~ZScRg_kU(3|Je-x<~FB$eQk`tTFKTX|1GHa`_oUG
z(tmqD_pdjkKVQZD;{Sr+swuKg{x-0;>(@5@b#ur6)`a|h)UVk5`}1GS0PO#!-_rj-
z=;}Wozr0^JvtOd}@AIer{pqJS@$(+_7xuJ}88P#vL27$YYDtD?Z9P;K9D2tF?RduM
zD7+~L%ow#bpc?%0uu-4N_620+!Cg?()B^m(dh#S!dLp?+R?ixYRFzft9p#pwR=ekV
zkujMiUM7s-R-P=f$Hr&djoVmfvc}A>X1)G0l;<M$UDD!Hu*sRof@x8A7!_^6DDBSx
zPH-8#J|EDm;-YPcvA_2vvyWl)cMJfh&^p;@Hj;d(XChQg`i;&SY~8Cs1=SY^yTD~X
zE8p+0;05hx7Vt`E?LE7a!dQJW#Q34K>RV!srG{cpy0}(eUYkveeT1s?j)juK9Dk|0
zb26<foMK3+g<MP>LVOla$N!7Z$7HgziBy7}C0QngcfQYEMu2Ozj>3$WV7UAEd3l)^
zb?+ViOVD+aj+g-d^>p!OkYD@nzutp>x708E_s^{MH}v73S!r^w{8Fa>86N%qVfWw6
z$hZ4HGOiSUV@9^#C=KV$K$3l!uPS)0tUN9&Qp{TBQ)<oNNYocDVQ}0^j6mLKn{(vE
zmA)De2Cn3|+-W@@c1Ea#`I2I&vX%=ik|>=kLgJSvo^g>^4nU;zrM*=*MaY(1n-Cv_
z2oFV;68ZgxImM_Nyr<eb%?3qCzcO~i1|C>BH0Q{D)Nt?mjCH$`EmeLZq=dnMIp&Hs
z+8p}e#6Wkn+-BO6g5a+>P=&SXch+<j$xwxO^86ElrF7Vq$7#K(M6uP%x9^kI3VOqv
zb>eg7W4#ju(H8JR5RWlFVufWA(0qgq6Qi7}yw+*sBHy)6{6T3AuUE+k0&34Y+PQ1F
z2GOKLJ9E1Ler!*^?DsKTOe47P$2T#jvyK5XVj~)7Y%1d(hh&;C11z`qvfAY2d{71j
zMzgqaC0`K$hM;PO1vDqYK`dbd)U~;koO#MRp|7&tq=);nAJa_l;pBzZt?k+F;fmUl
z7yY%M>nSZ_z7^^{=(NS?EPVK^WSqz1q7b*#>Soro%GU~_hA~ia5R4yMnq{K;Lt#RN
z3$YQDs!&3>xICN|l3Z3r!Cd@wWdVS$i979zIarzaJqRH5+CBQ9o-18x7dh_nb3Tkg
z3ROuOp4P~?%HS6aaE0I$0oGLH;Z)8*b1zM+Nhzr7+N&U4+*H~Unjzy*qbo>}5*Si*
zvRdLV$&h0N?Pe8ExETE2@!*~vOioKgB(_@dGbappk-;z{;;%tcOcLIg^Q624>H*0S
zAYIEY&Kb1XVe<3c@3@?){sk~U#Dc>%g{n&;4T`=ZNt_0_<=5;nUukW>Q>Z5~sBbU0
z><xv?Z0?J9>d`Jhg&F!Z^|>s3v22;<qaKos!{ygTNa9-e-GpLo)tPn~Iu?Ch|G~iy
z&!|C5)Bf}A3lIzF>qs8$WF#jCg+{O)wCOMkxE)KNYe}Qz0lQF_9r4p6!2kyfy&1T{
z&+<aU63HnW=lJ$3Mtpay>Cz)jER^*uu0G^b<o<Y6BVE`XeY1^LML)I{ipwZp`d>VL
zW4yR{ngN5pMibxG+aD11^GbY+xV$B#{`#2wuORB57Uka%pMKtB<zL^*|8S4}`Skd<
z$Nuts+zj)Yo&#;y(8M&}tAfl5!~>2$6QUi*aU_OWUiM8^tsuRKeeYN+>dj6Kp}Lii
z<TP6fC#-yzL1lz~pt;DRh{!~E9Nhl!n^p+LqO6VR>zLoh{fC`@p3$3~|NX7#&nEXb
zG&M)A^6w;Icl)=m$X}3T{_y+XpME+{{qNK?SHgp_{Ok30|A&p}nB$c^AsD@SMcy0N
z8aX@}d!alh_{yHBa+pZfYkuq}%Dsrg)fMja2A~2E-RXTiom;;2001F0I+ZD2ECJQd
zGs;_Co}wEpi#M35SY0rIXhUu>?mhZ!qp5#(`nghlVsjslbf*QYT4`bC)9(Gb{_NSo
zZs=+X)$I?aG~K1X7Rw^r5k_;xI3@El;2Mo>ky<WFa!%&Op=qy(7#ABAB8B@aa!m~*
zxw7Wz8G9}jsvEQOZ!2x;2CwqsPjB+#R*db{6ao9U?L;x|x2rWRO=KYtbf#6*&p{o|
zwM`}Y3U%gHRpU5CaHnR*H8;M!6K6LZy{2iGCUS}a<^a{LZNs-u`*?*(9cY}4A8F#~
zA0^_tZU(+RvwkJRi4m}iliO@k*`2TA)JLVXI5g3KTRE{1bbSOKaY!O|7}3-h4lA0V
z)8o%1zb&1$uL0ka3ti{+z~O}xI_eq-fZhQB84kXSdNQ!^)WP1SMzu;6l(7AJX?#O(
z5{)j6{32>*QI(fV=RSIug1V2}Ofi%~49aFGQM)18>>{(WH9$DVrUqYQ@)dtspAJ<t
zoC5VFKE9_Y$P=%EoWOAjGF~K3-G<wf&3{mVA#77S{+!+Y-P7jTP!@n9NE(NJ&%r^o
zl90J)dTLJLRgl3vdQ(S2pF;eu$!EE>8x=+^g&-4Iwo6&cbR=Po0HA7ua*eHnS>mB1
z38+u@$y%z75=?gvt}&>9sxy-gh<P&QHW};cL=33Gz`Y{DS3PRVXlJ!RKC55HQ61*h
z;3hyjhr0rRVLVi~B^<e=W@#Gjor>6d!lQJG$yBOs4ZV^0n7s};yc*RtfcmO)<q4!@
zyyyo(hdW3~sy?ffE(~Z74^QFm?%Q)Ow)@_o-Kx^&dR<?2BtC&YKOEr9K3};Me*UNm
zxAufHdBkF3Txo6WuNqnzJeL7-c!Z9V@jYVySRoo2=Fv%(n&-Xd#vmN%VesjY8^hT9
zSb)w%S%!nJmGs3tU&{@c_|H~vamE&EHY!}+=?;PSOv_v^hHg{C^ozw%S~#l@M1Lh5
zsS(%N@huU)3-JC7GX;j;^*z;ObIjn=lZ9qnF&+mpq=obdbqp?!(zDgYToh=a{E><Z
z{k3}gz5a`rPMaG|-HHe(%dI(MGR%*MFb4atWokU`)rch4(2$y~;*;i}@)h@@HB*bG
zjn00{98kit`bt6L9;Tl*kUdox&t9m~w)2&yK#s!z$-He$I4G58rZu+>RJ^G#>M1Nx
z0*;C+Z=UI^R9RGRUtp@L-n;4Qd8Z_eh$4)z7Gu<`@4*4Q;4djHFjURUqkZ-US7U_u
zu~uDO4W{*Sg&}g-VWh>ye0MN_|K#lGc)vvr_hXYOLK05$^<KZq>1^$2$nbo9lni`0
z;q7*Ryq`Tqr@o+8{i>x?41eS0qAgpA_O!16d<v8+V8x@(j|wFnrEX-G35oil3Em8V
zQ9}WFO;oKa{}G+CZJZw9hnIF*uwornx1+f;fP`@U)Fn7Tyuv#doB=I+V_wzjRT_C4
z6w|ag{YB7EYYH;DmobL~Lw@y0wE0=PDrv*;7(<YTf#I0Ome#x4y#|dXlq>xQbSvVh
zG$OPyih*@@YWRB!G9gL{8QqZakaNpG8cQ6om;f%h!ce!6c>bej(tGj?T5Ly?<Xq6L
z&y`a;h7V@}Wv>EPLTg!8*4<Ck-`YL2Dyk9GiEyzpUZ!3@`feV2^#kkq3)lA|H4;?F
zaz994prZwQn^ll>C;+7Z;&D@ZSqlCb26x=xHd+WpPRUo_`>f8Q?HZkMxxPkN%iRTP
zDEb3EG`v6qcvIXwIj}!joT$T9H#H1Lg%%adjrmw9$(&h&7a=@=^V^3}+!g)CB2+$u
z=(B2H)2lD)_xV9P!I>Az;n=F^?~hk~Fq{NK+228rw1ZFsv}A!-eWT@~C#x#bJeJM^
zi)YW$+Oi8=63zfl9Eko%AvtJSWe9l0CdLgvkrA+#^f+ou+6f!)rye0t4X(pz3tKUm
z4(KL|NA%hxKGSmU!mc7^HV)wwPsM<nF_xdr9^WisMeQ7bGc${`Ozqh;JNgI)#I3(|
zkJj5LkpDicoabVYuskVr&OA!pZehvV2|tUMwi;<((I<V}?D}r^DDCncb72w2#AClt
zRXCptnDnfMG)Xsf=C~OcWUGm<u20tcSY(=ov*AO=3`GKX-davp?a~_y>nAjPkdu0A
z!80!ZF8glZI>~cG{LPN=g?^Oth5iUNR7#+Ma2bBzTbzxhSz3>v>bwUI&Q5BL;RF9l
zOyI{w&i3+G>31FNKJY9aH}G@Hk9@R!mv~xqlZKsf179wL^F|=$H{|atahGy3Ot~2@
zd3rjIO_Zbg8e&DIJMs0w&7C8D<R12}{U-i?JMk+1e)KB-4!e!6DY%8OQYSLg7eVxB
ztmDvJKa_Tzpw-gY`xTclg>QI57(=rUHl;4xy@VDzZ4hR{Jmc6r0DfiuooJp7#~l8K
zl2^<Rg0EEmXDF>8w??{+aa|Mrw#HsxHNo@6o7C4@N%Fmw4~gu_uM<u2cF;$OEsagM
zU*y(=&izN&xtcfLt7;>7v-1q4U!YBIp@bErj1jaM`61hCt5XNz5f}vt)(`gc&6d_!
zdE@Z_3-W!uj>OEcmWE==O4@2k^u-6Egq}k~GGQ*;1)cI3F!KupLF_IItfSNtLcNtc
zH&j6Ok77>&Uj;&i0~$PJEu5{<_CwjE3Ql3GE2&+wTIW}Dahc=<=ZJDKjzVQ{+Dsan
zz)>aEk|8P|!O@F@Wx@|r!1@l&<QQG<W8UjKZ%l!qpB~@Cz^o30^eIi;u>+ynP}+A=
zA0qFxM4`X8TwXDB(v|!Dy_0eIldG9&%#DE}G}vZG-~ydxdem`FVgoO+l-UBlkY=V;
ztZON)1e3HhLneDfpC{_JLai#`)7`eK__0O!k2!!qSx(y`$ymG{ym}WB&+yC0v9+f1
z+kTUg;R;ko>QK95O(Dhfu;*pzSFLzyFEFAtojE?3-?ZX4FS#^1JQ?BLqDE#>0O$hI
zT@WMXa-MA3#EK_jP01qAmdIT&`|!G1th#T~;h}0}aLP1n!H9I?eZ(t+IKrtva;|*u
zrEKW>fmputUF(zI7su<B%}Vm4*tA;fBpA;5cQ{f5nRODJ2^BCTtO-Mp#yrrHNMIY&
z-$5O>e#Fg-9Iz&%@>xOXp%zRz0QW*)9nomJ2(%{W02$cC>wmiAv8$Z3sDzb`j!*^3
zL=M36R%9TflmEfX3<WS6tqPi_ck!Xe2%S@mp&gdUhN1KG!6ArR$9w$jdUM|fX^z#!
z!!9@VcPk|f>9KO0urur#P&r*{VnZ1bcjh5(-o_pIc$lNs7u68V6n%Z7V5#}AD=?S1
z>ZPk|JS634wHVdO1q#V0YZu9Y)YcAgJC$U{+uvpLcl0U;FXtaR+S4H}3D0=P293X`
zyZf14qS`X_J)xn}L_>b87yBxXVxG5vTWI0frLRe<<wYA0^^nf*z16yc7KomqD7F>m
zq~^NiyI>lpt^^&kYm<wh;NDxsLFw1&e0f3om`tCs1vtlQbf{dT5ZBec8dY2mSLIi@
zcjKU<?a*_xwT4@a`Lge{d2Yc;OfA)#9Wb)HMsMS0)ToWI(0TFWo6#v}xe_v$RD^Ft
zveTLu%)4YKnUK3q2VotHK!`*S5I`d$$T`cZ(MobQa`E(qOO&IqO6EIil$xrlYwq5?
zJnG7VFItqzwV>QipitGO+`5)H@#SI@^R;DoWam}S1&iYE4PEDJTG?PZ%)NIiPo?+*
zyl=;JkjS-4KiH5=Hj7kZ^@w}LRj1nqUdd8ZaU-m?c~`v_<ciUr*5&$F5L1sDc!2;%
zd2rJp#>5D)>f&qWh*>XU$O|$V_&pdla6sak#FP^Qk73{(Ib(=QDj(3>U#_|&7v;t+
zW}hw2i`eLgu<{_@!cjRR_<jYo4oD4x3ow>QR`WFv5vH_Wwkf==%$7UXBbS*QeE~ll
zY)svV#&B-v07bAQ`P``ZC4?3t5g_Ygnz!i^HviBrGFEgXltF~hk{Q?b4(vO+Mb3N|
znh9gF%`p6y8TPQ5tzeO=G++fpCgD})8iERP2;P@wflf-t%yXHDm4Ky32C^8RPqyO$
zFu(-vk7yOCyhS|ffrE-_DA1I5-Nzm_XO6s9WzpMbs?Pp!z|4{@&`42BBV>;ClPNqx
zI`J94wruG#TD0-RfVcSb(DWVETMN<-UEnWXn5Hxy^<iKn2e?;=S7Bo^Qjql4wsK)P
zt7mc+2<!~3iasc~SBDO?grCxpNNo@t!b!XwDec(&E}8~+>{`Vj(Tm`T44U7WFXuXl
z6jKf+6OQ&UlIS{JOdW}`>ciMeoD_YfFVmrb$v6GLU90VYB#sf=j_j<sM=VC&RFBes
zngMX3xL}36d_3tQrm`#{YlWNtE%sTg;e<q;C7pPxc61L2*wa+zaCc8(Fd1pKam!~U
z&`q_oh8X^mmhu!#xo#=y-gEbUfha#8aefH2CKx85rD(8-fheQAs{`?|&pg|&(%Z{+
zOG=+j;C}qI`0a#0gfsRwXFj2=&_Ylt<Ky`=X)&pW+<9AhmFU34@O5Bc4Wl{I?89S+
zE3-0*42rKmuCAM`+%ldr)M6)y0?bBO=P6YWKvpLmO~tl^M6LIN{M1Qw@t{)bq_GYa
z*aV|g1F|v_EBHf}<Ho_oAWg`}5v*cg4*o!1KbtCoQLp-5WSZ2LcFDmPIdidKObZQZ
z(rDsQfAVcESqhJoUUGq(EuyOW&x@KFxlHKG-n}jWK&}N<SQ8v86Efg)v3t|<9K`?)
zYVDd6b8SN<_6^MSw%mFhmL;>)j*s?patEZn3snkXRBH*nfPN4ho%V8px{v4Y#uc7!
zWBNA<PJ#u_{U(m<N}3(e@<v!^ca-YG9Ax_}^2d@2D2(K@Yf<=@ijg^qYMJ|7JZp*H
z3vIbyBgfILzChM=(W?}uU_Kzw2_(SEZUYFTLp^rs$uMfS-jAxKmH;EH<YF>@i4AgS
zp~<Ly4>lTe$efCrW8@=8W)B3!^4+VZM2=dld3n^by2^62fBLMiNbc#L<&z43rX&k?
zH6S6n#$z3_CE4=v<}kbgW&Dj>5s&e9TQYcKum?geawRpT0g6w~pijLCdRU?+dIf4_
zeN<EO_^}_k=;tK<25@?bon?gqRfPjsG7tG}cvX$-f~8kkWy>_AhM*%T%vVyCmt(qn
zA?k-=;jUEiOK3QsU^s3|xxw`l+3rX$X*57?)23HWRi?bT<a_#bgKKDX``3?IkE4*`
zZh)Hq;#7U5;jy6Pu&Ug1SNUuXiy%UdlE7==nS&fMm~C1eUazub@qGr<WsHX$Z!z<R
zov~zm2OEmamGuxFYralyuc6Vq*>Po7zNbSZWzw6R@~wx#Aq**HBr@)qUEE-_9<GA9
zGHw3guIVE6PU*0ltAEv1!(zuY>1|G;uWWO-oKy?E$*m(2gts!m6~whm4l8E$(<#;S
z;rbF6*Y|Y#7EAxAS4tJqk9U3TY8A&LEl6@_yCT%6glWU5_Hi|JP9IuZ8IOFTw|FiZ
zd;k(hs48_e#fRkg3-#`9ceWc@Vz3E6T;2_MqzG@pGMwz_8D%(!AtFeD5R9^#%huAQ
z7sDu6PC9uu71hnZkFcgl$grP43a^>3k>8RDo=3z5#h&Uum%>CL)l8myClt5Yj}ScX
ze`KlP(mcDj?*k$+m|A@4SULiw-ZPuT{-WQYmFhIN*rJ9s?GQf&O1ywMx>r;{H@-={
zaU9)L=EK^SLgm7r=P9rp@6z<XOygiuR(4K9dXC4ot;jL~a*V@>L&ML;d1ok!%e(W?
znDQfi9UdORutN*@V2k3m)J~Yz?G`G>Iu6Z+VuwZ4Y8rz?eX()yfNeTi4yIY8xtvZ>
zWENEhsc^81rxUq^DTL{!p9my&dI?F;1)sLa`fKkR5(NkN86ck92M>WtZVe${a8%_8
zQ38y^CKS>Wr}~CP9q;H}gNNrIb)C7hRk_X+(HK$u!SQvm6pc-T?;qhvmGARUB5#qo
z&a1ZAX70b|PVUA`-?`nBr8m#sey{7?4Zq?@FKXI-5p3nQ7jkLlcTO&LB4gguupF<S
z&)7}VkKpxPiu>@RXbmFvn3#m7!GUlr^}zW=y2maAJxxvN?7JwIQ&exNfz77fR$KSp
zweF7qg=2nt{p5VRo8Z(J4nJ%*TA%Q8`EVxH4^tYbh^G8)R6FT4N?^u!Qlklm=@`lS
zp#1vn@3zIohamP_^!A%JM9F1=Xj2lzF$rv~LW(N74rK{b>lHxXKl;PAe14VrZ!~bQ
zKt3ktF@~7z=!sl@c$UG@&1Z(pF*_aMf7M2N7^LFQ(~A-!&MHuOj4r+QJ;YTa!9)tk
z`P|vZsmYmyJ`9CSXFXX}8e@LN$rh&%ExNkD5IRw}E3VWC=~DF|YDCuA<Q!rXu%t0y
zRe?u6>p5^50{k#44}(#o>GDM>Gsx_FLp(`~4KBHoLk>T$=3Or>_Bf#u0udw%FM|Rj
zN3i~)Uv8V*QB}6sUNc#)5Vvc7N}c0K7+9Fi)E5jnnSdHSDCa7Q1WKdI9^*oeV8M`A
zG5B%u`IGoX+~)9HIi4ClBGy%-M?o_3%4Q()Llwd`FL-nk5O@P1;?ntqXr4tezv<vi
z3+UPtqQgnS{JHk}Gz}*wknnKv%*Jan&ZvrI<pN(xy4-wZ1~1J;`hpPFC?x<w31)K|
z{m?oMfVyGVrIM>Frh7}C62%NC)@?<ul@rKHur`Er&y4SBB#OFOIif4YJ505f_$ik=
zr0%&x>;YMmBL0l{?&qc4UqdB9UXr1>sk;MTP~0M0?ypId2adClXssNO^~Dl5v<fe~
zDd}5937SJH)pHv|T>u-5-p^-dP)MAx5Mrkda>qTz(nAFjaoM+rqcMXjR}PHe0i)KM
zd8~ewNi8iDhHJ7v$K;^->Kf7YNcUiSIf|Hmt8Q+TGbUcZF|vtMRh-GL-9vJ|))|Wc
zW)2@jyI5NLMN&jJKjk@`RtxGhh?gbe{6v6i?7Stnlyh&Xoo?yfSM@^5a6NDaby>6J
zYm~29^x@wEh<nARJ8cw=^Jj}H>knE$uga=fn};t-RGhNS@*ld?CN`Hbu#)`gw^zRG
zs~R+a<k*l~<qVj@cijw&><>eV3zj-FWS4!KWzbt`;`0$eG<>SkWZP=~xDd<_D|=Q+
za8w3VQr>*^!rEi4e>AA)(U{~rk%m3_uH<<L?IOu!{X~OLD}&j-tm|`tQogKG(zkA@
zIXwNC_}qfAkQ|SXb>N-fC1t*xqCmJIm)@+E0As0?#$wWxpGB%aX*c88KV+aqA$>A6
zcQCTwb9UbNn9THTx);o&&P@5JQbLUv17mObYyo@TCg5g$Cv>l=eQ`~}SvM=ivA>7N
za#!Hn!HM`p57mpbxToa{C>T!FV;A6su0&=Mf`|(cKG6(9k}7J|g~%t1vv9t{o4O1I
z<YU9S5OU(uvLUCM$j7`<29nzbFd>>wYdIL6i~6qjoz<-26PKN7J!)3MOg|DfV?lF^
z_Tk#WQ;AybFeVcRxM(+raU93ezd=Pal6Bu7CHmQNP6X!n6{2&Yxg!I~ec;jzgoHfh
z6`fNHHJZ|8@uVJ`oow3;_eQM`5TW_B?y}+A&d0dt5h{S9q>^d*^>IADGBO?kz55c`
zCdb!zrH5|}Z?muoXDipbVSXf1(E$__TbwmQ=C_^>A4nF{*BZj@BrC3H5@H~O*84a{
zYLD5KZi33b88zLf9vnE8y=LS!?#)r3`E6WIHO)8dyDnP$)%CDFYRfl6b8YLe@k6i(
zLdH)}!1{gg^;^e6mbbf=$-g}TQIv&!wV21}x>=Ou_^c^bUUuKPkowxwq5Qg;gwmxb
zls<V>wl5<5v$co#0e6)4?)xztx;NUN*(>d@3rMa^ie^X;?Ae*BO|M%-RpR!Ob57HC
zVw`HW_>bbph7sS!M_(Fm8fMRw{!hngnQ&?xFqED-aqPmIw_u4f`Fb{;9U`U<!H^KD
zE8Vf-W?D}vTswBdgL+CY0=jzn8|tSZ{2lx^f_SOT2#1!18mE|kl&+At9Iu=|kv)K8
zTcC;8jt=h|bzYL^WgQ3CnqNCQklMO@z&sJ4M_zs9{K>s?{<`%Vc=Tz{VzwQRF7-ac
z1nasUbs4BP-&ws?OW*PW#51D-0K6qA{>bV4oVs|+>AZ=Y|9iQ+f5>9|4bwRn-on49
zbM#^V$CU-YS0j&e@BGHEdb|HaLZ?<~Abg4Wm0v{;PLEy*JT#%pVtE(6q+M1Gl88?k
zuP-T<!#yb`73ql`orN+~LkyKSV?2bUP~viRpm0@``F;zGLO#+ikH!FJJmCZHm%+SF
zs}E#k4M#tG?x4YuBgqF<{B1Qc%?#5%dc}jqWjdfSI+{tSSXa+$^OBI$AvODPjB1H>
zM1<-WOz!H!#{wZjijQOy5K2=`$mw`W-<qG)_lSARAo-6$nR!70;nAFaH1N-wU)WCI
z#-dr@h4wRERzC_7j&)^+OXz<p%bG?fwV&qkHdEbKUVVZk1pBdDej2|A=eEY6nWg2`
zA>!%rj)!K734!i|@cSB?Q}WEVNfZQig+*&Tcx?#Z*M@5D-?oqm_aG`79jnW$7Y2RZ
z9oL8xybqZfiNdE5g<AHONg4{Ouj@J?pOe7QqXk?QUBk1AfXtSADfhWD5UWhQtHq2G
z>LYZFXYJz~Vb@4U5rvOM!vqR1n|DReUHbEULLjXL#Q0!dDHPc`H_h2KLs1eMR{HJ4
zDsAQi-|CqGv}r=!Kes@hQCLqg17NHW3VQYWre$naI_eKjF(3DvZJKEatj89Ff4PZ%
z0AfMHva}>-c;DD%Su~7?CJkEqar5>@hD^0ZC2g-~eZpdk#gLeS5`f_wh>_?tZnZ$Q
zotQ@dvMLX`0T8Ya6YSY%<4R39=Or=UV}WK4yKap(5j{&+y-ynAA1Lh9JJ?nI@GT$2
z%&l{M5YRs3X!OoOe{F*U6eys7V9jE!BVU1*f8ilCn;9Zg8H#BZt;0keK<)tNhE6UV
zlp*42L=a&oM98BuqZE$U^vF3Gw_39}+WPVG{*3twqJhQ6F8{<+-J`Y&(~o{~)|xeT
z5<CMw`83c>x5we2JSuGOn{;y`n+E3A39$(M#mZt`c=N_7!mOEwb8aW*vk5VL{6%LF
zKf4UsV5n2aw~f0)v@M>lF|e>zN}8Mb4_dBT>m2e^D9CrJ(>q+M@~Ga~aSr5>Fr&3R
zy=;VMHDC95l5I58tQ}fRax|%l!+x+Ko<y4?N`mu8!fsC~<&s9|+~4_U?#WPFEM@79
z-t#!s8(W({uo-;WQMRe%C+`LJL54MrL`a|%hRgSbCOk=m%^5MQPUddL<RPC?%bhEj
zM6t8NXyq#Lu=2$$%CksVDUjI=YPR8+4?{G32QxCW7ztxglKx{6K^2ZwfnW!naN04W
z)=Kh1>72m3i+RPPFLbt{r`OpBZ=bo~usLHG`AmP-EFb0gDPPH%9Aq}C&MFzF)98mm
zNvsb!Wz41YrE?{p))g#phLcp)zLUu&_Dc3DH>3LDJ;Zy!LPY-+&qVhkZ|TsT?82Q*
z!6{vxh#Q!x>y8Fj7DAfQM5R2s^DFtI$R>dfGXr*KNur?>u8c!eLEs_$Zz~4oMiz@x
z57SPY%QGJnzql(i#nw-v9r2_B&fkJ-3Ap-=(P8YzK102M{7$GEuK25X_Zw{e0rEcs
z+JB}%<DanYZwT{0bIem-D;?e{L;qCT($K_G$5PKk$NYbjY5(E(KWFg&qE+~@x`o{m
zBf|5EmiO@YFO%}|sXrFYj#*0&yOnNa^JD0l2AtgxgTD|E(HG*Avat%iJUOCLgK$S?
zZPYX-7aFn0zX~HB4ONF|j1SD<QIk0iN!s4Vo|m9k8ZD^Ax35;4SLT!xU(zI>+jeUb
zD22ohm79;`33&AQV6Pp1f(dCQp?0=zh#^Ue=(6P;=)!xx0HrRA2|UC#fIs#N>Cq%j
zOK^=bi0*Bf54no0Gza!!<Jy~nv2;Qs|2&vYMh&YB!0(tZf?_Cxkk>rHPEn){qCo~r
z4nzK2C7e0uJho34j?{79(j;mktWqj_q=i)xG74`XAK$S(>eA4)IwhG+Pa)=5^e#o)
zvsG7+z1c@9cc;XVwCnhhI}{6g;bHRzVpvmAAbJFLBtCATld~TVH9;|-EG6eV8#`=q
z1&IHhnu(`^Y%O%&PVAU73U-A^T0Z;mJbZC5Vf}sF<s%UcG5hh6z;qV7!2W<GV;s^|
z$12M1Le&Km`~o3lvjtd41$eo0PlzMz_7L91rFPO8J!inV$NlGcZ(gF$j_p<3Gha{x
z%&j6Y`zj~85sqNGGPZ4^a!gWI_2)Sy42SSanqz01<j06Vh|Wc~(~FBGH#Xgz<9%M}
zgkIiND6ZS5Dra)KtL;#%by)T@nKi>QW{s)X$`^sOppi-}rJ~Z&%a{uWuLHg*<g=?u
z%L?Idg-w99zcu)(IADohrfqY6E&Dkbm}3e>ph5R;8izEm0z83@8!-)FH6Gl^S0G9q
z*pL>+2Z0eTNthMHS!46ooQT_ihFyE^GXi4P`0N>JhRg-_sAaV2s4gdrPJPb7bbb=?
zw)0@Iv1H&CS{j@`$u`5I=p;h^yQo`N?PdU1$?uSRJIo_Sz8T0cQGVi4P=W{e65>;n
z8&W&$E`8CYwkRJ|Mp#_?l+0zepfu$nxOdrGc5LlScFREmU#kjm;6*&dBNm<>j?%95
z*(HLj5SHO!$jG_k6nqDZLLhN%V<0)|3dUm?$r$|UMLyi>P8MU=!!tmai_93;^rMe0
z?KKfC5S(0B7+PZ_PuaKU6Ktr3eHja%>BoAW>F*6oMrl~04cS{u=dZCy*^JX-ICgx2
zE^msR5qt`V(5#m_YnlTAVqi0TkNGGUShw?0lqJnzKN!9UeiGLo$N7s)Ewmgwr1K2X
zyMmwv7&yq$suo=x)iav-oc3~fcO1qBp@y%q`Bi{6hzYC}k-J@B7<_BZe(%m&P3F$V
z^%Bl%Mv6GyG7Q$Gl8chFEw1R*G+E59$bGF?#S*(Re}INFF`F1Y2-_tZJo@XS2pf&B
zXMKr@4u{0$VP(Rs6%!FNs#li8DJxM6T9kuUba2LhbUL$3r0miK4JT#Zj^TBGCZxz>
z@nC*OoEl6#eRlb2bHl0$k_78!)Q_C06J)W2vJ_SlL(7vvSIeDEclD_26!`X$;jy#2
z?L;d)5xUTK_c6&x46EX*AM5E1V=t(U<{nVidjjr-QFk>dJH18gtYpi8o83%n*Q(er
z+(svpCrRHKNY4B^K+M2TMoi($1e*>?)4l-c82UOqhk*i>KiZe7GuE#V#{eCC!Zn@X
zCMrnpS&YX$Awz`~GGO>`f_8%T3<TBZBVevGp#-9SxPyaS;(hJNo0<w+<aWDwjcd55
zT<)=>w)3fX(2(_g>zmVw4hBvl_Cdv$nzHscS3x2%3ytGuhNxg1xdd%uK*m{In-ZL;
z#bDxg>*&x-A%%iHqCyNU>7=JTWS;0~zSmd6KV6XTG>ZP9+c2m{WuXpm4y4zBm&vVk
zGs#1WM<KC?%;wsC4R2N$P-?IlYeWZbmnj6p%iv+mO5{IYm3}Epi<h#2+r#@<cWfrO
zDb=xl^mV3T>x}<PQN!nUSIu}Y(i)wfc=RHE7ZBIMqks`aOy)@@%*jcn3r5Pb;@J~F
zAx6JyX72e?QJiVHFnQ6eG^-q2_^TZJLjZ~|N&&fMBZo=b#Gf5uWLj|i4u}E47?b3A
zAPjqW*?B*>Mx|<z=x5=h1o}P0io?2DQCK`ON>%aDK>81>+dKph_oL1dN`_tm*2Ut>
zPNThQJz51xe;_GRRhL9N=Daj5SuD+XHorg-UM+)jF!Kc$J{3V50kbU>ih!2YrOYxA
zXMt7^c=W)`6XUFLsdia}vP0rcVL2E_tDa3a6AAh34Y}8j7H+Z4J%w3!l+^h6c-K>X
zSvek}-}DK5I;Nm-jx+V8a`YqG1)l&D@de55l$#*R?ZutkErz1Ci=-SQd>~0glBlRy
z;C943#;3g259McD&vnDqtgg2l9}x1w!=G){)MoEFRbpHOwPtU4SXeme<lQM<(NL~9
zT<zM_Q64EcP3g;4y|TbM?ng3F!Q6J>9{9`J71@WGOMy*bBv?5zxka~74=5tW>7nyQ
z)Syj2>)dX@^KJsk<v*IrltKf!>;+21BRh{{fcFil+sCVXL`+@&GJwV}!^Vj?21JQA
zZwovFG9*Oh-%-K+s9Hovl@RlZEE)paIPPON85LSnp0UUV3p3DJRV8Ya%*R_N=RM_5
z1M7Qx;6CZ}4iZWeZ4e<Pqz9W?V>!t_A~wt;G-ZgCBq~SU)y{w!5EDWJmKQ+ytT-^=
zn2RQ7m@8%p7Ebw@6|J=$e)O!ex*Qylx0Wqc2RtweJF?lF>owV)S2J>AVCx*Db4$rt
zVo@8c1>CXIj3=$f#BG#IWqAz{g!ZomUqL4v24iHOTW9ttp4kFIwv(3l8?B*~0W>pr
zKglSRd-Y#MWi;b}E)}>xJP8~|?~@z5o^BRf^OW$)_^QB|E7CAxMHpQ6o4{X_U=$**
z<=@2_BhELxE50l70oE>McPQZQ5k{ha2f6P1AvIvv*AAU{=Ywu&6&$k#2fICZ39Wu(
z!}rQ`7>xTDjE_==iK=<83d4Zh5H<IzNEKzdGnEWbZJJbGPFS}HUk!tF>Njo+eFV~j
zLvy?qQ5xzPTMTKwFu@SlS_lT$|40ngsX9<sS_-WBTEVX^Ol)1SXF<B38b+|Z!a2?P
zLJxO!^wP;L%L$bo$LZ=l_>|ULB@roIQ1E3IWmi2gGQ50Iw8r&PfHa*2kH+0$Y(7It
zzoP8eussBiS~Z)^6ca@1Oe%H3JmdnTl+TGJd0{U7v%AU->4L!YbH`mL8LO@)N#`C{
zdT<yMtSwosnOT{EN*jSe&_~MKwgiz(d57TPy3daRIrJ{V#pyZs!uxVtMMou#?8_=D
z%&Zwb(1<^tV~YkUSU=Q;%T`nYxn@PBdG%uz0DomVXJR*>bT=o;$aYHdN=3DY9P$Kv
zja`4APtiynSEpesehLAJ#B$-qhkMwfrv2nB-A7n~Gbl%|63R6Sk_a(LggA(Sbsa9?
zo&SzpZthrBYT0P}@N)4)Pd%;jVgC@D40*G5ZFbPRQ7uX)6U#_tcr_cdmd-YTBd6u%
zgpYAura@i=^cn!J3^AloP;(ULWlwl3I!tJlr8%Zn5Ps(CgudLTZ{Da3CKlZ=<>szi
z)zF=(1eWR_MIymXoh2r%F<MguwGt-Abmn)rYLo9RY2|hFK;{TaC6lo$y*}YGmM>8S
z7tl8kaSfH!2Cdi;-mU}NrHA>2eNN^-S)QAW4nW;dSSf~apx1NBT*p50TrB<wDSrr^
z#!Nd+%7;<J@Z|vT1&J6sRbY;0F}pw8E4w63U!l?z4L_`9FQaY<YfpkvF=szKn?7je
zT$$c$?=ZA2_qgpo(Mui;o_k<12Ku2=USA<7shE?E0mJ@9?!aR!X{>?B*gVq!m_D~w
zJIgdl8(V5ssZ>ZcXR!H>QudB;f4QZu@V?~HUC|KR)d_6$Mvxj|(fiU}zL;0-J4w#b
z+FXS5`GPpE?k6}gI7!LYwGjHyJ*>()ELvVoQd3b?nj!o(BeF}}UEadP8n=%4;u-6C
zu=J&(VeE2gqP*fy(9*@71YMnL&;XV`bMKrLqBU!)h0(g%DI#p9BTUEPmmW?wv?8e5
zoNJiMoK;}h)#lKq(O>|5t99rGKU2l8mBnC<+O@1xZIKyR#0#Zd0KoEy*^;oR@_-zq
zw9M0vWw9$VI}o&ebMsKt%DM>-ZM@g_z!ckor9U;qH_OUIg_3dJ$k09RLQ)91STHV-
z6}METKPH)}0@TFTpa8I+poFbms6nzME#6BUuPIxpqjzv7@Pw!j3oqIn6wNR9uhF1&
zT9Pd*%QKa+)aYKW`?3U%;To^SRdj1grlR3-#TwCsaCn8`R6J1krT1C2WMh!HxN9;9
z(fmEuC@E?gWRd*s7o7X!=&Zo1AO6^kuay!?F^7_OGpF@x>JHUJht4K**j7a|b&94>
z4ytTf=kmr((?-X3+?3a=xl|7e(Sep%HKTn8a89MkE4ilkCZ>5#rHLNqtv?VI#Fm12
zoG3uu^>Ozk4KfVj`$++>$N`pHAFBl{YP|8&8_w+V(f3oya-0exJop`cOic^E(EGo@
z=-u*}W~BuiC#!vPCHz5mr;XV|?tVQ>-dr3f5o&uFn~u9)LKfU)JtZT9Bu=wxFkMSW
zBLri{uS+wu!2c~myNy_S&1=;*j&ebM2k##FVk{N^j8I@23M%%!-zAJO2dbPSYE=tA
z|9+QP4!O5F*g544ncrmEHrhrdU7bd`lD+z*)dZp+i-vq{e8WY%(#obP3XnJuc~^zb
z0+Q5~dJR;}G13FoynI^S#^Aa9);H-!CuB{s^@oOoDg5NXs{42jR-vg~H>H+dZOUdv
zj2DdFPNK0MC@yt1oNocqTSJp___5SrHtgRV7cz5#`~&3=KiNf)*)-c+)#qD?qIQ2P
zR{w^{D*z<P5PHuMSp-|fznGl?Xd_gr*V2y)?8z%RjFMb!T$lKTL#e}$*orhQ+3&j~
zx5;j(Q|s=dpii<ee&?u5d@sc(pvokI7SRl*)-VDL6?E%@SZ*0e3)_NP^DM!|Y@oSI
z$JU8ya9jP}zH6&zKl+C-5EA<)hE|I5E_++|un@q$3y!4<Q^}>oN#Z3cAdJ~olNmGM
zqP-_(7YL~qCJ~*ZAQA}J24RA$TPN@X7=7AEU2-s~v0+b)s95cyjUM}Rmnv``K9wD!
zPr4?Q^Lj0_qkXs_4|Crizx#_8Jqq8zPIGBThP;EH6+n5Cg5*zbYRufzI?@Uc5=4}m
zM%t>XOY~_;<V8sLZKj#C-4{2<Z%Kh6KMnUHnIjs-**Nj5<$KaCttDD5w!F_3X1xl+
zOg0szS}oq<utaFQz04932leCjvTYen{#pm<1gdfj#!U=<m{U6=GwFS1XwI)($b`hK
ztQWjaOXOc3E#B&X_if}eghCgr$J{n*FX|CbLRzZpj+_I`bmflyw*;cFP@0b{VgTM{
zW&{nYW=6{QNddWOLRuPCR91DG=G84(5nR_JbrMcXO;+_+t*f)A{%UP(mTKQ^r*6KV
z^$ktA-nc>KzZlz$RV!+BnO#aKq${nu<&L@*j^Z~*G>FeNNX|W+eAloXtG!sFM7KG<
zPC-h3uq!{FMHSXR%)AdfdWFSuLZ(&oEAQYNMNHge&WhXeQ5Jg-$f0+UYimU5Pba0+
zA8qt(@E?UF;peQT28&Tn-0Hq<a$VxdBg#ZjEZ&yI7jg{JrL&TKWlbD>!JD9YhxlGR
z;S>a5L{lmm-a9{`g<bzuNwOi!%o`60=yQLv9?AG)FBofGxkH5KkS%9{6Xy@;YWzLs
zcXEIptS$VMXVK?aF&w_lqsopV6*ud)UFTJ#V-m@plhC1cjov0!U9Oqm6kjk_73)}s
z7jy(xOl(~+FxUNV<Y$5C&^pM}N6tlUH=z+4c8M-ae#m*ia97@ybQ|~^KWV+iwJ1~j
z8tC8w0N&y>f5f$Zj^Mn-wZ#8r^5P#tH?IuIfB4U@gE@c02-nYAdaAGQ=S>Rd-;8km
z%-H!WwZNa~`oHz2Hbx&O8b>Ii>TMp{xL)yPb3m2rCTu@GNcm{93>14XCR!SFqQ}i0
zAMIa7LJAcZ1b47Ite9*viR<)VVu3jiY*iAkQ+S)k9}e*I1m7G$=0EBHe>T^@xfc|_
za*O{1Uhp%8_%B-dI7E$DzADRnIsF{ms*{6s@+vKpC3uj@WT^lbuF@W@Cv=@f6zqJH
z<T)7({3+U~E%n3D(2TMV*vGJ!se*k1D|xl=y#C>^iG09*45;8M4OC`578Id9iI1hz
z29cJGw)!bKJF3EE;mGy$@Wi}GsM#9=HPOPMN%1k+h>B@ZpyV0aP!wO5v9K@z{6MCh
ztLoS=V+GR5?h-B?46ILK08=W@bXFS+(43qoQ62zq;S%U)x3c$m<I@taM%<EG6#HFB
zxx+i1`b5x=5pGqF51OZ#be!y;g#D&!^>mU8AYPi(?$N6{Ew2ruro?r~hu9d0OI<qK
zlduo?*e<FQsgwj>+ZkWbYiv{tiBMR_6)M2ChU5!@v@gv_RRv)S>cb{3Bo#eCo3{Oi
zaTvUGon(Lj0B<(>|H{Sx%#eR`7iW3JfnQ3Z{sY=m|HJQ}(EoMu|JIBBFWmc2bt)u=
zUOQEZjfxLX{I%kYeD);X+fd)GUt3$^KMiRA$DIC#mOlBZ-)iD(LrK1We@pwFZ2Z=1
z_3jrvS7T+YrfA;xt==Kkd*z`Fm<cg@Pv#+*!-=DxwRb~pbl8*yG0cUV*DuIlHR};e
zE>b100Zs?>&c2*Hw^ff_rdWAFn2MuQHs(azkb#pI)_oy0Ax$XA?jiTOgTS>eZG7KY
zL|7sp-fl4Zp;i<aH>}sll{_Tb0KKwymc#<vCIkbi!pj7tmlIMvJGAP7x43p#gEZ3~
zsNCkjldixx%}#~DT7_d+Tfm`%a3HqUG_L(_+R9LLw;(8wMJpME>M^YcOsrtdPu#0<
zqrfQ4X?Iv&-q9}sHgvi_WRi#~qTguzL*VAT-w`dw9E5rO*v66LWsuZIQ++cd>CQli
z(UU$Cf_;C~=?!8qR`i?ifI@4Njx-#n%?E&-^v+#7;`yg4g0AHb1C);L!rWv*zGdB<
zan+V?+_|?pVgN1F6-9n-L9Z=WPaP@OatPf3m9lwU^S_y#oE0?W#Xkcdr1T`9CcJpx
zhcqvp`RZ|KCrf?jxW;~N4sE_O&hNA(r#Y}{Ts5mlS)x2jSUVN`a3g0En>|}o)T!<_
zaIaZ}{w3=hu5TmjD7<`*(v{^s#J39rOB4Uj6o^<qN?ZxK#Lj)vk0FnwFa*T1cTW)*
zgP<eqYJ1C>Fmg5v?6B_5=mND3Fi0@uTi@Cj7Tjb(qg(GGTIIvg6pf)N&r}=>1Lq<$
z_6M}+)hWLf0TXkx4QQd6b{!xXU<{3Lx}Ap0G-mc{X!uG9;l{#_rd``QgY@mz+)k0+
z5!1)s?priw(zT_fwZiQwWRcR0*EqPwxtCaHG}<Mn>Q4XItX|B(3P}D=L4)0DL+w|y
zskg1*jCvgcY%upw=L#k__x$wk?Evh$xgqQRx-q=@{2y@f^J;iI|49Bv;o_eb#@`$-
zL|#=3{sVaNd+z%UFG$Ys|Ex!IoWhc2HqCqYF(u`qA|eH0-1@w&T&rUD<>Z<OIrjHf
z9fEbqd1}XPr}K&22u+jz!tL5)+bMLLDpUmh;@lq$*v1(LV{32-Os_e0L!smn&f=?D
zy1U|`Pq1t<X{&h$VhxJi3UeN+_+*aE2jgwjA9CX&C;Tekjrvi@GQ#;2_oqRXY7$7P
zh}iH5`Msl(UbLxFwxP&7BD>*2(Q4k6c#Z@X+qiYvz$6)w5waW$5mEUB=P`r(iEZtG
z!GKn677ROTe*>cTJl5}pLgh0tivs4hbWpTu>s_!P@AcE=NUXbWYLWIJXJ$9YvS-E)
z&VGj%eH0I+ZT+gL3o;CWbo`dH4w_E~6`yF>28IIUXxaPkwU|#I!VIxLMV?G^o>{Ao
zEGkr^7Z`G~5XF#d<c{b;pm>Jk0~t>8n{O!Vi2Yb`zY=^D%raPR-<2r$Zhc^OWZY1d
z`Ji-Z?oDo0$c@^45mTk8fSHd1$LJ%AB#FaMaDa8yH#1OVFo@`EKbcvh%xQi*HK7OQ
z#b?Xey(8jXj()%jpj;e}^}ncl$LPSeZCx}*#dcD0MHN(R+qP}nww;Pqv2EM7Z6_7I
z)Y|8+Rd=6_bKkq|wYJmRY;z>P#+ZHdK1O=~`u9cn2QBKA7>e$ym)$5(=xAxhk%vv}
zVdgy|^uZ<TaAr-8sgM%kFA7w+fDr0b(RpBdwV_j7GgTnbIc9#PnBYF|at0u0=CANw
z(KuE!!V<R_Dx*TncL=a9I|g`UzE`GZYkd{ahRa#&JvDJ!%(rW3vTjQKPO+#jz0I7`
z$6*1-lq!}lzsW#CgodG<UuaIE(A&i;pG_-GANpR%D_0K@UmL1bv9L13DZ<#sNqb*L
zlvcS*i<Ni1Q}xtA<m6YMZC+`r2sf(%jsqgnVuIdMa;0O6zh|>dZ>s5NI*xXJT(ngD
zQ=ey{#K=~Qq5IRa8kl~IU$zT48M$$#O-g02|BN@J2ypBrMlzGcf%JXU#ABjamT1~q
zdGKRu+e1KJLOu&~<Pm?0`4XP$767(-jWV86%uS2hJ*Y&Pu#=lUHVi_)<%M7riY=h|
z>PhJ{!;tQFj~Dy=>w)Kc5X+&gE!ITg&5=8-vxYA1VLlhogrT|{K?7Fc@~-^#3FB=a
zz9jQ2=&zWThBUQ?|G_5m%P;@`ifRANdH(}rnn8-fpZLU-51`LK70}hyvHdT|ilB(N
zynw8hh=jDbfP{dgJdeDHl%$rNf`kN*tjbpl{XedSP7x2rWFPVD*Zc2qiU~><QdlhT
zZ|xnrAk&~kh?~XFykhzAm?3dlhu$r45C}$2vC3;27fYJ4$aftZ;b$JiwawI27!%<K
zdnrb(&(`?#;)=X#$-}cbfhDEFv^}ezC=_6w3=$#RB640m9)J4&6xe2M))D~@2^E_M
z-jUyRqSsb}s6OGQ(%#~r9%eU;5zb%h<~1o?2Z1jsm1e=f^%0h<OMF5U^-EnP7p`v_
z)E5U|8P+;2MbrT;s<KrqP@LXN@LfYS7W`^28rj{V7@{sLu3QUOm^;50cWld?48>vJ
zF66*ZXa<{$A07u1_tQ0jdbfI(Qz8W|pTUUcrcf@#MAz{1HHcwym`iATyW#wU-VbSr
z07Xz!iWm=w;u$fE&2;Cp3eb)H@3Rr6>O<<PB73jrdc%|D^0FHTUYJTQ&6Y)=cVoki
z3DI-p9AN-~G~bL1&nVzvjo!3Xa9*gU5wV(FgfvlSbE3tm!sU=zi3YnZS!-O#W_s~9
zK7}IrX%6}T@=Rftj4XCP-hX<dlCjGE;V`u2*OEjL#HiWyRSQvZF^u|47<HZa41d|p
zaWMM`yW~iopv=G#N}o`G*<5Sbaa}D%X9RsBV2b>@8{gK|gBzCDgD@tvfBL1`66G2w
z_jyt_gq^ravOlN{vb-|z3Ccdtg!d!_uAfN7q)xFbu1*LGnEFHjKF7~o@Ke~ICxhZD
z$f4C&J!MsFp|~m!ja8oN#Q^D#v0$AE#Z;|iH7qJ-A1v#V2cP4fY)BX-c<xD{3p=$9
z;r8?Ez7{){W5OuROltFx*B9T)+?yV;-ROWMb(ijo9)g@F-|Cu*%Z6}<hbMumHp+|&
zAm{jC#{eVlQ@N^RebNc%dI%<l_$IB2u2<jO#UL)T7^{1a0BW0YTm07NaK{`I`2G$_
z<c7U_A_Yqx6j63!MRQ!g`XFvhRj==|V0tIH%>gWy&Y6RM8NuP(Iwz4i-=o0S%C0$+
zK1iZ|Q&3sFY0>S~{Pg*CL~AR_{>^p9iHj`cOQ{+a2}#zzwy~d$0CqfiDJW5sw$;ja
zmMf*0E{80Id;k07!>UgQeF!>1W-eZHj9q!MN*Tr)0&#EjwHDYe*O8@C8t!NWZ-Kq$
zC_+!Sg;v&&V$hDw@9eoC*7!_q8BRviYV0%mV2&OIfawT$l!J&7e5#7l;?Oe>!qt9i
zOb~E_lf+t#z6XtxGt#du6Y<83X|zIunZW=-41S0~?2g{=AKRD>_~9`N#xj;G7J73I
zt`h@VmtZG<dZi1Y%P^8Ggd`#uK{B>jf(UYr&2OM9*%S8bW9HB%q$l<rJCc6Y-d+DY
zG_H#wn3V;8!SHH*X@A1!#iu3A=JIHc6s{&pDkG^QnDDGmoHu4Bo3M;}rT}>G>`1D)
zn$2Z-TitCFQ-wQ{5?pp=UUcyG$NgOM)s<6Mv{y!WTQPR>aBqiWa=9Ar=OZO}#FB18
zY}(kL=6`6M%C>Aav*UP%yUIM#dNBRC{O*zumD=e3h0=B{FSDUN+?qAm)1QsRYQNS=
z=mF)ns<_l`s<x0hwVu%hU27ZAu-gUwr)z2&EoWGF^<Be9hT91C=|!q;_-So!r6oc!
z;p8cK&e42ZaLzBF@crd>cef!!-hBL>nI(JlT<t0~fqW*<1&yaT(Vt+L+`g~v<YWOn
z-?TCz&1+8SI{}9d{8GY;2mHHMF-A9+s23Dv|7$VT_NBqJ=dsck$1tyQ8F#4Eb5L%K
z+4)(aX<bdt8?hXeg~}UdsAo2xrw>Fkglgf}4mW#G_dVAQ1&ZUx?+=N@#B_U$O*=c7
zmYy&@T@&*(Tw3KNXBI@%wyI6V^kscByg3z<&jzg??=`vyBqUL{0`=Ty?SyF@=5K#c
zZ)K&=5_*CH0Q?I0e;t;;CqTb_`~&b$Njd*I3jQ4ZgJcKi{~;--gec|ozfN;l$P32)
zn%J-BA5Z(&|1JNXl=IJ7f28dH9RG_I{0AQE9^d~u)`>o@MgNpA?9cU6|2d+vH?Xt+
z?Q{HB6NXUS-%j*j@4q|I9b~&CduX8B9w<sR=<+1^*dl$rLvW@*gs}@Cr~6mP^F`tt
zCn4`PY?jL?fGo$|#_g_OuDeyFE<vG25_tHed*)YwdduirWW~6KN`-6^h#E8|E-3&Z
ze$W!07=6yO+mZiiQ=gR4@9)za%mx8fNW2BT{scm!^aKvVYTSy;TqJMl_$^tp`PkHY
zhTeL_)76fegE9w^(oW)VD**HW$uLr)a2-!C>T@S%gg8UJQ_sFDcYAMF$~t2&olqG;
z%Q?C>Rz1Q#p3Caqd@zD>N{->?5y)iMRgnMnJlQh_!bxxujbEL!{<jC{5F@qvKEH57
zZ|8^t^DNv~mT{Mo;c(X*MI2jfVda>|3(sgwzKeT1_8tu#v6(m;gP0sVH%-cF`NG<x
zCcY`Q`uqfUx!AnJsX2`Vp@n9&hsK_exU*H<IrCs!)BKf%d~oGgR1;Q)^T{6@B~Wh9
zOYT?v4pk{HgS=1^q~9Bq+ez;Pd==tu#Yf=13FnC@Nlw1MBp-(}4NcQ7_CPr{N*@2w
zphGQG%NY5Q|NUkAzg*?_2AvwCf59#G=U(`0SN!)4@h`Z=#yDO-gxRY)PAZru?8R+)
zWh7@7#)V^$RO&I?n(GH5SDfjOK|Z9}u^~2rxra)}-e1qoJvKRcCT&-XMMSpG9WU-r
z93N1VP7M_lVV(!a#U2$eb1-T~bn616lKKo{rVgIy$WUARE2Lc3<o66m*Y%l7zK@{R
z8{8DP>iFSp9k5Cj=c=e&bq(<pbaF`?@70PI-?lKdHjf#q!=;Eve)lq+%H>QguVLSt
zlPLz5(oci@Ip(T5QEWb^Z;+j>h_}9ASQtiW<&4tLL1AS%ylpM15!oB$bGRuak+wAe
z{EJ3RMNV<RJi1gdXeN*KJ5^jUMtFAB7I$LamQ@M%GO19r1DzZ<$;duQ;kZN1P?eF#
zXgPt$iHZhXIb3}%@S9H}-AG)sp;YWKw%c(Et?mGfdkGuHfHf!=Vo(s_{njZT*kCp>
z1uCiGNWZyG=5A7nS&3YnxE(Hb28o0$a71@m?I4L6fnO2J0hDImfVpZSi_|B_;Z)PH
zGS9o}){!`}2{t!`T9p*S9(^V((a364OR*8%HUBh-Q_Lo8wJ!3aSS;9T<U;ADazh==
z(Qg@r)Y|Uoo+`+n{XSm~lqzqCyEt@5MlPzPVoFf<tkXcNW+<v;6z*yGoZXmLmB-eL
zS&WI@xhsBlqJkZbYpo9{amy^LZa~mI<m}+jmvC}vXc?i1Dm6W7hMLJ+pr5oZ5E%=g
z1z;DcYHAJ)@KLAuyg2R;^W$|2Qvfa45%(+h;pKzFx_*#Lwa-xgv)vvGEOb^`v3}2R
z6QFEXCBOnWfE~HSfZZ&%gc+c@bv+OT9ePbyT%Py)Rzrt@(^9Ld5e&!p0(M^6@@7;L
ziYnU6{Q|j)O{E+u*h?l81yw768^8p(;d6<5+hC|_X_xaGGIEbHUM)@K1{p`&&zbk|
zB_}V88ZIu(nvTv6ub<yu-p*Y|^Kj7F0ly7=wQj!iw$P~reRi4sVNY9V*_p*Rp?{B6
z3hH`Xzy!m7lguNfA{UAemPODshU(il0zI|^<~=sA0BWdac4+4rMuA`o!;Ob9YBx2q
zOMS1`BQzPHpXeC{p#4F?v`FMN-DR8;x-ymh;vklUMoh~s4TOtAe9zG$QLSzc2#AF*
zsJS}?BvMtZ?b;~e!`!_OGD9_j68cy?Y#Gz4;?b41glPDs03pEG@`1ru6Rpmfeh>Of
zT4=;LfJPc&B-IBg)*ys2s7+^?hp=p6zu5y{Gu%Ks)3<uCQ3<1+#e0sd9f)0*F!Zp1
z#p0k`Jx4V|GK=wj0v&-$Za`Qjl-1E9G2rWORr3rgWheQ`4d(TR*`D~o?=({&SmaO+
zKa~lRkRA_W8}`Mtace>+C^V@7+0oRnMFMb1Dhbf)m|=uSt6kV~J{ZhYNy|CKu1`0<
zuNjOXCNoKKgR3>lB&T{$4`7I1W3OZsNvP=42G0>uqxJA~2JxDe9J)gXN_aYud^B=p
z%`agqfLeTw-C=46yicOgWWadr8QD!7nJVgEh42y^r3CGY+a$eB=5QaxRhIHLQdkQ<
zCk2a_Kp*b+t3LAO9Z!P`z*Unz6oD2!v3$&eR_gU%;EV)hxHrZto-+1f$QamcZfSs9
zJ=4*##`2)Y$w(|}8#m7@oTJ5BB4o!}YP6f`7C7l7VD*m)u1{z7gbXWK!|lHmOR8Lk
z)dlx;vH`hp#fOJg1P7bK59h6YVve_NrM!kAG$Xm65l4^GpD&G5Po0fk%+ofNbsPXk
z32JN55z)LNO33n;>V{vu1Y8nxqwf2Vy&t(binHL`Y%qY?Y^Yecq{&LUq%Tm&<UC5p
zCpq3XR%0Ja)cW2O7=Z6TuDfrX*T8Is#~c;sQA#%Y$y10O>ky|*uVqD5-K#}(iUJ;i
zs%7lhJatc{h9}Y>qE6y7TwS_(kM{lME%FQYB2EnuYR&?WTxGi2%v(JG$@IvJP;AAM
z$oEf(>9NfPy&5#$eafU3y<aidy#krc&l`PFf<)#pEaOEouskCO+sooCA7Si@U{rJ(
zdzlP|iAVf3%dEx9>1?;{sn66tS3&Abf*M6F5z6Bn>$ttdeMf`3RLlzMf$A>XTEvAH
ze`csa!H;G6X`cu*kXV7E{ZiswQyv<fj3D8E;1dRZx95;9kEL2kAa+t8f{cD&T4!WB
z$^Q&^E9Um)HY{9-KW%oEcE7qZ0cChvD1qKICR_otxbH)Yy%2S6QPdTpzV5A0QLc&j
z-bH2AmyLuwdvi!RzSdIOPs9K+aIBwP|A2|yIKL7Toi~%u?u-jvF0GZiM)z+j>{VR3
z9Y8lRn-;FysCQL+{wQ|7QIP!KeAyUFllEApF#JJZ4Cl-R5$$2E8N_96pc}#8Kr)h`
zx^M39>>kB2t($MKyRyMVk%&6Wx)7KRIuL=QP+Pmu4?Q$clk;AD76XThX1LtVpBg=c
zTjeGW2k!BseRsb3RjMuZY;M4vE(F~*ZzmlUEi}HO46>q|d%-N1k=7@74NH$||HMJm
zX^ysV&nHvHvWK^bw=1T~F%__Rk$F&=RQzIsG^r)I0el#>g0yxF2*~4{IGRYOUX#l}
zi<VMf(276K_eKJUrP8Jnc0Y_AkX^}g+>2f_x1lD1<P7+!(gf&AieuJVC`RF1QpWr9
z{$5zf<cN7YEkLa>@^RUKWXyT*YFnf{TVv5S%4x-;17>JE&$0lUiR>DtwOdCmLfj`Y
zKGB%mkO35dBumEwh%*|Fz7kNUBypRXlsbF;Q!wy+Gz5`vU2aEG*LqZzX{R+9EAm)E
z!>b>y4WyC4cBYoVY*qcD$3zb4RH4~5{#7uun9ZPafzPXxNUnWtEqOqC9x?hXEX?8i
zy5%eIIJ-o60?7EHd_g=Xm`q6YExas$aAxJh^zTlE8S-Z4V`>LQFQRVIIav6bXwN2U
z`!vcDR*c>041WcNn@omtNykVr`MluEG_Fb@oO%5O`wBGYTkt`cWpjN4$sAr-I1Hvy
zfV!r(#n-sp-UX-A%DZa0EQf5dd<&qqu6pUKnAowFV}=#xkP(yt2X-!=T;ikTs#w<d
z8f0cI@x)uSzX`<Z9ivcbA!Sgl5}bk>l*iZyGp`hX4am%AtMe{`D7<tc;j;;bycUA(
zp4o!er0sYvT2B!^bXO?@naZheoQ7qb&YNJa_#8&_RE9*h7>WV3+yG;o_{`jYsU1)_
zu*;4Ka4TI|dICnY7s)dy6FPohPH;Os%1%M-RI~fzz=Gen`Pm+s{(jA43nx<J02d6p
zw*z%9oTz?(m_|VeJvW+T_PYyA6#_^`5mMe~qsy5Z_TFeYvYRz5v6HBbw&wUL%+CY{
zJT!5P9^s>XlJHU$pM8y`zg-M}f=dDT;-6PTvLOyOJ}*3L1FKz%zI1Gyd4HsrE=-MK
z-R$AYUk+Az{;2ShB2!u>97rcJ%jM&|zbYO-RP%+s#3wnM_}V_#7;_shnOwJXG%M&1
zy6}V!?UD-+I7}plI9Wd3nNVc6NM1U;VxxjKB6+TaeTmz9Dah#DK0bk0#BDYx<*WBv
zX`RwZ)zbmF8s)7D(kW8JBu|5uv?)nk$ir$3kr<SK=BPZc4Hyx_RW9?af(n4!m7WX1
zsg(Z7qhGC^D{u75OQ9+B`m9#w>k|ia=0%TvUGKYS#({gxC?l(!eH^`(D$viRQ&9_O
z`ncL%2A6|)`5in(Zgk_BMABM~7jWp?`T8UeaR+L?Hk<}5ii+auP|M<3R&4g3C`N;G
zt8$>>5Vn}L-ebPvHUFQnz4*pnJMISQDter*fw)R6XkmBQ{oJab^aMw8fvhs<;^N=a
zbTE2d4Ge>U!Qb}@6TUZqZpij@7%>Dup}coED3ZCL9SIKAR>YQ_b-ihnUKl<n2{(ty
z!D>tqsN0_~`?Q`Smq;0Iv8DsN@NZ+o^oAkXW3CC(&qF|za;8IOXopL>H%gsB*MMo`
zSu=yekz1Wnk8?82$bVqa@50=Raa|<|K{If`X&cErSI$RkNf+3;bzkh@wVTCGv<bqH
z&rrhr2Il8et}QZo>OB~<IWJB*1z!u-q?Bli(dm9vOxe=g)e&Il;wHhDcu99DCr1aJ
zM#+miJ_<4J)##VOp|<x;>X{<U2`gZ3;$?>N(e6w=j34h}G+G;rdkr6m8*eH=sZvxm
z1gxw)7yx#eCA!u{VF2+!TJd1INmZm9J+#-DEmRSvpYc4uYYda!hC<WX{E(Z#XD%3=
zE3hgx7D-2FrmvA#DcJ)~GRx$oeOTf@RHzie#tu{^2nzPiH}wit!IVhWM7^Xq{dT3d
z<N^0uTNIvgXkxdtBd>}P-0Y&L9lEZ-is>>3coywZf_60aLDn>S4c(n5PY=+t;zuXe
ztrZab2V0Znval~G3a5y`r|_&M0=vmro`;UC^TP6BaaHerL;|SK@$>$W#YK)Dj<@YO
z?DLcgEy~JJb8m!BRau<HoN3mX5laJ_YgIQZCj#PZj-F9!GQm&&z9W%iuD%!V$su^7
ziCar`aR6n^{A=G_p9RdK(DB8V-6f%PLD64iQ3WW}2T_m|2a9a;Q>(Ao$wxD(r3-MB
z4juu@L@J|kbDU^Q<w{wCXfk)nB?+?ONAfs(WTa-Z<Q#8b=Q?n;ylx(ir!Si^z!J+X
zqM0zUfsMKfm~K?XyV6NH)Ds_bk~T|r>rzG>V;h)37>0ayg+T$)l?xkScKS-i6Vh1|
zxHj6`&9$yRRfjiS>%V;$-iBp3L)C+lc?7{oAq7G-!yzdl=r&U8;S|7eOR!HyU&)Eg
zA~rc;^A+6nOu+r37ddnuO{2cfRM{TX4E*_UyJE8Zj1Oxwk_V_Lb*p|P2x=kMm?N?7
zOZm*Q!cb?RvVFU1mtx2%rpdfuvHX{lqf3FVfl;HzqMj&-g_7RQAB3hZrRc0lOBJ>T
z8_g&l!i6Z-7oiCrCkpi~d)>P?=XzZ~TJ2G2Vy@r>!WAJr5t1-h@a;#^T6rHmh)JOH
zO9qcRG^KUr*Ti&@YkCqS&fNkmBW64(zH{bM7S((ia)X<W4KHubLv?-h5UrsZqO&Er
zk~nXi6X|;3X$8usQT_(rnkzXZq@4)QFPhK{mB8xXS*EyLXnWqNDy7tg(0-&}RFJi2
zQP~f{iq!<KKWEX{xI0fl(G-Ci-`GbK3_^1;dlYQ?P>OO?v{@A!)1H#~S*Zm?W+@zM
zW48eX&rJbGk40G7iL2o!;r5roU<DL^5GL>#XBb1(GC;$&V0X?-pvo#Xgt&}Z)Grhv
zs0sdJqNkUf(z4aLS-pzyiZq@{wy_niFZ-w-{uEy>6wYljb)%?l=Djv}qh3eY?<uYi
zomStMf?nH(+1Otnfd*b4$ZsCoFgkL3^(ug(KK^>IH*lfohw!5_7^CTVLCakrtbhZ$
zt_-AvsM(Cj-NM?8sC}9xq1bTJs1;`pT6Zh*eX1ig+X;rx?eOdPC16f-4ezK`<Cm0T
zuX^gPAJ&}{`NR9?td^vYFmp$2%wXAhWz7+Mk79DL6uUqM4?eE&!OXreKu4^zrXm<D
z3`&Y5G&p__j)QpZY(%I()BUo|wbKG6K!^*~ErO5ucS9$-oKe5EF6C<4p=kSq&ILDN
zJ2mSm=31+wD2Jd)<x^n=0AeW*%^Zei#;(13%u~!+PRzv?PCJzq4EFm*)HE?8a3`?J
z@2|N{C`~edZn(ELsBaBm-QQy1Lbl3Mm9qe)cO3xN<RUyD+frS)LfI}=U+}?BYSjzc
ziCoXWLM-?pm-af3I)D2kETqK7Yi#WRK55WNZWzt&s4;%V#Pa!51t*IlkE#IhbfnzI
zP_epzrX|v%EK(Rr7$mdwD2bLMToP1DK1F%~g=EU6yVfO}iC~}4r_xd*9dA&<ML|4%
zX^2vHUM)#iYM0J=;i@J?<2c?aV10&ZTn6j(!1AOij!bdZu6s$$jNlC`%2A#Ju;N0L
z)zozQ5T#EJB<a_AS5vNE_*&0^D)rV|4BHsQ=SuGACk#&mnMPu(9goL}beGe;N)VsO
zXNfm+?Ue=hFgPeK=_OQcVw!oxcU|VrEIw!_KuL(MI~y^~<VFW4Gf~J`lIe##+PAtX
zq07k1<gH^8c7ePIZV=FYnU(h>44qkU#=~uq>MVfEV5&VrSQ`o5&TI>>MKw2%T$;e1
z?J$oolH(Q~%VsicZQhFf&9eYT!zic^LdlU;*R#TmqyZ<)poUs#n{WHXF{Jn+`I1$A
zYoQ#pG-;kkXk_3D)u@A_`uDBB-7h(o>y2Mj64BO2E5wFwUT?ILn*qn7<h6)Bwd;{N
zjX>vQv;{5E!^`v&7OHbyCuUa*0pb*%h#j7@W}oJv9OM9)4hj@h-YnBP%tWE<7Mvw?
zYos!<7%~{AGy;gK0}~-r#t^%M2#S+$tDr9kU5U_{U5=ydxQ!l28z{;P6@6umivv@v
z?<4woC{kM_Di8X8Jay-<{kZPS%R{*e40>d(TvaiuqR#fkVnSj&d)UB*E#wDAonj7k
zQmu86CH7Rq^dydiuED+`-?*!F$*~OJnJa>oyEb_+2taFf4U{uOB+Jilyci}pJzb0E
zm4=v*>+P5JKl_wtw9WUL{5;JKGE3pGJNl3V3!RUx<4}$nGvH{2lpz=$AzHe0VjcrM
zR)|-qfga^`;6<CGzS?Vr+SE$hw9*yUd`2@eE2BhP3Fyy->L_zE$*BNU#&rzlymtd^
zS%*IKWXif&0eoGDJA4T2#JzwxYyi2W7M=lz<3%cTJH`ds$24^|(o{nZg?H?ThIc2%
z?`)ZHM(J|H$bLuze{gyDENb;Y6L%spZ^N_N0bcdfWpi+y@2*eXEvokX$FWm3&*dvf
zwK?k(f+u8`&yAd{TObJdvpuX;wZ|9&6A4rQiHecBmMcD#vW9zotDa<9Y3gOwrRafh
zSG#KNC|*%*7@1#F>*A6e*v#kT$e^9T$F_`TPm!!7%AxvJH1XL<DAevNAkV>60DWT@
zG&<J%`jdj#FJ2W&xXn2|k^M9B{!y@0GM{|4eaRX+H_P24JjPeqWa<bN_HOJJwlkm3
zmpCt~7e^r4BNs#8HH^vJhy%?Va!%!0+QMNU2$Hu#k}+;`6Evu<0=`mjV>Di+V8p%3
zuWtjMk0*zxv7ofdslE-+1?Dn>Ue7lgd`HYlzWTA&GB~%E$b`-N3NuOgRCYfJYMH?p
zJzRZOWmCbTaSF_w;J#>Nq}zd2<8!BsKtjWvPk+jq!C2u_FlEZ8)a6c-vS%<>#+FoS
zxFhIDU4xdM=tdIoMmi}~fZ<&)mQlg4suLqW;~xrpv-(BzkQ3yL72u4M-~`r<)s4mZ
zXRvQ;hbGvwz2&Ekg%Tg+>9hAgDnVpt<tzCp006(T!T&f<{Hvt$?}?oLN*Mp+lFENR
zk<;%$2}St-QFZLUfD(LCl7b>a3bKFTB>o5ZhyW!Es})B0w{a~SW1l71)Q7XMnOeJ5
z!@<frp5t>d?b%xXl~W=a;-W>tnD=(JcH!z%M}aBT-7C#ZH)nT9CiNcYzPbRl6cr!5
zV&y@D{HBCr?bAK6$48>uIAk+M6%pVf(PDLER9PKFs)KHC4M^q38IfoD!PZd_$mfZG
zY03Jklpn3~pr5{Xf-tdO=PODfj&W-mC~hlS1SGkC{boXJc}*#2rb3xb$D8}@)3imG
zUCL&EJ?GYF{^~Un+Dx|gmS%~pvFz~TZe`}@Frt!a^xDvRxFD_g1O~o-!<v+}#IIWU
z28D%FFZee1&p59ecp&Kwvie0BK-Be7a*cr>h=Z)an0a?7Qv@n%VRI!Nv4k&=>`3e6
z$Eg$vkeXTbpcCQNpElTHX5=w{b||W$Kpt%;pHlTrjc3@EK_x%1tDLbCLnW1}uw`Ia
zqj{?oeG*W75wWK;EiFe>GpS1IxPWfm$A`>5rGW6F2@mNZND+XB;N`mn^#C4xRM)p^
zIk;RLm=-!B#tzOS`*vHI844=&f>A+XikroFZ88CFJbd!trf6<{fpRPBuT(q_`uerl
z{p)SjexK~Ebb{^u*oyK&q+b7>q&z$?-K0|28K7HaUs1`o>~LB~Paq*7Bzyc)JRBac
z`FnH0>`q#D+cogo{p`csyEH=bFcVd1H6I|NC6c~b&2WwAE~lwEk6Z`LoGsP)U~!@h
zGRzUUZ8c&B##PGQFT6%nXP+{h6=mX+^l$yd$l0Z3;n3HIT<AGfC@!(ivS{mAx)agJ
zcHO@*fA@pGa~J#Mp9sl3*Ix%=J0yF<K2R>KEAWQum_MBvEhgbC`1ybU)6T0~p~KwF
z{ITCO0mfr1qH<jpK%!%Y7~cm_5BOf>bFrRVt#yBk@Qnz|m15%5FxS_ISD%>yTo6VI
za$)i^vPA1?GzjK5D(<lkT^}jdbuf;w`5?Kb6K(0)abH5`;uusY{z3A}>Ybn3dE^N3
zK99{u)|fj7-X4xQhos4}M7C4<OOS6-*&vV#;J#;Yi^-g8YqJu)Qnj5%JqS$~Oy60j
zocl78fc>Ezo`&}^+{Q+(oyYI0I+ozGqu7YJ+B|(g$TcSg)0}NyV>Y2T2!rksq1}pZ
zQC)_r@V-W*<y$V)Yu_$nAtbF$a_y`mXJ|RlBgxd)dR}H)TrY9;*eRgYJD4J)!Pe2T
z?_3pyP0QY*Yfe~;ucHy<W~?lRGsbS8<2%Z>%Do&jmV^0GuU9S<vWa-iNFQfg;y$mh
zbgUxOrI+hUZZzUL-ecBj0FzHVKu9KSSt@8FU(W}xVI#IIAz|SmV#%Qv`ccf=a9W>4
zxx-nAHQ4O5KO`rrpIzOolj4lKow6)G0$X6`K?b@T9=Cbxf0t$bdP+N)z!v;%Or#+3
zb#14sz-&;F>%6aSrBlgm!K5|VDnSsvas~LoW(|`$3zY^fW?~IucC=CwFe1R2AxJD~
zz+^lQ!7}Hm;w1!JzD{-g+2^RY0IGvpwS(GC?t)db=PvxvWudlwR4&RFFLj9r=4)ny
zx18Ig0NSv|>4*k)Y|Cm=i#<)L(I{5N3q>^Lh4r*@{}vsuubKE)CNQ}$G}@{|_TZ@V
zi^J+CMM!?fp(>LAwk=-LF2p4z%We9f29CTapj#|XgVqFD+5H!=X0*IFcbTRNqsnI5
zN1}a<jkqz&=t9^sXCbchPrh>fcTY=8)aeTCO>bwX=KG`p=&H#HCqjsy7h@tF52)h{
zO207KVNHqhH0qvjDq5$O?3g!-8G)U<;8*8<fUt(AwRGo+$BSbt<+W5QHA4)M^Ftq@
zzT6>YSv4wGrVXnqM9+iY4%b@=B8h&X1>iE(L(?XB6%X28%o5yw-lT3<NFc@;yBTU3
zr6@@a(Jpflfuv#a%t7~6gCN?{YU9knQ45jsv)+i~<O)*I0f=__DjUKjqJ*T^+C}S3
z`9o}f?cD7yy;9v!ryVMYRciUs-JV;mWQT$A2Xz{y>_fDCb5BSx(|g7lv<GuA3IRLL
zNzMg3z?Jc!d<0Ok5?u+5OpWxoIN_0O6rYt(97IzDTN&)F1<~bxZ64tq-H1DB?MBG^
zANpFVIIDUTA4u+Bhtgk1`0rqjf2qp(*UA0o=(keu?>#;L0?_fl$$pc4$bO^9kUJdq
zD>~5Z1BmrTp7Kc`Uu~GJ=h;`9ADz3YYL+j<vv20DiDl<Fx#ae5;>y;>Yr|3@e~5Cr
z?G&4vTJmPY1b&EeCTO;<422MG?aSNneOm~J=?+grn}PwRm0&ZER76j~zhTt2f*TF$
zLBM76#)LG~u2l#fNY}N-v$$@x{47KY7p=3k{r#gStHJ4aQBHiZKSVhl)@Of-a$^5Y
zlvD7(L^)3$eu;A0;HvFAk*U7_O_UQG^}mU7x_|i)<qTgS;EDW0l=EuoLzHt#l*s|s
z?``Hol=JL3+I;^3cpCCUl=Ha#e~EJbd?9oo_$bQ%@1mT)Tk6+k>)$J({b{Iwf?xSZ
zMuYgz6PBgU`wPRO@PStPr=pyHeUCp!zir_^I}f_E9*qCj^LGH2x_Akz6&mQki)R$`
zdOo^N<L276%{<V0)E+SVmHb76MW00UpdSPnv4{;{t~W@B@Msfn>$|}D@`T&rMBMOQ
zpvJk#nlVKj6S@nrKN<A)9R5V<+$I{?Z1EwckV5sJTF2buMiPmYuF>+*l3`xhbk-o#
zw5`-rQ1R0RRhc(>`Yy}Nja8n;y02>6RCU!XC6Z^5pI5~2WjWT=ujO%Ny@fH>yH4L{
zeX(2+#HD1UVx%NyQCV#H0l|rEjX_)p$JA##yVfw*fFzubF=&B4Vgj2yKGq?nN8pY*
zh+#R_K@t68j5VmngdVkDv^qs#2rH?_rPjsu7K8k&11teDDVr1y^sstBGes*j&Zz0O
z?H*rdM6BH*$f#ireD#2Mv7NIgXK2j|m89Nwy<in25JPx??iEcFrpc;pNCqe9<W=5*
zr42Hb2l&iQdkO9qUpJfixcyH}<VCYGrPHDlKHUDIqb!P=WO89A+AKPDb4c!4&~^G~
zYFb_}qZSQd=VkbIZ?mD84kj*2aCZ5I!z(;#G1?a9jz_rJjcA4!{bIO9)Iy!8ATvBp
zP7GshiE$kfp?Zz9;Afk#(n{%BIlQGoK*wWVa90->mY~{HGDh%wd};e`HkidZW|CXO
zfO)=WI2MANU90r7FQCU%&6A!&WCGQ1p?BTFYZs4Y%e%o-x&2s((U?EaW3%sm7KVbg
zKU<r#>mf{NjV78ero8&>K1wVyosssqF`ZeS!TGt3m13UxH8E8Dp#Y8)8*<I|(NObi
zm;M!kf8W2q9Q#)z;lHNC{d4>N6UY8<TlqiGtA7u79}W2bN656_y!!Wk>R$)bKb5ki
zh4uan4LaHKg7HW1_>Vkt$l5#ww4F5r8@G$Dv3(U#n@`qllvRY|V&2lPDn)gaZg}vO
zd)*ooOVO~^cH*jOpTv^b*5Q6N8Sp*rVT*pu`PaPvvh(jN`o9yv|Iy<915MrPF7{_{
z!N(W-e;dI6Y_ss7JT~_Fcz(VAE`S4n*aQ5d^#cIl!wvuV`O7}PPvifNAO5!){RbN7
z_k4yBH~;|0M|Ap!d=7sFr9Veh2F^Mb*5(Gk`Qv{jc>YD(M_+=B)$*^l*Bdg+*1Uw^
ztgQ%HdBLL{e^m*!fJxI>U`iIpU1lnoKBo;9{4N<li|IU$rPWstr>19&8zP0}PH=IQ
zGa^x7H)XQ~Z?B165;XA#g8ZqDyVhqxySptw{Vz0hqHtYCCYYtkusKvSB%L^7vOb<k
z{9q;{(6Czxo`B)HZ(u28AnOjYr~~Sjf$;Y;YZgZ8pM<Mn2DDNFi(tSmR?W9!p!_fm
z6*gs}kil&{_Ql|5EgLa>Iq+~MuvRg&=>nBY=oLSxiw%0AeX~SP<P&Myw&;|}^yKOM
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

literal 0
HcmV?d00001

diff --git a/frontend/angular-clarity-master/src/app/modules/main/builder/dashboardnew/Data_lake/Data_lake.component.html b/frontend/angular-clarity-master/src/app/modules/main/builder/dashboardnew/Data_lake/Data_lake.component.html
index bb62d9a..2ee46d8 100644
--- a/frontend/angular-clarity-master/src/app/modules/main/builder/dashboardnew/Data_lake/Data_lake.component.html
+++ b/frontend/angular-clarity-master/src/app/modules/main/builder/dashboardnew/Data_lake/Data_lake.component.html
@@ -71,13 +71,19 @@
             Calculated Fields
           </ng-container></clr-dg-column>
 
-
+        <!-- Webhook Status Column -->
+        <clr-dg-column>
+          <ng-container *clrDgHideableColumn="{hidden: false}">
+            Webhook Status
+          </ng-container>
+        </clr-dg-column>
 
         <!-- who column -->
         <clr-dg-column>
           <ng-container *clrDgHideableColumn="{hidden: false}">
             <clr-icon shape="bars"></clr-icon> Action
-          </ng-container></clr-dg-column>
+          </ng-container>
+        </clr-dg-column>
         <!-- end -->
 
         <clr-dg-row *clrDgItems="let user of product" [clrDgItem]="user">
@@ -104,7 +110,7 @@
               <span
                 style="margin-right: 8px; overflow: hidden; text-overflow: ellipsis; white-space: nowrap; flex-grow: 1;"
                 title="{{user.url_endpoint}}" (click)="showFullUrl(user.url_endpoint)">
-                {{user.url | slice:0:30}}{{user.url_endpoint.length > 30 ? '...' : ''}}
+                {{user.url | slice:0:30}}{{user?.url_endpoint?.length > 30 ? '...' : ''}}
               </span>
               <button class="btn btn-icon btn-sm" (click)="copyToClipboard(user.url_endpoint)" title="Copy URL">
                 <clr-icon shape="copy-to-clipboard"></clr-icon>
@@ -138,39 +144,79 @@
             style="cursor: pointer; align-items: center;"><clr-icon shape="details"
               *ngIf="user.calculated_field_json"></clr-icon></clr-dg-cell>
 
-
+          <!-- Webhook Status Cell -->
+          <clr-dg-cell>
+            <span *ngIf="user.webhook_url && user.webhook_url.trim() !== ''" class="webhook-enabled">Enabled</span>
+            <span *ngIf="!user.webhook_url || user.webhook_url.trim() === ''" class="webhook-disabled">Disabled</span>
+          </clr-dg-cell>
 
           <!-- who column -->
           <clr-dg-cell>
-            <div style="display: flex; align-items: center; gap: 1px; flex-wrap: nowrap;">
-              <clr-signpost>
-                <span style="cursor: pointer;" clrSignpostTrigger><clr-icon shape="help" class="success"
-                    style="color: rgb(0, 130, 236);"></clr-icon></span>
-                <clr-signpost-content [clrPosition]="'left-middle'" *clrIfOpen>
-                  <h5 style="margin-top: 0">Who Column</h5>
-                  <div>Account ID: <code class="clr-code">{{user.accountId}}</code></div>
-                  <div>Created At: <code class="clr-code">{{user.createdAt| date}}</code></div>
-                  <div>Created By: <code class="clr-code">{{user.createdBy}}</code></div>
-                  <div>Updated At: <code class="clr-code">{{user.updatedAt | date}}</code></div>
-                  <div>Updated By: <code class="clr-code">{{user.updatedBy}}</code></div>
-                </clr-signpost-content>
-              </clr-signpost>
+            <clr-signpost>
+              <span style="cursor: pointer;" clrSignpostTrigger><clr-icon shape="help" class="success"
+                  style="color: rgb(0, 130, 236);"></clr-icon></span>
+              <clr-signpost-content [clrPosition]="'left-middle'" *clrIfOpen>
+                <h5 style="margin-top: 0">Who Column</h5>
+                <div>Account ID: <code class="clr-code">{{user.accountId}}</code></div>
+                <div>Created At: <code class="clr-code">{{user.createdAt| date}}</code></div>
+                <div>Created By: <code class="clr-code">{{user.createdBy}}</code></div>
+                <div>Updated At: <code class="clr-code">{{user.updatedAt | date}}</code></div>
+                <div>Updated By: <code class="clr-code">{{user.updatedBy}}</code></div>
+              </clr-signpost-content>
+            </clr-signpost>
 
-              <!-- New JSON Update button -->
-              <button class="btn btn-icon btn-sm" (click)="updateJson(user.id)" title="Update JSON">
-                <clr-icon shape="refresh"></clr-icon>
-              </button>
+            <!-- New JSON Update button -->
+            <button class="btn btn-icon" (click)="updateJson(user.id)" title="Update JSON">
+              <clr-icon shape="refresh"></clr-icon>
+            </button>
 
-              <!-- Calculated Field button -->
-              <button class="btn btn-icon btn-sm" (click)="fetchAvailableKeys(user, false)" title="Create Calculated Field">
-                <clr-icon shape="calculator"></clr-icon>
-              </button>
-
-              <!-- Group By button -->
-              <button class="btn btn-icon btn-sm" (click)="openGroupByModal(user)" title="Group By Configuration">
-                <clr-icon shape="group"></clr-icon>
-              </button>
-            </div>
+            <!-- Calculated Field button -->
+            <button class="btn btn-icon" (click)="fetchAvailableKeys(user)" title="Create Calculated Field">
+              <clr-icon shape="calculator"></clr-icon>
+            </button>
+          
+            <!-- Group By button -->
+            <button class="btn btn-icon" (click)="openGroupByModal(user)" title="Group By Configuration">
+              <clr-icon shape="group"></clr-icon>
+            </button>
+          
+            <!-- Blending Keys button (only shown for blending type with non-empty blending_lakeids) -->
+            <button class="btn btn-icon" 
+                  (click)="fetchBlendingKeys(user)" 
+                  title="Configure Blending Query"
+                  *ngIf="canShowBlendingAction(user)">
+              <clr-icon shape="code"></clr-icon>
+            </button>
+          
+            <!-- Field Mapping button -->
+            <button class="btn btn-icon" 
+                  (click)="openFieldMappingModal(user)" 
+                  title="Field Mapping"
+                  *ngIf="user.url && user.sure_connect_id">
+              <clr-icon shape="map"></clr-icon>
+            </button>
+          
+            <!-- Scheduler button -->
+            <button class="btn btn-icon" 
+                  (click)="openSchedulerModal(user)" 
+                  title="Scheduler">
+              <clr-icon shape="clock"></clr-icon>
+            </button>
+            
+            <!-- Webhook toggle button -->
+            <button class="btn btn-icon" 
+                  (click)="toggleWebhook(user)" 
+                  title="Toggle Webhook">
+              <clr-icon shape="network-globe"></clr-icon>
+            </button>
+            
+            <!-- Copy Webhook URL button -->
+            <button class="btn btn-icon" 
+                  (click)="copyWebhookUrl(user.webhook_url)" 
+                  title="Copy Webhook URL"
+                  *ngIf="user.webhook_url && user.webhook_url.trim() !== ''">
+              <clr-icon shape="copy-to-clipboard"></clr-icon>
+            </button>
           </clr-dg-cell>
 
           <!-- who colmn -->
@@ -434,8 +480,32 @@
           </select>
         </div>
 
-        <!-- Add ref_datalake_id dropdown -->
+        <!-- Data Lake Type -->
         <div class="clr-col-sm-12">
+          <label>Data Lake Type</label>
+          <select class="clr-input" [(ngModel)]="rowSelected.datalake_type" name="datalake_type">
+            <option *ngFor="let type of dataLakeTypes" [value]="type.value">{{ type.label }}</option>
+          </select>
+        </div>
+
+        <!-- Blending Data Lakes (only show when blending type is selected) -->
+        <div class="clr-col-sm-12" *ngIf="rowSelected.datalake_type === 'blending'">
+          <label>Blending Data Lakes</label>
+          <div class="checkbox-container">
+            <div *ngFor="let dataLake of dataLakeList" class="checkbox-item">
+              <input 
+                type="checkbox" 
+                [value]="dataLake.id" 
+                (change)="onEditBlendingLakeCheckboxChange($event, dataLake.id)"
+                [checked]="isEditBlendingLakeSelected(dataLake.id)">
+              <label>{{ dataLake.name }}</label>
+            </div>
+          </div>
+          <small class="clr-subtext">Select data lakes to blend</small>
+        </div>
+
+        <!-- Reference Data Lake (only show when normal type is selected) -->
+        <div class="clr-col-sm-12" *ngIf="rowSelected.datalake_type === 'normal'">
           <label>Reference Data Lake</label>
           <select class="clr-input" [(ngModel)]="rowSelected.ref_datalake_id" name="ref_datalake_id">
             <option value="">Select Data Lake</option>
@@ -563,8 +633,32 @@
           </select>
         </div>
 
-        <!-- Add ref_datalake_id dropdown -->
+        <!-- Data Lake Type -->
         <div class="clr-col-sm-12">
+          <label>Data Lake Type</label>
+          <select formControlName="datalake_type">
+            <option *ngFor="let type of dataLakeTypes" [value]="type.value">{{ type.label }}</option>
+          </select>
+        </div>
+
+        <!-- Blending Data Lakes (only show when blending type is selected) -->
+        <div class="clr-col-sm-12" *ngIf="entryForm.get('datalake_type')?.value === 'blending'">
+          <label>Blending Data Lakes</label>
+          <div class="checkbox-container">
+            <div *ngFor="let dataLake of dataLakeList" class="checkbox-item">
+              <input 
+                type="checkbox" 
+                [value]="dataLake.id" 
+                (change)="onBlendingLakeCheckboxChange($event, dataLake.id)"
+                [checked]="isBlendingLakeSelected(dataLake.id)">
+              <label>{{ dataLake.name }}</label>
+            </div>
+          </div>
+          <small class="clr-subtext">Select data lakes to blend</small>
+        </div>
+
+        <!-- Reference Data Lake (only show when normal type is selected) -->
+        <div class="clr-col-sm-12" *ngIf="entryForm.get('datalake_type')?.value === 'normal'">
           <label>Reference Data Lake</label>
           <select formControlName="ref_datalake_id">
             <option value="">Select Data Lake</option>
@@ -916,4 +1010,200 @@
   </div>
 </clr-modal>
 
-<!-- htmlpopup -->   
\ No newline at end of file
+<!-- Blending Keys Panel -->
+<div class="blending-keys-panel" *ngIf="showBlendingKeys">
+  <div class="panel-header">
+    <h3>Blending Configuration</h3>
+    <button class="btn btn-icon" (click)="closeBlendingKeys()" title="Close">
+      <clr-icon shape="close"></clr-icon>
+    </button>
+  </div>
+  
+  <div class="panel-content">
+    <!-- Display keys for each blending lake -->
+    <div class="keys-container" *ngFor="let keyData of blendingKeysData">
+      <h4>Data Lake {{ keyData.lakeId }} - Table: {{ keyData.tableName }}</h4>
+      <div class="headers-container">
+        <span class="header-tag" *ngFor="let header of keyData.headers">{{ header }}</span>
+      </div>
+    </div>
+    
+    <!-- SQL Query Editor -->
+    <div class="sql-editor-container">
+      <h4>SQL Query Builder</h4>
+      <textarea class="clr-textarea sql-textarea" 
+                [(ngModel)]="sqlQueryText" 
+                placeholder="Enter your SQL query here using the available headers..."
+                rows="6"></textarea>
+      <div class="editor-actions">
+        <button class="btn btn-primary" (click)="updateSqlQuery()">Update SQL Query</button>
+      </div>
+    </div>
+  </div>
+</div>
+
+<!-- Blending Configuration Modal -->
+<clr-modal [(clrModalOpen)]="showBlendingKeys" [clrModalSize]="'xl'" [clrModalStaticBackdrop]="true">
+  <h3 class="modal-title">Blending Configuration</h3>
+  <div class="modal-body">
+    <div class="blending-config-container">
+      <!-- Display keys for each blending lake -->
+      <div class="keys-section" *ngIf="blendingKeysData && blendingKeysData.length > 0">
+        <h4 class="section-title">
+          <clr-icon shape="data-field" class="section-icon"></clr-icon>
+          Available Data Sources
+        </h4>
+        <div class="keys-container">
+          <div class="key-card" *ngFor="let keyData of blendingKeysData">
+            <div class="key-header">
+              <h5>Data Lake {{ keyData.lakeId }} - Table: {{ keyData.tableName }}</h5>
+            </div>
+            <div class="headers-container">
+              <span class="header-tag" *ngFor="let header of keyData.headers" 
+                    (click)="insertHeaderIntoQuery(header)">
+                {{ header }}
+              </span>
+            </div>
+          </div>
+        </div>
+      </div>
+      
+      <!-- SQL Query Editor -->
+      <div class="sql-editor-section">
+        <h4 class="section-title">
+          <clr-icon shape="code" class="section-icon"></clr-icon>
+          SQL Query Builder
+        </h4>
+        <div class="sql-editor-container">
+          <textarea class="clr-textarea sql-textarea" 
+                    [(ngModel)]="sqlQueryText" 
+                    placeholder="Enter your SQL query here using the available headers. Click on header names above to insert them into your query."
+                    rows="8"></textarea>
+          <div class="editor-hint">
+            <small class="clr-subtext">Tip: Click on header names above to automatically insert them into your query</small>
+          </div>
+        </div>
+      </div>
+    </div>
+  </div>
+  <div class="modal-footer">
+    <button type="button" class="btn btn-outline" (click)="closeBlendingKeys()">Cancel</button>
+    <button type="button" class="btn btn-primary" (click)="updateSqlQuery()">Update SQL Query</button>
+  </div>
+</clr-modal>
+
+<!-- Field Mapping Modal -->
+<clr-modal [(clrModalOpen)]="showFieldMappingModal" [clrModalSize]="'lg'" [clrModalStaticBackdrop]="true">
+  <h3 class="modal-title">Field Mapping Configuration</h3>
+  <div class="modal-body">
+    <div class="field-mapping-container">
+      <div class="instructions">
+        <p>Map original field names to new names. Leave mapping blank to exclude field from mapping.</p>
+      </div>
+      
+      <div class="mapping-table-container" *ngIf="fieldMappingData && fieldMappingData.length > 0">
+        <table class="table mapping-table">
+          <thead>
+            <tr>
+              <th width="50%">Original Field Name</th>
+              <th width="50%">Mapped Field Name</th>
+            </tr>
+          </thead>
+          <tbody>
+            <tr *ngFor="let field of fieldMappingData; let i = index">
+              <td class="original-field">
+                <span class="field-tag">{{ field.original }}</span>
+              </td>
+              <td>
+                <input type="text" 
+                       class="clr-input mapping-input" 
+                       [(ngModel)]="field.mapped" 
+                       placeholder="Enter new field name"
+                       (ngModelChange)="updateFieldMapping(i, $event)">
+              </td>
+            </tr>
+          </tbody>
+        </table>
+      </div>
+      
+      <div class="no-data-message" *ngIf="fieldMappingData && fieldMappingData.length === 0">
+        <p>No fields available for mapping. Please check the data source configuration.</p>
+      </div>
+    </div>
+  </div>
+  <div class="modal-footer">
+    <button type="button" class="btn btn-outline" (click)="closeFieldMappingModal()">Cancel</button>
+    <button type="button" class="btn btn-primary" (click)="updateFieldMappings()" [disabled]="!fieldMappingData || fieldMappingData.length === 0">Update Field Mappings</button>
+  </div>
+</clr-modal>
+
+<!-- Scheduler Modal -->
+<clr-modal [(clrModalOpen)]="showSchedulerModal" [clrModalSize]="'md'" [clrModalStaticBackdrop]="true">
+  <h3 class="modal-title">Job Scheduler</h3>
+  <div class="modal-body">
+    <div class="scheduler-container">
+      <div class="data-lake-info">
+        <h4>Data Lake: {{ selectedSchedulerItem?.name }}</h4>
+      </div>
+      
+      <!-- Job Information -->
+      <div class="job-info-section" *ngIf="schedulerJob">
+        <div class="job-header">
+          <h5>Job Information</h5>
+          <span class="badge" [ngClass]="getStatusBadgeClass(schedulerJob.status)">
+            {{ schedulerJob.status }}
+          </span>
+        </div>
+        
+        <div class="job-details">
+          <div class="detail-row">
+            <label>Job Name:</label>
+            <span>{{ schedulerJob.name }}</span>
+          </div>
+          <div class="detail-row">
+            <label>Job Type:</label>
+            <span>{{ schedulerJob.jobType }}</span>
+          </div>
+          <div class="detail-row">
+            <label>Description:</label>
+            <span>{{ schedulerJob.description }}</span>
+          </div>
+        </div>
+        
+        <!-- Job Actions -->
+        <div class="job-actions">
+          <button class="btn btn-warning" (click)="pauseJob()" *ngIf="schedulerJob.status === 'RUNNING'">
+            <clr-icon shape="pause"></clr-icon> Pause Job
+          </button>
+          <button class="btn btn-success" (click)="resumeJob()" *ngIf="schedulerJob.status === 'PAUSED'">
+            <clr-icon shape="play"></clr-icon> Resume Job
+          </button>
+          <button class="btn btn-danger" (click)="stopJob()" *ngIf="schedulerJob.status !== 'STOPPED'">
+            <clr-icon shape="stop"></clr-icon> Stop Job
+          </button>
+          <button class="btn btn-primary" (click)="restartJob()" *ngIf="schedulerJob.status === 'STOPPED'">
+            <clr-icon shape="play"></clr-icon> Restart Job
+          </button>
+        </div>
+      </div>
+      
+      <!-- No Job Found -->
+      <div class="no-job-section" *ngIf="schedulerJob === null">
+        <div class="no-job-message">
+          <p>No scheduled job found for this Data Lake.</p>
+          <p>Would you like to create a new job?</p>
+        </div>
+        
+        <div class="create-job-actions">
+          <button class="btn btn-primary" (click)="createJob()">
+            <clr-icon shape="plus"></clr-icon> Create Job
+          </button>
+        </div>
+      </div>
+    </div>
+  </div>
+  <div class="modal-footer">
+    <button type="button" class="btn btn-outline" (click)="closeSchedulerModal()">Close</button>
+  </div>
+
+</clr-modal>
diff --git a/frontend/angular-clarity-master/src/app/modules/main/builder/dashboardnew/Data_lake/Data_lake.component.scss b/frontend/angular-clarity-master/src/app/modules/main/builder/dashboardnew/Data_lake/Data_lake.component.scss
index e638025..2d6880b 100644
--- a/frontend/angular-clarity-master/src/app/modules/main/builder/dashboardnew/Data_lake/Data_lake.component.scss
+++ b/frontend/angular-clarity-master/src/app/modules/main/builder/dashboardnew/Data_lake/Data_lake.component.scss
@@ -384,3 +384,494 @@
   border: 1px solid #ccc;
   border-radius: 4px;
 }
+
+/* Data Lake Type Styles */
+.clr-subtext {
+  display: block;
+  margin-top: 5px;
+  font-size: 12px;
+  color: #666;
+}
+
+[data-multiple] {
+  height: auto !important;
+  min-height: 80px;
+}
+
+/* Checkbox Styles for Blending Data Lakes */
+.checkbox-container {
+  border: 1px solid #ccc;
+  border-radius: 4px;
+  padding: 10px;
+  max-height: 200px;
+  overflow-y: auto;
+  background-color: #f9f9f9;
+}
+
+.checkbox-item {
+  display: flex;
+  align-items: center;
+  margin-bottom: 8px;
+}
+
+.checkbox-item input[type="checkbox"] {
+  margin-right: 8px;
+}
+
+.checkbox-item label {
+  margin-bottom: 0;
+  cursor: pointer;
+}
+
+/* Blending Keys Panel Styles */
+.blending-keys-panel {
+  position: fixed;
+  bottom: 0;
+  left: 0;
+  right: 0;
+  background-color: white;
+  border-top: 1px solid #ccc;
+  box-shadow: 0 -2px 4px rgba(0,0,0,0.1);
+  z-index: 1000;
+  max-height: 50vh;
+  overflow-y: auto;
+}
+
+.panel-header {
+  display: flex;
+  justify-content: space-between;
+  align-items: center;
+  padding: 15px;
+  border-bottom: 1px solid #eee;
+  background-color: #f5f5f5;
+}
+
+.panel-header h3 {
+  margin: 0;
+  color: #333;
+}
+
+.panel-content {
+  padding: 15px;
+}
+
+.keys-container {
+  margin-bottom: 20px;
+  padding: 10px;
+  border: 1px solid #eee;
+  border-radius: 4px;
+  background-color: #fafafa;
+}
+
+.keys-container h4 {
+  margin-top: 0;
+  color: #555;
+}
+
+.headers-container {
+  display: flex;
+  flex-wrap: wrap;
+  gap: 8px;
+  margin-top: 10px;
+}
+
+.header-tag {
+  display: inline-block;
+  background-color: #e3f2fd;
+  border: 1px solid #bbdefb;
+  border-radius: 12px;
+  padding: 4px 10px;
+  font-size: 12px;
+  font-family: monospace;
+}
+
+.sql-editor-container {
+  margin-top: 20px;
+}
+
+.sql-textarea {
+  width: 100%;
+  font-family: 'Courier New', monospace;
+  font-size: 14px;
+}
+
+.editor-actions {
+  margin-top: 10px;
+  text-align: right;
+}
+
+/* Blending Configuration Modal Styles */
+.blending-config-container {
+  display: flex;
+  flex-direction: column;
+  gap: 20px;
+}
+
+.section-title {
+  color: #0072a0;
+  font-weight: 600;
+  margin-bottom: 15px;
+  display: flex;
+  align-items: center;
+}
+
+.section-icon {
+  margin-right: 10px;
+}
+
+.keys-section {
+  padding: 15px;
+  border-radius: 8px;
+  background-color: #f9f9f9;
+  box-shadow: 0 2px 4px rgba(0,0,0,0.05);
+}
+
+.key-card {
+  background-color: white;
+  border: 1px solid #e0e0e0;
+  border-radius: 6px;
+  padding: 15px;
+  margin-bottom: 15px;
+  box-shadow: 0 1px 3px rgba(0,0,0,0.1);
+}
+
+.key-header h5 {
+  margin: 0 0 10px 0;
+  color: #333;
+  font-weight: 500;
+}
+
+.headers-container {
+  display: flex;
+  flex-wrap: wrap;
+  gap: 8px;
+}
+
+.header-tag {
+  display: inline-flex;
+  align-items: center;
+  background-color: #e3f2fd;
+  border: 1px solid #bbdefb;
+  border-radius: 20px;
+  padding: 6px 12px;
+  margin: 4px;
+  font-size: 13px;
+  font-family: monospace;
+  cursor: pointer;
+  transition: all 0.2s;
+}
+
+.header-tag:hover {
+  background-color: #bbdefb;
+  transform: translateY(-2px);
+  box-shadow: 0 2px 4px rgba(0,0,0,0.1);
+}
+
+.sql-editor-section {
+  padding: 15px;
+  border-radius: 8px;
+  background-color: #f9f9f9;
+  box-shadow: 0 2px 4px rgba(0,0,0,0.05);
+}
+
+.sql-editor-container {
+  background-color: white;
+  border: 1px solid #e0e0e0;
+  border-radius: 6px;
+  padding: 15px;
+}
+
+.sql-textarea {
+  width: 100%;
+  font-family: 'Courier New', monospace;
+  font-size: 14px;
+  min-height: 150px;
+}
+
+.editor-hint {
+  margin-top: 10px;
+}
+
+.modal-footer {
+  display: flex;
+  justify-content: flex-end;
+  gap: 10px;
+  padding: 15px;
+  border-top: 1px solid #eee;
+}
+
+/* Field Mapping Modal Styles */
+.field-mapping-container {
+  padding: 10px;
+}
+
+.instructions {
+  background-color: #e3f2fd;
+  border: 1px solid #bbdefb;
+  border-radius: 4px;
+  padding: 15px;
+  margin-bottom: 20px;
+}
+
+.instructions p {
+  margin: 0;
+  color: #1976d2;
+}
+
+.mapping-table-container {
+  overflow-x: auto;
+}
+
+.mapping-table {
+  width: 100%;
+  border-collapse: collapse;
+}
+
+.mapping-table th {
+  background-color: #f5f5f5;
+  padding: 12px 15px;
+  text-align: left;
+  font-weight: 600;
+  color: #333;
+  border-bottom: 2px solid #ddd;
+}
+
+.mapping-table td {
+  padding: 12px 15px;
+  border-bottom: 1px solid #eee;
+}
+
+.original-field {
+  vertical-align: middle;
+}
+
+.field-tag {
+  display: inline-block;
+  background-color: #e0e0e0;
+  border: 1px solid #bdbdbd;
+  border-radius: 4px;
+  padding: 6px 10px;
+  font-family: monospace;
+  font-size: 13px;
+}
+
+.mapping-input {
+  width: 100%;
+  padding: 8px 12px;
+  border: 1px solid #ccc;
+  border-radius: 4px;
+  font-size: 14px;
+}
+
+.mapping-input:focus {
+  outline: none;
+  border-color: #0072a0;
+  box-shadow: 0 0 0 2px rgba(0, 114, 160, 0.2);
+}
+
+.no-data-message {
+  text-align: center;
+  padding: 30px;
+  color: #666;
+  font-style: italic;
+}
+
+.modal-footer {
+  display: flex;
+  justify-content: flex-end;
+  gap: 10px;
+  padding: 15px;
+  border-top: 1px solid #eee;
+}
+
+/* Scheduler Modal Styles */
+.scheduler-container {
+  padding: 10px;
+}
+
+.data-lake-info h4 {
+  margin: 0 0 20px 0;
+  color: #333;
+  border-bottom: 1px solid #eee;
+  padding-bottom: 10px;
+}
+
+.job-info-section {
+  background-color: #f9f9f9;
+  border: 1px solid #e0e0e0;
+  border-radius: 6px;
+  padding: 20px;
+  margin-bottom: 20px;
+}
+
+.job-header {
+  display: flex;
+  justify-content: space-between;
+  align-items: center;
+  margin-bottom: 15px;
+}
+
+.job-header h5 {
+  margin: 0;
+  color: #333;
+}
+
+.badge {
+  padding: 5px 10px;
+  border-radius: 12px;
+  font-size: 12px;
+  font-weight: bold;
+}
+
+.badge-success {
+  background-color: #4caf50;
+  color: white;
+}
+
+.badge-warning {
+  background-color: #ff9800;
+  color: white;
+}
+
+.badge-danger {
+  background-color: #f44336;
+  color: white;
+}
+
+.badge-light {
+  background-color: #e0e0e0;
+  color: #333;
+}
+
+.job-details {
+  margin-bottom: 20px;
+}
+
+.detail-row {
+  display: flex;
+  margin-bottom: 10px;
+}
+
+.detail-row label {
+  font-weight: 500;
+  width: 120px;
+  color: #555;
+}
+
+.detail-row span {
+  flex: 1;
+}
+
+.job-actions {
+  display: flex;
+  gap: 10px;
+  flex-wrap: wrap;
+}
+
+.job-actions .btn {
+  display: flex;
+  align-items: center;
+  gap: 5px;
+}
+
+.no-job-section {
+  text-align: center;
+  padding: 30px 20px;
+}
+
+.no-job-message p {
+  margin: 10px 0;
+  color: #666;
+}
+
+.no-job-message p:first-child {
+  font-size: 18px;
+  color: #333;
+}
+
+.create-job-actions {
+  margin-top: 20px;
+}
+
+.create-job-actions .btn {
+  display: inline-flex;
+  align-items: center;
+  gap: 5px;
+}
+
+.modal-footer {
+  display: flex;
+  justify-content: flex-end;
+  gap: 10px;
+  padding: 15px;
+  border-top: 1px solid #eee;
+}
+
+/* Webhook Status Styles */
+.webhook-enabled {
+  display: inline-block;
+  padding: 4px 8px;
+  border-radius: 12px;
+  font-size: 12px;
+  font-weight: bold;
+  background-color: #4caf50;
+  color: white;
+}
+
+.webhook-disabled {
+  display: inline-block;
+  padding: 4px 8px;
+  border-radius: 12px;
+  font-size: 12px;
+  font-weight: bold;
+  background-color: #f44336;
+  color: white;
+}
+
+/* Webhook Status Styles */
+.webhook-status {
+  display: inline-block;
+  padding: 4px 8px;
+  border-radius: 12px;
+  font-size: 12px;
+  font-weight: bold;
+}
+
+.webhook-status.enabled {
+  background-color: #4caf50;
+  color: white;
+}
+
+.webhook-status.disabled {
+  background-color: #f44336;
+  color: white;
+}
+
+/* Webhook Modal Styles */
+.webhook-container {
+  padding: 10px;
+}
+
+.webhook-container .data-lake-info h4 {
+  margin: 0 0 20px 0;
+  color: #333;
+  border-bottom: 1px solid #eee;
+  padding-bottom: 10px;
+}
+
+.webhook-form {
+  margin-bottom: 20px;
+}
+
+.webhook-info {
+  background-color: #e3f2fd;
+  border: 1px solid #bbdefb;
+  border-radius: 4px;
+  padding: 15px;
+  margin-top: 20px;
+}
+
+.webhook-info p {
+  margin: 0;
+  color: #1976d2;
+}
diff --git a/frontend/angular-clarity-master/src/app/modules/main/builder/dashboardnew/Data_lake/Data_lake.component.ts b/frontend/angular-clarity-master/src/app/modules/main/builder/dashboardnew/Data_lake/Data_lake.component.ts
index 6cc9432..fb4b684 100644
--- a/frontend/angular-clarity-master/src/app/modules/main/builder/dashboardnew/Data_lake/Data_lake.component.ts
+++ b/frontend/angular-clarity-master/src/app/modules/main/builder/dashboardnew/Data_lake/Data_lake.component.ts
@@ -2,6 +2,7 @@ import { Component, OnInit } from '@angular/core';
 import { ToastrService } from 'ngx-toastr';
 import { AlertService } from 'src/app/services/alert.service';
 import { Data_lakeservice } from './Data_lake.service';
+import { SchedulerService } from 'src/app/services/scheduler.service';
 import { AbstractControl, FormArray, FormBuilder, FormGroup, Validators, ValidationErrors } from '@angular/forms';
 import { ExtensionService } from 'src/app/services/fnd/extension.service';
 import { DashboardContentModel2 } from 'src/app/models/builder/dashboard';
@@ -10,6 +11,7 @@ import { UserInfoService } from 'src/app/services/user-info.service';
 import { SureconnectService } from '../sureconnect/sureconnect.service';
 import { HttpClient } from '@angular/common/http';
 import { ApiRequestService } from 'src/app/services/api/api-request.service';
+import { DataLakeSchedulerService } from './dataLakescheduler.service';
 declare var JsBarcode: any;
 @Component({
   selector: 'app-Data_lake',
@@ -66,6 +68,12 @@ export class Data_lakeComponent implements OnInit {
   dataLakeList: any[] = [];
   selectedDataLake: any = null;
 
+  // New properties for data lake type
+  dataLakeTypes = [
+    { value: 'normal', label: 'Normal' },
+    { value: 'blending', label: 'Blending' }
+  ];
+
   // Calculated field properties
   calculatedFieldModalOpen = false;
   availableKeys: string[] = [];
@@ -99,10 +107,36 @@ export class Data_lakeComponent implements OnInit {
   
   selectedAggregationFields: { field: string; operation: string }[] = [];
   
+  // New property to store selected blending lake IDs as string
+  selectedBlendingLakeIds: string[] = [];
+  editSelectedBlendingLakeIds: string[] = [];
+  
+  // New properties for blending functionality
+  showBlendingKeys = false;
+  blendingKeysData: any[] = [];
+  sqlQueryText = '';
+  selectedBlendingItem: any = null;
+  
+  // New properties for field mapping
+  showFieldMappingModal = false;
+  fieldMappingData: any[] = [];
+  fieldMappings: { [key: string]: string } = {};
+  selectedMappingItem: any = null;
+  
+  // New properties for scheduler functionality
+  showSchedulerModal = false;
+  schedulerJob: any = null;
+  selectedSchedulerItem: any = null;
+  
+  // New properties for webhook functionality
+  showWebhookModal = false;
+  selectedWebhookItem: any = null;
+  
   constructor(
     private extensionService: ExtensionService,
     private userInfoService: UserInfoService,
     private mainService: Data_lakeservice,
+    private schedulerService: DataLakeSchedulerService,
     private alertService: AlertService,
     private toastr: ToastrService,
     private _fb: FormBuilder,
@@ -124,23 +158,19 @@ export class Data_lakeComponent implements OnInit {
     this.getDataLakeList(); // Fetch Data Lake list for reference dropdown
     this.entryForm = this._fb.group({
       name: [null],
-
       url: [null],
-
       schedule: [null],
-
       cron_job: [null],
-
       json: [null],
-
       url_endpoint: [null],
-
       batch_volume: [null],
-
-      sure_connect_id: [null], // Add SureConnect field
-      ref_datalake_id: [null], // Add Data Lake reference field
-
-    }); // component_button200
+      sure_connect_id: [null],
+      ref_datalake_id: [null],
+      datalake_type: ['normal'], // Default to normal
+      blending_lakeids: [[]], // Array for multiple selections
+      webhook_url: [null] // Add webhook_url field
+    });
+    
     // form code start
     this.extensionService.getJsonObjectsByFormCodeList(this.formcode).subscribe(data => {
       console.log(data);
@@ -240,8 +270,7 @@ export class Data_lakeComponent implements OnInit {
   // Fetch Data Lake list for reference dropdown
   getDataLakeList() {
     this.mainService.getAll().subscribe((data: any[]) => {
-      // Filter out the current item to avoid self-reference
-      this.dataLakeList = data.filter(item => item.id !== (this.rowSelected?.id || 0));
+      this.dataLakeList = data;
       console.log('Data Lake List:', this.dataLakeList);
     }, (error) => {
       console.log('Error fetching Data Lake list:', error);
@@ -686,8 +715,16 @@ export class Data_lakeComponent implements OnInit {
     this.editCronExpression = row.cron_job || '';
     // Set the selected SureConnect for edit form
     this.selectedSureConnect = row.sure_connect_id || null;
-    // Set the selected Data Lake for edit form
-    this.selectedDataLake = row.ref_datalake_id || null;
+    
+    // Initialize blending lake IDs for edit form from string
+    if (row.blending_lakeids && typeof row.blending_lakeids === 'string') {
+      this.editSelectedBlendingLakeIds = row.blending_lakeids.split(',').filter(id => id.trim() !== '');
+    } else if (row.blending_lakeids && Array.isArray(row.blending_lakeids)) {
+      this.editSelectedBlendingLakeIds = row.blending_lakeids.map(id => id.toString());
+    } else {
+      this.editSelectedBlendingLakeIds = [];
+    }
+    
     // Use setTimeout to ensure the component has time to initialize
     setTimeout(() => {
       this.modalEdit = true;
@@ -838,18 +875,22 @@ export class Data_lakeComponent implements OnInit {
   }
   
   goToAdd(row) {
-    this.modalAdd = true;
+    this.modalAdd = false;
     this.addCronExpression = '';
     this.selectedSureConnect = null; // Reset SureConnect selection
-    this.selectedDataLake = null; // Reset Data Lake selection
     this.submitted = false;
+    // Reset blending lake IDs for add form
+    this.selectedBlendingLakeIds = [];
+    
     // Reset the form control for cron_job and sure_connect_id
     if (this.entryForm) {
       if (this.entryForm.get('cron_job')) {
         this.entryForm.get('cron_job')?.setValue('');
       }
-
+      // Reset blending_lakeids to empty string
+      this.entryForm.get('blending_lakeids')?.setValue('');
     }
+    this.modalAdd = true;
   }
   submitted = false;
   onSubmit() {
@@ -1290,4 +1331,433 @@ export class Data_lakeComponent implements OnInit {
       return [];
     }
   }
+  
+  // Method to check if blending action should be available
+  canShowBlendingAction(item: any): boolean {
+    return item.datalake_type === 'blending' && 
+           item.blending_lakeids && 
+           item.blending_lakeids.trim() !== '';
+  }
+  
+  // Method to insert header into SQL query at cursor position
+  insertHeaderIntoQuery(header: string) {
+    const textarea = document.querySelector('.sql-textarea') as HTMLTextAreaElement;
+    if (textarea) {
+      const start = textarea.selectionStart;
+      const end = textarea.selectionEnd;
+      const text = textarea.value;
+      const before = text.substring(0, start);
+      const after = text.substring(end, text.length);
+      
+      // Insert the header at cursor position
+      this.sqlQueryText = before + header + after;
+      
+      // Set cursor position after the inserted text
+      setTimeout(() => {
+        textarea.selectionStart = start + header.length;
+        textarea.selectionEnd = start + header.length;
+        textarea.focus();
+      }, 0);
+    } else {
+      // Fallback: append to end of text
+      this.sqlQueryText += header;
+    }
+  }
+  
+  // Method to fetch blending keys
+  fetchBlendingKeys(item: any) {
+    this.selectedBlendingItem = item;
+    this.blendingKeysData = [];
+    this.showBlendingKeys = true;
+    
+    // Initialize SQL query text from existing data
+    if (item.sqlquery_json) {
+      this.sqlQueryText = item.sqlquery_json;
+    } else {
+      this.sqlQueryText = '';
+    }
+    
+    // Parse blending_lakeids string to array
+    const lakeIds = item.blending_lakeids.split(',').map(id => id.trim()).filter(id => id !== '');
+    
+    // Fetch keys for each lake ID
+    lakeIds.forEach(lakeId => {
+      this.mainService.fetchBlendingKeys(Number(lakeId)).subscribe(
+        (data: any) => {
+          this.blendingKeysData.push({
+            lakeId: lakeId,
+            tableName: data.tableName,
+            headers: data.headers
+          });
+        },
+        (error) => {
+          console.error('Error fetching keys for lake ID:', lakeId, error);
+          this.toastr.error(`Failed to fetch keys for Data Lake ${lakeId}`);
+        }
+      );
+    });
+  }
+  
+  // Method to update SQL query
+  updateSqlQuery() {
+    if (!this.selectedBlendingItem) {
+      this.toastr.error('No blending item selected');
+      return;
+    }
+    
+    // Update the SQL query JSON field
+    this.selectedBlendingItem.sqlquery_json = this.sqlQueryText;
+    
+    // Call update service
+    this.mainService.update(this.selectedBlendingItem.id, this.selectedBlendingItem).subscribe(
+      (response) => {
+        this.toastr.success('SQL query updated successfully');
+        // Update the local data
+        const index = this.product.findIndex(p => p.id === this.selectedBlendingItem.id);
+        if (index !== -1) {
+          this.product[index] = {...this.selectedBlendingItem};
+        }
+      },
+      (error) => {
+        console.error('Error updating SQL query:', error);
+        this.toastr.error('Failed to update SQL query');
+      }
+    );
+  }
+  
+  // Method to close blending keys panel
+  closeBlendingKeys() {
+    this.showBlendingKeys = false;
+    this.blendingKeysData = [];
+    this.sqlQueryText = '';
+    this.selectedBlendingItem = null;
+  }
+  
+  // Method to handle checkbox change for blending lakes (ADD form)
+  onBlendingLakeCheckboxChange(event: any, lakeId: number) {
+    const lakeIdStr = lakeId.toString();
+    if (event.target.checked) {
+      // Add to selected blending lake IDs
+      if (!this.selectedBlendingLakeIds.includes(lakeIdStr)) {
+        this.selectedBlendingLakeIds.push(lakeIdStr);
+      }
+    } else {
+      // Remove from selected blending lake IDs
+      const index = this.selectedBlendingLakeIds.indexOf(lakeIdStr);
+      if (index > -1) {
+        this.selectedBlendingLakeIds.splice(index, 1);
+      }
+    }
+    
+    // Update the form control value as a comma-separated string
+    this.entryForm.get('blending_lakeids')?.setValue(this.selectedBlendingLakeIds.join(','));
+  }
+  
+  // Method to check if a blending lake is selected (ADD form)
+  isBlendingLakeSelected(lakeId: number): boolean {
+    return this.selectedBlendingLakeIds.includes(lakeId.toString());
+  }
+  
+  // Method to handle checkbox change for blending lakes (EDIT form)
+  onEditBlendingLakeCheckboxChange(event: any, lakeId: number) {
+    const lakeIdStr = lakeId.toString();
+    if (event.target.checked) {
+      // Add to selected blending lake IDs
+      if (!this.editSelectedBlendingLakeIds.includes(lakeIdStr)) {
+        this.editSelectedBlendingLakeIds.push(lakeIdStr);
+      }
+    } else {
+      // Remove from selected blending lake IDs
+      const index = this.editSelectedBlendingLakeIds.indexOf(lakeIdStr);
+      if (index > -1) {
+        this.editSelectedBlendingLakeIds.splice(index, 1);
+      }
+    }
+    
+    // Update the rowSelected value as a comma-separated string
+    this.rowSelected.blending_lakeids = this.editSelectedBlendingLakeIds.join(',');
+  }
+  
+  // Method to check if a blending lake is selected (EDIT form)
+  isEditBlendingLakeSelected(lakeId: number): boolean {
+    return this.editSelectedBlendingLakeIds.includes(lakeId.toString());
+  }
+  
+  // Method to open field mapping modal
+  openFieldMappingModal(item: any) {
+    this.selectedMappingItem = item;
+    this.fieldMappingData = [];
+    this.fieldMappings = {};
+    this.showFieldMappingModal = true;
+    
+    // Fetch available keys using the same API as calculated fields
+    this.mainService.fetchAvailableKeys(item.url, item.sure_connect_id).subscribe(
+      (keys: string[]) => {
+        // Initialize field mappings with empty values
+        this.fieldMappingData = keys.map(key => ({
+          original: key,
+          mapped: ''
+        }));
+        
+        // If there's existing mapping data, populate it
+        if (item.mapping_json) {
+          try {
+            const existingMappings = JSON.parse(item.mapping_json);
+            this.fieldMappingData.forEach(field => {
+              if (existingMappings[field.original]) {
+                field.mapped = existingMappings[field.original];
+              }
+            });
+          } catch (e) {
+            console.error('Error parsing existing mapping JSON:', e);
+          }
+        }
+      },
+      (error) => {
+        console.error('Error fetching keys for field mapping:', error);
+        this.toastr.error('Failed to fetch available keys for field mapping');
+      }
+    );
+  }
+  
+  // Method to update field mappings
+  updateFieldMappings() {
+    if (!this.selectedMappingItem) {
+      this.toastr.error('No item selected for mapping');
+      return;
+    }
+    
+    // Create mapping object
+    const mappings: { [key: string]: string } = {};
+    this.fieldMappingData.forEach(field => {
+      if (field.mapped && field.mapped.trim() !== '') {
+        mappings[field.original] = field.mapped.trim();
+      }
+    });
+    
+    // Convert to JSON string
+    const mappingJson = JSON.stringify(mappings);
+    
+    // Update the mapping JSON field
+    this.selectedMappingItem.mapping_json = mappingJson;
+    
+    // Call update service
+    this.mainService.update(this.selectedMappingItem.id, this.selectedMappingItem).subscribe(
+      (response) => {
+        this.toastr.success('Field mappings updated successfully');
+        // Update the local data
+        const index = this.product.findIndex(p => p.id === this.selectedMappingItem.id);
+        if (index !== -1) {
+          this.product[index] = {...this.selectedMappingItem};
+        }
+        this.closeFieldMappingModal();
+      },
+      (error) => {
+        console.error('Error updating field mappings:', error);
+        this.toastr.error('Failed to update field mappings');
+      }
+    );
+  }
+  
+  // Method to close field mapping modal
+  closeFieldMappingModal() {
+    this.showFieldMappingModal = false;
+    this.fieldMappingData = [];
+    this.fieldMappings = {};
+    this.selectedMappingItem = null;
+  }
+  
+  // Method to update individual field mapping
+  updateFieldMapping(index: number, value: string) {
+    if (index >= 0 && index < this.fieldMappingData.length) {
+      this.fieldMappingData[index].mapped = value;
+    }
+  }
+  
+  
+  // Method to open scheduler modal
+  openSchedulerModal(item: any) {
+    this.selectedSchedulerItem = item;
+    this.schedulerJob = null;
+    this.showSchedulerModal = true;
+    
+    // Fetch job by lake ID
+    this.schedulerService.getJobByLakeId(item.id).subscribe(
+      (job: any) => {
+        this.schedulerJob = job;
+      },
+      (error) => {
+        // If job not found, it's expected - we'll show create option
+        if (error.status === 404) {
+          this.schedulerJob = null;
+        } else {
+          console.error('Error fetching scheduler job:', error);
+          this.toastr.error('Failed to fetch scheduler job information');
+        }
+      }
+    );
+  }
+  
+  // Method to create a new job
+  createJob() {
+    if (!this.selectedSchedulerItem) {
+      this.toastr.error('No data lake selected');
+      return;
+    }
+    
+    const jobData = {
+      name: this.selectedSchedulerItem.name,
+      status: 'RUNNING',
+      description: `Scheduled job for ${this.selectedSchedulerItem.name}`,
+      jobType: 'DATALAKE',
+      lakeid: this.selectedSchedulerItem.id
+    };
+    
+    this.schedulerService.createJob(jobData).subscribe(
+      (job: any) => {
+        this.schedulerJob = job;
+        this.toastr.success('Job created successfully');
+      },
+      (error) => {
+        console.error('Error creating job:', error);
+        this.toastr.error('Failed to create job');
+      }
+    );
+  }
+  
+  // Method to pause a job
+  pauseJob() {
+    if (!this.schedulerJob || !this.schedulerJob.id) {
+      this.toastr.error('No job selected');
+      return;
+    }
+    
+    this.schedulerService.pauseJob(this.schedulerJob.id).subscribe(
+      (response: any) => {
+        this.schedulerJob.status = 'PAUSED';
+        this.toastr.success('Job paused successfully');
+      },
+      (error) => {
+        console.error('Error pausing job:', error);
+        this.toastr.error('Failed to pause job');
+      }
+    );
+  }
+  
+  // Method to resume a job
+  resumeJob() {
+    if (!this.schedulerJob || !this.schedulerJob.id) {
+      this.toastr.error('No job selected');
+      return;
+    }
+    
+    this.schedulerService.resumeJob(this.schedulerJob.id).subscribe(
+      (response: any) => {
+        this.schedulerJob.status = 'RUNNING';
+        this.toastr.success('Job resumed successfully');
+      },
+      (error) => {
+        console.error('Error resuming job:', error);
+        this.toastr.error('Failed to resume job');
+      }
+    );
+  }
+  
+  // Method to stop a job
+  stopJob() {
+    if (!this.schedulerJob || !this.schedulerJob.id) {
+      this.toastr.error('No job selected');
+      return;
+    }
+    
+    this.schedulerService.stopJob(this.schedulerJob.id).subscribe(
+      (response: any) => {
+        this.schedulerJob.status = 'STOPPED';
+        this.toastr.success('Job stopped successfully');
+      },
+      (error) => {
+        console.error('Error stopping job:', error);
+        this.toastr.error('Failed to stop job');
+      }
+    );
+  }
+  
+  // Method to restart a stopped job
+  restartJob() {
+    if (!this.schedulerJob || !this.schedulerJob.id) {
+      this.toastr.error('No job selected');
+      return;
+    }
+    
+    // To restart a job, we need to create a new job with the same parameters
+    const jobData = {
+      name: this.schedulerJob.name,
+      status: 'RUNNING',
+      description: this.schedulerJob.description,
+      jobType: this.schedulerJob.jobType,
+      lakeid: this.schedulerJob.lakeid
+    };
+    
+    this.schedulerService.createJob(jobData).subscribe(
+      (job: any) => {
+        this.schedulerJob = job;
+        this.toastr.success('Job restarted successfully');
+      },
+      (error) => {
+        console.error('Error restarting job:', error);
+        this.toastr.error('Failed to restart job');
+      }
+    );
+  }
+  
+  // Method to close scheduler modal
+  closeSchedulerModal() {
+    this.showSchedulerModal = false;
+    this.schedulerJob = null;
+    this.selectedSchedulerItem = null;
+  }
+  
+  // Method to get status badge class
+  getStatusBadgeClass(status: string): string {
+    switch (status) {
+      case 'RUNNING':
+        return 'badge-success';
+      case 'PAUSED':
+        return 'badge-warning';
+      case 'STOPPED':
+        return 'badge-danger';
+      default:
+        return 'badge-light';
+    }
+  }
+  
+  // Method to toggle webhook for a data lake item
+  toggleWebhook(item: any) {
+    // Call the enableWebhook service method
+    this.mainService.enableWebhook(item.id).subscribe(
+      (updatedItem: any) => {
+        // Update the local data with the response from the server
+        const index = this.product.findIndex(p => p.id === item.id);
+        if (index !== -1) {
+          this.product[index] = {...updatedItem};
+        }
+        
+        // Show success message based on the new webhook status
+        if (updatedItem.webhook_url && updatedItem.webhook_url.trim() !== '') {
+          this.toastr.success('Webhook enabled successfully');
+        } else {
+          this.toastr.success('Webhook disabled successfully');
+        }
+      },
+      (error) => {
+        console.error('Error toggling webhook:', error);
+        this.toastr.error('Failed to toggle webhook');
+      }
+    );
+  }
+  
+  // Method to copy webhook URL to clipboard
+  copyWebhookUrl(webhookUrl: string) {
+    this.copyToClipboard(webhookUrl);
+  }
 }
diff --git a/frontend/angular-clarity-master/src/app/modules/main/builder/dashboardnew/Data_lake/Data_lake.service.ts b/frontend/angular-clarity-master/src/app/modules/main/builder/dashboardnew/Data_lake/Data_lake.service.ts
index 5312cf8..51052fd 100644
--- a/frontend/angular-clarity-master/src/app/modules/main/builder/dashboardnew/Data_lake/Data_lake.service.ts
+++ b/frontend/angular-clarity-master/src/app/modules/main/builder/dashboardnew/Data_lake/Data_lake.service.ts
@@ -42,6 +42,12 @@ export class Data_lakeservice{
     return this.apiRequest.get(apiUrl);
   }
 
+  // Method to fetch blending keys for a specific lake ID
+  fetchBlendingKeys(lakeId: number): Observable<any> {
+    const _http = `${this.baseURL}/keys/${lakeId}`;
+    return this.apiRequest.get(_http);
+  }
+  
   // Method to update calculated fields for a data lake item
   updateCalculatedFields(id: number, calculatedFieldJson: string, isCalculatedField: boolean): Observable<any> {
     const _http = this.baseURL + "/" + id;
@@ -51,5 +57,11 @@ export class Data_lakeservice{
     };
     return this.apiRequest.put(_http, data);
   }
+  
+  // Method to enable webhook for a data lake item
+  enableWebhook(id: number): Observable<any> {
+    const _http = `${this.baseURL}/webhook/${id}`;
+    return this.apiRequest.get(_http);
+  }
 // updateaction
 }
\ No newline at end of file
diff --git a/frontend/angular-clarity-master/src/app/modules/main/builder/dashboardnew/Data_lake/cron-job-builder/cron-job-builder.component.html b/frontend/angular-clarity-master/src/app/modules/main/builder/dashboardnew/Data_lake/cron-job-builder/cron-job-builder.component.html
index d8df94d..f70c8a4 100644
--- a/frontend/angular-clarity-master/src/app/modules/main/builder/dashboardnew/Data_lake/cron-job-builder/cron-job-builder.component.html
+++ b/frontend/angular-clarity-master/src/app/modules/main/builder/dashboardnew/Data_lake/cron-job-builder/cron-job-builder.component.html
@@ -1,6 +1,15 @@
 <div class="cron-job-builder">
   <h4>Cron Job Builder</h4>
   <div class="clr-row">
+    <div class="clr-col-lg-2 clr-col-md-4 clr-col-sm-6 clr-col-12">
+      <div class="form-group">
+        <label>Second</label>
+        <select class="form-control" [(ngModel)]="second" (change)="onFieldChange()">
+          <option *ngFor="let option of secondOptions" [value]="option.value">{{ option.label }}</option>
+        </select>
+      </div>
+    </div>
+    
     <div class="clr-col-lg-2 clr-col-md-4 clr-col-sm-6 clr-col-12">
       <div class="form-group">
         <label>Minute</label>
@@ -28,7 +37,7 @@
       </div>
     </div>
     
-    <div class="clr-col-lg-3 clr-col-md-6 clr-col-sm-6 clr-col-12">
+    <div class="clr-col-lg-2 clr-col-md-4 clr-col-sm-6 clr-col-12">
       <div class="form-group">
         <label>Month</label>
         <select class="form-control" [(ngModel)]="month" (change)="onFieldChange()">
@@ -37,7 +46,7 @@
       </div>
     </div>
     
-    <div class="clr-col-lg-3 clr-col-md-6 clr-col-sm-12 clr-col-12">
+    <div class="clr-col-lg-2 clr-col-md-4 clr-col-sm-6 clr-col-12">
       <div class="form-group">
         <label>Day of Week</label>
         <select class="form-control" [(ngModel)]="dayOfWeek" (change)="onFieldChange()">
diff --git a/frontend/angular-clarity-master/src/app/modules/main/builder/dashboardnew/Data_lake/cron-job-builder/cron-job-builder.component.ts b/frontend/angular-clarity-master/src/app/modules/main/builder/dashboardnew/Data_lake/cron-job-builder/cron-job-builder.component.ts
index b00c59c..61f87a1 100644
--- a/frontend/angular-clarity-master/src/app/modules/main/builder/dashboardnew/Data_lake/cron-job-builder/cron-job-builder.component.ts
+++ b/frontend/angular-clarity-master/src/app/modules/main/builder/dashboardnew/Data_lake/cron-job-builder/cron-job-builder.component.ts
@@ -10,7 +10,8 @@ export class CronJobBuilderComponent implements OnInit, OnChanges {
   @Input() instanceId: string = ''; // Unique identifier for each instance
   @Output() cronExpressionChange = new EventEmitter<string>();
   
-  // Cron job fields
+  // Cron job fields (now starting with seconds)
+  second: string = '*';
   minute: string = '*';
   hour: string = '*';
   dayOfMonth: string = '*';
@@ -21,6 +22,7 @@ export class CronJobBuilderComponent implements OnInit, OnChanges {
   cronDescription: string = '';
   
   // Options for selectors
+  secondOptions: any[] = [];
   minuteOptions: any[] = [];
   hourOptions: any[] = [];
   dayOfMonthOptions: any[] = [];
@@ -29,9 +31,10 @@ export class CronJobBuilderComponent implements OnInit, OnChanges {
 
   ngOnInit() {
     // Initialize options for each instance
-    this.minuteOptions = this.generateOptions(0, 59);
-    this.hourOptions = this.generateOptions(0, 23);
-    this.dayOfMonthOptions = this.generateOptions(1, 31);
+    this.secondOptions = this.generateOptions(0, 59, 'second');
+    this.minuteOptions = this.generateOptions(0, 59, 'minute');
+    this.hourOptions = this.generateOptions(0, 23, 'hour');
+    this.dayOfMonthOptions = this.generateOptions(1, 31, 'day');
     this.monthOptions = [
       { value: '*', label: 'Every month' },
       { value: '1', label: 'January' },
@@ -73,8 +76,8 @@ export class CronJobBuilderComponent implements OnInit, OnChanges {
     }
   }
 
-  generateOptions(start: number, end: number): any[] {
-    const options = [{ value: '*', label: `Every (${start === 0 ? '0' : start}-${end})` }];
+  generateOptions(start: number, end: number, type: string): any[] {
+    const options = [{ value: '*', label: `Every ${type} (${start === 0 ? '0' : start}-${end})` }];
     for (let i = start; i <= end; i++) {
       options.push({ value: i.toString(), label: i.toString() });
     }
@@ -83,7 +86,16 @@ export class CronJobBuilderComponent implements OnInit, OnChanges {
 
   parseCronExpression(expression: string) {
     const parts = expression.split(' ');
-    if (parts.length >= 5) {
+    if (parts.length >= 6) {  // Now expecting 6 parts with seconds
+      this.second = parts[0];
+      this.minute = parts[1];
+      this.hour = parts[2];
+      this.dayOfMonth = parts[3];
+      this.month = parts[4];
+      this.dayOfWeek = parts[5];
+    } else if (parts.length >= 5) {  // For backward compatibility with 5-part cron expressions
+      // Default seconds to 0 if not provided
+      this.second = '0';
       this.minute = parts[0];
       this.hour = parts[1];
       this.dayOfMonth = parts[2];
@@ -95,19 +107,33 @@ export class CronJobBuilderComponent implements OnInit, OnChanges {
   generateDescription() {
     let description = 'Runs ';
     
+    // Second description
+    if (this.second === '*') {
+      description += 'every second';
+    } else if (this.second.includes('/')) {
+      const interval = this.second.split('/')[1];
+      description += `every ${interval} seconds`;
+    } else {
+      description += `at second ${this.second}`;
+    }
+    
     // Minute description
     if (this.minute === '*') {
-      description += 'every minute';
+      if (this.second === '*') {
+        description += '';
+      } else {
+        description += ' of every minute';
+      }
     } else if (this.minute.includes('/')) {
       const interval = this.minute.split('/')[1];
-      description += `every ${interval} minutes`;
+      description += ` of every ${interval} minutes`;
     } else {
-      description += `at minute ${this.minute}`;
+      description += ` at minute ${this.minute}`;
     }
     
     // Hour description
     if (this.hour === '*') {
-      if (this.minute === '*') {
+      if (this.minute === '*' && this.second === '*') {
         description += '';
       } else {
         description += ' past every hour';
@@ -146,21 +172,23 @@ export class CronJobBuilderComponent implements OnInit, OnChanges {
     }
     
     // Special case for simple patterns
-    if (this.minute === '0' && this.hour === '0' && this.dayOfMonth === '1' && this.month === '*' && this.dayOfWeek === '*') {
+    if (this.second === '0' && this.minute === '0' && this.hour === '0' && this.dayOfMonth === '1' && this.month === '*' && this.dayOfWeek === '*') {
       description = 'Runs at midnight on the first day of every month';
-    } else if (this.minute === '0' && this.hour === '0' && this.dayOfMonth === '*' && this.month === '*' && this.dayOfWeek === '*') {
+    } else if (this.second === '0' && this.minute === '0' && this.hour === '0' && this.dayOfMonth === '*' && this.month === '*' && this.dayOfWeek === '*') {
       description = 'Runs at midnight every day';
-    } else if (this.minute === '0' && this.hour === '*' && this.dayOfMonth === '*' && this.month === '*' && this.dayOfWeek === '*') {
+    } else if (this.second === '0' && this.minute === '0' && this.hour === '*' && this.dayOfMonth === '*' && this.month === '*' && this.dayOfWeek === '*') {
       description = 'Runs at the top of every hour';
-    } else if (this.minute === '*' && this.hour === '*' && this.dayOfMonth === '*' && this.month === '*' && this.dayOfWeek === '*') {
-      description = 'Runs every minute';
+    } else if (this.second === '0' && this.minute === '*' && this.hour === '*' && this.dayOfMonth === '*' && this.month === '*' && this.dayOfWeek === '*') {
+      description = 'Runs at the top of every minute';
+    } else if (this.second === '*' && this.minute === '*' && this.hour === '*' && this.dayOfMonth === '*' && this.month === '*' && this.dayOfWeek === '*') {
+      description = 'Runs every second';
     }
     
     this.cronDescription = description;
   }
 
   buildCronExpression() {
-    const expression = `${this.minute} ${this.hour} ${this.dayOfMonth} ${this.month} ${this.dayOfWeek}`;
+    const expression = `${this.second} ${this.minute} ${this.hour} ${this.dayOfMonth} ${this.month} ${this.dayOfWeek}`;
     this.cronExpressionChange.emit(expression);
     this.generateDescription(); // Update description when expression changes
     return expression;
diff --git a/frontend/angular-clarity-master/src/app/modules/main/builder/dashboardnew/Data_lake/dataLakescheduler.service.ts b/frontend/angular-clarity-master/src/app/modules/main/builder/dashboardnew/Data_lake/dataLakescheduler.service.ts
new file mode 100644
index 0000000..216a2f7
--- /dev/null
+++ b/frontend/angular-clarity-master/src/app/modules/main/builder/dashboardnew/Data_lake/dataLakescheduler.service.ts
@@ -0,0 +1,47 @@
+
+import { Injectable } from '@angular/core';
+import { Observable } from "rxjs";
+import { HttpClient } from "@angular/common/http";
+import { ApiRequestService } from "src/app/services/api/api-request.service";
+
+@Injectable({
+  providedIn: 'root'
+})
+export class DataLakeSchedulerService {
+  private baseURL = "scheduler";
+
+  constructor(
+    private http: HttpClient,
+    private apiRequest: ApiRequestService,
+  ) { }
+
+  // Get job by lake ID
+  getJobByLakeId(lakeId: number): Observable<any> {
+    const _http = `${this.baseURL}/lake/${lakeId}`;
+    return this.apiRequest.get(_http);
+  }
+
+  // Create a new job
+  createJob(jobData: any): Observable<any> {
+    const _http = `${this.baseURL}/create`;
+    return this.apiRequest.post(_http, jobData);
+  }
+
+  // Pause a job
+  pauseJob(jobId: number): Observable<any> {
+    const _http = `${this.baseURL}/pause/${jobId}`;
+    return this.apiRequest.post(_http, {});
+  }
+
+  // Resume a job
+  resumeJob(jobId: number): Observable<any> {
+    const _http = `${this.baseURL}/resume/${jobId}`;
+    return this.apiRequest.post(_http, {});
+  }
+
+  // Stop a job
+  stopJob(jobId: number): Observable<any> {
+    const _http = `${this.baseURL}/stop/${jobId}`;
+    return this.apiRequest.delete(_http);
+  }
+}
\ No newline at end of file
diff --git a/frontend/angular-clarity-master/src/app/modules/main/builder/dashboardnew/allnewdash/allnewdash.component.html b/frontend/angular-clarity-master/src/app/modules/main/builder/dashboardnew/allnewdash/allnewdash.component.html
index b50c51f..85294db 100644
--- a/frontend/angular-clarity-master/src/app/modules/main/builder/dashboardnew/allnewdash/allnewdash.component.html
+++ b/frontend/angular-clarity-master/src/app/modules/main/builder/dashboardnew/allnewdash/allnewdash.component.html
@@ -1,58 +1,67 @@
 <ol class="breadcrumb breadcrumb-arrow font-trirong">
-    <li><a href="javascript://" [routerLink]="['/cns-portal/dashboard/order']"><clr-icon shape="home"></clr-icon></a></li>
-    <li><a href="javascript://"><clr-icon shape="dashboard"></clr-icon> {{ 'Dashboard_builder' | translate }}</a></li>
-  </ol>
-  
-  <br>
-  
-  <div class="dg-wrapper">
-      <div class="clr-row">
-        <div class="clr-col-8">
-          <h3>{{ 'Dashboard_builder' | translate }}</h3>
-        </div>
-        <div class="clr-col-4" style="text-align: right;">
-          <button id="add" class="btn btn-primary"  (click)="gotorunner()">
-            <clr-icon shape="grid-view"></clr-icon>{{ 'Dashboard_runner' | translate }}
-          </button>
-          <button class="btn btn-outline" (click)="onExport()">
-            <clr-icon shape="export"></clr-icon>  {{ 'EXPORT_XLSX' | translate }}
-          </button>
-          <button id="add" class="btn btn-primary"  (click)="gotoadd()">
-            <clr-icon shape="plus"></clr-icon> {{ 'ADD' | translate }}
-          </button>
-        </div>
-      </div>
-  
-      <clr-datagrid [clrDgLoading]="loading">
-        <clr-dg-placeholder><ng-template #loadingSpinner><clr-spinner>{{ 'Loading' | translate }} ...... </clr-spinner></ng-template>
-          <div *ngIf="error;else loadingSpinner">{{error}}</div></clr-dg-placeholder>
-  
-          <clr-dg-column [clrDgField]="''">
-              <ng-container *clrDgHideableColumn="{hidden: false}">
-                {{ 'Go_to' | translate }}
-              </ng-container>
-          </clr-dg-column>
-          <clr-dg-column [clrDgField]="'dashboard_name'">
-              <ng-container *clrDgHideableColumn="{hidden: false}">
-                {{ 'Dashboard_Name' | translate }}
-              </ng-container>
-          </clr-dg-column>
-          <clr-dg-column [clrDgField]="'description'">
-              <ng-container *clrDgHideableColumn="{hidden: false}">
-                {{ 'Description' | translate }}
-              </ng-container>
-          </clr-dg-column >
-          <clr-dg-column [clrDgField]="'secuirity_profile'">
-              <ng-container *clrDgHideableColumn="{hidden: false}">
-                {{ 'Security_Profile' | translate }}
-              </ng-container>
-          </clr-dg-column >
-          <clr-dg-column [clrDgField]="'add_to_home'">
-            <ng-container *clrDgHideableColumn="{hidden: false}">
-              {{ 'Add_to_home' | translate }}
-            </ng-container>
-        </clr-dg-column >
-          <!-- <clr-dg-column [clrDgField]="'formType'">
+  <li><a href="javascript://" [routerLink]="['/cns-portal/dashboard/order']"><clr-icon shape="home"></clr-icon></a></li>
+  <li><a href="javascript://"><clr-icon shape="dashboard"></clr-icon> {{ 'Dashboard_builder' | translate }}</a></li>
+</ol>
+
+<br>
+
+<div class="dg-wrapper">
+  <div class="clr-row">
+    <div class="clr-col-8">x
+      <h3>{{ 'Dashboard_builder' | translate }}</h3>
+    </div>
+    <div class="clr-col-4" style="text-align: right;">
+      <button class="btn btn-success" [routerLink]="['/cns-portal/shield-dashboard']">
+        <clr-icon shape="shield"></clr-icon>Shield Dashboard
+      </button>
+      <button id="add" class="btn btn-primary" (click)="gotorunner()">
+        <clr-icon shape="grid-view"></clr-icon>{{ 'Dashboard_runner' | translate }}
+      </button>
+      <!-- Add Chart Config button -->
+      <button class="btn btn-primary" (click)="openChartConfig()">
+        <clr-icon shape="cog"></clr-icon> Chart Config
+      </button>
+      <button class="btn btn-outline" (click)="onExport()">
+        <clr-icon shape="export"></clr-icon> {{ 'EXPORT_XLSX' | translate }}
+      </button>
+      <button id="add" class="btn btn-primary" (click)="gotoadd()">
+        <clr-icon shape="plus"></clr-icon> {{ 'ADD' | translate }}
+      </button>
+    </div>
+  </div>
+
+  <clr-datagrid [clrDgLoading]="loading">
+    <clr-dg-placeholder><ng-template #loadingSpinner><clr-spinner>{{ 'Loading' | translate }} ......
+        </clr-spinner></ng-template>
+      <div *ngIf="error;else loadingSpinner">{{error}}</div>
+    </clr-dg-placeholder>
+
+    <clr-dg-column [clrDgField]="''">
+      <ng-container *clrDgHideableColumn="{hidden: false}">
+        {{ 'Go_to' | translate }}
+      </ng-container>
+    </clr-dg-column>
+    <clr-dg-column [clrDgField]="'dashboard_name'">
+      <ng-container *clrDgHideableColumn="{hidden: false}">
+        {{ 'Dashboard_Name' | translate }}
+      </ng-container>
+    </clr-dg-column>
+    <clr-dg-column [clrDgField]="'description'">
+      <ng-container *clrDgHideableColumn="{hidden: false}">
+        {{ 'Description' | translate }}
+      </ng-container>
+    </clr-dg-column>
+    <clr-dg-column [clrDgField]="'secuirity_profile'">
+      <ng-container *clrDgHideableColumn="{hidden: false}">
+        {{ 'Security_Profile' | translate }}
+      </ng-container>
+    </clr-dg-column>
+    <clr-dg-column [clrDgField]="'add_to_home'">
+      <ng-container *clrDgHideableColumn="{hidden: false}">
+        {{ 'Add_to_home' | translate }}
+      </ng-container>
+    </clr-dg-column>
+    <!-- <clr-dg-column [clrDgField]="'formType'">
             <ng-container *clrDgHideableColumn="{hidden: false}">
               Build Status
             </ng-container> 
@@ -62,84 +71,86 @@
                 Testing
               </ng-container> 
             </clr-dg-column > -->
-          <clr-dg-column [clrDgField]="'action'"> <ng-container *clrDgHideableColumn="{hidden: false}">
-            {{ 'Action' | translate }}
-            </ng-container></clr-dg-column>
-  
-          <clr-dg-row *clrDgItems="let user of data?.slice()?.reverse();" [clrDgItem]="user">
-            <clr-dg-cell><span class="label label-light-blue" style="display: inline;margin-left: 10px; cursor: pointer;" (click)="goToEdit(user.id)">  {{ 'SET_UP' | translate }}</span></clr-dg-cell>
-              <clr-dg-cell>{{user.dashboard_name}}</clr-dg-cell>
-              <clr-dg-cell>{{user.description}}</clr-dg-cell>
-              <clr-dg-cell>{{user.secuirity_profile}}</clr-dg-cell>
-              <clr-dg-cell>{{user.add_to_home}}</clr-dg-cell>
+    <clr-dg-column [clrDgField]="'action'"> <ng-container *clrDgHideableColumn="{hidden: false}">
+        {{ 'Action' | translate }}
+      </ng-container></clr-dg-column>
 
-              <!-- <clr-dg-cell><input type="radio" id="cb1" class="dots" [ngStyle]="{'background-color': user.build == true ? 'green' : 'red'}"></clr-dg-cell>
+    <clr-dg-row *clrDgItems="let user of data?.slice()?.reverse();" [clrDgItem]="user">
+      <clr-dg-cell><span class="label label-light-blue" style="display: inline;margin-left: 10px; cursor: pointer;"
+          (click)="goToEdit(user.id)"> {{ 'SET_UP' | translate }}</span></clr-dg-cell>
+      <clr-dg-cell>{{user.dashboard_name}}</clr-dg-cell>
+      <clr-dg-cell>{{user.description}}</clr-dg-cell>
+      <clr-dg-cell>{{user.secuirity_profile}}</clr-dg-cell>
+      <clr-dg-cell>{{user.add_to_home}}</clr-dg-cell>
+
+      <!-- <clr-dg-cell><input type="radio" id="cb1" class="dots" [ngStyle]="{'background-color': user.build == true ? 'green' : 'red'}"></clr-dg-cell>
         <clr-dg-cell>{{user.testing}}</clr-dg-cell> -->
-              <clr-dg-cell>
-                <!-- <span style="cursor: pointer; padding: 10px; "><clr-icon shape="form"  (click)="goToEdit(user.id)" class="success" style="color: rgb(0, 130, 236);"></clr-icon></span> -->
-              <a href="javascript:void(0)" style="padding-right: 10px;" role="tooltip" aria-haspopup="true" class="tooltip tooltip-sm tooltip-top-left">
-                <span style="cursor: pointer;"><clr-icon shape="trash" (click)="onDelete(user)" class="red is-error" style="color: red;"></clr-icon></span>
-                <span class="tooltip-content">{{ 'Delete' | translate }}</span>
-                </a>
-             
-              <clr-signpost>
-                <span style="cursor: pointer;" clrSignpostTrigger><clr-icon shape="help" class="success" style="color: rgb(0, 130, 236);"></clr-icon></span>
-                <clr-signpost-content [clrPosition]="'left-middle'" *clrIfOpen>
-                  <h5 style="margin-top: 0">{{ 'Who_Column' | translate }}</h5>
-                  <div>{{ 'Account_ID' | translate }}: <code class="clr-code">{{ user.accountId }}</code></div>
-                  <div>{{ 'Created_At' | translate }}: <code class="clr-code">{{ user.createdAt | date }}</code></div>
-                  <div>{{ 'Created_By' | translate }}: <code class="clr-code">{{ user.createdBy }}</code></div>
-                  <div>{{ 'Updated_At' | translate }}: <code class="clr-code">{{ user.updatedAt | date }}</code></div>
-                  <div>{{ 'Updated_By' | translate }}: <code class="clr-code">{{ user.updatedBy }}</code></div>
-              </clr-signpost-content>
-              </clr-signpost>
-            
-              </clr-dg-cell>
-          <clr-dg-action-overflow>
-            <button class="action-item" (click)="goToEditData(user.id)">{{ 'Edit' | translate }} <clr-icon shape="edit" class="is-error"></clr-icon></button>
-            <!-- <button class="action-item" (click)="onDelete(user)">Delete<clr-icon shape="trash" class="is-error"></clr-icon></button> -->
-          </clr-dg-action-overflow>
-        </clr-dg-row>
-  
-        <clr-dg-footer>
-          <clr-dg-pagination #pagination [clrDgPageSize]="10">
-            <clr-dg-page-size [clrPageSizeOptions]="[10,20,50,100]">{{ 'Users_per_page' | translate }}</clr-dg-page-size>
-            {{pagination.firstItem + 1}} - {{pagination.lastItem + 1}}
-            {{ 'of' | translate }} {{pagination.totalItems}}   {{ 'users' | translate }}
-          </clr-dg-pagination>
-        </clr-dg-footer>
-      </clr-datagrid>
+      <clr-dg-cell>
+        <!-- <span style="cursor: pointer; padding: 10px; "><clr-icon shape="form"  (click)="goToEdit(user.id)" class="success" style="color: rgb(0, 130, 236);"></clr-icon></span> -->
+        <a href="javascript:void(0)" style="padding-right: 10px;" role="tooltip" aria-haspopup="true"
+          class="tooltip tooltip-sm tooltip-top-left">
+          <span style="cursor: pointer;"><clr-icon shape="trash" (click)="onDelete(user)" class="red is-error"
+              style="color: red;"></clr-icon></span>
+          <span class="tooltip-content">{{ 'Delete' | translate }}</span>
+        </a>
+
+        <clr-signpost>
+          <span style="cursor: pointer;" clrSignpostTrigger><clr-icon shape="help" class="success"
+              style="color: rgb(0, 130, 236);"></clr-icon></span>
+          <clr-signpost-content [clrPosition]="'left-middle'" *clrIfOpen>
+            <h5 style="margin-top: 0">{{ 'Who_Column' | translate }}</h5>
+            <div>{{ 'Account_ID' | translate }}: <code class="clr-code">{{ user.accountId }}</code></div>
+            <div>{{ 'Created_At' | translate }}: <code class="clr-code">{{ user.createdAt | date }}</code></div>
+            <div>{{ 'Created_By' | translate }}: <code class="clr-code">{{ user.createdBy }}</code></div>
+            <div>{{ 'Updated_At' | translate }}: <code class="clr-code">{{ user.updatedAt | date }}</code></div>
+            <div>{{ 'Updated_By' | translate }}: <code class="clr-code">{{ user.updatedBy }}</code></div>
+          </clr-signpost-content>
+        </clr-signpost>
+
+      </clr-dg-cell>
+      <clr-dg-action-overflow>
+        <button class="action-item" (click)="goToEditData(user.id)">{{ 'Edit' | translate }} <clr-icon shape="edit"
+            class="is-error"></clr-icon></button>
+        <!-- <button class="action-item" (click)="onDelete(user)">Delete<clr-icon shape="trash" class="is-error"></clr-icon></button> -->
+      </clr-dg-action-overflow>
+    </clr-dg-row>
+
+    <clr-dg-footer>
+      <clr-dg-pagination #pagination [clrDgPageSize]="10">
+        <clr-dg-page-size [clrPageSizeOptions]="[10,20,50,100]">{{ 'Users_per_page' | translate }}</clr-dg-page-size>
+        {{pagination.firstItem + 1}} - {{pagination.lastItem + 1}}
+        {{ 'of' | translate }} {{pagination.totalItems}} {{ 'users' | translate }}
+      </clr-dg-pagination>
+    </clr-dg-footer>
+  </clr-datagrid>
+</div>
+
+<clr-modal [(clrModalOpen)]="addModall" [clrModalSize]="'lg'" [clrModalStaticBackdrop]="true">
+  <div class="modal-body">
+    <div class="s-order-dash-pg">
+      <div class="chart-box" id="word1" (click)="gotoadd()"><br>
+        <img style="margin: auto; display: block;" src="/assets/images/fromscratch.png" height="90" width="90">
+        <h5 class="center"> <b>{{ 'Start_from_scratch' | translate }}</b> </h5>
+      </div>
+      <div class="chart-box" id="word1"><br>
+        <img style="margin: auto; display: block;" src="/assets/images/copytemplate.png" height="90" width="90">
+        <h5 class="center"> <b>{{ 'Import_from_template' | translate }}</b> </h5>
+      </div>
+      <div class="chart-box" id="word1"><br>
+        <img style="margin: auto; display: block;" src="/assets/images/database.png" height="90" width="90">
+        <h5 class="center"> <b>{{ 'Import_from_public_project' | translate }}</b> </h5>
+      </div>
     </div>
-  
-    <clr-modal [(clrModalOpen)]="addModall" [clrModalSize]="'lg'" [clrModalStaticBackdrop]="true">
-      <div class="modal-body">
-          <div class="s-order-dash-pg">
-              <div class="chart-box" id="word1" (click)="gotoadd()"><br>
-                <img style="margin: auto; display: block;" src="/assets/images/fromscratch.png" height="90" width="90">
-                <h5 class="center"> <b>{{ 'Start_from_scratch' | translate }}</b>  </h5>
-              </div>
-              <div class="chart-box" id="word1" ><br>
-                <img style="margin: auto; display: block;" src="/assets/images/copytemplate.png" height="90" width="90">
-                <h5 class="center"> <b>{{ 'Import_from_template' | translate }}</b>  </h5>
-              </div>
-              <div class="chart-box" id="word1"><br>
-                <img style="margin: auto; display: block;" src="/assets/images/database.png" height="90" width="90">
-                <h5 class="center"> <b>{{ 'Import_from_public_project' | translate }}</b>  </h5>
-              </div>
-            </div>
-      </div>
-    </clr-modal>
-  
-    <clr-modal [(clrModalOpen)]="modalDelete" [clrModalSize]="'lg'" [clrModalStaticBackdrop]="true">
-      <div class="modal-body" *ngIf="rowSelected.id">
-        <h1 class="delete">{{ 'Are_you_sure_want_to_delete' | translate }}</h1>
-        <h2 class="heading">{{rowSelected.id}}</h2>
-        <div class="modal-footer">
-          <button type="button" class="btn btn-outline" (click)="modalDelete = false">{{ 'Cancel' | translate }}</button>
-          <button type="submit" (click)="delete(rowSelected.id)" class="btn btn-primary" >{{ 'Delete' | translate }}</button>
-        </div>
-      </div>
-    </clr-modal>
-   
-  
-  
\ No newline at end of file
+  </div>
+</clr-modal>
+
+<clr-modal [(clrModalOpen)]="modalDelete" [clrModalSize]="'lg'" [clrModalStaticBackdrop]="true">
+  <div class="modal-body" *ngIf="rowSelected.id">
+    <h1 class="delete">{{ 'Are_you_sure_want_to_delete' | translate }}</h1>
+    <h2 class="heading">{{rowSelected.id}}</h2>
+    <div class="modal-footer">
+      <button type="button" class="btn btn-outline" (click)="modalDelete = false">{{ 'Cancel' | translate }}</button>
+      <button type="submit" (click)="delete(rowSelected.id)" class="btn btn-primary">{{ 'Delete' | translate }}</button>
+    </div>
+  </div>
+</clr-modal>
\ No newline at end of file
diff --git a/frontend/angular-clarity-master/src/app/modules/main/builder/dashboardnew/allnewdash/allnewdash.component.ts b/frontend/angular-clarity-master/src/app/modules/main/builder/dashboardnew/allnewdash/allnewdash.component.ts
index b907dae..e40ebc4 100644
--- a/frontend/angular-clarity-master/src/app/modules/main/builder/dashboardnew/allnewdash/allnewdash.component.ts
+++ b/frontend/angular-clarity-master/src/app/modules/main/builder/dashboardnew/allnewdash/allnewdash.component.ts
@@ -24,6 +24,7 @@ export class AllnewdashComponent implements OnInit {
   projectname;
   projectId;
   error;
+  chartConfigManagerOpen = false;
   constructor(
     private router : Router,
     private route: ActivatedRoute,private dashboardService : DashboardService,
@@ -121,4 +122,9 @@ export class AllnewdashComponent implements OnInit {
   //    this.router.navigate(['../editdashn'],{relativeTo:this.route});
   // }
 
+  // Add method to open chart configuration manager
+  openChartConfig(): void {
+          this.router.navigate(['../chart-types'],{relativeTo:this.route});
+
+  }
 }
diff --git a/frontend/angular-clarity-master/src/app/modules/main/builder/dashboardnew/chart-config-manager/chart-config-manager.component.html b/frontend/angular-clarity-master/src/app/modules/main/builder/dashboardnew/chart-config-manager/chart-config-manager.component.html
new file mode 100644
index 0000000..18e5c95
--- /dev/null
+++ b/frontend/angular-clarity-master/src/app/modules/main/builder/dashboardnew/chart-config-manager/chart-config-manager.component.html
@@ -0,0 +1,630 @@
+<div class="chart-config-manager">
+  <h2>Chart Configuration Manager</h2>
+  
+  <!-- Chart Types Section -->
+  <clr-tabs>
+    <clr-tab>
+      <button clrTabLink>Chart Types</button>
+      <clr-tab-content>
+        <div class="card">
+          <div class="card-header">
+            <h3>Chart Types</h3>
+            <button class="btn btn-sm btn-primary" (click)="showAddChartTypeForm = true">
+              Add Chart Type
+            </button>
+          </div>
+          
+          <!-- Add Chart Type Form -->
+          <div class="card-block" *ngIf="showAddChartTypeForm">
+            <form clrForm>
+              <clr-input-container>
+                <label>Name</label>
+                <input clrInput type="text" [(ngModel)]="newChartType.name" name="chartTypeName" required />
+              </clr-input-container>
+              
+              <clr-input-container>
+                <label>Display Name</label>
+                <input clrInput type="text" [(ngModel)]="newChartType.displayName" name="chartTypeDisplayName" />
+              </clr-input-container>
+              
+              <clr-textarea-container>
+                <label>Description</label>
+                <textarea clrTextarea [(ngModel)]="newChartType.description" name="chartTypeDescription"></textarea>
+              </clr-textarea-container>
+              
+              <clr-checkbox-container>
+                <label>Is Active</label>
+                <clr-checkbox-wrapper>
+                  <input type="checkbox" clrCheckbox [(ngModel)]="newChartType.isActive" name="chartTypeIsActive" />
+                  <label>Active</label>
+                </clr-checkbox-wrapper>
+              </clr-checkbox-container>
+              
+              <div class="form-actions">
+                <button class="btn btn-primary" (click)="createChartType()" [disabled]="!newChartType.name">Save</button>
+                <button class="btn" (click)="showAddChartTypeForm = false">Cancel</button>
+              </div>
+            </form>
+          </div>
+          
+          <!-- Chart Types Table -->
+          <div class="card-block">
+            <clr-datagrid>
+              <clr-dg-column>Name</clr-dg-column>
+              <clr-dg-column>Display Name</clr-dg-column>
+              <clr-dg-column>Description</clr-dg-column>
+              <clr-dg-column>Status</clr-dg-column>
+              <clr-dg-column>Actions</clr-dg-column>
+              
+              <clr-dg-row *clrDgItems="let chartType of chartTypes" [clrDgItem]="chartType">
+                <clr-dg-cell>{{chartType.name}}</clr-dg-cell>
+                <clr-dg-cell>{{chartType.displayName}}</clr-dg-cell>
+                <clr-dg-cell>{{chartType.description}}</clr-dg-cell>
+                <clr-dg-cell>
+                  <span class="label" [class.label-success]="chartType.isActive" [class.label-danger]="!chartType.isActive">
+                    {{chartType.isActive ? 'Active' : 'Inactive'}}
+                  </span>
+                </clr-dg-cell>
+                <clr-dg-cell>
+                  <button class="btn btn-sm btn-icon" (click)="selectChartTypeForEdit(chartType)">
+                    <cds-icon shape="pencil"></cds-icon>
+                  </button>
+                  <button class="btn btn-sm btn-icon" (click)="deleteChartType(chartType.id)">
+                    <cds-icon shape="trash"></cds-icon>
+                  </button>
+                  <button class="btn btn-sm btn-icon" (click)="onChartTypeSelect(chartType)">
+                    <cds-icon shape="eye"></cds-icon>
+                  </button>
+                </clr-dg-cell>
+              </clr-dg-row>
+              
+              <clr-dg-footer>
+                {{chartTypes.length}} chart types
+              </clr-dg-footer>
+            </clr-datagrid>
+          </div>
+          
+          <!-- Edit Chart Type Form -->
+          <div class="card-block" *ngIf="selectedChartType">
+            <h4>Edit Chart Type</h4>
+            <form clrForm>
+              <clr-input-container>
+                <label>Name</label>
+                <input clrInput type="text" [(ngModel)]="selectedChartType.name" name="editChartTypeName" required />
+              </clr-input-container>
+              
+              <clr-input-container>
+                <label>Display Name</label>
+                <input clrInput type="text" [(ngModel)]="selectedChartType.displayName" name="editChartTypeDisplayName" />
+              </clr-input-container>
+              
+              <clr-textarea-container>
+                <label>Description</label>
+                <textarea clrTextarea [(ngModel)]="selectedChartType.description" name="editChartTypeDescription"></textarea>
+              </clr-textarea-container>
+              
+              <clr-checkbox-container>
+                <label>Is Active</label>
+                <clr-checkbox-wrapper>
+                  <input type="checkbox" clrCheckbox [(ngModel)]="selectedChartType.isActive" name="editChartTypeIsActive" />
+                  <label>Active</label>
+                </clr-checkbox-wrapper>
+              </clr-checkbox-container>
+              
+              <div class="form-actions">
+                <button class="btn btn-primary" (click)="updateChartType()" [disabled]="!selectedChartType.name">Update</button>
+                <button class="btn" (click)="selectedChartType = null">Cancel</button>
+              </div>
+            </form>
+          </div>
+        </div>
+      </clr-tab-content>
+    </clr-tab>
+    
+    <!-- UI Components Section -->
+    <clr-tab *ngIf="selectedChartType">
+      <button clrTabLink>UI Components</button>
+      <clr-tab-content>
+        <div class="card">
+          <div class="card-header">
+            <h3>UI Components for {{selectedChartType?.name}}</h3>
+            <button class="btn btn-sm btn-primary" (click)="showAddUiComponentForm = true">
+              Add UI Component
+            </button>
+          </div>
+          
+          <!-- Add UI Component Form -->
+          <div class="card-block" *ngIf="showAddUiComponentForm">
+            <form clrForm>
+              <clr-input-container>
+                <label>Component Name</label>
+                <input clrInput type="text" [(ngModel)]="newUiComponent.componentName" name="componentName" required />
+              </clr-input-container>
+              
+              <clr-input-container>
+                <label>Component Type</label>
+                <input clrInput type="text" [(ngModel)]="newUiComponent.componentType" name="componentType" />
+              </clr-input-container>
+              
+              <clr-input-container>
+                <label>Display Label</label>
+                <input clrInput type="text" [(ngModel)]="newUiComponent.displayLabel" name="displayLabel" />
+              </clr-input-container>
+              
+              <clr-input-container>
+                <label>Placeholder</label>
+                <input clrInput type="text" [(ngModel)]="newUiComponent.placeholder" name="placeholder" />
+              </clr-input-container>
+              
+              <clr-input-container>
+                <label>Sort Order</label>
+                <input clrInput type="number" [(ngModel)]="newUiComponent.sortOrder" name="sortOrder" />
+              </clr-input-container>
+              
+              <clr-checkbox-container>
+                <label>Is Required</label>
+                <clr-checkbox-wrapper>
+                  <input type="checkbox" clrCheckbox [(ngModel)]="newUiComponent.isRequired" name="isRequired" />
+                  <label>Required</label>
+                </clr-checkbox-wrapper>
+              </clr-checkbox-container>
+              
+              <div class="form-actions">
+                <button class="btn btn-primary" (click)="createUiComponent()" [disabled]="!newUiComponent.componentName">Save</button>
+                <button class="btn" (click)="showAddUiComponentForm = false">Cancel</button>
+              </div>
+            </form>
+          </div>
+          
+          <!-- UI Components Table -->
+          <div class="card-block">
+            <clr-datagrid>
+              <clr-dg-column>Component Name</clr-dg-column>
+              <clr-dg-column>Component Type</clr-dg-column>
+              <clr-dg-column>Display Label</clr-dg-column>
+              <clr-dg-column>Placeholder</clr-dg-column>
+              <clr-dg-column>Required</clr-dg-column>
+              <clr-dg-column>Sort Order</clr-dg-column>
+              <clr-dg-column>Actions</clr-dg-column>
+              
+              <clr-dg-row *clrDgItems="let uiComponent of uiComponents" [clrDgItem]="uiComponent">
+                <clr-dg-cell>{{uiComponent.componentName}}</clr-dg-cell>
+                <clr-dg-cell>{{uiComponent.componentType}}</clr-dg-cell>
+                <clr-dg-cell>{{uiComponent.displayLabel}}</clr-dg-cell>
+                <clr-dg-cell>{{uiComponent.placeholder}}</clr-dg-cell>
+                <clr-dg-cell>
+                  <span class="label" [class.label-success]="uiComponent.isRequired" [class.label-danger]="!uiComponent.isRequired">
+                    {{uiComponent.isRequired ? 'Yes' : 'No'}}
+                  </span>
+                </clr-dg-cell>
+                <clr-dg-cell>{{uiComponent.sortOrder}}</clr-dg-cell>
+                <clr-dg-cell>
+                  <button class="btn btn-sm btn-icon" (click)="selectUiComponentForEdit(uiComponent)">
+                    <cds-icon shape="pencil"></cds-icon>
+                  </button>
+                  <button class="btn btn-sm btn-icon" (click)="deleteUiComponent(uiComponent.id)">
+                    <cds-icon shape="trash"></cds-icon>
+                  </button>
+                </clr-dg-cell>
+              </clr-dg-row>
+              
+              <clr-dg-footer>
+                {{uiComponents.length}} UI components
+              </clr-dg-footer>
+            </clr-datagrid>
+          </div>
+          
+          <!-- Edit UI Component Form -->
+          <div class="card-block" *ngIf="selectedUiComponent">
+            <h4>Edit UI Component</h4>
+            <form clrForm>
+              <clr-input-container>
+                <label>Component Name</label>
+                <input clrInput type="text" [(ngModel)]="selectedUiComponent.componentName" name="editComponentName" required />
+              </clr-input-container>
+              
+              <clr-input-container>
+                <label>Component Type</label>
+                <input clrInput type="text" [(ngModel)]="selectedUiComponent.componentType" name="editComponentType" />
+              </clr-input-container>
+              
+              <clr-input-container>
+                <label>Display Label</label>
+                <input clrInput type="text" [(ngModel)]="selectedUiComponent.displayLabel" name="editDisplayLabel" />
+              </clr-input-container>
+              
+              <clr-input-container>
+                <label>Placeholder</label>
+                <input clrInput type="text" [(ngModel)]="selectedUiComponent.placeholder" name="editPlaceholder" />
+              </clr-input-container>
+              
+              <clr-input-container>
+                <label>Sort Order</label>
+                <input clrInput type="number" [(ngModel)]="selectedUiComponent.sortOrder" name="editSortOrder" />
+              </clr-input-container>
+              
+              <clr-checkbox-container>
+                <label>Is Required</label>
+                <clr-checkbox-wrapper>
+                  <input type="checkbox" clrCheckbox [(ngModel)]="selectedUiComponent.isRequired" name="editIsRequired" />
+                  <label>Required</label>
+                </clr-checkbox-wrapper>
+              </clr-checkbox-container>
+              
+              <div class="form-actions">
+                <button class="btn btn-primary" (click)="updateUiComponent()" [disabled]="!selectedUiComponent.componentName">Update</button>
+                <button class="btn" (click)="selectedUiComponent = null">Cancel</button>
+              </div>
+            </form>
+          </div>
+        </div>
+      </clr-tab-content>
+    </clr-tab>
+    
+    <!-- Component Properties Section -->
+    <clr-tab *ngIf="selectedUiComponent">
+      <button clrTabLink>Component Properties</button>
+      <clr-tab-content>
+        <div class="card">
+          <div class="card-header">
+            <h3>Properties for {{selectedUiComponent?.componentName}}</h3>
+            <button class="btn btn-sm btn-primary" (click)="showAddComponentPropertyForm = true">
+              Add Property
+            </button>
+          </div>
+          
+          <!-- Add Component Property Form -->
+          <div class="card-block" *ngIf="showAddComponentPropertyForm">
+            <form clrForm>
+              <clr-input-container>
+                <label>Property Name</label>
+                <input clrInput type="text" [(ngModel)]="newComponentProperty.propertyName" name="propertyName" required />
+              </clr-input-container>
+              
+              <clr-input-container>
+                <label>Property Value</label>
+                <input clrInput type="text" [(ngModel)]="newComponentProperty.propertyValue" name="propertyValue" />
+              </clr-input-container>
+              
+              <clr-input-container>
+                <label>Property Type</label>
+                <input clrInput type="text" [(ngModel)]="newComponentProperty.propertyType" name="propertyType" />
+              </clr-input-container>
+              
+              <div class="form-actions">
+                <button class="btn btn-primary" (click)="createComponentProperty()" [disabled]="!newComponentProperty.propertyName">Save</button>
+                <button class="btn" (click)="showAddComponentPropertyForm = false">Cancel</button>
+              </div>
+            </form>
+          </div>
+          
+          <!-- Component Properties Table -->
+          <div class="card-block">
+            <clr-datagrid>
+              <clr-dg-column>Property Name</clr-dg-column>
+              <clr-dg-column>Property Value</clr-dg-column>
+              <clr-dg-column>Property Type</clr-dg-column>
+              <clr-dg-column>Actions</clr-dg-column>
+              
+              <clr-dg-row *clrDgItems="let property of componentProperties" [clrDgItem]="property">
+                <clr-dg-cell>{{property.propertyName}}</clr-dg-cell>
+                <clr-dg-cell>{{property.propertyValue}}</clr-dg-cell>
+                <clr-dg-cell>{{property.propertyType}}</clr-dg-cell>
+                <clr-dg-cell>
+                  <button class="btn btn-sm btn-icon" (click)="selectComponentPropertyForEdit(property)">
+                    <cds-icon shape="pencil"></cds-icon>
+                  </button>
+                  <button class="btn btn-sm btn-icon" (click)="deleteComponentProperty(property.id)">
+                    <cds-icon shape="trash"></cds-icon>
+                  </button>
+                </clr-dg-cell>
+              </clr-dg-row>
+              
+              <clr-dg-footer>
+                {{componentProperties.length}} properties
+              </clr-dg-footer>
+            </clr-datagrid>
+          </div>
+          
+          <!-- Edit Component Property Form -->
+          <div class="card-block" *ngIf="selectedComponentProperty">
+            <h4>Edit Component Property</h4>
+            <form clrForm>
+              <clr-input-container>
+                <label>Property Name</label>
+                <input clrInput type="text" [(ngModel)]="selectedComponentProperty.propertyName" name="editPropertyName" required />
+              </clr-input-container>
+              
+              <clr-input-container>
+                <label>Property Value</label>
+                <input clrInput type="text" [(ngModel)]="selectedComponentProperty.propertyValue" name="editPropertyValue" />
+              </clr-input-container>
+              
+              <clr-input-container>
+                <label>Property Type</label>
+                <input clrInput type="text" [(ngModel)]="selectedComponentProperty.propertyType" name="editPropertyType" />
+              </clr-input-container>
+              
+              <div class="form-actions">
+                <button class="btn btn-primary" (click)="updateComponentProperty()" [disabled]="!selectedComponentProperty.propertyName">Update</button>
+                <button class="btn" (click)="selectedComponentProperty = null">Cancel</button>
+              </div>
+            </form>
+          </div>
+        </div>
+      </clr-tab-content>
+    </clr-tab>
+    
+    <!-- Chart Templates Section -->
+    <clr-tab *ngIf="selectedChartType">
+      <button clrTabLink>Chart Templates</button>
+      <clr-tab-content>
+        <div class="card">
+          <div class="card-header">
+            <h3>Templates for {{selectedChartType?.name}}</h3>
+            <button class="btn btn-sm btn-primary" (click)="showAddChartTemplateForm = true">
+              Add Template
+            </button>
+          </div>
+          
+          <!-- Add Chart Template Form -->
+          <div class="card-block" *ngIf="showAddChartTemplateForm">
+            <form clrForm>
+              <clr-input-container>
+                <label>Template Name</label>
+                <input clrInput type="text" [(ngModel)]="newChartTemplate.templateName" name="templateName" required />
+              </clr-input-container>
+              
+              <clr-textarea-container>
+                <label>HTML Template</label>
+                <textarea clrTextarea [(ngModel)]="newChartTemplate.templateHtml" name="templateHtml" rows="5"></textarea>
+              </clr-textarea-container>
+              
+              <clr-textarea-container>
+                <label>CSS Template</label>
+                <textarea clrTextarea [(ngModel)]="newChartTemplate.templateCss" name="templateCss" rows="5"></textarea>
+              </clr-textarea-container>
+              
+              <clr-checkbox-container>
+                <label>Is Default</label>
+                <clr-checkbox-wrapper>
+                  <input type="checkbox" clrCheckbox [(ngModel)]="newChartTemplate.isDefault" name="isDefault" />
+                  <label>Default Template</label>
+                </clr-checkbox-wrapper>
+              </clr-checkbox-container>
+              
+              <div class="form-actions">
+                <button class="btn btn-primary" (click)="createChartTemplate()" [disabled]="!newChartTemplate.templateName">Save</button>
+                <button class="btn" (click)="showAddChartTemplateForm = false">Cancel</button>
+              </div>
+            </form>
+          </div>
+          
+          <!-- Chart Templates Table -->
+          <div class="card-block">
+            <clr-datagrid>
+              <clr-dg-column>Template Name</clr-dg-column>
+              <clr-dg-column>Is Default</clr-dg-column>
+              <clr-dg-column>Actions</clr-dg-column>
+              
+              <clr-dg-row *clrDgItems="let template of chartTemplates" [clrDgItem]="template">
+                <clr-dg-cell>{{template.templateName}}</clr-dg-cell>
+                <clr-dg-cell>
+                  <span class="label" [class.label-success]="template.isDefault" [class.label-danger]="!template.isDefault">
+                    {{template.isDefault ? 'Yes' : 'No'}}
+                  </span>
+                </clr-dg-cell>
+                <clr-dg-cell>
+                  <button class="btn btn-sm btn-icon" (click)="selectChartTemplateForEdit(template)">
+                    <cds-icon shape="pencil"></cds-icon>
+                  </button>
+                  <button class="btn btn-sm btn-icon" (click)="deleteChartTemplate(template.id)">
+                    <cds-icon shape="trash"></cds-icon>
+                  </button>
+                </clr-dg-cell>
+              </clr-dg-row>
+              
+              <clr-dg-footer>
+                {{chartTemplates.length}} templates
+              </clr-dg-footer>
+            </clr-datagrid>
+          </div>
+          
+          <!-- Edit Chart Template Form -->
+          <div class="card-block" *ngIf="selectedChartTemplate">
+            <h4>Edit Chart Template</h4>
+            <form clrForm>
+              <clr-input-container>
+                <label>Template Name</label>
+                <input clrInput type="text" [(ngModel)]="selectedChartTemplate.templateName" name="editTemplateName" required />
+              </clr-input-container>
+              
+              <clr-textarea-container>
+                <label>HTML Template</label>
+                <textarea clrTextarea [(ngModel)]="selectedChartTemplate.templateHtml" name="editTemplateHtml" rows="5"></textarea>
+              </clr-textarea-container>
+              
+              <clr-textarea-container>
+                <label>CSS Template</label>
+                <textarea clrTextarea [(ngModel)]="selectedChartTemplate.templateCss" name="editTemplateCss" rows="5"></textarea>
+              </clr-textarea-container>
+              
+              <clr-checkbox-container>
+                <label>Is Default</label>
+                <clr-checkbox-wrapper>
+                  <input type="checkbox" clrCheckbox [(ngModel)]="selectedChartTemplate.isDefault" name="editIsDefault" />
+                  <label>Default Template</label>
+                </clr-checkbox-wrapper>
+              </clr-checkbox-container>
+              
+              <div class="form-actions">
+                <button class="btn btn-primary" (click)="updateChartTemplate()" [disabled]="!selectedChartTemplate.templateName">Update</button>
+                <button class="btn" (click)="selectedChartTemplate = null">Cancel</button>
+              </div>
+            </form>
+          </div>
+        </div>
+      </clr-tab-content>
+    </clr-tab>
+    
+    <!-- Dynamic Fields Section -->
+    <clr-tab *ngIf="selectedChartType">
+      <button clrTabLink>Dynamic Fields</button>
+      <clr-tab-content>
+        <div class="card">
+          <div class="card-header">
+            <h3>Dynamic Fields for {{selectedChartType?.name}}</h3>
+            <button class="btn btn-sm btn-primary" (click)="showAddDynamicFieldForm = true">
+              Add Field
+            </button>
+          </div>
+          
+          <!-- Add Dynamic Field Form -->
+          <div class="card-block" *ngIf="showAddDynamicFieldForm">
+            <form clrForm>
+              <clr-input-container>
+                <label>Field Name</label>
+                <input clrInput type="text" [(ngModel)]="newDynamicField.fieldName" name="fieldName" required />
+              </clr-input-container>
+              
+              <clr-input-container>
+                <label>Field Label</label>
+                <input clrInput type="text" [(ngModel)]="newDynamicField.fieldLabel" name="fieldLabel" />
+              </clr-input-container>
+              
+              <clr-input-container>
+                <label>Field Type</label>
+                <input clrInput type="text" [(ngModel)]="newDynamicField.fieldType" name="fieldType" />
+              </clr-input-container>
+              
+              <clr-textarea-container>
+                <label>Field Options</label>
+                <textarea clrTextarea [(ngModel)]="newDynamicField.fieldOptions" name="fieldOptions"></textarea>
+              </clr-textarea-container>
+              
+              <clr-input-container>
+                <label>Sort Order</label>
+                <input clrInput type="number" [(ngModel)]="newDynamicField.sortOrder" name="fieldSortOrder" />
+              </clr-input-container>
+              
+              <clr-checkbox-container>
+                <label>Is Required</label>
+                <clr-checkbox-wrapper>
+                  <input type="checkbox" clrCheckbox [(ngModel)]="newDynamicField.isRequired" name="fieldIsRequired" />
+                  <label>Required</label>
+                </clr-checkbox-wrapper>
+              </clr-checkbox-container>
+              
+              <clr-checkbox-container>
+                <label>Show in UI</label>
+                <clr-checkbox-wrapper>
+                  <input type="checkbox" clrCheckbox [(ngModel)]="newDynamicField.showInUi" name="fieldShowInUi" />
+                  <label>Show in UI</label>
+                </clr-checkbox-wrapper>
+              </clr-checkbox-container>
+              
+              <div class="form-actions">
+                <button class="btn btn-primary" (click)="createDynamicField()" [disabled]="!newDynamicField.fieldName">Save</button>
+                <button class="btn" (click)="showAddDynamicFieldForm = false">Cancel</button>
+              </div>
+            </form>
+          </div>
+          
+          <!-- Dynamic Fields Table -->
+          <div class="card-block">
+            <clr-datagrid>
+              <clr-dg-column>Field Name</clr-dg-column>
+              <clr-dg-column>Field Label</clr-dg-column>
+              <clr-dg-column>Field Type</clr-dg-column>
+              <clr-dg-column>Required</clr-dg-column>
+              <clr-dg-column>Show in UI</clr-dg-column>
+              <clr-dg-column>Sort Order</clr-dg-column>
+              <clr-dg-column>Actions</clr-dg-column>
+              
+              <clr-dg-row *clrDgItems="let field of dynamicFields" [clrDgItem]="field">
+                <clr-dg-cell>{{field.fieldName}}</clr-dg-cell>
+                <clr-dg-cell>{{field.fieldLabel}}</clr-dg-cell>
+                <clr-dg-cell>{{field.fieldType}}</clr-dg-cell>
+                <clr-dg-cell>
+                  <span class="label" [class.label-success]="field.isRequired" [class.label-danger]="!field.isRequired">
+                    {{field.isRequired ? 'Yes' : 'No'}}
+                  </span>
+                </clr-dg-cell>
+                <clr-dg-cell>
+                  <span class="label" [class.label-success]="field.showInUi" [class.label-danger]="!field.showInUi">
+                    {{field.showInUi ? 'Yes' : 'No'}}
+                  </span>
+                </clr-dg-cell>
+                <clr-dg-cell>{{field.sortOrder}}</clr-dg-cell>
+                <clr-dg-cell>
+                  <button class="btn btn-sm btn-icon" (click)="selectDynamicFieldForEdit(field)">
+                    <cds-icon shape="pencil"></cds-icon>
+                  </button>
+                  <button class="btn btn-sm btn-icon" (click)="deleteDynamicField(field.id)">
+                    <cds-icon shape="trash"></cds-icon>
+                  </button>
+                </clr-dg-cell>
+              </clr-dg-row>
+              
+              <clr-dg-footer>
+                {{dynamicFields.length}} fields
+              </clr-dg-footer>
+            </clr-datagrid>
+          </div>
+          
+          <!-- Edit Dynamic Field Form -->
+          <div class="card-block" *ngIf="selectedDynamicField">
+            <h4>Edit Dynamic Field</h4>
+            <form clrForm>
+              <clr-input-container>
+                <label>Field Name</label>
+                <input clrInput type="text" [(ngModel)]="selectedDynamicField.fieldName" name="editFieldName" required />
+              </clr-input-container>
+              
+              <clr-input-container>
+                <label>Field Label</label>
+                <input clrInput type="text" [(ngModel)]="selectedDynamicField.fieldLabel" name="editFieldLabel" />
+              </clr-input-container>
+              
+              <clr-input-container>
+                <label>Field Type</label>
+                <input clrInput type="text" [(ngModel)]="selectedDynamicField.fieldType" name="editFieldType" />
+              </clr-input-container>
+              
+              <clr-textarea-container>
+                <label>Field Options</label>
+                <textarea clrTextarea [(ngModel)]="selectedDynamicField.fieldOptions" name="editFieldOptions"></textarea>
+              </clr-textarea-container>
+              
+              <clr-input-container>
+                <label>Sort Order</label>
+                <input clrInput type="number" [(ngModel)]="selectedDynamicField.sortOrder" name="editFieldSortOrder" />
+              </clr-input-container>
+              
+              <clr-checkbox-container>
+                <label>Is Required</label>
+                <clr-checkbox-wrapper>
+                  <input type="checkbox" clrCheckbox [(ngModel)]="selectedDynamicField.isRequired" name="editFieldIsRequired" />
+                  <label>Required</label>
+                </clr-checkbox-wrapper>
+              </clr-checkbox-container>
+              
+              <clr-checkbox-container>
+                <label>Show in UI</label>
+                <clr-checkbox-wrapper>
+                  <input type="checkbox" clrCheckbox [(ngModel)]="selectedDynamicField.showInUi" name="editFieldShowInUi" />
+                  <label>Show in UI</label>
+                </clr-checkbox-wrapper>
+              </clr-checkbox-container>
+              
+              <div class="form-actions">
+                <button class="btn btn-primary" (click)="updateDynamicField()" [disabled]="!selectedDynamicField.fieldName">Update</button>
+                <button class="btn" (click)="selectedDynamicField = null">Cancel</button>
+              </div>
+            </form>
+          </div>
+        </div>
+      </clr-tab-content>
+    </clr-tab>
+  </clr-tabs>
+</div>
diff --git a/frontend/angular-clarity-master/src/app/modules/main/builder/dashboardnew/chart-config-manager/chart-config-manager.component.scss b/frontend/angular-clarity-master/src/app/modules/main/builder/dashboardnew/chart-config-manager/chart-config-manager.component.scss
new file mode 100644
index 0000000..8e7895c
--- /dev/null
+++ b/frontend/angular-clarity-master/src/app/modules/main/builder/dashboardnew/chart-config-manager/chart-config-manager.component.scss
@@ -0,0 +1,60 @@
+.chart-config-manager {
+  padding: 20px;
+  
+  .card {
+    margin-bottom: 20px;
+    
+    .card-header {
+      display: flex;
+      justify-content: space-between;
+      align-items: center;
+      
+      h3 {
+        margin: 0;
+      }
+    }
+    
+    .card-block {
+      padding: 15px;
+      
+      form {
+        margin-bottom: 20px;
+      }
+    }
+  }
+  
+  .form-actions {
+    display: flex;
+    gap: 10px;
+    margin-top: 15px;
+  }
+  
+  clr-datagrid {
+    min-height: 200px;
+  }
+  
+  .label {
+    padding: 4px 8px;
+    border-radius: 3px;
+    font-size: 12px;
+    font-weight: bold;
+  }
+  
+  .label-success {
+    background-color: #318700;
+    color: white;
+  }
+  
+  .label-danger {
+    background-color: #e62200;
+    color: white;
+  }
+  
+  .required {
+    color: red;
+  }
+  
+  .alert {
+    margin-bottom: 20px;
+  }
+}
\ No newline at end of file
diff --git a/frontend/angular-clarity-master/src/app/modules/main/builder/dashboardnew/chart-config-manager/chart-config-manager.component.ts b/frontend/angular-clarity-master/src/app/modules/main/builder/dashboardnew/chart-config-manager/chart-config-manager.component.ts
new file mode 100644
index 0000000..8886d71
--- /dev/null
+++ b/frontend/angular-clarity-master/src/app/modules/main/builder/dashboardnew/chart-config-manager/chart-config-manager.component.ts
@@ -0,0 +1,658 @@
+import { Component, OnInit } from '@angular/core';
+import { HttpClient } from '@angular/common/http';
+import { environment } from 'src/environments/environment';
+import { ClrLoadingState } from '@clr/angular';
+
+interface ChartType {
+  id: number;
+  name: string;
+  displayName: string;
+  description: string;
+  isActive: boolean;
+  createdAt: string;
+  updatedAt: string;
+}
+
+interface UiComponent {
+  id: number;
+  chartType: ChartType;
+  componentName: string;
+  componentType: string;
+  displayLabel: string;
+  placeholder: string;
+  isRequired: boolean;
+  sortOrder: number;
+  createdAt: string;
+  updatedAt: string;
+}
+
+interface ComponentProperty {
+  id: number;
+  component: UiComponent;
+  propertyName: string;
+  propertyValue: string;
+  propertyType: string;
+  createdAt: string;
+  updatedAt: string;
+}
+
+interface ChartTemplate {
+  id: number;
+  chartType: ChartType;
+  templateName: string;
+  templateHtml: string;
+  templateCss: string;
+  isDefault: boolean;
+  createdAt: string;
+  updatedAt: string;
+}
+
+interface DynamicField {
+  id: number;
+  chartType: ChartType;
+  fieldName: string;
+  fieldLabel: string;
+  fieldType: string;
+  fieldOptions: string;
+  isRequired: boolean;
+  showInUi: boolean;
+  sortOrder: number;
+  createdAt: string;
+  updatedAt: string;
+}
+
+@Component({
+  selector: 'app-chart-config-manager',
+  templateUrl: './chart-config-manager.component.html',
+  styleUrls: ['./chart-config-manager.component.scss']
+})
+export class ChartConfigManagerComponent implements OnInit {
+  // Chart Types
+  chartTypes: ChartType[] = [];
+  selectedChartType: ChartType | null = null;
+  newChartType: Partial<ChartType> = {};
+  showAddChartTypeForm = false;
+  chartTypeLoadingState: ClrLoadingState = ClrLoadingState.DEFAULT;
+
+  // UI Components
+  uiComponents: UiComponent[] = [];
+  selectedUiComponent: UiComponent | null = null;
+  newUiComponent: Partial<UiComponent> = {};
+  showAddUiComponentForm = false;
+  uiComponentLoadingState: ClrLoadingState = ClrLoadingState.DEFAULT;
+
+  // Component Properties
+  componentProperties: ComponentProperty[] = [];
+  selectedComponentProperty: ComponentProperty | null = null;
+  newComponentProperty: Partial<ComponentProperty> = {};
+  showAddComponentPropertyForm = false;
+  componentPropertyLoadingState: ClrLoadingState = ClrLoadingState.DEFAULT;
+
+  // Chart Templates
+  chartTemplates: ChartTemplate[] = [];
+  selectedChartTemplate: ChartTemplate | null = null;
+  newChartTemplate: Partial<ChartTemplate> = {};
+  showAddChartTemplateForm = false;
+  chartTemplateLoadingState: ClrLoadingState = ClrLoadingState.DEFAULT;
+
+  // Dynamic Fields
+  dynamicFields: DynamicField[] = [];
+  selectedDynamicField: DynamicField | null = null;
+  newDynamicField: Partial<DynamicField> = {};
+  showAddDynamicFieldForm = false;
+  dynamicFieldLoadingState: ClrLoadingState = ClrLoadingState.DEFAULT;
+
+  // Error handling
+  errorMessage: string | null = null;
+  successMessage: string | null = null;
+
+  // API base URL
+  private apiUrl = environment.apiUrl || 'http://localhost:8080/api';
+
+  constructor(private http: HttpClient) { }
+
+  ngOnInit(): void {
+    this.loadChartTypes();
+  }
+
+  // Show error message
+  private showError(message: string): void {
+    this.errorMessage = message;
+    setTimeout(() => {
+      this.errorMessage = null;
+    }, 5000);
+  }
+
+  // Show success message
+  private showSuccess(message: string): void {
+    this.successMessage = message;
+    setTimeout(() => {
+      this.successMessage = null;
+    }, 3000);
+  }
+
+  // Chart Type Methods
+  loadChartTypes(): void {
+    this.chartTypeLoadingState = ClrLoadingState.LOADING;
+    this.http.get<ChartType[]>(`${this.apiUrl}/chart-types`).subscribe({
+      next: (data) => {
+        this.chartTypes = data;
+        this.chartTypeLoadingState = ClrLoadingState.SUCCESS;
+      },
+      error: (error) => {
+        console.error('Error loading chart types:', error);
+        this.showError('Error loading chart types: ' + (error.error?.message || error.message || 'Unknown error'));
+        this.chartTypeLoadingState = ClrLoadingState.ERROR;
+      }
+    });
+  }
+
+  createChartType(): void {
+    if (!this.newChartType.name) {
+      this.showError('Chart type name is required');
+      return;
+    }
+
+    this.chartTypeLoadingState = ClrLoadingState.LOADING;
+    this.http.post<ChartType>(`${this.apiUrl}/chart-types`, this.newChartType).subscribe({
+      next: (data) => {
+        this.chartTypes.push(data);
+        this.newChartType = {};
+        this.showAddChartTypeForm = false;
+        this.showSuccess('Chart type created successfully');
+        this.chartTypeLoadingState = ClrLoadingState.SUCCESS;
+      },
+      error: (error) => {
+        console.error('Error creating chart type:', error);
+        this.showError('Error creating chart type: ' + (error.error?.message || error.message || 'Unknown error'));
+        this.chartTypeLoadingState = ClrLoadingState.ERROR;
+      }
+    });
+  }
+
+  updateChartType(): void {
+    if (!this.selectedChartType || !this.selectedChartType.name) {
+      this.showError('Chart type name is required');
+      return;
+    }
+
+    this.chartTypeLoadingState = ClrLoadingState.LOADING;
+    this.http.put<ChartType>(`${this.apiUrl}/chart-types/${this.selectedChartType.id}`, this.selectedChartType).subscribe({
+      next: (data) => {
+        const index = this.chartTypes.findIndex(ct => ct.id === data.id);
+        if (index !== -1) {
+          this.chartTypes[index] = data;
+        }
+        this.selectedChartType = null;
+        this.showSuccess('Chart type updated successfully');
+        this.chartTypeLoadingState = ClrLoadingState.SUCCESS;
+      },
+      error: (error) => {
+        console.error('Error updating chart type:', error);
+        this.showError('Error updating chart type: ' + (error.error?.message || error.message || 'Unknown error'));
+        this.chartTypeLoadingState = ClrLoadingState.ERROR;
+      }
+    });
+  }
+
+  deleteChartType(id: number): void {
+    if (!confirm('Are you sure you want to delete this chart type?')) {
+      return;
+    }
+
+    this.chartTypeLoadingState = ClrLoadingState.LOADING;
+    this.http.delete(`${this.apiUrl}/chart-types/${id}`).subscribe({
+      next: () => {
+        this.chartTypes = this.chartTypes.filter(ct => ct.id !== id);
+        // Also clear related data if the deleted chart type was selected
+        if (this.selectedChartType && this.selectedChartType.id === id) {
+          this.selectedChartType = null;
+          this.uiComponents = [];
+          this.chartTemplates = [];
+          this.dynamicFields = [];
+        }
+        this.showSuccess('Chart type deleted successfully');
+        this.chartTypeLoadingState = ClrLoadingState.SUCCESS;
+      },
+      error: (error) => {
+        console.error('Error deleting chart type:', error);
+        this.showError('Error deleting chart type: ' + (error.error?.message || error.message || 'Unknown error'));
+        this.chartTypeLoadingState = ClrLoadingState.ERROR;
+      }
+    });
+  }
+
+  selectChartTypeForEdit(chartType: ChartType): void {
+    this.selectedChartType = { ...chartType };
+  }
+
+  // UI Component Methods
+  loadUiComponents(chartTypeId: number): void {
+    this.uiComponentLoadingState = ClrLoadingState.LOADING;
+    this.http.get<UiComponent[]>(`${this.apiUrl}/ui-components/chart-type/${chartTypeId}`).subscribe({
+      next: (data) => {
+        this.uiComponents = data;
+        this.uiComponentLoadingState = ClrLoadingState.SUCCESS;
+      },
+      error: (error) => {
+        console.error('Error loading UI components:', error);
+        this.showError('Error loading UI components: ' + (error.error?.message || error.message || 'Unknown error'));
+        this.uiComponentLoadingState = ClrLoadingState.ERROR;
+      }
+    });
+  }
+
+  createUiComponent(): void {
+    if (!this.selectedChartType) {
+      this.showError('Please select a chart type first');
+      return;
+    }
+
+    if (!this.newUiComponent.componentName) {
+      this.showError('Component name is required');
+      return;
+    }
+
+    this.uiComponentLoadingState = ClrLoadingState.LOADING;
+    const uiComponentData = {
+      ...this.newUiComponent,
+      chartType: { id: this.selectedChartType.id }
+    };
+
+    this.http.post<UiComponent>(`${this.apiUrl}/ui-components`, uiComponentData).subscribe({
+      next: (data) => {
+        this.uiComponents.push(data);
+        this.newUiComponent = {};
+        this.showAddUiComponentForm = false;
+        this.showSuccess('UI component created successfully');
+        this.uiComponentLoadingState = ClrLoadingState.SUCCESS;
+      },
+      error: (error) => {
+        console.error('Error creating UI component:', error);
+        this.showError('Error creating UI component: ' + (error.error?.message || error.message || 'Unknown error'));
+        this.uiComponentLoadingState = ClrLoadingState.ERROR;
+      }
+    });
+  }
+
+  updateUiComponent(): void {
+    if (!this.selectedUiComponent || !this.selectedUiComponent.componentName) {
+      this.showError('Component name is required');
+      return;
+    }
+
+    this.uiComponentLoadingState = ClrLoadingState.LOADING;
+    this.http.put<UiComponent>(`${this.apiUrl}/ui-components/${this.selectedUiComponent.id}`, this.selectedUiComponent).subscribe({
+      next: (data) => {
+        const index = this.uiComponents.findIndex(uc => uc.id === data.id);
+        if (index !== -1) {
+          this.uiComponents[index] = data;
+        }
+        this.selectedUiComponent = null;
+        this.showSuccess('UI component updated successfully');
+        this.uiComponentLoadingState = ClrLoadingState.SUCCESS;
+      },
+      error: (error) => {
+        console.error('Error updating UI component:', error);
+        this.showError('Error updating UI component: ' + (error.error?.message || error.message || 'Unknown error'));
+        this.uiComponentLoadingState = ClrLoadingState.ERROR;
+      }
+    });
+  }
+
+  deleteUiComponent(id: number): void {
+    if (!confirm('Are you sure you want to delete this UI component?')) {
+      return;
+    }
+
+    this.uiComponentLoadingState = ClrLoadingState.LOADING;
+    this.http.delete(`${this.apiUrl}/ui-components/${id}`).subscribe({
+      next: () => {
+        this.uiComponents = this.uiComponents.filter(uc => uc.id !== id);
+        if (this.selectedUiComponent && this.selectedUiComponent.id === id) {
+          this.selectedUiComponent = null;
+        }
+        this.showSuccess('UI component deleted successfully');
+        this.uiComponentLoadingState = ClrLoadingState.SUCCESS;
+      },
+      error: (error) => {
+        console.error('Error deleting UI component:', error);
+        this.showError('Error deleting UI component: ' + (error.error?.message || error.message || 'Unknown error'));
+        this.uiComponentLoadingState = ClrLoadingState.ERROR;
+      }
+    });
+  }
+
+  selectUiComponentForEdit(uiComponent: UiComponent): void {
+    this.selectedUiComponent = { ...uiComponent };
+  }
+
+  // Component Property Methods
+  loadComponentProperties(componentId: number): void {
+    this.componentPropertyLoadingState = ClrLoadingState.LOADING;
+    this.http.get<ComponentProperty[]>(`${this.apiUrl}/component-properties/component/${componentId}`).subscribe({
+      next: (data) => {
+        this.componentProperties = data;
+        this.componentPropertyLoadingState = ClrLoadingState.SUCCESS;
+      },
+      error: (error) => {
+        console.error('Error loading component properties:', error);
+        this.showError('Error loading component properties: ' + (error.error?.message || error.message || 'Unknown error'));
+        this.componentPropertyLoadingState = ClrLoadingState.ERROR;
+      }
+    });
+  }
+
+  createComponentProperty(): void {
+    if (!this.selectedUiComponent) {
+      this.showError('Please select a UI component first');
+      return;
+    }
+
+    if (!this.newComponentProperty.propertyName) {
+      this.showError('Property name is required');
+      return;
+    }
+
+    this.componentPropertyLoadingState = ClrLoadingState.LOADING;
+    const componentPropertyData = {
+      ...this.newComponentProperty,
+      component: { id: this.selectedUiComponent.id }
+    };
+
+    this.http.post<ComponentProperty>(`${this.apiUrl}/component-properties`, componentPropertyData).subscribe({
+      next: (data) => {
+        this.componentProperties.push(data);
+        this.newComponentProperty = {};
+        this.showAddComponentPropertyForm = false;
+        this.showSuccess('Component property created successfully');
+        this.componentPropertyLoadingState = ClrLoadingState.SUCCESS;
+      },
+      error: (error) => {
+        console.error('Error creating component property:', error);
+        this.showError('Error creating component property: ' + (error.error?.message || error.message || 'Unknown error'));
+        this.componentPropertyLoadingState = ClrLoadingState.ERROR;
+      }
+    });
+  }
+
+  updateComponentProperty(): void {
+    if (!this.selectedComponentProperty || !this.selectedComponentProperty.propertyName) {
+      this.showError('Property name is required');
+      return;
+    }
+
+    this.componentPropertyLoadingState = ClrLoadingState.LOADING;
+    this.http.put<ComponentProperty>(`${this.apiUrl}/component-properties/${this.selectedComponentProperty.id}`, this.selectedComponentProperty).subscribe({
+      next: (data) => {
+        const index = this.componentProperties.findIndex(cp => cp.id === data.id);
+        if (index !== -1) {
+          this.componentProperties[index] = data;
+        }
+        this.selectedComponentProperty = null;
+        this.showSuccess('Component property updated successfully');
+        this.componentPropertyLoadingState = ClrLoadingState.SUCCESS;
+      },
+      error: (error) => {
+        console.error('Error updating component property:', error);
+        this.showError('Error updating component property: ' + (error.error?.message || error.message || 'Unknown error'));
+        this.componentPropertyLoadingState = ClrLoadingState.ERROR;
+      }
+    });
+  }
+
+  deleteComponentProperty(id: number): void {
+    if (!confirm('Are you sure you want to delete this component property?')) {
+      return;
+    }
+
+    this.componentPropertyLoadingState = ClrLoadingState.LOADING;
+    this.http.delete(`${this.apiUrl}/component-properties/${id}`).subscribe({
+      next: () => {
+        this.componentProperties = this.componentProperties.filter(cp => cp.id !== id);
+        if (this.selectedComponentProperty && this.selectedComponentProperty.id === id) {
+          this.selectedComponentProperty = null;
+        }
+        this.showSuccess('Component property deleted successfully');
+        this.componentPropertyLoadingState = ClrLoadingState.SUCCESS;
+      },
+      error: (error) => {
+        console.error('Error deleting component property:', error);
+        this.showError('Error deleting component property: ' + (error.error?.message || error.message || 'Unknown error'));
+        this.componentPropertyLoadingState = ClrLoadingState.ERROR;
+      }
+    });
+  }
+
+  selectComponentPropertyForEdit(componentProperty: ComponentProperty): void {
+    this.selectedComponentProperty = { ...componentProperty };
+  }
+
+  // Chart Template Methods
+  loadChartTemplates(chartTypeId: number): void {
+    this.chartTemplateLoadingState = ClrLoadingState.LOADING;
+    this.http.get<ChartTemplate[]>(`${this.apiUrl}/chart-templates/chart-type/${chartTypeId}`).subscribe({
+      next: (data) => {
+        this.chartTemplates = data;
+        this.chartTemplateLoadingState = ClrLoadingState.SUCCESS;
+      },
+      error: (error) => {
+        console.error('Error loading chart templates:', error);
+        this.showError('Error loading chart templates: ' + (error.error?.message || error.message || 'Unknown error'));
+        this.chartTemplateLoadingState = ClrLoadingState.ERROR;
+      }
+    });
+  }
+
+  createChartTemplate(): void {
+    if (!this.selectedChartType) {
+      this.showError('Please select a chart type first');
+      return;
+    }
+
+    if (!this.newChartTemplate.templateName) {
+      this.showError('Template name is required');
+      return;
+    }
+
+    this.chartTemplateLoadingState = ClrLoadingState.LOADING;
+    const chartTemplateData = {
+      ...this.newChartTemplate,
+      chartType: { id: this.selectedChartType.id }
+    };
+
+    this.http.post<ChartTemplate>(`${this.apiUrl}/chart-templates`, chartTemplateData).subscribe({
+      next: (data) => {
+        this.chartTemplates.push(data);
+        this.newChartTemplate = {};
+        this.showAddChartTemplateForm = false;
+        this.showSuccess('Chart template created successfully');
+        this.chartTemplateLoadingState = ClrLoadingState.SUCCESS;
+      },
+      error: (error) => {
+        console.error('Error creating chart template:', error);
+        this.showError('Error creating chart template: ' + (error.error?.message || error.message || 'Unknown error'));
+        this.chartTemplateLoadingState = ClrLoadingState.ERROR;
+      }
+    });
+  }
+
+  updateChartTemplate(): void {
+    if (!this.selectedChartTemplate || !this.selectedChartTemplate.templateName) {
+      this.showError('Template name is required');
+      return;
+    }
+
+    this.chartTemplateLoadingState = ClrLoadingState.LOADING;
+    this.http.put<ChartTemplate>(`${this.apiUrl}/chart-templates/${this.selectedChartTemplate.id}`, this.selectedChartTemplate).subscribe({
+      next: (data) => {
+        const index = this.chartTemplates.findIndex(ct => ct.id === data.id);
+        if (index !== -1) {
+          this.chartTemplates[index] = data;
+        }
+        this.selectedChartTemplate = null;
+        this.showSuccess('Chart template updated successfully');
+        this.chartTemplateLoadingState = ClrLoadingState.SUCCESS;
+      },
+      error: (error) => {
+        console.error('Error updating chart template:', error);
+        this.showError('Error updating chart template: ' + (error.error?.message || error.message || 'Unknown error'));
+        this.chartTemplateLoadingState = ClrLoadingState.ERROR;
+      }
+    });
+  }
+
+  deleteChartTemplate(id: number): void {
+    if (!confirm('Are you sure you want to delete this chart template?')) {
+      return;
+    }
+
+    this.chartTemplateLoadingState = ClrLoadingState.LOADING;
+    this.http.delete(`${this.apiUrl}/chart-templates/${id}`).subscribe({
+      next: () => {
+        this.chartTemplates = this.chartTemplates.filter(ct => ct.id !== id);
+        if (this.selectedChartTemplate && this.selectedChartTemplate.id === id) {
+          this.selectedChartTemplate = null;
+        }
+        this.showSuccess('Chart template deleted successfully');
+        this.chartTemplateLoadingState = ClrLoadingState.SUCCESS;
+      },
+      error: (error) => {
+        console.error('Error deleting chart template:', error);
+        this.showError('Error deleting chart template: ' + (error.error?.message || error.message || 'Unknown error'));
+        this.chartTemplateLoadingState = ClrLoadingState.ERROR;
+      }
+    });
+  }
+
+  selectChartTemplateForEdit(chartTemplate: ChartTemplate): void {
+    this.selectedChartTemplate = { ...chartTemplate };
+  }
+
+  // Dynamic Field Methods
+  loadDynamicFields(chartTypeId: number): void {
+    this.dynamicFieldLoadingState = ClrLoadingState.LOADING;
+    this.http.get<DynamicField[]>(`${this.apiUrl}/dynamic-fields/chart-type/${chartTypeId}`).subscribe({
+      next: (data) => {
+        this.dynamicFields = data;
+        this.dynamicFieldLoadingState = ClrLoadingState.SUCCESS;
+      },
+      error: (error) => {
+        console.error('Error loading dynamic fields:', error);
+        this.showError('Error loading dynamic fields: ' + (error.error?.message || error.message || 'Unknown error'));
+        this.dynamicFieldLoadingState = ClrLoadingState.ERROR;
+      }
+    });
+  }
+
+  createDynamicField(): void {
+    if (!this.selectedChartType) {
+      this.showError('Please select a chart type first');
+      return;
+    }
+
+    if (!this.newDynamicField.fieldName) {
+      this.showError('Field name is required');
+      return;
+    }
+
+    this.dynamicFieldLoadingState = ClrLoadingState.LOADING;
+    const dynamicFieldData = {
+      ...this.newDynamicField,
+      chartType: { id: this.selectedChartType.id }
+    };
+
+    this.http.post<DynamicField>(`${this.apiUrl}/dynamic-fields`, dynamicFieldData).subscribe({
+      next: (data) => {
+        this.dynamicFields.push(data);
+        this.newDynamicField = {};
+        this.showAddDynamicFieldForm = false;
+        this.showSuccess('Dynamic field created successfully');
+        this.dynamicFieldLoadingState = ClrLoadingState.SUCCESS;
+      },
+      error: (error) => {
+        console.error('Error creating dynamic field:', error);
+        this.showError('Error creating dynamic field: ' + (error.error?.message || error.message || 'Unknown error'));
+        this.dynamicFieldLoadingState = ClrLoadingState.ERROR;
+      }
+    });
+  }
+
+  updateDynamicField(): void {
+    if (!this.selectedDynamicField || !this.selectedDynamicField.fieldName) {
+      this.showError('Field name is required');
+      return;
+    }
+
+    this.dynamicFieldLoadingState = ClrLoadingState.LOADING;
+    this.http.put<DynamicField>(`${this.apiUrl}/dynamic-fields/${this.selectedDynamicField.id}`, this.selectedDynamicField).subscribe({
+      next: (data) => {
+        const index = this.dynamicFields.findIndex(df => df.id === data.id);
+        if (index !== -1) {
+          this.dynamicFields[index] = data;
+        }
+        this.selectedDynamicField = null;
+        this.showSuccess('Dynamic field updated successfully');
+        this.dynamicFieldLoadingState = ClrLoadingState.SUCCESS;
+      },
+      error: (error) => {
+        console.error('Error updating dynamic field:', error);
+        this.showError('Error updating dynamic field: ' + (error.error?.message || error.message || 'Unknown error'));
+        this.dynamicFieldLoadingState = ClrLoadingState.ERROR;
+      }
+    });
+  }
+
+  deleteDynamicField(id: number): void {
+    if (!confirm('Are you sure you want to delete this dynamic field?')) {
+      return;
+    }
+
+    this.dynamicFieldLoadingState = ClrLoadingState.LOADING;
+    this.http.delete(`${this.apiUrl}/dynamic-fields/${id}`).subscribe({
+      next: () => {
+        this.dynamicFields = this.dynamicFields.filter(df => df.id !== id);
+        if (this.selectedDynamicField && this.selectedDynamicField.id === id) {
+          this.selectedDynamicField = null;
+        }
+        this.showSuccess('Dynamic field deleted successfully');
+        this.dynamicFieldLoadingState = ClrLoadingState.SUCCESS;
+      },
+      error: (error) => {
+        console.error('Error deleting dynamic field:', error);
+        this.showError('Error deleting dynamic field: ' + (error.error?.message || error.message || 'Unknown error'));
+        this.dynamicFieldLoadingState = ClrLoadingState.ERROR;
+      }
+    });
+  }
+
+  selectDynamicFieldForEdit(dynamicField: DynamicField): void {
+    this.selectedDynamicField = { ...dynamicField };
+  }
+
+  // Helper methods
+  onChartTypeSelect(chartType: ChartType): void {
+    this.selectedChartType = chartType;
+    this.loadUiComponents(chartType.id);
+    this.loadChartTemplates(chartType.id);
+    this.loadDynamicFields(chartType.id);
+  }
+
+  resetForms(): void {
+    this.newChartType = {};
+    this.newUiComponent = {};
+    this.newComponentProperty = {};
+    this.newChartTemplate = {};
+    this.newDynamicField = {};
+    this.showAddChartTypeForm = false;
+    this.showAddUiComponentForm = false;
+    this.showAddComponentPropertyForm = false;
+    this.showAddChartTemplateForm = false;
+    this.showAddDynamicFieldForm = false;
+    this.selectedChartType = null;
+    this.selectedUiComponent = null;
+    this.selectedComponentProperty = null;
+    this.selectedChartTemplate = null;
+    this.selectedDynamicField = null;
+  }
+}
\ No newline at end of file
diff --git a/frontend/angular-clarity-master/src/app/modules/main/builder/dashboardnew/chart-config/chart-config-manager.component.html b/frontend/angular-clarity-master/src/app/modules/main/builder/dashboardnew/chart-config/chart-config-manager.component.html
new file mode 100644
index 0000000..f27393a
--- /dev/null
+++ b/frontend/angular-clarity-master/src/app/modules/main/builder/dashboardnew/chart-config/chart-config-manager.component.html
@@ -0,0 +1,495 @@
+<div class="chart-config-manager">
+  <h2>Chart Configuration Manager</h2>
+  
+  <!-- Test message to verify component is loading -->
+  <div class="alert alert-info">
+    <div class="alert-item">
+      <span class="alert-text">Chart Config Manager Component Loaded Successfully</span>
+    </div>
+  </div>
+  
+  <!-- Error and Success Messages -->
+  <div class="alert alert-danger" *ngIf="errorMessage">
+    <button type="button" class="close" aria-label="Close" (click)="errorMessage = null">
+      <cds-icon shape="close"></cds-icon>
+    </button>
+    <div class="alert-item">
+      <span class="alert-text">{{ errorMessage }}</span>
+    </div>
+  </div>
+  
+  <div class="alert alert-success" *ngIf="successMessage">
+    <button type="button" class="close" aria-label="Close" (click)="successMessage = null">
+      <cds-icon shape="close"></cds-icon>
+    </button>
+    <div class="alert-item">
+      <span class="alert-text">{{ successMessage }}</span>
+    </div>
+  </div>
+  
+  <!-- Chart Types Section -->
+  <clr-tab>
+    <button clrTabLink>Chart Types</button>
+    <clr-tab-content>
+      <div class="card">
+        <div class="card-header">
+          <h3>Chart Types</h3>
+          <button class="btn btn-sm btn-primary" (click)="showAddChartTypeForm = true">
+            <cds-icon shape="plus"></cds-icon> Add Chart Type
+          </button>
+        </div>
+        
+        <!-- Add Chart Type Form -->
+        <div class="card-block" *ngIf="showAddChartTypeForm">
+          <app-chart-type-form 
+            [chartType]="newChartType" 
+            (save)="createChartType()" 
+            (cancel)="showAddChartTypeForm = false">
+          </app-chart-type-form>
+        </div>
+        
+        <!-- Chart Types Table -->
+        <div class="card-block">
+          <clr-datagrid [clrDgLoading]="chartTypeLoadingState === ClrLoadingState.LOADING">
+            <clr-dg-column>Name</clr-dg-column>
+            <clr-dg-column>Display Name</clr-dg-column>
+            <clr-dg-column>Description</clr-dg-column>
+            <clr-dg-column>Status</clr-dg-column>
+            <clr-dg-column>Created At</clr-dg-column>
+            <clr-dg-column>Updated At</clr-dg-column>
+            <clr-dg-column>Actions</clr-dg-column>
+            
+            <clr-dg-row *clrDgItems="let chartType of chartTypes" [clrDgItem]="chartType">
+              <clr-dg-cell>{{chartType.name}}</clr-dg-cell>
+              <clr-dg-cell>{{chartType.displayName}}</clr-dg-cell>
+              <clr-dg-cell>{{chartType.description}}</clr-dg-cell>
+              <clr-dg-cell>
+                <span class="label" [class.label-success]="chartType.isActive" [class.label-danger]="!chartType.isActive">
+                  {{chartType.isActive ? 'Active' : 'Inactive'}}
+                </span>
+              </clr-dg-cell>
+              <clr-dg-cell>{{chartType.createdAt | date:'short'}}</clr-dg-cell>
+              <clr-dg-cell>{{chartType.updatedAt | date:'short'}}</clr-dg-cell>
+              <clr-dg-cell>
+                <button class="btn btn-sm btn-icon" (click)="selectChartTypeForEdit(chartType)" title="Edit" [disabled]="chartTypeLoadingState === ClrLoadingState.LOADING">
+                  <clr-spinner *ngIf="chartTypeLoadingState === ClrLoadingState.LOADING" clrSmall clrInline></clr-spinner>
+                  <cds-icon *ngIf="chartTypeLoadingState !== ClrLoadingState.LOADING" shape="pencil"></cds-icon>
+                </button>
+                <button class="btn btn-sm btn-icon" (click)="deleteChartType(chartType.id)" title="Delete" [disabled]="chartTypeLoadingState === ClrLoadingState.LOADING">
+                  <clr-spinner *ngIf="chartTypeLoadingState === ClrLoadingState.LOADING" clrSmall clrInline></clr-spinner>
+                  <cds-icon *ngIf="chartTypeLoadingState !== ClrLoadingState.LOADING" shape="trash"></cds-icon>
+                </button>
+                <button class="btn btn-sm btn-icon" (click)="onChartTypeSelect(chartType)" title="View Details" [disabled]="chartTypeLoadingState === ClrLoadingState.LOADING">
+                  <clr-spinner *ngIf="chartTypeLoadingState === ClrLoadingState.LOADING" clrSmall clrInline></clr-spinner>
+                  <cds-icon *ngIf="chartTypeLoadingState !== ClrLoadingState.LOADING" shape="eye"></cds-icon>
+                </button>
+              </clr-dg-cell>
+            </clr-dg-row>
+            
+            <clr-dg-footer>
+              {{chartTypes.length}} chart type(s)
+            </clr-dg-footer>
+          </clr-datagrid>
+        </div>
+        
+        <!-- Edit Chart Type Form -->
+        <div class="card-block" *ngIf="selectedChartType">
+          <h4>Edit Chart Type</h4>
+          <app-chart-type-form 
+            [chartType]="selectedChartType" 
+            [isEdit]="true"
+            (save)="updateChartType()" 
+            (cancel)="selectedChartType = null">
+          </app-chart-type-form>
+        </div>
+      </div>
+    </clr-tab-content>
+  </clr-tab>
+  
+  <!-- UI Components Section -->
+  <clr-tab *ngIf="selectedChartType">
+    <button clrTabLink>UI Components</button>
+    <clr-tab-content>
+      <div class="card">
+        <div class="card-header">
+          <h3>UI Components for {{selectedChartType?.name}}</h3>
+          <button class="btn btn-sm btn-primary" (click)="showAddUiComponentForm = true">
+            <cds-icon shape="plus"></cds-icon> Add UI Component
+          </button>
+        </div>
+        
+        <!-- Add UI Component Form -->
+        <div class="card-block" *ngIf="showAddUiComponentForm">
+          <app-ui-component-form 
+            [uiComponent]="newUiComponent" 
+            (save)="createUiComponent()" 
+            (cancel)="showAddUiComponentForm = false">
+          </app-ui-component-form>
+        </div>
+        
+        <!-- UI Components Table -->
+        <div class="card-block">
+          <clr-datagrid [clrDgLoading]="uiComponentLoadingState === ClrLoadingState.LOADING">
+            <clr-dg-column>Component Name</clr-dg-column>
+            <clr-dg-column>Component Type</clr-dg-column>
+            <clr-dg-column>Display Label</clr-dg-column>
+            <clr-dg-column>Required</clr-dg-column>
+            <clr-dg-column>Actions</clr-dg-column>
+            
+            <clr-dg-row *clrDgItems="let uiComponent of uiComponents" [clrDgItem]="uiComponent">
+              <clr-dg-cell>{{uiComponent.componentName}}</clr-dg-cell>
+              <clr-dg-cell>{{uiComponent.componentType}}</clr-dg-cell>
+              <clr-dg-cell>{{uiComponent.displayLabel}}</clr-dg-cell>
+              <clr-dg-cell>
+                <span class="label" [class.label-success]="uiComponent.isRequired" [class.label-danger]="!uiComponent.isRequired">
+                  {{uiComponent.isRequired ? 'Yes' : 'No'}}
+                </span>
+              </clr-dg-cell>
+              <clr-dg-cell class="action-cell">
+                <div class="action-buttons">
+                  <button class="btn btn-sm btn-icon" (click)="selectUiComponentForEdit(uiComponent)" title="Edit" [disabled]="uiComponentLoadingState === ClrLoadingState.LOADING">
+                    <clr-spinner *ngIf="uiComponentLoadingState === ClrLoadingState.LOADING" clrSmall clrInline></clr-spinner>
+                    <cds-icon *ngIf="uiComponentLoadingState !== ClrLoadingState.LOADING" shape="pencil" aria-label="Edit"></cds-icon>
+                  </button>
+                  <button class="btn btn-sm btn-icon" (click)="deleteUiComponent(uiComponent.id)" title="Delete" [disabled]="uiComponentLoadingState === ClrLoadingState.LOADING">
+                    <clr-spinner *ngIf="uiComponentLoadingState === ClrLoadingState.LOADING" clrSmall clrInline></clr-spinner>
+                    <cds-icon *ngIf="uiComponentLoadingState !== ClrLoadingState.LOADING" shape="trash" aria-label="Delete"></cds-icon>
+                  </button>
+                  <button class="btn btn-sm btn-icon" (click)="onUiComponentSelect(uiComponent)" title="View Properties" [disabled]="uiComponentLoadingState === ClrLoadingState.LOADING">
+                    <clr-spinner *ngIf="uiComponentLoadingState === ClrLoadingState.LOADING" clrSmall clrInline></clr-spinner>
+                    <cds-icon *ngIf="uiComponentLoadingState !== ClrLoadingState.LOADING" shape="eye" aria-label="View Properties"></cds-icon>
+                  </button>
+                </div>
+              </clr-dg-cell>
+            </clr-dg-row>
+            
+            <clr-dg-footer>
+              {{uiComponents.length}} UI component(s)
+            </clr-dg-footer>
+          </clr-datagrid>
+        </div>
+        
+        <!-- Edit UI Component Form -->
+        <div class="card-block" *ngIf="selectedUiComponent">
+          <h4>Edit UI Component</h4>
+          <app-ui-component-form 
+            [uiComponent]="selectedUiComponent" 
+            [isEdit]="true"
+            (save)="updateUiComponent()" 
+            (cancel)="selectedUiComponent = null">
+          </app-ui-component-form>
+        </div>
+      </div>
+    </clr-tab-content>
+  </clr-tab>
+  
+  <!-- Component Properties Section -->
+  <clr-tab *ngIf="selectedUiComponent">
+    <button clrTabLink>Component Properties</button>
+    <clr-tab-content>
+      <div class="card">
+        <div class="card-header">
+          <h3>Properties for {{selectedUiComponent?.componentName}}</h3>
+          <button class="btn btn-sm btn-primary" (click)="showAddComponentPropertyForm = true">
+            <cds-icon shape="plus"></cds-icon> Add Property
+          </button>
+        </div>
+        
+        <!-- Add Component Property Form -->
+        <div class="card-block" *ngIf="showAddComponentPropertyForm">
+          <app-component-property-form 
+            [componentProperty]="newComponentProperty" 
+            (save)="createComponentProperty()" 
+            (cancel)="showAddComponentPropertyForm = false">
+          </app-component-property-form>
+        </div>
+        
+        <!-- Component Properties Table -->
+        <div class="card-block">
+          <clr-datagrid [clrDgLoading]="componentPropertyLoadingState === ClrLoadingState.LOADING">
+            <clr-dg-column>Property Name</clr-dg-column>
+            <clr-dg-column>Property Value</clr-dg-column>
+            <clr-dg-column>Property Type</clr-dg-column>
+            <clr-dg-column>Created At</clr-dg-column>
+            <clr-dg-column>Updated At</clr-dg-column>
+            <clr-dg-column>Actions</clr-dg-column>
+            
+            <clr-dg-row *clrDgItems="let property of componentProperties" [clrDgItem]="property">
+              <clr-dg-cell>{{property.propertyName}}</clr-dg-cell>
+              <clr-dg-cell>{{property.propertyValue}}</clr-dg-cell>
+              <clr-dg-cell>{{property.propertyType}}</clr-dg-cell>
+              <clr-dg-cell>{{property.createdAt | date:'short'}}</clr-dg-cell>
+              <clr-dg-cell>{{property.updatedAt | date:'short'}}</clr-dg-cell>
+              <clr-dg-cell>
+                <button class="btn btn-sm btn-icon" (click)="selectComponentPropertyForEdit(property)" title="Edit" [disabled]="componentPropertyLoadingState === ClrLoadingState.LOADING">
+                  <clr-spinner *ngIf="componentPropertyLoadingState === ClrLoadingState.LOADING" clrSmall clrInline></clr-spinner>
+                  <cds-icon *ngIf="componentPropertyLoadingState !== ClrLoadingState.LOADING" shape="pencil"></cds-icon>
+                </button>
+                <button class="btn btn-sm btn-icon" (click)="deleteComponentProperty(property.id)" title="Delete" [disabled]="componentPropertyLoadingState === ClrLoadingState.LOADING">
+                  <clr-spinner *ngIf="componentPropertyLoadingState === ClrLoadingState.LOADING" clrSmall clrInline></clr-spinner>
+                  <cds-icon *ngIf="componentPropertyLoadingState !== ClrLoadingState.LOADING" shape="trash"></cds-icon>
+                </button>
+              </clr-dg-cell>
+            </clr-dg-row>
+            
+            <clr-dg-footer>
+              {{componentProperties.length}} propertie(s)
+            </clr-dg-footer>
+          </clr-datagrid>
+        </div>
+        
+        <!-- Edit Component Property Form -->
+        <div class="card-block" *ngIf="selectedComponentProperty">
+          <h4>Edit Component Property</h4>
+          <app-component-property-form 
+            [componentProperty]="selectedComponentProperty" 
+            [isEdit]="true"
+            (save)="updateComponentProperty()" 
+            (cancel)="selectedComponentProperty = null">
+          </app-component-property-form>
+        </div>
+      </div>
+    </clr-tab-content>
+  </clr-tab>
+  
+  <!-- Chart Templates Section -->
+  <clr-tab *ngIf="selectedChartType">
+    <button clrTabLink>Chart Templates</button>
+    <clr-tab-content>
+      <div class="card">
+        <div class="card-header">
+          <h3>Templates for {{selectedChartType?.name}}</h3>
+          <button class="btn btn-sm btn-primary" (click)="showAddChartTemplateForm = true">
+            <cds-icon shape="plus"></cds-icon> Add Template
+          </button>
+        </div>
+        
+        <!-- Add Chart Template Form -->
+        <div class="card-block" *ngIf="showAddChartTemplateForm">
+          <app-chart-template-form 
+            [chartTemplate]="newChartTemplate" 
+            (save)="createChartTemplate()" 
+            (cancel)="showAddChartTemplateForm = false">
+          </app-chart-template-form>
+        </div>
+        
+        <!-- Chart Templates Table -->
+        <div class="card-block">
+          <clr-datagrid [clrDgLoading]="chartTemplateLoadingState === ClrLoadingState.LOADING">
+            <clr-dg-column>Template Name</clr-dg-column>
+            <clr-dg-column>Is Default</clr-dg-column>
+            <clr-dg-column>Created At</clr-dg-column>
+            <clr-dg-column>Updated At</clr-dg-column>
+            <clr-dg-column>Actions</clr-dg-column>
+            
+            <clr-dg-row *clrDgItems="let template of chartTemplates" [clrDgItem]="template">
+              <clr-dg-cell>{{template.templateName}}</clr-dg-cell>
+              <clr-dg-cell>
+                <span class="label" [class.label-success]="template.isDefault" [class.label-danger]="!template.isDefault">
+                  {{template.isDefault ? 'Yes' : 'No'}}
+                </span>
+              </clr-dg-cell>
+              <clr-dg-cell>{{template.createdAt | date:'short'}}</clr-dg-cell>
+              <clr-dg-cell>{{template.updatedAt | date:'short'}}</clr-dg-cell>
+              <clr-dg-cell>
+                <button class="btn btn-sm btn-icon" (click)="selectChartTemplateForEdit(template)" title="Edit" [disabled]="chartTemplateLoadingState === ClrLoadingState.LOADING">
+                  <clr-spinner *ngIf="chartTemplateLoadingState === ClrLoadingState.LOADING" clrSmall clrInline></clr-spinner>
+                  <cds-icon *ngIf="chartTemplateLoadingState !== ClrLoadingState.LOADING" shape="pencil"></cds-icon>
+                </button>
+                <button class="btn btn-sm btn-icon" (click)="deleteChartTemplate(template.id)" title="Delete" [disabled]="chartTemplateLoadingState === ClrLoadingState.LOADING">
+                  <clr-spinner *ngIf="chartTemplateLoadingState === ClrLoadingState.LOADING" clrSmall clrInline></clr-spinner>
+                  <cds-icon *ngIf="chartTemplateLoadingState !== ClrLoadingState.LOADING" shape="trash"></cds-icon>
+                </button>
+              </clr-dg-cell>
+            </clr-dg-row>
+            
+            <clr-dg-footer>
+              {{chartTemplates.length}} template(s)
+            </clr-dg-footer>
+          </clr-datagrid>
+        </div>
+        
+        <!-- Edit Chart Template Form -->
+        <div class="card-block" *ngIf="selectedChartTemplate">
+          <h4>Edit Chart Template</h4>
+          <app-chart-template-form 
+            [chartTemplate]="selectedChartTemplate" 
+            [isEdit]="true"
+            (save)="updateChartTemplate()" 
+            (cancel)="selectedChartTemplate = null">
+          </app-chart-template-form>
+        </div>
+      </div>
+    </clr-tab-content>
+  </clr-tab>
+  
+  <!-- Dynamic Fields Section -->
+  <clr-tab *ngIf="selectedChartType">
+    <button clrTabLink>Dynamic Fields</button>
+    <clr-tab-content>
+      <div class="card">
+        <div class="card-header">
+          <h3>Dynamic Fields for {{selectedChartType?.name}}</h3>
+          <button class="btn btn-sm btn-primary" (click)="showAddDynamicFieldForm = true">
+            <cds-icon shape="plus"></cds-icon> Add Field
+          </button>
+        </div>
+        
+        <!-- Add Dynamic Field Form -->
+        <div class="card-block" *ngIf="showAddDynamicFieldForm">
+          <form clrForm>
+            <clr-input-container>
+              <label>Field Name <span class="required">*</span></label>
+              <input clrInput type="text" [(ngModel)]="newDynamicField.fieldName" name="fieldName" required />
+            </clr-input-container>
+            
+            <clr-input-container>
+              <label>Field Label</label>
+              <input clrInput type="text" [(ngModel)]="newDynamicField.fieldLabel" name="fieldLabel" />
+            </clr-input-container>
+            
+            <clr-input-container>
+              <label>Field Type</label>
+              <input clrInput type="text" [(ngModel)]="newDynamicField.fieldType" name="fieldType" />
+            </clr-input-container>
+            
+            <clr-textarea-container>
+              <label>Field Options</label>
+              <textarea clrTextarea [(ngModel)]="newDynamicField.fieldOptions" name="fieldOptions"></textarea>
+            </clr-textarea-container>
+            
+            <clr-input-container>
+              <label>Sort Order</label>
+              <input clrInput type="number" [(ngModel)]="newDynamicField.sortOrder" name="fieldSortOrder" />
+            </clr-input-container>
+            
+            <clr-checkbox-container>
+              <label>Is Required</label>
+              <clr-checkbox-wrapper>
+                <input type="checkbox" clrCheckbox [(ngModel)]="newDynamicField.isRequired" name="fieldIsRequired" />
+                <label>Required</label>
+              </clr-checkbox-wrapper>
+            </clr-checkbox-container>
+            
+            <clr-checkbox-container>
+              <label>Show in UI</label>
+              <clr-checkbox-wrapper>
+                <input type="checkbox" clrCheckbox [(ngModel)]="newDynamicField.showInUi" name="fieldShowInUi" />
+                <label>Show in UI</label>
+              </clr-checkbox-wrapper>
+            </clr-checkbox-container>
+            
+            <div class="form-actions">
+              <button class="btn btn-primary" (click)="createDynamicField()" [disabled]="!newDynamicField.fieldName || dynamicFieldLoadingState === ClrLoadingState.LOADING">
+                <clr-spinner *ngIf="dynamicFieldLoadingState === ClrLoadingState.LOADING" clrSmall clrInline></clr-spinner>
+                Save
+              </button>
+              <button class="btn" (click)="showAddDynamicFieldForm = false">Cancel</button>
+            </div>
+          </form>
+        </div>
+        
+        <!-- Dynamic Fields Table -->
+        <div class="card-block">
+          <clr-datagrid [clrDgLoading]="dynamicFieldLoadingState === ClrLoadingState.LOADING">
+            <clr-dg-column>Field Name</clr-dg-column>
+            <clr-dg-column>Field Label</clr-dg-column>
+            <clr-dg-column>Field Type</clr-dg-column>
+            <clr-dg-column>Required</clr-dg-column>
+            <clr-dg-column>Show in UI</clr-dg-column>
+            <clr-dg-column>Sort Order</clr-dg-column>
+            <clr-dg-column>Created At</clr-dg-column>
+            <clr-dg-column>Updated At</clr-dg-column>
+            <clr-dg-column>Actions</clr-dg-column>
+            
+            <clr-dg-row *clrDgItems="let field of dynamicFields" [clrDgItem]="field">
+              <clr-dg-cell>{{field.fieldName}}</clr-dg-cell>
+              <clr-dg-cell>{{field.fieldLabel}}</clr-dg-cell>
+              <clr-dg-cell>{{field.fieldType}}</clr-dg-cell>
+              <clr-dg-cell>
+                <span class="label" [class.label-success]="field.isRequired" [class.label-danger]="!field.isRequired">
+                  {{field.isRequired ? 'Yes' : 'No'}}
+                </span>
+              </clr-dg-cell>
+              <clr-dg-cell>
+                <span class="label" [class.label-success]="field.showInUi" [class.label-danger]="!field.showInUi">
+                  {{field.showInUi ? 'Yes' : 'No'}}
+                </span>
+              </clr-dg-cell>
+              <clr-dg-cell>{{field.sortOrder}}</clr-dg-cell>
+              <clr-dg-cell>{{field.createdAt | date:'short'}}</clr-dg-cell>
+              <clr-dg-cell>{{field.updatedAt | date:'short'}}</clr-dg-cell>
+              <clr-dg-cell>
+                <button class="btn btn-sm btn-icon" (click)="selectDynamicFieldForEdit(field)" title="Edit">
+                  <cds-icon shape="pencil"></cds-icon>
+                </button>
+                <button class="btn btn-sm btn-icon" (click)="deleteDynamicField(field.id)" title="Delete">
+                  <cds-icon shape="trash"></cds-icon>
+                </button>
+              </clr-dg-cell>
+            </clr-dg-row>
+            
+            <clr-dg-footer>
+              {{dynamicFields.length}} field(s)
+            </clr-dg-footer>
+          </clr-datagrid>
+        </div>
+        
+        <!-- Edit Dynamic Field Form -->
+        <div class="card-block" *ngIf="selectedDynamicField">
+          <h4>Edit Dynamic Field</h4>
+          <form clrForm>
+            <clr-input-container>
+              <label>Field Name <span class="required">*</span></label>
+              <input clrInput type="text" [(ngModel)]="selectedDynamicField.fieldName" name="editFieldName" required />
+            </clr-input-container>
+            
+            <clr-input-container>
+              <label>Field Label</label>
+              <input clrInput type="text" [(ngModel)]="selectedDynamicField.fieldLabel" name="editFieldLabel" />
+            </clr-input-container>
+            
+            <clr-input-container>
+              <label>Field Type</label>
+              <input clrInput type="text" [(ngModel)]="selectedDynamicField.fieldType" name="editFieldType" />
+            </clr-input-container>
+            
+            <clr-textarea-container>
+              <label>Field Options</label>
+              <textarea clrTextarea [(ngModel)]="selectedDynamicField.fieldOptions" name="editFieldOptions"></textarea>
+            </clr-textarea-container>
+            
+            <clr-input-container>
+              <label>Sort Order</label>
+              <input clrInput type="number" [(ngModel)]="selectedDynamicField.sortOrder" name="editFieldSortOrder" />
+            </clr-input-container>
+            
+            <clr-checkbox-container>
+              <label>Is Required</label>
+              <clr-checkbox-wrapper>
+                <input type="checkbox" clrCheckbox [(ngModel)]="selectedDynamicField.isRequired" name="editFieldIsRequired" />
+                <label>Required</label>
+              </clr-checkbox-wrapper>
+            </clr-checkbox-container>
+            
+            <clr-checkbox-container>
+              <label>Show in UI</label>
+              <clr-checkbox-wrapper>
+                <input type="checkbox" clrCheckbox [(ngModel)]="selectedDynamicField.showInUi" name="editFieldShowInUi" />
+                <label>Show in UI</label>
+              </clr-checkbox-wrapper>
+            </clr-checkbox-container>
+            
+            <div class="form-actions">
+              <button class="btn btn-primary" (click)="updateDynamicField()" [disabled]="!selectedDynamicField.fieldName || dynamicFieldLoadingState === ClrLoadingState.LOADING">
+                <clr-spinner *ngIf="dynamicFieldLoadingState === ClrLoadingState.LOADING" clrSmall clrInline></clr-spinner>
+                Update
+              </button>
+              <button class="btn" (click)="selectedDynamicField = null">Cancel</button>
+            </div>
+          </form>
+        </div>
+      </div>
+    </clr-tab-content>
+  </clr-tab>
+</div>
\ No newline at end of file
diff --git a/frontend/angular-clarity-master/src/app/modules/main/builder/dashboardnew/chart-config/chart-config-manager.component.scss b/frontend/angular-clarity-master/src/app/modules/main/builder/dashboardnew/chart-config/chart-config-manager.component.scss
new file mode 100644
index 0000000..9a9198b
--- /dev/null
+++ b/frontend/angular-clarity-master/src/app/modules/main/builder/dashboardnew/chart-config/chart-config-manager.component.scss
@@ -0,0 +1,97 @@
+.chart-config-manager {
+  padding: 20px;
+  
+  .card {
+    margin-bottom: 20px;
+    
+    .card-header {
+      display: flex;
+      justify-content: space-between;
+      align-items: center;
+      
+      h3 {
+        margin: 0;
+      }
+    }
+    
+    .card-block {
+      padding: 15px;
+      
+      form {
+        margin-bottom: 20px;
+      }
+    }
+  }
+  
+  .form-actions {
+    display: flex;
+    gap: 10px;
+    margin-top: 15px;
+  }
+  
+  clr-datagrid {
+    min-height: 200px;
+  }
+  
+  .label {
+    padding: 4px 8px;
+    border-radius: 3px;
+    font-size: 12px;
+    font-weight: bold;
+  }
+  
+  .label-success {
+    background-color: #318700;
+    color: white;
+  }
+  
+  .label-danger {
+    background-color: #e62200;
+    color: white;
+  }
+  
+  .required {
+    color: red;
+  }
+  
+  .alert {
+    margin-bottom: 20px;
+  }
+  
+  clr-tab-content {
+    padding: 15px 0;
+  }
+}
+
+.action-cell {
+  min-width: 120px;
+}
+
+.action-buttons {
+  display: flex;
+  gap: 5px;
+  flex-wrap: nowrap;
+  align-items: center;
+}
+
+.action-buttons .btn-icon {
+  min-width: 36px;
+  display: flex;
+  align-items: center;
+  justify-content: center;
+}
+
+// Ensure icons are visible
+cds-icon {
+  display: inline-block !important;
+}
+
+clr-spinner {
+  margin: 0;
+}cds-icon {
+  display: inline-block !important;
+}
+
+clr-spinner {
+  margin: 0;
+}
\ No newline at end of file
diff --git a/frontend/angular-clarity-master/src/app/modules/main/builder/dashboardnew/chart-config/chart-config-manager.component.ts b/frontend/angular-clarity-master/src/app/modules/main/builder/dashboardnew/chart-config/chart-config-manager.component.ts
new file mode 100644
index 0000000..df35f13
--- /dev/null
+++ b/frontend/angular-clarity-master/src/app/modules/main/builder/dashboardnew/chart-config/chart-config-manager.component.ts
@@ -0,0 +1,710 @@
+import { Component, OnInit } from '@angular/core';
+import { ClrLoadingState } from '@clr/angular';
+import { ChartTypeService } from '../chart-type-manager/chart-type.service';
+import { UiComponentService } from './ui-component.service';
+import { ComponentPropertyService } from './component-property.service';
+import { ChartTemplateService } from './chart-template.service';
+import { DynamicFieldService } from './dynamic-field.service';
+
+export interface ChartType {
+  id: number;
+  name: string;
+  displayName: string;
+  description: string;
+  isActive: boolean;
+  createdAt: string;
+  updatedAt: string;
+}
+
+export interface UiComponent {
+  id: number;
+  chartType: ChartType;
+  componentName: string;
+  componentType: string;
+  displayLabel: string;
+  placeholder: string;
+  isRequired: boolean;
+  sortOrder: number;
+  createdAt: string;
+  updatedAt: string;
+}
+
+export interface ComponentProperty {
+  id: number;
+  component: UiComponent;
+  propertyName: string;
+  propertyValue: string;
+  propertyType: string;
+  createdAt: string;
+  updatedAt: string;
+}
+
+export interface ChartTemplate {
+  id: number;
+  chartType: ChartType;
+  templateName: string;
+  templateHtml: string;
+  templateCss: string;
+  isDefault: boolean;
+  createdAt: string;
+  updatedAt: string;
+}
+
+export interface DynamicField {
+  id: number;
+  chartType: ChartType;
+  fieldName: string;
+  fieldLabel: string;
+  fieldType: string;
+  fieldOptions: string;
+  isRequired: boolean;
+  showInUi: boolean;
+  sortOrder: number;
+  createdAt: string;
+  updatedAt: string;
+}
+
+@Component({
+  selector: 'app-chart-config-manager',
+  templateUrl: './chart-config-manager.component.html',
+  styleUrls: ['./chart-config-manager.component.scss']
+})
+export class ChartConfigManagerComponent implements OnInit {
+  // Chart Types
+  chartTypes: ChartType[] = [];
+  selectedChartType: ChartType | null = null;
+  newChartType: Partial<ChartType> = {};
+  showAddChartTypeForm = false;
+  chartTypeLoadingState: ClrLoadingState = ClrLoadingState.DEFAULT;
+
+  // UI Components
+  uiComponents: UiComponent[] = [];
+  selectedUiComponent: UiComponent | null = null;
+  newUiComponent: Partial<UiComponent> = {};
+  showAddUiComponentForm = false;
+  uiComponentLoadingState: ClrLoadingState = ClrLoadingState.DEFAULT;
+
+  // Component Properties
+  componentProperties: ComponentProperty[] = [];
+  selectedComponentProperty: ComponentProperty | null = null;
+  newComponentProperty: Partial<ComponentProperty> = {};
+  showAddComponentPropertyForm = false;
+  componentPropertyLoadingState: ClrLoadingState = ClrLoadingState.DEFAULT;
+
+  // Chart Templates
+  chartTemplates: ChartTemplate[] = [];
+  selectedChartTemplate: ChartTemplate | null = null;
+  newChartTemplate: Partial<ChartTemplate> = {};
+  showAddChartTemplateForm = false;
+  chartTemplateLoadingState: ClrLoadingState = ClrLoadingState.DEFAULT;
+
+  // Dynamic Fields
+  dynamicFields: DynamicField[] = [];
+  selectedDynamicField: DynamicField | null = null;
+  newDynamicField: Partial<DynamicField> = {};
+  showAddDynamicFieldForm = false;
+  dynamicFieldLoadingState: ClrLoadingState = ClrLoadingState.DEFAULT;
+
+  // Make ClrLoadingState available to template
+  readonly ClrLoadingState = ClrLoadingState;
+
+  // Error handling
+  errorMessage: string | null = null;
+  successMessage: string | null = null;
+
+  constructor(
+    private chartTypeService: ChartTypeService,
+    private uiComponentService: UiComponentService,
+    private componentPropertyService: ComponentPropertyService,
+    private chartTemplateService: ChartTemplateService,
+    private dynamicFieldService: DynamicFieldService
+  ) { }
+
+  ngOnInit(): void {
+    console.log('ChartConfigManagerComponent initialized');
+    this.loadChartTypes();
+  }
+
+  // Show error message
+  private showError(message: string): void {
+    this.errorMessage = message;
+    setTimeout(() => {
+      this.errorMessage = null;
+    }, 5000);
+  }
+
+  // Show success message
+  private showSuccess(message: string): void {
+    this.successMessage = message;
+    setTimeout(() => {
+      this.successMessage = null;
+    }, 3000);
+  }
+
+  // Chart Type Methods
+  loadChartTypes(): void {
+    this.chartTypeLoadingState = ClrLoadingState.LOADING;
+    console.log('Loading chart types...');
+    this.chartTypeService.getAllChartTypes().subscribe({
+      next: (data) => {
+        console.log('Chart types loaded:', data);
+        this.chartTypes = data;
+        this.chartTypeLoadingState = ClrLoadingState.SUCCESS;
+      },
+      error: (error) => {
+        console.error('Error loading chart types:', error);
+        this.showError('Error loading chart types: ' + (error.error?.message || error.message || 'Unknown error'));
+        this.chartTypeLoadingState = ClrLoadingState.ERROR;
+      }
+    });
+  }
+
+  createChartType(): void {
+    if (!this.newChartType.name) {
+      this.showError('Chart type name is required');
+      return;
+    }
+
+    this.chartTypeLoadingState = ClrLoadingState.LOADING;
+    this.chartTypeService.createChartType(this.newChartType).subscribe({
+      next: (data) => {
+        this.chartTypes.push(data);
+        this.newChartType = {};
+        this.showAddChartTypeForm = false;
+        this.showSuccess('Chart type created successfully');
+        this.chartTypeLoadingState = ClrLoadingState.SUCCESS;
+      },
+      error: (error) => {
+        console.error('Error creating chart type:', error);
+        this.showError('Error creating chart type: ' + (error.error?.message || error.message || 'Unknown error'));
+        this.chartTypeLoadingState = ClrLoadingState.ERROR;
+      }
+    });
+  }
+
+  updateChartType(): void {
+    if (!this.selectedChartType || !this.selectedChartType.name) {
+      this.showError('Chart type name is required');
+      return;
+    }
+
+    this.chartTypeLoadingState = ClrLoadingState.LOADING;
+    this.chartTypeService.updateChartType(this.selectedChartType.id, this.selectedChartType).subscribe({
+      next: (data) => {
+        const index = this.chartTypes.findIndex(ct => ct.id === data.id);
+        if (index !== -1) {
+          this.chartTypes[index] = data;
+        }
+        this.selectedChartType = null;
+        this.showSuccess('Chart type updated successfully');
+        this.chartTypeLoadingState = ClrLoadingState.SUCCESS;
+      },
+      error: (error) => {
+        console.error('Error updating chart type:', error);
+        this.showError('Error updating chart type: ' + (error.error?.message || error.message || 'Unknown error'));
+        this.chartTypeLoadingState = ClrLoadingState.ERROR;
+      }
+    });
+  }
+
+  deleteChartType(id: number): void {
+    if (!confirm('Are you sure you want to delete this chart type? This will also delete all related UI components, templates, and fields.')) {
+      return;
+    }
+
+    this.chartTypeLoadingState = ClrLoadingState.LOADING;
+    this.chartTypeService.deleteChartType(id).subscribe({
+      next: () => {
+        this.chartTypes = this.chartTypes.filter(ct => ct.id !== id);
+        // Clear related data if the deleted chart type was selected
+        if (this.selectedChartType && this.selectedChartType.id === id) {
+          this.selectedChartType = null;
+          this.uiComponents = [];
+          this.chartTemplates = [];
+          this.dynamicFields = [];
+        }
+        this.showSuccess('Chart type deleted successfully');
+        this.chartTypeLoadingState = ClrLoadingState.SUCCESS;
+      },
+      error: (error) => {
+        console.error('Error deleting chart type:', error);
+        this.showError('Error deleting chart type: ' + (error.error?.message || error.message || 'Unknown error'));
+        this.chartTypeLoadingState = ClrLoadingState.ERROR;
+      }
+    });
+  }
+
+  selectChartTypeForEdit(chartType: ChartType): void {
+    this.selectedChartType = { ...chartType };
+  }
+
+  // UI Component Methods
+  loadUiComponents(chartTypeId: number): void {
+    if (!chartTypeId) {
+      this.uiComponents = [];
+      return;
+    }
+    
+    this.uiComponentLoadingState = ClrLoadingState.LOADING;
+    this.uiComponentService.getUiComponentsByChartType(chartTypeId).subscribe({
+      next: (data) => {
+        this.uiComponents = data;
+        this.uiComponentLoadingState = ClrLoadingState.SUCCESS;
+      },
+      error: (error) => {
+        console.error('Error loading UI components:', error);
+        this.showError('Error loading UI components: ' + (error.error?.message || error.message || 'Unknown error'));
+        this.uiComponentLoadingState = ClrLoadingState.ERROR;
+      }
+    });
+  }
+
+  createUiComponent(): void {
+    if (!this.selectedChartType) {
+      this.showError('Please select a chart type first');
+      return;
+    }
+
+    if (!this.newUiComponent.componentName) {
+      this.showError('Component name is required');
+      return;
+    }
+
+    this.uiComponentLoadingState = ClrLoadingState.LOADING;
+    
+    // Create a complete chartType object with only the ID
+    const chartTypeWithId = { 
+      id: this.selectedChartType.id,
+      name: '',
+      displayName: '',
+      description: '',
+      isActive: true,
+      createdAt: '',
+      updatedAt: ''
+    };
+
+    const uiComponentData = {
+      ...this.newUiComponent,
+      chartType: chartTypeWithId
+    };
+
+    this.uiComponentService.createUiComponent(uiComponentData).subscribe({
+      next: (data) => {
+        this.uiComponents.push(data);
+        this.newUiComponent = {};
+        this.showAddUiComponentForm = false;
+        this.showSuccess('UI component created successfully');
+        this.uiComponentLoadingState = ClrLoadingState.SUCCESS;
+      },
+      error: (error) => {
+        console.error('Error creating UI component:', error);
+        this.showError('Error creating UI component: ' + (error.error?.message || error.message || 'Unknown error'));
+        this.uiComponentLoadingState = ClrLoadingState.ERROR;
+      }
+    });
+  }
+
+  updateUiComponent(): void {
+    if (!this.selectedUiComponent || !this.selectedUiComponent.componentName) {
+      this.showError('Component name is required');
+      return;
+    }
+
+    this.uiComponentLoadingState = ClrLoadingState.LOADING;
+    this.uiComponentService.updateUiComponent(this.selectedUiComponent.id, this.selectedUiComponent).subscribe({
+      next: (data) => {
+        const index = this.uiComponents.findIndex(uc => uc.id === data.id);
+        if (index !== -1) {
+          this.uiComponents[index] = data;
+        }
+        this.selectedUiComponent = null;
+        this.showSuccess('UI component updated successfully');
+        this.uiComponentLoadingState = ClrLoadingState.SUCCESS;
+      },
+      error: (error) => {
+        console.error('Error updating UI component:', error);
+        this.showError('Error updating UI component: ' + (error.error?.message || error.message || 'Unknown error'));
+        this.uiComponentLoadingState = ClrLoadingState.ERROR;
+      }
+    });
+  }
+
+  deleteUiComponent(id: number): void {
+    if (!confirm('Are you sure you want to delete this UI component?')) {
+      return;
+    }
+
+    this.uiComponentLoadingState = ClrLoadingState.LOADING;
+    this.uiComponentService.deleteUiComponent(id).subscribe({
+      next: () => {
+        this.uiComponents = this.uiComponents.filter(uc => uc.id !== id);
+        this.showSuccess('UI component deleted successfully');
+        this.uiComponentLoadingState = ClrLoadingState.SUCCESS;
+      },
+      error: (error) => {
+        console.error('Error deleting UI component:', error);
+        this.showError('Error deleting UI component: ' + (error.error?.message || error.message || 'Unknown error'));
+        this.uiComponentLoadingState = ClrLoadingState.ERROR;
+      }
+    });
+  }
+
+  selectUiComponentForEdit(uiComponent: UiComponent): void {
+    this.selectedUiComponent = { ...uiComponent };
+  }
+
+  // Component Property Methods
+  loadComponentProperties(componentId: number): void {
+    if (!componentId) {
+      this.componentProperties = [];
+      return;
+    }
+    
+    this.componentPropertyLoadingState = ClrLoadingState.LOADING;
+    this.componentPropertyService.getComponentPropertiesByComponent(componentId).subscribe({
+      next: (data) => {
+        this.componentProperties = data;
+        this.componentPropertyLoadingState = ClrLoadingState.SUCCESS;
+      },
+      error: (error) => {
+        console.error('Error loading component properties:', error);
+        this.showError('Error loading component properties: ' + (error.error?.message || error.message || 'Unknown error'));
+        this.componentPropertyLoadingState = ClrLoadingState.ERROR;
+      }
+    });
+  }
+
+  createComponentProperty(): void {
+    if (!this.selectedUiComponent) {
+      this.showError('Please select a UI component first');
+      return;
+    }
+
+    if (!this.newComponentProperty.propertyName) {
+      this.showError('Property name is required');
+      return;
+    }
+
+    this.componentPropertyLoadingState = ClrLoadingState.LOADING;
+    
+    // Create a complete component object with only the ID
+    const componentWithId = { 
+      id: this.selectedUiComponent.id
+    } as UiComponent;
+
+    const componentPropertyData = {
+      ...this.newComponentProperty,
+      component: componentWithId
+    };
+
+    this.componentPropertyService.createComponentProperty(componentPropertyData).subscribe({
+      next: (data) => {
+        this.componentProperties.push(data);
+        this.newComponentProperty = {};
+        this.showAddComponentPropertyForm = false;
+        this.showSuccess('Component property created successfully');
+        this.componentPropertyLoadingState = ClrLoadingState.SUCCESS;
+      },
+      error: (error) => {
+        console.error('Error creating component property:', error);
+        this.showError('Error creating component property: ' + (error.error?.message || error.message || 'Unknown error'));
+        this.componentPropertyLoadingState = ClrLoadingState.ERROR;
+      }
+    });
+  }
+
+  updateComponentProperty(): void {
+    if (!this.selectedComponentProperty || !this.selectedComponentProperty.propertyName) {
+      this.showError('Property name is required');
+      return;
+    }
+
+    this.componentPropertyLoadingState = ClrLoadingState.LOADING;
+    this.componentPropertyService.updateComponentProperty(this.selectedComponentProperty.id, this.selectedComponentProperty).subscribe({
+      next: (data) => {
+        const index = this.componentProperties.findIndex(cp => cp.id === data.id);
+        if (index !== -1) {
+          this.componentProperties[index] = data;
+        }
+        this.selectedComponentProperty = null;
+        this.showSuccess('Component property updated successfully');
+        this.componentPropertyLoadingState = ClrLoadingState.SUCCESS;
+      },
+      error: (error) => {
+        console.error('Error updating component property:', error);
+        this.showError('Error updating component property: ' + (error.error?.message || error.message || 'Unknown error'));
+        this.componentPropertyLoadingState = ClrLoadingState.ERROR;
+      }
+    });
+  }
+
+  deleteComponentProperty(id: number): void {
+    if (!confirm('Are you sure you want to delete this component property?')) {
+      return;
+    }
+
+    this.componentPropertyLoadingState = ClrLoadingState.LOADING;
+    this.componentPropertyService.deleteComponentProperty(id).subscribe({
+      next: () => {
+        this.componentProperties = this.componentProperties.filter(cp => cp.id !== id);
+        this.showSuccess('Component property deleted successfully');
+        this.componentPropertyLoadingState = ClrLoadingState.SUCCESS;
+      },
+      error: (error) => {
+        console.error('Error deleting component property:', error);
+        this.showError('Error deleting component property: ' + (error.error?.message || error.message || 'Unknown error'));
+        this.componentPropertyLoadingState = ClrLoadingState.ERROR;
+      }
+    });
+  }
+
+  selectComponentPropertyForEdit(componentProperty: ComponentProperty): void {
+    this.selectedComponentProperty = { ...componentProperty };
+  }
+
+  // Chart Template Methods
+  loadChartTemplates(chartTypeId: number): void {
+    if (!chartTypeId) {
+      this.chartTemplates = [];
+      return;
+    }
+    
+    this.chartTemplateLoadingState = ClrLoadingState.LOADING;
+    this.chartTemplateService.getChartTemplatesByChartType(chartTypeId).subscribe({
+      next: (data) => {
+        this.chartTemplates = data;
+        this.chartTemplateLoadingState = ClrLoadingState.SUCCESS;
+      },
+      error: (error) => {
+        console.error('Error loading chart templates:', error);
+        this.showError('Error loading chart templates: ' + (error.error?.message || error.message || 'Unknown error'));
+        this.chartTemplateLoadingState = ClrLoadingState.ERROR;
+      }
+    });
+  }
+
+  createChartTemplate(): void {
+    if (!this.selectedChartType) {
+      this.showError('Please select a chart type first');
+      return;
+    }
+
+    if (!this.newChartTemplate.templateName) {
+      this.showError('Template name is required');
+      return;
+    }
+
+    this.chartTemplateLoadingState = ClrLoadingState.LOADING;
+    
+    // Remove the chartType from the template data since we're passing it as a parameter
+    const chartTemplateData = { ...this.newChartTemplate };
+    // Remove chartType property if it exists
+    delete (chartTemplateData as any).chartType;
+
+    this.chartTemplateService.createChartTemplate(chartTemplateData, this.selectedChartType.id).subscribe({
+      next: (data) => {
+        this.chartTemplates.push(data);
+        this.newChartTemplate = {};
+        this.showAddChartTemplateForm = false;
+        this.showSuccess('Chart template created successfully');
+        this.chartTemplateLoadingState = ClrLoadingState.SUCCESS;
+      },
+      error: (error) => {
+        console.error('Error creating chart template:', error);
+        this.showError('Error creating chart template: ' + (error.error?.message || error.message || 'Unknown error'));
+        this.chartTemplateLoadingState = ClrLoadingState.ERROR;
+      }
+    });
+  }
+
+  updateChartTemplate(): void {
+    if (!this.selectedChartTemplate || !this.selectedChartTemplate.templateName) {
+      this.showError('Template name is required');
+      return;
+    }
+
+    this.chartTemplateLoadingState = ClrLoadingState.LOADING;
+    this.chartTemplateService.updateChartTemplate(this.selectedChartTemplate.id, this.selectedChartTemplate).subscribe({
+      next: (data) => {
+        const index = this.chartTemplates.findIndex(ct => ct.id === data.id);
+        if (index !== -1) {
+          this.chartTemplates[index] = data;
+        }
+        this.selectedChartTemplate = null;
+        this.showSuccess('Chart template updated successfully');
+        this.chartTemplateLoadingState = ClrLoadingState.SUCCESS;
+      },
+      error: (error) => {
+        console.error('Error updating chart template:', error);
+        this.showError('Error updating chart template: ' + (error.error?.message || error.message || 'Unknown error'));
+        this.chartTemplateLoadingState = ClrLoadingState.ERROR;
+      }
+    });
+  }
+
+  deleteChartTemplate(id: number): void {
+    if (!confirm('Are you sure you want to delete this chart template?')) {
+      return;
+    }
+
+    this.chartTemplateLoadingState = ClrLoadingState.LOADING;
+    this.chartTemplateService.deleteChartTemplate(id).subscribe({
+      next: () => {
+        this.chartTemplates = this.chartTemplates.filter(ct => ct.id !== id);
+        this.showSuccess('Chart template deleted successfully');
+        this.chartTemplateLoadingState = ClrLoadingState.SUCCESS;
+      },
+      error: (error) => {
+        console.error('Error deleting chart template:', error);
+        this.showError('Error deleting chart template: ' + (error.error?.message || error.message || 'Unknown error'));
+        this.chartTemplateLoadingState = ClrLoadingState.ERROR;
+      }
+    });
+  }
+
+  selectChartTemplateForEdit(chartTemplate: ChartTemplate): void {
+    this.selectedChartTemplate = { ...chartTemplate };
+  }
+
+  // Dynamic Field Methods
+  loadDynamicFields(chartTypeId: number): void {
+    if (!chartTypeId) {
+      this.dynamicFields = [];
+      return;
+    }
+    
+    this.dynamicFieldLoadingState = ClrLoadingState.LOADING;
+    this.dynamicFieldService.getDynamicFieldsByChartType(chartTypeId).subscribe({
+      next: (data) => {
+        this.dynamicFields = data;
+        this.dynamicFieldLoadingState = ClrLoadingState.SUCCESS;
+      },
+      error: (error) => {
+        console.error('Error loading dynamic fields:', error);
+        this.showError('Error loading dynamic fields: ' + (error.error?.message || error.message || 'Unknown error'));
+        this.dynamicFieldLoadingState = ClrLoadingState.ERROR;
+      }
+    });
+  }
+
+  createDynamicField(): void {
+    if (!this.selectedChartType) {
+      this.showError('Please select a chart type first');
+      return;
+    }
+
+    if (!this.newDynamicField.fieldName) {
+      this.showError('Field name is required');
+      return;
+    }
+
+    this.dynamicFieldLoadingState = ClrLoadingState.LOADING;
+    
+    // Remove the chartType from the dynamic field data since we're passing it as a parameter
+    const dynamicFieldData = { ...this.newDynamicField };
+    // Remove chartType property if it exists
+    delete (dynamicFieldData as any).chartType;
+
+    this.dynamicFieldService.createDynamicField(dynamicFieldData, this.selectedChartType.id).subscribe({
+      next: (data) => {
+        this.dynamicFields.push(data);
+        this.newDynamicField = {};
+        this.showAddDynamicFieldForm = false;
+        this.showSuccess('Dynamic field created successfully');
+        this.dynamicFieldLoadingState = ClrLoadingState.SUCCESS;
+      },
+      error: (error) => {
+        console.error('Error creating dynamic field:', error);
+        this.showError('Error creating dynamic field: ' + (error.error?.message || error.message || 'Unknown error'));
+        this.dynamicFieldLoadingState = ClrLoadingState.ERROR;
+      }
+    });
+  }
+
+  updateDynamicField(): void {
+    if (!this.selectedDynamicField || !this.selectedDynamicField.fieldName) {
+      this.showError('Field name is required');
+      return;
+    }
+
+    this.dynamicFieldLoadingState = ClrLoadingState.LOADING;
+    this.dynamicFieldService.updateDynamicField(this.selectedDynamicField.id, this.selectedDynamicField).subscribe({
+      next: (data) => {
+        const index = this.dynamicFields.findIndex(df => df.id === data.id);
+        if (index !== -1) {
+          this.dynamicFields[index] = data;
+        }
+        this.selectedDynamicField = null;
+        this.showSuccess('Dynamic field updated successfully');
+        this.dynamicFieldLoadingState = ClrLoadingState.SUCCESS;
+      },
+      error: (error) => {
+        console.error('Error updating dynamic field:', error);
+        this.showError('Error updating dynamic field: ' + (error.error?.message || error.message || 'Unknown error'));
+        this.dynamicFieldLoadingState = ClrLoadingState.ERROR;
+      }
+    });
+  }
+
+  deleteDynamicField(id: number): void {
+    if (!confirm('Are you sure you want to delete this dynamic field?')) {
+      return;
+    }
+
+    this.dynamicFieldLoadingState = ClrLoadingState.LOADING;
+    this.dynamicFieldService.deleteDynamicField(id).subscribe({
+      next: () => {
+        this.dynamicFields = this.dynamicFields.filter(df => df.id !== id);
+        this.showSuccess('Dynamic field deleted successfully');
+        this.dynamicFieldLoadingState = ClrLoadingState.SUCCESS;
+      },
+      error: (error) => {
+        console.error('Error deleting dynamic field:', error);
+        this.showError('Error deleting dynamic field: ' + (error.error?.message || error.message || 'Unknown error'));
+        this.dynamicFieldLoadingState = ClrLoadingState.ERROR;
+      }
+    });
+  }
+
+  selectDynamicFieldForEdit(dynamicField: DynamicField): void {
+    this.selectedDynamicField = { ...dynamicField };
+  }
+
+  // Helper methods
+  onChartTypeSelect(chartType: ChartType): void {
+    this.selectedChartType = chartType;
+    this.loadUiComponents(chartType.id);
+    this.loadChartTemplates(chartType.id);
+    this.loadDynamicFields(chartType.id);
+  }
+
+  onUiComponentSelect(uiComponent: UiComponent): void {
+    this.selectedUiComponent = uiComponent;
+    this.loadComponentProperties(uiComponent.id);
+    // Scroll to the Component Properties tab
+    setTimeout(() => {
+      const element = document.querySelector('clr-tab[ng-reflect-ng-if="true"] button[clr-tab-link]:nth-child(3)');
+      if (element) {
+        element.scrollIntoView({ behavior: 'smooth', block: 'nearest' });
+      }
+    }, 100);
+  }
+
+  resetForms(): void {
+    this.newChartType = {};
+    this.newUiComponent = {};
+    this.newComponentProperty = {};
+    this.newChartTemplate = {};
+    this.newDynamicField = {};
+    this.showAddChartTypeForm = false;
+    this.showAddUiComponentForm = false;
+    this.showAddComponentPropertyForm = false;
+    this.showAddChartTemplateForm = false;
+    this.showAddDynamicFieldForm = false;
+    this.selectedChartType = null;
+    this.selectedUiComponent = null;
+    this.selectedComponentProperty = null;
+    this.selectedChartTemplate = null;
+    this.selectedDynamicField = null;
+  }
+}
\ No newline at end of file
diff --git a/frontend/angular-clarity-master/src/app/modules/main/builder/dashboardnew/chart-config/chart-template.service.ts b/frontend/angular-clarity-master/src/app/modules/main/builder/dashboardnew/chart-config/chart-template.service.ts
new file mode 100644
index 0000000..9b9d787
--- /dev/null
+++ b/frontend/angular-clarity-master/src/app/modules/main/builder/dashboardnew/chart-config/chart-template.service.ts
@@ -0,0 +1,46 @@
+import { Injectable } from '@angular/core';
+import { Observable } from 'rxjs';
+import { ApiRequestService } from 'src/app/services/api/api-request.service';
+import { ChartTemplate } from './chart-config-manager.component';
+
+@Injectable({
+  providedIn: 'root'
+})
+export class ChartTemplateService {
+  private chartTemplatesUrl = 'api/chart-templates';
+
+  constructor(private apiRequest: ApiRequestService) { }
+
+  // Get all chart templates for a chart type
+  getChartTemplatesByChartType(chartTypeId: number): Observable<ChartTemplate[]> {
+    const url = `${this.chartTemplatesUrl}/chart-type/${chartTypeId}`;
+    return this.apiRequest.get(url);
+  }
+
+  // Get chart template by ID
+  getChartTemplateById(id: number): Observable<ChartTemplate> {
+    const url = `${this.chartTemplatesUrl}/${id}`;
+    return this.apiRequest.get(url);
+  }
+
+  // Create new chart template with optional chart type ID as parameter
+  createChartTemplate(chartTemplate: Partial<ChartTemplate>, chartTypeId?: number): Observable<ChartTemplate> {
+    let url = this.chartTemplatesUrl;
+    if (chartTypeId) {
+      url = `${this.chartTemplatesUrl}?chartTypeId=${chartTypeId}`;
+    }
+    return this.apiRequest.post(url, chartTemplate);
+  }
+
+  // Update chart template
+  updateChartTemplate(id: number, chartTemplate: ChartTemplate): Observable<ChartTemplate> {
+    const url = `${this.chartTemplatesUrl}/${id}`;
+    return this.apiRequest.put(url, chartTemplate);
+  }
+
+  // Delete chart template
+  deleteChartTemplate(id: number): Observable<void> {
+    const url = `${this.chartTemplatesUrl}/${id}`;
+    return this.apiRequest.delete(url);
+  }
+}
\ No newline at end of file
diff --git a/frontend/angular-clarity-master/src/app/modules/main/builder/dashboardnew/chart-config/component-property.service.ts b/frontend/angular-clarity-master/src/app/modules/main/builder/dashboardnew/chart-config/component-property.service.ts
new file mode 100644
index 0000000..72f67af
--- /dev/null
+++ b/frontend/angular-clarity-master/src/app/modules/main/builder/dashboardnew/chart-config/component-property.service.ts
@@ -0,0 +1,42 @@
+import { Injectable } from '@angular/core';
+import { Observable } from 'rxjs';
+import { ApiRequestService } from 'src/app/services/api/api-request.service';
+import { ComponentProperty } from './chart-config-manager.component';
+
+@Injectable({
+  providedIn: 'root'
+})
+export class ComponentPropertyService {
+  private componentPropertiesUrl = 'api/component-properties';
+
+  constructor(private apiRequest: ApiRequestService) { }
+
+  // Get all component properties for a component
+  getComponentPropertiesByComponent(componentId: number): Observable<ComponentProperty[]> {
+    const url = `${this.componentPropertiesUrl}/component/${componentId}`;
+    return this.apiRequest.get(url);
+  }
+
+  // Get component property by ID
+  getComponentPropertyById(id: number): Observable<ComponentProperty> {
+    const url = `${this.componentPropertiesUrl}/${id}`;
+    return this.apiRequest.get(url);
+  }
+
+  // Create new component property
+  createComponentProperty(componentProperty: Partial<ComponentProperty>): Observable<ComponentProperty> {
+    return this.apiRequest.post(this.componentPropertiesUrl, componentProperty);
+  }
+
+  // Update component property
+  updateComponentProperty(id: number, componentProperty: ComponentProperty): Observable<ComponentProperty> {
+    const url = `${this.componentPropertiesUrl}/${id}`;
+    return this.apiRequest.put(url, componentProperty);
+  }
+
+  // Delete component property
+  deleteComponentProperty(id: number): Observable<void> {
+    const url = `${this.componentPropertiesUrl}/${id}`;
+    return this.apiRequest.delete(url);
+  }
+}
\ No newline at end of file
diff --git a/frontend/angular-clarity-master/src/app/modules/main/builder/dashboardnew/chart-config/dynamic-chart-loader.service.ts b/frontend/angular-clarity-master/src/app/modules/main/builder/dashboardnew/chart-config/dynamic-chart-loader.service.ts
new file mode 100644
index 0000000..62c63c6
--- /dev/null
+++ b/frontend/angular-clarity-master/src/app/modules/main/builder/dashboardnew/chart-config/dynamic-chart-loader.service.ts
@@ -0,0 +1,125 @@
+import { Injectable } from '@angular/core';
+import { Observable, forkJoin } from 'rxjs';
+import { map } from 'rxjs/operators';
+import { ApiRequestService } from 'src/app/services/api/api-request.service';
+import { ChartType, UiComponent, ComponentProperty, ChartTemplate, DynamicField } from './chart-config-manager.component';
+
+@Injectable({
+  providedIn: 'root'
+})
+export class DynamicChartLoaderService {
+  private chartTypesUrl = 'api/chart-types';
+  private uiComponentsUrl = 'api/ui-components';
+  private componentPropertiesUrl = 'api/component-properties';
+  private chartTemplatesUrl = 'api/chart-templates';
+  private dynamicFieldsUrl = 'api/dynamic-fields';
+
+  constructor(private apiRequest: ApiRequestService) { }
+
+  /**
+   * Load all chart configurations dynamically
+   * This method fetches all chart types and their associated components, templates, and fields
+   */
+  loadAllChartConfigurations(): Observable<any> {
+    console.log('Loading all chart configurations dynamically');
+
+    // Load all chart types first
+    return this.apiRequest.get(this.chartTypesUrl).pipe(
+      map(chartTypes => {
+        console.log('Loaded chart types:', chartTypes);
+        return chartTypes;
+      })
+    );
+  }
+
+  /**
+   * Load complete configuration for a specific chart type
+   * This includes UI components, templates, and dynamic fields
+   */
+  loadChartConfiguration(chartTypeId: number): Observable<{
+    chartType: ChartType,
+    uiComponents: UiComponent[],
+    templates: ChartTemplate[],
+    dynamicFields: DynamicField[]
+  }> {
+    console.log(`Loading complete configuration for chart type ${chartTypeId}`);
+
+    // Load all related data in parallel
+    return forkJoin({
+      chartType: this.apiRequest.get(`${this.chartTypesUrl}/${chartTypeId}`),
+      uiComponents: this.apiRequest.get(`${this.uiComponentsUrl}/chart-type/${chartTypeId}`),
+      templates: this.apiRequest.get(`${this.chartTemplatesUrl}/chart-type/${chartTypeId}`),
+      dynamicFields: this.apiRequest.get(`${this.dynamicFieldsUrl}/chart-type/${chartTypeId}`)
+    }).pipe(
+      map(result => {
+        console.log(`Loaded complete configuration for chart type ${chartTypeId}:`, result);
+        return result;
+      })
+    );
+  }
+
+  /**
+   * Load chart template for a specific chart type
+   * This is used to render the chart UI dynamically
+   */
+  loadChartTemplate(chartTypeId: number): Observable<ChartTemplate[]> {
+    console.log(`Loading chart templates for chart type ${chartTypeId}`);
+    return this.apiRequest.get(`${this.chartTemplatesUrl}/chart-type/${chartTypeId}`);
+  }
+
+  /**
+   * Load UI components for a specific chart type
+   * These define what configuration fields are needed for the chart
+   */
+  loadUiComponents(chartTypeId: number): Observable<UiComponent[]> {
+    console.log(`Loading UI components for chart type ${chartTypeId}`);
+    return this.apiRequest.get(`${this.uiComponentsUrl}/chart-type/${chartTypeId}`);
+  }
+
+  /**
+   * Load dynamic fields for a specific chart type
+   * These define additional dynamic fields that can be used in the chart
+   */
+  loadDynamicFields(chartTypeId: number): Observable<DynamicField[]> {
+    console.log(`Loading dynamic fields for chart type ${chartTypeId}`);
+    return this.apiRequest.get(`${this.dynamicFieldsUrl}/chart-type/${chartTypeId}`);
+  }
+
+  /**
+   * Get chart type by name
+   * This is useful for finding a chart type by its name rather than ID
+   */
+  // getChartTypeByName(name: string): Observable<ChartType | null> {
+  //   console.log(`Finding chart type by name: ${name}`);
+  //   return this.apiRequest.get(`${this.chartTypesUrl}/byname?chartName=${name}`).pipe(
+  //     map((chartTypes: ChartType[]) => {
+  //       console.log('Available chart types:', chartTypes);
+  //       const chartType = chartTypes.find(ct => ct.name === name);
+  //       console.log(`Found chart type for name ${name}:`, chartType);
+  //       return chartType || null;
+  //     })
+  //   );
+  // }
+
+  getChartTypeByName(name: string): Observable<any> {
+    console.log(`Finding chart type by name: ${name}`);
+    return this.apiRequest.get(`${this.chartTypesUrl}/byname?chartName=${name}`);
+  }
+
+
+
+  /**
+   * Load all active chart types
+   * This is used to populate the chart selection in the dashboard editor
+   */
+  loadActiveChartTypes(): Observable<ChartType[]> {
+    console.log('Loading active chart types');
+    return this.apiRequest.get(`${this.chartTypesUrl}`).pipe(
+      map((chartTypes: ChartType[]) => {
+        const activeChartTypes = chartTypes.filter(ct => ct.isActive);
+        console.log('Loaded active chart types:', activeChartTypes);
+        return activeChartTypes;
+      })
+    );
+  }
+}
\ No newline at end of file
diff --git a/frontend/angular-clarity-master/src/app/modules/main/builder/dashboardnew/chart-config/dynamic-field.service.ts b/frontend/angular-clarity-master/src/app/modules/main/builder/dashboardnew/chart-config/dynamic-field.service.ts
new file mode 100644
index 0000000..f43166f
--- /dev/null
+++ b/frontend/angular-clarity-master/src/app/modules/main/builder/dashboardnew/chart-config/dynamic-field.service.ts
@@ -0,0 +1,46 @@
+import { Injectable } from '@angular/core';
+import { Observable } from 'rxjs';
+import { ApiRequestService } from 'src/app/services/api/api-request.service';
+import { DynamicField } from './chart-config-manager.component';
+
+@Injectable({
+  providedIn: 'root'
+})
+export class DynamicFieldService {
+  private dynamicFieldsUrl = 'api/dynamic-fields';
+
+  constructor(private apiRequest: ApiRequestService) { }
+
+  // Get all dynamic fields for a chart type
+  getDynamicFieldsByChartType(chartTypeId: number): Observable<DynamicField[]> {
+    const url = `${this.dynamicFieldsUrl}/chart-type/${chartTypeId}`;
+    return this.apiRequest.get(url);
+  }
+
+  // Get dynamic field by ID
+  getDynamicFieldById(id: number): Observable<DynamicField> {
+    const url = `${this.dynamicFieldsUrl}/${id}`;
+    return this.apiRequest.get(url);
+  }
+
+  // Create new dynamic field with optional chart type ID as parameter
+  createDynamicField(dynamicField: Partial<DynamicField>, chartTypeId?: number): Observable<DynamicField> {
+    let url = this.dynamicFieldsUrl;
+    if (chartTypeId) {
+      url = `${this.dynamicFieldsUrl}?chartTypeId=${chartTypeId}`;
+    }
+    return this.apiRequest.post(url, dynamicField);
+  }
+
+  // Update dynamic field
+  updateDynamicField(id: number, dynamicField: DynamicField): Observable<DynamicField> {
+    const url = `${this.dynamicFieldsUrl}/${id}`;
+    return this.apiRequest.put(url, dynamicField);
+  }
+
+  // Delete dynamic field
+  deleteDynamicField(id: number): Observable<void> {
+    const url = `${this.dynamicFieldsUrl}/${id}`;
+    return this.apiRequest.delete(url);
+  }
+}
\ No newline at end of file
diff --git a/frontend/angular-clarity-master/src/app/modules/main/builder/dashboardnew/chart-config/forms/chart-template-form.component.html b/frontend/angular-clarity-master/src/app/modules/main/builder/dashboardnew/chart-config/forms/chart-template-form.component.html
new file mode 100644
index 0000000..d7b3c4a
--- /dev/null
+++ b/frontend/angular-clarity-master/src/app/modules/main/builder/dashboardnew/chart-config/forms/chart-template-form.component.html
@@ -0,0 +1,33 @@
+<div class="chart-template-form">
+  <form clrForm (ngSubmit)="onSubmit()" #chartTemplateForm="ngForm">
+    <clr-input-container>
+      <label>Template Name <span class="required">*</span></label>
+      <input clrInput type="text" [(ngModel)]="chartTemplate.templateName" name="templateName" required />
+    </clr-input-container>
+    
+    <clr-textarea-container>
+      <label>HTML Template</label>
+      <textarea clrTextarea [(ngModel)]="chartTemplate.templateHtml" name="templateHtml" rows="5" placeholder="<div class='chart-container'>...</div>"></textarea>
+    </clr-textarea-container>
+    
+    <clr-textarea-container>
+      <label>CSS Template</label>
+      <textarea clrTextarea [(ngModel)]="chartTemplate.templateCss" name="templateCss" rows="5" placeholder=".chart-container { ... }"></textarea>
+    </clr-textarea-container>
+    
+    <clr-checkbox-container>
+      <label>Is Default</label>
+      <clr-checkbox-wrapper>
+        <input type="checkbox" clrCheckbox [(ngModel)]="chartTemplate.isDefault" name="isDefault" />
+        <label>Default Template</label>
+      </clr-checkbox-wrapper>
+    </clr-checkbox-container>
+    
+    <div class="form-actions">
+      <button class="btn btn-primary" type="submit" [disabled]="!chartTemplate.templateName">
+        {{ isEdit ? 'Update' : 'Save' }}
+      </button>
+      <button class="btn" type="button" (click)="onCancel()">Cancel</button>
+    </div>
+  </form>
+</div>
\ No newline at end of file
diff --git a/frontend/angular-clarity-master/src/app/modules/main/builder/dashboardnew/chart-config/forms/chart-template-form.component.scss b/frontend/angular-clarity-master/src/app/modules/main/builder/dashboardnew/chart-config/forms/chart-template-form.component.scss
new file mode 100644
index 0000000..d58ef48
--- /dev/null
+++ b/frontend/angular-clarity-master/src/app/modules/main/builder/dashboardnew/chart-config/forms/chart-template-form.component.scss
@@ -0,0 +1,17 @@
+.chart-template-form {
+  padding: 20px;
+  background-color: #f9f9f9;
+  border-radius: 4px;
+  margin-bottom: 20px;
+}
+
+.form-actions {
+  margin-top: 20px;
+  display: flex;
+  gap: 10px;
+}
+
+textarea {
+  font-family: 'Courier New', monospace;
+  font-size: 12px;
+}
\ No newline at end of file
diff --git a/frontend/angular-clarity-master/src/app/modules/main/builder/dashboardnew/chart-config/forms/chart-template-form.component.ts b/frontend/angular-clarity-master/src/app/modules/main/builder/dashboardnew/chart-config/forms/chart-template-form.component.ts
new file mode 100644
index 0000000..b488f33
--- /dev/null
+++ b/frontend/angular-clarity-master/src/app/modules/main/builder/dashboardnew/chart-config/forms/chart-template-form.component.ts
@@ -0,0 +1,22 @@
+import { Component, Input, Output, EventEmitter } from '@angular/core';
+import { ChartTemplate } from '../chart-config-manager.component';
+
+@Component({
+  selector: 'app-chart-template-form',
+  templateUrl: './chart-template-form.component.html',
+  styleUrls: ['./chart-template-form.component.scss']
+})
+export class ChartTemplateFormComponent {
+  @Input() chartTemplate: Partial<ChartTemplate> = {};
+  @Input() isEdit = false;
+  @Output() save = new EventEmitter<Partial<ChartTemplate>>();
+  @Output() cancel = new EventEmitter<void>();
+
+  onSubmit(): void {
+    this.save.emit(this.chartTemplate);
+  }
+
+  onCancel(): void {
+    this.cancel.emit();
+  }
+}
\ No newline at end of file
diff --git a/frontend/angular-clarity-master/src/app/modules/main/builder/dashboardnew/chart-config/forms/chart-type-form.component.html b/frontend/angular-clarity-master/src/app/modules/main/builder/dashboardnew/chart-config/forms/chart-type-form.component.html
new file mode 100644
index 0000000..cad41f7
--- /dev/null
+++ b/frontend/angular-clarity-master/src/app/modules/main/builder/dashboardnew/chart-config/forms/chart-type-form.component.html
@@ -0,0 +1,33 @@
+<div class="chart-type-form">
+  <form clrForm (ngSubmit)="onSubmit()" #chartTypeForm="ngForm">
+    <clr-input-container>
+      <label>Name <span class="required">*</span></label>
+      <input clrInput type="text" [(ngModel)]="chartType.name" name="chartTypeName" required />
+    </clr-input-container>
+    
+    <clr-input-container>
+      <label>Display Name</label>
+      <input clrInput type="text" [(ngModel)]="chartType.displayName" name="chartTypeDisplayName" />
+    </clr-input-container>
+    
+    <clr-textarea-container>
+      <label>Description</label>
+      <textarea clrTextarea [(ngModel)]="chartType.description" name="chartTypeDescription" rows="3"></textarea>
+    </clr-textarea-container>
+    
+    <clr-checkbox-container>
+      <label>Is Active</label>
+      <clr-checkbox-wrapper>
+        <input type="checkbox" clrCheckbox [(ngModel)]="chartType.isActive" name="chartTypeIsActive" />
+        <label>Active</label>
+      </clr-checkbox-wrapper>
+    </clr-checkbox-container>
+    
+    <div class="form-actions">
+      <button class="btn btn-primary" type="submit" [disabled]="!chartType.name">
+        {{ isEdit ? 'Update' : 'Save' }}
+      </button>
+      <button class="btn" type="button" (click)="onCancel()">Cancel</button>
+    </div>
+  </form>
+</div>
\ No newline at end of file
diff --git a/frontend/angular-clarity-master/src/app/modules/main/builder/dashboardnew/chart-config/forms/chart-type-form.component.scss b/frontend/angular-clarity-master/src/app/modules/main/builder/dashboardnew/chart-config/forms/chart-type-form.component.scss
new file mode 100644
index 0000000..2262bef
--- /dev/null
+++ b/frontend/angular-clarity-master/src/app/modules/main/builder/dashboardnew/chart-config/forms/chart-type-form.component.scss
@@ -0,0 +1,12 @@
+.chart-type-form {
+  padding: 20px;
+  background-color: #f9f9f9;
+  border-radius: 4px;
+  margin-bottom: 20px;
+}
+
+.form-actions {
+  margin-top: 20px;
+  display: flex;
+  gap: 10px;
+}
\ No newline at end of file
diff --git a/frontend/angular-clarity-master/src/app/modules/main/builder/dashboardnew/chart-config/forms/chart-type-form.component.ts b/frontend/angular-clarity-master/src/app/modules/main/builder/dashboardnew/chart-config/forms/chart-type-form.component.ts
new file mode 100644
index 0000000..9873aba
--- /dev/null
+++ b/frontend/angular-clarity-master/src/app/modules/main/builder/dashboardnew/chart-config/forms/chart-type-form.component.ts
@@ -0,0 +1,22 @@
+import { Component, Input, Output, EventEmitter } from '@angular/core';
+import { ChartType } from '../chart-config-manager.component';
+
+@Component({
+  selector: 'app-chart-type-form',
+  templateUrl: './chart-type-form.component.html',
+  styleUrls: ['./chart-type-form.component.scss']
+})
+export class ChartTypeFormComponent {
+  @Input() chartType: Partial<ChartType> = {};
+  @Input() isEdit = false;
+  @Output() save = new EventEmitter<Partial<ChartType>>();
+  @Output() cancel = new EventEmitter<void>();
+
+  onSubmit(): void {
+    this.save.emit(this.chartType);
+  }
+
+  onCancel(): void {
+    this.cancel.emit();
+  }
+}
\ No newline at end of file
diff --git a/frontend/angular-clarity-master/src/app/modules/main/builder/dashboardnew/chart-config/forms/component-property-form.component.html b/frontend/angular-clarity-master/src/app/modules/main/builder/dashboardnew/chart-config/forms/component-property-form.component.html
new file mode 100644
index 0000000..28ec0d6
--- /dev/null
+++ b/frontend/angular-clarity-master/src/app/modules/main/builder/dashboardnew/chart-config/forms/component-property-form.component.html
@@ -0,0 +1,28 @@
+<div class="component-property-form">
+  <form clrForm (ngSubmit)="onSubmit()" #componentPropertyForm="ngForm">
+    <clr-input-container>
+      <label>Property Name <span class="required">*</span></label>
+      <input clrInput type="text" [(ngModel)]="componentProperty.propertyName" name="propertyName" required />
+    </clr-input-container>
+    
+    <clr-input-container>
+      <label>Property Value</label>
+      <input clrInput type="text" [(ngModel)]="componentProperty.propertyValue" name="propertyValue" />
+    </clr-input-container>
+    
+    <clr-select-container>
+      <label>Property Type</label>
+      <select clrSelect [(ngModel)]="componentProperty.propertyType" name="propertyType">
+        <option value="">Select a type</option>
+        <option *ngFor="let type of propertyTypes" [value]="type">{{ type | titlecase }}</option>
+      </select>
+    </clr-select-container>
+    
+    <div class="form-actions">
+      <button class="btn btn-primary" type="submit" [disabled]="!componentProperty.propertyName">
+        {{ isEdit ? 'Update' : 'Save' }}
+      </button>
+      <button class="btn" type="button" (click)="onCancel()">Cancel</button>
+    </div>
+  </form>
+</div>
\ No newline at end of file
diff --git a/frontend/angular-clarity-master/src/app/modules/main/builder/dashboardnew/chart-config/forms/component-property-form.component.scss b/frontend/angular-clarity-master/src/app/modules/main/builder/dashboardnew/chart-config/forms/component-property-form.component.scss
new file mode 100644
index 0000000..fa1b5ff
--- /dev/null
+++ b/frontend/angular-clarity-master/src/app/modules/main/builder/dashboardnew/chart-config/forms/component-property-form.component.scss
@@ -0,0 +1,12 @@
+.component-property-form {
+  padding: 20px;
+  background-color: #f9f9f9;
+  border-radius: 4px;
+  margin-bottom: 20px;
+}
+
+.form-actions {
+  margin-top: 20px;
+  display: flex;
+  gap: 10px;
+}
\ No newline at end of file
diff --git a/frontend/angular-clarity-master/src/app/modules/main/builder/dashboardnew/chart-config/forms/component-property-form.component.ts b/frontend/angular-clarity-master/src/app/modules/main/builder/dashboardnew/chart-config/forms/component-property-form.component.ts
new file mode 100644
index 0000000..84e135f
--- /dev/null
+++ b/frontend/angular-clarity-master/src/app/modules/main/builder/dashboardnew/chart-config/forms/component-property-form.component.ts
@@ -0,0 +1,31 @@
+import { Component, Input, Output, EventEmitter } from '@angular/core';
+import { ComponentProperty } from '../chart-config-manager.component';
+
+@Component({
+  selector: 'app-component-property-form',
+  templateUrl: './component-property-form.component.html',
+  styleUrls: ['./component-property-form.component.scss']
+})
+export class ComponentPropertyFormComponent {
+  @Input() componentProperty: Partial<ComponentProperty> = {};
+  @Input() isEdit = false;
+  @Output() save = new EventEmitter<Partial<ComponentProperty>>();
+  @Output() cancel = new EventEmitter<void>();
+
+  propertyTypes = [
+    'string',
+    'number',
+    'boolean',
+    'array',
+    'object',
+    'function'
+  ];
+
+  onSubmit(): void {
+    this.save.emit(this.componentProperty);
+  }
+
+  onCancel(): void {
+    this.cancel.emit();
+  }
+}
\ No newline at end of file
diff --git a/frontend/angular-clarity-master/src/app/modules/main/builder/dashboardnew/chart-config/forms/dynamic-field-form.component.html b/frontend/angular-clarity-master/src/app/modules/main/builder/dashboardnew/chart-config/forms/dynamic-field-form.component.html
new file mode 100644
index 0000000..4601665
--- /dev/null
+++ b/frontend/angular-clarity-master/src/app/modules/main/builder/dashboardnew/chart-config/forms/dynamic-field-form.component.html
@@ -0,0 +1,54 @@
+<div class="dynamic-field-form">
+  <form clrForm (ngSubmit)="onSubmit()" #dynamicFieldForm="ngForm">
+    <clr-input-container>
+      <label>Field Name <span class="required">*</span></label>
+      <input clrInput type="text" [(ngModel)]="dynamicField.fieldName" name="fieldName" required />
+    </clr-input-container>
+    
+    <clr-input-container>
+      <label>Field Label</label>
+      <input clrInput type="text" [(ngModel)]="dynamicField.fieldLabel" name="fieldLabel" />
+    </clr-input-container>
+    
+    <clr-select-container>
+      <label>Field Type</label>
+      <select clrSelect [(ngModel)]="dynamicField.fieldType" name="fieldType">
+        <option value="">Select a type</option>
+        <option *ngFor="let type of fieldTypes" [value]="type">{{ type | titlecase }}</option>
+      </select>
+    </clr-select-container>
+    
+    <clr-textarea-container>
+      <label>Field Options (JSON format)</label>
+      <textarea clrTextarea [(ngModel)]="dynamicField.fieldOptions" name="fieldOptions" rows="3" placeholder='{"option1": "Option 1", "option2": "Option 2"}'></textarea>
+    </clr-textarea-container>
+    
+    <clr-input-container>
+      <label>Sort Order</label>
+      <input clrInput type="number" [(ngModel)]="dynamicField.sortOrder" name="fieldSortOrder" />
+    </clr-input-container>
+    
+    <clr-checkbox-container>
+      <label>Is Required</label>
+      <clr-checkbox-wrapper>
+        <input type="checkbox" clrCheckbox [(ngModel)]="dynamicField.isRequired" name="fieldIsRequired" />
+        <label>Required</label>
+      </clr-checkbox-wrapper>
+    </clr-checkbox-container>
+    
+    <clr-checkbox-container>
+      <label>Show in UI</label>
+      <clr-checkbox-wrapper>
+        <input type="checkbox" clrCheckbox [(ngModel)]="dynamicField.showInUi" name="fieldShowInUi" />
+        <label>Show in UI</label>
+      </clr-checkbox-wrapper>
+    </clr-checkbox-container>
+    
+    <div class="form-actions">
+      <button class="btn btn-primary" type="submit" [disabled]="!dynamicField.fieldName">
+        {{ isEdit ? 'Update' : 'Save' }}
+      </button>
+      <button class="btn" type="button" (click)="onCancel()">Cancel</button>
+    </div>
+  </form>
+</div>
\ No newline at end of file
diff --git a/frontend/angular-clarity-master/src/app/modules/main/builder/dashboardnew/chart-config/forms/dynamic-field-form.component.scss b/frontend/angular-clarity-master/src/app/modules/main/builder/dashboardnew/chart-config/forms/dynamic-field-form.component.scss
new file mode 100644
index 0000000..7034d94
--- /dev/null
+++ b/frontend/angular-clarity-master/src/app/modules/main/builder/dashboardnew/chart-config/forms/dynamic-field-form.component.scss
@@ -0,0 +1,17 @@
+.dynamic-field-form {
+  padding: 20px;
+  background-color: #f9f9f9;
+  border-radius: 4px;
+  margin-bottom: 20px;
+}
+
+.form-actions {
+  margin-top: 20px;
+  display: flex;
+  gap: 10px;
+}
+
+textarea {
+  font-family: 'Courier New', monospace;
+  font-size: 12px;
+}
\ No newline at end of file
diff --git a/frontend/angular-clarity-master/src/app/modules/main/builder/dashboardnew/chart-config/forms/dynamic-field-form.component.ts b/frontend/angular-clarity-master/src/app/modules/main/builder/dashboardnew/chart-config/forms/dynamic-field-form.component.ts
new file mode 100644
index 0000000..e5b43fe
--- /dev/null
+++ b/frontend/angular-clarity-master/src/app/modules/main/builder/dashboardnew/chart-config/forms/dynamic-field-form.component.ts
@@ -0,0 +1,34 @@
+import { Component, Input, Output, EventEmitter } from '@angular/core';
+import { DynamicField } from '../chart-config-manager.component';
+
+@Component({
+  selector: 'app-dynamic-field-form',
+  templateUrl: './dynamic-field-form.component.html',
+  styleUrls: ['./dynamic-field-form.component.scss']
+})
+export class DynamicFieldFormComponent {
+  @Input() dynamicField: Partial<DynamicField> = {};
+  @Input() isEdit = false;
+  @Output() save = new EventEmitter<Partial<DynamicField>>();
+  @Output() cancel = new EventEmitter<void>();
+
+  fieldTypes = [
+    'text',
+    'number',
+    'email',
+    'password',
+    'date',
+    'select',
+    'checkbox',
+    'radio',
+    'textarea'
+  ];
+
+  onSubmit(): void {
+    this.save.emit(this.dynamicField);
+  }
+
+  onCancel(): void {
+    this.cancel.emit();
+  }
+}
\ No newline at end of file
diff --git a/frontend/angular-clarity-master/src/app/modules/main/builder/dashboardnew/chart-config/forms/ui-component-form.component.html b/frontend/angular-clarity-master/src/app/modules/main/builder/dashboardnew/chart-config/forms/ui-component-form.component.html
new file mode 100644
index 0000000..fbc9bed
--- /dev/null
+++ b/frontend/angular-clarity-master/src/app/modules/main/builder/dashboardnew/chart-config/forms/ui-component-form.component.html
@@ -0,0 +1,46 @@
+<div class="ui-component-form">
+  <form clrForm (ngSubmit)="onSubmit()" #uiComponentForm="ngForm">
+    <clr-input-container>
+      <label>Component Name <span class="required">*</span></label>
+      <input clrInput type="text" [(ngModel)]="uiComponent.componentName" name="componentName" required />
+    </clr-input-container>
+    
+    <clr-select-container>
+      <label>Component Type</label>
+      <select clrSelect [(ngModel)]="uiComponent.componentType" name="componentType">
+        <option value="">Select a type</option>
+        <option *ngFor="let type of componentTypes" [value]="type">{{ type | titlecase }}</option>
+      </select>
+    </clr-select-container>
+    
+    <clr-input-container>
+      <label>Display Label</label>
+      <input clrInput type="text" [(ngModel)]="uiComponent.displayLabel" name="displayLabel" />
+    </clr-input-container>
+    
+    <clr-input-container>
+      <label>Placeholder</label>
+      <input clrInput type="text" [(ngModel)]="uiComponent.placeholder" name="placeholder" />
+    </clr-input-container>
+    
+    <clr-input-container>
+      <label>Sort Order</label>
+      <input clrInput type="number" [(ngModel)]="uiComponent.sortOrder" name="sortOrder" />
+    </clr-input-container>
+    
+    <clr-checkbox-container>
+      <label>Is Required</label>
+      <clr-checkbox-wrapper>
+        <input type="checkbox" clrCheckbox [(ngModel)]="uiComponent.isRequired" name="isRequired" />
+        <label>Required</label>
+      </clr-checkbox-wrapper>
+    </clr-checkbox-container>
+    
+    <div class="form-actions">
+      <button class="btn btn-primary" type="submit" [disabled]="!uiComponent.componentName">
+        {{ isEdit ? 'Update' : 'Save' }}
+      </button>
+      <button class="btn" type="button" (click)="onCancel()">Cancel</button>
+    </div>
+  </form>
+</div>
\ No newline at end of file
diff --git a/frontend/angular-clarity-master/src/app/modules/main/builder/dashboardnew/chart-config/forms/ui-component-form.component.scss b/frontend/angular-clarity-master/src/app/modules/main/builder/dashboardnew/chart-config/forms/ui-component-form.component.scss
new file mode 100644
index 0000000..8cad11e
--- /dev/null
+++ b/frontend/angular-clarity-master/src/app/modules/main/builder/dashboardnew/chart-config/forms/ui-component-form.component.scss
@@ -0,0 +1,12 @@
+.ui-component-form {
+  padding: 20px;
+  background-color: #f9f9f9;
+  border-radius: 4px;
+  margin-bottom: 20px;
+}
+
+.form-actions {
+  margin-top: 20px;
+  display: flex;
+  gap: 10px;
+}
\ No newline at end of file
diff --git a/frontend/angular-clarity-master/src/app/modules/main/builder/dashboardnew/chart-config/forms/ui-component-form.component.ts b/frontend/angular-clarity-master/src/app/modules/main/builder/dashboardnew/chart-config/forms/ui-component-form.component.ts
new file mode 100644
index 0000000..edf7eff
--- /dev/null
+++ b/frontend/angular-clarity-master/src/app/modules/main/builder/dashboardnew/chart-config/forms/ui-component-form.component.ts
@@ -0,0 +1,33 @@
+import { Component, Input, Output, EventEmitter } from '@angular/core';
+import { UiComponent } from '../chart-config-manager.component';
+
+@Component({
+  selector: 'app-ui-component-form',
+  templateUrl: './ui-component-form.component.html',
+  styleUrls: ['./ui-component-form.component.scss']
+})
+export class UiComponentFormComponent {
+  @Input() uiComponent: Partial<UiComponent> = {};
+  @Input() isEdit = false;
+  @Output() save = new EventEmitter<Partial<UiComponent>>();
+  @Output() cancel = new EventEmitter<void>();
+
+  componentTypes = [
+    'input',
+    'select',
+    'checkbox',
+    'radio',
+    'textarea',
+    'datepicker',
+    'slider',
+    'toggle'
+  ];
+
+  onSubmit(): void {
+    this.save.emit(this.uiComponent);
+  }
+
+  onCancel(): void {
+    this.cancel.emit();
+  }
+}
\ No newline at end of file
diff --git a/frontend/angular-clarity-master/src/app/modules/main/builder/dashboardnew/chart-config/ui-component.service.ts b/frontend/angular-clarity-master/src/app/modules/main/builder/dashboardnew/chart-config/ui-component.service.ts
new file mode 100644
index 0000000..86afa27
--- /dev/null
+++ b/frontend/angular-clarity-master/src/app/modules/main/builder/dashboardnew/chart-config/ui-component.service.ts
@@ -0,0 +1,47 @@
+import { Injectable } from '@angular/core';
+import { Observable } from 'rxjs';
+import { ApiRequestService } from 'src/app/services/api/api-request.service';
+import { UiComponent } from './chart-config-manager.component';
+
+@Injectable({
+  providedIn: 'root'
+})
+export class UiComponentService {
+  private uiComponentsUrl = 'api/ui-components';
+
+  constructor(private apiRequest: ApiRequestService) { }
+
+  // Get all UI components for a chart type
+  getUiComponentsByChartType(chartTypeId: number): Observable<UiComponent[]> {
+    const url = `${this.uiComponentsUrl}/chart-type/${chartTypeId}`;
+    console.log(`Fetching UI components for chart type ${chartTypeId} from ${url}`);
+    return this.apiRequest.get(url);
+  }
+
+  // Get UI component by ID
+  getUiComponentById(id: number): Observable<UiComponent> {
+    const url = `${this.uiComponentsUrl}/${id}`;
+    console.log(`Fetching UI component ${id} from ${url}`);
+    return this.apiRequest.get(url);
+  }
+
+  // Create new UI component
+  createUiComponent(uiComponent: Partial<UiComponent>): Observable<UiComponent> {
+    console.log('Creating UI component:', uiComponent);
+    return this.apiRequest.post(this.uiComponentsUrl, uiComponent);
+  }
+
+  // Update UI component
+  updateUiComponent(id: number, uiComponent: UiComponent): Observable<UiComponent> {
+    const url = `${this.uiComponentsUrl}/${id}`;
+    console.log(`Updating UI component ${id}:`, uiComponent);
+    return this.apiRequest.put(url, uiComponent);
+  }
+
+  // Delete UI component
+  deleteUiComponent(id: number): Observable<void> {
+    const url = `${this.uiComponentsUrl}/${id}`;
+    console.log(`Deleting UI component ${id}`);
+    return this.apiRequest.delete(url);
+  }
+}
\ No newline at end of file
diff --git a/frontend/angular-clarity-master/src/app/modules/main/builder/dashboardnew/chart-type-manager/add-chart-type.component.html b/frontend/angular-clarity-master/src/app/modules/main/builder/dashboardnew/chart-type-manager/add-chart-type.component.html
new file mode 100644
index 0000000..71f17f9
--- /dev/null
+++ b/frontend/angular-clarity-master/src/app/modules/main/builder/dashboardnew/chart-type-manager/add-chart-type.component.html
@@ -0,0 +1,76 @@
+<div class="add-chart-type-page">
+  <div class="header">
+    <h2>Add New Chart Type</h2>
+  </div>
+
+  <!-- Error and Success Messages -->
+  <div class="alert alert-danger" *ngIf="errorMessage">
+    <button type="button" class="close" aria-label="Close" (click)="errorMessage = null">
+      <cds-icon shape="close"></cds-icon>
+    </button>
+    <div class="alert-item">
+      <span class="alert-text">{{ errorMessage }}</span>
+    </div>
+  </div>
+
+  <div class="alert alert-success" *ngIf="successMessage">
+    <button type="button" class="close" aria-label="Close" (click)="successMessage = null">
+      <cds-icon shape="close"></cds-icon>
+    </button>
+    <div class="alert-item">
+      <span class="alert-text">{{ successMessage }}</span>
+    </div>
+  </div>
+
+  <div class="card">
+    <div class="card-block">
+      <form clrForm (ngSubmit)="createChartType()" #addChartTypeForm="ngForm">
+        <clr-input-container>
+          <label>Name <span class="required">*</span></label>
+          <input clrInput type="text" [(ngModel)]="chartType.name" name="chartTypeName" required />
+          <clr-control-helper>Enter a unique name for the chart type (e.g., "line-chart", "bar-chart")</clr-control-helper>
+        </clr-input-container>
+
+        <clr-input-container>
+          <label>Display Name</label>
+          <input clrInput type="text" [(ngModel)]="chartType.displayName" name="chartTypeDisplayName" />
+          <clr-control-helper>This is the user-friendly name shown in the UI</clr-control-helper>
+        </clr-input-container>
+
+        <clr-textarea-container>
+          <label>Description</label>
+          <textarea clrTextarea [(ngModel)]="chartType.description" name="chartTypeDescription" rows="3"></textarea>
+          <clr-control-helper>Provide a detailed description of this chart type and when to use it</clr-control-helper>
+        </clr-textarea-container>
+
+        <clr-checkbox-container>
+          <label>Is Active</label>
+          <clr-checkbox-wrapper>
+            <input type="checkbox" clrCheckbox [(ngModel)]="chartType.isActive" name="chartTypeIsActive" />
+            <label>Active</label>
+          </clr-checkbox-wrapper>
+          <clr-control-helper>Deactivate chart types that should not be available for selection</clr-control-helper>
+        </clr-checkbox-container>
+
+        <div class="form-actions">
+          <button class="btn btn-primary" type="submit" [disabled]="!chartType.name || loadingState === ClrLoadingState.LOADING">
+            <clr-spinner *ngIf="loadingState === ClrLoadingState.LOADING" clrSmall clrInline></clr-spinner>
+            Create Chart Type
+          </button>
+          <button class="btn" type="button" (click)="onCancel()">Cancel</button>
+        </div>
+      </form>
+    </div>
+  </div>
+
+  <div class="info-section">
+    <h4>About Chart Types</h4>
+    <p>Chart types define the different visualization options available in the dashboard builder. Each chart type can have:</p>
+    <ul>
+      <li>Associated UI components that define the configuration form</li>
+      <li>Templates that define how the chart is rendered</li>
+      <li>Dynamic fields that capture specific configuration parameters</li>
+    </ul>
+    <p>After creating a chart type, you can configure its components, templates, and fields in the chart configuration manager.</p>
+  </div>
+</div>
\ No newline at end of file
diff --git a/frontend/angular-clarity-master/src/app/modules/main/builder/dashboardnew/chart-type-manager/add-chart-type.component.scss b/frontend/angular-clarity-master/src/app/modules/main/builder/dashboardnew/chart-type-manager/add-chart-type.component.scss
new file mode 100644
index 0000000..ed422e0
--- /dev/null
+++ b/frontend/angular-clarity-master/src/app/modules/main/builder/dashboardnew/chart-type-manager/add-chart-type.component.scss
@@ -0,0 +1,65 @@
+.add-chart-type-page {
+  padding: 20px;
+  max-width: 800px;
+  margin: 0 auto;
+
+  .header {
+    margin-bottom: 20px;
+    h2 {
+      color: #0079b8;
+      font-weight: 300;
+    }
+  }
+
+  .card {
+    margin-bottom: 20px;
+    box-shadow: 0 2px 8px rgba(0, 0, 0, 0.1);
+    
+    .card-block {
+      padding: 20px;
+    }
+  }
+
+  .form-actions {
+    margin-top: 20px;
+    display: flex;
+    gap: 10px;
+  }
+
+  .info-section {
+    background-color: #f6f6f6;
+    border-left: 4px solid #0079b8;
+    padding: 15px;
+    border-radius: 4px;
+    
+    h4 {
+      margin-top: 0;
+      color: #0079b8;
+    }
+    
+    ul {
+      padding-left: 20px;
+      
+      li {
+        margin-bottom: 8px;
+      }
+    }
+    
+    p {
+      margin: 10px 0;
+    }
+  }
+
+  @media (max-width: 768px) {
+    padding: 10px;
+    
+    .form-actions {
+      flex-direction: column;
+      
+      button {
+        width: 100%;
+        margin-bottom: 10px;
+      }
+    }
+  }
+}
\ No newline at end of file
diff --git a/frontend/angular-clarity-master/src/app/modules/main/builder/dashboardnew/chart-type-manager/add-chart-type.component.ts b/frontend/angular-clarity-master/src/app/modules/main/builder/dashboardnew/chart-type-manager/add-chart-type.component.ts
new file mode 100644
index 0000000..2edd075
--- /dev/null
+++ b/frontend/angular-clarity-master/src/app/modules/main/builder/dashboardnew/chart-type-manager/add-chart-type.component.ts
@@ -0,0 +1,70 @@
+import { Component } from '@angular/core';
+import { Router } from '@angular/router';
+import { ClrLoadingState } from '@clr/angular';
+import { ChartType, ChartTypeService } from './chart-type.service';
+
+@Component({
+  selector: 'app-add-chart-type',
+  templateUrl: './add-chart-type.component.html',
+  styleUrls: ['./add-chart-type.component.scss']
+})
+export class AddChartTypeComponent {
+  chartType: Partial<ChartType> = {
+    isActive: true
+  };
+  loadingState: ClrLoadingState = ClrLoadingState.DEFAULT;
+  errorMessage: string | null = null;
+  successMessage: string | null = null;
+
+  // Make ClrLoadingState available to template
+  readonly ClrLoadingState = ClrLoadingState;
+
+  constructor(
+    private chartTypeService: ChartTypeService,
+    private router: Router
+  ) { }
+
+  // Show error message
+  private showError(message: string): void {
+    this.errorMessage = message;
+    setTimeout(() => {
+      this.errorMessage = null;
+    }, 5000);
+  }
+
+  // Show success message
+  private showSuccess(message: string): void {
+    this.successMessage = message;
+    setTimeout(() => {
+      this.successMessage = null;
+    }, 3000);
+  }
+
+  createChartType(): void {
+    if (!this.chartType.name) {
+      this.showError('Chart type name is required');
+      return;
+    }
+
+    this.loadingState = ClrLoadingState.LOADING;
+    this.chartTypeService.createChartType(this.chartType).subscribe({
+      next: (data) => {
+        this.showSuccess('Chart type created successfully');
+        this.loadingState = ClrLoadingState.SUCCESS;
+        // Redirect to chart types list after a short delay
+        setTimeout(() => {
+          this.router.navigate(['/cns-portal/dashboardbuilder/chart-types']);
+        }, 1500);
+      },
+      error: (error) => {
+        console.error('Error creating chart type:', error);
+        this.showError('Error creating chart type: ' + (error.error?.message || error.message || 'Unknown error'));
+        this.loadingState = ClrLoadingState.ERROR;
+      }
+    });
+  }
+
+  onCancel(): void {
+    this.router.navigate(['/cns-portal/dashboardbuilder/chart-types']);
+  }
+}
\ No newline at end of file
diff --git a/frontend/angular-clarity-master/src/app/modules/main/builder/dashboardnew/chart-type-manager/chart-type-fields.component.html b/frontend/angular-clarity-master/src/app/modules/main/builder/dashboardnew/chart-type-manager/chart-type-fields.component.html
new file mode 100644
index 0000000..6ede91b
--- /dev/null
+++ b/frontend/angular-clarity-master/src/app/modules/main/builder/dashboardnew/chart-type-manager/chart-type-fields.component.html
@@ -0,0 +1,222 @@
+<div class="chart-type-fields-page">
+  <div class="header">
+    <h2>
+      <button class="btn btn-link back-button" (click)="goBack()">
+        <cds-icon shape="arrow" direction="left"></cds-icon>
+      </button>
+      Dynamic Fields for {{ chartType?.name || 'Chart Type' }}
+    </h2>
+  </div>
+
+  <!-- Error and Success Messages -->
+  <div class="alert alert-danger" *ngIf="errorMessage">
+    <button type="button" class="close" aria-label="Close" (click)="errorMessage = null">
+      <cds-icon shape="close"></cds-icon>
+    </button>
+    <div class="alert-item">
+      <span class="alert-text">{{ errorMessage }}</span>
+    </div>
+  </div>
+
+  <div class="alert alert-success" *ngIf="successMessage">
+    <button type="button" class="close" aria-label="Close" (click)="successMessage = null">
+      <cds-icon shape="close"></cds-icon>
+    </button>
+    <div class="alert-item">
+      <span class="alert-text">{{ successMessage }}</span>
+    </div>
+  </div>
+
+  <!-- Add Dynamic Field Form -->
+  <div class="card" *ngIf="showAddForm">
+    <div class="card-header">
+      <h3>Add New Dynamic Field</h3>
+    </div>
+    <div class="card-block">
+      <form clrForm (ngSubmit)="createDynamicField()" #addDynamicFieldForm="ngForm">
+        <clr-input-container>
+          <label>Field Name <span class="required">*</span></label>
+          <input clrInput type="text" [(ngModel)]="newDynamicField.fieldName" name="fieldName" required />
+          <clr-control-helper>Enter a unique name for the dynamic field (e.g., "chart-title", "x-axis-label")</clr-control-helper>
+        </clr-input-container>
+
+        <clr-input-container>
+          <label>Field Label</label>
+          <input clrInput type="text" [(ngModel)]="newDynamicField.fieldLabel" name="fieldLabel" />
+          <clr-control-helper>User-friendly label shown in the configuration form</clr-control-helper>
+        </clr-input-container>
+
+        <clr-input-container>
+          <label>Field Type</label>
+          <input clrInput type="text" [(ngModel)]="newDynamicField.fieldType" name="fieldType" />
+          <clr-control-helper>Type of the field (e.g., "string", "number", "boolean")</clr-control-helper>
+        </clr-input-container>
+
+        <clr-textarea-container>
+          <label>Field Options</label>
+          <textarea clrTextarea [(ngModel)]="newDynamicField.fieldOptions" name="fieldOptions" rows="3"></textarea>
+          <clr-control-helper>JSON options for the field (for select fields, etc.)</clr-control-helper>
+        </clr-textarea-container>
+
+        <clr-input-container>
+          <label>Sort Order</label>
+          <input clrInput type="number" [(ngModel)]="newDynamicField.sortOrder" name="fieldSortOrder" />
+          <clr-control-helper>Order in which fields appear in the form</clr-control-helper>
+        </clr-input-container>
+
+        <clr-checkbox-container>
+          <label>Is Required</label>
+          <clr-checkbox-wrapper>
+            <input type="checkbox" clrCheckbox [(ngModel)]="newDynamicField.isRequired" name="fieldIsRequired" />
+            <label>Required</label>
+          </clr-checkbox-wrapper>
+          <clr-control-helper>Mark as required if this field must be filled</clr-control-helper>
+        </clr-checkbox-container>
+
+        <clr-checkbox-container>
+          <label>Show in UI</label>
+          <clr-checkbox-wrapper>
+            <input type="checkbox" clrCheckbox [(ngModel)]="newDynamicField.showInUi" name="fieldShowInUi" />
+            <label>Visible</label>
+          </clr-checkbox-wrapper>
+          <clr-control-helper>Uncheck to hide this field in the configuration form</clr-control-helper>
+        </clr-checkbox-container>
+
+        <div class="form-actions">
+          <button class="btn btn-primary" type="submit" [disabled]="!newDynamicField.fieldName || loadingState === ClrLoadingState.LOADING">
+            <clr-spinner *ngIf="loadingState === ClrLoadingState.LOADING" clrSmall clrInline></clr-spinner>
+            Create Dynamic Field
+          </button>
+          <button class="btn" type="button" (click)="showAddForm = false">Cancel</button>
+        </div>
+      </form>
+    </div>
+  </div>
+
+  <!-- Dynamic Fields Grid -->
+  <div class="card">
+    <div class="card-header">
+      <div class="clr-row">
+        <div class="clr-col">
+          <h3>Dynamic Fields</h3>
+        </div>
+        <div class="clr-col" style="text-align: right;">
+          <button class="btn btn-primary" (click)="showAddForm = true">
+            <cds-icon shape="plus"></cds-icon> Add Dynamic Field
+          </button>
+        </div>
+      </div>
+    </div>
+
+    <div class="card-block">
+      <clr-datagrid [clrDgLoading]="loadingState === ClrLoadingState.LOADING">
+        <clr-dg-column>Field Name</clr-dg-column>
+        <clr-dg-column>Field Label</clr-dg-column>
+        <clr-dg-column>Field Type</clr-dg-column>
+        <clr-dg-column>Required</clr-dg-column>
+        <clr-dg-column>Visible</clr-dg-column>
+        <clr-dg-column>Sort Order</clr-dg-column>
+        <clr-dg-column>Actions</clr-dg-column>
+
+        <clr-dg-row *clrDgItems="let dynamicField of dynamicFields" [clrDgItem]="dynamicField">
+          <clr-dg-cell>{{dynamicField.fieldName}}</clr-dg-cell>
+          <clr-dg-cell>{{dynamicField.fieldLabel}}</clr-dg-cell>
+          <clr-dg-cell>{{dynamicField.fieldType}}</clr-dg-cell>
+          <clr-dg-cell>
+            <span class="label" [class.label-success]="dynamicField.isRequired" [class.label-danger]="!dynamicField.isRequired">
+              {{dynamicField.isRequired ? 'Yes' : 'No'}}
+            </span>
+          </clr-dg-cell>
+          <clr-dg-cell>
+            <span class="label" [class.label-success]="dynamicField.showInUi" [class.label-danger]="!dynamicField.showInUi">
+              {{dynamicField.showInUi ? 'Yes' : 'No'}}
+            </span>
+          </clr-dg-cell>
+          <clr-dg-cell>{{dynamicField.sortOrder}}</clr-dg-cell>
+          <clr-dg-cell>
+            <button class="btn btn-sm btn-icon" (click)="selectDynamicFieldForEdit(dynamicField)" title="Edit">
+              <cds-icon shape="pencil"></cds-icon>
+            </button>
+            <button class="btn btn-sm btn-icon" (click)="deleteDynamicField(dynamicField.id)" title="Delete">
+              <cds-icon shape="trash"></cds-icon>
+            </button>
+          </clr-dg-cell>
+        </clr-dg-row>
+
+        <clr-dg-footer>
+          {{dynamicFields.length}} dynamic field(s)
+        </clr-dg-footer>
+      </clr-datagrid>
+    </div>
+  </div>
+
+  <!-- Edit Dynamic Field Form -->
+  <div class="card" *ngIf="selectedDynamicField">
+    <div class="card-header">
+      <h3>Edit Dynamic Field</h3>
+    </div>
+    <div class="card-block">
+      <form clrForm (ngSubmit)="updateDynamicField()" #editDynamicFieldForm="ngForm">
+        <clr-input-container>
+          <label>Field Name <span class="required">*</span></label>
+          <input clrInput type="text" [(ngModel)]="selectedDynamicField.fieldName" name="editFieldName" required />
+        </clr-input-container>
+
+        <clr-input-container>
+          <label>Field Label</label>
+          <input clrInput type="text" [(ngModel)]="selectedDynamicField.fieldLabel" name="editFieldLabel" />
+        </clr-input-container>
+
+        <clr-input-container>
+          <label>Field Type</label>
+          <input clrInput type="text" [(ngModel)]="selectedDynamicField.fieldType" name="editFieldType" />
+        </clr-input-container>
+
+        <clr-textarea-container>
+          <label>Field Options</label>
+          <textarea clrTextarea [(ngModel)]="selectedDynamicField.fieldOptions" name="editFieldOptions" rows="3"></textarea>
+        </clr-textarea-container>
+
+        <clr-input-container>
+          <label>Sort Order</label>
+          <input clrInput type="number" [(ngModel)]="selectedDynamicField.sortOrder" name="editFieldSortOrder" />
+        </clr-input-container>
+
+        <clr-checkbox-container>
+          <label>Is Required</label>
+          <clr-checkbox-wrapper>
+            <input type="checkbox" clrCheckbox [(ngModel)]="selectedDynamicField.isRequired" name="editFieldIsRequired" />
+            <label>Required</label>
+          </clr-checkbox-wrapper>
+        </clr-checkbox-container>
+
+        <clr-checkbox-container>
+          <label>Show in UI</label>
+          <clr-checkbox-wrapper>
+            <input type="checkbox" clrCheckbox [(ngModel)]="selectedDynamicField.showInUi" name="editFieldShowInUi" />
+            <label>Visible</label>
+          </clr-checkbox-wrapper>
+        </clr-checkbox-container>
+
+        <div class="form-actions">
+          <button class="btn btn-primary" type="submit" [disabled]="!selectedDynamicField.fieldName || loadingState === ClrLoadingState.LOADING">
+            <clr-spinner *ngIf="loadingState === ClrLoadingState.LOADING" clrSmall clrInline></clr-spinner>
+            Update Dynamic Field
+          </button>
+          <button class="btn" type="button" (click)="selectedDynamicField = null">Cancel</button>
+        </div>
+      </form>
+    </div>
+  </div>
+
+  <div class="info-section">
+    <h4>About Dynamic Fields</h4>
+    <p>Dynamic fields define the configurable parameters for a chart type. Each field represents:</p>
+    <ul>
+      <li>A configuration option that can be set when creating or editing a chart</li>
+      <li>Metadata like type, label, and validation rules</li>
+      <li>Visibility and requirement settings</li>
+    </ul>
+    <p>Dynamic fields allow you to create flexible chart configurations that can be customized per instance.</p>
+  </div>
+</div>
\ No newline at end of file
diff --git a/frontend/angular-clarity-master/src/app/modules/main/builder/dashboardnew/chart-type-manager/chart-type-fields.component.scss b/frontend/angular-clarity-master/src/app/modules/main/builder/dashboardnew/chart-type-manager/chart-type-fields.component.scss
new file mode 100644
index 0000000..16e28cf
--- /dev/null
+++ b/frontend/angular-clarity-master/src/app/modules/main/builder/dashboardnew/chart-type-manager/chart-type-fields.component.scss
@@ -0,0 +1,128 @@
+.chart-type-fields-page {
+  padding: 20px;
+  max-width: 1200px;
+  margin: 0 auto;
+
+  .header {
+    margin-bottom: 20px;
+    display: flex;
+    align-items: center;
+    
+    h2 {
+      color: #0079b8;
+      font-weight: 300;
+      display: flex;
+      align-items: center;
+      gap: 10px;
+    }
+    
+    .back-button {
+      padding: 0;
+      cds-icon {
+        width: 24px;
+        height: 24px;
+      }
+    }
+  }
+
+  .card {
+    margin-bottom: 20px;
+    box-shadow: 0 2px 8px rgba(0, 0, 0, 0.1);
+    
+    .card-block {
+      padding: 20px;
+    }
+    
+    .card-header {
+      h3 {
+        margin: 0;
+        color: #0079b8;
+      }
+    }
+  }
+
+  .form-actions {
+    margin-top: 20px;
+    display: flex;
+    gap: 10px;
+  }
+
+  .label {
+    padding: 4px 8px;
+    border-radius: 12px;
+    font-size: 12px;
+    font-weight: bold;
+    
+    &.label-success {
+      background-color: #3d9970;
+      color: white;
+    }
+    
+    &.label-danger {
+      background-color: #d32f2f;
+      color: white;
+    }
+  }
+
+  clr-datagrid {
+    margin-top: 10px;
+    
+    clr-dg-cell {
+      &:first-child {
+        font-weight: 500;
+      }
+    }
+  }
+
+  .btn-icon {
+    margin-right: 5px;
+  }
+
+  .info-section {
+    background-color: #f6f6f6;
+    border-left: 4px solid #0079b8;
+    padding: 15px;
+    border-radius: 4px;
+    
+    h4 {
+      margin-top: 0;
+      color: #0079b8;
+    }
+    
+    ul {
+      padding-left: 20px;
+      
+      li {
+        margin-bottom: 8px;
+      }
+    }
+    
+    p {
+      margin: 10px 0;
+    }
+  }
+
+  @media (max-width: 768px) {
+    padding: 10px;
+    
+    .form-actions {
+      flex-direction: column;
+      
+      button {
+        width: 100%;
+        margin-bottom: 10px;
+      }
+    }
+    
+    .card-header {
+      .clr-row {
+        flex-direction: column;
+        
+        .clr-col {
+          text-align: left !important;
+          margin-bottom: 10px;
+        }
+      }
+    }
+  }
+}
\ No newline at end of file
diff --git a/frontend/angular-clarity-master/src/app/modules/main/builder/dashboardnew/chart-type-manager/chart-type-fields.component.ts b/frontend/angular-clarity-master/src/app/modules/main/builder/dashboardnew/chart-type-manager/chart-type-fields.component.ts
new file mode 100644
index 0000000..782f5c5
--- /dev/null
+++ b/frontend/angular-clarity-master/src/app/modules/main/builder/dashboardnew/chart-type-manager/chart-type-fields.component.ts
@@ -0,0 +1,181 @@
+import { Component, OnInit } from '@angular/core';
+import { ActivatedRoute, Router } from '@angular/router';
+import { ClrLoadingState } from '@clr/angular';
+import { ChartType, ChartTypeService } from './chart-type.service';
+import { DynamicField } from '../chart-config/chart-config-manager.component';
+import { DynamicFieldService } from '../chart-config/dynamic-field.service';
+
+@Component({
+  selector: 'app-chart-type-fields',
+  templateUrl: './chart-type-fields.component.html',
+  styleUrls: ['./chart-type-fields.component.scss']
+})
+export class ChartTypeFieldsComponent implements OnInit {
+  chartType: ChartType | null = null;
+  dynamicFields: DynamicField[] = [];
+  newDynamicField: Partial<DynamicField> = {
+    isRequired: false,
+    showInUi: true
+  };
+  selectedDynamicField: DynamicField | null = null;
+  showAddForm = false;
+  
+  loadingState: ClrLoadingState = ClrLoadingState.DEFAULT;
+  errorMessage: string | null = null;
+  successMessage: string | null = null;
+
+  // Make ClrLoadingState available to template
+  readonly ClrLoadingState = ClrLoadingState;
+
+  constructor(
+    private chartTypeService: ChartTypeService,
+    private dynamicFieldService: DynamicFieldService,
+    private route: ActivatedRoute,
+    private router: Router
+  ) { }
+
+  ngOnInit(): void {
+    const chartTypeId = Number(this.route.snapshot.paramMap.get('id'));
+    if (chartTypeId) {
+      this.loadChartType(chartTypeId);
+      this.loadDynamicFields(chartTypeId);
+    } else {
+      this.showError('Invalid chart type ID');
+    }
+  }
+
+  // Show error message
+  private showError(message: string): void {
+    this.errorMessage = message;
+    setTimeout(() => {
+      this.errorMessage = null;
+    }, 5000);
+  }
+
+  // Show success message
+  private showSuccess(message: string): void {
+    this.successMessage = message;
+    setTimeout(() => {
+      this.successMessage = null;
+    }, 3000);
+  }
+
+  loadChartType(id: number): void {
+    this.chartTypeService.getChartTypeById(id).subscribe({
+      next: (data) => {
+        this.chartType = data;
+      },
+      error: (error) => {
+        console.error('Error loading chart type:', error);
+        this.showError('Error loading chart type: ' + (error.error?.message || error.message || 'Unknown error'));
+      }
+    });
+  }
+
+  loadDynamicFields(chartTypeId: number): void {
+    this.loadingState = ClrLoadingState.LOADING;
+    this.dynamicFieldService.getDynamicFieldsByChartType(chartTypeId).subscribe({
+      next: (data) => {
+        this.dynamicFields = data;
+        this.loadingState = ClrLoadingState.SUCCESS;
+      },
+      error: (error) => {
+        console.error('Error loading dynamic fields:', error);
+        this.showError('Error loading dynamic fields: ' + (error.error?.message || error.message || 'Unknown error'));
+        this.loadingState = ClrLoadingState.ERROR;
+      }
+    });
+  }
+
+  createDynamicField(): void {
+    if (!this.chartType || !this.newDynamicField.fieldName) {
+      this.showError('Field name is required');
+      return;
+    }
+
+    // Create a copy without the chartType property
+    const fieldData: Partial<DynamicField> = {
+      fieldName: this.newDynamicField.fieldName,
+      fieldLabel: this.newDynamicField.fieldLabel,
+      fieldType: this.newDynamicField.fieldType,
+      fieldOptions: this.newDynamicField.fieldOptions,
+      isRequired: this.newDynamicField.isRequired,
+      showInUi: this.newDynamicField.showInUi,
+      sortOrder: this.newDynamicField.sortOrder
+    };
+
+    this.loadingState = ClrLoadingState.LOADING;
+    this.dynamicFieldService.createDynamicField(fieldData, this.chartType.id).subscribe({
+      next: (data) => {
+        this.dynamicFields.push(data);
+        this.newDynamicField = { isRequired: false, showInUi: true };
+        this.showAddForm = false;
+        this.showSuccess('Dynamic field created successfully');
+        this.loadingState = ClrLoadingState.SUCCESS;
+      },
+      error: (error) => {
+        console.error('Error creating dynamic field:', error);
+        this.showError('Error creating dynamic field: ' + (error.error?.message || error.message || 'Unknown error'));
+        this.loadingState = ClrLoadingState.ERROR;
+      }
+    });
+  }
+
+  updateDynamicField(): void {
+    if (!this.selectedDynamicField || !this.selectedDynamicField.fieldName) {
+      this.showError('Field name is required');
+      return;
+    }
+
+    console.log('Updating dynamic field:', this.selectedDynamicField);
+    this.loadingState = ClrLoadingState.LOADING;
+    this.dynamicFieldService.updateDynamicField(this.selectedDynamicField.id, this.selectedDynamicField).subscribe({
+      next: (data) => {
+        const index = this.dynamicFields.findIndex(df => df.id === data.id);
+        if (index !== -1) {
+          this.dynamicFields[index] = data;
+        }
+        this.selectedDynamicField = null;
+        this.showSuccess('Dynamic field updated successfully');
+        this.loadingState = ClrLoadingState.SUCCESS;
+      },
+      error: (error) => {
+        console.error('Error updating dynamic field:', error);
+        this.showError('Error updating dynamic field: ' + (error.error?.message || error.message || 'Unknown error'));
+        this.loadingState = ClrLoadingState.ERROR;
+      }
+    });
+  }
+
+  deleteDynamicField(id: number): void {
+    if (!confirm('Are you sure you want to delete this dynamic field?')) {
+      return;
+    }
+
+    this.loadingState = ClrLoadingState.LOADING;
+    this.dynamicFieldService.deleteDynamicField(id).subscribe({
+      next: () => {
+        this.dynamicFields = this.dynamicFields.filter(df => df.id !== id);
+        this.showSuccess('Dynamic field deleted successfully');
+        this.loadingState = ClrLoadingState.SUCCESS;
+      },
+      error: (error) => {
+        console.error('Error deleting dynamic field:', error);
+        this.showError('Error deleting dynamic field: ' + (error.error?.message || error.message || 'Unknown error'));
+        this.loadingState = ClrLoadingState.ERROR;
+      }
+    });
+  }
+
+  selectDynamicFieldForEdit(dynamicField: DynamicField): void {
+    this.selectedDynamicField = { ...dynamicField };
+  }
+
+  goBack(): void {
+    if (this.chartType) {
+      this.router.navigate(['/cns-portal/dashboardbuilder/chart-types/edit', this.chartType.id]);
+    } else {
+      this.router.navigate(['/cns-portal/dashboardbuilder/chart-types']);
+    }
+  }
+}
\ No newline at end of file
diff --git a/frontend/angular-clarity-master/src/app/modules/main/builder/dashboardnew/chart-type-manager/chart-type-manager.component.html b/frontend/angular-clarity-master/src/app/modules/main/builder/dashboardnew/chart-type-manager/chart-type-manager.component.html
new file mode 100644
index 0000000..50e56aa
--- /dev/null
+++ b/frontend/angular-clarity-master/src/app/modules/main/builder/dashboardnew/chart-type-manager/chart-type-manager.component.html
@@ -0,0 +1,75 @@
+<div class="chart-type-manager">
+  <h2>Chart Type Management</h2>
+  
+  <!-- Error and Success Messages -->
+  <div class="alert alert-danger" *ngIf="errorMessage">
+    <button type="button" class="close" aria-label="Close" (click)="errorMessage = null">
+      <cds-icon shape="close"></cds-icon>
+    </button>
+    <div class="alert-item">
+      <span class="alert-text">{{ errorMessage }}</span>
+    </div>
+  </div>
+  
+  <div class="alert alert-success" *ngIf="successMessage">
+    <button type="button" class="close" aria-label="Close" (click)="successMessage = null">
+      <cds-icon shape="close"></cds-icon>
+    </button>
+    <div class="alert-item">
+      <span class="alert-text">{{ successMessage }}</span>
+    </div>
+  </div>
+  
+  <!-- Chart Types Grid -->
+  <div class="card">
+    <div class="card-header">
+      <div class="clr-row">
+        <div class="clr-col">
+          <h3>Chart Types</h3>
+        </div>
+        <div class="clr-col" style="text-align: right;">
+          <button class="btn btn-primary" [routerLink]="['/cns-portal/dashboardbuilder/chart-types/add']">
+            <cds-icon shape="plus"></cds-icon> Add Chart Type
+          </button>
+        </div>
+      </div>
+    </div>
+    
+    <div class="card-block">
+      <clr-datagrid [clrDgLoading]="chartTypeLoadingState === ClrLoadingState.LOADING">
+        <clr-dg-column>Name</clr-dg-column>
+        <clr-dg-column>Display Name</clr-dg-column>
+        <clr-dg-column>Description</clr-dg-column>
+        <clr-dg-column>Status</clr-dg-column>
+        <clr-dg-column>Created At</clr-dg-column>
+        <clr-dg-column>Updated At</clr-dg-column>
+        <clr-dg-column>Actions</clr-dg-column>
+        
+        <clr-dg-row *clrDgItems="let chartType of chartTypes" [clrDgItem]="chartType">
+          <clr-dg-cell>{{chartType.name}}</clr-dg-cell>
+          <clr-dg-cell>{{chartType.displayName}}</clr-dg-cell>
+          <clr-dg-cell>{{chartType.description}}</clr-dg-cell>
+          <clr-dg-cell>
+            <span class="label" [class.label-success]="chartType.isActive" [class.label-danger]="!chartType.isActive">
+              {{chartType.isActive ? 'Active' : 'Inactive'}}
+            </span>
+          </clr-dg-cell>
+          <clr-dg-cell>{{chartType.createdAt ? (chartType.createdAt | date:'short') : 'N/A'}}</clr-dg-cell>
+          <clr-dg-cell>{{chartType.updatedAt ? (chartType.updatedAt | date:'short') : 'N/A'}}</clr-dg-cell>
+          <clr-dg-cell>
+            <button class="btn btn-sm btn-icon" [routerLink]="['/cns-portal/dashboardbuilder/chart-types/edit', chartType.id]" title="Edit">
+              <cds-icon shape="pencil"></cds-icon>
+            </button>
+            <button class="btn btn-sm btn-icon" (click)="deleteChartType(chartType.id)" title="Delete">
+              <cds-icon shape="trash"></cds-icon>
+            </button>
+          </clr-dg-cell>
+        </clr-dg-row>
+        
+        <clr-dg-footer>
+          {{chartTypes.length}} chart type(s)
+        </clr-dg-footer>
+      </clr-datagrid>
+    </div>
+  </div>
+</div>
\ No newline at end of file
diff --git a/frontend/angular-clarity-master/src/app/modules/main/builder/dashboardnew/chart-type-manager/chart-type-manager.component.scss b/frontend/angular-clarity-master/src/app/modules/main/builder/dashboardnew/chart-type-manager/chart-type-manager.component.scss
new file mode 100644
index 0000000..bdc412a
--- /dev/null
+++ b/frontend/angular-clarity-master/src/app/modules/main/builder/dashboardnew/chart-type-manager/chart-type-manager.component.scss
@@ -0,0 +1,71 @@
+.chart-type-manager {
+  padding: 20px;
+
+  h2 {
+    color: #0079b8;
+    font-weight: 300;
+    margin-bottom: 20px;
+  }
+
+  .card {
+    margin-bottom: 20px;
+    box-shadow: 0 2px 8px rgba(0, 0, 0, 0.1);
+    
+    .card-header {
+      h3 {
+        margin: 0;
+        color: #0079b8;
+      }
+    }
+    
+    .card-block {
+      padding: 20px;
+    }
+  }
+
+  .label {
+    padding: 4px 8px;
+    border-radius: 12px;
+    font-size: 12px;
+    font-weight: bold;
+    
+    &.label-success {
+      background-color: #3d9970;
+      color: white;
+    }
+    
+    &.label-danger {
+      background-color: #d32f2f;
+      color: white;
+    }
+  }
+
+  clr-datagrid {
+    margin-top: 10px;
+    
+    clr-dg-cell {
+      &:first-child {
+        font-weight: 500;
+      }
+    }
+  }
+
+  .btn-icon {
+    margin-right: 5px;
+  }
+
+  @media (max-width: 768px) {
+    padding: 10px;
+    
+    .card-header {
+      .clr-row {
+        flex-direction: column;
+        
+        .clr-col {
+          text-align: left !important;
+          margin-bottom: 10px;
+        }
+      }
+    }
+  }
+}
\ No newline at end of file
diff --git a/frontend/angular-clarity-master/src/app/modules/main/builder/dashboardnew/chart-type-manager/chart-type-manager.component.ts b/frontend/angular-clarity-master/src/app/modules/main/builder/dashboardnew/chart-type-manager/chart-type-manager.component.ts
new file mode 100644
index 0000000..3640074
--- /dev/null
+++ b/frontend/angular-clarity-master/src/app/modules/main/builder/dashboardnew/chart-type-manager/chart-type-manager.component.ts
@@ -0,0 +1,115 @@
+import { Component, OnInit } from '@angular/core';
+import { ClrLoadingState } from '@clr/angular';
+import { ChartType, ChartTypeService } from './chart-type.service';
+
+@Component({
+  selector: 'app-chart-type-manager',
+  templateUrl: './chart-type-manager.component.html',
+  styleUrls: ['./chart-type-manager.component.scss']
+})
+export class ChartTypeManagerComponent implements OnInit {
+  chartTypes: ChartType[] = [];
+  chartTypeLoadingState: ClrLoadingState = ClrLoadingState.DEFAULT;
+
+  // Make ClrLoadingState available to template
+  readonly ClrLoadingState = ClrLoadingState;
+
+  // Error handling
+  errorMessage: string | null = null;
+  successMessage: string | null = null;
+
+  constructor(private chartTypeService: ChartTypeService) { }
+
+  ngOnInit(): void {
+    this.loadChartTypes();
+  }
+
+  // Show error message
+  private showError(message: string): void {
+    this.errorMessage = message;
+    setTimeout(() => {
+      this.errorMessage = null;
+    }, 5000);
+  }
+
+  // Show success message
+  private showSuccess(message: string): void {
+    this.successMessage = message;
+    setTimeout(() => {
+      this.successMessage = null;
+    }, 3000);
+  }
+
+  // Chart Type Methods
+  loadChartTypes(): void {
+    this.chartTypeLoadingState = ClrLoadingState.LOADING;
+    this.chartTypeService.getAllChartTypes().subscribe({
+      next: (data) => {
+        // Process the data to ensure dates are properly formatted
+        this.chartTypes = data.map(chartType => ({
+          ...chartType,
+          createdAt: this.formatDate(chartType.createdAt),
+          updatedAt: this.formatDate(chartType.updatedAt)
+        }));
+        this.chartTypeLoadingState = ClrLoadingState.SUCCESS;
+      },
+      error: (error) => {
+        console.error('Error loading chart types:', error);
+        this.showError('Error loading chart types: ' + (error.error?.message || error.message || 'Unknown error'));
+        this.chartTypeLoadingState = ClrLoadingState.ERROR;
+      }
+    });
+  }
+
+  // Format date to handle both string and object formats
+  private formatDate(date: any): string {
+    if (!date) return '';
+    
+    // If it's already a string, return as is
+    if (typeof date === 'string') {
+      return date;
+    }
+    
+    // If it's an object, try to convert to string
+    if (typeof date === 'object') {
+      // Handle various date object formats
+      if (date instanceof Date) {
+        return date.toISOString();
+      }
+      
+      // Handle ISO string within object
+      if (date.date) {
+        return date.date;
+      }
+      
+      // Handle other object formats
+      try {
+        return new Date(date).toISOString();
+      } catch {
+        return '';
+      }
+    }
+    
+    return '';
+  }
+
+  deleteChartType(id: number): void {
+    if (!confirm('Are you sure you want to delete this chart type?')) {
+      return;
+    }
+
+    this.chartTypeLoadingState = ClrLoadingState.LOADING;
+    this.chartTypeService.deleteChartType(id).subscribe({
+      next: () => {
+        this.chartTypes = this.chartTypes.filter(ct => ct.id !== id);
+        this.showSuccess('Chart type deleted successfully');
+        this.chartTypeLoadingState = ClrLoadingState.SUCCESS;
+      },
+      error: (error) => {
+        console.error('Error deleting chart type:', error);
+        this.showError('Error deleting chart type: ' + (error.error?.message || error.message || 'Unknown error'));
+        this.chartTypeLoadingState = ClrLoadingState.ERROR;
+      }
+    });
+  }
+}
\ No newline at end of file
diff --git a/frontend/angular-clarity-master/src/app/modules/main/builder/dashboardnew/chart-type-manager/chart-type-page.component.ts b/frontend/angular-clarity-master/src/app/modules/main/builder/dashboardnew/chart-type-manager/chart-type-page.component.ts
new file mode 100644
index 0000000..0cf2c7e
--- /dev/null
+++ b/frontend/angular-clarity-master/src/app/modules/main/builder/dashboardnew/chart-type-manager/chart-type-page.component.ts
@@ -0,0 +1,22 @@
+import { Component } from '@angular/core';
+
+@Component({
+  selector: 'app-chart-type-page',
+  template: `
+    <div class="chart-type-page">
+      <app-chart-type-manager></app-chart-type-manager>
+    </div>
+  `,
+  styles: [`
+    .chart-type-page {
+      padding: 20px;
+    }
+    
+    @media (max-width: 768px) {
+      .chart-type-page {
+        padding: 10px;
+      }
+    }
+  `]
+})
+export class ChartTypePageComponent { }
\ No newline at end of file
diff --git a/frontend/angular-clarity-master/src/app/modules/main/builder/dashboardnew/chart-type-manager/chart-type-templates.component.html b/frontend/angular-clarity-master/src/app/modules/main/builder/dashboardnew/chart-type-manager/chart-type-templates.component.html
new file mode 100644
index 0000000..a8a4091
--- /dev/null
+++ b/frontend/angular-clarity-master/src/app/modules/main/builder/dashboardnew/chart-type-manager/chart-type-templates.component.html
@@ -0,0 +1,175 @@
+<div class="chart-type-templates-page">
+  <div class="header">
+    <h2>
+      <button class="btn btn-link back-button" (click)="goBack()">
+        <cds-icon shape="arrow" direction="left"></cds-icon>
+      </button>
+      Chart Templates for {{ chartType?.name || 'Chart Type' }}
+    </h2>
+  </div>
+
+  <!-- Error and Success Messages -->
+  <div class="alert alert-danger" *ngIf="errorMessage">
+    <button type="button" class="close" aria-label="Close" (click)="errorMessage = null">
+      <cds-icon shape="close"></cds-icon>
+    </button>
+    <div class="alert-item">
+      <span class="alert-text">{{ errorMessage }}</span>
+    </div>
+  </div>
+
+  <div class="alert alert-success" *ngIf="successMessage">
+    <button type="button" class="close" aria-label="Close" (click)="successMessage = null">
+      <cds-icon shape="close"></cds-icon>
+    </button>
+    <div class="alert-item">
+      <span class="alert-text">{{ successMessage }}</span>
+    </div>
+  </div>
+
+  <!-- Add Chart Template Form -->
+  <div class="card" *ngIf="showAddForm">
+    <div class="card-header">
+      <h3>Add New Chart Template</h3>
+    </div>
+    <div class="card-block">
+      <form clrForm (ngSubmit)="createChartTemplate()" #addChartTemplateForm="ngForm">
+        <clr-input-container>
+          <label>Template Name <span class="required">*</span></label>
+          <input clrInput type="text" [(ngModel)]="newChartTemplate.templateName" name="templateName" required />
+          <clr-control-helper>Enter a unique name for the chart template</clr-control-helper>
+        </clr-input-container>
+
+        <clr-textarea-container>
+          <label>HTML Template</label>
+          <textarea clrTextarea [(ngModel)]="newChartTemplate.templateHtml" name="templateHtml" rows="5"></textarea>
+          <clr-control-helper>HTML structure for rendering the chart</clr-control-helper>
+        </clr-textarea-container>
+
+        <clr-textarea-container>
+          <label>CSS Template</label>
+          <textarea clrTextarea [(ngModel)]="newChartTemplate.templateCss" name="templateCss" rows="5"></textarea>
+          <clr-control-helper>CSS styling for the chart template</clr-control-helper>
+        </clr-textarea-container>
+
+        <clr-checkbox-container>
+          <label>Is Default</label>
+          <clr-checkbox-wrapper>
+            <input type="checkbox" clrCheckbox [(ngModel)]="newChartTemplate.isDefault" name="isDefault" />
+            <label>Default Template</label>
+          </clr-checkbox-wrapper>
+          <clr-control-helper>Mark as default template for this chart type</clr-control-helper>
+        </clr-checkbox-container>
+
+        <div class="form-actions">
+          <button class="btn btn-primary" type="submit" [disabled]="!newChartTemplate.templateName || loadingState === ClrLoadingState.LOADING">
+            <clr-spinner *ngIf="loadingState === ClrLoadingState.LOADING" clrSmall clrInline></clr-spinner>
+            Create Chart Template
+          </button>
+          <button class="btn" type="button" (click)="showAddForm = false">Cancel</button>
+        </div>
+      </form>
+    </div>
+  </div>
+
+  <!-- Chart Templates Grid -->
+  <div class="card">
+    <div class="card-header">
+      <div class="clr-row">
+        <div class="clr-col">
+          <h3>Chart Templates</h3>
+        </div>
+        <div class="clr-col" style="text-align: right;">
+          <button class="btn btn-primary" (click)="showAddForm = true">
+            <cds-icon shape="plus"></cds-icon> Add Chart Template
+          </button>
+        </div>
+      </div>
+    </div>
+
+    <div class="card-block">
+      <clr-datagrid [clrDgLoading]="loadingState === ClrLoadingState.LOADING">
+        <clr-dg-column>Template Name</clr-dg-column>
+        <clr-dg-column>Default</clr-dg-column>
+        <clr-dg-column>Created At</clr-dg-column>
+        <clr-dg-column>Updated At</clr-dg-column>
+        <clr-dg-column>Actions</clr-dg-column>
+
+        <clr-dg-row *clrDgItems="let chartTemplate of chartTemplates" [clrDgItem]="chartTemplate">
+          <clr-dg-cell>{{chartTemplate.templateName}}</clr-dg-cell>
+          <clr-dg-cell>
+            <span class="label" [class.label-success]="chartTemplate.isDefault" [class.label-danger]="!chartTemplate.isDefault">
+              {{chartTemplate.isDefault ? 'Yes' : 'No'}}
+            </span>
+          </clr-dg-cell>
+          <clr-dg-cell>{{chartTemplate.createdAt | date:'short'}}</clr-dg-cell>
+          <clr-dg-cell>{{chartTemplate.updatedAt | date:'short'}}</clr-dg-cell>
+          <clr-dg-cell>
+            <button class="btn btn-sm btn-icon" (click)="selectChartTemplateForEdit(chartTemplate)" title="Edit">
+              <cds-icon shape="pencil"></cds-icon>
+            </button>
+            <button class="btn btn-sm btn-icon" (click)="deleteChartTemplate(chartTemplate.id)" title="Delete">
+              <cds-icon shape="trash"></cds-icon>
+            </button>
+          </clr-dg-cell>
+        </clr-dg-row>
+
+        <clr-dg-footer>
+          {{chartTemplates.length}} chart template(s)
+        </clr-dg-footer>
+      </clr-datagrid>
+    </div>
+  </div>
+
+  <!-- Edit Chart Template Form -->
+  <div class="card" *ngIf="selectedChartTemplate">
+    <div class="card-header">
+      <h3>Edit Chart Template</h3>
+    </div>
+    <div class="card-block">
+      <form clrForm (ngSubmit)="updateChartTemplate()" #editChartTemplateForm="ngForm">
+        <clr-input-container>
+          <label>Template Name <span class="required">*</span></label>
+          <input clrInput type="text" [(ngModel)]="selectedChartTemplate.templateName" name="editTemplateName" required />
+        </clr-input-container>
+
+        <clr-textarea-container>
+          <label>HTML Template</label>
+          <textarea clrTextarea [(ngModel)]="selectedChartTemplate.templateHtml" name="editTemplateHtml" rows="5"></textarea>
+        </clr-textarea-container>
+
+        <clr-textarea-container>
+          <label>CSS Template</label>
+          <textarea clrTextarea [(ngModel)]="selectedChartTemplate.templateCss" name="editTemplateCss" rows="5"></textarea>
+        </clr-textarea-container>
+
+        <clr-checkbox-container>
+          <label>Is Default</label>
+          <clr-checkbox-wrapper>
+            <input type="checkbox" clrCheckbox [(ngModel)]="selectedChartTemplate.isDefault" name="editIsDefault" />
+            <label>Default Template</label>
+          </clr-checkbox-wrapper>
+        </clr-checkbox-container>
+
+        <div class="form-actions">
+          <button class="btn btn-primary" type="submit" [disabled]="!selectedChartTemplate.templateName || loadingState === ClrLoadingState.LOADING">
+            <clr-spinner *ngIf="loadingState === ClrLoadingState.LOADING" clrSmall clrInline></clr-spinner>
+            Update Chart Template
+          </button>
+          <button class="btn" type="button" (click)="selectedChartTemplate = null">Cancel</button>
+        </div>
+      </form>
+    </div>
+  </div>
+
+  <div class="info-section">
+    <h4>About Chart Templates</h4>
+    <p>Chart templates define how a chart of this type is rendered. Each template includes:</p>
+    <ul>
+      <li>HTML structure that defines the chart layout</li>
+      <li>CSS styling that controls the appearance</li>
+      <li>A default flag to indicate the primary template</li>
+    </ul>
+    <p>Templates allow you to have multiple visual representations for the same chart type.</p>
+  </div>
+</div>
\ No newline at end of file
diff --git a/frontend/angular-clarity-master/src/app/modules/main/builder/dashboardnew/chart-type-manager/chart-type-templates.component.scss b/frontend/angular-clarity-master/src/app/modules/main/builder/dashboardnew/chart-type-manager/chart-type-templates.component.scss
new file mode 100644
index 0000000..53c34d7
--- /dev/null
+++ b/frontend/angular-clarity-master/src/app/modules/main/builder/dashboardnew/chart-type-manager/chart-type-templates.component.scss
@@ -0,0 +1,128 @@
+.chart-type-templates-page {
+  padding: 20px;
+  max-width: 1200px;
+  margin: 0 auto;
+
+  .header {
+    margin-bottom: 20px;
+    display: flex;
+    align-items: center;
+    
+    h2 {
+      color: #0079b8;
+      font-weight: 300;
+      display: flex;
+      align-items: center;
+      gap: 10px;
+    }
+    
+    .back-button {
+      padding: 0;
+      cds-icon {
+        width: 24px;
+        height: 24px;
+      }
+    }
+  }
+
+  .card {
+    margin-bottom: 20px;
+    box-shadow: 0 2px 8px rgba(0, 0, 0, 0.1);
+    
+    .card-block {
+      padding: 20px;
+    }
+    
+    .card-header {
+      h3 {
+        margin: 0;
+        color: #0079b8;
+      }
+    }
+  }
+
+  .form-actions {
+    margin-top: 20px;
+    display: flex;
+    gap: 10px;
+  }
+
+  .label {
+    padding: 4px 8px;
+    border-radius: 12px;
+    font-size: 12px;
+    font-weight: bold;
+    
+    &.label-success {
+      background-color: #3d9970;
+      color: white;
+    }
+    
+    &.label-danger {
+      background-color: #d32f2f;
+      color: white;
+    }
+  }
+
+  clr-datagrid {
+    margin-top: 10px;
+    
+    clr-dg-cell {
+      &:first-child {
+        font-weight: 500;
+      }
+    }
+  }
+
+  .btn-icon {
+    margin-right: 5px;
+  }
+
+  .info-section {
+    background-color: #f6f6f6;
+    border-left: 4px solid #0079b8;
+    padding: 15px;
+    border-radius: 4px;
+    
+    h4 {
+      margin-top: 0;
+      color: #0079b8;
+    }
+    
+    ul {
+      padding-left: 20px;
+      
+      li {
+        margin-bottom: 8px;
+      }
+    }
+    
+    p {
+      margin: 10px 0;
+    }
+  }
+
+  @media (max-width: 768px) {
+    padding: 10px;
+    
+    .form-actions {
+      flex-direction: column;
+      
+      button {
+        width: 100%;
+        margin-bottom: 10px;
+      }
+    }
+    
+    .card-header {
+      .clr-row {
+        flex-direction: column;
+        
+        .clr-col {
+          text-align: left !important;
+          margin-bottom: 10px;
+        }
+      }
+    }
+  }
+}
\ No newline at end of file
diff --git a/frontend/angular-clarity-master/src/app/modules/main/builder/dashboardnew/chart-type-manager/chart-type-templates.component.ts b/frontend/angular-clarity-master/src/app/modules/main/builder/dashboardnew/chart-type-manager/chart-type-templates.component.ts
new file mode 100644
index 0000000..85de681
--- /dev/null
+++ b/frontend/angular-clarity-master/src/app/modules/main/builder/dashboardnew/chart-type-manager/chart-type-templates.component.ts
@@ -0,0 +1,176 @@
+import { Component, OnInit } from '@angular/core';
+import { ActivatedRoute, Router } from '@angular/router';
+import { ClrLoadingState } from '@clr/angular';
+import { ChartType, ChartTypeService } from './chart-type.service';
+import { ChartTemplateService } from '../chart-config/chart-template.service';
+import { ChartTemplate } from '../chart-config/chart-config-manager.component';
+
+@Component({
+  selector: 'app-chart-type-templates',
+  templateUrl: './chart-type-templates.component.html',
+  styleUrls: ['./chart-type-templates.component.scss']
+})
+export class ChartTypeTemplatesComponent implements OnInit {
+  chartType: ChartType | null = null;
+  chartTemplates: ChartTemplate[] = [];
+  newChartTemplate: Partial<ChartTemplate> = {
+    isDefault: false
+  };
+  selectedChartTemplate: ChartTemplate | null = null;
+  showAddForm = false;
+  
+  loadingState: ClrLoadingState = ClrLoadingState.DEFAULT;
+  errorMessage: string | null = null;
+  successMessage: string | null = null;
+
+  // Make ClrLoadingState available to template
+  readonly ClrLoadingState = ClrLoadingState;
+
+  constructor(
+    private chartTypeService: ChartTypeService,
+    private chartTemplateService: ChartTemplateService,
+    private route: ActivatedRoute,
+    private router: Router
+  ) { }
+
+  ngOnInit(): void {
+    const chartTypeId = Number(this.route.snapshot.paramMap.get('id'));
+    if (chartTypeId) {
+      this.loadChartType(chartTypeId);
+      this.loadChartTemplates(chartTypeId);
+    } else {
+      this.showError('Invalid chart type ID');
+    }
+  }
+
+  // Show error message
+  private showError(message: string): void {
+    this.errorMessage = message;
+    setTimeout(() => {
+      this.errorMessage = null;
+    }, 5000);
+  }
+
+  // Show success message
+  private showSuccess(message: string): void {
+    this.successMessage = message;
+    setTimeout(() => {
+      this.successMessage = null;
+    }, 3000);
+  }
+
+  loadChartType(id: number): void {
+    this.chartTypeService.getChartTypeById(id).subscribe({
+      next: (data) => {
+        this.chartType = data;
+      },
+      error: (error) => {
+        console.error('Error loading chart type:', error);
+        this.showError('Error loading chart type: ' + (error.error?.message || error.message || 'Unknown error'));
+      }
+    });
+  }
+
+  loadChartTemplates(chartTypeId: number): void {
+    this.loadingState = ClrLoadingState.LOADING;
+    this.chartTemplateService.getChartTemplatesByChartType(chartTypeId).subscribe({
+      next: (data) => {
+        this.chartTemplates = data;
+        this.loadingState = ClrLoadingState.SUCCESS;
+      },
+      error: (error) => {
+        console.error('Error loading chart templates:', error);
+        this.showError('Error loading chart templates: ' + (error.error?.message || error.message || 'Unknown error'));
+        this.loadingState = ClrLoadingState.ERROR;
+      }
+    });
+  }
+
+  createChartTemplate(): void {
+    if (!this.chartType || !this.newChartTemplate.templateName) {
+      this.showError('Template name is required');
+      return;
+    }
+
+    // Create a copy without the chartType property
+    const templateData: Partial<ChartTemplate> = {
+      templateName: this.newChartTemplate.templateName,
+      templateHtml: this.newChartTemplate.templateHtml,
+      templateCss: this.newChartTemplate.templateCss,
+      isDefault: this.newChartTemplate.isDefault
+    };
+
+    this.loadingState = ClrLoadingState.LOADING;
+    this.chartTemplateService.createChartTemplate(templateData, this.chartType.id).subscribe({
+      next: (data) => {
+        this.chartTemplates.push(data);
+        this.newChartTemplate = { isDefault: false };
+        this.showAddForm = false;
+        this.showSuccess('Chart template created successfully');
+        this.loadingState = ClrLoadingState.SUCCESS;
+      },
+      error: (error) => {
+        console.error('Error creating chart template:', error);
+        this.showError('Error creating chart template: ' + (error.error?.message || error.message || 'Unknown error'));
+        this.loadingState = ClrLoadingState.ERROR;
+      }
+    });
+  }
+
+  updateChartTemplate(): void {
+    if (!this.selectedChartTemplate || !this.selectedChartTemplate.templateName) {
+      this.showError('Template name is required');
+      return;
+    }
+
+    this.loadingState = ClrLoadingState.LOADING;
+    this.chartTemplateService.updateChartTemplate(this.selectedChartTemplate.id, this.selectedChartTemplate).subscribe({
+      next: (data) => {
+        const index = this.chartTemplates.findIndex(ct => ct.id === data.id);
+        if (index !== -1) {
+          this.chartTemplates[index] = data;
+        }
+        this.selectedChartTemplate = null;
+        this.showSuccess('Chart template updated successfully');
+        this.loadingState = ClrLoadingState.SUCCESS;
+      },
+      error: (error) => {
+        console.error('Error updating chart template:', error);
+        this.showError('Error updating chart template: ' + (error.error?.message || error.message || 'Unknown error'));
+        this.loadingState = ClrLoadingState.ERROR;
+      }
+    });
+  }
+
+  deleteChartTemplate(id: number): void {
+    if (!confirm('Are you sure you want to delete this chart template?')) {
+      return;
+    }
+
+    this.loadingState = ClrLoadingState.LOADING;
+    this.chartTemplateService.deleteChartTemplate(id).subscribe({
+      next: () => {
+        this.chartTemplates = this.chartTemplates.filter(ct => ct.id !== id);
+        this.showSuccess('Chart template deleted successfully');
+        this.loadingState = ClrLoadingState.SUCCESS;
+      },
+      error: (error) => {
+        console.error('Error deleting chart template:', error);
+        this.showError('Error deleting chart template: ' + (error.error?.message || error.message || 'Unknown error'));
+        this.loadingState = ClrLoadingState.ERROR;
+      }
+    });
+  }
+
+  selectChartTemplateForEdit(chartTemplate: ChartTemplate): void {
+    this.selectedChartTemplate = { ...chartTemplate };
+  }
+
+  goBack(): void {
+    if (this.chartType) {
+      this.router.navigate(['/cns-portal/dashboardbuilder/chart-types/edit', this.chartType.id]);
+    } else {
+      this.router.navigate(['/cns-portal/dashboardbuilder/chart-types']);
+    }
+  }
+}
\ No newline at end of file
diff --git a/frontend/angular-clarity-master/src/app/modules/main/builder/dashboardnew/chart-type-manager/chart-type-ui-components.component.html b/frontend/angular-clarity-master/src/app/modules/main/builder/dashboardnew/chart-type-manager/chart-type-ui-components.component.html
new file mode 100644
index 0000000..15cee37
--- /dev/null
+++ b/frontend/angular-clarity-master/src/app/modules/main/builder/dashboardnew/chart-type-manager/chart-type-ui-components.component.html
@@ -0,0 +1,312 @@
+<div class="chart-type-ui-components-page">
+  <div class="header">
+    <h2>
+      <button class="btn btn-link back-button" (click)="goBack()">
+        <cds-icon shape="arrow" direction="left"></cds-icon>
+      </button>
+      UI Components for {{ chartType?.name || 'Chart Type' }}
+    </h2>
+  </div>
+
+  <!-- Error and Success Messages -->
+  <div class="alert alert-danger" *ngIf="errorMessage">
+    <button type="button" class="close" aria-label="Close" (click)="errorMessage = null">
+      <cds-icon shape="close"></cds-icon>
+    </button>
+    <div class="alert-item">
+      <span class="alert-text">{{ errorMessage }}</span>
+    </div>
+  </div>
+
+  <div class="alert alert-success" *ngIf="successMessage">
+    <button type="button" class="close" aria-label="Close" (click)="successMessage = null">
+      <cds-icon shape="close"></cds-icon>
+    </button>
+    <div class="alert-item">
+      <span class="alert-text">{{ successMessage }}</span>
+    </div>
+  </div>
+
+  <!-- Add UI Component Form -->
+  <div class="card" *ngIf="showAddForm">
+    <div class="card-header">
+      <h3>Add New UI Component</h3>
+    </div>
+    <div class="card-block">
+      <form clrForm (ngSubmit)="createUiComponent()" #addUiComponentForm="ngForm">
+        <clr-input-container>
+          <label>Component Name <span class="required">*</span></label>
+          <input clrInput type="text" [(ngModel)]="newUiComponent.componentName" name="componentName" required />
+          <clr-control-helper>Enter a unique name for the UI component (e.g., "title-config", "axis-config")</clr-control-helper>
+        </clr-input-container>
+
+        <clr-input-container>
+          <label>Component Type</label>
+          <input clrInput type="text" [(ngModel)]="newUiComponent.componentType" name="componentType" />
+          <clr-control-helper>Type of the component (e.g., "input", "select", "checkbox")</clr-control-helper>
+        </clr-input-container>
+
+        <clr-input-container>
+          <label>Display Label</label>
+          <input clrInput type="text" [(ngModel)]="newUiComponent.displayLabel" name="displayLabel" />
+          <clr-control-helper>User-friendly label shown in the configuration form</clr-control-helper>
+        </clr-input-container>
+
+        <clr-input-container>
+          <label>Placeholder</label>
+          <input clrInput type="text" [(ngModel)]="newUiComponent.placeholder" name="placeholder" />
+          <clr-control-helper>Placeholder text for input fields</clr-control-helper>
+        </clr-input-container>
+
+        <clr-input-container>
+          <label>Sort Order</label>
+          <input clrInput type="number" [(ngModel)]="newUiComponent.sortOrder" name="sortOrder" />
+          <clr-control-helper>Order in which components appear in the form</clr-control-helper>
+        </clr-input-container>
+
+        <clr-checkbox-container>
+          <label>Is Required</label>
+          <clr-checkbox-wrapper>
+            <input type="checkbox" clrCheckbox [(ngModel)]="newUiComponent.isRequired" name="isRequired" />
+            <label>Required</label>
+          </clr-checkbox-wrapper>
+          <clr-control-helper>Mark as required if this component must be filled</clr-control-helper>
+        </clr-checkbox-container>
+
+        <div class="form-actions">
+          <button class="btn btn-primary" type="submit" [disabled]="!newUiComponent.componentName || loadingState === ClrLoadingState.LOADING">
+            <clr-spinner *ngIf="loadingState === ClrLoadingState.LOADING" clrSmall clrInline></clr-spinner>
+            Create UI Component
+          </button>
+          <button class="btn" type="button" (click)="showAddForm = false">Cancel</button>
+        </div>
+      </form>
+    </div>
+  </div>
+
+  <!-- UI Components Grid -->
+  <div class="card">
+    <div class="card-header">
+      <div class="clr-row">
+        <div class="clr-col">
+          <h3>UI Components</h3>
+        </div>
+        <div class="clr-col" style="text-align: right;">
+          <button class="btn btn-primary" (click)="showAddForm = true">
+            <cds-icon shape="plus"></cds-icon> Add UI Component
+          </button>
+        </div>
+      </div>
+    </div>
+
+    <div class="card-block">
+      <clr-datagrid [clrDgLoading]="loadingState === ClrLoadingState.LOADING">
+        <clr-dg-column>Component Name</clr-dg-column>
+        <clr-dg-column>Component Type</clr-dg-column>
+        <clr-dg-column>Display Label</clr-dg-column>
+        <clr-dg-column>Required</clr-dg-column>
+        <clr-dg-column>Actions</clr-dg-column>
+
+        <clr-dg-row *clrDgItems="let uiComponent of uiComponents" [clrDgItem]="uiComponent">
+          <clr-dg-cell>{{uiComponent.componentName}}</clr-dg-cell>
+          <clr-dg-cell>{{uiComponent.componentType}}</clr-dg-cell>
+          <clr-dg-cell>{{uiComponent.displayLabel}}</clr-dg-cell>
+          <clr-dg-cell>
+            <span class="label" [class.label-success]="uiComponent.isRequired" [class.label-danger]="!uiComponent.isRequired">
+              {{uiComponent.isRequired ? 'Yes' : 'No'}}
+            </span>
+          </clr-dg-cell>
+          <clr-dg-cell class="action-cell">
+            <div class="action-buttons">
+              <button class="btn btn-sm btn-icon" (click)="selectUiComponentForEdit(uiComponent)" title="Edit" [disabled]="loadingState === ClrLoadingState.LOADING">
+                <clr-spinner *ngIf="loadingState === ClrLoadingState.LOADING" clrSmall clrInline></clr-spinner>
+                <cds-icon *ngIf="loadingState !== ClrLoadingState.LOADING" shape="pencil" aria-label="Edit"></cds-icon>
+              </button>
+              <button class="btn btn-sm btn-icon" (click)="deleteUiComponent(uiComponent.id)" title="Delete" [disabled]="loadingState === ClrLoadingState.LOADING">
+                <clr-spinner *ngIf="loadingState === ClrLoadingState.LOADING" clrSmall clrInline></clr-spinner>
+                <cds-icon *ngIf="loadingState !== ClrLoadingState.LOADING" shape="trash" aria-label="Delete"></cds-icon>
+              </button>
+              <button class="btn btn-sm btn-icon btn-primary" (click)="onViewComponentProperties(uiComponent)" title="View Properties" [disabled]="loadingState === ClrLoadingState.LOADING">
+                <clr-spinner *ngIf="loadingState === ClrLoadingState.LOADING" clrSmall clrInline></clr-spinner>
+                <cds-icon *ngIf="loadingState !== ClrLoadingState.LOADING" shape="eye" aria-label="View Properties"></cds-icon>
+              </button>
+            </div>
+          </clr-dg-cell>
+        </clr-dg-row>
+
+        <clr-dg-footer>
+          {{uiComponents.length}} UI component(s)
+        </clr-dg-footer>
+      </clr-datagrid>
+    </div>
+  </div>
+
+  <!-- Edit UI Component Form -->
+  <div class="card" *ngIf="selectedUiComponent && !showAddComponentPropertyForm && !selectedComponentProperty">
+    <div class="card-header">
+      <h3>Edit UI Component</h3>
+    </div>
+    <div class="card-block">
+      <form clrForm (ngSubmit)="updateUiComponent()" #editUiComponentForm="ngForm">
+        <clr-input-container>
+          <label>Component Name <span class="required">*</span></label>
+          <input clrInput type="text" [(ngModel)]="selectedUiComponent.componentName" name="editComponentName" required />
+        </clr-input-container>
+
+        <clr-input-container>
+          <label>Component Type</label>
+          <input clrInput type="text" [(ngModel)]="selectedUiComponent.componentType" name="editComponentType" />
+        </clr-input-container>
+
+        <clr-input-container>
+          <label>Display Label</label>
+          <input clrInput type="text" [(ngModel)]="selectedUiComponent.displayLabel" name="editDisplayLabel" />
+        </clr-input-container>
+
+        <clr-input-container>
+          <label>Placeholder</label>
+          <input clrInput type="text" [(ngModel)]="selectedUiComponent.placeholder" name="editPlaceholder" />
+        </clr-input-container>
+
+        <clr-input-container>
+          <label>Sort Order</label>
+          <input clrInput type="number" [(ngModel)]="selectedUiComponent.sortOrder" name="editSortOrder" />
+        </clr-input-container>
+
+        <clr-checkbox-container>
+          <label>Is Required</label>
+          <clr-checkbox-wrapper>
+            <input type="checkbox" clrCheckbox [(ngModel)]="selectedUiComponent.isRequired" name="editIsRequired" />
+            <label>Required</label>
+          </clr-checkbox-wrapper>
+        </clr-checkbox-container>
+
+        <div class="form-actions">
+          <button class="btn btn-primary" type="submit" [disabled]="!selectedUiComponent.componentName || loadingState === ClrLoadingState.LOADING">
+            <clr-spinner *ngIf="loadingState === ClrLoadingState.LOADING" clrSmall clrInline></clr-spinner>
+            Update UI Component
+          </button>
+          <button class="btn" type="button" (click)="selectedUiComponent = null">Cancel</button>
+        </div>
+      </form>
+    </div>
+  </div>
+
+  <!-- Component Properties Section -->
+  <div class="card" *ngIf="selectedUiComponent">
+    <div class="card-header">
+      <div class="clr-row">
+        <div class="clr-col">
+          <h3>Properties for {{selectedUiComponent?.componentName}}</h3>
+        </div>
+        <div class="clr-col" style="text-align: right;">
+          <button class="btn btn-primary" (click)="showAddComponentPropertyForm = true">
+            <cds-icon shape="plus"></cds-icon> Add Property
+          </button>
+        </div>
+      </div>
+    </div>
+
+    <!-- Add Component Property Form -->
+    <div class="card-block" *ngIf="showAddComponentPropertyForm">
+      <form clrForm (ngSubmit)="createComponentProperty()" #addComponentPropertyForm="ngForm">
+        <clr-input-container>
+          <label>Property Name <span class="required">*</span></label>
+          <input clrInput type="text" [(ngModel)]="newComponentProperty.propertyName" name="propertyName" required />
+        </clr-input-container>
+        
+        <clr-input-container>
+          <label>Property Value</label>
+          <input clrInput type="text" [(ngModel)]="newComponentProperty.propertyValue" name="propertyValue" />
+        </clr-input-container>
+        
+        <clr-input-container>
+          <label>Property Type</label>
+          <input clrInput type="text" [(ngModel)]="newComponentProperty.propertyType" name="propertyType" />
+        </clr-input-container>
+        
+        <div class="form-actions">
+          <button class="btn btn-primary" type="submit" [disabled]="!newComponentProperty.propertyName || componentPropertyLoadingState === ClrLoadingState.LOADING">
+            <clr-spinner *ngIf="componentPropertyLoadingState === ClrLoadingState.LOADING" clrSmall clrInline></clr-spinner>
+            Create Property
+          </button>
+          <button class="btn" type="button" (click)="showAddComponentPropertyForm = false">Cancel</button>
+        </div>
+      </form>
+    </div>
+
+    <!-- Component Properties Table -->
+    <div class="card-block">
+      <clr-datagrid [clrDgLoading]="componentPropertyLoadingState === ClrLoadingState.LOADING">
+        <clr-dg-column>Property Name</clr-dg-column>
+        <clr-dg-column>Property Value</clr-dg-column>
+        <clr-dg-column>Property Type</clr-dg-column>
+        <clr-dg-column>Created At</clr-dg-column>
+        <clr-dg-column>Updated At</clr-dg-column>
+        <clr-dg-column>Actions</clr-dg-column>
+        
+        <clr-dg-row *clrDgItems="let property of componentProperties" [clrDgItem]="property">
+          <clr-dg-cell>{{property.propertyName}}</clr-dg-cell>
+          <clr-dg-cell>{{property.propertyValue}}</clr-dg-cell>
+          <clr-dg-cell>{{property.propertyType}}</clr-dg-cell>
+          <clr-dg-cell>{{property.createdAt | date:'short'}}</clr-dg-cell>
+          <clr-dg-cell>{{property.updatedAt | date:'short'}}</clr-dg-cell>
+          <clr-dg-cell>
+            <button class="btn btn-sm btn-icon" (click)="selectComponentPropertyForEdit(property)" title="Edit" [disabled]="componentPropertyLoadingState === ClrLoadingState.LOADING">
+              <clr-spinner *ngIf="componentPropertyLoadingState === ClrLoadingState.LOADING" clrSmall clrInline></clr-spinner>
+              <cds-icon *ngIf="componentPropertyLoadingState !== ClrLoadingState.LOADING" shape="pencil"></cds-icon>
+            </button>
+            <button class="btn btn-sm btn-icon" (click)="deleteComponentProperty(property.id)" title="Delete" [disabled]="componentPropertyLoadingState === ClrLoadingState.LOADING">
+              <clr-spinner *ngIf="componentPropertyLoadingState === ClrLoadingState.LOADING" clrSmall clrInline></clr-spinner>
+              <cds-icon *ngIf="componentPropertyLoadingState !== ClrLoadingState.LOADING" shape="trash"></cds-icon>
+            </button>
+          </clr-dg-cell>
+        </clr-dg-row>
+        
+        <clr-dg-footer>
+          {{componentProperties.length}} propertie(s)
+        </clr-dg-footer>
+      </clr-datagrid>
+    </div>
+
+    <!-- Edit Component Property Form -->
+    <div class="card-block" *ngIf="selectedComponentProperty">
+      <h4>Edit Component Property</h4>
+      <form clrForm (ngSubmit)="updateComponentProperty()" #editComponentPropertyForm="ngForm">
+        <clr-input-container>
+          <label>Property Name <span class="required">*</span></label>
+          <input clrInput type="text" [(ngModel)]="selectedComponentProperty.propertyName" name="editPropertyName" required />
+        </clr-input-container>
+        
+        <clr-input-container>
+          <label>Property Value</label>
+          <input clrInput type="text" [(ngModel)]="selectedComponentProperty.propertyValue" name="editPropertyValue" />
+        </clr-input-container>
+        
+        <clr-input-container>
+          <label>Property Type</label>
+          <input clrInput type="text" [(ngModel)]="selectedComponentProperty.propertyType" name="editPropertyType" />
+        </clr-input-container>
+        
+        <div class="form-actions">
+          <button class="btn btn-primary" type="submit" [disabled]="!selectedComponentProperty.propertyName || componentPropertyLoadingState === ClrLoadingState.LOADING">
+            <clr-spinner *ngIf="componentPropertyLoadingState === ClrLoadingState.LOADING" clrSmall clrInline></clr-spinner>
+            Update Property
+          </button>
+          <button class="btn" type="button" (click)="selectedComponentProperty = null">Cancel</button>
+        </div>
+      </form>
+    </div>
+  </div>
+
+  <div class="info-section">
+    <h4>About UI Components</h4>
+    <p>UI components define the configuration form elements for a chart type. Each component represents:</p>
+    <ul>
+      <li>A form field that appears when configuring a chart of this type</li>
+      <li>Metadata like label, placeholder, and validation rules</li>
+      <li>An order in which they appear in the configuration form</li>
+    </ul>
+    <p>After creating UI components, you can define their properties using the "View Properties" button.</p>
+  </div>
+</div>
\ No newline at end of file
diff --git a/frontend/angular-clarity-master/src/app/modules/main/builder/dashboardnew/chart-type-manager/chart-type-ui-components.component.scss b/frontend/angular-clarity-master/src/app/modules/main/builder/dashboardnew/chart-type-manager/chart-type-ui-components.component.scss
new file mode 100644
index 0000000..da40f68
--- /dev/null
+++ b/frontend/angular-clarity-master/src/app/modules/main/builder/dashboardnew/chart-type-manager/chart-type-ui-components.component.scss
@@ -0,0 +1,156 @@
+.chart-type-ui-components-page {
+  padding: 20px;
+  max-width: 1200px;
+  margin: 0 auto;
+
+  .header {
+    margin-bottom: 20px;
+    display: flex;
+    align-items: center;
+    
+    h2 {
+      color: #0079b8;
+      font-weight: 300;
+      display: flex;
+      align-items: center;
+      gap: 10px;
+    }
+    
+    .back-button {
+      padding: 0;
+      cds-icon {
+        width: 24px;
+        height: 24px;
+      }
+    }
+  }
+
+  .card {
+    margin-bottom: 20px;
+    box-shadow: 0 2px 8px rgba(0, 0, 0, 0.1);
+    
+    .card-block {
+      padding: 20px;
+    }
+    
+    .card-header {
+      h3 {
+        margin: 0;
+        color: #0079b8;
+      }
+    }
+  }
+
+  .form-actions {
+    margin-top: 20px;
+    display: flex;
+    gap: 10px;
+  }
+
+  .label {
+    padding: 4px 8px;
+    border-radius: 12px;
+    font-size: 12px;
+    font-weight: bold;
+    
+    &.label-success {
+      background-color: #3d9970;
+      color: white;
+    }
+    
+    &.label-danger {
+      background-color: #d32f2f;
+      color: white;
+    }
+  }
+
+  clr-datagrid {
+    margin-top: 10px;
+    
+    clr-dg-cell {
+      &:first-child {
+        font-weight: 500;
+      }
+    }
+  }
+
+  .btn-icon {
+    margin-right: 5px;
+  }
+
+  .info-section {
+    background-color: #f6f6f6;
+    border-left: 4px solid #0079b8;
+    padding: 15px;
+    border-radius: 4px;
+    
+    h4 {
+      margin-top: 0;
+      color: #0079b8;
+    }
+    
+    ul {
+      padding-left: 20px;
+      
+      li {
+        margin-bottom: 8px;
+      }
+    }
+    
+    p {
+      margin: 10px 0;
+    }
+  }
+
+  // Component Properties Section Styles
+  .action-cell {
+    min-width: 120px;
+  }
+
+  .action-buttons {
+    display: flex;
+    gap: 5px;
+    flex-wrap: nowrap;
+    align-items: center;
+  }
+
+  .action-buttons .btn-icon {
+    min-width: 36px;
+    display: flex;
+    align-items: center;
+    justify-content: center;
+  }
+
+  // Ensure icons are visible
+  cds-icon {
+    display: inline-block !important;
+  }
+
+  clr-spinner {
+    margin: 0;
+  }
+
+  @media (max-width: 768px) {
+    padding: 10px;
+    
+    .form-actions {
+      flex-direction: column;
+      
+      button {
+        width: 100%;
+        margin-bottom: 10px;
+      }
+    }
+    
+    .card-header {
+      .clr-row {
+        flex-direction: column;
+        
+        .clr-col {
+          text-align: left !important;
+          margin-bottom: 10px;
+        }
+      }
+    }
+  }
+}
\ No newline at end of file
diff --git a/frontend/angular-clarity-master/src/app/modules/main/builder/dashboardnew/chart-type-manager/chart-type-ui-components.component.ts b/frontend/angular-clarity-master/src/app/modules/main/builder/dashboardnew/chart-type-manager/chart-type-ui-components.component.ts
new file mode 100644
index 0000000..a2ca262
--- /dev/null
+++ b/frontend/angular-clarity-master/src/app/modules/main/builder/dashboardnew/chart-type-manager/chart-type-ui-components.component.ts
@@ -0,0 +1,309 @@
+import { Component, OnInit } from '@angular/core';
+import { ActivatedRoute, Router } from '@angular/router';
+import { ClrLoadingState } from '@clr/angular';
+import { ChartType, ChartTypeService } from './chart-type.service';
+import { UiComponentService } from '../chart-config/ui-component.service';
+import { ComponentPropertyService } from '../chart-config/component-property.service';
+import { UiComponent, ComponentProperty } from '../chart-config/chart-config-manager.component';
+
+@Component({
+  selector: 'app-chart-type-ui-components',
+  templateUrl: './chart-type-ui-components.component.html',
+  styleUrls: ['./chart-type-ui-components.component.scss']
+})
+export class ChartTypeUiComponentsComponent implements OnInit {
+  chartType: ChartType | null = null;
+  uiComponents: UiComponent[] = [];
+  newUiComponent: Partial<UiComponent> = {
+    isRequired: false
+  };
+  selectedUiComponent: UiComponent | null = null;
+  showAddForm = false;
+  
+  // Component Properties
+  componentProperties: ComponentProperty[] = [];
+  selectedComponentProperty: ComponentProperty | null = null;
+  newComponentProperty: Partial<ComponentProperty> = {};
+  showAddComponentPropertyForm = false;
+  componentPropertyLoadingState: ClrLoadingState = ClrLoadingState.DEFAULT;
+  
+  loadingState: ClrLoadingState = ClrLoadingState.DEFAULT;
+  errorMessage: string | null = null;
+  successMessage: string | null = null;
+
+  // Make ClrLoadingState available to template
+  readonly ClrLoadingState = ClrLoadingState;
+
+  constructor(
+    private chartTypeService: ChartTypeService,
+    private uiComponentService: UiComponentService,
+    private componentPropertyService: ComponentPropertyService,
+    private route: ActivatedRoute,
+    private router: Router
+  ) { }
+
+  ngOnInit(): void {
+    const chartTypeId = Number(this.route.snapshot.paramMap.get('id'));
+    if (chartTypeId) {
+      this.loadChartType(chartTypeId);
+      this.loadUiComponents(chartTypeId);
+    } else {
+      this.showError('Invalid chart type ID');
+    }
+  }
+
+  // Show error message
+  private showError(message: string): void {
+    this.errorMessage = message;
+    setTimeout(() => {
+      this.errorMessage = null;
+    }, 5000);
+  }
+
+  // Show success message
+  private showSuccess(message: string): void {
+    this.successMessage = message;
+    setTimeout(() => {
+      this.successMessage = null;
+    }, 3000);
+  }
+
+  loadChartType(id: number): void {
+    this.chartTypeService.getChartTypeById(id).subscribe({
+      next: (data) => {
+        this.chartType = data;
+      },
+      error: (error) => {
+        console.error('Error loading chart type:', error);
+        this.showError('Error loading chart type: ' + (error.error?.message || error.message || 'Unknown error'));
+      }
+    });
+  }
+
+  loadUiComponents(chartTypeId: number): void {
+    this.loadingState = ClrLoadingState.LOADING;
+    this.uiComponentService.getUiComponentsByChartType(chartTypeId).subscribe({
+      next: (data) => {
+        this.uiComponents = data;
+        this.loadingState = ClrLoadingState.SUCCESS;
+      },
+      error: (error) => {
+        console.error('Error loading UI components:', error);
+        this.showError('Error loading UI components: ' + (error.error?.message || error.message || 'Unknown error'));
+        this.loadingState = ClrLoadingState.ERROR;
+      }
+    });
+  }
+
+  createUiComponent(): void {
+    if (!this.chartType || !this.newUiComponent.componentName) {
+      this.showError('Component name is required');
+      return;
+    }
+
+    this.loadingState = ClrLoadingState.LOADING;
+    
+    // Create a complete chartType object with only the ID (following the pattern in chart-config-manager)
+    const chartTypeWithId = { 
+      id: this.chartType.id,
+      name: '',
+      displayName: '',
+      description: '',
+      isActive: true,
+      createdAt: '',
+      updatedAt: ''
+    };
+
+    const componentData = {
+      ...this.newUiComponent,
+      chartType: chartTypeWithId
+    };
+    
+    this.uiComponentService.createUiComponent(componentData).subscribe({
+      next: (data) => {
+        this.uiComponents.push(data);
+        this.newUiComponent = { isRequired: false };
+        this.showAddForm = false;
+        this.showSuccess('UI component created successfully');
+        this.loadingState = ClrLoadingState.SUCCESS;
+      },
+      error: (error) => {
+        console.error('Error creating UI component:', error);
+        this.showError('Error creating UI component: ' + (error.error?.message || error.message || 'Unknown error'));
+        this.loadingState = ClrLoadingState.ERROR;
+      }
+    });
+  }
+
+  updateUiComponent(): void {
+    if (!this.selectedUiComponent || !this.selectedUiComponent.componentName) {
+      this.showError('Component name is required');
+      return;
+    }
+
+    this.loadingState = ClrLoadingState.LOADING;
+    this.uiComponentService.updateUiComponent(this.selectedUiComponent.id, this.selectedUiComponent).subscribe({
+      next: (data) => {
+        const index = this.uiComponents.findIndex(uc => uc.id === data.id);
+        if (index !== -1) {
+          this.uiComponents[index] = data;
+        }
+        this.selectedUiComponent = null;
+        this.showSuccess('UI component updated successfully');
+        this.loadingState = ClrLoadingState.SUCCESS;
+      },
+      error: (error) => {
+        console.error('Error updating UI component:', error);
+        this.showError('Error updating UI component: ' + (error.error?.message || error.message || 'Unknown error'));
+        this.loadingState = ClrLoadingState.ERROR;
+      }
+    });
+  }
+
+  deleteUiComponent(id: number): void {
+    if (!confirm('Are you sure you want to delete this UI component?')) {
+      return;
+    }
+
+    this.loadingState = ClrLoadingState.LOADING;
+    this.uiComponentService.deleteUiComponent(id).subscribe({
+      next: () => {
+        this.uiComponents = this.uiComponents.filter(uc => uc.id !== id);
+        this.showSuccess('UI component deleted successfully');
+        this.loadingState = ClrLoadingState.SUCCESS;
+      },
+      error: (error) => {
+        console.error('Error deleting UI component:', error);
+        this.showError('Error deleting UI component: ' + (error.error?.message || error.message || 'Unknown error'));
+        this.loadingState = ClrLoadingState.ERROR;
+      }
+    });
+  }
+
+  selectUiComponentForEdit(uiComponent: UiComponent): void {
+    this.selectedUiComponent = { ...uiComponent };
+  }
+
+  // Component Property Methods
+  loadComponentProperties(componentId: number): void {
+    if (!componentId) {
+      this.componentProperties = [];
+      return;
+    }
+    
+    this.componentPropertyLoadingState = ClrLoadingState.LOADING;
+    this.componentPropertyService.getComponentPropertiesByComponent(componentId).subscribe({
+      next: (data) => {
+        this.componentProperties = data;
+        this.componentPropertyLoadingState = ClrLoadingState.SUCCESS;
+      },
+      error: (error) => {
+        console.error('Error loading component properties:', error);
+        this.showError('Error loading component properties: ' + (error.error?.message || error.message || 'Unknown error'));
+        this.componentPropertyLoadingState = ClrLoadingState.ERROR;
+      }
+    });
+  }
+
+  createComponentProperty(): void {
+    if (!this.selectedUiComponent) {
+      this.showError('Please select a UI component first');
+      return;
+    }
+
+    if (!this.newComponentProperty.propertyName) {
+      this.showError('Property name is required');
+      return;
+    }
+
+    this.componentPropertyLoadingState = ClrLoadingState.LOADING;
+    
+    // Create a complete component object with only the ID
+    const componentWithId = { 
+      id: this.selectedUiComponent.id
+    } as UiComponent;
+
+    const componentPropertyData = {
+      ...this.newComponentProperty,
+      component: componentWithId
+    };
+
+    this.componentPropertyService.createComponentProperty(componentPropertyData).subscribe({
+      next: (data) => {
+        this.componentProperties.push(data);
+        this.newComponentProperty = {};
+        this.showAddComponentPropertyForm = false;
+        this.showSuccess('Component property created successfully');
+        this.componentPropertyLoadingState = ClrLoadingState.SUCCESS;
+      },
+      error: (error) => {
+        console.error('Error creating component property:', error);
+        this.showError('Error creating component property: ' + (error.error?.message || error.message || 'Unknown error'));
+        this.componentPropertyLoadingState = ClrLoadingState.ERROR;
+      }
+    });
+  }
+
+  updateComponentProperty(): void {
+    if (!this.selectedComponentProperty || !this.selectedComponentProperty.propertyName) {
+      this.showError('Property name is required');
+      return;
+    }
+
+    this.componentPropertyLoadingState = ClrLoadingState.LOADING;
+    this.componentPropertyService.updateComponentProperty(this.selectedComponentProperty.id, this.selectedComponentProperty).subscribe({
+      next: (data) => {
+        const index = this.componentProperties.findIndex(cp => cp.id === data.id);
+        if (index !== -1) {
+          this.componentProperties[index] = data;
+        }
+        this.selectedComponentProperty = null;
+        this.showSuccess('Component property updated successfully');
+        this.componentPropertyLoadingState = ClrLoadingState.SUCCESS;
+      },
+      error: (error) => {
+        console.error('Error updating component property:', error);
+        this.showError('Error updating component property: ' + (error.error?.message || error.message || 'Unknown error'));
+        this.componentPropertyLoadingState = ClrLoadingState.ERROR;
+      }
+    });
+  }
+
+  deleteComponentProperty(id: number): void {
+    if (!confirm('Are you sure you want to delete this component property?')) {
+      return;
+    }
+
+    this.componentPropertyLoadingState = ClrLoadingState.LOADING;
+    this.componentPropertyService.deleteComponentProperty(id).subscribe({
+      next: () => {
+        this.componentProperties = this.componentProperties.filter(cp => cp.id !== id);
+        this.showSuccess('Component property deleted successfully');
+        this.componentPropertyLoadingState = ClrLoadingState.SUCCESS;
+      },
+      error: (error) => {
+        console.error('Error deleting component property:', error);
+        this.showError('Error deleting component property: ' + (error.error?.message || error.message || 'Unknown error'));
+        this.componentPropertyLoadingState = ClrLoadingState.ERROR;
+      }
+    });
+  }
+
+  selectComponentPropertyForEdit(componentProperty: ComponentProperty): void {
+    this.selectedComponentProperty = { ...componentProperty };
+  }
+
+  // Helper method to view properties for a UI component
+  onViewComponentProperties(uiComponent: UiComponent): void {
+    this.selectedUiComponent = uiComponent;
+    this.loadComponentProperties(uiComponent.id);
+  }
+
+  goBack(): void {
+    if (this.chartType) {
+      this.router.navigate(['/cns-portal/dashboardbuilder/chart-types/edit', this.chartType.id]);
+    } else {
+      this.router.navigate(['/cns-portal/dashboardbuilder/chart-types']);
+    }
+  }
+}
\ No newline at end of file
diff --git a/frontend/angular-clarity-master/src/app/modules/main/builder/dashboardnew/chart-type-manager/chart-type.service.ts b/frontend/angular-clarity-master/src/app/modules/main/builder/dashboardnew/chart-type-manager/chart-type.service.ts
new file mode 100644
index 0000000..d475ff9
--- /dev/null
+++ b/frontend/angular-clarity-master/src/app/modules/main/builder/dashboardnew/chart-type-manager/chart-type.service.ts
@@ -0,0 +1,55 @@
+import { Injectable } from '@angular/core';
+import { Observable } from 'rxjs';
+import { ApiRequestService } from 'src/app/services/api/api-request.service';
+
+export interface ChartType {
+  id: number;
+  name: string;
+  displayName: string;
+  description: string;
+  isActive: boolean;
+  createdAt: string;
+  updatedAt: string;
+}
+
+@Injectable({
+  providedIn: 'root'
+})
+export class ChartTypeService {
+  private chartTypesUrl = 'api/chart-types';
+
+  constructor(private apiRequest: ApiRequestService) { }
+
+  // Get all chart types
+  getAllChartTypes(): Observable<ChartType[]> {
+    console.log('Fetching all chart types from', this.chartTypesUrl);
+    return this.apiRequest.get(this.chartTypesUrl);
+  }
+
+  // Get chart type by ID
+  getChartTypeById(id: number): Observable<ChartType> {
+    const url = `${this.chartTypesUrl}/${id}`;
+    console.log(`Fetching chart type ${id} from ${url}`);
+    return this.apiRequest.get(url);
+  }
+
+  // Create new chart type
+  createChartType(chartType: Partial<ChartType>): Observable<ChartType> {
+    console.log('Creating chart type:', chartType);
+    return this.apiRequest.post(this.chartTypesUrl, chartType);
+  }
+
+  // Update chart type
+  updateChartType(id: number, chartType: ChartType): Observable<ChartType> {
+    const url = `${this.chartTypesUrl}/${id}`;
+    console.log(`Updating chart type ${id}:`, chartType);
+    return this.apiRequest.put(url, chartType);
+  }
+
+  // Delete chart type
+  deleteChartType(id: number): Observable<void> {
+    const url = `${this.chartTypesUrl}/${id}`;
+    console.log(`Deleting chart type ${id}`);
+    return this.apiRequest.delete(url);
+  }
+}
\ No newline at end of file
diff --git a/frontend/angular-clarity-master/src/app/modules/main/builder/dashboardnew/chart-type-manager/edit-chart-type.component.html b/frontend/angular-clarity-master/src/app/modules/main/builder/dashboardnew/chart-type-manager/edit-chart-type.component.html
new file mode 100644
index 0000000..1d854ee
--- /dev/null
+++ b/frontend/angular-clarity-master/src/app/modules/main/builder/dashboardnew/chart-type-manager/edit-chart-type.component.html
@@ -0,0 +1,160 @@
+<div class="edit-chart-type-page">
+  <div class="header">
+    <h2>Edit Chart Type</h2>
+  </div>
+
+  <!-- Loading State -->
+  <div *ngIf="loadingState === ClrLoadingState.LOADING" class="loading-spinner">
+    <clr-spinner clrMedium></clr-spinner>
+    <span>Loading chart type...</span>
+  </div>
+
+  <!-- Error and Success Messages -->
+  <div class="alert alert-danger" *ngIf="errorMessage">
+    <button type="button" class="close" aria-label="Close" (click)="errorMessage = null">
+      <cds-icon shape="close"></cds-icon>
+    </button>
+    <div class="alert-item">
+      <span class="alert-text">{{ errorMessage }}</span>
+    </div>
+  </div>
+
+  <div class="alert alert-success" *ngIf="successMessage">
+    <button type="button" class="close" aria-label="Close" (click)="successMessage = null">
+      <cds-icon shape="close"></cds-icon>
+    </button>
+    <div class="alert-item">
+      <span class="alert-text">{{ successMessage }}</span>
+    </div>
+  </div>
+
+  <!-- Chart Type Form -->
+  <div class="card" *ngIf="chartType && loadingState !== ClrLoadingState.LOADING">
+    <div class="card-header">
+      <div class="chart-type-header">
+        <h3>{{ chartType.name }}</h3>
+        <span class="label" [class.label-success]="chartType.isActive" [class.label-danger]="!chartType.isActive">
+          {{ chartType.isActive ? 'Active' : 'Inactive' }}
+        </span>
+      </div>
+    </div>
+    <div class="card-block">
+      <form clrForm (ngSubmit)="updateChartType()" #editChartTypeForm="ngForm">
+        <clr-input-container>
+          <label>Name <span class="required">*</span></label>
+          <input clrInput type="text" [(ngModel)]="chartType.name" name="chartTypeName" required />
+          <clr-control-helper>Enter a unique name for the chart type (e.g., "line-chart", "bar-chart")</clr-control-helper>
+        </clr-input-container>
+
+        <clr-input-container>
+          <label>Display Name</label>
+          <input clrInput type="text" [(ngModel)]="chartType.displayName" name="chartTypeDisplayName" />
+          <clr-control-helper>This is the user-friendly name shown in the UI</clr-control-helper>
+        </clr-input-container>
+
+        <clr-textarea-container>
+          <label>Description</label>
+          <textarea clrTextarea [(ngModel)]="chartType.description" name="chartTypeDescription" rows="3"></textarea>
+          <clr-control-helper>Provide a detailed description of this chart type and when to use it</clr-control-helper>
+        </clr-textarea-container>
+
+        <clr-checkbox-container>
+          <label>Is Active</label>
+          <clr-checkbox-wrapper>
+            <input type="checkbox" clrCheckbox [(ngModel)]="chartType.isActive" name="chartTypeIsActive" />
+            <label>Active</label>
+          </clr-checkbox-wrapper>
+          <clr-control-helper>Deactivate chart types that should not be available for selection</clr-control-helper>
+        </clr-checkbox-container>
+
+        <div class="form-actions">
+          <button class="btn btn-primary" type="submit" [disabled]="!chartType.name || loadingState === ClrLoadingState.LOADING">
+            <clr-spinner *ngIf="loadingState === ClrLoadingState.LOADING" clrSmall clrInline></clr-spinner>
+            Update Chart Type
+          </button>
+          <button class="btn" type="button" (click)="onCancel()">Cancel</button>
+          <button class="btn btn-danger" type="button" (click)="onDelete()" style="margin-left: auto;">
+            <cds-icon shape="trash"></cds-icon> Delete
+          </button>
+        </div>
+      </form>
+    </div>
+  </div>
+
+  <!-- Related Entities Management -->
+  <div class="card" *ngIf="chartType && loadingState !== ClrLoadingState.LOADING">
+    <div class="card-header">
+      <h3>Related Configuration</h3>
+    </div>
+    <div class="card-block">
+      <div class="related-entities-grid">
+        <div class="entity-card">
+          <div class="entity-header">
+            <cds-icon shape="view-list" size="24"></cds-icon>
+            <h4>UI Components</h4>
+          </div>
+          <p>Manage the UI components that define the configuration form for this chart type.</p>
+          <button class="btn btn-sm btn-link" [routerLink]="['/cns-portal/dashboardbuilder/chart-types', chartType.id, 'ui-components']">
+            Manage UI Components
+          </button>
+        </div>
+        
+        <div class="entity-card">
+          <div class="entity-header">
+            <cds-icon shape="template" size="24"></cds-icon>
+            <h4>Chart Templates</h4>
+          </div>
+          <p>Manage the templates that define how this chart type is rendered.</p>
+          <button class="btn btn-sm btn-link" [routerLink]="['/cns-portal/dashboardbuilder/chart-types', chartType.id, 'templates']">
+            Manage Templates
+          </button>
+        </div>
+        
+        <div class="entity-card">
+          <div class="entity-header">
+            <cds-icon shape="form" size="24"></cds-icon>
+            <h4>Dynamic Fields</h4>
+          </div>
+          <p>Manage the dynamic fields that capture specific configuration parameters.</p>
+          <button class="btn btn-sm btn-link" [routerLink]="['/cns-portal/dashboardbuilder/chart-types', chartType.id, 'fields']">
+            Manage Fields
+          </button>
+        </div>
+      </div>
+    </div>
+  </div>
+
+  <!-- Chart Type Details -->
+  <div class="card" *ngIf="chartType && loadingState !== ClrLoadingState.LOADING">
+    <div class="card-header">
+      <h3>Chart Type Details</h3>
+    </div>
+    <div class="card-block">
+      <div class="details-grid">
+        <div class="detail-item">
+          <label>ID:</label>
+          <span>{{ chartType.id }}</span>
+        </div>
+        <div class="detail-item">
+          <label>Created At:</label>
+          <span>{{ chartType.createdAt ? (chartType.createdAt | date:'medium') : 'N/A' }}</span>
+        </div>
+        <div class="detail-item">
+          <label>Updated At:</label>
+          <span>{{ chartType.updatedAt ? (chartType.updatedAt | date:'medium') : 'N/A' }}</span>
+        </div>
+      </div>
+    </div>
+  </div>
+
+  <div class="info-section">
+    <h4>About Chart Types</h4>
+    <p>Chart types define the different visualization options available in the dashboard builder. Each chart type can have:</p>
+    <ul>
+      <li>Associated UI components that define the configuration form</li>
+      <li>Templates that define how the chart is rendered</li>
+      <li>Dynamic fields that capture specific configuration parameters</li>
+    </ul>
+    <p>After creating a chart type, you can configure its components, templates, and fields using the management links above.</p>
+  </div>
+</div>
\ No newline at end of file
diff --git a/frontend/angular-clarity-master/src/app/modules/main/builder/dashboardnew/chart-type-manager/edit-chart-type.component.scss b/frontend/angular-clarity-master/src/app/modules/main/builder/dashboardnew/chart-type-manager/edit-chart-type.component.scss
new file mode 100644
index 0000000..2c38984
--- /dev/null
+++ b/frontend/angular-clarity-master/src/app/modules/main/builder/dashboardnew/chart-type-manager/edit-chart-type.component.scss
@@ -0,0 +1,163 @@
+.edit-chart-type-page {
+  padding: 20px;
+  max-width: 1200px;
+  margin: 0 auto;
+
+  .header {
+    margin-bottom: 20px;
+    h2 {
+      color: #0079b8;
+      font-weight: 300;
+    }
+  }
+
+  .loading-spinner {
+    display: flex;
+    align-items: center;
+    justify-content: center;
+    padding: 20px;
+    gap: 10px;
+  }
+
+  .card {
+    margin-bottom: 20px;
+    box-shadow: 0 2px 8px rgba(0, 0, 0, 0.1);
+    
+    .card-block {
+      padding: 20px;
+    }
+    
+    .card-header {
+      .chart-type-header {
+        display: flex;
+        justify-content: space-between;
+        align-items: center;
+        
+        h3 {
+          margin: 0;
+        }
+      }
+    }
+  }
+
+  .form-actions {
+    margin-top: 20px;
+    display: flex;
+    gap: 10px;
+  }
+
+  .related-entities-grid {
+    display: grid;
+    grid-template-columns: repeat(auto-fit, minmax(300px, 1fr));
+    gap: 20px;
+    
+    .entity-card {
+      border: 1px solid #ddd;
+      border-radius: 4px;
+      padding: 20px;
+      text-align: center;
+      background-color: #f9f9f9;
+      
+      .entity-header {
+        display: flex;
+        flex-direction: column;
+        align-items: center;
+        margin-bottom: 15px;
+        
+        cds-icon {
+          color: #0079b8;
+          margin-bottom: 10px;
+        }
+        
+        h4 {
+          margin: 0;
+          color: #0079b8;
+        }
+      }
+      
+      p {
+        color: #666;
+        margin-bottom: 15px;
+        min-height: 60px;
+      }
+      
+      .btn-link {
+        font-weight: 500;
+      }
+    }
+  }
+
+  .details-grid {
+    display: grid;
+    grid-template-columns: repeat(auto-fill, minmax(250px, 1fr));
+    gap: 15px;
+    
+    .detail-item {
+      display: flex;
+      flex-direction: column;
+      
+      label {
+        font-weight: bold;
+        margin-bottom: 5px;
+        color: #333;
+      }
+      
+      span {
+        padding: 8px;
+        background-color: #f6f6f6;
+        border-radius: 4px;
+      }
+    }
+  }
+
+  .info-section {
+    background-color: #f6f6f6;
+    border-left: 4px solid #0079b8;
+    padding: 15px;
+    border-radius: 4px;
+    
+    h4 {
+      margin-top: 0;
+      color: #0079b8;
+    }
+    
+    ul {
+      padding-left: 20px;
+      
+      li {
+        margin-bottom: 8px;
+      }
+    }
+    
+    p {
+      margin: 10px 0;
+    }
+  }
+
+  @media (max-width: 768px) {
+    padding: 10px;
+    
+    .form-actions {
+      flex-direction: column;
+      
+      button {
+        width: 100%;
+        margin-bottom: 10px;
+      }
+    }
+    
+    .chart-type-header {
+      flex-direction: column;
+      align-items: flex-start !important;
+      
+      .label {
+        margin-top: 10px;
+      }
+    }
+    
+    .related-entities-grid {
+      grid-template-columns: 1fr;
+    }
+  }
+}    
+    
\ No newline at end of file
diff --git a/frontend/angular-clarity-master/src/app/modules/main/builder/dashboardnew/chart-type-manager/edit-chart-type.component.ts b/frontend/angular-clarity-master/src/app/modules/main/builder/dashboardnew/chart-type-manager/edit-chart-type.component.ts
new file mode 100644
index 0000000..fd8846c
--- /dev/null
+++ b/frontend/angular-clarity-master/src/app/modules/main/builder/dashboardnew/chart-type-manager/edit-chart-type.component.ts
@@ -0,0 +1,159 @@
+import { Component, OnInit } from '@angular/core';
+import { ActivatedRoute, Router } from '@angular/router';
+import { ClrLoadingState } from '@clr/angular';
+import { ChartType, ChartTypeService } from './chart-type.service';
+
+@Component({
+  selector: 'app-edit-chart-type',
+  templateUrl: './edit-chart-type.component.html',
+  styleUrls: ['./edit-chart-type.component.scss']
+})
+export class EditChartTypeComponent implements OnInit {
+  chartType: ChartType | null = null;
+  loadingState: ClrLoadingState = ClrLoadingState.DEFAULT;
+  errorMessage: string | null = null;
+  successMessage: string | null = null;
+
+  // Make ClrLoadingState available to template
+  readonly ClrLoadingState = ClrLoadingState;
+
+  constructor(
+    private chartTypeService: ChartTypeService,
+    private route: ActivatedRoute,
+    private router: Router
+  ) { }
+
+  ngOnInit(): void {
+    const id = Number(this.route.snapshot.paramMap.get('id'));
+    if (id) {
+      this.loadChartType(id);
+    } else {
+      this.showError('Invalid chart type ID');
+    }
+  }
+
+  // Show error message
+  private showError(message: string): void {
+    this.errorMessage = message;
+    setTimeout(() => {
+      this.errorMessage = null;
+    }, 5000);
+  }
+
+  // Show success message
+  private showSuccess(message: string): void {
+    this.successMessage = message;
+    setTimeout(() => {
+      this.successMessage = null;
+    }, 3000);
+  }
+
+  loadChartType(id: number): void {
+    this.loadingState = ClrLoadingState.LOADING;
+    this.chartTypeService.getChartTypeById(id).subscribe({
+      next: (data) => {
+        // Process the data to ensure dates are properly formatted
+        this.chartType = {
+          ...data,
+          createdAt: this.formatDate(data.createdAt),
+          updatedAt: this.formatDate(data.updatedAt)
+        };
+        this.loadingState = ClrLoadingState.SUCCESS;
+      },
+      error: (error) => {
+        console.error('Error loading chart type:', error);
+        this.showError('Error loading chart type: ' + (error.error?.message || error.message || 'Unknown error'));
+        this.loadingState = ClrLoadingState.ERROR;
+      }
+    });
+  }
+
+  // Format date to handle both string and object formats
+  private formatDate(date: any): string {
+    if (!date) return '';
+    
+    // If it's already a string, return as is
+    if (typeof date === 'string') {
+      return date;
+    }
+    
+    // If it's an object, try to convert to string
+    if (typeof date === 'object') {
+      // Handle various date object formats
+      if (date instanceof Date) {
+        return date.toISOString();
+      }
+      
+      // Handle ISO string within object
+      if (date.date) {
+        return date.date;
+      }
+      
+      // Handle other object formats
+      try {
+        return new Date(date).toISOString();
+      } catch {
+        return '';
+      }
+    }
+    
+    return '';
+  }
+
+  updateChartType(): void {
+    if (!this.chartType || !this.chartType.name) {
+      this.showError('Chart type name is required');
+      return;
+    }
+
+    this.loadingState = ClrLoadingState.LOADING;
+    this.chartTypeService.updateChartType(this.chartType.id, this.chartType).subscribe({
+      next: (data) => {
+        // Process the data to ensure dates are properly formatted
+        this.chartType = {
+          ...data,
+          createdAt: this.formatDate(data.createdAt),
+          updatedAt: this.formatDate(data.updatedAt)
+        };
+        this.showSuccess('Chart type updated successfully');
+        this.loadingState = ClrLoadingState.SUCCESS;
+        // Redirect to chart types list after a short delay
+        setTimeout(() => {
+          this.router.navigate(['/cns-portal/dashboardbuilder/chart-types']);
+        }, 1500);
+      },
+      error: (error) => {
+        console.error('Error updating chart type:', error);
+        this.showError('Error updating chart type: ' + (error.error?.message || error.message || 'Unknown error'));
+        this.loadingState = ClrLoadingState.ERROR;
+      }
+    });
+  }
+
+  onCancel(): void {
+    this.router.navigate(['/cns-portal/dashboardbuilder/chart-types']);
+  }
+
+  onDelete(): void {
+    if (!this.chartType) return;
+    
+    if (confirm('Are you sure you want to delete this chart type? This action cannot be undone.')) {
+      this.loadingState = ClrLoadingState.LOADING;
+      this.chartTypeService.deleteChartType(this.chartType.id).subscribe({
+        next: () => {
+          this.showSuccess('Chart type deleted successfully');
+          this.loadingState = ClrLoadingState.SUCCESS;
+          // Redirect to chart types list after a short delay
+          setTimeout(() => {
+            this.router.navigate(['/cns-portal/dashboardbuilder/chart-types']);
+          }, 1500);
+        },
+        error: (error) => {
+          console.error('Error deleting chart type:', error);
+          this.showError('Error deleting chart type: ' + (error.error?.message || error.message || 'Unknown error'));
+          this.loadingState = ClrLoadingState.ERROR;
+        }
+      });
+    }
+  }
+}
\ No newline at end of file
diff --git a/frontend/angular-clarity-master/src/app/modules/main/builder/dashboardnew/common-filter/EXAMPLE_USAGE.md b/frontend/angular-clarity-master/src/app/modules/main/builder/dashboardnew/common-filter/EXAMPLE_USAGE.md
new file mode 100644
index 0000000..3d536da
--- /dev/null
+++ b/frontend/angular-clarity-master/src/app/modules/main/builder/dashboardnew/common-filter/EXAMPLE_USAGE.md
@@ -0,0 +1,687 @@
+# Common Filter System - Example Usage
+
+## Dashboard Layout
+
+```
++-----------------------------------------------------+
+| Common Filter Widget (Draggable)                    |
+|                                                     |
+| [Category ▼] [Status ▼] [Date Range] [Active -toggle]|
+| [Save Preset] [Preset Selector] [Reset]             |
++-----------------------------------------------------+
+| +-----------+  +-----------+  +-----------+          |
+| | Bar Chart |  | Line Chart|  | Pie Chart |          |
+| |           |  |           |  |           |          |
+| |           |  |           |  |           |          |
+| +-----------+  +-----------+  +-----------+          |
+|                                                     |
+| +-----------+  +-----------+  +-----------+          |
+| | Table     |  | Map       |  | KPI Cards |          |
+| |           |  |           |  |           |          |
+| |           |  |           |  |           |          |
+| +-----------+  +-----------+  +-----------+          |
++-----------------------------------------------------+
+```
+
+## Filter Configuration Example
+
+### 1. Creating Filter Definitions
+
+```typescript
+// In CommonFilterComponent or dashboard initialization
+const filters: Filter[] = [
+  {
+    id: 'category',
+    field: 'product_category',
+    label: 'Category',
+    type: 'dropdown',
+    options: ['Electronics', 'Clothing', 'Home & Garden', 'Books', 'Sports']
+  },
+  {
+    id: 'status',
+    field: 'order_status',
+    label: 'Status',
+    type: 'multiselect',
+    options: ['Pending', 'Processing', 'Shipped', 'Delivered', 'Cancelled']
+  },
+  {
+    id: 'date_range',
+    field: 'order_date',
+    label: 'Order Date',
+    type: 'date-range'
+  },
+  {
+    id: 'active',
+    field: 'is_active',
+    label: 'Active Orders',
+    type: 'toggle'
+  }
+];
+
+// Set filters in the service
+filterService.setFilters(filters);
+```
+
+### 2. Setting Initial Filter Values
+
+```typescript
+// Set initial values
+filterService.updateFilterValue('category', 'Electronics');
+filterService.updateFilterValue('status', ['Processing', 'Shipped']);
+filterService.updateFilterValue('date_range', {
+  start: '2023-01-01',
+  end: '2023-12-31'
+});
+filterService.updateFilterValue('active', true);
+```
+
+### 3. Chart Component Integration
+
+```typescript
+// In bar-chart.component.ts
+export class BarChartComponent implements OnInit, OnChanges, OnDestroy {
+  private subscriptions: Subscription[] = [];
+
+  constructor(
+    private dashboardService: Dashboard3Service,
+    private filterService: FilterService
+  ) { }
+
+  ngOnInit(): void {
+    // Subscribe to filter changes
+    this.subscriptions.push(
+      this.filterService.filterState$.subscribe(filters => {
+        this.refreshData();
+      })
+    );
+    
+    // Load initial data
+    this.fetchChartData();
+  }
+
+  fetchChartData(): void {
+    // Get current filter values
+    const filterValues = this.filterService.getFilterValues();
+    
+    // Build filter parameters for API
+    let filterParams = '';
+    if (Object.keys(filterValues).length > 0) {
+      const filterObj = {};
+      
+      // Add base filters first
+      if (this.baseFilters && this.baseFilters.length > 0) {
+        this.baseFilters.forEach(filter => {
+          if (filter.field && filter.value) {
+            filterObj[filter.field] = filter.value;
+          }
+        });
+      }
+      
+      // Add common filters
+      Object.keys(filterValues).forEach(key => {
+        const value = filterValues[key];
+        if (value !== undefined && value !== null && value !== '') {
+          filterObj[key] = value;
+        }
+      });
+      
+      if (Object.keys(filterObj).length > 0) {
+        filterParams = JSON.stringify(filterObj);
+      }
+    }
+    
+    // Make API call with filters
+    this.dashboardService.getChartData(
+      this.table, 
+      'bar', 
+      this.xAxis, 
+      this.yAxis, 
+      this.connection, 
+      '', 
+      '', 
+      filterParams
+    ).subscribe(data => {
+      // Handle response
+      this.processChartData(data);
+    });
+  }
+
+  refreshData(): void {
+    this.fetchChartData();
+  }
+
+  ngOnDestroy(): void {
+    this.subscriptions.forEach(sub => sub.unsubscribe());
+  }
+}
+```
+
+### 4. API Endpoint Example
+
+```javascript
+// Backend API endpoint example
+app.get('/chart/getdashjson/bar', (req, res) => {
+  const {
+    tableName,
+    xAxis,
+    yAxes,
+    sureId,
+    filters // JSON string of filters
+  } = req.query;
+  
+  // Parse filters
+  let filterObj = {};
+  if (filters) {
+    try {
+      filterObj = JSON.parse(filters);
+    } catch (e) {
+      console.error('Failed to parse filters:', e);
+    }
+  }
+  
+  // Build database query with filters
+  let query = `SELECT ${xAxis}, ${yAxes} FROM ${tableName}`;
+  const whereConditions = [];
+  
+  // Add filter conditions
+  Object.keys(filterObj).forEach(field => {
+    const value = filterObj[field];
+    if (Array.isArray(value)) {
+      // Handle multiselect (IN clause)
+      const values = value.map(v => `'${v}'`).join(',');
+      whereConditions.push(`${field} IN (${values})`);
+    } else if (typeof value === 'object' && value.start && value.end) {
+      // Handle date range
+      whereConditions.push(`${field} BETWEEN '${value.start}' AND '${value.end}'`);
+    } else if (typeof value === 'boolean') {
+      // Handle boolean
+      whereConditions.push(`${field} = ${value}`);
+    } else {
+      // Handle text and other values
+      whereConditions.push(`${field} = '${value}'`);
+    }
+  });
+  
+  if (whereConditions.length > 0) {
+    query += ` WHERE ${whereConditions.join(' AND ')}`;
+  }
+  
+  // Execute query and return results
+  database.query(query, (err, results) => {
+    if (err) {
+      res.status(500).json({ error: err.message });
+    } else {
+      res.json({
+        chartLabels: results.map(row => row[xAxis]),
+        chartData: [{
+          data: results.map(row => row[yAxes]),
+          label: yAxes
+        }]
+      });
+    }
+  });
+});
+```
+
+## Filter Presets Example
+
+### Saving a Preset
+
+```typescript
+// Save current filter state as a preset
+const presetName = 'Q4 2023 Sales';
+filterService.savePreset(presetName);
+
+// Preset is now available in the presets list
+const presets = filterService.getPresets(); // ['Q4 2023 Sales', ...]
+```
+
+### Loading a Preset
+
+```typescript
+// Load a saved preset
+filterService.loadPreset('Q4 2023 Sales');
+
+// All charts will automatically refresh with the preset filters
+```
+
+## Cross-Filtering Example
+
+```typescript
+// In a chart component, handle click events
+onBarClick(event: any): void {
+  const clickedCategory = event.active[0]._model.label;
+  
+  // Update the category filter
+  this.filterService.updateFilterValue('category', clickedCategory);
+  
+  // All other charts will automatically update
+}
+```
+
+## URL Synchronization Example
+
+```typescript
+// Update URL when filters change
+this.filterService.filterState$.subscribe(filters => {
+  const queryParams = new URLSearchParams();
+  
+  Object.keys(filters).forEach(key => {
+    const value = filters[key];
+    if (value !== undefined && value !== null && value !== '') {
+      if (typeof value === 'object') {
+        if (value.hasOwnProperty('start') && value.hasOwnProperty('end')) {
+          // Date range
+          if (value.start) queryParams.append(`${key}_start`, value.start);
+          if (value.end) queryParams.append(`${key}_end`, value.end);
+        } else {
+          // Other objects as JSON
+          queryParams.append(key, JSON.stringify(value));
+        }
+      } else {
+        // Simple values
+        queryParams.append(key, value.toString());
+      }
+    }
+  });
+  
+  // Update browser URL
+  const newUrl = `${window.location.pathname}?${queryParams.toString()}`;
+  window.history.replaceState({}, '', newUrl);
+});
+
+// Load filters from URL on page load
+ngOnInit(): void {
+  const urlParams = new URLSearchParams(window.location.search);
+  const filterState: any = {};
+  
+  // Parse URL parameters back into filter state
+  for (const [key, value] of urlParams.entries()) {
+    if (key.endsWith('_start')) {
+      const fieldName = key.replace('_start', '');
+      filterState[fieldName] = filterState[fieldName] || {};
+      filterState[fieldName].start = value;
+    } else if (key.endsWith('_end')) {
+      const fieldName = key.replace('_end', '');
+      filterState[fieldName] = filterState[fieldName] || {};
+      filterState[fieldName].end = value;
+    } else {
+      try {
+        filterState[key] = JSON.parse(value);
+      } catch (e) {
+        filterState[key] = value;
+      }
+    }
+  }
+  
+  // Apply URL filters
+  Object.keys(filterState).forEach(key => {
+    this.filterService.updateFilterValue(key, filterState[key]);
+  });
+}
+```
+
+## Data Flow Diagram
+
+```mermaid
+sequenceDiagram
+    participant User
+    participant CommonFilterComponent
+    participant FilterService
+    participant ChartComponent
+    participant API
+
+    User->>CommonFilterComponent: Configure filters
+    CommonFilterComponent->>FilterService: Update filter state
+    FilterService->>ChartComponent: Notify filter change
+    ChartComponent->>FilterService: Request current filters
+    FilterService-->>ChartComponent: Return filter values
+    ChartComponent->>API: Fetch data with filters
+    API-->>ChartComponent: Return filtered data
+    ChartComponent->>User: Display updated chart
+```
+
+This implementation provides a robust, scalable solution for managing common filters across multiple dashboard components with real-time updates and flexible configuration options.# Common Filter System - Example Usage
+
+## Dashboard Layout
+
+```
++-----------------------------------------------------+
+| Common Filter Widget (Draggable)                    |
+|                                                     |
+| [Category ▼] [Status ▼] [Date Range] [Active -toggle]|
+| [Save Preset] [Preset Selector] [Reset]             |
++-----------------------------------------------------+
+| +-----------+  +-----------+  +-----------+          |
+| | Bar Chart |  | Line Chart|  | Pie Chart |          |
+| |           |  |           |  |           |          |
+| |           |  |           |  |           |          |
+| +-----------+  +-----------+  +-----------+          |
+|                                                     |
+| +-----------+  +-----------+  +-----------+          |
+| | Table     |  | Map       |  | KPI Cards |          |
+| |           |  |           |  |           |          |
+| |           |  |           |  |           |          |
+| +-----------+  +-----------+  +-----------+          |
++-----------------------------------------------------+
+```
+
+## Filter Configuration Example
+
+### 1. Creating Filter Definitions
+
+```typescript
+// In CommonFilterComponent or dashboard initialization
+const filters: Filter[] = [
+  {
+    id: 'category',
+    field: 'product_category',
+    label: 'Category',
+    type: 'dropdown',
+    options: ['Electronics', 'Clothing', 'Home & Garden', 'Books', 'Sports']
+  },
+  {
+    id: 'status',
+    field: 'order_status',
+    label: 'Status',
+    type: 'multiselect',
+    options: ['Pending', 'Processing', 'Shipped', 'Delivered', 'Cancelled']
+  },
+  {
+    id: 'date_range',
+    field: 'order_date',
+    label: 'Order Date',
+    type: 'date-range'
+  },
+  {
+    id: 'active',
+    field: 'is_active',
+    label: 'Active Orders',
+    type: 'toggle'
+  }
+];
+
+// Set filters in the service
+filterService.setFilters(filters);
+```
+
+### 2. Setting Initial Filter Values
+
+```typescript
+// Set initial values
+filterService.updateFilterValue('category', 'Electronics');
+filterService.updateFilterValue('status', ['Processing', 'Shipped']);
+filterService.updateFilterValue('date_range', {
+  start: '2023-01-01',
+  end: '2023-12-31'
+});
+filterService.updateFilterValue('active', true);
+```
+
+### 3. Chart Component Integration
+
+```typescript
+// In bar-chart.component.ts
+export class BarChartComponent implements OnInit, OnChanges, OnDestroy {
+  private subscriptions: Subscription[] = [];
+
+  constructor(
+    private dashboardService: Dashboard3Service,
+    private filterService: FilterService
+  ) { }
+
+  ngOnInit(): void {
+    // Subscribe to filter changes
+    this.subscriptions.push(
+      this.filterService.filterState$.subscribe(filters => {
+        this.refreshData();
+      })
+    );
+    
+    // Load initial data
+    this.fetchChartData();
+  }
+
+  fetchChartData(): void {
+    // Get current filter values
+    const filterValues = this.filterService.getFilterValues();
+    
+    // Build filter parameters for API
+    let filterParams = '';
+    if (Object.keys(filterValues).length > 0) {
+      const filterObj = {};
+      
+      // Add base filters first
+      if (this.baseFilters && this.baseFilters.length > 0) {
+        this.baseFilters.forEach(filter => {
+          if (filter.field && filter.value) {
+            filterObj[filter.field] = filter.value;
+          }
+        });
+      }
+      
+      // Add common filters
+      Object.keys(filterValues).forEach(key => {
+        const value = filterValues[key];
+        if (value !== undefined && value !== null && value !== '') {
+          filterObj[key] = value;
+        }
+      });
+      
+      if (Object.keys(filterObj).length > 0) {
+        filterParams = JSON.stringify(filterObj);
+      }
+    }
+    
+    // Make API call with filters
+    this.dashboardService.getChartData(
+      this.table, 
+      'bar', 
+      this.xAxis, 
+      this.yAxis, 
+      this.connection, 
+      '', 
+      '', 
+      filterParams
+    ).subscribe(data => {
+      // Handle response
+      this.processChartData(data);
+    });
+  }
+
+  refreshData(): void {
+    this.fetchChartData();
+  }
+
+  ngOnDestroy(): void {
+    this.subscriptions.forEach(sub => sub.unsubscribe());
+  }
+}
+```
+
+### 4. API Endpoint Example
+
+```javascript
+// Backend API endpoint example
+app.get('/chart/getdashjson/bar', (req, res) => {
+  const {
+    tableName,
+    xAxis,
+    yAxes,
+    sureId,
+    filters // JSON string of filters
+  } = req.query;
+  
+  // Parse filters
+  let filterObj = {};
+  if (filters) {
+    try {
+      filterObj = JSON.parse(filters);
+    } catch (e) {
+      console.error('Failed to parse filters:', e);
+    }
+  }
+  
+  // Build database query with filters
+  let query = `SELECT ${xAxis}, ${yAxes} FROM ${tableName}`;
+  const whereConditions = [];
+  
+  // Add filter conditions
+  Object.keys(filterObj).forEach(field => {
+    const value = filterObj[field];
+    if (Array.isArray(value)) {
+      // Handle multiselect (IN clause)
+      const values = value.map(v => `'${v}'`).join(',');
+      whereConditions.push(`${field} IN (${values})`);
+    } else if (typeof value === 'object' && value.start && value.end) {
+      // Handle date range
+      whereConditions.push(`${field} BETWEEN '${value.start}' AND '${value.end}'`);
+    } else if (typeof value === 'boolean') {
+      // Handle boolean
+      whereConditions.push(`${field} = ${value}`);
+    } else {
+      // Handle text and other values
+      whereConditions.push(`${field} = '${value}'`);
+    }
+  });
+  
+  if (whereConditions.length > 0) {
+    query += ` WHERE ${whereConditions.join(' AND ')}`;
+  }
+  
+  // Execute query and return results
+  database.query(query, (err, results) => {
+    if (err) {
+      res.status(500).json({ error: err.message });
+    } else {
+      res.json({
+        chartLabels: results.map(row => row[xAxis]),
+        chartData: [{
+          data: results.map(row => row[yAxes]),
+          label: yAxes
+        }]
+      });
+    }
+  });
+});
+```
+
+## Filter Presets Example
+
+### Saving a Preset
+
+```typescript
+// Save current filter state as a preset
+const presetName = 'Q4 2023 Sales';
+filterService.savePreset(presetName);
+
+// Preset is now available in the presets list
+const presets = filterService.getPresets(); // ['Q4 2023 Sales', ...]
+```
+
+### Loading a Preset
+
+```typescript
+// Load a saved preset
+filterService.loadPreset('Q4 2023 Sales');
+
+// All charts will automatically refresh with the preset filters
+```
+
+## Cross-Filtering Example
+
+```typescript
+// In a chart component, handle click events
+onBarClick(event: any): void {
+  const clickedCategory = event.active[0]._model.label;
+  
+  // Update the category filter
+  this.filterService.updateFilterValue('category', clickedCategory);
+  
+  // All other charts will automatically update
+}
+```
+
+## URL Synchronization Example
+
+```typescript
+// Update URL when filters change
+this.filterService.filterState$.subscribe(filters => {
+  const queryParams = new URLSearchParams();
+  
+  Object.keys(filters).forEach(key => {
+    const value = filters[key];
+    if (value !== undefined && value !== null && value !== '') {
+      if (typeof value === 'object') {
+        if (value.hasOwnProperty('start') && value.hasOwnProperty('end')) {
+          // Date range
+          if (value.start) queryParams.append(`${key}_start`, value.start);
+          if (value.end) queryParams.append(`${key}_end`, value.end);
+        } else {
+          // Other objects as JSON
+          queryParams.append(key, JSON.stringify(value));
+        }
+      } else {
+        // Simple values
+        queryParams.append(key, value.toString());
+      }
+    }
+  });
+  
+  // Update browser URL
+  const newUrl = `${window.location.pathname}?${queryParams.toString()}`;
+  window.history.replaceState({}, '', newUrl);
+});
+
+// Load filters from URL on page load
+ngOnInit(): void {
+  const urlParams = new URLSearchParams(window.location.search);
+  const filterState: any = {};
+  
+  // Parse URL parameters back into filter state
+  for (const [key, value] of urlParams.entries()) {
+    if (key.endsWith('_start')) {
+      const fieldName = key.replace('_start', '');
+      filterState[fieldName] = filterState[fieldName] || {};
+      filterState[fieldName].start = value;
+    } else if (key.endsWith('_end')) {
+      const fieldName = key.replace('_end', '');
+      filterState[fieldName] = filterState[fieldName] || {};
+      filterState[fieldName].end = value;
+    } else {
+      try {
+        filterState[key] = JSON.parse(value);
+      } catch (e) {
+        filterState[key] = value;
+      }
+    }
+  }
+  
+  // Apply URL filters
+  Object.keys(filterState).forEach(key => {
+    this.filterService.updateFilterValue(key, filterState[key]);
+  });
+}
+```
+
+## Data Flow Diagram
+
+```mermaid
+sequenceDiagram
+    participant User
+    participant CommonFilterComponent
+    participant FilterService
+    participant ChartComponent
+    participant API
+
+    User->>CommonFilterComponent: Configure filters
+    CommonFilterComponent->>FilterService: Update filter state
+    FilterService->>ChartComponent: Notify filter change
+    ChartComponent->>FilterService: Request current filters
+    FilterService-->>ChartComponent: Return filter values
+    ChartComponent->>API: Fetch data with filters
+    API-->>ChartComponent: Return filtered data
+    ChartComponent->>User: Display updated chart
+```
+
+This implementation provides a robust, scalable solution for managing common filters across multiple dashboard components with real-time updates and flexible configuration options.
\ No newline at end of file
diff --git a/frontend/angular-clarity-master/src/app/modules/main/builder/dashboardnew/common-filter/IMPLEMENTATION_GUIDE.md b/frontend/angular-clarity-master/src/app/modules/main/builder/dashboardnew/common-filter/IMPLEMENTATION_GUIDE.md
new file mode 100644
index 0000000..b56127f
--- /dev/null
+++ b/frontend/angular-clarity-master/src/app/modules/main/builder/dashboardnew/common-filter/IMPLEMENTATION_GUIDE.md
@@ -0,0 +1,219 @@
+# Common Filter Implementation Guide
+
+## Overview
+
+This implementation provides a centralized filter system that allows users to control multiple charts simultaneously through a draggable filter widget. The system consists of:
+
+1. **FilterService** - Central service managing filter definitions and state
+2. **CommonFilterComponent** - Draggable widget for configuring filters
+3. **Chart Components** - Updated chart components that subscribe to filter changes
+
+## Architecture
+
+```mermaid
+graph TB
+    A[FilterService] --> B[CommonFilterComponent]
+    A --> C[BarChartComponent]
+    A --> D[LineChartComponent]
+    A --> E[OtherChartComponents]
+    F[User Interaction] --> B
+```
+
+## Key Components
+
+### 1. FilterService
+
+The central service that manages:
+- Filter definitions (type, options, labels)
+- Current filter values
+- Filter presets
+- Query parameter generation for API calls
+
+#### Methods:
+- `addFilter()` - Add a new filter
+- `removeFilter()` - Remove a filter
+- `updateFilterValue()` - Update a filter's value
+- `getFilterValues()` - Get current filter values
+- `resetFilters()` - Reset all filters to default values
+- `savePreset()` - Save current filter state as a preset
+- `loadPreset()` - Load a saved preset
+- `buildQueryParams()` - Generate query parameters for API calls
+
+### 2. CommonFilterComponent
+
+A draggable widget that provides the UI for:
+- Adding/removing filters
+- Configuring filter properties
+- Setting filter values
+- Managing presets
+
+### 3. Chart Components
+
+Updated chart components that:
+- Subscribe to filter changes
+- Automatically refresh when filters change
+- Include filter values in API calls
+
+## Implementation Details
+
+### Filter Types Supported
+
+1. **Text** - Simple text input
+2. **Dropdown** - Single selection from options
+3. **Multiselect** - Multiple selection from options
+4. **Date Range** - Start and end date selection
+5. **Toggle** - Boolean on/off switch
+
+### Data Flow
+
+1. User adds/configures filters in CommonFilterComponent
+2. FilterService stores filter definitions and values
+3. Chart components subscribe to FilterService.filterState$
+4. When filters change, charts automatically refresh
+5. Filter values are included in API calls as query parameters
+
+### API Integration
+
+Filters are passed to the backend as query parameters:
+- Text filter: `name=John`
+- Dropdown filter: `category=A`
+- Multiselect filter: `tags=["tag1","tag2"]`
+- Date range filter: `date_start=2023-01-01&date_end=2023-12-31`
+- Toggle filter: `isActive=true`
+
+## Usage Examples
+
+### Adding the Common Filter Widget
+
+1. Drag the "Common Filter" widget from the component palette
+2. Place it at the top of the dashboard
+3. Configure filters as needed
+
+### Creating Filters
+
+```typescript
+// Add a text filter
+const textFilter: Filter = {
+  id: 'name',
+  field: 'name',
+  label: 'Name',
+  type: 'text'
+};
+
+// Add a dropdown filter
+const dropdownFilter: Filter = {
+  id: 'category',
+  field: 'category',
+  label: 'Category',
+  type: 'dropdown',
+  options: ['A', 'B', 'C']
+};
+```
+
+### Consuming Filters in Charts
+
+```typescript
+// In chart component
+constructor(private filterService: FilterService) {}
+
+ngOnInit(): void {
+  // Subscribe to filter changes
+  this.subscriptions.push(
+    this.filterService.filterState$.subscribe(filters => {
+      this.fetchChartData();
+    })
+  );
+}
+
+fetchChartData(): void {
+  // Get current filter values
+  const filterValues = this.filterService.getFilterValues();
+  
+  // Include in API call
+  const queryParams = this.filterService.buildQueryParams();
+  // Use queryParams in API call
+}
+```
+
+## JSON Structures
+
+### Filter Definition
+
+```json
+{
+  "id": "filter_123456",
+  "field": "category",
+  "label": "Category",
+  "type": "dropdown",
+  "options": ["Electronics", "Clothing", "Books"],
+  "value": "Electronics"
+}
+```
+
+### Filter State
+
+```json
+{
+  "category": "Electronics",
+  "price_range": {
+    "start": 100,
+    "end": 500
+  },
+  "in_stock": true,
+  "tags": ["sale", "featured"]
+}
+```
+
+### API Response Format
+
+```json
+{
+  "chartLabels": ["Jan", "Feb", "Mar"],
+  "chartData": [
+    {
+      "data": [10, 20, 30],
+      "label": "Sales"
+    }
+  ]
+}
+```
+
+## Cross-Filtering Support
+
+Charts can also support cross-filtering where clicking on one chart updates the common filters:
+
+1. Implement click handlers in chart components
+2. Update filter values through FilterService
+3. All other charts automatically refresh
+
+Example:
+```typescript
+onChartClick(dataPoint: any): void {
+  // Update a filter based on chart click
+  this.filterService.updateFilterValue('category', dataPoint.category);
+}
+```
+
+## Preset Management
+
+Users can save and load filter presets:
+
+1. Configure desired filters
+2. Enter a preset name and click "Save Preset"
+3. Select preset from dropdown to load
+4. Delete presets as needed
+
+## URL Synchronization
+
+Filter states can be synchronized with URL query parameters for shareable dashboards:
+
+1. On filter change, update URL query parameters
+2. On page load, read filters from URL
+3. Apply filters to charts
+
+## Optional Enhancements
+
+1. **Real-time Updates** - WebSocket integration for live data
+2. **Advanced Filtering** - Custom filter expressions
+3. **Filter Dependencies** - Conditional filters based on other filter values
+4. **Analytics** - Track most used filters and combinations
\ No newline at end of file
diff --git a/frontend/angular-clarity-master/src/app/modules/main/builder/dashboardnew/common-filter/chart-wrapper.component.scss b/frontend/angular-clarity-master/src/app/modules/main/builder/dashboardnew/common-filter/chart-wrapper.component.scss
new file mode 100644
index 0000000..822c149
--- /dev/null
+++ b/frontend/angular-clarity-master/src/app/modules/main/builder/dashboardnew/common-filter/chart-wrapper.component.scss
@@ -0,0 +1,68 @@
+.chart-wrapper {
+  height: 100%;
+  width: 100%;
+  display: flex;
+  flex-direction: column;
+  box-sizing: border-box;
+  
+  .chart-header {
+    padding: 10px 15px;
+    background: #f8f8f8;
+    border-bottom: 1px solid #eee;
+    
+    h5 {
+      margin: 0;
+      color: #333;
+      font-size: 16px;
+      white-space: nowrap;
+      overflow: hidden;
+      text-overflow: ellipsis;
+    }
+  }
+  
+  .chart-container {
+    flex: 1;
+    padding: 15px;
+    overflow: auto;
+    position: relative;
+    
+    // Ensure chart containers fill available space
+    ::ng-deep canvas {
+      max-width: 100%;
+      max-height: 100%;
+    }
+  }
+}
+
+// Responsive adjustments
+@media (max-width: 768px) {
+  .chart-wrapper {
+    .chart-header {
+      padding: 8px 12px;
+      
+      h5 {
+        font-size: 14px;
+      }
+    }
+    
+    .chart-container {
+      padding: 10px;
+    }
+  }
+}
+
+@media (max-width: 480px) {
+  .chart-wrapper {
+    .chart-header {
+      padding: 6px 10px;
+      
+      h5 {
+        font-size: 13px;
+      }
+    }
+    
+    .chart-container {
+      padding: 8px;
+    }
+  }
+}
\ No newline at end of file
diff --git a/frontend/angular-clarity-master/src/app/modules/main/builder/dashboardnew/common-filter/chart-wrapper.component.spec.ts b/frontend/angular-clarity-master/src/app/modules/main/builder/dashboardnew/common-filter/chart-wrapper.component.spec.ts
new file mode 100644
index 0000000..74d20dd
--- /dev/null
+++ b/frontend/angular-clarity-master/src/app/modules/main/builder/dashboardnew/common-filter/chart-wrapper.component.spec.ts
@@ -0,0 +1,39 @@
+import { ComponentFixture, TestBed } from '@angular/core/testing';
+import { ChartWrapperComponent } from './chart-wrapper.component';
+import { FilterService } from './filter.service';
+
+describe('ChartWrapperComponent', () => {
+  let component: ChartWrapperComponent;
+  let fixture: ComponentFixture<ChartWrapperComponent>;
+  let filterService: FilterService;
+
+  beforeEach(async () => {
+    await TestBed.configureTestingModule({
+      declarations: [ChartWrapperComponent],
+      providers: [FilterService]
+    })
+    .compileComponents();
+    
+    fixture = TestBed.createComponent(ChartWrapperComponent);
+    component = fixture.componentInstance;
+    filterService = TestBed.inject(FilterService);
+    fixture.detectChanges();
+  });
+
+  it('should create', () => {
+    expect(component).toBeTruthy();
+  });
+
+  it('should subscribe to filter changes on init', () => {
+    spyOn(filterService.filterState$, 'subscribe');
+    component.ngOnInit();
+    expect(filterService.filterState$.subscribe).toHaveBeenCalled();
+  });
+
+  it('should unsubscribe from filter changes on destroy', () => {
+    component.ngOnInit();
+    spyOn(component['filterSubscription']!, 'unsubscribe');
+    component.ngOnDestroy();
+    expect(component['filterSubscription']!.unsubscribe).toHaveBeenCalled();
+  });
+});
\ No newline at end of file
diff --git a/frontend/angular-clarity-master/src/app/modules/main/builder/dashboardnew/common-filter/chart-wrapper.component.ts b/frontend/angular-clarity-master/src/app/modules/main/builder/dashboardnew/common-filter/chart-wrapper.component.ts
new file mode 100644
index 0000000..3552f1b
--- /dev/null
+++ b/frontend/angular-clarity-master/src/app/modules/main/builder/dashboardnew/common-filter/chart-wrapper.component.ts
@@ -0,0 +1,111 @@
+import { Component, Input, OnInit, OnDestroy, ComponentRef, ViewChild, ViewContainerRef, HostListener } from '@angular/core';
+import { Subscription } from 'rxjs';
+import { FilterService } from './filter.service';
+
+@Component({
+  selector: 'app-chart-wrapper',
+  template: `
+    <div class="chart-wrapper">
+      <div class="chart-header" *ngIf="chartTitle">
+        <h5>{{ chartTitle }}</h5>
+      </div>
+      <div class="chart-container">
+        <ng-container #chartContainer></ng-container>
+      </div>
+    </div>
+  `,
+  styleUrls: ['./chart-wrapper.component.scss']
+})
+export class ChartWrapperComponent implements OnInit, OnDestroy {
+  @Input() chartComponent: any;
+  @Input() chartInputs: any = {};
+  @Input() chartTitle: string = '';
+
+  @ViewChild('chartContainer', { read: ViewContainerRef }) chartContainer!: ViewContainerRef;
+
+  private componentRef: ComponentRef<any> | null = null;
+  private filterSubscription: Subscription | null = null;
+
+  constructor(private filterService: FilterService) { }
+
+  ngOnInit(): void {
+    this.loadChartComponent();
+    this.subscribeToFilters();
+  }
+
+  ngOnDestroy(): void {
+    if (this.filterSubscription) {
+      this.filterSubscription.unsubscribe();
+    }
+    if (this.componentRef) {
+      this.componentRef.destroy();
+    }
+  }
+  
+  // Handle window resize events
+  @HostListener('window:resize', ['$event'])
+  onResize(event: any) {
+    // Notify the chart component to resize if it has a resize method
+    if (this.componentRef && this.componentRef.instance) {
+      const chartInstance = this.componentRef.instance;
+      
+      // If it's a chart component with an onResize method, call it
+      if (chartInstance.onResize && typeof chartInstance.onResize === 'function') {
+        chartInstance.onResize();
+      }
+      
+      // If it's a chart component with a chart property (from BaseChartDirective), resize it
+      if (chartInstance.chart && typeof chartInstance.chart.resize === 'function') {
+        setTimeout(() => {
+          chartInstance.chart.resize();
+        }, 100);
+      }
+    }
+  }
+
+  private loadChartComponent(): void {
+    if (this.chartContainer && this.chartComponent) {
+      this.chartContainer.clear();
+      const factory = this.chartContainer.createComponent(this.chartComponent);
+      this.componentRef = factory;
+      
+      // Set initial inputs
+      Object.keys(this.chartInputs).forEach(key => {
+        factory.instance[key] = this.chartInputs[key];
+      });
+    }
+  }
+
+  private subscribeToFilters(): void {
+    this.filterSubscription = this.filterService.filterState$.subscribe(filterValues => {
+      this.updateChartWithFilters(filterValues);
+    });
+  }
+
+  private updateChartWithFilters(filterValues: any): void {
+    if (this.componentRef) {
+      // Add filter values to chart inputs
+      const updatedInputs = {
+        ...this.chartInputs,
+        filterValues: filterValues,
+        // Pass the query params string for easy API integration
+        filterQueryParams: this.filterService.buildQueryParams()
+      };
+
+      // Update chart component inputs
+      Object.keys(updatedInputs).forEach(key => {
+        this.componentRef!.instance[key] = updatedInputs[key];
+      });
+
+      // Trigger change detection if the component has a method for it
+      if (this.componentRef!.instance.ngOnChanges) {
+        // We can't easily trigger ngOnChanges manually, but the input update should trigger it
+      }
+      
+      // If the chart component has a method to refresh data, call it
+      if (this.componentRef!.instance.refreshData) {
+        this.componentRef!.instance.refreshData();
+      }
+    }
+  }
+}
\ No newline at end of file
diff --git a/frontend/angular-clarity-master/src/app/modules/main/builder/dashboardnew/common-filter/common-filter.component.html b/frontend/angular-clarity-master/src/app/modules/main/builder/dashboardnew/common-filter/common-filter.component.html
new file mode 100644
index 0000000..9fa578a
--- /dev/null
+++ b/frontend/angular-clarity-master/src/app/modules/main/builder/dashboardnew/common-filter/common-filter.component.html
@@ -0,0 +1,128 @@
+<div class="common-filter-container">
+  <!-- Filter Header -->
+  <div class="filter-header">
+    <h4>Common Filters</h4>
+    <button class="btn btn-sm btn-primary" (click)="addFilter()">
+      <clr-icon shape="plus"></clr-icon> Add Filter
+    </button>
+  </div>
+
+  <!-- Presets Section -->
+  <div class="presets-section" *ngIf="presets.length > 0">
+    <div class="preset-controls">
+      <select [(ngModel)]="activePreset" (change)="loadPreset(activePreset || '')" class="clr-select">
+        <option value="">Select Preset</option>
+        <option *ngFor="let preset of presets" [value]="preset">{{ preset }}</option>
+      </select>
+      <button class="btn btn-sm btn-danger" (click)="resetFilters()">
+        <clr-icon shape="undo"></clr-icon> Reset
+      </button>
+    </div>
+  </div>
+
+  <!-- Save Preset Section -->
+  <div class="save-preset-section">
+    <div class="clr-input-group">
+      <input type="text" [(ngModel)]="newPresetName" placeholder="Preset name" class="clr-input">
+      <div class="clr-input-group-btn">
+        <button class="btn btn-sm btn-success" (click)="savePreset()" [disabled]="!newPresetName.trim()">
+          <clr-icon shape="floppy"></clr-icon> Save Preset
+        </button>
+      </div>
+    </div>
+  </div>
+
+  <!-- Filters Form -->
+  <form [formGroup]="filterForm" class="filters-form">
+    <div class="filters-grid">
+      <div *ngFor="let filter of filters" class="filter-item">
+        <div class="filter-header">
+          <span class="filter-label">{{ filter.label }}</span>
+          <button class="btn btn-icon btn-danger btn-sm" (click)="removeFilter(filter.id)">
+            <clr-icon shape="trash"></clr-icon>
+          </button>
+        </div>
+
+        <!-- Filter Type Selector -->
+        <div class="clr-form-control">
+          <select [(ngModel)]="filter.type" (ngModelChange)="updateFilter(filter.id, 'type', $event)" 
+                  [ngModelOptions]="{standalone: true}" class="clr-select filter-type-select">
+            <option value="text">Text</option>
+            <option value="dropdown">Dropdown</option>
+            <option value="multiselect">Multi-Select</option>
+            <option value="date-range">Date Range</option>
+            <option value="toggle">Toggle</option>
+          </select>
+        </div>
+
+        <!-- Filter Label Input -->
+        <div class="clr-form-control">
+          <input type="text" [(ngModel)]="filter.label" (ngModelChange)="updateFilter(filter.id, 'label', $event)" 
+                 [ngModelOptions]="{standalone: true}" placeholder="Filter Label" class="clr-input">
+        </div>
+
+        <!-- Filter Field Input -->
+        <div class="clr-form-control">
+          <input type="text" [(ngModel)]="filter.field" (ngModelChange)="updateFilter(filter.id, 'field', $event)" 
+                 [ngModelOptions]="{standalone: true}" placeholder="Field Name" class="clr-input">
+        </div>
+
+        <!-- Filter Options (for dropdown and multiselect) -->
+        <div class="clr-form-control" *ngIf="filter.type === 'dropdown' || filter.type === 'multiselect'">
+          <textarea [(ngModel)]="filter.options" (ngModelChange)="updateFilter(filter.id, 'options', $event ? $event.split(',') : [])" 
+                    [ngModelOptions]="{standalone: true}" placeholder="Options (comma separated)" class="clr-textarea"></textarea>
+        </div>
+
+        <!-- Filter Controls Based on Type -->
+        <div class="filter-control" [ngSwitch]="filter.type">
+          <!-- Text Filter -->
+          <div *ngSwitchCase="'text'">
+            <input type="text" [formControlName]="filter.id" placeholder="Enter text" class="clr-input">
+          </div>
+
+          <!-- Dropdown Filter -->
+          <div *ngSwitchCase="'dropdown'">
+            <select [formControlName]="filter.id" class="clr-select">
+              <option value="">Select an option</option>
+              <option *ngFor="let option of filter.options" [value]="option">{{ option }}</option>
+            </select>
+          </div>
+
+          <!-- Multi-Select Filter -->
+          <div *ngSwitchCase="'multiselect'">
+            <select [formControlName]="filter.id" multiple class="clr-select multiselect">
+              <option *ngFor="let option of filter.options" [value]="option">{{ option }}</option>
+            </select>
+          </div>
+
+          <!-- Date Range Filter -->
+          <div *ngSwitchCase="'date-range'" class="date-range-controls">
+            <div class="clr-form-control">
+              <label>Start Date</label>
+              <input type="date" [ngModel]="filterForm.get(filter.id + '.start')?.value" 
+                     (ngModelChange)="onDateRangeChange(filter.id, { start: $event, end: filterForm.get(filter.id + '.end')?.value })" 
+                     [ngModelOptions]="{standalone: true}" class="clr-input">
+            </div>
+            <div class="clr-form-control">
+              <label>End Date</label>
+              <input type="date" [ngModel]="filterForm.get(filter.id + '.end')?.value" 
+                     (ngModelChange)="onDateRangeChange(filter.id, { start: filterForm.get(filter.id + '.start')?.value, end: $event })" 
+                     [ngModelOptions]="{standalone: true}" class="clr-input">
+            </div>
+          </div>
+
+          <!-- Toggle Filter -->
+          <div *ngSwitchCase="'toggle'" class="toggle-control">
+            <input type="checkbox" [formControlName]="filter.id" clrToggle class="clr-toggle">
+            <label>{{ filter.label }}</label>
+          </div>
+        </div>
+      </div>
+    </div>
+  </form>
+
+  <!-- No Filters Message -->
+  <div class="no-filters" *ngIf="filters.length === 0">
+    <p>No filters added yet. Click "Add Filter" to create your first filter.</p>
+  </div>
+</div>
\ No newline at end of file
diff --git a/frontend/angular-clarity-master/src/app/modules/main/builder/dashboardnew/common-filter/common-filter.component.scss b/frontend/angular-clarity-master/src/app/modules/main/builder/dashboardnew/common-filter/common-filter.component.scss
new file mode 100644
index 0000000..3bb3cb7
--- /dev/null
+++ b/frontend/angular-clarity-master/src/app/modules/main/builder/dashboardnew/common-filter/common-filter.component.scss
@@ -0,0 +1,192 @@
+.common-filter-container {
+  padding: 15px;
+  background: #f5f5f5;
+  border: 1px solid #ddd;
+  border-radius: 4px;
+  margin-bottom: 20px;
+  height: 100%;
+  width: 100%;
+  box-sizing: border-box;
+
+  .filter-header {
+    display: flex;
+    justify-content: space-between;
+    align-items: center;
+    margin-bottom: 15px;
+    flex-wrap: wrap;
+    gap: 10px;
+
+    h4 {
+      margin: 0;
+      color: #333;
+      flex: 1;
+    }
+    
+    .btn {
+      white-space: nowrap;
+    }
+  }
+
+  .presets-section {
+    margin-bottom: 15px;
+    
+    .preset-controls {
+      display: flex;
+      gap: 10px;
+      align-items: center;
+      flex-wrap: wrap;
+      
+      select {
+        flex: 1;
+        min-width: 150px;
+      }
+      
+      .btn {
+        white-space: nowrap;
+      }
+    }
+  }
+
+  .save-preset-section {
+    margin-bottom: 15px;
+    
+    .clr-input-group {
+      display: flex;
+      flex-wrap: wrap;
+      gap: 10px;
+      
+      .clr-input {
+        flex: 1;
+        min-width: 150px;
+      }
+      
+      .clr-input-group-btn {
+        .btn {
+          white-space: nowrap;
+        }
+      }
+    }
+  }
+
+  .filters-form {
+    .filters-grid {
+      display: grid;
+      grid-template-columns: repeat(auto-fill, minmax(250px, 1fr));
+      gap: 15px;
+      
+      .filter-item {
+        background: white;
+        border: 1px solid #e0e0e0;
+        border-radius: 4px;
+        padding: 15px;
+        display: flex;
+        flex-direction: column;
+        
+        .filter-header {
+          display: flex;
+          justify-content: space-between;
+          align-items: center;
+          margin-bottom: 10px;
+          
+          .filter-label {
+            font-weight: bold;
+            color: #333;
+            flex: 1;
+            white-space: nowrap;
+            overflow: hidden;
+            text-overflow: ellipsis;
+          }
+        }
+        
+        .filter-type-select {
+          width: 100%;
+          margin-bottom: 10px;
+        }
+        
+        .clr-form-control {
+          margin-bottom: 10px;
+          
+          input, select, textarea {
+            width: 100%;
+            min-width: 0; // Allow flexbox to shrink items
+          }
+        }
+        
+        .date-range-controls {
+          display: flex;
+          gap: 10px;
+          flex-direction: column;
+          
+          .clr-form-control {
+            flex: 1;
+          }
+          
+          @media (min-width: 480px) {
+            flex-direction: row;
+          }
+        }
+        
+        .toggle-control {
+          display: flex;
+          align-items: center;
+          gap: 8px;
+          flex-wrap: wrap;
+        }
+        
+        .multiselect {
+          height: 100px;
+        }
+      }
+    }
+  }
+
+  .no-filters {
+    text-align: center;
+    padding: 20px;
+    color: #666;
+    font-style: italic;
+  }
+}
+
+// Responsive design for smaller screens
+@media (max-width: 768px) {
+  .common-filter-container {
+    padding: 10px;
+    
+    .filters-form {
+      .filters-grid {
+        grid-template-columns: 1fr;
+        gap: 10px;
+      }
+    }
+    
+    .filter-header {
+      flex-direction: column;
+      align-items: stretch;
+    }
+    
+    .presets-section {
+      .preset-controls {
+        flex-direction: column;
+      }
+    }
+    
+    .save-preset-section {
+      .clr-input-group {
+        flex-direction: column;
+      }
+    }
+  }
+}
+
+@media (max-width: 480px) {
+  .common-filter-container {
+    .date-range-controls {
+      flex-direction: column;
+    }
+    
+    .filter-item {
+      padding: 10px;
+    }
+  }
+}
\ No newline at end of file
diff --git a/frontend/angular-clarity-master/src/app/modules/main/builder/dashboardnew/common-filter/common-filter.component.spec.ts b/frontend/angular-clarity-master/src/app/modules/main/builder/dashboardnew/common-filter/common-filter.component.spec.ts
new file mode 100644
index 0000000..3a65cec
--- /dev/null
+++ b/frontend/angular-clarity-master/src/app/modules/main/builder/dashboardnew/common-filter/common-filter.component.spec.ts
@@ -0,0 +1,89 @@
+import { ComponentFixture, TestBed } from '@angular/core/testing';
+import { FormBuilder, FormsModule, ReactiveFormsModule } from '@angular/forms';
+import { CommonFilterComponent } from './common-filter.component';
+import { FilterService } from './filter.service';
+
+describe('CommonFilterComponent', () => {
+  let component: CommonFilterComponent;
+  let fixture: ComponentFixture<CommonFilterComponent>;
+  let filterService: FilterService;
+
+  beforeEach(async () => {
+    await TestBed.configureTestingModule({
+      imports: [FormsModule, ReactiveFormsModule],
+      declarations: [CommonFilterComponent],
+      providers: [FormBuilder, FilterService]
+    })
+    .compileComponents();
+    
+    fixture = TestBed.createComponent(CommonFilterComponent);
+    component = fixture.componentInstance;
+    filterService = TestBed.inject(FilterService);
+    fixture.detectChanges();
+  });
+
+  it('should create', () => {
+    expect(component).toBeTruthy();
+  });
+
+  it('should add a new filter', () => {
+    const initialFilters = filterService.getFilters().length;
+    component.addFilter();
+    const updatedFilters = filterService.getFilters().length;
+    expect(updatedFilters).toBe(initialFilters + 1);
+  });
+
+  it('should remove a filter', () => {
+    // Add a filter first
+    component.addFilter();
+    const filterId = filterService.getFilters()[0].id;
+    
+    // Then remove it
+    const initialFilters = filterService.getFilters().length;
+    component.removeFilter(filterId);
+    const updatedFilters = filterService.getFilters().length;
+    expect(updatedFilters).toBe(initialFilters - 1);
+  });
+
+  it('should update filter properties', () => {
+    // Add a filter
+    component.addFilter();
+    const filter = filterService.getFilters()[0];
+    
+    // Update the filter label
+    component.updateFilter(filter.id, 'label', 'Updated Label');
+    const updatedFilters = filterService.getFilters();
+    expect(updatedFilters[0].label).toBe('Updated Label');
+  });
+
+  it('should handle filter value changes', () => {
+    const filterId = 'test-filter';
+    const testValue = 'test value';
+    
+    // Mock the filter service method
+    spyOn(filterService, 'updateFilterValue');
+    
+    component.onFilterChange(filterId, testValue);
+    expect(filterService.updateFilterValue).toHaveBeenCalledWith(filterId, testValue);
+  });
+
+  it('should reset filters', () => {
+    spyOn(filterService, 'resetFilters');
+    component.resetFilters();
+    expect(filterService.resetFilters).toHaveBeenCalled();
+  });
+
+  it('should save and load presets', () => {
+    spyOn(filterService, 'savePreset');
+    spyOn(filterService, 'loadPreset');
+    
+    // Test save preset
+    component.newPresetName = 'Test Preset';
+    component.savePreset();
+    expect(filterService.savePreset).toHaveBeenCalledWith('Test Preset');
+    
+    // Test load preset
+    component.loadPreset('Test Preset');
+    expect(filterService.loadPreset).toHaveBeenCalledWith('Test Preset');
+  });
+});
\ No newline at end of file
diff --git a/frontend/angular-clarity-master/src/app/modules/main/builder/dashboardnew/common-filter/common-filter.component.ts b/frontend/angular-clarity-master/src/app/modules/main/builder/dashboardnew/common-filter/common-filter.component.ts
new file mode 100644
index 0000000..8ca2fab
--- /dev/null
+++ b/frontend/angular-clarity-master/src/app/modules/main/builder/dashboardnew/common-filter/common-filter.component.ts
@@ -0,0 +1,197 @@
+import { Component, OnInit, OnDestroy, Input, HostListener } from '@angular/core';
+import { FormBuilder, FormGroup } from '@angular/forms';
+import { Subscription } from 'rxjs';
+import { Filter, FilterService, FilterType } from './filter.service';
+
+@Component({
+  selector: 'app-common-filter',
+  templateUrl: './common-filter.component.html',
+  styleUrls: ['./common-filter.component.scss']
+})
+export class CommonFilterComponent implements OnInit, OnDestroy {
+  @Input() baseFilters: any[] = [];
+  @Input() drilldownFilters: any[] = [];
+  @Input() drilldownLayers: any[] = [];
+  @Input() fieldName: string;
+  @Input() connection: number;
+  
+  filters: Filter[] = [];
+  filterForm: FormGroup;
+  presets: string[] = [];
+  activePreset: string | null = null;
+  newPresetName: string = '';
+  
+  private subscriptions: Subscription[] = [];
+
+  constructor(
+    private filterService: FilterService,
+    private fb: FormBuilder
+  ) {
+    this.filterForm = this.fb.group({});
+  }
+
+  ngOnInit(): void {
+    // Subscribe to filter definitions
+    this.subscriptions.push(
+      this.filterService.filters$.subscribe(filters => {
+        this.filters = filters;
+        this.buildForm();
+      })
+    );
+    
+    // Subscribe to filter state changes
+    this.subscriptions.push(
+      this.filterService.filterState$.subscribe(state => {
+        this.updateFormValues(state);
+      })
+    );
+    
+    // Subscribe to preset changes
+    this.subscriptions.push(
+      this.filterService.activePreset$.subscribe(preset => {
+        this.activePreset = preset;
+      })
+    );
+    
+    // Get initial presets
+    this.presets = this.filterService.getPresets();
+  }
+
+  ngOnDestroy(): void {
+    this.subscriptions.forEach(sub => sub.unsubscribe());
+  }
+  
+  // Handle window resize events
+  @HostListener('window:resize', ['$event'])
+  onResize(event: any) {
+    // Trigger change detection to reflow the layout
+    setTimeout(() => {
+      // This will cause the grid to recalculate its layout
+      this.filters = [...this.filters];
+    }, 100);
+  }
+
+  // Build the form based on current filters
+  private buildForm(): void {
+    // Clear existing form controls
+    Object.keys(this.filterForm.controls).forEach(key => {
+      this.filterForm.removeControl(key);
+    });
+    
+    // Add controls for each filter
+    this.filters.forEach(filter => {
+      let initialValue: any;
+      
+      switch (filter.type) {
+        case 'multiselect':
+          initialValue = filter.value || [];
+          break;
+        case 'date-range':
+          initialValue = filter.value || { start: null, end: null };
+          break;
+        case 'toggle':
+          initialValue = filter.value || false;
+          break;
+        default:
+          initialValue = filter.value || '';
+      }
+      
+      const control = this.fb.control(initialValue);
+      
+      // Subscribe to value changes for this control
+      control.valueChanges.subscribe(value => {
+        this.onFilterChange(filter.id, value);
+      });
+      
+      this.filterForm.addControl(filter.id, control);
+    });
+  }
+
+  // Update form values based on filter state
+  private updateFormValues(state: any): void {
+    Object.keys(state).forEach(key => {
+      if (this.filterForm.contains(key)) {
+        this.filterForm.get(key)?.setValue(state[key], { emitEvent: false });
+      }
+    });
+  }
+
+  // Handle filter value changes
+  onFilterChange(filterId: string, value: any): void {
+    console.log('=== COMMON FILTER DEBUG INFO ===');
+    console.log('Filter value changed for ID:', filterId);
+    console.log('New value:', value);
+    
+    const filterDef = this.filters.find(f => f.id === filterId);
+    console.log('Filter definition:', filterDef);
+    
+    this.filterService.updateFilterValue(filterId, value);
+    console.log('=== END COMMON FILTER DEBUG ===');
+  }
+
+  // Handle multiselect changes
+  onMultiselectChange(filterId: string, selectedValues: string[]): void {
+    this.filterService.updateFilterValue(filterId, selectedValues);
+  }
+
+  // Handle date range changes
+  onDateRangeChange(filterId: string, dateRange: { start: string | null, end: string | null }): void {
+    this.filterService.updateFilterValue(filterId, dateRange);
+  }
+
+  // Handle toggle changes
+  onToggleChange(filterId: string, checked: boolean): void {
+    this.filterService.updateFilterValue(filterId, checked);
+  }
+
+  // Reset all filters
+  resetFilters(): void {
+    this.filterService.resetFilters();
+  }
+
+  // Save current filter state as preset
+  savePreset(): void {
+    if (this.newPresetName.trim()) {
+      this.filterService.savePreset(this.newPresetName.trim());
+      this.presets = this.filterService.getPresets();
+      this.newPresetName = '';
+    }
+  }
+
+  // Load a preset
+  loadPreset(presetName: string): void {
+    this.filterService.loadPreset(presetName);
+  }
+
+  // Delete a preset
+  deletePreset(presetName: string): void {
+    this.filterService.deletePreset(presetName);
+    this.presets = this.filterService.getPresets();
+  }
+
+  // Add a new filter
+  addFilter(): void {
+    const newFilter: Filter = {
+      id: `filter_${Date.now()}`,
+      field: '',
+      label: 'New Filter',
+      type: 'text'
+    };
+    this.filterService.addFilter(newFilter);
+  }
+
+  // Remove a filter
+  removeFilter(filterId: string): void {
+    this.filterService.removeFilter(filterId);
+  }
+
+  // Update filter properties
+  updateFilter(filterId: string, property: string, value: any): void {
+    const filterIndex = this.filters.findIndex(f => f.id === filterId);
+    if (filterIndex !== -1) {
+      const updatedFilters = [...this.filters];
+      (updatedFilters[filterIndex] as any)[property] = value;
+      this.filterService.setFilters(updatedFilters);
+    }
+  }
+}
\ No newline at end of file
diff --git a/frontend/angular-clarity-master/src/app/modules/main/builder/dashboardnew/common-filter/compact-filter.component.html b/frontend/angular-clarity-master/src/app/modules/main/builder/dashboardnew/common-filter/compact-filter.component.html
new file mode 100644
index 0000000..7c613e4
--- /dev/null
+++ b/frontend/angular-clarity-master/src/app/modules/main/builder/dashboardnew/common-filter/compact-filter.component.html
@@ -0,0 +1,122 @@
+<!-- Configuration Mode -->
+<div class="compact-filter-config" *ngIf="isConfigMode">
+  <div class="config-header">
+    <h5>Compact Filter Configuration</h5>
+    <button class="btn btn-sm btn-link" (click)="cancelConfiguration()">
+      <clr-icon shape="close"></clr-icon>
+    </button>
+  </div>
+  
+  <div class="config-form">
+    <div class="clr-form-control">
+      <label class="clr-control-label">API URL</label>
+      <input type="text" [(ngModel)]="configApiUrl" (ngModelChange)="onApiUrlChange($event)" placeholder="Enter API URL" class="clr-input">
+    </div>
+    
+    <div class="clr-form-control">
+      <label class="clr-control-label">Filter Key</label>
+      <select [(ngModel)]="configFilterKey" (ngModelChange)="onFilterKeyChange($event)" class="clr-select">
+        <option value="">Select a key</option>
+        <option *ngFor="let key of availableKeys" [value]="key">{{ key }}</option>
+      </select>
+    </div>
+    
+    <div class="clr-form-control">
+      <label class="clr-control-label">Filter Type</label>
+      <select [(ngModel)]="configFilterType" (ngModelChange)="onFilterTypeChange($event)" class="clr-select">
+        <option value="text">Text</option>
+        <option value="dropdown">Dropdown</option>
+        <option value="multiselect">Multi-Select</option>
+        <option value="date-range">Date Range</option>
+        <option value="toggle">Toggle</option>
+      </select>
+    </div>
+    
+    <!-- Options will be automatically populated for dropdown/multiselect based on API data -->
+    <div class="clr-form-control" *ngIf="configFilterType === 'dropdown' || configFilterType === 'multiselect'">
+      <label class="clr-control-label">Available Values (comma separated)</label>
+      <div class="available-values">
+        {{ availableValues.join(', ') }}
+      </div>
+    </div>
+    
+    <div class="config-actions">
+      <button class="btn btn-sm btn-outline" (click)="cancelConfiguration()">Cancel</button>
+      <button class="btn btn-sm btn-primary" (click)="saveConfiguration()">Save</button>
+    </div>
+  </div>
+</div>
+
+<!-- Display Mode -->
+<div class="compact-filter" *ngIf="!isConfigMode">
+  <div class="filter-header">
+    <span class="filter-label" *ngIf="filterLabel">{{ filterLabel }}</span>
+    <span class="filter-key" *ngIf="!filterLabel && filterKey">{{ filterKey }}</span>
+    <span class="filter-type">({{ filterType }})</span>
+    <button class="btn btn-icon btn-sm" (click)="toggleConfigMode()">
+      <clr-icon shape="cog"></clr-icon>
+    </button>
+  </div>
+  
+  <!-- Text Filter -->
+  <div class="filter-control" *ngIf="filterType === 'text'">
+    <input type="text" 
+           [(ngModel)]="filterValue" 
+           (ngModelChange)="onFilterValueChange($event)"
+           [placeholder]="filterLabel || filterKey"
+           class="clr-input compact-input">
+  </div>
+
+  <!-- Dropdown Filter -->
+  <div class="filter-control" *ngIf="filterType === 'dropdown'">
+    <select [(ngModel)]="filterValue" 
+            (ngModelChange)="onFilterValueChange($event)"
+            class="clr-select compact-select">
+      <option value="">{{ filterLabel || filterKey }}</option>
+      <option *ngFor="let option of filterOptions" [value]="option">{{ option }}</option>
+    </select>
+  </div>
+
+  <!-- Multi-Select Filter -->
+  <div class="filter-control" *ngIf="filterType === 'multiselect'">
+    <div class="compact-multiselect-display" (click)="toggleMultiselectDropdown()" style="padding: 5px; border: 1px solid #ddd; cursor: pointer; background-color: #f8f8f8;">
+      <span *ngIf="filterValue && filterValue.length > 0">{{ filterValue.length }} selected</span>
+      <span *ngIf="!filterValue || filterValue.length === 0">{{ filterLabel || filterKey || 'Select options' }}</span>
+      <clr-icon shape="caret down" style="float: right; margin-top: 3px;"></clr-icon>
+    </div>
+    <div class="compact-multiselect-dropdown" *ngIf="showMultiselectDropdown" style="max-height: 200px; overflow-y: auto; border: 1px solid #ddd; border-top: none; padding: 10px; background-color: white; position: absolute; z-index: 1000; width: calc(100% - 2px); box-shadow: 0 2px 4px rgba(0,0,0,0.1);">
+      <div *ngFor="let option of filterOptions" class="clr-checkbox-wrapper" style="margin-bottom: 5px;">
+        <input type="checkbox" 
+               [id]="'multiselect-' + option" 
+               [value]="option" 
+               [checked]="isOptionSelected(option)"
+               (change)="onMultiselectOptionChange($event, option)">
+        <label [for]="'multiselect-' + option" class="clr-control-label">{{ option }}</label>
+      </div>
+    </div>
+  </div>
+
+  <!-- Date Range Filter -->
+  <div class="filter-control date-range" *ngIf="filterType === 'date-range'">
+    <input type="date" 
+           [(ngModel)]="filterValue.start" 
+           (ngModelChange)="onDateRangeChange({ start: $event, end: filterValue.end })"
+           placeholder="Start Date"
+           class="clr-input compact-date">
+    <input type="date" 
+           [(ngModel)]="filterValue.end" 
+           (ngModelChange)="onDateRangeChange({ start: filterValue.start, end: $event })"
+           placeholder="End Date"
+           class="clr-input compact-date">
+  </div>
+
+  <!-- Toggle Filter -->
+  <div class="filter-control toggle" *ngIf="filterType === 'toggle'">
+    <input type="checkbox" 
+           [(ngModel)]="filterValue" 
+           (ngModelChange)="onToggleChange($event)"
+           clrToggle 
+           class="clr-toggle">
+    <label class="toggle-label">{{ filterLabel || filterKey }}</label>
+  </div>
+</div>
\ No newline at end of file
diff --git a/frontend/angular-clarity-master/src/app/modules/main/builder/dashboardnew/common-filter/compact-filter.component.scss b/frontend/angular-clarity-master/src/app/modules/main/builder/dashboardnew/common-filter/compact-filter.component.scss
new file mode 100644
index 0000000..ee880b3
--- /dev/null
+++ b/frontend/angular-clarity-master/src/app/modules/main/builder/dashboardnew/common-filter/compact-filter.component.scss
@@ -0,0 +1,224 @@
+.compact-filter {
+  display: inline-block;
+  min-width: 120px;
+  max-width: 200px;
+  margin: 5px;
+  padding: 5px;
+  background: #f8f9fa;
+  border: 1px solid #e9ecef;
+  border-radius: 4px;
+  font-size: 12px;
+  
+  .filter-header {
+    display: flex;
+    justify-content: space-between;
+    align-items: center;
+    margin-bottom: 5px;
+    
+    .filter-label, .filter-key {
+      font-weight: bold;
+      white-space: nowrap;
+      overflow: hidden;
+      text-overflow: ellipsis;
+      flex-grow: 1;
+    }
+    
+    .filter-type {
+      font-size: 10px;
+      color: #6c757d;
+      margin-left: 5px;
+    }
+    
+    .btn-icon {
+      padding: 2px;
+      min-width: auto;
+    }
+  }
+  
+  .filter-control {
+    display: flex;
+    align-items: center;
+    gap: 5px;
+    
+    &.date-range {
+      flex-direction: column;
+    }
+    
+    &.toggle {
+      justify-content: center;
+    }
+  }
+  
+  .compact-input,
+  .compact-select,
+  .compact-multiselect,
+  .compact-date {
+    width: 100%;
+    padding: 4px 6px;
+    font-size: 12px;
+    border-radius: 3px;
+    min-height: 24px;
+  }
+  
+  .compact-select,
+  .compact-multiselect {
+    height: 24px;
+  }
+  
+  .compact-multiselect {
+    height: auto;
+    min-height: 24px;
+  }
+  
+  .multiselect-container {
+    max-height: 150px;
+    overflow-y: auto;
+    border: 1px solid #ddd;
+    border-radius: 4px;
+    padding: 5px;
+    background: white;
+  }
+  
+  .checkbox-group {
+    display: flex;
+    flex-direction: column;
+    gap: 3px;
+  }
+  
+  .checkbox-item {
+    display: flex;
+    align-items: center;
+    gap: 5px;
+  }
+  
+  .checkbox-label {
+    font-size: 12px;
+    margin: 0;
+    cursor: pointer;
+    white-space: nowrap;
+    overflow: hidden;
+    text-overflow: ellipsis;
+  }
+  
+  .clr-checkbox {
+    margin: 0;
+    cursor: pointer;
+  }
+  
+  .toggle-label {
+    margin: 0;
+    font-size: 12px;
+    white-space: nowrap;
+    overflow: hidden;
+    text-overflow: ellipsis;
+    max-width: 100px;
+  }
+  
+  .clr-toggle {
+    margin: 0 5px 0 0;
+  }
+  
+  /* Responsive design */
+  @media (max-width: 768px) {
+    min-width: 100px;
+    max-width: 150px;
+    
+    .compact-input,
+    .compact-select,
+    .compact-multiselect,
+    .compact-date {
+      font-size: 11px;
+      padding: 3px 5px;
+    }
+    
+    .toggle-label {
+      font-size: 11px;
+      max-width: 80px;
+    }
+  }
+  
+  @media (max-width: 480px) {
+    min-width: 80px;
+    max-width: 120px;
+    
+    .compact-input,
+    .compact-select,
+    .compact-multiselect,
+    .compact-date {
+      font-size: 10px;
+      padding: 2px 4px;
+    }
+    
+    .toggle-label {
+      font-size: 10px;
+      max-width: 60px;
+    }
+  }
+}
+
+.compact-filter-config {
+  min-width: 200px;
+  max-width: 300px;
+  padding: 10px;
+  background: #f8f9fa;
+  border: 1px solid #e9ecef;
+  border-radius: 4px;
+  
+  .config-header {
+    display: flex;
+    justify-content: space-between;
+    align-items: center;
+    margin-bottom: 10px;
+    
+    h5 {
+      margin: 0;
+    }
+    
+    .btn-link {
+      padding: 2px;
+      min-width: auto;
+    }
+  }
+  
+  .config-form {
+    .clr-form-control {
+      margin-bottom: 8px;
+      
+      .clr-control-label {
+        font-size: 12px;
+      }
+      
+      .clr-input,
+      .clr-select,
+      .clr-textarea {
+        font-size: 12px;
+        padding: 4px 6px;
+      }
+      
+      .clr-textarea {
+        min-height: 60px;
+      }
+      
+      .available-values {
+        background: #e9ecef;
+        border-radius: 3px;
+        padding: 6px;
+        font-size: 11px;
+        margin-top: 4px;
+        word-break: break-all;
+      }
+    }
+    
+    .config-actions {
+      display: flex;
+      justify-content: flex-end;
+      gap: 5px;
+      margin-top: 10px;
+      
+      .btn {
+        font-size: 12px;
+        padding: 4px 8px;
+      }
+    }
+  }
+}
\ No newline at end of file
diff --git a/frontend/angular-clarity-master/src/app/modules/main/builder/dashboardnew/common-filter/compact-filter.component.ts b/frontend/angular-clarity-master/src/app/modules/main/builder/dashboardnew/common-filter/compact-filter.component.ts
new file mode 100644
index 0000000..da6c536
--- /dev/null
+++ b/frontend/angular-clarity-master/src/app/modules/main/builder/dashboardnew/common-filter/compact-filter.component.ts
@@ -0,0 +1,441 @@
+import { Component, OnInit, Input, Output, EventEmitter, OnChanges, SimpleChanges, OnDestroy } from '@angular/core';
+import { FilterService, Filter } from './filter.service';
+import { AlertsService } from 'src/app/services/fnd/alerts.service';
+
+@Component({
+  selector: 'app-compact-filter',
+  templateUrl: './compact-filter.component.html',
+  styleUrls: ['./compact-filter.component.scss']
+})
+export class CompactFilterComponent implements OnInit, OnChanges, OnDestroy {
+  @Input() filterKey: string = '';
+  @Input() filterType: string = 'text';
+  @Input() filterOptions: string[] = [];
+  @Input() filterLabel: string = '';
+  @Input() apiUrl: string = '';
+  @Input() connectionId: number | undefined;
+  @Output() filterChange = new EventEmitter<any>();
+  @Output() configChange = new EventEmitter<any>();
+  
+  selectedFilter: Filter | null = null;
+  filterValue: any = '';
+  availableFilters: Filter[] = [];
+  availableKeys: string[] = [];
+  availableValues: string[] = [];
+  
+  // Multiselect dropdown state
+  showMultiselectDropdown: boolean = false;
+  
+  // Configuration properties
+  isConfigMode: boolean = false;
+  configFilterKey: string = '';
+  configFilterType: string = 'text';
+  configFilterOptions: string = '';
+  configFilterLabel: string = '';
+  configApiUrl: string = '';
+  configConnectionId: number | undefined;
+  
+  constructor(
+    private filterService: FilterService,
+    private alertService: AlertsService
+  ) { }
+
+  ngOnInit(): void {
+    // Initialize configuration from inputs
+    this.configFilterKey = this.filterKey;
+    this.configFilterType = this.filterType;
+    this.configFilterLabel = this.filterLabel;
+    this.configFilterOptions = this.filterOptions.join(',');
+    this.configApiUrl = this.apiUrl;
+    this.configConnectionId = this.connectionId;
+    
+    // Load available keys and values if API URL and filter key are provided
+    if (this.apiUrl) {
+      this.loadAvailableKeys();
+      // Load available values for the current filter key if it's a dropdown or multiselect
+      if ((this.filterType === 'dropdown' || this.filterType === 'multiselect') && this.filterKey) {
+        this.loadAvailableValues(this.filterKey);
+      }
+    }
+    
+    // Register this filter with the filter service
+    this.registerFilter();
+    
+    // Subscribe to filter definitions to get available filters
+    this.filterService.filters$.subscribe(filters => {
+      this.availableFilters = filters;
+      this.updateSelectedFilter();
+    });
+    
+    // Subscribe to filter state changes
+    this.filterService.filterState$.subscribe(state => {
+      if (this.selectedFilter && state.hasOwnProperty(this.selectedFilter.id)) {
+        this.filterValue = state[this.selectedFilter.id];
+      }
+    });
+  }
+  
+  ngOnChanges(changes: SimpleChanges): void {
+    // If filterKey changes, clear the previous filter value and remove old filter from service
+    if (changes.filterKey) {
+      // Clear the previous filter value
+      this.filterValue = '';
+      
+      // Clear filter options
+      this.filterOptions = [];
+      
+      // Clear available values
+      this.availableValues = [];
+      
+      // If we had a previous selected filter, clear its value in the service
+      if (this.selectedFilter && changes.filterKey.previousValue) {
+        const oldFilterId = changes.filterKey.previousValue;
+        this.filterService.updateFilterValue(oldFilterId, '');
+      }
+    }
+    
+    // If filterKey or filterType changes, re-register the filter
+    if (changes.filterKey || changes.filterType) {
+      // Load available values for the current filter key if it's a dropdown or multiselect
+      if ((this.filterType === 'dropdown' || this.filterType === 'multiselect') && this.filterKey) {
+        this.loadAvailableValues(this.filterKey);
+      }
+      this.registerFilter();
+    }
+    
+    // Handle API URL changes
+    if (changes.apiUrl && !changes.apiUrl.firstChange) {
+      if (this.apiUrl) {
+        this.loadAvailableKeys();
+      }
+    }
+  }
+  
+  // Register this filter with the filter service
+  registerFilter(): void {
+    if (this.filterKey) {
+      // Get current filter values from the service
+      const currentFilterValues = this.filterService.getFilterValues();
+      
+      // Create a filter definition for this compact filter
+      const filterDef: Filter = {
+        id: `${this.filterKey}`,
+        field: this.filterKey,
+        label: this.filterLabel || this.filterKey,
+        type: this.filterType as any,
+        options: this.filterOptions,
+        value: this.filterValue // Use the current filter value
+      };
+      
+      // Get current filters
+      const currentFilters = this.filterService.getFilters();
+      
+      // Check if this filter is already registered
+      const existingFilterIndex = currentFilters.findIndex(f => f.id === filterDef.id);
+      
+      if (existingFilterIndex >= 0) {
+        // Preserve the existing filter configuration
+        const existingFilter = currentFilters[existingFilterIndex];
+        
+        // Preserve the existing filter value if it exists in the service
+        if (currentFilterValues.hasOwnProperty(existingFilter.id)) {
+          filterDef.value = currentFilterValues[existingFilter.id];
+          this.filterValue = filterDef.value; // Update local value
+        } else if (existingFilter.value !== undefined) {
+          // Fallback to existing filter's value if no service value
+          filterDef.value = existingFilter.value;
+          this.filterValue = filterDef.value;
+        }
+        
+        // Preserve other configuration properties
+        filterDef.label = existingFilter.label;
+        filterDef.options = existingFilter.options || this.filterOptions;
+        
+        // Update existing filter
+        currentFilters[existingFilterIndex] = filterDef;
+      } else {
+        // For new filters, check if there's already a value in the service
+        if (currentFilterValues.hasOwnProperty(filterDef.id)) {
+          filterDef.value = currentFilterValues[filterDef.id];
+          this.filterValue = filterDef.value; // Update local value
+        }
+        
+        // Add new filter
+        currentFilters.push(filterDef);
+      }
+      
+      // Update the filter service with the new filter list
+      this.filterService.setFilters(currentFilters);
+      
+      // Update the selected filter reference
+      this.selectedFilter = filterDef;
+    }
+  }
+  
+  updateSelectedFilter(): void {
+    if (this.filterKey && this.availableFilters.length > 0) {
+      this.selectedFilter = this.availableFilters.find(f => f.field === this.filterKey) || null;
+      if (this.selectedFilter) {
+        // Get current value for this filter from the service
+        const currentState = this.filterService.getFilterValues();
+        const filterValue = currentState[this.selectedFilter.id];
+        if (filterValue !== undefined) {
+          this.filterValue = filterValue;
+        } else if (this.selectedFilter.value !== undefined) {
+          // Use the filter's default value if no service value
+          this.filterValue = this.selectedFilter.value;
+        } else {
+          // Use the current filter value as fallback
+          this.filterValue = this.filterValue || '';
+        }
+        
+        // Also update configuration properties from the selected filter
+        this.configFilterKey = this.selectedFilter.field;
+        this.configFilterType = this.selectedFilter.type;
+        this.configFilterLabel = this.selectedFilter.label;
+        this.configFilterOptions = (this.selectedFilter.options || []).join(',');
+      }
+    }
+  }
+  
+  onFilterValueChange(value: any): void {
+    if (this.selectedFilter) {
+      this.filterValue = value;
+      this.filterService.updateFilterValue(this.selectedFilter.id, value);
+      this.filterChange.emit({ filterId: this.selectedFilter.id, value: value });
+      
+      // Update the filter definition in the service to reflect the new value
+      const currentFilters = this.filterService.getFilters();
+      const filterIndex = currentFilters.findIndex(f => f.id === this.selectedFilter.id);
+      if (filterIndex >= 0) {
+        currentFilters[filterIndex].value = value;
+        this.filterService.setFilters(currentFilters);
+      }
+    }
+  }
+  
+  onToggleChange(checked: boolean): void {
+    this.onFilterValueChange(checked);
+  }
+  
+  onDateRangeChange(dateRange: { start: string | null, end: string | null }): void {
+    this.onFilterValueChange(dateRange);
+  }
+  
+  ngOnDestroy(): void {
+    // Component cleanup - remove this filter from the filter service
+    if (this.selectedFilter) {
+      // Use the proper removeFilter method which handles both filter definition and state
+      this.filterService.removeFilter(this.selectedFilter.id);
+    }
+  }
+  
+  // Load available keys from API
+  loadAvailableKeys(): void {
+    if (this.apiUrl) {
+      this.alertService.getColumnfromurl(this.apiUrl, this.connectionId).subscribe(
+        (keys: string[]) => {
+          this.availableKeys = keys;
+        },
+        (error) => {
+          console.error('Error loading available keys:', error);
+          this.availableKeys = [];
+        }
+      );
+    }
+  }
+  
+  // Load available values for a specific key
+  loadAvailableValues(key: string): void {
+    if (this.apiUrl && key) {
+      this.alertService.getValuesFromUrl(this.apiUrl, this.connectionId, key).subscribe(
+        (values: string[]) => {
+          this.availableValues = values;
+          // Update filter options if this is a dropdown or multiselect
+          if (this.filterType === 'dropdown' || this.filterType === 'multiselect') {
+            this.filterOptions = values;
+          }
+        },
+        (error) => {
+          console.error('Error loading available values:', error);
+          this.availableValues = [];
+        }
+      );
+    }
+  }
+  
+  // Configuration methods
+  toggleConfigMode(): void {
+    this.isConfigMode = !this.isConfigMode;
+    if (this.isConfigMode) {
+      // Initialize config values from current filter if available
+      if (this.selectedFilter) {
+        this.configFilterKey = this.selectedFilter.field;
+        this.configFilterType = this.selectedFilter.type;
+        this.configFilterLabel = this.selectedFilter.label;
+        this.configFilterOptions = (this.selectedFilter.options || []).join(',');
+      } else {
+        // Fallback to current properties
+        this.configFilterKey = this.filterKey;
+        this.configFilterType = this.filterType;
+        this.configFilterLabel = this.filterLabel;
+        this.configFilterOptions = this.filterOptions.join(',');
+      }
+      this.configApiUrl = this.apiUrl;
+      this.configConnectionId = this.connectionId;
+    }
+  }
+  
+  saveConfiguration(): void {
+    const config = {
+      filterKey: this.configFilterKey,
+      filterType: this.configFilterType,
+      filterLabel: this.configFilterLabel,
+      filterOptions: this.configFilterOptions.split(',').map(opt => opt.trim()).filter(opt => opt),
+      apiUrl: this.configApiUrl,
+      connectionId: this.configConnectionId
+    };
+    
+    // Emit configuration change
+    this.configChange.emit(config);
+    
+    // Update local properties
+    this.filterKey = config.filterKey;
+    this.filterType = config.filterType;
+    this.filterLabel = config.filterLabel;
+    this.filterOptions = config.filterOptions;
+    this.apiUrl = config.apiUrl;
+    this.connectionId = config.connectionId;
+    
+    // Clear filter value when changing configuration
+    this.filterValue = '';
+    
+    // Load available keys if API URL is provided
+    if (this.apiUrl) {
+      this.loadAvailableKeys();
+    }
+    
+    // Load available values for the selected key if it's a dropdown or multiselect
+    if ((this.configFilterType === 'dropdown' || this.configFilterType === 'multiselect') && this.configFilterKey) {
+      this.loadAvailableValues(this.configFilterKey);
+    }
+    
+    // Register the updated filter with the filter service
+    this.registerFilter();
+    
+    // Update selected filter
+    this.updateSelectedFilter();
+    
+    // Exit config mode
+    this.isConfigMode = false;
+  }
+  
+  cancelConfiguration(): void {
+    this.isConfigMode = false;
+  }
+  
+  // Handle filter key change in configuration
+  onFilterKeyChange(key: string): void {
+    // Clear the previous filter value when changing keys
+    this.filterValue = '';
+    
+    // Clear filter options until new values are loaded
+    this.filterOptions = [];
+    
+    this.configFilterKey = key;
+    
+    // Load available values for the selected key if it's a dropdown or multiselect
+    if ((this.configFilterType === 'dropdown' || this.configFilterType === 'multiselect') && key) {
+      this.loadAvailableValues(key);
+    }
+    
+    // Clear the filter service value for the previous filter key
+    if (this.selectedFilter) {
+      this.filterService.updateFilterValue(this.selectedFilter.id, '');
+    }
+  }
+  
+  // Handle API URL change in configuration
+  onApiUrlChange(url: string): void {
+    this.configApiUrl = url;
+    // Load available keys when API URL changes
+    if (url) {
+      this.loadAvailableKeys();
+      // Also clear available values since the API has changed
+      this.availableValues = [];
+      this.filterOptions = [];
+    }
+  }
+  
+  // Handle filter type change in configuration
+  onFilterTypeChange(type: string): void {
+    this.configFilterType = type;
+    // If changing to dropdown or multiselect and we have a key selected, load values
+    if ((type === 'dropdown' || type === 'multiselect') && this.configFilterKey) {
+      this.loadAvailableValues(this.configFilterKey);
+    }
+  }
+  
+  // Add method to check if an option is selected for checkboxes
+  isOptionSelected(option: string): boolean {
+    if (!this.filterValue) {
+      return false;
+    }
+    
+    // Ensure filterValue is an array for multiselect
+    if (!Array.isArray(this.filterValue)) {
+      this.filterValue = [];
+      return false;
+    }
+    
+    return this.filterValue.includes(option);
+  }
+  // need to check this 
+  // Add method to handle multiselect option change
+  onMultiselectOptionChange(event: any, option: string): void {
+    // Initialize filterValue array if it doesn't exist
+    if (!this.filterValue) {
+      this.filterValue = [];
+    }
+    
+    // Ensure filterValue is an array
+    if (!Array.isArray(this.filterValue)) {
+      this.filterValue = [];
+    }
+    
+    if (event.target.checked) {
+      // Add option if not already in array
+      if (!this.filterValue.includes(option)) {
+        this.filterValue.push(option);
+      }
+    } else {
+      // Remove option from array
+      const index = this.filterValue.indexOf(option);
+      if (index > -1) {
+        this.filterValue.splice(index, 1);
+      }
+    }
+    
+    // Emit the change event
+    this.onFilterValueChange(this.filterValue);
+  }
+  
+  // Add method to toggle multiselect dropdown visibility
+  toggleMultiselectDropdown(): void {
+    this.showMultiselectDropdown = !this.showMultiselectDropdown;
+    
+    // Add document click handler to close dropdown when clicking outside
+    if (this.showMultiselectDropdown) {
+      setTimeout(() => {
+        const handleClick = (event: MouseEvent) => {
+          const target = event.target as HTMLElement;
+          if (!target.closest('.compact-multiselect-display') && !target.closest('.compact-multiselect-dropdown')) {
+            this.showMultiselectDropdown = false;
+            document.removeEventListener('click', handleClick);
+          }
+        };
+        document.addEventListener('click', handleClick);
+      }, 0);
+    }
+  }
+}
\ No newline at end of file
diff --git a/frontend/angular-clarity-master/src/app/modules/main/builder/dashboardnew/common-filter/filter.service.spec.ts b/frontend/angular-clarity-master/src/app/modules/main/builder/dashboardnew/common-filter/filter.service.spec.ts
new file mode 100644
index 0000000..72e070f
--- /dev/null
+++ b/frontend/angular-clarity-master/src/app/modules/main/builder/dashboardnew/common-filter/filter.service.spec.ts
@@ -0,0 +1,129 @@
+import { TestBed } from '@angular/core/testing';
+import { FilterService, Filter } from './filter.service';
+
+describe('FilterService', () => {
+  let service: FilterService;
+
+  beforeEach(() => {
+    TestBed.configureTestingModule({});
+    service = TestBed.inject(FilterService);
+  });
+
+  it('should be created', () => {
+    expect(service).toBeTruthy();
+  });
+
+  it('should add and remove filters', () => {
+    const filter: Filter = {
+      id: 'test-filter',
+      field: 'testField',
+      label: 'Test Field',
+      type: 'text'
+    };
+
+    // Add filter
+    service.addFilter(filter);
+    const filters = service.getFilters();
+    expect(filters.length).toBe(1);
+    expect(filters[0]).toEqual(filter);
+
+    // Remove filter
+    service.removeFilter('test-filter');
+    const updatedFilters = service.getFilters();
+    expect(updatedFilters.length).toBe(0);
+  });
+
+  it('should update filter values', () => {
+    const filter: Filter = {
+      id: 'name-filter',
+      field: 'name',
+      label: 'Name',
+      type: 'text'
+    };
+
+    service.addFilter(filter);
+    service.updateFilterValue('name-filter', 'John Doe');
+
+    const filterValues = service.getFilterValues();
+    expect(filterValues['name-filter']).toBe('John Doe');
+  });
+
+  it('should reset filters', () => {
+    const textFilter: Filter = {
+      id: 'name',
+      field: 'name',
+      label: 'Name',
+      type: 'text',
+      value: 'John'
+    };
+
+    const toggleFilter: Filter = {
+      id: 'active',
+      field: 'isActive',
+      label: 'Active',
+      type: 'toggle',
+      value: true
+    };
+
+    service.setFilters([textFilter, toggleFilter]);
+    service.resetFilters();
+
+    const filterValues = service.getFilterValues();
+    expect(filterValues['name']).toBe('');
+    expect(filterValues['active']).toBe(false);
+  });
+
+  it('should manage presets', () => {
+    const filter: Filter = {
+      id: 'category',
+      field: 'category',
+      label: 'Category',
+      type: 'dropdown',
+      value: 'Electronics'
+    };
+
+    service.addFilter(filter);
+    
+    // Save preset
+    service.savePreset('Electronics View');
+    const presets = service.getPresets();
+    expect(presets).toContain('Electronics View');
+
+    // Update filter and load preset
+    service.updateFilterValue('category', 'Clothing');
+    service.loadPreset('Electronics View');
+    
+    const filterValues = service.getFilterValues();
+    expect(filterValues['category']).toBe('Electronics');
+
+    // Delete preset
+    service.deletePreset('Electronics View');
+    const updatedPresets = service.getPresets();
+    expect(updatedPresets).not.toContain('Electronics View');
+  });
+
+  it('should build query parameters', () => {
+    const textFilter: Filter = {
+      id: 'name',
+      field: 'name',
+      label: 'Name',
+      type: 'text'
+    };
+
+    const dateFilter: Filter = {
+      id: 'dateRange',
+      field: 'date',
+      label: 'Date Range',
+      type: 'date-range'
+    };
+
+    service.setFilters([textFilter, dateFilter]);
+    service.updateFilterValue('name', 'John Doe');
+    service.updateFilterValue('dateRange', { start: '2023-01-01', end: '2023-12-31' });
+
+    const queryParams = service.buildQueryParams();
+    expect(queryParams).toContain('name=John%20Doe');
+    expect(queryParams).toContain('dateRange_start=2023-01-01');
+    expect(queryParams).toContain('dateRange_end=2023-12-31');
+  });
+});
\ No newline at end of file
diff --git a/frontend/angular-clarity-master/src/app/modules/main/builder/dashboardnew/common-filter/filter.service.ts b/frontend/angular-clarity-master/src/app/modules/main/builder/dashboardnew/common-filter/filter.service.ts
new file mode 100644
index 0000000..4dea664
--- /dev/null
+++ b/frontend/angular-clarity-master/src/app/modules/main/builder/dashboardnew/common-filter/filter.service.ts
@@ -0,0 +1,199 @@
+import { Injectable } from '@angular/core';
+import { BehaviorSubject, Observable } from 'rxjs';
+
+// Define the filter types
+export type FilterType = 'dropdown' | 'multiselect' | 'date-range' | 'text' | 'toggle';
+
+// Define the filter interface
+export interface Filter {
+  id: string;
+  field: string;
+  label: string;
+  type: FilterType;
+  options?: string[]; // For dropdown and multiselect
+  value?: any; // Current value
+  placeholder?: string;
+}
+
+// Define the filter state
+export interface FilterState {
+  [key: string]: any;
+}
+
+@Injectable({
+  providedIn: 'root'
+})
+export class FilterService {
+  // Store the filter definitions
+  private filtersSubject = new BehaviorSubject<Filter[]>([]);
+  public filters$ = this.filtersSubject.asObservable();
+
+  // Store the current filter values
+  private filterStateSubject = new BehaviorSubject<FilterState>({});
+  public filterState$ = this.filterStateSubject.asObservable();
+
+  // Store the active filter presets
+  private activePresetSubject = new BehaviorSubject<string | null>(null);
+  public activePreset$ = this.activePresetSubject.asObservable();
+
+  // Store filter presets
+  private presets: { [key: string]: FilterState } = {};
+
+  constructor() { }
+
+  // Add a new filter
+  addFilter(filter: Filter): void {
+    const currentFilters = this.filtersSubject.value;
+    this.filtersSubject.next([...currentFilters, filter]);
+  }
+
+  // Remove a filter
+  removeFilter(filterId: string): void {
+    const currentFilters = this.filtersSubject.value;
+    const updatedFilters = currentFilters.filter(f => f.id !== filterId);
+    this.filtersSubject.next(updatedFilters);
+    
+    // Also remove the filter value from state
+    const currentState = this.filterStateSubject.value;
+    const newState = { ...currentState };
+    delete newState[filterId];
+    this.filterStateSubject.next(newState);
+  }
+
+  // Update filter value
+  updateFilterValue(filterId: string, value: any): void {
+    console.log('=== FILTER SERVICE DEBUG INFO ===');
+    console.log('Updating filter value for ID:', filterId);
+    console.log('New value:', value);
+    
+    const currentState = this.filterStateSubject.value;
+    const newState = {
+      ...currentState,
+      [filterId]: value
+    };
+    
+    console.log('New filter state:', newState);
+    this.filterStateSubject.next(newState);
+    console.log('=== END FILTER SERVICE DEBUG ===');
+  }
+
+  // Get current filter values
+  getFilterValues(): FilterState {
+    return this.filterStateSubject.value;
+  }
+
+  // Reset all filters
+  resetFilters(): void {
+    const currentFilters = this.filtersSubject.value;
+    const resetState: FilterState = {};
+    
+    // Initialize all filters with empty/default values
+    currentFilters.forEach(filter => {
+      switch (filter.type) {
+        case 'multiselect':
+          resetState[filter.id] = [];
+          break;
+        case 'date-range':
+          resetState[filter.id] = { start: null, end: null };
+          break;
+        case 'toggle':
+          resetState[filter.id] = false;
+          break;
+        default:
+          resetState[filter.id] = '';
+      }
+    });
+    
+    this.filterStateSubject.next(resetState);
+  }
+
+  // Save current filter state as a preset
+  savePreset(name: string): void {
+    this.presets[name] = this.filterStateSubject.value;
+  }
+
+  // Load a preset
+  loadPreset(name: string): void {
+    if (this.presets[name]) {
+      this.filterStateSubject.next(this.presets[name]);
+      this.activePresetSubject.next(name);
+    }
+  }
+
+  // Get all presets
+  getPresets(): string[] {
+    return Object.keys(this.presets);
+  }
+
+  // Delete a preset
+  deletePreset(name: string): void {
+    delete this.presets[name];
+    if (this.activePresetSubject.value === name) {
+      this.activePresetSubject.next(null);
+    }
+  }
+
+  // Clear all presets
+  clearPresets(): void {
+    this.presets = {};
+    this.activePresetSubject.next(null);
+  }
+
+  // Build query parameters for API calls
+  buildQueryParams(): string {
+    const filterValues = this.getFilterValues();
+    const params = new URLSearchParams();
+    
+    Object.keys(filterValues).forEach(key => {
+      const value = filterValues[key];
+      if (value !== undefined && value !== null && value !== '') {
+        if (typeof value === 'object') {
+          // Handle date ranges and other objects
+          if (value.hasOwnProperty('start') && value.hasOwnProperty('end')) {
+            // Date range
+            if (value.start) params.append(`${key}_start`, value.start);
+            if (value.end) params.append(`${key}_end`, value.end);
+          } else {
+            // Other objects as JSON
+            params.append(key, JSON.stringify(value));
+          }
+        } else {
+          // Simple values
+          params.append(key, value.toString());
+        }
+      }
+    });
+    
+    return params.toString();
+  }
+
+  // Get filter definitions
+  getFilters(): Filter[] {
+    return this.filtersSubject.value;
+  }
+
+  // Update filter definitions
+  setFilters(filters: Filter[]): void {
+    this.filtersSubject.next(filters);
+    
+    // Initialize filter state with default values
+    const initialState: FilterState = {};
+    filters.forEach(filter => {
+      switch (filter.type) {
+        case 'multiselect':
+          initialState[filter.id] = filter.value || [];
+          break;
+        case 'date-range':
+          initialState[filter.id] = filter.value || { start: null, end: null };
+          break;
+        case 'toggle':
+          initialState[filter.id] = filter.value || false;
+          break;
+        default:
+          initialState[filter.id] = filter.value || '';
+      }
+    });
+    
+    this.filterStateSubject.next(initialState);
+  }
+}
\ No newline at end of file
diff --git a/frontend/angular-clarity-master/src/app/modules/main/builder/dashboardnew/common-filter/index.ts b/frontend/angular-clarity-master/src/app/modules/main/builder/dashboardnew/common-filter/index.ts
new file mode 100644
index 0000000..a770f81
--- /dev/null
+++ b/frontend/angular-clarity-master/src/app/modules/main/builder/dashboardnew/common-filter/index.ts
@@ -0,0 +1,4 @@
+export * from './filter.service';
+export * from './common-filter.component';
+export * from './chart-wrapper.component';
+export * from './compact-filter.component';
\ No newline at end of file
diff --git a/frontend/angular-clarity-master/src/app/modules/main/builder/dashboardnew/editnewdash/chart-config-modal.component.html b/frontend/angular-clarity-master/src/app/modules/main/builder/dashboardnew/editnewdash/chart-config-modal.component.html
new file mode 100644
index 0000000..80d72c0
--- /dev/null
+++ b/frontend/angular-clarity-master/src/app/modules/main/builder/dashboardnew/editnewdash/chart-config-modal.component.html
@@ -0,0 +1,4 @@
+<div class="chart-config-modal">
+  <h3>Chart Configuration Manager</h3>
+  <app-chart-config-manager></app-chart-config-manager>
+</div>
\ No newline at end of file
diff --git a/frontend/angular-clarity-master/src/app/modules/main/builder/dashboardnew/editnewdash/chart-config-modal.component.scss b/frontend/angular-clarity-master/src/app/modules/main/builder/dashboardnew/editnewdash/chart-config-modal.component.scss
new file mode 100644
index 0000000..74955f7
--- /dev/null
+++ b/frontend/angular-clarity-master/src/app/modules/main/builder/dashboardnew/editnewdash/chart-config-modal.component.scss
@@ -0,0 +1,5 @@
+.chart-config-modal {
+  padding: 20px;
+  max-height: 80vh;
+  overflow-y: auto;
+}
\ No newline at end of file
diff --git a/frontend/angular-clarity-master/src/app/modules/main/builder/dashboardnew/editnewdash/chart-config-modal.component.ts b/frontend/angular-clarity-master/src/app/modules/main/builder/dashboardnew/editnewdash/chart-config-modal.component.ts
new file mode 100644
index 0000000..ef2819b
--- /dev/null
+++ b/frontend/angular-clarity-master/src/app/modules/main/builder/dashboardnew/editnewdash/chart-config-modal.component.ts
@@ -0,0 +1,10 @@
+import { Component } from '@angular/core';
+
+@Component({
+  selector: 'app-chart-config-modal',
+  templateUrl: './chart-config-modal.component.html',
+  styleUrls: ['./chart-config-modal.component.scss']
+})
+export class ChartConfigModalComponent {
+  // This component will be used to display the chart configuration manager in a modal
+}
\ No newline at end of file
diff --git a/frontend/angular-clarity-master/src/app/modules/main/builder/dashboardnew/editnewdash/editnewdash.component.html b/frontend/angular-clarity-master/src/app/modules/main/builder/dashboardnew/editnewdash/editnewdash.component.html
index a440ffc..0d721e4 100644
--- a/frontend/angular-clarity-master/src/app/modules/main/builder/dashboardnew/editnewdash/editnewdash.component.html
+++ b/frontend/angular-clarity-master/src/app/modules/main/builder/dashboardnew/editnewdash/editnewdash.component.html
@@ -7,8 +7,8 @@
 </ol> -->
 
 <div style="display: inline;">
-  <button class="btn componentbtn" (click)="toggleMenu()"><clr-icon shape="plus"></clr-icon>component</button>
-  <button class="btn btn-primary" (click)="openCommonFilterModal()" style="margin-left: 10px;">
+  <button class="btn componentbtn" (click)="toggleMenu()" *ngIf="!fromRunner"><clr-icon shape="plus"></clr-icon>component</button>
+  <button class="btn btn-primary" (click)="openCommonFilterModal()" style="margin-left: 10px;" *ngIf="!fromRunner">
     <clr-icon shape="filter"></clr-icon> Common Filter
   </button>
   <div style="display: inline;">
@@ -17,12 +17,15 @@
   <div style="display: inline; float: right;">
     <!-- <button class="btn btn-primary">Build</button>
       <button class="btn btn-primary" (click)="onSchedule()">Schedule</button> -->
+    <button class="btn btn-success" (click)="testDynamicChartCreation()" style="margin-left: 10px;" *ngIf="!fromRunner">
+      <clr-icon shape="test"></clr-icon> Test Dynamic Chart
+    </button>
   </div>
 
 </div>
 
 <div class="content-container">
-  <nav class="sidenav" *ngIf="toggle" style="width: 16%;">
+  <nav class="sidenav" *ngIf="toggle && !fromRunner" style="width: 16%;">
     <ul class="nav-list" style="list-style-type: none;">
       <li *ngFor="let widget of WidgetsMock">
 
@@ -42,14 +45,14 @@
     <gridster [options]="options" (drop)="onDrop($event)" style="background-color: transparent;">
       <gridster-item [item]="item" *ngFor="let item of dashboardArray">
         <!-- <ng-container *ngIf="addToDashboard && item.addToDashboard"> -->
-        <button class="btn btn-icon btn-danger" style="margin-left: 10px; margin-top: 10px;" (click)="removeItem(item)">
+        <button class="btn btn-icon btn-danger" style="margin-left: 10px; margin-top: 10px;" (click)="removeItem(item)" *ngIf="!fromRunner">
           <clr-icon shape="trash"></clr-icon>
         </button>
-        <button class="btn btn-icon drag-handler" style="margin-left: 10px; margin-top: 10px;">
+        <button class="btn btn-icon drag-handler" style="margin-left: 10px; margin-top: 10px;" *ngIf="!fromRunner">
           <clr-icon shape="drag-handle"></clr-icon>
         </button>
 
-        <button class="btn btn-icon" style="margin-top: 10px; float: right;">
+        <button class="btn btn-icon" style="margin-top: 10px; float: right;" *ngIf="!fromRunner">
           <input type="checkbox" clrToggle [(ngModel)]="item.addToDashboard" name="addToDashboardSwitch"
             (change)="toggleAddToDashboard(item)" />
         </button>
@@ -57,7 +60,7 @@
         <!-- <label for="workflow_name">Add to Dasboard</label>
               <input class="btn btn-icon" style="margin-top: 10px;float: right;"  type="checkbox" clrToggle value="billable" name="billable" />
             -->
-        <button class="btn btn-icon" style="margin-top: 10px;float: right;" (click)="editGadget(item)">
+        <button class="btn btn-icon" style="margin-top: 10px;float: right;" (click)="editGadget(item)" *ngIf="!fromRunner">
           <clr-icon shape="pencil"></clr-icon>
         </button>
 
@@ -72,7 +75,7 @@
 </div>
 <div style="text-align: center;">
   <button class="btn btn-outline" (click)="goBack()">Back</button>
-  <button type="submit" class="btn btn-primary btn-adddata " (click)="UpdateLine()">
+  <button type="submit" class="btn btn-primary btn-adddata " (click)="UpdateLine()" *ngIf="!fromRunner">
     <b>Update</b>
   </button>
 </div>
@@ -89,53 +92,148 @@
             [(ngModel)]="gadgetsEditdata.charttitle">
         </div>
       </div>
-      
-      <!-- Add Connection Selection Field -->
-      <div class="clr-row">
+
+
+      <!-- Compact Filter Configuration (shown only for Compact Filter components) -->
+      <div class="clr-row" *ngIf="gadgetsEditdata?.fieldName === 'Compact Filter'">
         <div class="clr-col-sm-12">
-          <label for="connection">Connection</label>
-          <select id="connection" formControlName="connection" [(ngModel)]="gadgetsEditdata.connection" class="clr-select">
-            <option value="">Select Connection</option>
-            <option *ngFor="let conn of sureconnectData" [value]="conn.id">
-              {{conn.connection_name || conn.id}}
-            </option>
-          </select>
-          <div class="clr-subtext">Select a SureConnect connection to use for this chart</div>
-        </div>
-      </div>
-      
-      <div class="clr-row"
-        *ngIf="gadgetsEditdata?.fieldName !== 'Grid View' && gadgetsEditdata?.fieldName !== 'To Do Chart'">
-        <div class="clr-col-sm-12">
-          <div class="clr-form-control" style="margin-top: 5px;margin-bottom: 10px;">
-            <div class="clr-control-container">
-              <!-- <div class="clr-checkbox-wrapper">
-                <input type="checkbox" id="slices" formControlName="slices" [(ngModel)]="gadgetsEditdata.slices" class="clr-checkbox" />
-                <label for="slices" class="clr-control-label">Show colors in gradient</label>
-                </div> -->
-              <!-- <div class="clr-checkbox-wrapper">
-                <input type="checkbox" id="chartcolor" formControlName="chartcolor" [(ngModel)]="gadgetsEditdata.chartcolor" class="clr-checkbox" />
-                <label for="chartcolor" class="clr-control-label">Show colors in gradient</label>
-              </div> -->
-              <!-- <div class="clr-checkbox-wrapper">
-                <input type="checkbox" id="donut" formControlName="donut"[(ngModel)]="gadgetsEditdata.donut" class="clr-checkbox" />
-                <label for="donut" class="clr-control-label">Show donut</label>
-              </div> -->
-              <div class="clr-checkbox-wrapper">
-                <input type="checkbox" id="chartlegend" formControlName="chartlegend"
-                  [(ngModel)]="gadgetsEditdata.chartlegend" class="clr-checkbox" />
-                <label for="chartlegend" class="clr-control-label">Show Chart Legend</label>
+          <h4>Compact Filter Configuration</h4>
+
+          <div class="clr-row">
+            <div class="clr-col-sm-12">
+              <label for="compactFilterConnection">Connection</label>
+              <select id="compactFilterConnection" class="clr-select" [(ngModel)]="gadgetsEditdata.connection"
+                (ngModelChange)="onCompactFilterConnectionChange($event)" [ngModelOptions]="{standalone: true}">
+                <option value="">Select Connection</option>
+                <option *ngFor="let conn of sureconnectData" [value]="conn.id">
+                  {{conn.connection_name || conn.id}}
+                </option>
+              </select>
+              <div class="clr-subtext">Select a connection for this compact filter</div>
+            </div>
+          </div>
+
+          <div class="clr-row" style="margin-top: 10px;">
+            <div class="clr-col-sm-12">
+              <label for="compactFilterApiUrl">API URL</label>
+              <div>
+                <input type="text" id="compactFilterApiUrl" class="clr-input" [(ngModel)]="gadgetsEditdata.table"
+                  (ngModelChange)="onCompactFilterApiUrlChange($event)" [ngModelOptions]="{standalone: true}"
+                  placeholder="Enter API URL">
+                <span>
+                  <button class="btn btn-icon btn-primary" style="margin: 0px;"
+                    (click)="loadAvailableKeys(gadgetsEditdata.table, gadgetsEditdata.connection)"
+                    [disabled]="!gadgetsEditdata.table">
+                    <clr-icon shape="redo"></clr-icon>
+                  </button>
+                </span>
               </div>
-              <div class="clr-checkbox-wrapper">
-                <input type="checkbox" id="showlabel" formControlName="showlabel"
-                  [(ngModel)]="gadgetsEditdata.showlabel" class="clr-checkbox" />
-                <label for="showlabel" class="clr-control-label">Show Chart Label</label>
+              <div class="clr-subtext">Enter the API URL to fetch data for this filter</div>
+            </div>
+          </div>
+
+          <div class="clr-row" style="margin-top: 10px;">
+            <div class="clr-col-sm-12">
+              <label for="filterKey">Filter Key</label>
+              <select id="filterKey" class="clr-select" [(ngModel)]="gadgetsEditdata.filterKey"
+                (ngModelChange)="onFilterKeyChange($event)" [ngModelOptions]="{standalone: true}">
+                <option value="">Select Filter Key</option>
+                <option *ngFor="let key of availableKeys" [value]="key">{{ key }}</option>
+              </select>
+              <div class="clr-subtext">Select the field name to filter on</div>
+            </div>
+          </div>
+
+          <div class="clr-row" style="margin-top: 10px;">
+            <div class="clr-col-sm-12">
+              <label for="filterType">Filter Type</label>
+              <select id="filterType" class="clr-select" [(ngModel)]="gadgetsEditdata.filterType"
+                (ngModelChange)="onFilterTypeChange($event)" [ngModelOptions]="{standalone: true}">
+                <option value="text">Text</option>
+                <option value="dropdown">Dropdown</option>
+                <option value="multiselect">Multi-Select</option>
+                <option value="date-range">Date Range</option>
+                <option value="toggle">Toggle</option>
+              </select>
+              <div class="clr-subtext">Select the type of filter control to display</div>
+            </div>
+          </div>
+
+          <div class="clr-row" style="margin-top: 10px;">
+            <div class="clr-col-sm-12">
+              <label for="filterLabel">Filter Label (Optional)</label>
+              <input type="text" id="filterLabel" class="clr-input" [(ngModel)]="gadgetsEditdata.filterLabel"
+                [ngModelOptions]="{standalone: true}" placeholder="Enter filter label">
+              <div class="clr-subtext">Label to display for this filter in the UI (if not provided, filter key will be
+                used)</div>
+            </div>
+          </div>
+
+          <div class="clr-row" style="margin-top: 10px;"
+            *ngIf="gadgetsEditdata.filterType === 'dropdown' || gadgetsEditdata.filterType === 'multiselect'">
+            <div class="clr-col-sm-12">
+              <label for="filterOptions">Filter Options (comma separated)</label>
+              <input type="text" id="filterOptions" class="clr-input" [(ngModel)]="filterOptionsString"
+                [ngModelOptions]="{standalone: true}" placeholder="Option1,Option2,Option3">
+              <div class="clr-subtext">Comma-separated list of options for dropdown/multiselect filters</div>
+              <div class="clr-subtext" *ngIf="gadgetsEditdata.filterKey">
+                <strong>Available values for "{{ gadgetsEditdata.filterKey }}":</strong> {{ filterOptionsString }}
               </div>
             </div>
           </div>
         </div>
       </div>
-      <!-- <div class="clr-row">
+
+      <div class="clr-row" *ngIf="gadgetsEditdata?.fieldName  !== 'Compact Filter'"
+        style="margin-top: 20px; padding-top: 15px; border-top: 1px solid #ddd;">
+
+        <!-- Add Connection Selection Field -->
+        <div class="clr-row">
+          <div class="clr-col-sm-12">
+            <label for="connection">Connection</label>
+            <select id="connection" formControlName="connection" [(ngModel)]="gadgetsEditdata.connection"
+              class="clr-select">
+              <option value="">Select Connection</option>
+              <option *ngFor="let conn of sureconnectData" [value]="conn.id">
+                {{conn.connection_name || conn.id}}
+              </option>
+            </select>
+            <div class="clr-subtext">Select a SureConnect connection to use for this chart</div>
+          </div>
+        </div>
+
+        <div class="clr-row"
+          *ngIf="gadgetsEditdata?.fieldName !== 'Grid View' && gadgetsEditdata?.fieldName !== 'To Do Chart'">
+          <div class="clr-col-sm-12">
+            <div class="clr-form-control" style="margin-top: 5px;margin-bottom: 10px;">
+              <div class="clr-control-container">
+                <!-- <div class="clr-checkbox-wrapper">
+                <input type="checkbox" id="slices" formControlName="slices" [(ngModel)]="gadgetsEditdata.slices" class="clr-checkbox" />
+                <label for="slices" class="clr-control-label">Show colors in gradient</label>
+                </div> -->
+                <!-- <div class="clr-checkbox-wrapper">
+                <input type="checkbox" id="chartcolor" formControlName="chartcolor" [(ngModel)]="gadgetsEditdata.chartcolor" class="clr-checkbox" />
+                <label for="chartcolor" class="clr-control-label">Show colors in gradient</label>
+              </div> -->
+                <!-- <div class="clr-checkbox-wrapper">
+                <input type="checkbox" id="donut" formControlName="donut"[(ngModel)]="gadgetsEditdata.donut" class="clr-checkbox" />
+                <label for="donut" class="clr-control-label">Show donut</label>
+              </div> -->
+                <div class="clr-checkbox-wrapper">
+                  <input type="checkbox" id="chartlegend" formControlName="chartlegend"
+                    [(ngModel)]="gadgetsEditdata.chartlegend" class="clr-checkbox" />
+                  <label for="chartlegend" class="clr-control-label">Show Chart Legend</label>
+                </div>
+                <div class="clr-checkbox-wrapper">
+                  <input type="checkbox" id="showlabel" formControlName="showlabel"
+                    [(ngModel)]="gadgetsEditdata.showlabel" class="clr-checkbox" />
+                  <label for="showlabel" class="clr-control-label">Show Chart Label</label>
+                </div>
+              </div>
+            </div>
+          </div>
+        </div>
+        <!-- <div class="clr-row">
         <div class="clr-col-sm-12">
           <label for="datasource">Data Store</label>
           <select formControlName="datastore" [(ngModel)]="gadgetsEditdata.datastore" (change)="storename($event.target.value)">
@@ -145,417 +243,494 @@
         </div>
       </div> -->
 
-      <div class="clr-row">
-        <div class="clr-col-sm-12">
-          <label for="table">Api Url</label>
-          <div><input type="urk" id="table" formControlName="table" class="clr-input"
-              [(ngModel)]="gadgetsEditdata.table" style="width:90%">&nbsp;<span><button class="btn btn-icon btn-primary"
-                style="margin: 0px;" (click)="callApi(gadgetsEditdata.table)">
-                <clr-icon shape="redo"></clr-icon> </button></span></div>
-          <!-- <select  id="table" formControlName="table" [(ngModel)]="gadgetsEditdata.table" (change)="tablename($event.target.value)">
+        <div class="clr-row">
+          <div class="clr-col-sm-12">
+            <label for="table">Api Url</label>
+            <div><input type="urk" id="table" formControlName="table" class="clr-input"
+                [(ngModel)]="gadgetsEditdata.table" style="width:90%">&nbsp;<span><button
+                  class="btn btn-icon btn-primary" style="margin: 0px;" (click)="callApi(gadgetsEditdata.table)">
+                  <clr-icon shape="redo"></clr-icon> </button></span></div>
+            <!-- <select  id="table" formControlName="table" [(ngModel)]="gadgetsEditdata.table" (change)="tablename($event.target.value)">
             <option value="null">choose Table</option>
             <option *ngFor="let data of TableData" [value]="data">{{data}}</option>
            </select> -->
+          </div>
         </div>
-      </div>
-      <div class="clr-row"
-        *ngIf="gadgetsEditdata?.fieldName !== 'Grid View'&& gadgetsEditdata?.fieldName !== 'To Do Chart'">
-        <div class="clr-col-sm-12">
-          <label for="xAxis">X-Axis <span
-              *ngIf="gadgetsEditdata?.fieldName === 'Bubble Chart' || gadgetsEditdata?.fieldName === 'Scatter Chart' ">(Numeric)</span></label>
-          <!-- <input id="xAxis" type="text" formControlName="xAxis" class="clr-input" [(ngModel)]="gadgetsEditdata.xAxis"> -->
-          <select id="xAxis" formControlName="xAxis" [(ngModel)]="gadgetsEditdata.xAxis">
-            <option value="null">choose Column</option>
-            <option *ngFor="let data of columnData" [value]="data">{{data}}</option>
-          </select>
+        <div class="clr-row"
+          *ngIf="gadgetsEditdata?.fieldName !== 'Grid View'&& gadgetsEditdata?.fieldName !== 'To Do Chart'">
+          <div class="clr-col-sm-12">
+            <label for="xAxis">X-Axis <span
+                *ngIf="gadgetsEditdata?.fieldName === 'Bubble Chart' || gadgetsEditdata?.fieldName === 'Scatter Chart' ">(Numeric)</span></label>
+            <!-- <input id="xAxis" type="text" formControlName="xAxis" class="clr-input" [(ngModel)]="gadgetsEditdata.xAxis"> -->
+            <select id="xAxis" formControlName="xAxis" [(ngModel)]="gadgetsEditdata.xAxis">
+              <option value="null">choose Column</option>
+              <option *ngFor="let data of columnData" [value]="data">{{data}}</option>
+            </select>
+          </div>
         </div>
-      </div>
-      <div class="clr-row"
-        *ngIf="gadgetsEditdata?.fieldName !== 'Pie Chart' && gadgetsEditdata?.fieldName !== 'Polar Area Chart' && gadgetsEditdata?.fieldName !== 'To Do Chart'">
-        <div class="clr-col-sm-12">
-          <label for="yAxis" *ngIf="gadgetsEditdata?.fieldName === 'Grid View'; else yaxislable">Columns</label>
-          <ng-template #yaxislable>
+        <div class="clr-row"
+          *ngIf="gadgetsEditdata?.fieldName !== 'Pie Chart' && gadgetsEditdata?.fieldName !== 'Polar Area Chart' && gadgetsEditdata?.fieldName !== 'To Do Chart'">
+          <div class="clr-col-sm-12">
+            <label for="yAxis" *ngIf="gadgetsEditdata?.fieldName === 'Grid View'; else yaxislable">Columns</label>
+            <ng-template #yaxislable>
+              <label for="yAxis">Y-Axis (Numeric)</label>
+            </ng-template>
+
+            <!-- <input id="yAxis" type="text" formControlName="yAxis" class="clr-input" [(ngModel)]="gadgetsEditdata.yAxis"> -->
+            <clr-combobox-container style="margin-top: 10px !important;">
+              <clr-combobox id="yAxis" [(ngModel)]="selectedyAxis" formControlName="yAxis" clrMulti="true" required>
+                <ng-container *clrOptionSelected="let selected;let i = alias">
+                  {{selected}}
+                </ng-container>
+                <clr-options>
+                  <clr-option *clrOptionItems="let state of columnData" [clrValue]="state">
+                    {{state}}
+                  </clr-option>
+                </clr-options>
+              </clr-combobox>
+            </clr-combobox-container>
+          </div>
+        </div>
+
+        <div class="clr-row"
+          *ngIf="gadgetsEditdata?.fieldName == 'Pie Chart' || gadgetsEditdata?.fieldName == 'Polar Area Chart' || gadgetsEditdata?.fieldName == 'To Do Chart'">
+          <div class="clr-col-sm-12">
             <label for="yAxis">Y-Axis (Numeric)</label>
-          </ng-template>
-
-          <!-- <input id="yAxis" type="text" formControlName="yAxis" class="clr-input" [(ngModel)]="gadgetsEditdata.yAxis"> -->
-          <clr-combobox-container style="margin-top: 10px !important;">
-            <clr-combobox id="yAxis" [(ngModel)]="selectedyAxis" formControlName="yAxis" clrMulti="true" required>
-              <ng-container *clrOptionSelected="let selected;let i = alias">
-                {{selected}}
-              </ng-container>
-              <clr-options>
-                <clr-option *clrOptionItems="let state of columnData" [clrValue]="state">
-                  {{state}}
-                </clr-option>
-              </clr-options>
-            </clr-combobox>
-          </clr-combobox-container>
-        </div>
-      </div>
-
-      <div class="clr-row"
-        *ngIf="gadgetsEditdata?.fieldName == 'Pie Chart' || gadgetsEditdata?.fieldName == 'Polar Area Chart' || gadgetsEditdata?.fieldName == 'To Do Chart'">
-        <div class="clr-col-sm-12">
-          <label for="yAxis">Y-Axis (Numeric)</label>
-          <select id="yAxis" formControlName="yAxis" [(ngModel)]="gadgetsEditdata.yAxis">
-            <option value="null">choose Column</option>
-            <option *ngFor="let data of columnData" [value]="data">{{data}}</option>
-          </select>
-        </div>
-      </div>
-
-      <!-- Base API Filters -->
-      <div class="clr-row" style="margin-top: 15px;">
-        <div class="clr-col-sm-12">
-          <h5>Base API Filters</h5>
-          <div class="clr-subtext">Configure filters for the main API (applied regardless of drilldown settings)</div>
-          
-          <!-- Common Filter Toggle -->
-          <div class="clr-form-control" style="margin-top: 10px;">
-            <div class="clr-control-container">
-              <div class="clr-checkbox-wrapper">
-                <input type="checkbox" id="commonFilterToggle" [(ngModel)]="gadgetsEditdata.commonFilterEnabled" 
-                       (change)="onCommonFilterToggle()" [ngModelOptions]="{standalone: true}" class="clr-checkbox" />
-                <label for="commonFilterToggle" class="clr-control-label">Use Common Filter</label>
-              </div>
-            </div>
-          </div>
-          
-          <!-- Add Base Filter Button -->
-          <button class="btn btn-sm btn-primary" (click)="addBaseFilter()" style="margin-top: 10px; margin-bottom: 10px;" 
-                  [disabled]="gadgetsEditdata.commonFilterEnabled">
-            <clr-icon shape="plus"></clr-icon> Add Filter
-          </button>
-          
-          <!-- Base Filter Fields List -->
-          <div *ngFor="let filter of gadgetsEditdata.baseFilters; let i = index" 
-               style="margin-bottom: 10px; padding: 8px; border: 1px solid #eee; border-radius: 4px; background-color: #f9f9f9;">
-            <div style="display: flex; justify-content: space-between; align-items: center;">
-              <span>Filter {{i + 1}}</span>
-              <button class="btn btn-icon btn-danger btn-sm" (click)="removeBaseFilter(i)" 
-                      [disabled]="gadgetsEditdata.commonFilterEnabled">
-                <clr-icon shape="trash"></clr-icon>
-              </button>
-            </div>
-            
-            <div class="clr-row" style="margin-top: 8px;">
-              <div class="clr-col-sm-5">
-                <select [(ngModel)]="filter.field" [ngModelOptions]="{standalone: true}" class="clr-select" 
-                        [disabled]="gadgetsEditdata.commonFilterEnabled">
-                  <option value="">Select Field</option>
-                  <!-- Base API filters should always use columnData, not drilldownColumnData -->
-                  <option *ngFor="let column of getAvailableFields(gadgetsEditdata.baseFilters, i, columnData)" [value]="column">{{column}}</option>
-                </select>
-              </div>
-              
-              <div class="clr-col-sm-5">
-                <input type="text" [(ngModel)]="filter.value" [ngModelOptions]="{standalone: true}" 
-                       class="clr-input" placeholder="Filter Value" 
-                       [disabled]="gadgetsEditdata.commonFilterEnabled"/>
-              </div>
-              
-              <div class="clr-col-sm-2">
-                <button class="btn btn-icon btn-danger btn-sm" (click)="removeBaseFilter(i)" 
-                        [disabled]="gadgetsEditdata.commonFilterEnabled">
-                  <clr-icon shape="trash"></clr-icon>
-                </button>
-              </div>
-            </div>
+            <select id="yAxis" formControlName="yAxis" [(ngModel)]="gadgetsEditdata.yAxis">
+              <option value="null">choose Column</option>
+              <option *ngFor="let data of columnData" [value]="data">{{data}}</option>
+            </select>
           </div>
         </div>
-      </div>
 
-      <!-- Base Drilldown Configuration Section -->
-      <div class="clr-row" style="margin-top: 20px; padding-top: 15px; border-top: 1px solid #ddd;">
-        <div class="clr-col-sm-12">
-          <h4>Base Drilldown Configuration</h4>
-          <div class="clr-form-control">
-            <div class="clr-control-container">
-              <div class="clr-checkbox-wrapper">
-                <input type="checkbox" id="drilldownEnabled" formControlName="drilldownEnabled"
-                  [(ngModel)]="gadgetsEditdata.drilldownEnabled" class="clr-checkbox" 
-                  (change)="gadgetsEditdata.drilldownEnabled ? null : resetDrilldownConfiguration()" />
-                <label for="drilldownEnabled" class="clr-control-label">Enable Base Drilldown</label>
-              </div>
-            </div>
-          </div>
-        </div>
-      </div>
+        <!-- Base API Filters -->
+        <div class="clr-row" style="margin-top: 15px;">
+          <div class="clr-col-sm-12">
+            <h5>Base API Filters</h5>
+            <div class="clr-subtext">Configure filters for the main API (applied regardless of drilldown settings)</div>
 
-      <div class="clr-row" *ngIf="gadgetsEditdata.drilldownEnabled">
-        <div class="clr-col-sm-12">
-          <label for="drilldownApiUrl">Base Drilldown API URL</label>
-          <div>
-            <input type="text" id="drilldownApiUrl" formControlName="drilldownApiUrl" class="clr-input"
-              [(ngModel)]="gadgetsEditdata.drilldownApiUrl" style="width:90%" [ngModelOptions]="{standalone: true}">&nbsp;
-            <span>
-              <button class="btn btn-icon btn-primary" style="margin: 0px;" 
-                (click)="refreshBaseDrilldownColumns()" [disabled]="!gadgetsEditdata.drilldownApiUrl">
-                <clr-icon shape="redo"></clr-icon>
-              </button>
-            </span>
-          </div>
-          <div class="clr-subtext">Enter the API URL for base drilldown data. Use angle brackets for parameters, e.g., http://api.example.com/data/&lt;country&gt;</div>
-        </div>
-      </div>
-
-      <div class="clr-row" *ngIf="gadgetsEditdata.drilldownEnabled">
-        <div class="clr-col-sm-12">
-          <label for="drilldownXAxis">Base Drilldown X-Axis</label>
-          <select id="drilldownXAxis" formControlName="drilldownXAxis" [(ngModel)]="gadgetsEditdata.drilldownXAxis" [ngModelOptions]="{standalone: true}">
-            <option value="">Select X-Axis Column</option>
-            <option *ngFor="let column of drilldownColumnData" [value]="column">{{column}}</option>
-          </select>
-          <div class="clr-subtext">Select the column to use for X-axis in base drilldown view</div>
-        </div>
-      </div>
-
-      <div class="clr-row" *ngIf="gadgetsEditdata.drilldownEnabled && 
-        gadgetsEditdata?.fieldName !== 'Pie Chart' && 
-        gadgetsEditdata?.fieldName !== 'Polar Area Chart' && 
-        gadgetsEditdata?.fieldName !== 'To Do Chart'">
-        <div class="clr-col-sm-12">
-          <label for="drilldownYAxis">Base Drilldown Y-Axis</label>
-          <select id="drilldownYAxis" formControlName="drilldownYAxis" [(ngModel)]="gadgetsEditdata.drilldownYAxis" [ngModelOptions]="{standalone: true}">
-            <option value="">Select Y-Axis Column</option>
-            <option *ngFor="let column of drilldownColumnData" [value]="column">{{column}}</option>
-          </select>
-          <div class="clr-subtext">Select the column to use for Y-axis in base drilldown view</div>
-        </div>
-      </div>
-
-      <!-- Base Drilldown Parameter Configuration -->
-      <div class="clr-row" *ngIf="gadgetsEditdata.drilldownEnabled">
-        <div class="clr-col-sm-12">
-          <label for="drilldownParameter">Base Drilldown Parameter</label>
-          <select id="drilldownParameter" [(ngModel)]="gadgetsEditdata.drilldownParameter" [ngModelOptions]="{standalone: true}">
-            <option value="">Select Parameter Column</option>
-            <option *ngFor="let column of drilldownColumnData" [value]="column">{{column}}</option>
-          </select>
-          <div class="clr-subtext">Select the column to use as parameter for URL template replacement in base drilldown</div>
-        </div>
-      </div>
-
-      <!-- Base Drilldown Filter Configuration -->
-      <div class="clr-row" *ngIf="gadgetsEditdata.drilldownEnabled" style="margin-top: 15px;">
-        <div class="clr-col-sm-12">
-          <h5>Base Drilldown Filters</h5>
-          <div class="clr-subtext">Configure filters for the base drilldown level</div>
-          
-          <!-- Common Filter Toggle for Base Drilldown -->
-          <div class="clr-form-control" style="margin-top: 10px;">
-            <div class="clr-control-container">
-              <div class="clr-checkbox-wrapper">
-                <input type="checkbox" id="commonFilterToggleDrilldown" [(ngModel)]="gadgetsEditdata.commonFilterEnabledDrilldown" 
-                       (change)="onCommonFilterToggleDrilldown()" [ngModelOptions]="{standalone: true}" class="clr-checkbox" />
-                <label for="commonFilterToggleDrilldown" class="clr-control-label">Use Common Filter</label>
-              </div>
-            </div>
-          </div>
-          
-          <!-- Add Drilldown Filter Button -->
-          <button class="btn btn-sm btn-primary" (click)="addDrilldownFilter()" style="margin-top: 10px; margin-bottom: 10px;" 
-                  [disabled]="gadgetsEditdata.commonFilterEnabledDrilldown">
-            <clr-icon shape="plus"></clr-icon> Add Filter
-          </button>
-          
-          <!-- Drilldown Filter Fields List -->
-          <div *ngFor="let filter of gadgetsEditdata.drilldownFilters; let i = index" 
-               style="margin-bottom: 10px; padding: 8px; border: 1px solid #eee; border-radius: 4px; background-color: #f9f9f9;">
-            <div style="display: flex; justify-content: space-between; align-items: center;">
-              <span>Filter {{i + 1}}</span>
-              <button class="btn btn-icon btn-danger btn-sm" (click)="removeDrilldownFilter(i)" 
-                      [disabled]="gadgetsEditdata.commonFilterEnabledDrilldown">
-                <clr-icon shape="trash"></clr-icon>
-              </button>
-            </div>
-            
-            <div class="clr-row" style="margin-top: 8px;">
-              <div class="clr-col-sm-5">
-                <select [(ngModel)]="filter.field" [ngModelOptions]="{standalone: true}" class="clr-select" 
-                        [disabled]="gadgetsEditdata.commonFilterEnabledDrilldown">
-                  <option value="">Select Field</option>
-                  <option *ngFor="let column of getAvailableFields(gadgetsEditdata.drilldownFilters, i, drilldownColumnData)" [value]="column">{{column}}</option>
-                </select>
-              </div>
-              
-              <div class="clr-col-sm-5">
-                <input type="text" [(ngModel)]="filter.value" [ngModelOptions]="{standalone: true}" 
-                       class="clr-input" placeholder="Filter Value" 
-                       [disabled]="gadgetsEditdata.commonFilterEnabledDrilldown"/>
-              </div>
-              
-              <div class="clr-col-sm-2">
-                <button class="btn btn-icon btn-danger btn-sm" (click)="removeDrilldownFilter(i)" 
-                        [disabled]="gadgetsEditdata.commonFilterEnabledDrilldown">
-                  <clr-icon shape="trash"></clr-icon>
-                </button>
-              </div>
-            </div>
-          </div>
-        </div>
-      </div>
-
-
-
-      <!-- Multi-Layer Drilldown Configurations -->
-      <div class="clr-row" *ngIf="gadgetsEditdata.drilldownEnabled" style="margin-top: 20px; padding-top: 15px; border-top: 1px solid #ddd;">
-        <div class="clr-col-sm-12">
-          <h4>Multi-Layer Drilldown Configurations</h4>
-          <button class="btn btn-sm btn-primary" (click)="addDrilldownLayer()">
-            <clr-icon shape="plus"></clr-icon> Add Drilldown Layer
-          </button>
-          <div class="clr-subtext">Add additional drilldown layers for multi-level navigation</div>
-        </div>
-      </div>
-
-      <!-- Dynamic Drilldown Layers -->
-      <div class="clr-row" *ngFor="let layer of gadgetsEditdata.drilldownLayers; let i = index">
-        <div class="clr-col-sm-12" style="margin-top: 15px; padding: 10px; border: 1px solid #eee; border-radius: 4px;">
-          <div style="display: flex; justify-content: space-between; align-items: center;">
-            <h5>Drilldown Layer {{i + 1}}</h5>
-            <button class="btn btn-icon btn-danger btn-sm" (click)="removeDrilldownLayer(i)">
-              <clr-icon shape="trash"></clr-icon>
-            </button>
-          </div>
-          
-          <div class="clr-form-control">
-            <div class="clr-control-container">
-              <div class="clr-checkbox-wrapper">
-                <input type="checkbox" [id]="'layerEnabled' + i" [(ngModel)]="layer.enabled" class="clr-checkbox" [ngModelOptions]="{standalone: true}" />
-                <label [for]="'layerEnabled' + i" class="clr-control-label">Enable Layer {{i + 1}} Drilldown</label>
-              </div>
-            </div>
-          </div>
-          
-          <div class="clr-row">
-            <div class="clr-col-sm-12">
-              <label [for]="'layerApiUrl' + i">Layer {{i + 1}} API URL</label>
-              <div>
-                <input type="text" [id]="'layerApiUrl' + i" class="clr-input"
-                  [(ngModel)]="layer.apiUrl" style="width:90%" [ngModelOptions]="{standalone: true}">&nbsp;
-                <span>
-                  <button class="btn btn-icon btn-primary" style="margin: 0px;" 
-                    (click)="refreshDrilldownLayerColumns(i)" [disabled]="!layer.apiUrl">
-                    <clr-icon shape="redo"></clr-icon>
-                  </button>
-                </span>
-              </div>
-              <div class="clr-subtext">Enter the API URL for layer {{i + 1}} drilldown data. Use angle brackets for parameters, e.g., http://api.example.com/data/&lt;state&gt;</div>
-            </div>
-          </div>
-          
-          <div class="clr-row">
-            <div class="clr-col-sm-12">
-              <label [for]="'layerXAxis' + i">Layer {{i + 1}} X-Axis</label>
-              <select [id]="'layerXAxis' + i" [(ngModel)]="layer.xAxis" [ngModelOptions]="{standalone: true}">
-                <option value="">Select X-Axis Column</option>
-                <option *ngFor="let column of layerColumnData[i] || []" [value]="column">{{column}}</option>
-              </select>
-              <div class="clr-subtext">Select the column to use for X-axis in layer {{i + 1}} drilldown view</div>
-            </div>
-          </div>
-          
-          <div class="clr-row" *ngIf="gadgetsEditdata?.fieldName !== 'Pie Chart' && 
-            gadgetsEditdata?.fieldName !== 'Polar Area Chart' && 
-            gadgetsEditdata?.fieldName !== 'To Do Chart'">
-            <div class="clr-col-sm-12">
-              <label [for]="'layerYAxis' + i">Layer {{i + 1}} Y-Axis</label>
-              <select [id]="'layerYAxis' + i" [(ngModel)]="layer.yAxis" [ngModelOptions]="{standalone: true}">
-                <option value="">Select Y-Axis Column</option>
-                <option *ngFor="let column of layerColumnData[i] || []" [value]="column">{{column}}</option>
-              </select>
-              <div class="clr-subtext">Select the column to use for Y-axis in layer {{i + 1}} drilldown view</div>
-            </div>
-          </div>
-
-          <!-- Parameter Selection for Drilldown Layer -->
-          <div class="clr-row">
-            <div class="clr-col-sm-12">
-              <label [for]="'layerParameter' + i">Layer {{i + 1}} Parameter</label>
-              <select [id]="'layerParameter' + i" [(ngModel)]="layer.parameter" [ngModelOptions]="{standalone: true}">
-                <option value="">Select Parameter Column</option>
-                <option *ngFor="let column of layerColumnData[i] || []" [value]="column">{{column}}</option>
-              </select>
-              <div class="clr-subtext">Select the column to use as parameter for URL template replacement in layer {{i + 1}} drilldown</div>
-            </div>
-          </div>
-
-          <!-- Layer Filter Configuration -->
-          <div class="clr-row" style="margin-top: 15px;">
-            <div class="clr-col-sm-12">
-              <h5>Layer {{i + 1}} Filters</h5>
-              <div class="clr-subtext">Configure filters for this drilldown layer</div>
-              
-              <!-- Common Filter Toggle for Layer -->
-              <div class="clr-form-control" style="margin-top: 10px;">
-                <div class="clr-control-container">
-                  <div class="clr-checkbox-wrapper">
-                    <input type="checkbox" [id]="'commonFilterToggleLayer' + i" [(ngModel)]="layer.commonFilterEnabled" 
-                           (change)="onCommonFilterToggleLayer(i)" [ngModelOptions]="{standalone: true}" class="clr-checkbox" />
-                    <label [for]="'commonFilterToggleLayer' + i" class="clr-control-label">Use Common Filter</label>
-                  </div>
+            <!-- Common Filter Toggle -->
+            <div class="clr-form-control" style="margin-top: 10px;">
+              <div class="clr-control-container">
+                <div class="clr-checkbox-wrapper">
+                  <input type="checkbox" id="commonFilterToggle" [(ngModel)]="gadgetsEditdata.commonFilterEnabled"
+                    (change)="onCommonFilterToggle()" [ngModelOptions]="{standalone: true}" class="clr-checkbox" />
+                  <label for="commonFilterToggle" class="clr-control-label">Use Common Filter</label>
                 </div>
               </div>
-              
-              <!-- Add Layer Filter Button -->
-              <button class="btn btn-sm btn-primary" (click)="addLayerFilter(i)" style="margin-top: 10px; margin-bottom: 10px;" 
-                      [disabled]="layer.commonFilterEnabled">
-                <clr-icon shape="plus"></clr-icon> Add Filter
-              </button>
-              
-              <!-- Layer Filter Fields List -->
-              <div *ngFor="let filter of layer.filters; let j = index" 
-                   style="margin-bottom: 10px; padding: 8px; border: 1px solid #eee; border-radius: 4px; background-color: #f9f9f9;">
-                <div style="display: flex; justify-content: space-between; align-items: center;">
-                  <span>Filter {{j + 1}}</span>
-                  <button class="btn btn-icon btn-danger btn-sm" (click)="removeLayerFilter(i, j)" 
-                          [disabled]="layer.commonFilterEnabled">
+            </div>
+
+            <!-- Add Base Filter Button -->
+            <button class="btn btn-sm btn-primary" (click)="addBaseFilter()"
+              style="margin-top: 10px; margin-bottom: 10px;" [disabled]="gadgetsEditdata.commonFilterEnabled">
+              <clr-icon shape="plus"></clr-icon> Add Filter
+            </button>
+
+            <!-- Base Filter Fields List -->
+            <div *ngFor="let filter of gadgetsEditdata.baseFilters; let i = index"
+              style="margin-bottom: 10px; padding: 8px; border: 1px solid #eee; border-radius: 4px; background-color: #f9f9f9;">
+              <div style="display: flex; justify-content: space-between; align-items: center;">
+                <span>Filter {{i + 1}}</span>
+                <button class="btn btn-icon btn-danger btn-sm" (click)="removeBaseFilter(i)"
+                  [disabled]="gadgetsEditdata.commonFilterEnabled">
+                  <clr-icon shape="trash"></clr-icon>
+                </button>
+              </div>
+
+              <div class="clr-row" style="margin-top: 8px;">
+                <div class="clr-col-sm-4">
+                  <select [(ngModel)]="filter.field" (ngModelChange)="onBaseFilterFieldChange(i, $event)" [ngModelOptions]="{standalone: true}" class="clr-select"
+                    [disabled]="gadgetsEditdata.commonFilterEnabled">
+                    <option value="">Select Field</option>
+                    <!-- Base API filters should always use columnData, not drilldownColumnData -->
+                    <option *ngFor="let column of getAvailableFields(gadgetsEditdata.baseFilters, i, columnData)"
+                      [value]="column">{{column}}</option>
+                  </select>
+                </div>
+
+                <div class="clr-col-sm-3">
+                  <select [(ngModel)]="filter.type" (ngModelChange)="onBaseFilterTypeChange(i, $event)" [ngModelOptions]="{standalone: true}" class="clr-select"
+                    [disabled]="gadgetsEditdata.commonFilterEnabled">
+                    <option value="text">Text</option>
+                    <option value="dropdown">Dropdown</option>
+                    <option value="multiselect">Multi-Select</option>
+                    <option value="date-range">Date Range</option>
+                    <option value="toggle">Toggle</option>
+                  </select>
+                </div>
+
+                <div class="clr-col-sm-3" *ngIf="filter.type === 'dropdown' || filter.type === 'multiselect'">
+                  <input type="text" [(ngModel)]="filter.options" [ngModelOptions]="{standalone: true}" class="clr-input"
+                    placeholder="Option1,Option2,Option3" [disabled]="gadgetsEditdata.commonFilterEnabled" />
+                  <div class="clr-subtext" *ngIf="filter.availableValues">
+                    Available: {{ filter.availableValues }}
+                  </div>
+                </div>
+
+                <div class="clr-col-sm-3" *ngIf="filter.type !== 'dropdown' && filter.type !== 'multiselect'">
+                  <input type="text" [(ngModel)]="filter.value" [ngModelOptions]="{standalone: true}" class="clr-input"
+                    placeholder="Filter Value" [disabled]="gadgetsEditdata.commonFilterEnabled" />
+                </div>
+
+                <div class="clr-col-sm-2">
+                  <button class="btn btn-icon btn-danger btn-sm" (click)="removeBaseFilter(i)"
+                    [disabled]="gadgetsEditdata.commonFilterEnabled">
                     <clr-icon shape="trash"></clr-icon>
                   </button>
                 </div>
-                
-                <div class="clr-row" style="margin-top: 8px;">
-                  <div class="clr-col-sm-5">
-                    <select [(ngModel)]="filter.field" [ngModelOptions]="{standalone: true}" class="clr-select" 
-                            [disabled]="layer.commonFilterEnabled">
-                      <option value="">Select Field</option>
-                      <option *ngFor="let column of getAvailableFields(layer.filters, j, layerColumnData[i] || [])" [value]="column">{{column}}</option>
-                    </select>
+              </div>
+            </div>
+          </div>
+        </div>
+
+        <!-- Base Drilldown Configuration Section -->
+        <div class="clr-row" style="margin-top: 20px; padding-top: 15px; border-top: 1px solid #ddd;">
+          <div class="clr-col-sm-12">
+            <h4>Base Drilldown Configuration</h4>
+            <div class="clr-form-control">
+              <div class="clr-control-container">
+                <div class="clr-checkbox-wrapper">
+                  <input type="checkbox" id="drilldownEnabled" formControlName="drilldownEnabled"
+                    [(ngModel)]="gadgetsEditdata.drilldownEnabled" class="clr-checkbox"
+                    (change)="gadgetsEditdata.drilldownEnabled ? null : resetDrilldownConfiguration()" />
+                  <label for="drilldownEnabled" class="clr-control-label">Enable Base Drilldown</label>
+                </div>
+              </div>
+            </div>
+          </div>
+        </div>
+
+        <div class="clr-row" *ngIf="gadgetsEditdata.drilldownEnabled">
+          <div class="clr-col-sm-12">
+            <label for="drilldownApiUrl">Base Drilldown API URL</label>
+            <div>
+              <input type="text" id="drilldownApiUrl" formControlName="drilldownApiUrl" class="clr-input"
+                [(ngModel)]="gadgetsEditdata.drilldownApiUrl" style="width:90%"
+                [ngModelOptions]="{standalone: true}">&nbsp;
+              <span>
+                <button class="btn btn-icon btn-primary" style="margin: 0px;" (click)="refreshBaseDrilldownColumns()"
+                  [disabled]="!gadgetsEditdata.drilldownApiUrl">
+                  <clr-icon shape="redo"></clr-icon>
+                </button>
+              </span>
+            </div>
+            <div class="clr-subtext">Enter the API URL for base drilldown data. Use angle brackets for parameters, e.g.,
+              http://api.example.com/data/&lt;country&gt;</div>
+          </div>
+        </div>
+
+        <div class="clr-row" *ngIf="gadgetsEditdata.drilldownEnabled">
+          <div class="clr-col-sm-12">
+            <label for="drilldownXAxis">Base Drilldown X-Axis</label>
+            <select id="drilldownXAxis" formControlName="drilldownXAxis" [(ngModel)]="gadgetsEditdata.drilldownXAxis"
+              [ngModelOptions]="{standalone: true}">
+              <option value="">Select X-Axis Column</option>
+              <option *ngFor="let column of drilldownColumnData" [value]="column">{{column}}</option>
+            </select>
+            <div class="clr-subtext">Select the column to use for X-axis in base drilldown view</div>
+          </div>
+        </div>
+
+        <div class="clr-row" *ngIf="gadgetsEditdata.drilldownEnabled && 
+        gadgetsEditdata?.fieldName !== 'Pie Chart' && 
+        gadgetsEditdata?.fieldName !== 'Polar Area Chart' && 
+        gadgetsEditdata?.fieldName !== 'To Do Chart'">
+          <div class="clr-col-sm-12">
+            <label for="drilldownYAxis">Base Drilldown Y-Axis</label>
+            <select id="drilldownYAxis" formControlName="drilldownYAxis" [(ngModel)]="gadgetsEditdata.drilldownYAxis"
+              [ngModelOptions]="{standalone: true}">
+              <option value="">Select Y-Axis Column</option>
+              <option *ngFor="let column of drilldownColumnData" [value]="column">{{column}}</option>
+            </select>
+            <div class="clr-subtext">Select the column to use for Y-axis in base drilldown view</div>
+          </div>
+        </div>
+
+        <!-- Base Drilldown Parameter Configuration -->
+        <div class="clr-row" *ngIf="gadgetsEditdata.drilldownEnabled">
+          <div class="clr-col-sm-12">
+            <label for="drilldownParameter">Base Drilldown Parameter</label>
+            <select id="drilldownParameter" [(ngModel)]="gadgetsEditdata.drilldownParameter"
+              [ngModelOptions]="{standalone: true}">
+              <option value="">Select Parameter Column</option>
+              <option *ngFor="let column of drilldownColumnData" [value]="column">{{column}}</option>
+            </select>
+            <div class="clr-subtext">Select the column to use as parameter for URL template replacement in base
+              drilldown
+            </div>
+          </div>
+        </div>
+
+        <!-- Base Drilldown Filter Configuration -->
+        <div class="clr-row" *ngIf="gadgetsEditdata.drilldownEnabled" style="margin-top: 15px;">
+          <div class="clr-col-sm-12">
+            <h5>Base Drilldown Filters</h5>
+            <div class="clr-subtext">Configure filters for the base drilldown level</div>
+
+            <!-- Common Filter Toggle for Base Drilldown -->
+            <div class="clr-form-control" style="margin-top: 10px;">
+              <div class="clr-control-container">
+                <div class="clr-checkbox-wrapper">
+                  <input type="checkbox" id="commonFilterToggleDrilldown"
+                    [(ngModel)]="gadgetsEditdata.commonFilterEnabledDrilldown"
+                    (change)="onCommonFilterToggleDrilldown()" [ngModelOptions]="{standalone: true}"
+                    class="clr-checkbox" />
+                  <label for="commonFilterToggleDrilldown" class="clr-control-label">Use Common Filter</label>
+                </div>
+              </div>
+            </div>
+
+            <!-- Add Drilldown Filter Button -->
+            <button class="btn btn-sm btn-primary" (click)="addDrilldownFilter()"
+              style="margin-top: 10px; margin-bottom: 10px;" [disabled]="gadgetsEditdata.commonFilterEnabledDrilldown">
+              <clr-icon shape="plus"></clr-icon> Add Filter
+            </button>
+
+            <!-- Drilldown Filter Fields List -->
+            <div *ngFor="let filter of gadgetsEditdata.drilldownFilters; let i = index"
+              style="margin-bottom: 10px; padding: 8px; border: 1px solid #eee; border-radius: 4px; background-color: #f9f9f9;">
+              <div style="display: flex; justify-content: space-between; align-items: center;">
+                <span>Filter {{i + 1}}</span>
+                <button class="btn btn-icon btn-danger btn-sm" (click)="removeDrilldownFilter(i)"
+                  [disabled]="gadgetsEditdata.commonFilterEnabledDrilldown">
+                  <clr-icon shape="trash"></clr-icon>
+                </button>
+              </div>
+
+              <div class="clr-row" style="margin-top: 8px;">
+                <div class="clr-col-sm-4">
+                  <select [(ngModel)]="filter.field" (ngModelChange)="onDrilldownFilterFieldChange(i, $event)" [ngModelOptions]="{standalone: true}" class="clr-select"
+                    [disabled]="gadgetsEditdata.commonFilterEnabledDrilldown">
+                    <option value="">Select Field</option>
+                    <option
+                      *ngFor="let column of getAvailableFields(gadgetsEditdata.drilldownFilters, i, drilldownColumnData)"
+                      [value]="column">{{column}}</option>
+                  </select>
+                </div>
+
+                <div class="clr-col-sm-3">
+                  <select [(ngModel)]="filter.type" (ngModelChange)="onDrilldownFilterTypeChange(i, $event)" [ngModelOptions]="{standalone: true}" class="clr-select"
+                    [disabled]="gadgetsEditdata.commonFilterEnabledDrilldown">
+                    <option value="text">Text</option>
+                    <option value="dropdown">Dropdown</option>
+                    <option value="multiselect">Multi-Select</option>
+                    <option value="date-range">Date Range</option>
+                    <option value="toggle">Toggle</option>
+                  </select>
+                </div>
+
+                <div class="clr-col-sm-3" *ngIf="filter.type === 'dropdown' || filter.type === 'multiselect'">
+                  <input type="text" [(ngModel)]="filter.options" [ngModelOptions]="{standalone: true}" class="clr-input"
+                    placeholder="Option1,Option2,Option3" [disabled]="gadgetsEditdata.commonFilterEnabledDrilldown" />
+                  <div class="clr-subtext" *ngIf="filter.availableValues">
+                    Available: {{ filter.availableValues }}
                   </div>
-                  
-                  <div class="clr-col-sm-5">
-                    <input type="text" [(ngModel)]="filter.value" [ngModelOptions]="{standalone: true}" 
-                           class="clr-input" placeholder="Filter Value" 
-                           [disabled]="layer.commonFilterEnabled"/>
+                </div>
+
+                <div class="clr-col-sm-3" *ngIf="filter.type !== 'dropdown' && filter.type !== 'multiselect'">
+                  <input type="text" [(ngModel)]="filter.value" [ngModelOptions]="{standalone: true}" class="clr-input"
+                    placeholder="Filter Value" [disabled]="gadgetsEditdata.commonFilterEnabledDrilldown" />
+                </div>
+
+                <div class="clr-col-sm-2">
+                  <button class="btn btn-icon btn-danger btn-sm" (click)="removeDrilldownFilter(i)"
+                    [disabled]="gadgetsEditdata.commonFilterEnabledDrilldown">
+                    <clr-icon shape="trash"></clr-icon>
+                  </button>
+                </div>
+              </div>
+            </div>
+          </div>
+        </div>
+
+
+
+        <!-- Multi-Layer Drilldown Configurations -->
+        <div class="clr-row" *ngIf="gadgetsEditdata.drilldownEnabled"
+          style="margin-top: 20px; padding-top: 15px; border-top: 1px solid #ddd;">
+          <div class="clr-col-sm-12">
+            <h4>Multi-Layer Drilldown Configurations</h4>
+            <button class="btn btn-sm btn-primary" (click)="addDrilldownLayer()">
+              <clr-icon shape="plus"></clr-icon> Add Drilldown Layer
+            </button>
+            <div class="clr-subtext">Add additional drilldown layers for multi-level navigation</div>
+          </div>
+        </div>
+
+        <!-- Dynamic Drilldown Layers -->
+        <div class="clr-row" *ngFor="let layer of gadgetsEditdata.drilldownLayers; let i = index">
+          <div class="clr-col-sm-12"
+            style="margin-top: 15px; padding: 10px; border: 1px solid #eee; border-radius: 4px;">
+            <div style="display: flex; justify-content: space-between; align-items: center;">
+              <h5>Drilldown Layer {{i + 1}}</h5>
+              <button class="btn btn-icon btn-danger btn-sm" (click)="removeDrilldownLayer(i)">
+                <clr-icon shape="trash"></clr-icon>
+              </button>
+            </div>
+
+            <div class="clr-form-control">
+              <div class="clr-control-container">
+                <div class="clr-checkbox-wrapper">
+                  <input type="checkbox" [id]="'layerEnabled' + i" [(ngModel)]="layer.enabled" class="clr-checkbox"
+                    [ngModelOptions]="{standalone: true}" />
+                  <label [for]="'layerEnabled' + i" class="clr-control-label">Enable Layer {{i + 1}} Drilldown</label>
+                </div>
+              </div>
+            </div>
+
+            <div class="clr-row">
+              <div class="clr-col-sm-12">
+                <label [for]="'layerApiUrl' + i">Layer {{i + 1}} API URL</label>
+                <div>
+                  <input type="text" [id]="'layerApiUrl' + i" class="clr-input" [(ngModel)]="layer.apiUrl"
+                    style="width:90%" [ngModelOptions]="{standalone: true}">&nbsp;
+                  <span>
+                    <button class="btn btn-icon btn-primary" style="margin: 0px;"
+                      (click)="refreshDrilldownLayerColumns(i)" [disabled]="!layer.apiUrl">
+                      <clr-icon shape="redo"></clr-icon>
+                    </button>
+                  </span>
+                </div>
+                <div class="clr-subtext">Enter the API URL for layer {{i + 1}} drilldown data. Use angle brackets for
+                  parameters, e.g., http://api.example.com/data/&lt;state&gt;</div>
+              </div>
+            </div>
+
+            <div class="clr-row">
+              <div class="clr-col-sm-12">
+                <label [for]="'layerXAxis' + i">Layer {{i + 1}} X-Axis</label>
+                <select [id]="'layerXAxis' + i" [(ngModel)]="layer.xAxis" [ngModelOptions]="{standalone: true}">
+                  <option value="">Select X-Axis Column</option>
+                  <option *ngFor="let column of layerColumnData[i] || []" [value]="column">{{column}}</option>
+                </select>
+                <div class="clr-subtext">Select the column to use for X-axis in layer {{i + 1}} drilldown view</div>
+              </div>
+            </div>
+
+            <div class="clr-row" *ngIf="gadgetsEditdata?.fieldName !== 'Pie Chart' && 
+            gadgetsEditdata?.fieldName !== 'Polar Area Chart' && 
+            gadgetsEditdata?.fieldName !== 'To Do Chart'">
+              <div class="clr-col-sm-12">
+                <label [for]="'layerYAxis' + i">Layer {{i + 1}} Y-Axis</label>
+                <select [id]="'layerYAxis' + i" [(ngModel)]="layer.yAxis" [ngModelOptions]="{standalone: true}">
+                  <option value="">Select Y-Axis Column</option>
+                  <option *ngFor="let column of layerColumnData[i] || []" [value]="column">{{column}}</option>
+                </select>
+                <div class="clr-subtext">Select the column to use for Y-axis in layer {{i + 1}} drilldown view</div>
+              </div>
+            </div>
+
+            <!-- Parameter Selection for Drilldown Layer -->
+            <div class="clr-row">
+              <div class="clr-col-sm-12">
+                <label [for]="'layerParameter' + i">Layer {{i + 1}} Parameter</label>
+                <select [id]="'layerParameter' + i" [(ngModel)]="layer.parameter" [ngModelOptions]="{standalone: true}">
+                  <option value="">Select Parameter Column</option>
+                  <option *ngFor="let column of layerColumnData[i] || []" [value]="column">{{column}}</option>
+                </select>
+                <div class="clr-subtext">Select the column to use as parameter for URL template replacement in layer {{i
+                  +
+                  1}} drilldown</div>
+              </div>
+            </div>
+
+            <!-- Layer Filter Configuration -->
+            <div class="clr-row" style="margin-top: 15px;">
+              <div class="clr-col-sm-12">
+                <h5>Layer {{i + 1}} Filters</h5>
+                <div class="clr-subtext">Configure filters for this drilldown layer</div>
+
+                <!-- Common Filter Toggle for Layer -->
+                <div class="clr-form-control" style="margin-top: 10px;">
+                  <div class="clr-control-container">
+                    <div class="clr-checkbox-wrapper">
+                      <input type="checkbox" [id]="'commonFilterToggleLayer' + i"
+                        [(ngModel)]="layer.commonFilterEnabled" (change)="onCommonFilterToggleLayer(i)"
+                        [ngModelOptions]="{standalone: true}" class="clr-checkbox" />
+                      <label [for]="'commonFilterToggleLayer' + i" class="clr-control-label">Use Common Filter</label>
+                    </div>
                   </div>
-                  
-                  <div class="clr-col-sm-2">
-                    <button class="btn btn-icon btn-danger btn-sm" (click)="removeLayerFilter(i, j)" 
-                            [disabled]="layer.commonFilterEnabled">
+                </div>
+
+                <!-- Add Layer Filter Button -->
+                <button class="btn btn-sm btn-primary" (click)="addLayerFilter(i)"
+                  style="margin-top: 10px; margin-bottom: 10px;" [disabled]="layer.commonFilterEnabled">
+                  <clr-icon shape="plus"></clr-icon> Add Filter
+                </button>
+
+                <!-- Layer Filter Fields List -->
+                <div *ngFor="let filter of layer.filters; let j = index"
+                  style="margin-bottom: 10px; padding: 8px; border: 1px solid #eee; border-radius: 4px; background-color: #f9f9f9;">
+                  <div style="display: flex; justify-content: space-between; align-items: center;">
+                    <span>Filter {{j + 1}}</span>
+                    <button class="btn btn-icon btn-danger btn-sm" (click)="removeLayerFilter(i, j)"
+                      [disabled]="layer.commonFilterEnabled">
                       <clr-icon shape="trash"></clr-icon>
                     </button>
                   </div>
+
+                  <div class="clr-row" style="margin-top: 8px;">
+                    <div class="clr-col-sm-4">
+                      <select [(ngModel)]="filter.field" (ngModelChange)="onLayerFilterFieldChange(i, j, $event)" [ngModelOptions]="{standalone: true}" class="clr-select"
+                        [disabled]="layer.commonFilterEnabled">
+                        <option value="">Select Field</option>
+                        <option *ngFor="let column of getAvailableFields(layer.filters, j, layerColumnData[i] || [])"
+                          [value]="column">{{column}}</option>
+                      </select>
+                    </div>
+
+                    <div class="clr-col-sm-3">
+                      <select [(ngModel)]="filter.type" (ngModelChange)="onLayerFilterTypeChange(i, j, $event)" [ngModelOptions]="{standalone: true}" class="clr-select"
+                        [disabled]="layer.commonFilterEnabled">
+                        <option value="text">Text</option>
+                        <option value="dropdown">Dropdown</option>
+                        <option value="multiselect">Multi-Select</option>
+                        <option value="date-range">Date Range</option>
+                        <option value="toggle">Toggle</option>
+                      </select>
+                    </div>
+
+                    <div class="clr-col-sm-3" *ngIf="filter.type === 'dropdown' || filter.type === 'multiselect'">
+                      <input type="text" [(ngModel)]="filter.options" [ngModelOptions]="{standalone: true}" class="clr-input"
+                        placeholder="Option1,Option2,Option3" [disabled]="layer.commonFilterEnabled" />
+                      <div class="clr-subtext" *ngIf="filter.availableValues">
+                        Available: {{ filter.availableValues }}
+                      </div>
+                    </div>
+
+                    <div class="clr-col-sm-3" *ngIf="filter.type !== 'dropdown' && filter.type !== 'multiselect'">
+                      <input type="text" [(ngModel)]="filter.value" [ngModelOptions]="{standalone: true}" class="clr-input"
+                        placeholder="Filter Value" [disabled]="layer.commonFilterEnabled" />
+                    </div>
+
+                    <div class="clr-col-sm-2">
+                      <button class="btn btn-icon btn-danger btn-sm" (click)="removeLayerFilter(i, j)"
+                        [disabled]="layer.commonFilterEnabled">
+                        <clr-icon shape="trash"></clr-icon>
+                      </button>
+                    </div>
+                  </div>
                 </div>
               </div>
             </div>
           </div>
         </div>
-      </div>
 
-      <!-- <div class="clr-row">
+        <!-- <div class="clr-row">
         <div class="clr-col-sm-12">
           <label for="chartparameter">API parameter</label>
           <input id="chartparameter" type="text" formControlName="chartparameter" class="clr-input" [(ngModel)]="gadgetsEditdata.chartparameter">
         </div>
       </div> -->
-      <div class="modal-footer">
-        <button type="button" class="btn btn-outline" (click)="modeledit = false">Cancel</button>
-        <button type="button" class="btn btn-primary" (click)="applyChanges(modelid)">Apply</button>
-        <button type="submit" class="btn btn-primary" (click)="onSubmit(modelid)">Save</button>
+
       </div>
 
+        <div class="modal-footer">
+          <button type="button" class="btn btn-outline" (click)="modeledit = false">Cancel</button>
+          <button type="button" class="btn btn-primary" (click)="applyChanges(modelid)">Apply</button>
+          <button type="submit" class="btn btn-primary" (click)="onSubmit(modelid)">Save</button>
+        </div>
+
     </form>
   </div>
 </clr-modal>
@@ -568,7 +743,8 @@
       <div class="clr-row">
         <div class="clr-col-sm-12">
           <label for="commonFilterConnection">Connection</label>
-          <select id="commonFilterConnection" formControlName="connection" [(ngModel)]="commonFilterData.connection" class="clr-select">
+          <select id="commonFilterConnection" formControlName="connection" [(ngModel)]="commonFilterData.connection"
+            class="clr-select">
             <option value="">Select Connection</option>
             <option *ngFor="let conn of sureconnectData" [value]="conn.id">
               {{conn.connection_name || conn.id}}
@@ -576,7 +752,7 @@
           </select>
         </div>
       </div>
-      
+
       <div class="clr-row">
         <div class="clr-col-sm-12">
           <label for="commonFilterApiUrl">API URL</label>
@@ -584,35 +760,36 @@
             <input type="text" id="commonFilterApiUrl" formControlName="apiUrl" class="clr-input"
               [(ngModel)]="commonFilterData.apiUrl" style="width:90%">&nbsp;
             <span>
-              <button class="btn btn-icon btn-primary" style="margin: 0px;" 
-                (click)="refreshCommonFilterColumns()" [disabled]="!commonFilterData.apiUrl">
+              <button class="btn btn-icon btn-primary" style="margin: 0px;" (click)="refreshCommonFilterColumns()"
+                [disabled]="!commonFilterData.apiUrl">
                 <clr-icon shape="redo"></clr-icon>
               </button>
             </span>
           </div>
         </div>
       </div>
-      
+
       <!-- Common Filter Fields List -->
       <div class="clr-row" style="margin-top: 15px;">
         <div class="clr-col-sm-12">
           <h5>Common Filters</h5>
-          
+
           <!-- Add Common Filter Button -->
-          <button class="btn btn-sm btn-primary" (click)="addCommonFilter()" style="margin-top: 10px; margin-bottom: 10px;">
+          <button class="btn btn-sm btn-primary" (click)="addCommonFilter()"
+            style="margin-top: 10px; margin-bottom: 10px;">
             <clr-icon shape="plus"></clr-icon> Add Filter
           </button>
-          
+
           <!-- Common Filter Fields List -->
-          <div *ngFor="let filter of commonFilterData.filters; let i = index" 
-               style="margin-bottom: 10px; padding: 8px; border: 1px solid #eee; border-radius: 4px; background-color: #f9f9f9;">
+          <div *ngFor="let filter of commonFilterData.filters; let i = index"
+            style="margin-bottom: 10px; padding: 8px; border: 1px solid #eee; border-radius: 4px; background-color: #f9f9f9;">
             <div style="display: flex; justify-content: space-between; align-items: center;">
               <span>Filter {{i + 1}}</span>
               <button class="btn btn-icon btn-danger btn-sm" (click)="removeCommonFilter(i)">
                 <clr-icon shape="trash"></clr-icon>
               </button>
             </div>
-            
+
             <div class="clr-row" style="margin-top: 8px;">
               <div class="clr-col-sm-5">
                 <select [(ngModel)]="filter.field" [ngModelOptions]="{standalone: true}" class="clr-select">
@@ -620,12 +797,12 @@
                   <option *ngFor="let column of commonFilterColumnData" [value]="column">{{column}}</option>
                 </select>
               </div>
-              
+
               <div class="clr-col-sm-5">
-                <input type="text" [(ngModel)]="filter.value" [ngModelOptions]="{standalone: true}" 
-                       class="clr-input" placeholder="Filter Value" />
+                <input type="text" [(ngModel)]="filter.value" [ngModelOptions]="{standalone: true}" class="clr-input"
+                  placeholder="Filter Value" />
               </div>
-              
+
               <div class="clr-col-sm-2">
                 <button class="btn btn-icon btn-danger btn-sm" (click)="removeCommonFilter(i)">
                   <clr-icon shape="trash"></clr-icon>
@@ -641,4 +818,4 @@
     <button type="button" class="btn btn-outline" (click)="commonFilterModalOpen = false">Cancel</button>
     <button type="button" class="btn btn-primary" (click)="saveCommonFilter()">Save</button>
   </div>
-</clr-modal>
+</clr-modal>
\ No newline at end of file
diff --git a/frontend/angular-clarity-master/src/app/modules/main/builder/dashboardnew/editnewdash/editnewdash.component.ts b/frontend/angular-clarity-master/src/app/modules/main/builder/dashboardnew/editnewdash/editnewdash.component.ts
index dd020a6..cf490a7 100644
--- a/frontend/angular-clarity-master/src/app/modules/main/builder/dashboardnew/editnewdash/editnewdash.component.ts
+++ b/frontend/angular-clarity-master/src/app/modules/main/builder/dashboardnew/editnewdash/editnewdash.component.ts
@@ -22,6 +22,16 @@ import { AlertsService } from 'src/app/services/fnd/alerts.service';
 import { isArray } from 'highcharts';
 // Add the SureconnectService import
 import { SureconnectService } from '../sureconnect/sureconnect.service';
+// Add the CommonFilterComponent import
+import { CommonFilterComponent } from '../common-filter/common-filter.component';
+// Add the CompactFilterComponent import
+import { CompactFilterComponent } from '../common-filter';
+// Add the FilterService import
+import { FilterService } from '../common-filter/filter.service';
+// Add the UnifiedChartComponent import
+import { UnifiedChartComponent } from '../gadgets/unified-chart';
+// Add the DynamicChartLoaderService import
+import { DynamicChartLoaderService } from '../chart-config/dynamic-chart-loader.service';
 
 function isNullArray(arr) {
   return !Array.isArray(arr) || arr.length === 0;
@@ -43,8 +53,19 @@ export class EditnewdashComponent implements OnInit {
   commonFilterModalOpen: boolean = false; // Add common filter modal state
   public entryForm: FormGroup;
   public commonFilterForm: FormGroup; // Add common filter form
+  
+  // Add filterOptionsString property for compact filter
+  filterOptionsString: string = '';
+  
+  // Add availableKeys property for compact filter
+  availableKeys: string[] = [];
 
+  // Initialize with default widgets and update dynamically
   WidgetsMock: WidgetModel[] = [
+    {
+      name: 'Common Filter',
+      identifier: 'common_filter'
+    },
     {
       name: 'Radar Chart',
       identifier: 'radar_chart'
@@ -57,34 +78,34 @@ export class EditnewdashComponent implements OnInit {
       name: 'Line Chart',
       identifier: 'line_chart'
     },
-    {
-      name: 'Bar Chart',
-      identifier: 'bar_chart'
-    },
-    {
-      name: 'Pie Chart',
-      identifier: 'pie_chart'
-    },
-    {
-      name: 'Polar Area Chart',
-      identifier: 'polar_area_chart'
-    },
-    {
-      name: 'Bubble Chart',
-      identifier: 'bubble_chart'
-    },
-    {
-      name: 'Scatter Chart',
-      identifier: 'scatter_chart'
-    },
     // {
-    // name: 'Dynamic Chart',
-    // identifier: 'dynamic_chart'
+    //   name: 'Bar Chart',
+    //   identifier: 'bar_chart'
     // },
     // {
-    // name: 'Financial Chart',
-    // identifier: 'financial_chart'
+    //   name: 'Pie Chart',
+    //   identifier: 'pie_chart'
     // },
+    // {
+    //   name: 'Polar Area Chart',
+    //   identifier: 'polar_area_chart'
+    // },
+    // {
+    //   name: 'Bubble Chart',
+    //   identifier: 'bubble_chart'
+    // },
+    // {
+    //   name: 'Scatter Chart',
+    //   identifier: 'scatter_chart'
+    // },
+    {
+    name: 'Dynamic Chart',
+    identifier: 'dynamic_chart'
+    },
+    {
+    name: 'Financial Chart',
+    identifier: 'financial_chart'
+    },
     {
       name: 'To Do',
       identifier: 'to_do_chart'
@@ -92,6 +113,14 @@ export class EditnewdashComponent implements OnInit {
     {
       name: 'Grid View',
       identifier: 'grid_view'
+    },
+    {
+      name: 'Compact Filter',
+      identifier: 'compact_filter'
+    },
+    {
+      name: 'Unified Chart',
+      identifier: 'unified_chart'
     }
   ]
 
@@ -104,18 +133,21 @@ export class EditnewdashComponent implements OnInit {
   public dashArr: [];
 
   protected componentCollection = [
-    { name: "Line Chart", componentInstance: LineChartComponent },
-    { name: "Doughnut Chart", componentInstance: DoughnutChartComponent },
-    { name: "Radar Chart", componentInstance: RadarChartComponent },
-    { name: "Bar Chart", componentInstance: BarChartComponent },
-    { name: "Pie Chart", componentInstance: PieChartComponent },
-    { name: "Polar Area Chart", componentInstance: PolarChartComponent },
-    { name: "Bubble Chart", componentInstance: BubbleChartComponent },
-    { name: "Scatter Chart", componentInstance: ScatterChartComponent },
-    { name: "Dynamic Chart", componentInstance: DynamicChartComponent },
-    { name: "Financial Chart", componentInstance: FinancialChartComponent },
+    { name: "Common Filter", componentInstance: CommonFilterComponent },
+    { name: "Line Chart", componentInstance: UnifiedChartComponent },
+    { name: "Doughnut Chart", componentInstance: UnifiedChartComponent },
+    { name: "Radar Chart", componentInstance: UnifiedChartComponent },
+    { name: "Bar Chart", componentInstance: UnifiedChartComponent },
+    { name: "Pie Chart", componentInstance: UnifiedChartComponent },
+    { name: "Polar Area Chart", componentInstance: UnifiedChartComponent },
+    { name: "Bubble Chart", componentInstance: UnifiedChartComponent },
+    { name: "Scatter Chart", componentInstance: UnifiedChartComponent },
+    { name: "Dynamic Chart", componentInstance: UnifiedChartComponent },
+    { name: "Financial Chart", componentInstance: UnifiedChartComponent },
     { name: "To Do Chart", componentInstance: ToDoChartComponent },
     { name: "Grid View", componentInstance: GridViewComponent },
+    { name: "Compact Filter", componentInstance: CompactFilterComponent },
+    { name: "Unified Chart", componentInstance: UnifiedChartComponent },
   ];
   model: any;
   linesdata: any;
@@ -148,6 +180,7 @@ export class EditnewdashComponent implements OnInit {
     yAxis: '',
     xAxis: '',
     connection: '', // Add connection field
+    chartType: '', // Add chartType field
     // Drilldown configuration properties (base level)
     drilldownEnabled: false,
     drilldownApiUrl: '',
@@ -161,7 +194,12 @@ export class EditnewdashComponent implements OnInit {
     drilldownLayers: [] as any[],
     // Common filter properties
     commonFilterEnabled: false,
-    commonFilterEnabledDrilldown: false
+    commonFilterEnabledDrilldown: false,
+    // Compact filter properties
+    filterKey: '',
+    filterType: 'text',
+    filterLabel: '',
+    filterOptions: [] as string[]
   };
 
   // Add sureconnect data property
@@ -171,6 +209,9 @@ export class EditnewdashComponent implements OnInit {
   // Add drilldown column data property
   drilldownColumnData = []; // Add drilldown column data property
 
+  // Add chart types property for dynamic chart selection
+  chartTypes: any[] = [];
+
   constructor(private route: ActivatedRoute,
     private router: Router,
     private dashboardService: Dashboard3Service,
@@ -178,9 +219,16 @@ export class EditnewdashComponent implements OnInit {
     private _fb: FormBuilder,
     private datastoreService: DatastoreService,
     private alertService: AlertsService,
-    private sureconnectService: SureconnectService) { } // Add SureconnectService to constructor
+    private sureconnectService: SureconnectService,
+    private filterService: FilterService,
+    private dynamicChartLoader: DynamicChartLoaderService) { } // Add SureconnectService, FilterService, and DynamicChartLoaderService to constructor
 
+  // Add property to track if coming from dashboard runner
+  fromRunner: boolean = false;
+  
   ngOnInit(): void {
+    // Reset the filter service when the component is initialized
+    this.filterService.resetFilters();
 
     // Grid options
     this.options = {
@@ -201,8 +249,17 @@ export class EditnewdashComponent implements OnInit {
       },
       displayGrid: "always",
       minCols: 10,
-      minRows: 10
+      minRows: 10,
+      // Add resize callback to handle chart resizing
+      itemResizeCallback: this.itemResize.bind(this)
     };
+    
+    // Check if coming from dashboard runner
+    this.route.queryParams.subscribe(params => {
+      if (params['fromRunner'] === 'true') {
+        this.fromRunner = true;
+      }
+    });
 
     this.editId = this.route.snapshot.params.id;
     console.log(this.editId);
@@ -249,12 +306,46 @@ export class EditnewdashComponent implements OnInit {
       apiUrl: ['']
     });
     
+    // Load chart types for dynamic chart selection
+    this.loadChartTypesForSelection();
+    
     // Load sureconnect data first, then load dashboard data
     this.loadSureconnectData();
     
     // Load common filter data if it exists
     this.loadCommonFilterData();
   }
+
+  // Add method to load all chart types for dynamic selection
+  loadChartTypesForSelection() {
+  console.log('Loading chart types for selection');
+  this.dynamicChartLoader.loadActiveChartTypes().subscribe({
+    next: (chartTypes) => {
+      console.log('Loaded chart types for selection:', chartTypes);
+      this.chartTypes = chartTypes;
+
+      // Convert each chart type to a WidgetModel
+      const newWidgets = chartTypes.map(ct => ({
+        name: ct.displayName || ct.name,
+        // identifier: ct.name.toLowerCase().replace(/\s+/g, '_')
+        identifier: `${ct.name.toLowerCase().replace(/\s+/g, '_')}_chart`
+      }));
+
+      // Filter out duplicates by identifier
+      const existingIds = new Set(this.WidgetsMock.map(w => w.identifier));
+      const uniqueNewWidgets = newWidgets.filter(w => !existingIds.has(w.identifier));
+
+      // Append unique new widgets to WidgetsMock
+      this.WidgetsMock = [...this.WidgetsMock, ...uniqueNewWidgets];
+
+      console.log('Updated WidgetsMock:', this.WidgetsMock);
+    },
+    error: (error) => {
+      console.error('Error loading chart types for selection:', error);
+    }
+  });
+}
+
   
   // Add method to load sureconnect data
   loadSureconnectData() {
@@ -290,6 +381,9 @@ export class EditnewdashComponent implements OnInit {
   dashboardLine: any;
   dashboardName: any;
   getData() {
+    // Reset the filter service when switching between dashboard records
+    this.filterService.resetFilters();
+    
     // We get the id in get current router dashboard/:id
     this.route.params.subscribe(params => {
       // + is used to cast string to int
@@ -339,6 +433,37 @@ export class EditnewdashComponent implements OnInit {
           dashboard.component = component.componentInstance;
         }
       });
+      
+      // Map chart names to unified chart types
+      const chartTypeMap = {
+        'Radar Chart': 'radar',
+        'Line Chart': 'line',
+        'Doughnut Chart': 'doughnut',
+        'Bar Chart': 'bar',
+        'Pie Chart': 'pie',
+        'Polar Area Chart': 'polar',
+        'Bubble Chart': 'bubble',
+        'Scatter Chart': 'scatter',
+        'Dynamic Chart': 'line',
+        'Financial Chart': 'line'
+      };
+      
+      // If this is a chart, set the chartType property
+      if (chartTypeMap.hasOwnProperty(dashboard.name)) {
+        dashboard.chartType = chartTypeMap[dashboard.name];
+        // Keep the original name instead of changing it to "Unified Chart"
+        // dashboard.name = "Unified Chart";
+      }
+      
+      // Ensure compact filter configuration properties are properly initialized
+      if (dashboard.component === 'Compact Filter' || dashboard.name === 'Compact Filter') {
+        // Make sure all compact filter properties exist
+        if (dashboard.filterKey === undefined) dashboard.filterKey = '';
+        if (dashboard.filterType === undefined) dashboard.filterType = 'text';
+        if (dashboard.filterLabel === undefined) dashboard.filterLabel = '';
+        if (dashboard.filterOptions === undefined) dashboard.filterOptions = [];
+        // table and connection properties should already exist for all components
+      }
     });
   }
 
@@ -353,8 +478,43 @@ export class EditnewdashComponent implements OnInit {
           dashboard.component = component.name;
         }
       });
+      
+      // Map unified chart types back to chart names for serialization
+      const chartNameMap = {
+        'radar': 'Radar Chart',
+        'line': 'Line Chart',
+        'doughnut': 'Doughnut Chart',
+        'bar': 'Bar Chart',
+        'pie': 'Pie Chart',
+        'polar': 'Polar Area Chart',
+        'bubble': 'Bubble Chart',
+        'scatter': 'Scatter Chart'
+        // Removed hardcoded heatmap entry to make it fully dynamic
+      };
+      
+      // If this is a unified chart, set the name back to the appropriate chart name
+      if (dashboard.name === 'Unified Chart' && dashboard.chartType && chartNameMap.hasOwnProperty(dashboard.chartType)) {
+        dashboard.name = chartNameMap[dashboard.chartType];
+      }
+      // Also handle the case where the chart already has the correct name
+      else if (dashboard.chartType && chartNameMap.hasOwnProperty(dashboard.chartType) && 
+               dashboard.name === chartNameMap[dashboard.chartType]) {
+        // The name is already correct, no need to change it
+        dashboard.component = "Unified Chart";
+      }
+      
+      // Ensure compact filter configuration properties are preserved
+      if (dashboard.name === 'Compact Filter') {
+        // Make sure all compact filter properties exist
+        if (dashboard.filterKey === undefined) dashboard.filterKey = '';
+        if (dashboard.filterType === undefined) dashboard.filterType = 'text';
+        if (dashboard.filterLabel === undefined) dashboard.filterLabel = '';
+        if (dashboard.filterOptions === undefined) dashboard.filterOptions = [];
+        // table and connection properties should already exist for all components
+      }
     });
   }
+  
   // Add method to get available fields for a filter dropdown (excluding already selected fields)
   getAvailableFields(filters: any[], currentIndex: number, allFields: string[]): string[] {
     if (!filters || !allFields) {
@@ -386,110 +546,44 @@ export class EditnewdashComponent implements OnInit {
     //this._ds.updateDashboard(this.dashboardId, parsed).subscribe();
   }
 
-  onDrop(ev) {
+  onDrop = (ev) => {
+    console.log("on drop event ", ev);
     const componentType = ev.dataTransfer.getData("widgetIdentifier");
-    let maxChartId = this.dashboardArray?.reduce((maxId, item) => Math.max(maxId, item.chartid), 0);
+    // Safely calculate maxChartId, handling cases where chartid might be NaN or missing
+    console.log("on drop ", componentType);
+    let maxChartId = 0;
+    if (this.dashboardArray && this.dashboardArray.length > 0) {
+      const validChartIds = this.dashboardArray
+        .map(item => item.chartid)
+        .filter(chartid => typeof chartid === 'number' && !isNaN(chartid));
+      
+      if (validChartIds.length > 0) {
+        maxChartId = Math.max(...validChartIds);
+      }
+    }
     switch (componentType) {
+      // Handle all chart types by converting them to unified charts
       case "radar_chart":
-        return this.dashboardArray.push({
-          cols: 5,
-          rows: 6,
-          x: 0,
-          y: 0,
-          chartid: maxChartId + 1,
-          component: RadarChartComponent,
-          name: "Radar Chart"
-        });
+        // Use dynamic chart creation for all chart types
+        return this.createDynamicChart('radar', maxChartId);
       case "line_chart":
-        return this.dashboardArray.push({
-          cols: 5,
-          rows: 7,
-          x: 0,
-          y: 0,
-          chartid: maxChartId + 1,
-          component: LineChartComponent,
-          name: "Line Chart"
-        });
+        return this.createDynamicChart('line', maxChartId);
       case "doughnut_chart":
-        return this.dashboardArray.push({
-          cols: 5,
-          rows: 6,
-          x: 0,
-          y: 0,
-          chartid: maxChartId + 1,
-          component: DoughnutChartComponent,
-          name: "Doughnut Chart"
-        });
+        return this.createDynamicChart('doughnut', maxChartId);
       case "bar_chart":
-        return this.dashboardArray.push({
-          cols: 5,
-          rows: 6,
-          x: 0,
-          y: 0,
-          chartid: maxChartId + 1,
-          component: BarChartComponent,
-          name: "Bar Chart"
-        });
+        return this.createDynamicChart('bar', maxChartId);
       case "pie_chart":
-        return this.dashboardArray.push({
-          cols: 5,
-          rows: 6,
-          x: 0,
-          y: 0,
-          chartid: maxChartId + 1,
-          component: PieChartComponent,
-          name: "Pie Chart"
-        });
+        return this.createDynamicChart('pie', maxChartId);
       case "polar_area_chart":
-        return this.dashboardArray.push({
-          cols: 5,
-          rows: 6,
-          x: 0,
-          y: 0,
-          chartid: maxChartId + 1,
-          component: PolarChartComponent,
-          name: "Polar Area Chart"
-        });
+        return this.createDynamicChart('polar', maxChartId);
       case "bubble_chart":
-        return this.dashboardArray.push({
-          cols: 5,
-          rows: 6,
-          x: 0,
-          y: 0,
-          chartid: maxChartId + 1,
-          component: BubbleChartComponent,
-          name: "Bubble Chart"
-        });
+        return this.createDynamicChart('bubble', maxChartId);
       case "scatter_chart":
-        return this.dashboardArray.push({
-          cols: 5,
-          rows: 6,
-          x: 0,
-          y: 0,
-          chartid: maxChartId + 1,
-          component: ScatterChartComponent,
-          name: "Scatter Chart"
-        });
+        return this.createDynamicChart('scatter', maxChartId);
       case "dynamic_chart":
-        return this.dashboardArray.push({
-          cols: 5,
-          rows: 6,
-          x: 0,
-          y: 0,
-          chartid: maxChartId + 1,
-          component: DynamicChartComponent,
-          name: "Dynamic Chart"
-        });
+        return this.createDynamicChart('line', maxChartId); // Default to line for dynamic chart
       case "financial_chart":
-        return this.dashboardArray.push({
-          cols: 5,
-          rows: 6,
-          x: 0,
-          y: 0,
-          chartid: maxChartId + 1,
-          component: FinancialChartComponent,
-          name: "Financial Chart"
-        });
+        return this.createDynamicChart('line', maxChartId); // Default to line for financial chart
       case "to_do_chart":
         return this.dashboardArray.push({
           cols: 5,
@@ -500,6 +594,31 @@ export class EditnewdashComponent implements OnInit {
           component: ToDoChartComponent,
           name: "To Do Chart"
         });
+      case "common_filter":
+        return this.dashboardArray.push({
+          cols: 10,
+          rows: 3,
+          x: 0,
+          y: 0,
+          chartid: maxChartId + 1,
+          component: CommonFilterComponent,
+          name: "Common Filter"
+        });
+      case "compact_filter":
+        return this.dashboardArray.push({
+          cols: 3,
+          rows: 2,
+          x: 0,
+          y: 0,
+          chartid: maxChartId + 1,
+          component: CompactFilterComponent,
+          name: "Compact Filter",
+          // Add default configuration for compact filter
+          filterKey: '',
+          filterType: 'text',
+          filterLabel: '',
+          filterOptions: []
+        });
       case "grid_view":
         return this.dashboardArray.push({
           cols: 5,
@@ -510,6 +629,17 @@ export class EditnewdashComponent implements OnInit {
           component: GridViewComponent,
           name: "Grid View"
         });
+      case "unified_chart":
+        return this.createDynamicChart('bar', maxChartId); // Default to bar for unified chart
+      default:
+        // Handle any other chart types dynamically
+        // Extract chart type name from identifier (e.g., "heatmap_chart" -> "heatmap")
+        const chartTypeName = componentType.replace('_chart', '');
+        console.log('Creating dynamic chart of type:', chartTypeName);
+        console.log('Display name for chart:', this.getChartDisplayName(chartTypeName));
+        
+        // Use dynamic chart creation for all chart types
+        return this.createDynamicChart(chartTypeName, maxChartId);
     }
   }
   removeItem(item) {
@@ -525,7 +655,14 @@ export class EditnewdashComponent implements OnInit {
   }
 
   modelid: number;
+  // Update the editGadget method to initialize filter properties
   editGadget(item) {
+    // If coming from dashboard runner, skip showing the config modal
+    if (this.fromRunner) {
+      console.log('Coming from dashboard runner, skipping config modal');
+      return;
+    }
+    
     this.modeledit = true;
     this.modelid = item.chartid;
     console.log(this.modelid);
@@ -542,6 +679,94 @@ export class EditnewdashComponent implements OnInit {
     if (item['commonFilterEnabledDrilldown'] === undefined) { 
       this.gadgetsEditdata['commonFilterEnabledDrilldown'] = false; 
     }
+    // Initialize compact filter properties if not present
+    if (item['filterKey'] === undefined) { 
+      this.gadgetsEditdata['filterKey'] = ''; 
+    }
+    if (item['filterType'] === undefined) { 
+      this.gadgetsEditdata['filterType'] = 'text'; 
+    }
+    if (item['filterLabel'] === undefined) { 
+      this.gadgetsEditdata['filterLabel'] = ''; 
+    }
+    if (item['filterOptions'] === undefined) { 
+      this.gadgetsEditdata['filterOptions'] = []; 
+    }
+    // Initialize chartType property if not present (for unified chart)
+    if (item['chartType'] === undefined) { 
+      this.gadgetsEditdata['chartType'] = 'bar'; 
+    }
+    
+    // Initialize filterOptionsString for compact filter
+    if (item.name === 'Compact Filter') {
+      this.filterOptionsString = this.gadgetsEditdata['filterOptions'].join(', ');
+      // Load available keys when editing a compact filter
+      if (this.gadgetsEditdata['table']) {
+        this.loadAvailableKeys(this.gadgetsEditdata['table'], this.gadgetsEditdata['connection']);
+      }
+    } else {
+      this.filterOptionsString = '';
+    }
+    
+    // Initialize base filters with type and options if not present
+    if (item['baseFilters'] === undefined) { 
+      this.gadgetsEditdata['baseFilters'] = []; 
+    } else {
+      // Ensure each base filter has type and options properties
+      this.gadgetsEditdata['baseFilters'] = this.gadgetsEditdata['baseFilters'].map(filter => ({
+        field: filter.field || '',
+        value: filter.value || '',
+        type: filter.type || 'text',
+        options: filter.options || '',
+        availableValues: filter.availableValues || ''
+      }));
+    }
+    
+    // Initialize drilldown filters with type and options if not present
+    if (item['drilldownFilters'] === undefined) { 
+      this.gadgetsEditdata['drilldownFilters'] = []; 
+    } else {
+      // Ensure each drilldown filter has type and options properties
+      this.gadgetsEditdata['drilldownFilters'] = this.gadgetsEditdata['drilldownFilters'].map(filter => ({
+        field: filter.field || '',
+        value: filter.value || '',
+        type: filter.type || 'text',
+        options: filter.options || '',
+        availableValues: filter.availableValues || ''
+      }));
+    }
+    
+    // Initialize drilldown layers with proper filter structure if not present
+    if (item['drilldownLayers'] === undefined) { 
+      this.gadgetsEditdata['drilldownLayers'] = []; 
+    } else {
+      // Ensure each layer has proper filter structure
+      this.gadgetsEditdata['drilldownLayers'] = this.gadgetsEditdata['drilldownLayers'].map(layer => {
+        // Initialize parameter if not present
+        if (layer['parameter'] === undefined) {
+          layer['parameter'] = '';
+        }
+        // Initialize filters if not present
+        if (layer['filters'] === undefined) {
+          layer['filters'] = [];
+        } else {
+          // Ensure each layer filter has type and options properties
+          layer['filters'] = layer['filters'].map(filter => ({
+            field: filter.field || '',
+            value: filter.value || '',
+            type: filter.type || 'text',
+            options: filter.options || '',
+            availableValues: filter.availableValues || ''
+          }));
+        }
+        // Initialize common filter property for layer if not present
+        if (layer['commonFilterEnabled'] === undefined) {
+          layer['commonFilterEnabled'] = false;
+        }
+        return layer;
+      });
+    }
+    
     this.getStores();
     
     // Set default connection if none is set and we have connections
@@ -569,37 +794,6 @@ export class EditnewdashComponent implements OnInit {
       this.gadgetsEditdata['drilldownParameter'] = ''; 
     }
     
-    // Initialize base filters if not present
-    if (item['baseFilters'] === undefined) { 
-      this.gadgetsEditdata['baseFilters'] = []; 
-    }
-    
-    // Initialize drilldown filters if not present
-    if (item['drilldownFilters'] === undefined) { 
-      this.gadgetsEditdata['drilldownFilters'] = []; 
-    }
-    
-    // Initialize drilldown layers if not present
-    if (item['drilldownLayers'] === undefined) { 
-      this.gadgetsEditdata['drilldownLayers'] = []; 
-    } else {
-      // Ensure each layer has proper structure (removed parameterKey, added parameter)
-      this.gadgetsEditdata['drilldownLayers'].forEach((layer, index) => {
-        // Initialize parameter if not present
-        if (layer['parameter'] === undefined) {
-          layer['parameter'] = '';
-        }
-        // Initialize filters if not present
-        if (layer['filters'] === undefined) {
-          layer['filters'] = [];
-        }
-        // Initialize common filter property for layer if not present
-        if (layer['commonFilterEnabled'] === undefined) {
-          layer['commonFilterEnabled'] = false;
-        }
-      });
-    }
-    
     // Reset drilldown column data
     this.drilldownColumnData = [];
     
@@ -608,15 +802,34 @@ export class EditnewdashComponent implements OnInit {
       this.refreshBaseDrilldownColumns();
     }
     
-    if (item.datastore !== undefined || '' || null) {
+    // Check if we have either datastore or table to fetch columns
+    if ((item.datastore !== undefined && item.datastore !== '' && item.datastore !== null) || 
+        (item.table !== undefined && item.table !== '' && item.table !== null)) {
       const datastore = item.datastore;
-      this.getTables(datastore);
       const table = item.table;
-      this.getColumns(datastore, table);
+      
+      // Fetch tables if datastore is available
+      if (datastore) {
+        this.getTables(datastore);
+      }
+      
+      // Fetch columns if table is available
+      if (table) {
+        this.getColumns(datastore, table);
+      }
+      
       console.log(item.yAxis);
-      if (isArray(item.yAxis)) {
-        this.selectedyAxis = item.yAxis;
+      // Set selectedyAxis regardless of whether it's an array or string
+      if (item.yAxis !== undefined && item.yAxis !== '' && item.yAxis !== null) {
+        if (isArray(item.yAxis)) {
+          this.selectedyAxis = item.yAxis;
+        } else {
+          // For single yAxis values, convert to array
+          this.selectedyAxis = [item.yAxis];
+        }
         console.log(this.selectedyAxis);
+      } else {
+        this.selectedyAxis = [];
       }
     } else {
       this.selectedyAxis = [];
@@ -640,6 +853,9 @@ export class EditnewdashComponent implements OnInit {
 
     //https://www.w3schools.com/js/tryit.asp?filename=tryjson_stringify_function_tostring
 
+    // First serialize the dashboard collection to ensure component names are properly set
+    this.serialize(this.dashboardCollection.dashboard);
+
     let cmp = this.dashboardCollection.dashboard.forEach(dashboard => {
       this.componentCollection.forEach(component => {
         if (dashboard.name === component.name) {
@@ -660,8 +876,6 @@ export class EditnewdashComponent implements OnInit {
     //console.log(merged);
     console.log("temp data", typeof tmp);
     console.log(tmp);
-    let parsed = JSON.parse(tmp);
-    this.serialize(parsed.dashboard);
     this.dashbord1_Line.model = tmp;
 
     // let obj = this.dashboardCollection;
@@ -686,14 +900,32 @@ export class EditnewdashComponent implements OnInit {
     //       }
   }
 
+  // Update the onSubmit method to properly save filter data
   onSubmit(id) {
     console.log(id);
-    if (!isNullArray(this.selectedyAxis)) {
-      console.log("get y-axis array", this.selectedyAxis);
+    
+    // Check if ID is valid, including handling NaN
+    if (id === null || id === undefined || isNaN(id)) {
+      console.warn('Chart ID is null, undefined, or NaN, using modelid instead:', this.modelid);
+      id = this.modelid;
+    }
+    
+    // Ensure we have a valid numeric ID
+    const numId = typeof id === 'number' ? id : parseInt(id, 10);
+    if (isNaN(numId)) {
+      console.error('Unable to determine valid chart ID, aborting onSubmit');
+      return;
+    }
+    
+    // Handle both array and string yAxis values
+    if (this.selectedyAxis !== undefined && this.selectedyAxis !== null && 
+        ((Array.isArray(this.selectedyAxis) && this.selectedyAxis.length > 0) || 
+         (typeof this.selectedyAxis === 'string' && this.selectedyAxis !== ''))) {
+      console.log("get y-axis", this.selectedyAxis);
       this.entryForm.patchValue({ yAxis: this.selectedyAxis });
     }
     let formdata = this.entryForm.value;
-    let num = id;
+    let num = numId;
     console.log(this.entryForm.value);
     this.dashboardCollection.dashboard = this.dashboardCollection.dashboard.map(item => {
       if (item.chartid == num) {
@@ -717,6 +949,26 @@ export class EditnewdashComponent implements OnInit {
         xyz.drilldownLayers = this.gadgetsEditdata.drilldownLayers;
         xyz.commonFilterEnabled = this.gadgetsEditdata.commonFilterEnabled; // Add common filter property
         
+        // For compact filter, preserve filter configuration properties
+        if (item.name === 'Compact Filter') {
+          xyz.filterKey = this.gadgetsEditdata.filterKey || '';
+          xyz.filterType = this.gadgetsEditdata.filterType || 'text';
+          xyz.filterLabel = this.gadgetsEditdata.filterLabel || '';
+          // Convert filterOptionsString to array
+          if (this.gadgetsEditdata.fieldName === 'Compact Filter') {
+            xyz.filterOptions = this.filterOptionsString.split(',').map(opt => opt.trim()).filter(opt => opt);
+          } else {
+            xyz.filterOptions = this.gadgetsEditdata.filterOptions || [];
+          }
+          xyz.table = this.gadgetsEditdata.table || '';
+          xyz.connection = this.gadgetsEditdata.connection || undefined;
+        }
+        
+        // For unified chart, preserve chart configuration properties
+        if (item.name === 'Unified Chart') {
+          xyz.chartType = this.gadgetsEditdata.chartType || 'bar';
+        }
+        
         console.log(xyz);
         return xyz;
       }
@@ -751,7 +1003,142 @@ export class EditnewdashComponent implements OnInit {
    * This prevents errors when trying to set properties that don't exist on the components
    */
   getChartInputs(item: any): any {
-    // Only pass properties that are relevant to chart components
+    // For CompactFilterComponent, pass only filter configuration properties
+    if (item.name === 'Compact Filter') {
+      const filterInputs = {
+        filterKey: item['filterKey'] || '',
+        filterType: item['filterType'] || 'text',
+        filterLabel: item['filterLabel'] || '',
+        filterOptions: item['filterOptions'] || [],
+        apiUrl: item['table'] || '', // Use table as API URL
+        connectionId: item['connection'] ? parseInt(item['connection'], 10) : undefined
+      };
+      
+      // Preserve configuration in the item itself
+      item['filterKey'] = filterInputs['filterKey'];
+      item['filterType'] = filterInputs['filterType'];
+      item['filterLabel'] = filterInputs['filterLabel'];
+      item['filterOptions'] = filterInputs['filterOptions'];
+      item['table'] = filterInputs['apiUrl'];
+      item['connection'] = item['connection'];
+      
+      // Remove undefined properties to avoid passing unnecessary data
+      Object.keys(filterInputs).forEach(key => {
+        if (filterInputs[key] === undefined) {
+          delete filterInputs[key];
+        }
+      });
+      
+      return filterInputs;
+    }
+    
+    // For CommonFilterComponent, pass only filter-related properties
+    if (item.component && item.component.name === 'CommonFilterComponent') {
+      const commonFilterInputs = {
+        baseFilters: item['baseFilters'] || [],
+        drilldownFilters: item['drilldownFilters'] || [],
+        drilldownLayers: item['drilldownLayers'] || [],
+        fieldName: item['name'] || '',
+        connection: item['connection'] || undefined
+      };
+      
+      // Remove undefined properties to avoid passing unnecessary data
+      Object.keys(commonFilterInputs).forEach(key => {
+        if (commonFilterInputs[key] === undefined) {
+          delete commonFilterInputs[key];
+        }
+      });
+      
+      return commonFilterInputs;
+    }
+    
+    // For UnifiedChartComponent, pass chart properties with chartType
+    // Check if the component is UnifiedChartComponent dynamically
+    if (item.component === UnifiedChartComponent || 
+        (item.component && item.component.name === 'UnifiedChartComponent') ||
+        item.name === 'Unified Chart') {
+      const unifiedChartInputs = {
+        chartType: item.chartType || 'bar',
+        xAxis: item.xAxis,
+        yAxis: item.yAxis,
+        table: item.table,
+        datastore: item.datastore,
+        charttitle: item.charttitle,
+        chartlegend: item.chartlegend,
+        showlabel: item.showlabel,
+        chartcolor: item.chartcolor,
+        slices: item.slices,
+        donut: item.donut,
+        charturl: item.charturl,
+        chartparameter: item.chartparameter,
+        datasource: item.datasource,
+        fieldName: item.name, // Using item.name as fieldName
+        connection: item['connection'], // Add connection field using bracket notation
+        // Base drilldown configuration properties
+        drilldownEnabled: item['drilldownEnabled'],
+        drilldownApiUrl: item['drilldownApiUrl'],
+        // Removed drilldownParameterKey since we're using URL templates
+        drilldownXAxis: item['drilldownXAxis'],
+        drilldownYAxis: item['drilldownYAxis'],
+        drilldownParameter: item['drilldownParameter'], // Add drilldown parameter
+        baseFilters: item['baseFilters'] || [], // Add base filters
+        drilldownFilters: item['drilldownFilters'] || [], // Add drilldown filters
+        // Multi-layer drilldown configurations
+        drilldownLayers: item['drilldownLayers'] || []
+      };
+      
+      // Remove undefined properties to avoid passing unnecessary data
+      Object.keys(unifiedChartInputs).forEach(key => {
+        if (unifiedChartInputs[key] === undefined) {
+          delete unifiedChartInputs[key];
+        }
+      });
+      
+      return unifiedChartInputs;
+    }
+    
+    // For GridViewComponent, pass chart properties with drilldown support
+    if (item.component && item.component.name === 'GridViewComponent') {
+      const gridInputs = {
+        xAxis: item.xAxis,
+        yAxis: item.yAxis,
+        table: item.table,
+        datastore: item.datastore,
+        charttitle: item.charttitle,
+        chartlegend: item.chartlegend,
+        showlabel: item.showlabel,
+        chartcolor: item.chartcolor,
+        slices: item.slices,
+        donut: item.donut,
+        charturl: item.charturl,
+        chartparameter: item.chartparameter,
+        datasource: item.datasource,
+        fieldName: item.name, // Using item.name as fieldName
+        connection: item['connection'], // Add connection field using bracket notation
+        // Base drilldown configuration properties
+        drilldownEnabled: item['drilldownEnabled'],
+        drilldownApiUrl: item['drilldownApiUrl'],
+        // Removed drilldownParameterKey since we're using URL templates
+        drilldownXAxis: item['drilldownXAxis'],
+        drilldownYAxis: item['drilldownYAxis'],
+        drilldownParameter: item['drilldownParameter'], // Add drilldown parameter
+        baseFilters: item['baseFilters'] || [], // Add base filters
+        drilldownFilters: item['drilldownFilters'] || [], // Add drilldown filters
+        // Multi-layer drilldown configurations
+        drilldownLayers: item['drilldownLayers'] || []
+      };
+      
+      // Remove undefined properties to avoid passing unnecessary data
+      Object.keys(gridInputs).forEach(key => {
+        if (gridInputs[key] === undefined) {
+          delete gridInputs[key];
+        }
+      });
+      
+      return gridInputs;
+    }
+    
+    // For all other chart components, pass chart-specific properties
     const chartInputs = {
       xAxis: item.xAxis,
       yAxis: item.yAxis,
@@ -775,8 +1162,8 @@ export class EditnewdashComponent implements OnInit {
       drilldownXAxis: item['drilldownXAxis'],
       drilldownYAxis: item['drilldownYAxis'],
       drilldownParameter: item['drilldownParameter'], // Add drilldown parameter
-      baseFilters: item['baseFilters'] || [], // Add base filters
-      drilldownFilters: item['drilldownFilters'] || [], // Add drilldown filters
+      baseFilters: item['baseFilters'] || [], // Add base filters with type information
+      drilldownFilters: item['drilldownFilters'] || [], // Add drilldown filters with type information
       // Multi-layer drilldown configurations
       drilldownLayers: item['drilldownLayers'] || []
     };
@@ -791,18 +1178,29 @@ export class EditnewdashComponent implements OnInit {
     return chartInputs;
   }
 
+  // Update the applyChanges method to properly save filter data
   applyChanges(id) {
     console.log('Apply changes for chart ID:', id);
     
-    // Check if ID is valid
-    if (id === null || id === undefined) {
-      console.warn('Chart ID is null or undefined, using modelid instead:', this.modelid);
+    // Check if ID is valid, including handling NaN
+    if (id === null || id === undefined || isNaN(id)) {
+      console.warn('Chart ID is null, undefined, or NaN, using modelid instead:', this.modelid);
       id = this.modelid;
     }
     
-    // Update the form with selected Y-axis values if it's an array
-    if (!isNullArray(this.selectedyAxis)) {
-      console.log("get y-axis array", this.selectedyAxis);
+    // Ensure we have a valid numeric ID
+    const numId = typeof id === 'number' ? id : parseInt(id, 10);
+    if (isNaN(numId)) {
+      console.error('Unable to determine valid chart ID, aborting applyChanges');
+      return;
+    }
+    
+    // Update the form with selected Y-axis values
+    // Handle both array and string yAxis values
+    if (this.selectedyAxis !== undefined && this.selectedyAxis !== null && 
+        ((Array.isArray(this.selectedyAxis) && this.selectedyAxis.length > 0) || 
+         (typeof this.selectedyAxis === 'string' && this.selectedyAxis !== ''))) {
+      console.log("get y-axis", this.selectedyAxis);
       this.entryForm.patchValue({ yAxis: this.selectedyAxis });
     }
     
@@ -835,6 +1233,27 @@ export class EditnewdashComponent implements OnInit {
         updatedItem.commonFilterEnabled = this.gadgetsEditdata.commonFilterEnabled; // Add common filter property
         updatedItem.commonFilterEnabledDrilldown = this.gadgetsEditdata.commonFilterEnabledDrilldown; // Add drilldown common filter property
         
+        // For compact filter, preserve filter configuration properties
+        if (item.name === 'Compact Filter') {
+          updatedItem.filterKey = this.gadgetsEditdata.filterKey || '';
+          updatedItem.filterType = this.gadgetsEditdata.filterType || 'text';
+          updatedItem.filterLabel = this.gadgetsEditdata.filterLabel || '';
+          // Convert filterOptionsString to array
+          if (this.gadgetsEditdata.fieldName === 'Compact Filter') {
+            updatedItem.filterOptions = this.filterOptionsString.split(',').map(opt => opt.trim()).filter(opt => opt);
+          } else {
+            updatedItem.filterOptions = this.gadgetsEditdata.filterOptions || [];
+          }
+          updatedItem.table = this.gadgetsEditdata.table || ''; // API URL
+          updatedItem.connection = this.gadgetsEditdata.connection || undefined; // Connection ID
+          
+          // Also preserve these properties in gadgetsEditdata for consistency
+          this.gadgetsEditdata.filterKey = updatedItem.filterKey;
+          this.gadgetsEditdata.filterType = updatedItem.filterType;
+          this.gadgetsEditdata.filterLabel = updatedItem.filterLabel;
+          this.gadgetsEditdata.filterOptions = updatedItem.filterOptions;
+        }
+        
         console.log('Updated item:', updatedItem);
         return updatedItem;
       }
@@ -872,6 +1291,9 @@ export class EditnewdashComponent implements OnInit {
     
     // Note: We don't close the modal here, allowing the user to make additional changes
     // The user can click "Save" when they're done with all changes
+    
+    // Reset the filter service to ensure clean state
+    this.filterService.resetFilters();
   }
 
   goBack() {
@@ -1069,46 +1491,239 @@ export class EditnewdashComponent implements OnInit {
     // We're now using removeBaseFilter and removeLayerFilter methods instead
   }
   
-  // Add method to add a base filter
+  // Add method to handle base filter field change
+  onBaseFilterFieldChange(index: number, field: string) {
+    const filter = this.gadgetsEditdata.baseFilters[index];
+    if (filter) {
+      filter.field = field;
+      // If field changes, reset value and options
+      filter.value = '';
+      filter.options = '';
+      filter.availableValues = '';
+      
+      // If we have a field and table URL, load available values
+      if (field && this.gadgetsEditdata.table) {
+        this.loadFilterValuesForField(
+          this.gadgetsEditdata.table, 
+          this.gadgetsEditdata.connection, 
+          field, 
+          index, 
+          'base'
+        );
+      }
+    }
+  }
+
+  // Add method to handle base filter type change
+  onBaseFilterTypeChange(index: number, type: string) {
+    const filter = this.gadgetsEditdata.baseFilters[index];
+    if (filter) {
+      filter.type = type;
+      // If type changes to dropdown/multiselect and we have a field, load available values
+      if ((type === 'dropdown' || type === 'multiselect') && filter.field && this.gadgetsEditdata.table) {
+        this.loadFilterValuesForField(
+          this.gadgetsEditdata.table, 
+          this.gadgetsEditdata.connection, 
+          filter.field, 
+          index, 
+          'base'
+        );
+      }
+    }
+  }
+
+  // Add method to handle drilldown filter field change
+  onDrilldownFilterFieldChange(index: number, field: string) {
+    const filter = this.gadgetsEditdata.drilldownFilters[index];
+    if (filter) {
+      filter.field = field;
+      // If field changes, reset value and options
+      filter.value = '';
+      filter.options = '';
+      filter.availableValues = '';
+      
+      // If we have a field and drilldown API URL, load available values
+      if (field && this.gadgetsEditdata.drilldownApiUrl) {
+        this.loadFilterValuesForField(
+          this.gadgetsEditdata.drilldownApiUrl, 
+          this.gadgetsEditdata.connection, 
+          field, 
+          index, 
+          'drilldown'
+        );
+      }
+    }
+  }
+
+  // Add method to handle drilldown filter type change
+  onDrilldownFilterTypeChange(index: number, type: string) {
+    const filter = this.gadgetsEditdata.drilldownFilters[index];
+    if (filter) {
+      filter.type = type;
+      // If type changes to dropdown/multiselect and we have a field, load available values
+      if ((type === 'dropdown' || type === 'multiselect') && filter.field && this.gadgetsEditdata.drilldownApiUrl) {
+        this.loadFilterValuesForField(
+          this.gadgetsEditdata.drilldownApiUrl, 
+          this.gadgetsEditdata.connection, 
+          filter.field, 
+          index, 
+          'drilldown'
+        );
+      }
+    }
+  }
+
+  // Add method to handle layer filter field change
+  onLayerFilterFieldChange(layerIndex: number, filterIndex: number, field: string) {
+    const layer = this.gadgetsEditdata.drilldownLayers[layerIndex];
+    if (layer && layer.filters) {
+      const filter = layer.filters[filterIndex];
+      if (filter) {
+        filter.field = field;
+        // If field changes, reset value and options
+        filter.value = '';
+        filter.options = '';
+        filter.availableValues = '';
+        
+        // If we have a field and layer API URL, load available values
+        if (field && layer.apiUrl) {
+          this.loadFilterValuesForField(
+            layer.apiUrl, 
+            this.gadgetsEditdata.connection, 
+            field, 
+            filterIndex, 
+            'layer',
+            layerIndex
+          );
+        }
+      }
+    }
+  }
+
+  // Add method to handle layer filter type change
+  onLayerFilterTypeChange(layerIndex: number, filterIndex: number, type: string) {
+    const layer = this.gadgetsEditdata.drilldownLayers[layerIndex];
+    if (layer && layer.filters) {
+      const filter = layer.filters[filterIndex];
+      if (filter) {
+        filter.type = type;
+        // If type changes to dropdown/multiselect and we have a field, load available values
+        if ((type === 'dropdown' || type === 'multiselect') && filter.field && layer.apiUrl) {
+          this.loadFilterValuesForField(
+            layer.apiUrl, 
+            this.gadgetsEditdata.connection, 
+            filter.field, 
+            filterIndex, 
+            'layer',
+            layerIndex
+          );
+        }
+      }
+    }
+  }
+
+  // Add method to load filter values for a specific field
+  loadFilterValuesForField(
+    apiUrl: string, 
+    connectionId: string | undefined, 
+    field: string, 
+    filterIndex: number, 
+    filterType: 'base' | 'drilldown' | 'layer',
+    layerIndex?: number
+  ) {
+    if (apiUrl && field) {
+      const connectionIdNum = connectionId ? parseInt(connectionId, 10) : undefined;
+      this.alertService.getValuesFromUrl(apiUrl, connectionIdNum, field).subscribe(
+        (values: string[]) => {
+          // Update the filter with available values
+          if (filterType === 'base') {
+            const filter = this.gadgetsEditdata.baseFilters[filterIndex];
+            if (filter) {
+              filter.availableValues = values.join(', ');
+              // For dropdown/multiselect types, also update the options
+              if (filter.type === 'dropdown' || filter.type === 'multiselect') {
+                filter.options = filter.availableValues;
+              }
+            }
+          } else if (filterType === 'drilldown') {
+            const filter = this.gadgetsEditdata.drilldownFilters[filterIndex];
+            if (filter) {
+              filter.availableValues = values.join(', ');
+              // For dropdown/multiselect types, also update the options
+              if (filter.type === 'dropdown' || filter.type === 'multiselect') {
+                filter.options = filter.availableValues;
+              }
+            }
+          } else if (filterType === 'layer' && layerIndex !== undefined) {
+            const layer = this.gadgetsEditdata.drilldownLayers[layerIndex];
+            if (layer && layer.filters) {
+              const filter = layer.filters[filterIndex];
+              if (filter) {
+                filter.availableValues = values.join(', ');
+                // For dropdown/multiselect types, also update the options
+                if (filter.type === 'dropdown' || filter.type === 'multiselect') {
+                  filter.options = filter.availableValues;
+                }
+              }
+            }
+          }
+        },
+        (error) => {
+          console.error('Error loading available values for field:', field, error);
+        }
+      );
+    }
+  }
+
+  // Add method to add a base filter with default properties
   addBaseFilter() {
     const newFilter = {
       field: '',
-      value: ''
+      value: '',
+      type: 'text',
+      options: '',
+      availableValues: ''
     };
     this.gadgetsEditdata.baseFilters.push(newFilter);
   }
+
+  // Add method to add a drilldown filter with default properties
+  addDrilldownFilter() {
+    const newFilter = {
+      field: '',
+      value: '',
+      type: 'text',
+      options: '',
+      availableValues: ''
+    };
+    this.gadgetsEditdata.drilldownFilters.push(newFilter);
+  }
+
+  // Add method to add a layer filter with default properties
+  addLayerFilter(layerIndex: number) {
+    const newFilter = {
+      field: '',
+      value: '',
+      type: 'text',
+      options: '',
+      availableValues: ''
+    };
+    if (!this.gadgetsEditdata.drilldownLayers[layerIndex].filters) {
+      this.gadgetsEditdata.drilldownLayers[layerIndex].filters = [];
+    }
+    this.gadgetsEditdata.drilldownLayers[layerIndex].filters.push(newFilter);
+  }
   
   // Add method to remove a base filter
   removeBaseFilter(index: number) {
     this.gadgetsEditdata.baseFilters.splice(index, 1);
   }
   
-  // Add method to add a drilldown filter
-  addDrilldownFilter() {
-    const newFilter = {
-      field: '',
-      value: ''
-    };
-    this.gadgetsEditdata.drilldownFilters.push(newFilter);
-  }
-  
   // Add method to remove a drilldown filter
   removeDrilldownFilter(index: number) {
     this.gadgetsEditdata.drilldownFilters.splice(index, 1);
   }
   
-  // Add method to add a layer filter
-  addLayerFilter(layerIndex: number) {
-    const newFilter = {
-      field: '',
-      value: ''
-    };
-    if (!this.gadgetsEditdata.drilldownLayers[layerIndex].filters) {
-      this.gadgetsEditdata.drilldownLayers[layerIndex].filters = [];
-    }
-    this.gadgetsEditdata.drilldownLayers[layerIndex].filters.push(newFilter);
-  }
-  
   // Add method to remove a layer filter
   removeLayerFilter(layerIndex: number, filterIndex: number) {
     this.gadgetsEditdata.drilldownLayers[layerIndex].filters.splice(filterIndex, 1);
@@ -1247,4 +1862,355 @@ export class EditnewdashComponent implements OnInit {
       // When disabling, the user can edit the filters normally
     }
   }
+  
+  // Add method to handle item resize events
+  itemResize(item: any, itemComponent: any) {
+    console.log('Item resized:', item);
+    // Trigger a window resize event to notify charts to resize
+    window.dispatchEvent(new Event('resize'));
+    
+    // Also try to directly notify the chart component if possible
+    if (itemComponent && itemComponent.item && itemComponent.item.component) {
+      // If the resized item contains a chart, we could try to call its resize method directly
+      // This would require the chart component to have a public resize method
+    }
+  }
+  
+  // Add method to load available keys for compact filter
+  loadAvailableKeys(apiUrl: string, connectionId: string | undefined) {
+    if (apiUrl) {
+      const connectionIdNum = connectionId ? parseInt(connectionId, 10) : undefined;
+      this.alertService.getColumnfromurl(apiUrl, connectionIdNum).subscribe(
+        (keys: string[]) => {
+          this.availableKeys = keys;
+        },
+        (error) => {
+          console.error('Error loading available keys:', error);
+          this.availableKeys = [];
+        }
+      );
+    }
+  }
+
+  // Add method to load available values for a specific key
+  loadAvailableValues(key: string) {
+    if (key && this.gadgetsEditdata['table']) {
+      const connectionIdNum = this.gadgetsEditdata['connection'] ? 
+        parseInt(this.gadgetsEditdata['connection'], 10) : undefined;
+      this.alertService.getValuesFromUrl(this.gadgetsEditdata['table'], connectionIdNum, key).subscribe(
+        (values: string[]) => {
+          // Update filter options string for dropdown/multiselect
+          if (this.gadgetsEditdata['filterType'] === 'dropdown' || 
+              this.gadgetsEditdata['filterType'] === 'multiselect') {
+            this.filterOptionsString = values.join(', ');
+            // Also update the gadgetsEditdata filterOptions array
+            this.gadgetsEditdata['filterOptions'] = values;
+          }
+        },
+        (error) => {
+          console.error('Error loading available values:', error);
+        }
+      );
+    }
+  }
+
+  // Add method to handle filter key change
+  onFilterKeyChange(key: string) {
+    this.gadgetsEditdata['filterKey'] = key;
+    // Load available values when filter key changes
+    if (key && (this.gadgetsEditdata['filterType'] === 'dropdown' || 
+                this.gadgetsEditdata['filterType'] === 'multiselect')) {
+      this.loadAvailableValues(key);
+    }
+  }
+
+  // Add method to handle filter type change
+  onFilterTypeChange(type: string) {
+    this.gadgetsEditdata['filterType'] = type;
+    // Load available values when filter type changes to dropdown or multiselect
+    if ((type === 'dropdown' || type === 'multiselect') && this.gadgetsEditdata['filterKey']) {
+      this.loadAvailableValues(this.gadgetsEditdata['filterKey']);
+    }
+  }
+
+  // Add method to handle API URL change for compact filter
+  onCompactFilterApiUrlChange(url: string) {
+    this.gadgetsEditdata['table'] = url;
+    // Load available keys when API URL changes
+    if (url) {
+      this.loadAvailableKeys(url, this.gadgetsEditdata['connection']);
+    }
+  }
+
+  // Add method to handle connection change for compact filter
+  onCompactFilterConnectionChange(connectionId: string) {
+    this.gadgetsEditdata['connection'] = connectionId;
+    // Reload available keys when connection changes
+    if (this.gadgetsEditdata['table']) {
+      this.loadAvailableKeys(this.gadgetsEditdata['table'], connectionId);
+    }
+  }
+
+  // Add method to apply dynamic template to a chart
+  applyDynamicTemplate(chartItem: any, template: any) {
+    console.log('Applying dynamic template to chart:', chartItem, template);
+    
+    // Apply HTML template
+    if (template.templateHtml) {
+      // In a real implementation, you would dynamically render the HTML template
+      // For now, we'll just log it
+      console.log('HTML Template:', template.templateHtml);
+    }
+    
+    // Apply CSS styles
+    if (template.templateCss) {
+      // In a real implementation, you would dynamically apply the CSS styles
+      // For now, we'll just log it
+      console.log('CSS Template:', template.templateCss);
+    }
+    
+    // Return the chart item with template applied
+    return {
+      ...chartItem,
+      template: template
+    };
+  }
+  
+  // Add method to test dynamic chart creation
+  testDynamicChartCreation() {
+    console.log('Testing dynamic chart creation');
+    
+    // Show a success message to the user
+    alert('Dynamic chart test started. Check the browser console for detailed output.');
+    
+    // Load all chart types
+    this.dynamicChartLoader.loadAllChartConfigurations().subscribe({
+      next: (chartTypes) => {
+        console.log('Loaded chart types:', chartTypes);
+        
+        // Find bar chart type
+        const barChartType = chartTypes.find((ct: any) => ct.name === 'bar');
+        if (barChartType) {
+          console.log('Found bar chart type:', barChartType);
+          
+          // Load configuration for bar chart
+          this.dynamicChartLoader.loadChartConfiguration(barChartType.id).subscribe({
+            next: (config) => {
+              console.log('Loaded bar chart configuration:', config);
+              
+              // Create a test chart item
+              const chartItem = {
+                cols: 5,
+                rows: 6,
+                x: 0,
+                y: 0,
+                chartid: 100,
+                component: UnifiedChartComponent,
+                name: 'Test Dynamic Bar Chart',
+                chartType: 'bar',
+                xAxis: '',
+                yAxis: '',
+                table: '',
+                connection: undefined,
+                // Add dynamic fields from configuration
+                dynamicFields: config.dynamicFields || []
+              };
+              
+              console.log('Created test chart item:', chartItem);
+              
+              // If we have templates, apply the default one
+              if (config.templates && config.templates.length > 0) {
+                const defaultTemplate = config.templates.find((t: any) => t.isDefault) || config.templates[0];
+                if (defaultTemplate) {
+                  console.log('Applying default template:', defaultTemplate);
+                  const chartWithTemplate = this.applyDynamicTemplate(chartItem, defaultTemplate);
+                  console.log('Chart with template:', chartWithTemplate);
+                  
+                  // Show success message
+                  alert('Dynamic chart test completed successfully! Check console for details.');
+                }
+              } else {
+                // Show success message even without templates
+                alert('Dynamic chart test completed successfully! No templates found. Check console for details.');
+              }
+            },
+            error: (error) => {
+              console.error('Error loading bar chart configuration:', error);
+              alert('Error loading bar chart configuration. Check console for details.');
+            }
+          });
+        } else {
+          console.warn('Bar chart type not found');
+          alert('Bar chart type not found in the database.');
+        }
+      },
+      error: (error) => {
+        console.error('Error loading chart types:', error);
+        alert('Error loading chart types. Check console for details.');
+      }
+    });
+  }
+
+  // Add method to load dynamic chart configuration
+  loadDynamicChartConfiguration(chartTypeId: number) {
+    console.log(`Loading dynamic chart configuration for chart type ${chartTypeId}`);
+    this.dynamicChartLoader.loadChartConfiguration(chartTypeId).subscribe({
+      next: (config) => {
+        console.log('Loaded dynamic chart configuration:', config);
+        // Here you would apply the configuration to the UI
+        // For example, populate form fields, set up templates, etc.
+      },
+      error: (error) => {
+        console.error('Error loading dynamic chart configuration:', error);
+      }
+    });
+  }
+
+  
+
+  // Add method to create a dynamic chart with configuration from database
+  createDynamicChart = (chartTypeName: string, maxChartId: number) => {
+    console.log(`Creating dynamic chart of type: ${chartTypeName}`);
+    
+    // First, get the chart type by name
+    this.dynamicChartLoader.getChartTypeByName(chartTypeName).subscribe({
+      next: (chartType) => {
+        if (chartType) {
+          console.log(`Found chart type:`, chartType);
+          
+          // Load the complete configuration for this chart type
+          this.dynamicChartLoader.loadChartConfiguration(chartType.id).subscribe({
+            next: (config) => {
+              console.log(`Loaded configuration for ${chartTypeName}:`, config);
+              
+              // Create the chart item with dynamic configuration
+              const chartItem = {
+                cols: 5,
+                rows: 6,
+                x: 0,
+                y: 0,
+                chartid: maxChartId + 1,
+                component: UnifiedChartComponent,
+                name: chartType.displayName || chartTypeName,
+                chartType: chartType.name,
+                xAxis: '',
+                yAxis: '',
+                table: '',
+                connection: undefined,
+                // Add any dynamic fields from the configuration
+                dynamicFields: config.dynamicFields || []
+              };
+              
+              // Add UI components as configuration properties
+              if (config.uiComponents && config.uiComponents.length > 0) {
+                config.uiComponents.forEach(component => {
+                  chartItem[component.componentName] = '';
+                });
+              }
+              
+              this.dashboardArray.push(chartItem);
+              console.log(`Created dynamic chart:`, chartItem);
+            },
+            error: (error) => {
+              console.error(`Error loading configuration for ${chartTypeName}:`, error);
+              // Fallback to default configuration
+              this.createDefaultChart(chartTypeName, this.getChartDisplayName(chartTypeName));
+            }
+          });
+        } else {
+          console.warn(`Chart type ${chartTypeName} not found, using default configuration`);
+          this.createDefaultChart(chartTypeName, this.getChartDisplayName(chartTypeName));
+        }
+      },
+      error: (error) => {
+        console.error('Error loading configuration for chart type:', error);
+        // Fallback to default configuration
+        this.createDefaultChart(chartTypeName, this.getChartDisplayName(chartTypeName));
+      }
+    });
+  }
+  
+  // Fallback method to create default chart configuration
+  createDefaultChart = (chartTypeName: string, chartDisplayName: string) => {
+    console.log(`Creating default chart for ${chartTypeName}`);
+    
+    // Map chart type names to chart types - making it fully dynamic
+    const chartTypeMap = {
+      'bar': 'bar',
+      'line': 'line',
+      'pie': 'pie',
+      'doughnut': 'doughnut',
+      'radar': 'radar',
+      'polar': 'polar',
+      'bubble': 'bubble',
+      'scatter': 'scatter'
+      // Removed hardcoded heatmap entry to make it fully dynamic
+    };
+    
+    // Get the chart type from the name - default to bubble for unknown chart types
+    const chartType = chartTypeMap[chartTypeName.toLowerCase()] || 'bubble';
+    
+    // Safely calculate maxChartId, handling cases where chartid might be NaN or missing
+    let maxChartId = 0;
+    if (this.dashboardArray && this.dashboardArray.length > 0) {
+      const validChartIds = this.dashboardArray
+        .map(item => item.chartid)
+        .filter(chartid => typeof chartid === 'number' && !isNaN(chartid));
+      
+      if (validChartIds.length > 0) {
+        maxChartId = Math.max(...validChartIds);
+      }
+    }
+    
+    const chartItem = {
+      cols: 5,
+      rows: 6,
+      x: 0,
+      y: 0,
+      chartid: maxChartId + 1,
+      component: UnifiedChartComponent,
+      name: chartDisplayName,
+      chartType: chartType,
+      xAxis: '',
+      yAxis: '',
+      table: '',
+      connection: undefined
+    };
+    
+    this.dashboardArray.push(chartItem);
+    console.log('Created default chart:', chartItem);
+    
+    // Update the dashboard collection
+    this.dashboardCollection.dashboard = this.dashboardArray.slice();
+    
+    // Force gridster to refresh
+    if (this.options && this.options.api) {
+      this.options.api.optionsChanged();
+    }
+  }
+
+  // Helper method to get display name for chart type - making it fully dynamic
+  getChartDisplayName = (chartTypeName: string): string => {
+    const displayNameMap = {
+      'bar': 'Bar Chart',
+      'line': 'Line Chart',
+      'pie': 'Pie Chart',
+      'doughnut': 'Doughnut Chart',
+      'radar': 'Radar Chart',
+      'polar': 'Polar Area Chart',
+      'bubble': 'Bubble Chart',
+      'scatter': 'Scatter Chart'
+      // Removed hardcoded heatmap entry to make it fully dynamic
+    };
+    
+    // For unknown chart types, create a display name by capitalizing the first letter and adding ' Chart'
+    const displayName = displayNameMap[chartTypeName.toLowerCase()];
+    if (displayName) {
+      return displayName;
+    } else {
+      // Capitalize first letter and add ' Chart'
+      return chartTypeName.charAt(0).toUpperCase() + chartTypeName.slice(1) + ' Chart';
+    }
+  }
+
 }
diff --git a/frontend/angular-clarity-master/src/app/modules/main/builder/dashboardnew/gadgets/bar-chart.zip b/frontend/angular-clarity-master/src/app/modules/main/builder/dashboardnew/gadgets/bar-chart.zip
new file mode 100644
index 0000000000000000000000000000000000000000..bf020b9a60063f7b4a0287101f0ababdc87116eb
GIT binary patch
literal 18577
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
YBA~xg`~U#Rzy3J?av*@;-v0G}0IPOV-v9sr

literal 0
HcmV?d00001

diff --git a/frontend/angular-clarity-master/src/app/modules/main/builder/dashboardnew/gadgets/bar-chart/bar-chart.component.html b/frontend/angular-clarity-master/src/app/modules/main/builder/dashboardnew/gadgets/bar-chart/bar-chart.component.html
index e1b27cf..4c1ba64 100644
--- a/frontend/angular-clarity-master/src/app/modules/main/builder/dashboardnew/gadgets/bar-chart/bar-chart.component.html
+++ b/frontend/angular-clarity-master/src/app/modules/main/builder/dashboardnew/gadgets/bar-chart/bar-chart.component.html
@@ -1,31 +1,334 @@
-<div style="display: block">
-  <!-- No filter controls needed with the new simplified approach -->
-  <!-- Filters are now configured at the drilldown level -->
-  
-  <!-- Drilldown mode indicator -->
-  <div *ngIf="currentDrilldownLevel > 0" style="background-color: #e0e0e0; padding: 5px; margin-bottom: 10px; border-radius: 4px; text-align: center;">
-    <span style="font-weight: bold; color: #333;">Drilldown Level: {{currentDrilldownLevel}}</span>
-    <button (click)="navigateBack()" style="margin-left: 10px; padding: 2px 8px; background-color: #007cba; color: white; border: none; border-radius: 3px; cursor: pointer;">
-      Back to Level {{currentDrilldownLevel - 1}}
-    </button>
-    <button (click)="resetToOriginalData()" style="margin-left: 10px; padding: 2px 8px; background-color: #dc3545; color: white; border: none; border-radius: 3px; cursor: pointer;">
-      Back to Main View
-    </button>
+<div class="chart-container">
+  <!-- Filter Controls Section -->
+  <div class="filter-section" *ngIf="hasActiveFilters()">
+    <!-- Base Filters -->
+    <div class="filter-group" *ngIf="baseFilters && baseFilters.length > 0">
+      <h4>Base Filters</h4>
+      <div class="filter-controls">
+        <div *ngFor="let filter of baseFilters" class="filter-item">
+          <div class="filter-label">{{ filter.field }} ({{ filter.type || 'text' }})</div>
+          
+          <!-- Text Filter -->
+          <div *ngIf="!filter.type || filter.type === 'text'" class="filter-input">
+            <input type="text" 
+                   [(ngModel)]="filter.value" 
+                   (ngModelChange)="onBaseFilterChange(filter)"
+                   [placeholder]="filter.field"
+                   class="clr-input filter-text-input">
+          </div>
+          
+          <!-- Dropdown Filter -->
+          <div *ngIf="filter.type === 'dropdown'" class="filter-input">
+            <select [(ngModel)]="filter.value" 
+                    (ngModelChange)="onBaseFilterChange(filter)"
+                    class="clr-select filter-select">
+              <option value="">Select {{ filter.field }}</option>
+              <option *ngFor="let option of getFilterOptions(filter)" [value]="option">{{ option }}</option>
+            </select>
+          </div>
+          
+          <!-- Multi-Select Filter - Updated to show key first, then dropdown on click -->
+          <div *ngIf="filter.type === 'multiselect'" class="filter-input multiselect-container">
+            <div class="multiselect-display" (click)="toggleMultiselect(filter, 'base')">
+              <span class="multiselect-label">{{ filter.field }}</span>
+              <span class="multiselect-value" *ngIf="getSelectedOptionsCount(filter) > 0">
+                ({{ getSelectedOptionsCount(filter) }} selected)
+              </span>
+              <clr-icon shape="caret down" class="dropdown-icon"></clr-icon>
+            </div>
+            <div class="multiselect-dropdown" *ngIf="isMultiselectOpen(filter, 'base')">
+              <div class="checkbox-group">
+                <div *ngFor="let option of getFilterOptions(filter); let i = index" class="checkbox-item">
+                  <input type="checkbox" 
+                         [checked]="isOptionSelected(filter, option)" 
+                         (change)="onMultiSelectChange(filter, option, $event)"
+                         [id]="'base-' + filter.field + '-' + i" 
+                         class="clr-checkbox">
+                  <label [for]="'base-' + filter.field + '-' + i" class="checkbox-label">{{ option }}</label>
+                </div>
+              </div>
+            </div>
+          </div>
+          
+          <!-- Date Range Filter -->
+          <div *ngIf="filter.type === 'date-range'" class="filter-input date-range">
+            <div class="date-input-group">
+              <input type="date" 
+                     [(ngModel)]="filter.value.start" 
+                     (ngModelChange)="onDateRangeChange(filter, { start: $event, end: filter.value.end })"
+                     placeholder="Start Date"
+                     class="clr-input filter-date">
+              <span class="date-separator">to</span>
+              <input type="date" 
+                     [(ngModel)]="filter.value.end" 
+                     (ngModelChange)="onDateRangeChange(filter, { start: filter.value.start, end: $event })"
+                     placeholder="End Date"
+                     class="clr-input filter-date">
+            </div>
+          </div>
+          
+          <!-- Toggle Filter -->
+          <div *ngIf="filter.type === 'toggle'" class="filter-input toggle">
+            <input type="checkbox" 
+                   [(ngModel)]="filter.value" 
+                   (ngModelChange)="onToggleChange(filter, $event)"
+                   clrToggle 
+                   class="clr-toggle">
+            <label class="toggle-label">{{ filter.field }}</label>
+          </div>
+        </div>
+      </div>
+    </div>
+    
+    <!-- Drilldown Filters -->
+    <div class="filter-group" *ngIf="drilldownFilters && drilldownFilters.length > 0 && currentDrilldownLevel > 0">
+      <h4>Drilldown Filters</h4>
+      <div class="filter-controls">
+        <div *ngFor="let filter of drilldownFilters" class="filter-item">
+          <div class="filter-label">{{ filter.field }} ({{ filter.type || 'text' }})</div>
+          
+          <!-- Text Filter -->
+          <div *ngIf="!filter.type || filter.type === 'text'" class="filter-input">
+            <input type="text" 
+                   [(ngModel)]="filter.value" 
+                   (ngModelChange)="onDrilldownFilterChange(filter)"
+                   [placeholder]="filter.field"
+                   class="clr-input filter-text-input">
+          </div>
+          
+          <!-- Dropdown Filter -->
+          <div *ngIf="filter.type === 'dropdown'" class="filter-input">
+            <select [(ngModel)]="filter.value" 
+                    (ngModelChange)="onDrilldownFilterChange(filter)"
+                    class="clr-select filter-select">
+              <option value="">Select {{ filter.field }}</option>
+              <option *ngFor="let option of getFilterOptions(filter)" [value]="option">{{ option }}</option>
+            </select>
+          </div>
+          
+          <!-- Multi-Select Filter - Updated to show key first, then dropdown on click -->
+          <div *ngIf="filter.type === 'multiselect'" class="filter-input multiselect-container">
+            <div class="multiselect-display" (click)="toggleMultiselect(filter, 'drilldown')">
+              <span class="multiselect-label">{{ filter.field }}</span>
+              <span class="multiselect-value" *ngIf="getSelectedOptionsCount(filter) > 0">
+                ({{ getSelectedOptionsCount(filter) }} selected)
+              </span>
+              <clr-icon shape="caret down" class="dropdown-icon"></clr-icon>
+            </div>
+            <div class="multiselect-dropdown" *ngIf="isMultiselectOpen(filter, 'drilldown')">
+              <div class="checkbox-group">
+                <div *ngFor="let option of getFilterOptions(filter); let i = index" class="checkbox-item">
+                  <input type="checkbox" 
+                         [checked]="isOptionSelected(filter, option)" 
+                         (change)="onMultiSelectChange(filter, option, $event)"
+                         [id]="'drilldown-' + filter.field + '-' + i" 
+                         class="clr-checkbox">
+                  <label [for]="'drilldown-' + filter.field + '-' + i" class="checkbox-label">{{ option }}</label>
+                </div>
+              </div>
+            </div>
+          </div>
+          
+          <!-- Date Range Filter -->
+          <div *ngIf="filter.type === 'date-range'" class="filter-input date-range">
+            <div class="date-input-group">
+              <input type="date" 
+                     [(ngModel)]="filter.value.start" 
+                     (ngModelChange)="onDateRangeChange(filter, { start: $event, end: filter.value.end })"
+                     placeholder="Start Date"
+                     class="clr-input filter-date">
+              <span class="date-separator">to</span>
+              <input type="date" 
+                     [(ngModel)]="filter.value.end" 
+                     (ngModelChange)="onDateRangeChange(filter, { start: filter.value.start, end: $event })"
+                     placeholder="End Date"
+                     class="clr-input filter-date">
+            </div>
+          </div>
+          
+          <!-- Toggle Filter -->
+          <div *ngIf="filter.type === 'toggle'" class="filter-input toggle">
+            <input type="checkbox" 
+                   [(ngModel)]="filter.value" 
+                   (ngModelChange)="onToggleChange(filter, $event)"
+                   clrToggle 
+                   class="clr-toggle">
+            <label class="toggle-label">{{ filter.field }}</label>
+          </div>
+        </div>
+      </div>
+    </div>
+    
+    <!-- Layer Filters -->
+    <div class="filter-group" *ngIf="hasActiveLayerFilters()">
+      <h4>Layer Filters</h4>
+      <div class="filter-controls">
+        <div *ngFor="let filter of getActiveLayerFilters()" class="filter-item">
+          <div class="filter-label">{{ filter.field }} ({{ filter.type || 'text' }})</div>
+          
+          <!-- Text Filter -->
+          <div *ngIf="!filter.type || filter.type === 'text'" class="filter-input">
+            <input type="text" 
+                   [(ngModel)]="filter.value" 
+                   (ngModelChange)="onLayerFilterChange(filter)"
+                   [placeholder]="filter.field"
+                   class="clr-input filter-text-input">
+          </div>
+          
+          <!-- Dropdown Filter -->
+          <div *ngIf="filter.type === 'dropdown'" class="filter-input">
+            <select [(ngModel)]="filter.value" 
+                    (ngModelChange)="onLayerFilterChange(filter)"
+                    class="clr-select filter-select">
+              <option value="">Select {{ filter.field }}</option>
+              <option *ngFor="let option of getFilterOptions(filter)" [value]="option">{{ option }}</option>
+            </select>
+          </div>
+          
+          <!-- Multi-Select Filter - Updated to show key first, then dropdown on click -->
+          <div *ngIf="filter.type === 'multiselect'" class="filter-input multiselect-container">
+            <div class="multiselect-display" (click)="toggleMultiselect(filter, 'layer')">
+              <span class="multiselect-label">{{ filter.field }}</span>
+              <span class="multiselect-value" *ngIf="getSelectedOptionsCount(filter) > 0">
+                ({{ getSelectedOptionsCount(filter) }} selected)
+              </span>
+              <clr-icon shape="caret down" class="dropdown-icon"></clr-icon>
+            </div>
+            <div class="multiselect-dropdown" *ngIf="isMultiselectOpen(filter, 'layer')">
+              <div class="checkbox-group">
+                <div *ngFor="let option of getFilterOptions(filter); let i = index" class="checkbox-item">
+                  <input type="checkbox" 
+                         [checked]="isOptionSelected(filter, option)" 
+                         (change)="onMultiSelectChange(filter, option, $event)"
+                         [id]="'layer-' + filter.field + '-' + i" 
+                         class="clr-checkbox">
+                  <label [for]="'layer-' + filter.field + '-' + i" class="checkbox-label">{{ option }}</label>
+                </div>
+              </div>
+            </div>
+          </div>
+          
+          <!-- Date Range Filter -->
+          <div *ngIf="filter.type === 'date-range'" class="filter-input date-range">
+            <div class="date-input-group">
+              <input type="date" 
+                     [(ngModel)]="filter.value.start" 
+                     (ngModelChange)="onDateRangeChange(filter, { start: $event, end: filter.value.end })"
+                     placeholder="Start Date"
+                     class="clr-input filter-date">
+              <span class="date-separator">to</span>
+              <input type="date" 
+                     [(ngModel)]="filter.value.end" 
+                     (ngModelChange)="onDateRangeChange(filter, { start: filter.value.start, end: $event })"
+                     placeholder="End Date"
+                     class="clr-input filter-date">
+            </div>
+          </div>
+          
+          <!-- Toggle Filter -->
+          <div *ngIf="filter.type === 'toggle'" class="filter-input toggle">
+            <input type="checkbox" 
+                   [(ngModel)]="filter.value" 
+                   (ngModelChange)="onToggleChange(filter, $event)"
+                   clrToggle 
+                   class="clr-toggle">
+            <label class="toggle-label">{{ filter.field }}</label>
+          </div>
+        </div>
+      </div>
+    </div>
+    
+    <!-- Clear Filters Button -->
+    <div class="filter-actions">
+      <button class="btn btn-sm btn-outline" (click)="clearAllFilters()">Clear All Filters</button>
+    </div>
   </div>
   
-  <!-- No data message -->
-  <div *ngIf="noDataAvailable" style="text-align: center; padding: 20px; color: #666; font-style: italic;">
-    No data available
+  <!-- Header row with chart title and drilldown navigation -->
+  <div class="chart-header">
+    <div class="clr-row header-row">
+      <div class="clr-col-6">
+        <h3 class="chart-title">{{charttitle || 'Bar Chart'}}</h3>
+      </div>
+      <div class="clr-col-6" style="text-align: right;">
+        <!-- Add drilldown navigation controls -->
+        <button class="btn btn-sm btn-link" *ngIf="drilldownEnabled && drilldownStack.length > 0" (click)="navigateBack()">
+          <cds-icon shape="arrow" direction="left"></cds-icon>
+          Back to {{drilldownStack.length > 1 ? 'Previous Level' : 'Main Data'}}
+        </button>
+      </div>
+    </div>
+    
+    <!-- Show current drilldown level -->
+    <div class="clr-row" *ngIf="drilldownEnabled && drilldownStack.length > 0">
+      <div class="clr-col-12">
+        <div class="alert alert-info" style="padding: 8px 12px; margin-bottom: 12px;">
+          <div class="alert-items">
+            <div class="alert-item static">
+              <div class="alert-icon-wrapper">
+                <cds-icon class="alert-icon" shape="info-circle"></cds-icon>
+              </div>
+              <span class="alert-text">
+                Drilldown Level: {{currentDrilldownLevel}} 
+                <span *ngIf="drilldownStack.length > 0">
+                  (Clicked on: {{drilldownStack[drilldownStack.length - 1].clickedLabel}})
+                </span>
+              </span>
+            </div>
+          </div>
+        </div>
+      </div>
+    </div>
   </div>
   
-  <!-- Chart display -->
-  <div *ngIf="!noDataAvailable">
-    <canvas baseChart
-    [datasets]="barChartData"
-    [labels]="barChartLabels"
-    [type]="barChartType"
-    (chartHover)="chartHovered($event)"
-    (chartClick)="chartClicked($event)">
-  </canvas>
+  <div class="chart-wrapper">
+    <div class="chart-content" [class.loading]="isLoading">
+     
+      <div *ngIf="noDataAvailable" class="no-data-message">
+        No data available
+      </div>
+      
+    
+      <div *ngIf="!noDataAvailable" class="chart-display">
+        <canvas baseChart
+          [datasets]="barChartData"
+          [labels]="barChartLabels"
+          [type]="barChartType"
+          [options]="barChartOptions"
+          (chartHover)="chartHovered($event)"
+          (chartClick)="chartClicked($event)">
+        </canvas>
+      </div>
+      
+      <div class="loading-overlay" *ngIf="isLoading">
+        <div class="shimmer-bar"></div>
+      </div>
+    </div>
   </div>
+
+
+  <!-- sheield dashboard  -->
+<!-- 
+<div class="chart-container">
+  <div class="chart-header">
+    <h3>Deal Stage Wise Progress</h3>
+  </div>
+  <div class="chart-wrapper">
+    <div class="chart-content" [class.loading]="isLoading">
+      <canvas 
+        baseChart 
+        [data]="barChartData"
+        [options]="barChartOptions"
+        [type]="barChartType"
+        (chartClick)="chartClicked($event)"
+        (chartHover)="chartHovered($event)">
+      </canvas>
+      <div class="loading-overlay" *ngIf="isLoading">
+        <div class="shimmer-bar"></div>
+      </div>
+    </div>
+  </div>
+</div> -->
+
+
 </div>
\ No newline at end of file
diff --git a/frontend/angular-clarity-master/src/app/modules/main/builder/dashboardnew/gadgets/bar-chart/bar-chart.component.scss b/frontend/angular-clarity-master/src/app/modules/main/builder/dashboardnew/gadgets/bar-chart/bar-chart.component.scss
index e69de29..c70fd33 100644
--- a/frontend/angular-clarity-master/src/app/modules/main/builder/dashboardnew/gadgets/bar-chart/bar-chart.component.scss
+++ b/frontend/angular-clarity-master/src/app/modules/main/builder/dashboardnew/gadgets/bar-chart/bar-chart.component.scss
@@ -0,0 +1,278 @@
+// Chart container structure
+.chart-container {
+  height: 100%;
+  display: flex;
+  flex-direction: column;
+  
+  // Filter section styling
+  .filter-section {
+    margin-bottom: 20px;
+    padding: 15px;
+    border: 1px solid #ddd;
+    border-radius: 4px;
+    background-color: #f9f9f9;
+  }
+
+  .filter-group {
+    margin-bottom: 15px;
+    
+    h4 {
+      margin-top: 0;
+      margin-bottom: 10px;
+      color: #333;
+      font-weight: 600;
+    }
+  }
+
+  .filter-controls {
+    display: flex;
+    flex-wrap: wrap;
+    gap: 15px;
+  }
+
+  .filter-item {
+    flex: 1 1 300px;
+    min-width: 250px;
+    padding: 10px;
+    background: white;
+    border: 1px solid #e0e0e0;
+    border-radius: 4px;
+  }
+
+  .filter-label {
+    font-weight: 500;
+    margin-bottom: 8px;
+    color: #555;
+    font-size: 14px;
+  }
+
+  .filter-input {
+    width: 100%;
+    
+    .filter-text-input,
+    .filter-select,
+    .filter-date {
+      width: 100%;
+      padding: 6px 12px;
+      border: 1px solid #ccc;
+      border-radius: 4px;
+      font-size: 14px;
+    }
+    
+    .filter-select {
+      height: 34px;
+    }
+  }
+
+  .multiselect-container {
+    position: relative;
+  }
+
+  .multiselect-display {
+    display: flex;
+    align-items: center;
+    justify-content: space-between;
+    padding: 6px 12px;
+    border: 1px solid #ccc;
+    border-radius: 4px;
+    background: white;
+    cursor: pointer;
+    min-height: 34px;
+    
+    .multiselect-label {
+      flex: 1;
+      font-size: 14px;
+    }
+    
+    .multiselect-value {
+      color: #666;
+      font-size: 12px;
+      margin-right: 8px;
+    }
+    
+    .dropdown-icon {
+      flex-shrink: 0;
+      transition: transform 0.2s ease;
+    }
+    
+    &:hover {
+      border-color: #999;
+    }
+  }
+
+  .multiselect-dropdown {
+    position: absolute;
+    top: 100%;
+    left: 0;
+    right: 0;
+    z-index: 1000;
+    background: white;
+    border: 1px solid #ccc;
+    border-top: none;
+    border-radius: 0 0 4px 4px;
+    box-shadow: 0 2px 4px rgba(0,0,0,0.1);
+    max-height: 200px;
+    overflow-y: auto;
+    
+    .checkbox-group {
+      padding: 8px;
+      
+      .checkbox-item {
+        display: flex;
+        align-items: center;
+        gap: 8px;
+        padding: 4px 0;
+        
+        .checkbox-label {
+          margin: 0;
+          font-size: 14px;
+          cursor: pointer;
+        }
+      }
+    }
+  }
+
+  .date-range {
+    .date-input-group {
+      display: flex;
+      align-items: center;
+      gap: 8px;
+    }
+    
+    .date-separator {
+      margin: 0 5px;
+      color: #777;
+    }
+  }
+
+  .toggle {
+    display: flex;
+    align-items: center;
+    gap: 8px;
+    
+    .toggle-label {
+      margin: 0;
+      font-size: 14px;
+      cursor: pointer;
+    }
+  }
+
+  .filter-actions {
+    margin-top: 15px;
+    padding-top: 15px;
+    border-top: 1px solid #eee;
+    
+    .btn {
+      font-size: 13px;
+    }
+  }
+  
+  // Chart header styling
+  .chart-header {
+    margin-bottom: 20px;
+    
+    .header-row {
+      margin-bottom: 15px;
+      padding-bottom: 10px;
+      border-bottom: 1px solid #eee;
+      
+      .chart-title {
+        margin: 0;
+        font-size: 18px;
+        font-weight: 600;
+        color: #333;
+      }
+    }
+  }
+  
+  // Chart wrapper and content
+  .chart-wrapper {
+    flex: 1;
+    position: relative;
+    
+    .chart-content {
+      position: relative;
+      height: 100%;
+      min-height: 300px; // Ensure minimum height for chart
+      
+      &.loading {
+        opacity: 0.7;
+        
+        .chart-display {
+          filter: blur(2px);
+        }
+      }
+      
+      .no-data-message {
+        text-align: center;
+        padding: 20px;
+        color: #666;
+        font-style: italic;
+      }
+      
+      .chart-display {
+        position: relative;
+        height: 100%;
+        width: 100%;
+        max-width: 100%;
+        max-height: 100%;
+        transition: filter 0.3s ease;
+      }
+      
+      .loading-overlay {
+        position: absolute;
+        top: 0;
+        left: 0;
+        right: 0;
+        bottom: 0;
+        display: flex;
+        align-items: center;
+        justify-content: center;
+        background: rgba(255, 255, 255, 0.8);
+        
+        .shimmer-bar {
+          width: 80%;
+          height: 20px;
+          background: linear-gradient(90deg, #f0f0f0 25%, #e0e0e0 50%, #f0f0f0 75%);
+          background-size: 200% 100%;
+          animation: shimmer 1.5s infinite;
+          border-radius: 4px;
+        }
+      }
+    }
+  }
+}
+
+@keyframes shimmer {
+  0% {
+    background-position: -200% 0;
+  }
+  100% {
+    background-position: 200% 0;
+  }
+}
+
+// Responsive design
+@media (max-width: 768px) {
+  .chart-container {
+    .filter-controls {
+      flex-direction: column;
+    }
+    
+    .filter-item {
+      min-width: 100%;
+    }
+    
+    .chart-header {
+      .header-row {
+        .chart-title {
+          font-size: 16px;
+        }
+      }
+    }
+    
+    .chart-content {
+      min-height: 250px; // Adjust for mobile
+    }
+  }
+}
\ No newline at end of file
diff --git a/frontend/angular-clarity-master/src/app/modules/main/builder/dashboardnew/gadgets/bar-chart/bar-chart.component.ts b/frontend/angular-clarity-master/src/app/modules/main/builder/dashboardnew/gadgets/bar-chart/bar-chart.component.ts
index ee9938d..292f9ea 100644
--- a/frontend/angular-clarity-master/src/app/modules/main/builder/dashboardnew/gadgets/bar-chart/bar-chart.component.ts
+++ b/frontend/angular-clarity-master/src/app/modules/main/builder/dashboardnew/gadgets/bar-chart/bar-chart.component.ts
@@ -1,6 +1,9 @@
-import { Component, Input, OnInit, OnChanges, OnDestroy, SimpleChanges } from '@angular/core';
+import { Component, Input, OnInit, OnChanges, OnDestroy, SimpleChanges, ViewChild } from '@angular/core';
 import { Dashboard3Service } from '../../../../../../services/builder/dashboard3.service';
 import { Subscription } from 'rxjs';
+import { FilterService } from '../../common-filter/filter.service';
+// Add BaseChartDirective import for chart resizing
+import { BaseChartDirective } from 'ng2-charts';
 
 @Component({
   selector: 'app-bar-chart',
@@ -34,6 +37,9 @@ export class BarChartComponent implements OnInit, OnChanges, OnDestroy {
   // Multi-layer drilldown configuration inputs
   @Input() drilldownLayers: any[] = []; // Array of drilldown layer configurations
 
+  // Add ViewChild to access the chart directive
+  @ViewChild(BaseChartDirective) chart?: BaseChartDirective;
+
   barChartLabels: string[] = ['Apple', 'Banana', 'Kiwifruit', 'Blueberry', 'Orange', 'Grapes'];
   barChartType: string = 'bar';
   barChartPlugins = [];
@@ -42,6 +48,58 @@ export class BarChartComponent implements OnInit, OnChanges, OnDestroy {
   ];
   barChartLegend: boolean = true;
   
+  // Add responsive chart options
+  barChartOptions: any = {
+    responsive: true,
+    maintainAspectRatio: false,
+    scales: {
+      x: {
+        ticks: {
+          autoSkip: false,
+          maxRotation: 45,
+          minRotation: 45,
+          padding: 15,
+          font: {
+            size: 12
+          }
+        },
+        grid: {
+          display: false
+        }
+      },
+      y: {
+        beginAtZero: true,
+        ticks: {
+          font: {
+            size: 12
+          }
+        }
+      }
+    },
+    plugins: {
+      legend: {
+        display: true,
+        position: 'top',
+        labels: {
+          font: {
+            size: 12
+          }
+        }
+      },
+      tooltip: {
+        enabled: true
+      }
+    },
+    layout: {
+      padding: {
+        bottom: 60,
+        left: 15,
+        right: 15,
+        top: 15
+      }
+    }
+  };
+  
   // Multi-layer drilldown state tracking
   drilldownStack: any[] = []; // Stack to track drilldown navigation history
   currentDrilldownLevel: number = 0; // Current drilldown level (0 = base level)
@@ -51,15 +109,34 @@ export class BarChartComponent implements OnInit, OnChanges, OnDestroy {
   // No data state
   noDataAvailable: boolean = false;
   
+  // Loading state
+  isLoading: boolean = false;
+  
   // Flag to prevent infinite loops
   private isFetchingData: boolean = false;
   
   // Subscriptions to unsubscribe on destroy
   private subscriptions: Subscription[] = [];
 
-  constructor(private dashboardService: Dashboard3Service) { }
+  // Add properties for filter functionality
+  private openMultiselects: Map<string, string> = new Map(); // Map of filterId -> context
+  private documentClickHandler: ((event: MouseEvent) => void) | null = null;
+  private filtersInitialized: boolean = false;
+
+  constructor(
+    private dashboardService: Dashboard3Service,
+    private filterService: FilterService
+  ) { }
 
   ngOnInit(): void {
+    // Subscribe to filter changes
+    this.subscriptions.push(
+      this.filterService.filterState$.subscribe(filters => {
+        // When filters change, refresh the chart data
+        this.fetchChartData();
+      })
+    );
+    
     // Initialize with default data
     this.fetchChartData();
   }
@@ -67,6 +144,12 @@ export class BarChartComponent implements OnInit, OnChanges, OnDestroy {
   ngOnChanges(changes: SimpleChanges): void {
     console.log('BarChartComponent input changes:', changes);
     
+    // Initialize filter values if they haven't been initialized yet
+    if (!this.filtersInitialized && (changes.baseFilters || changes.drilldownFilters || changes.drilldownLayers)) {
+      this.initializeFilterValues();
+      this.filtersInitialized = true;
+    }
+    
     // Check if any of the key properties have changed
     const xAxisChanged = changes.xAxis && !changes.xAxis.firstChange;
     const yAxisChanged = changes.yAxis && !changes.yAxis.firstChange;
@@ -92,28 +175,348 @@ export class BarChartComponent implements OnInit, OnChanges, OnDestroy {
     // Update legend visibility if it changed
     if (changes.chartlegend !== undefined) {
       this.barChartLegend = changes.chartlegend.currentValue;
+      this.barChartOptions.plugins.legend.display = this.barChartLegend;
       console.log('Chart legend changed to:', this.barChartLegend);
     }
   }
 
+  // Initialize filter values with proper default values based on type
+  private initializeFilterValues(): void {
+    console.log('Initializing filter values');
+    
+    // Initialize base filters
+    if (this.baseFilters) {
+      this.baseFilters.forEach(filter => {
+        if (filter.value === undefined || filter.value === null) {
+          switch (filter.type) {
+            case 'multiselect':
+              filter.value = [];
+              break;
+            case 'date-range':
+              filter.value = { start: null, end: null };
+              break;
+            case 'toggle':
+              filter.value = false;
+              break;
+            default:
+              filter.value = '';
+          }
+        }
+      });
+    }
+    
+    // Initialize drilldown filters
+    if (this.drilldownFilters) {
+      this.drilldownFilters.forEach(filter => {
+        if (filter.value === undefined || filter.value === null) {
+          switch (filter.type) {
+            case 'multiselect':
+              filter.value = [];
+              break;
+            case 'date-range':
+              filter.value = { start: null, end: null };
+              break;
+            case 'toggle':
+              filter.value = false;
+              break;
+            default:
+              filter.value = '';
+          }
+        }
+      });
+    }
+    
+    // Initialize layer filters
+    if (this.drilldownLayers) {
+      this.drilldownLayers.forEach(layer => {
+        if (layer.filters) {
+          layer.filters.forEach((filter: any) => {
+            if (filter.value === undefined || filter.value === null) {
+              switch (filter.type) {
+                case 'multiselect':
+                  filter.value = [];
+                  break;
+                case 'date-range':
+                  filter.value = { start: null, end: null };
+                  break;
+                case 'toggle':
+                  filter.value = false;
+                  break;
+                default:
+                  filter.value = '';
+              }
+            }
+          });
+        }
+      });
+    }
+    
+    console.log('Filter values initialized:', {
+      baseFilters: this.baseFilters,
+      drilldownFilters: this.drilldownFilters,
+      drilldownLayers: this.drilldownLayers
+    });
+  }
+
+  // Check if there are active filters
+  hasActiveFilters(): boolean {
+    return (this.baseFilters && this.baseFilters.length > 0) || 
+           (this.drilldownFilters && this.drilldownFilters.length > 0) || 
+           this.hasActiveLayerFilters();
+  }
+
+  // Check if there are active layer filters for current drilldown level
+  hasActiveLayerFilters(): boolean {
+    if (this.currentDrilldownLevel > 1 && this.drilldownLayers && this.drilldownLayers.length > 0) {
+      const layerIndex = this.currentDrilldownLevel - 2; // -2 because level 1 is base drilldown
+      return layerIndex < this.drilldownLayers.length && 
+             this.drilldownLayers[layerIndex].filters && 
+             this.drilldownLayers[layerIndex].filters.length > 0;
+    }
+    return false;
+  }
+
+  // Get active layer filters for current drilldown level
+  getActiveLayerFilters(): any[] {
+    if (this.currentDrilldownLevel > 1 && this.drilldownLayers && this.drilldownLayers.length > 0) {
+      const layerIndex = this.currentDrilldownLevel - 2; // -2 because level 1 is base drilldown
+      if (layerIndex < this.drilldownLayers.length && 
+          this.drilldownLayers[layerIndex].filters) {
+        return this.drilldownLayers[layerIndex].filters;
+      }
+    }
+    return [];
+  }
+
+  // Get filter options for dropdown/multiselect filters
+  getFilterOptions(filter: any): string[] {
+    if (filter.options) {
+      if (Array.isArray(filter.options)) {
+        return filter.options;
+      } else if (typeof filter.options === 'string') {
+        return filter.options.split(',').map(opt => opt.trim()).filter(opt => opt);
+      }
+    }
+    return [];
+  }
+
+  // Check if an option is selected for multiselect filters
+  isOptionSelected(filter: any, option: string): boolean {
+    if (!filter.value) {
+      return false;
+    }
+    
+    if (Array.isArray(filter.value)) {
+      return filter.value.includes(option);
+    }
+    
+    return filter.value === option;
+  }
+
+  // Handle base filter changes
+  onBaseFilterChange(filter: any): void {
+    console.log('Base filter changed:', filter);
+    // Refresh data when filter changes
+    this.fetchChartData();
+  }
+
+  // Handle drilldown filter changes
+  onDrilldownFilterChange(filter: any): void {
+    console.log('Drilldown filter changed:', filter);
+    // Refresh data when filter changes
+    this.fetchChartData();
+  }
+
+  // Handle layer filter changes
+  onLayerFilterChange(filter: any): void {
+    console.log('Layer filter changed:', filter);
+    // Refresh data when filter changes
+    this.fetchChartData();
+  }
+
+  // Handle multiselect changes
+  onMultiSelectChange(filter: any, option: string, event: any): void {
+    const checked = event.target.checked;
+    
+    // Initialize filter.value as array if it's not already
+    if (!Array.isArray(filter.value)) {
+      filter.value = [];
+    }
+    
+    if (checked) {
+      // Add option to array if not already present
+      if (!filter.value.includes(option)) {
+        filter.value.push(option);
+      }
+    } else {
+      // Remove option from array
+      filter.value = filter.value.filter((item: string) => item !== option);
+    }
+    
+    // Refresh data when filter changes
+    this.fetchChartData();
+  }
+
+  // Handle date range changes
+  onDateRangeChange(filter: any, dateRange: { start: string | null, end: string | null }): void {
+    filter.value = dateRange;
+    // Refresh data when filter changes
+    this.fetchChartData();
+  }
+
+  // Handle toggle changes
+  onToggleChange(filter: any, checked: boolean): void {
+    filter.value = checked;
+    // Refresh data when filter changes
+    this.fetchChartData();
+  }
+
+  // Toggle multiselect dropdown visibility
+  toggleMultiselect(filter: any, context: string): void {
+    const filterId = `${context}-${filter.field}`;
+    if (this.isMultiselectOpen(filter, context)) {
+      this.openMultiselects.delete(filterId);
+    } else {
+      // Close all other multiselects first
+      this.openMultiselects.clear();
+      this.openMultiselects.set(filterId, context);
+      
+      // Add document click handler to close dropdown when clicking outside
+      this.addDocumentClickHandler();
+    }
+  }
+
+  // Add document click handler to close dropdowns when clicking outside
+  private addDocumentClickHandler(): void {
+    if (!this.documentClickHandler) {
+      this.documentClickHandler = (event: MouseEvent) => {
+        const target = event.target as HTMLElement;
+        // Check if click is outside any multiselect dropdown
+        if (!target.closest('.multiselect-container')) {
+          this.openMultiselects.clear();
+          this.removeDocumentClickHandler();
+        }
+      };
+      
+      // Use setTimeout to ensure the click event that opened the dropdown doesn't immediately close it
+      setTimeout(() => {
+        document.addEventListener('click', this.documentClickHandler!);
+      }, 0);
+    }
+  }
+
+  // Remove document click handler
+  private removeDocumentClickHandler(): void {
+    if (this.documentClickHandler) {
+      document.removeEventListener('click', this.documentClickHandler);
+      this.documentClickHandler = null;
+    }
+  }
+
+  // Check if multiselect dropdown is open
+  isMultiselectOpen(filter: any, context: string): boolean {
+    const filterId = `${context}-${filter.field}`;
+    return this.openMultiselects.has(filterId);
+  }
+
+  // Get count of selected options for a multiselect filter
+  getSelectedOptionsCount(filter: any): number {
+    if (!filter.value) {
+      return 0;
+    }
+    
+    if (Array.isArray(filter.value)) {
+      return filter.value.length;
+    }
+    
+    return 0;
+  }
+
+  // Clear all filters
+  clearAllFilters(): void {
+    // Clear base filters
+    if (this.baseFilters) {
+      this.baseFilters.forEach(filter => {
+        if (filter.type === 'multiselect') {
+          filter.value = [];
+        } else if (filter.type === 'date-range') {
+          filter.value = { start: null, end: null };
+        } else if (filter.type === 'toggle') {
+          filter.value = false;
+        } else {
+          filter.value = '';
+        }
+      });
+    }
+    
+    // Clear drilldown filters
+    if (this.drilldownFilters) {
+      this.drilldownFilters.forEach(filter => {
+        if (filter.type === 'multiselect') {
+          filter.value = [];
+        } else if (filter.type === 'date-range') {
+          filter.value = { start: null, end: null };
+        } else if (filter.type === 'toggle') {
+          filter.value = false;
+        } else {
+          filter.value = '';
+        }
+      });
+    }
+    
+    // Clear layer filters
+    if (this.drilldownLayers) {
+      this.drilldownLayers.forEach(layer => {
+        if (layer.filters) {
+          layer.filters.forEach((filter: any) => {
+            if (filter.type === 'multiselect') {
+              filter.value = [];
+            } else if (filter.type === 'date-range') {
+              filter.value = { start: null, end: null };
+            } else if (filter.type === 'toggle') {
+              filter.value = false;
+            } else {
+              filter.value = '';
+            }
+          });
+        }
+      });
+    }
+    
+    // Close all multiselect dropdowns
+    this.openMultiselects.clear();
+    
+    // Refresh data
+    this.fetchChartData();
+  }
+
   fetchChartData(): void {
+    // Set loading state
+    this.isLoading = true;
+    
     // Set flag to prevent recursive calls
     this.isFetchingData = true;
     
     // If we're in drilldown mode, fetch the appropriate drilldown data
     if (this.currentDrilldownLevel > 0 && this.drilldownStack.length > 0) {
       this.fetchDrilldownData();
-      // Reset flag after fetching
+      // Reset flags after fetching
       this.isFetchingData = false;
+      this.isLoading = false;
       return;
     }
     
     // If we have the necessary data, fetch chart data from the service
     if (this.table && this.xAxis && this.yAxis) {
-      console.log('Fetching bar chart data for:', { table: this.table, xAxis: this.xAxis, yAxis: this.yAxis, connection: this.connection });
+      console.log('=== BAR CHART DEBUG INFO ===');
+      console.log('Table:', this.table);
+      console.log('X-Axis:', this.xAxis);
+      console.log('Y-Axis:', this.yAxis);
+      console.log('Connection:', this.connection);
       
       // Convert yAxis to string if it's an array
       const yAxisString = Array.isArray(this.yAxis) ? this.yAxis.join(',') : this.yAxis;
+      console.log('Y-Axis String:', yAxisString);
       
       // Get the parameter value from the drilldown stack for base level (should be empty)
       let parameterValue = '';
@@ -123,31 +526,55 @@ export class BarChartComponent implements OnInit, OnChanges, OnDestroy {
       console.log('Bar chart data URL:', url);
       
       // Convert baseFilters to filter parameters
-      let filterParams = '';
+      const filterObj = {};
+      
+      // Add base filters
       if (this.baseFilters && this.baseFilters.length > 0) {
-        const filterObj = {};
         this.baseFilters.forEach(filter => {
           if (filter.field && filter.value) {
             filterObj[filter.field] = filter.value;
           }
         });
-        if (Object.keys(filterObj).length > 0) {
-          filterParams = JSON.stringify(filterObj);
-        }
       }
-      console.log('Base filter parameters:', filterParams);
+      
+      // Add common filters
+      const commonFilters = this.filterService.getFilterValues();
+      const filterDefinitions = this.filterService.getFilters();
+      Object.keys(commonFilters).forEach(filterId => {
+        const filterValue = commonFilters[filterId];
+        
+        // Find the filter definition to get the field name
+        const filterDef = this.filterService.getFilters().find(f => f.id === filterId);
+        
+        if (filterDef && filterDef.field) {
+          const fieldName = filterDef.field;
+          if (filterValue !== undefined && filterValue !== null && filterValue !== '') {
+            filterObj[fieldName] = filterValue;
+          }
+        }
+      });
+      
+      // Convert to JSON string for API call
+      let filterParams = '';
+      if (Object.keys(filterObj).length > 0) {
+        filterParams = JSON.stringify(filterObj);
+      }
+      
+      console.log('Final filter object:', filterObj);
       // Fetch data from the dashboard service with parameter field and value
       // For base level, we pass empty parameter and value, but now also pass filters
       const subscription = this.dashboardService.getChartData(this.table, 'bar', this.xAxis, yAxisString, this.connection, '', '', filterParams).subscribe(
         (data: any) => {
+          console.log('=== BAR CHART DATA RESPONSE ===');
           console.log('Received bar chart data:', data);
           if (data === null) {
             console.warn('Bar chart API returned null data. Check if the API endpoint is working correctly.');
             this.noDataAvailable = true;
             this.barChartLabels = [];
             this.barChartData = [];
-            // Reset flag after fetching
+            // Reset flags after fetching
             this.isFetchingData = false;
+            this.isLoading = false;
             return;
           }
           
@@ -160,6 +587,7 @@ export class BarChartComponent implements OnInit, OnChanges, OnDestroy {
             // Trigger change detection
             // this.barChartData = [...this.barChartData];
             console.log('Updated bar chart with data:', { labels: this.barChartLabels, data: this.barChartData });
+            console.log('=== CHART UPDATED SUCCESSFULLY ===');
           } else if (data && data.labels && data.datasets) {
             // Backend has already filtered the data, just display it
             this.noDataAvailable = data.labels.length === 0;
@@ -168,22 +596,26 @@ export class BarChartComponent implements OnInit, OnChanges, OnDestroy {
             // Trigger change detection
             // this.barChartData = [...this.barChartData];
             console.log('Updated bar chart with legacy data format:', { labels: this.barChartLabels, data: this.barChartData });
+            console.log('=== CHART UPDATED SUCCESSFULLY (LEGACY) ===');
           } else {
             console.warn('Bar chart received data does not have expected structure', data);
             this.noDataAvailable = true;
             this.barChartLabels = [];
             this.barChartData = [];
           }
-          // Reset flag after fetching
+          // Reset flags after fetching
           this.isFetchingData = false;
+          this.isLoading = false;
         },
         (error) => {
+          console.error('=== BAR CHART ERROR ===');
           console.error('Error fetching bar chart data:', error);
           this.noDataAvailable = true;
           this.barChartLabels = [];
           this.barChartData = [];
-          // Reset flag after fetching
+          // Reset flags after fetching
           this.isFetchingData = false;
+          this.isLoading = false;
           // Keep default data in case of error
         }
       );
@@ -195,8 +627,9 @@ export class BarChartComponent implements OnInit, OnChanges, OnDestroy {
       this.noDataAvailable = true;
       this.barChartLabels = [];
       this.barChartData = [];
-      // Reset flag after fetching
+      // Reset flags after fetching
       this.isFetchingData = false;
+      this.isLoading = false;
     }
   }
   
@@ -286,33 +719,49 @@ export class BarChartComponent implements OnInit, OnChanges, OnDestroy {
     console.log('Drilldown data URL:', url);
     
     // Convert drilldown layer filters to filter parameters (if applicable)
-    let filterParams = '';
+    const filterObj = {};
+    
+    // Add drilldown layer filters
     if (drilldownConfig.filters && drilldownConfig.filters.length > 0) {
-      const filterObj = {};
       drilldownConfig.filters.forEach((filter: any) => {
         if (filter.field && filter.value) {
           filterObj[filter.field] = filter.value;
         }
       });
-      if (Object.keys(filterObj).length > 0) {
-        filterParams = JSON.stringify(filterObj);
-      }
     }
-    console.log('Drilldown layer filter parameters:', filterParams);
     
-    // Convert drilldownFilters to filter parameters for drilldown level
-    let drilldownFilterParams = '';
+    // Add drilldownFilters
     if (this.drilldownFilters && this.drilldownFilters.length > 0) {
-      const filterObj = {};
       this.drilldownFilters.forEach(filter => {
         if (filter.field && filter.value) {
           filterObj[filter.field] = filter.value;
         }
       });
-      if (Object.keys(filterObj).length > 0) {
-        drilldownFilterParams = JSON.stringify(filterObj);
-      }
     }
+    
+    // Add common filters
+    const commonFilters = this.filterService.getFilterValues();
+    const filterDefinitions = this.filterService.getFilters();
+    Object.keys(commonFilters).forEach(filterId => {
+      const filterValue = commonFilters[filterId];
+      
+      // Find the filter definition to get the field name
+      const filterDef = this.filterService.getFilters().find(f => f.id === filterId);
+      
+      if (filterDef && filterDef.field) {
+        const fieldName = filterDef.field;
+        if (filterValue !== undefined && filterValue !== null && filterValue !== '') {
+          filterObj[fieldName] = filterValue;
+        }
+      }
+    });
+    
+    // Convert to JSON string for API call
+    let drilldownFilterParams = '';
+    if (Object.keys(filterObj).length > 0) {
+      drilldownFilterParams = JSON.stringify(filterObj);
+    }
+    
     console.log('Drilldown filter parameters:', drilldownFilterParams);
     
     // For drilldown level, we pass the parameter value from the drilldown stack and drilldown filters
@@ -342,17 +791,23 @@ export class BarChartComponent implements OnInit, OnChanges, OnDestroy {
           // Trigger change detection
           // this.barChartData = [...this.barChartData];
           console.log('Updated bar chart with drilldown data:', { labels: this.barChartLabels, data: this.barChartData });
+          // Set loading state to false
+          this.isLoading = false;
         } else if (data && data.labels && data.datasets) {
           // Backend has already filtered the data, just display it
           this.noDataAvailable = data.labels.length === 0;
           this.barChartLabels = data.labels;
           this.barChartData = data.datasets;
           console.log('Updated bar chart with drilldown legacy data format:', { labels: this.barChartLabels, data: this.barChartData });
+          // Set loading state to false
+          this.isLoading = false;
         } else {
           console.warn('Drilldown received data does not have expected structure', data);
           this.noDataAvailable = true;
           this.barChartLabels = [];
           this.barChartData = [];
+          // Set loading state to false
+          this.isLoading = false;
         }
       },
       (error) => {
@@ -360,12 +815,17 @@ export class BarChartComponent implements OnInit, OnChanges, OnDestroy {
         this.noDataAvailable = true;
         this.barChartLabels = [];
         this.barChartData = [];
+        // Set loading state to false
+        this.isLoading = false;
         // Keep current data in case of error
       }
     );
     
     // Add subscription to array for cleanup
     this.subscriptions.push(subscription);
+    
+    // Set loading state
+    this.isLoading = true;
   }
   
   // Reset to original data (go back to base level)
@@ -426,6 +886,18 @@ export class BarChartComponent implements OnInit, OnChanges, OnDestroy {
     }
   }
 
+  // Public method to refresh data when filters change
+  refreshData(): void {
+    this.fetchChartData();
+  }
+  
+  // Method to handle window resize events
+  onResize(): void {
+    if (this.chart) {
+      this.chart.chart?.resize();
+    }
+  }
+  
   // Ensure labels and data arrays have the same length
   private syncLabelAndDataArrays(): void {
     // For bar charts, we need to ensure all datasets have the same number of data points
@@ -557,6 +1029,12 @@ export class BarChartComponent implements OnInit, OnChanges, OnDestroy {
     this.originalBarChartLabels = [];
     this.originalBarChartData = [];
     
+    // Clear multiselect tracking
+    this.openMultiselects.clear();
+    
+    // Remove document click handler
+    this.removeDocumentClickHandler();
+    
     console.log('BarChartComponent destroyed and cleaned up');
   }
 }
\ No newline at end of file
diff --git a/frontend/angular-clarity-master/src/app/modules/main/builder/dashboardnew/gadgets/bubble-chart/bubble-chart.component.html b/frontend/angular-clarity-master/src/app/modules/main/builder/dashboardnew/gadgets/bubble-chart/bubble-chart.component.html
index 874bbed..e2c52aa 100644
--- a/frontend/angular-clarity-master/src/app/modules/main/builder/dashboardnew/gadgets/bubble-chart/bubble-chart.component.html
+++ b/frontend/angular-clarity-master/src/app/modules/main/builder/dashboardnew/gadgets/bubble-chart/bubble-chart.component.html
@@ -1,28 +1,310 @@
-<div style="display:block">
-  <!-- Drilldown mode indicator -->
-  <div *ngIf="currentDrilldownLevel > 0" style="background-color: #e0e0e0; padding: 5px; margin-bottom: 10px; border-radius: 4px; text-align: center;">
-    <span style="font-weight: bold; color: #333;">Drilldown Level: {{currentDrilldownLevel}}</span>
-    <button (click)="navigateBack()" style="margin-left: 10px; padding: 2px 8px; background-color: #007cba; color: white; border: none; border-radius: 3px; cursor: pointer;">
-      Back to Level {{currentDrilldownLevel - 1}}
-    </button>
-    <button (click)="resetToOriginalData()" style="margin-left: 10px; padding: 2px 8px; background-color: #dc3545; color: white; border: none; border-radius: 3px; cursor: pointer;">
-      Back to Main View
-    </button>
+<div style="display:block; height: 100%; width: 100%;">
+  <!-- Filter Controls Section -->
+  <div class="filter-section" *ngIf="hasActiveFilters()">
+    <!-- Base Filters -->
+    <div class="filter-group" *ngIf="baseFilters && baseFilters.length > 0">
+      <h4>Base Filters</h4>
+      <div class="filter-controls">
+        <div *ngFor="let filter of baseFilters" class="filter-item">
+          <div class="filter-label">{{ filter.field }} ({{ filter.type || 'text' }})</div>
+          
+          <!-- Text Filter -->
+          <div *ngIf="!filter.type || filter.type === 'text'" class="filter-input">
+            <input type="text" 
+                   [(ngModel)]="filter.value" 
+                   (ngModelChange)="onBaseFilterChange(filter)"
+                   [placeholder]="filter.field"
+                   class="clr-input filter-text-input">
+          </div>
+          
+          <!-- Dropdown Filter -->
+          <div *ngIf="filter.type === 'dropdown'" class="filter-input">
+            <select [(ngModel)]="filter.value" 
+                    (ngModelChange)="onBaseFilterChange(filter)"
+                    class="clr-select filter-select">
+              <option value="">Select {{ filter.field }}</option>
+              <option *ngFor="let option of getFilterOptions(filter)" [value]="option">{{ option }}</option>
+            </select>
+          </div>
+          
+          <!-- Multi-Select Filter - Updated to show key first, then dropdown on click -->
+          <div *ngIf="filter.type === 'multiselect'" class="filter-input multiselect-container">
+            <div class="multiselect-display" (click)="toggleMultiselect(filter, 'base')">
+              <span class="multiselect-label">{{ filter.field }}</span>
+              <span class="multiselect-value" *ngIf="getSelectedOptionsCount(filter) > 0">
+                ({{ getSelectedOptionsCount(filter) }} selected)
+              </span>
+              <clr-icon shape="caret down" class="dropdown-icon"></clr-icon>
+            </div>
+            <div class="multiselect-dropdown" *ngIf="isMultiselectOpen(filter, 'base')">
+              <div class="checkbox-group">
+                <div *ngFor="let option of getFilterOptions(filter); let i = index" class="checkbox-item">
+                  <input type="checkbox" 
+                         [checked]="isOptionSelected(filter, option)" 
+                         (change)="onMultiSelectChange(filter, option, $event)"
+                         [id]="'base-' + filter.field + '-' + i" 
+                         class="clr-checkbox">
+                  <label [for]="'base-' + filter.field + '-' + i" class="checkbox-label">{{ option }}</label>
+                </div>
+              </div>
+            </div>
+          </div>
+          
+          <!-- Date Range Filter -->
+          <div *ngIf="filter.type === 'date-range'" class="filter-input date-range">
+            <div class="date-input-group">
+              <input type="date" 
+                     [(ngModel)]="filter.value.start" 
+                     (ngModelChange)="onDateRangeChange(filter, { start: $event, end: filter.value.end })"
+                     placeholder="Start Date"
+                     class="clr-input filter-date">
+              <span class="date-separator">to</span>
+              <input type="date" 
+                     [(ngModel)]="filter.value.end" 
+                     (ngModelChange)="onDateRangeChange(filter, { start: filter.value.start, end: $event })"
+                     placeholder="End Date"
+                     class="clr-input filter-date">
+            </div>
+          </div>
+          
+          <!-- Toggle Filter -->
+          <div *ngIf="filter.type === 'toggle'" class="filter-input toggle">
+            <input type="checkbox" 
+                   [(ngModel)]="filter.value" 
+                   (ngModelChange)="onToggleChange(filter, $event)"
+                   clrToggle 
+                   class="clr-toggle">
+            <label class="toggle-label">{{ filter.field }}</label>
+          </div>
+        </div>
+      </div>
+    </div>
+    
+    <!-- Drilldown Filters -->
+    <div class="filter-group" *ngIf="drilldownFilters && drilldownFilters.length > 0 && currentDrilldownLevel > 0">
+      <h4>Drilldown Filters</h4>
+      <div class="filter-controls">
+        <div *ngFor="let filter of drilldownFilters" class="filter-item">
+          <div class="filter-label">{{ filter.field }} ({{ filter.type || 'text' }})</div>
+          
+          <!-- Text Filter -->
+          <div *ngIf="!filter.type || filter.type === 'text'" class="filter-input">
+            <input type="text" 
+                   [(ngModel)]="filter.value" 
+                   (ngModelChange)="onDrilldownFilterChange(filter)"
+                   [placeholder]="filter.field"
+                   class="clr-input filter-text-input">
+          </div>
+          
+          <!-- Dropdown Filter -->
+          <div *ngIf="filter.type === 'dropdown'" class="filter-input">
+            <select [(ngModel)]="filter.value" 
+                    (ngModelChange)="onDrilldownFilterChange(filter)"
+                    class="clr-select filter-select">
+              <option value="">Select {{ filter.field }}</option>
+              <option *ngFor="let option of getFilterOptions(filter)" [value]="option">{{ option }}</option>
+            </select>
+          </div>
+          
+          <!-- Multi-Select Filter - Updated to show key first, then dropdown on click -->
+          <div *ngIf="filter.type === 'multiselect'" class="filter-input multiselect-container">
+            <div class="multiselect-display" (click)="toggleMultiselect(filter, 'drilldown')">
+              <span class="multiselect-label">{{ filter.field }}</span>
+              <span class="multiselect-value" *ngIf="getSelectedOptionsCount(filter) > 0">
+                ({{ getSelectedOptionsCount(filter) }} selected)
+              </span>
+              <clr-icon shape="caret down" class="dropdown-icon"></clr-icon>
+            </div>
+            <div class="multiselect-dropdown" *ngIf="isMultiselectOpen(filter, 'drilldown')">
+              <div class="checkbox-group">
+                <div *ngFor="let option of getFilterOptions(filter); let i = index" class="checkbox-item">
+                  <input type="checkbox" 
+                         [checked]="isOptionSelected(filter, option)" 
+                         (change)="onMultiSelectChange(filter, option, $event)"
+                         [id]="'drilldown-' + filter.field + '-' + i" 
+                         class="clr-checkbox">
+                  <label [for]="'drilldown-' + filter.field + '-' + i" class="checkbox-label">{{ option }}</label>
+                </div>
+              </div>
+            </div>
+          </div>
+          
+          <!-- Date Range Filter -->
+          <div *ngIf="filter.type === 'date-range'" class="filter-input date-range">
+            <div class="date-input-group">
+              <input type="date" 
+                     [(ngModel)]="filter.value.start" 
+                     (ngModelChange)="onDateRangeChange(filter, { start: $event, end: filter.value.end })"
+                     placeholder="Start Date"
+                     class="clr-input filter-date">
+              <span class="date-separator">to</span>
+              <input type="date" 
+                     [(ngModel)]="filter.value.end" 
+                     (ngModelChange)="onDateRangeChange(filter, { start: filter.value.start, end: $event })"
+                     placeholder="End Date"
+                     class="clr-input filter-date">
+            </div>
+          </div>
+          
+          <!-- Toggle Filter -->
+          <div *ngIf="filter.type === 'toggle'" class="filter-input toggle">
+            <input type="checkbox" 
+                   [(ngModel)]="filter.value" 
+                   (ngModelChange)="onToggleChange(filter, $event)"
+                   clrToggle 
+                   class="clr-toggle">
+            <label class="toggle-label">{{ filter.field }}</label>
+          </div>
+        </div>
+      </div>
+    </div>
+    
+    <!-- Layer Filters -->
+    <div class="filter-group" *ngIf="hasActiveLayerFilters()">
+      <h4>Layer Filters</h4>
+      <div class="filter-controls">
+        <div *ngFor="let filter of getActiveLayerFilters()" class="filter-item">
+          <div class="filter-label">{{ filter.field }} ({{ filter.type || 'text' }})</div>
+          
+          <!-- Text Filter -->
+          <div *ngIf="!filter.type || filter.type === 'text'" class="filter-input">
+            <input type="text" 
+                   [(ngModel)]="filter.value" 
+                   (ngModelChange)="onLayerFilterChange(filter)"
+                   [placeholder]="filter.field"
+                   class="clr-input filter-text-input">
+          </div>
+          
+          <!-- Dropdown Filter -->
+          <div *ngIf="filter.type === 'dropdown'" class="filter-input">
+            <select [(ngModel)]="filter.value" 
+                    (ngModelChange)="onLayerFilterChange(filter)"
+                    class="clr-select filter-select">
+              <option value="">Select {{ filter.field }}</option>
+              <option *ngFor="let option of getFilterOptions(filter)" [value]="option">{{ option }}</option>
+            </select>
+          </div>
+          
+          <!-- Multi-Select Filter - Updated to show key first, then dropdown on click -->
+          <div *ngIf="filter.type === 'multiselect'" class="filter-input multiselect-container">
+            <div class="multiselect-display" (click)="toggleMultiselect(filter, 'layer')">
+              <span class="multiselect-label">{{ filter.field }}</span>
+              <span class="multiselect-value" *ngIf="getSelectedOptionsCount(filter) > 0">
+                ({{ getSelectedOptionsCount(filter) }} selected)
+              </span>
+              <clr-icon shape="caret down" class="dropdown-icon"></clr-icon>
+            </div>
+            <div class="multiselect-dropdown" *ngIf="isMultiselectOpen(filter, 'layer')">
+              <div class="checkbox-group">
+                <div *ngFor="let option of getFilterOptions(filter); let i = index" class="checkbox-item">
+                  <input type="checkbox" 
+                         [checked]="isOptionSelected(filter, option)" 
+                         (change)="onMultiSelectChange(filter, option, $event)"
+                         [id]="'layer-' + filter.field + '-' + i" 
+                         class="clr-checkbox">
+                  <label [for]="'layer-' + filter.field + '-' + i" class="checkbox-label">{{ option }}</label>
+                </div>
+              </div>
+            </div>
+          </div>
+          
+          <!-- Date Range Filter -->
+          <div *ngIf="filter.type === 'date-range'" class="filter-input date-range">
+            <div class="date-input-group">
+              <input type="date" 
+                     [(ngModel)]="filter.value.start" 
+                     (ngModelChange)="onDateRangeChange(filter, { start: $event, end: filter.value.end })"
+                     placeholder="Start Date"
+                     class="clr-input filter-date">
+              <span class="date-separator">to</span>
+              <input type="date" 
+                     [(ngModel)]="filter.value.end" 
+                     (ngModelChange)="onDateRangeChange(filter, { start: filter.value.start, end: $event })"
+                     placeholder="End Date"
+                     class="clr-input filter-date">
+            </div>
+          </div>
+          
+          <!-- Toggle Filter -->
+          <div *ngIf="filter.type === 'toggle'" class="filter-input toggle">
+            <input type="checkbox" 
+                   [(ngModel)]="filter.value" 
+                   (ngModelChange)="onToggleChange(filter, $event)"
+                   clrToggle 
+                   class="clr-toggle">
+            <label class="toggle-label">{{ filter.field }}</label>
+          </div>
+        </div>
+      </div>
+    </div>
+    
+    <!-- Clear Filters Button -->
+    <div class="filter-actions">
+      <button class="btn btn-sm btn-outline" (click)="clearAllFilters()">Clear All Filters</button>
+    </div>
   </div>
   
-  <!-- No data message -->
-  <div *ngIf="noDataAvailable" style="text-align: center; padding: 20px; color: #666; font-style: italic;">
-    No data available
+  <!-- Header row with chart title and drilldown navigation -->
+  <div class="clr-row header-row">
+    <div class="clr-col-6">
+      <h3 class="chart-title">{{charttitle || 'Bubble Chart'}}</h3>
+    </div>
+    <div class="clr-col-6" style="text-align: right;">
+      <!-- Add drilldown navigation controls -->
+      <button class="btn btn-sm btn-link" *ngIf="drilldownEnabled && drilldownStack.length > 0" (click)="navigateBack()">
+        <cds-icon shape="arrow" direction="left"></cds-icon>
+        Back to {{drilldownStack.length > 1 ? 'Previous Level' : 'Main Data'}}
+      </button>
+    </div>
   </div>
   
-  <!-- Chart display -->
-  <div *ngIf="!noDataAvailable">
+  <!-- Show current drilldown level -->
+  <div class="clr-row" *ngIf="drilldownEnabled && drilldownStack.length > 0">
+    <div class="clr-col-12">
+      <div class="alert alert-info" style="padding: 8px 12px; margin-bottom: 12px;">
+        <div class="alert-items">
+          <div class="alert-item static">
+            <div class="alert-icon-wrapper">
+              <cds-icon class="alert-icon" shape="info-circle"></cds-icon>
+            </div>
+            <span class="alert-text">
+              Drilldown Level: {{currentDrilldownLevel}} 
+              <span *ngIf="drilldownStack.length > 0">
+                (Clicked on: {{drilldownStack[drilldownStack.length - 1].clickedLabel}})
+              </span>
+            </span>
+          </div>
+        </div>
+      </div>
+    </div>
+  </div>
+  
+  <!-- Chart container -->
+  <div style="position: relative; height: calc(100% - 80px); width: 100%; padding: 0 10px 30px 10px;">
+    <!-- Loading indicator -->
+    <div *ngIf="!dataLoaded" style="text-align: center; padding: 20px; color: #666; position: absolute; top: 50%; left: 50%; transform: translate(-50%, -50%); z-index: 10; width: 100%;">
+      Loading data...
+    </div>
+    
+    <!-- No data message -->
+    <div *ngIf="dataLoaded && (noDataAvailable || !isChartDataValid())" style="text-align: center; padding: 20px; color: #666; font-style: italic; position: absolute; top: 50%; left: 50%; transform: translate(-50%, -50%); z-index: 10; width: 100%;">
+      No data available
+    </div>
+    
+    <!-- Chart display - Always render the canvas but conditionally show/hide with CSS -->
     <canvas baseChart
     [datasets]="bubbleChartData"
     [type]="bubbleChartType"
     [options]="bubbleChartOptions"
     (chartHover)="chartHovered($event)"
-    (chartClick)="chartClicked($event)">
+    (chartClick)="chartClicked($event)"
+    [style.visibility]="dataLoaded && !noDataAvailable && isChartDataValid() ? 'visible' : 'hidden'"
+    [style.position]="'absolute'"
+    [style.top]="'0'"
+    [style.left]="'0'"
+    [style.height]="'100%'"
+    [style.width]="'100%'"
+    [style.padding]="'0 10px 20px 10px'">
   </canvas>
   </div>
 </div>
\ No newline at end of file
diff --git a/frontend/angular-clarity-master/src/app/modules/main/builder/dashboardnew/gadgets/bubble-chart/bubble-chart.component.scss b/frontend/angular-clarity-master/src/app/modules/main/builder/dashboardnew/gadgets/bubble-chart/bubble-chart.component.scss
index e69de29..a9282e4 100644
--- a/frontend/angular-clarity-master/src/app/modules/main/builder/dashboardnew/gadgets/bubble-chart/bubble-chart.component.scss
+++ b/frontend/angular-clarity-master/src/app/modules/main/builder/dashboardnew/gadgets/bubble-chart/bubble-chart.component.scss
@@ -0,0 +1,192 @@
+.filter-section {
+  margin-bottom: 20px;
+  padding: 15px;
+  border: 1px solid #ddd;
+  border-radius: 4px;
+  background-color: #f9f9f9;
+}
+
+.filter-group {
+  margin-bottom: 15px;
+  
+  h4 {
+    margin-top: 0;
+    margin-bottom: 10px;
+    color: #333;
+    font-weight: 600;
+  }
+}
+
+.filter-controls {
+  display: flex;
+  flex-wrap: wrap;
+  gap: 15px;
+}
+
+.filter-item {
+  flex: 1 1 300px;
+  min-width: 250px;
+  padding: 10px;
+  background: white;
+  border: 1px solid #e0e0e0;
+  border-radius: 4px;
+}
+
+.filter-label {
+  font-weight: 500;
+  margin-bottom: 8px;
+  color: #555;
+  font-size: 14px;
+}
+
+.filter-input {
+  width: 100%;
+  
+  .filter-text-input,
+  .filter-select,
+  .filter-date {
+    width: 100%;
+    padding: 6px 12px;
+    border: 1px solid #ccc;
+    border-radius: 4px;
+    font-size: 14px;
+  }
+  
+  .filter-select {
+    height: 34px;
+  }
+}
+
+.multiselect-container {
+  position: relative;
+}
+
+.multiselect-display {
+  display: flex;
+  align-items: center;
+  justify-content: space-between;
+  padding: 6px 12px;
+  border: 1px solid #ccc;
+  border-radius: 4px;
+  background: white;
+  cursor: pointer;
+  min-height: 34px;
+  
+  .multiselect-label {
+    flex: 1;
+    font-size: 14px;
+  }
+  
+  .multiselect-value {
+    color: #666;
+    font-size: 12px;
+    margin-right: 8px;
+  }
+  
+  .dropdown-icon {
+    flex-shrink: 0;
+    transition: transform 0.2s ease;
+  }
+  
+  &:hover {
+    border-color: #999;
+  }
+}
+
+.multiselect-dropdown {
+  position: absolute;
+  top: 100%;
+  left: 0;
+  right: 0;
+  z-index: 1000;
+  background: white;
+  border: 1px solid #ccc;
+  border-top: none;
+  border-radius: 0 0 4px 4px;
+  box-shadow: 0 2px 4px rgba(0,0,0,0.1);
+  max-height: 200px;
+  overflow-y: auto;
+  
+  .checkbox-group {
+    padding: 8px;
+    
+    .checkbox-item {
+      display: flex;
+      align-items: center;
+      gap: 8px;
+      padding: 4px 0;
+      
+      .checkbox-label {
+        margin: 0;
+        font-size: 14px;
+        cursor: pointer;
+      }
+    }
+  }
+}
+
+.date-range {
+  .date-input-group {
+    display: flex;
+    align-items: center;
+    gap: 8px;
+  }
+  
+  .date-separator {
+    margin: 0 5px;
+    color: #777;
+  }
+}
+
+.toggle {
+  display: flex;
+  align-items: center;
+  gap: 8px;
+  
+  .toggle-label {
+    margin: 0;
+    font-size: 14px;
+    cursor: pointer;
+  }
+}
+
+.filter-actions {
+  margin-top: 15px;
+  padding-top: 15px;
+  border-top: 1px solid #eee;
+  
+  .btn {
+    font-size: 13px;
+  }
+}
+
+// New header row styling
+.header-row {
+  margin-bottom: 15px;
+  padding-bottom: 10px;
+  border-bottom: 1px solid #eee;
+  
+  .chart-title {
+    margin: 0;
+    font-size: 18px;
+    font-weight: 600;
+    color: #333;
+  }
+}
+
+// Responsive design
+@media (max-width: 768px) {
+  .filter-controls {
+    flex-direction: column;
+  }
+  
+  .filter-item {
+    min-width: 100%;
+  }
+  
+  .header-row {
+    .chart-title {
+      font-size: 16px;
+    }
+  }
+}
\ No newline at end of file
diff --git a/frontend/angular-clarity-master/src/app/modules/main/builder/dashboardnew/gadgets/bubble-chart/bubble-chart.component.ts b/frontend/angular-clarity-master/src/app/modules/main/builder/dashboardnew/gadgets/bubble-chart/bubble-chart.component.ts
index d23e208..bd9d0fc 100644
--- a/frontend/angular-clarity-master/src/app/modules/main/builder/dashboardnew/gadgets/bubble-chart/bubble-chart.component.ts
+++ b/frontend/angular-clarity-master/src/app/modules/main/builder/dashboardnew/gadgets/bubble-chart/bubble-chart.component.ts
@@ -1,6 +1,8 @@
 import { Component, OnInit, Input, OnChanges, SimpleChanges } from '@angular/core';
 import { ChartConfiguration, ChartDataset, ChartOptions } from 'chart.js';
 import { Dashboard3Service } from 'src/app/services/builder/dashboard3.service';
+import { FilterService } from '../../common-filter/filter.service';
+import { Subscription } from 'rxjs';
 
 @Component({
   selector: 'app-bubble-chart',
@@ -35,55 +37,77 @@ export class BubbleChartComponent implements OnInit, OnChanges {
   @Input() drilldownLayers: any[] = []; // Array of drilldown layer configurations
 
   public bubbleChartOptions: ChartConfiguration['options'] = {
-    // scales: {
-    //   x: {
-    //     min: 0,
-    //     max: 30,
-    //     ticks: {}
-    //   },
-    //   y: {
-    //     min: 0,
-    //     max: 30,
-    //     ticks: {}
-    //   },
-    //   plugins: {
-    //     title: {
-    //       display: true,
-    //       text: 'Bubble Chart'
-    //     }
-    //   }
-    // }
+    responsive: true,
+    maintainAspectRatio: false,
+    scales: {
+      x: {
+        beginAtZero: true,
+        title: {
+          display: true,
+          text: 'X Axis'
+        },
+        ticks: {
+          autoSkip: false,
+          maxRotation: 45,
+          minRotation: 45
+        }
+      },
+      y: {
+        beginAtZero: true,
+        title: {
+          display: true,
+          text: 'Y Axis'
+        }
+      }
+    },
+    plugins: {
+      legend: {
+        display: true,
+        position: 'top',
+      },
+      tooltip: {
+        enabled: true,
+        mode: 'point',
+        intersect: false,
+        callbacks: {
+          label: function(context: any) {
+            const point: any = context.raw;
+            if (point && point.hasOwnProperty('y') && point.hasOwnProperty('r')) {
+              const yValue = parseFloat(point.y);
+              const rValue = parseFloat(point.r);
+              if (!isNaN(yValue) && !isNaN(rValue)) {
+                return `Value: ${yValue.toFixed(2)}, Size: ${rValue.toFixed(1)}`;
+              }
+            }
+            return context.dataset.label || '';
+          }
+        }
+      }
+    },
+    animation: {
+      duration: 800,
+      easing: 'easeInOutQuart'
+    },
+    // Enable individual point styling
+    elements: {
+      point: {
+        hoverRadius: 12,
+        hoverBorderWidth: 3
+      }
+    },
+    // Add padding to ensure x-axis labels are visible
+    layout: {
+      padding: {
+        left: 10,
+        right: 10,
+        top: 10,
+        bottom: 30
+      }
+    }
   };
 
   public bubbleChartType: string = 'bubble';
-  public bubbleChartData: ChartDataset[] = [
-    {
-      data: [
-        { x: 10, y: 10, r: 10 },
-        { x: 15, y: 5, r: 15 },
-        { x: 26, y: 12, r: 23 },
-        { x: 7, y: 8, r: 8 },
-      ],
-      label: 'Investment Equities',
-      backgroundColor: 'rgba(255, 0, 0, 0.6)', // Red
-      borderColor: 'blue',
-      hoverBackgroundColor: 'purple',
-      hoverBorderColor: 'red',
-    },
-    {
-      data: [
-        { x: 5, y: 15, r: 12 },
-        { x: 20, y: 7, r: 8 },
-        { x: 12, y: 18, r: 15 },
-        { x: 8, y: 6, r: 10 },
-      ],
-      label: 'Investment Bonds',
-      backgroundColor: 'rgba(0, 255, 0, 0.6)', // Green
-      borderColor: 'green',
-      hoverBackgroundColor: 'yellow',
-      hoverBorderColor: 'blue',
-    },
-  ];
+  public bubbleChartData: ChartDataset[] = [];
   
   // Multi-layer drilldown state tracking
   drilldownStack: any[] = []; // Stack to track drilldown navigation history
@@ -92,19 +116,45 @@ export class BubbleChartComponent implements OnInit, OnChanges {
   
   // No data state
   noDataAvailable: boolean = false;
+  dataLoaded: boolean = false; // Track if data has been loaded
   
   // Flag to prevent infinite loops
   private isFetchingData: boolean = false;
+  
+  // Subscriptions to unsubscribe on destroy
+  private subscriptions: Subscription[] = [];
 
-  constructor(private dashboardService: Dashboard3Service) { }
+  // Add properties for filter functionality
+  private openMultiselects: Map<string, string> = new Map(); // Map of filterId -> context
+  private documentClickHandler: ((event: MouseEvent) => void) | null = null;
+  private filtersInitialized: boolean = false;
+
+  constructor(
+    private dashboardService: Dashboard3Service,
+    private filterService: FilterService
+  ) { }
 
   ngOnInit(): void {
+    // Subscribe to filter changes
+    this.subscriptions.push(
+      this.filterService.filterState$.subscribe(filters => {
+        // When filters change, refresh the chart data
+        this.fetchChartData();
+      })
+    );
+    
     this.fetchChartData();
   }
 
   ngOnChanges(changes: SimpleChanges): void {
     console.log('BubbleChartComponent input changes:', changes);
     
+    // Initialize filter values if they haven't been initialized yet
+    if (!this.filtersInitialized && (changes.baseFilters || changes.drilldownFilters || changes.drilldownLayers)) {
+      this.initializeFilterValues();
+      this.filtersInitialized = true;
+    }
+    
     // Check if any of the key properties have changed
     const xAxisChanged = changes.xAxis && !changes.xAxis.firstChange;
     const yAxisChanged = changes.yAxis && !changes.yAxis.firstChange;
@@ -127,13 +177,561 @@ export class BubbleChartComponent implements OnInit, OnChanges {
       this.fetchChartData();
     }
   }
+  
+  // Initialize filter values with proper default values based on type
+  private initializeFilterValues(): void {
+    console.log('Initializing filter values');
+    
+    // Initialize base filters
+    if (this.baseFilters) {
+      this.baseFilters.forEach(filter => {
+        if (filter.value === undefined || filter.value === null) {
+          switch (filter.type) {
+            case 'multiselect':
+              filter.value = [];
+              break;
+            case 'date-range':
+              filter.value = { start: null, end: null };
+              break;
+            case 'toggle':
+              filter.value = false;
+              break;
+            default:
+              filter.value = '';
+          }
+        }
+      });
+    }
+    
+    // Initialize drilldown filters
+    if (this.drilldownFilters) {
+      this.drilldownFilters.forEach(filter => {
+        if (filter.value === undefined || filter.value === null) {
+          switch (filter.type) {
+            case 'multiselect':
+              filter.value = [];
+              break;
+            case 'date-range':
+              filter.value = { start: null, end: null };
+              break;
+            case 'toggle':
+              filter.value = false;
+              break;
+            default:
+              filter.value = '';
+          }
+        }
+      });
+    }
+    
+    // Initialize layer filters
+    if (this.drilldownLayers) {
+      this.drilldownLayers.forEach(layer => {
+        if (layer.filters) {
+          layer.filters.forEach((filter: any) => {
+            if (filter.value === undefined || filter.value === null) {
+              switch (filter.type) {
+                case 'multiselect':
+                  filter.value = [];
+                  break;
+                case 'date-range':
+                  filter.value = { start: null, end: null };
+                  break;
+                case 'toggle':
+                  filter.value = false;
+                  break;
+                default:
+                  filter.value = '';
+              }
+            }
+          });
+        }
+      });
+    }
+    
+    console.log('Filter values initialized:', {
+      baseFilters: this.baseFilters,
+      drilldownFilters: this.drilldownFilters,
+      drilldownLayers: this.drilldownLayers
+    });
+  }
+
+  // Check if there are active filters
+  hasActiveFilters(): boolean {
+    return (this.baseFilters && this.baseFilters.length > 0) || 
+           (this.drilldownFilters && this.drilldownFilters.length > 0) || 
+           this.hasActiveLayerFilters();
+  }
+
+  // Check if there are active layer filters for current drilldown level
+  hasActiveLayerFilters(): boolean {
+    if (this.currentDrilldownLevel > 1 && this.drilldownLayers && this.drilldownLayers.length > 0) {
+      const layerIndex = this.currentDrilldownLevel - 2; // -2 because level 1 is base drilldown
+      return layerIndex < this.drilldownLayers.length && 
+             this.drilldownLayers[layerIndex].filters && 
+             this.drilldownLayers[layerIndex].filters.length > 0;
+    }
+    return false;
+  }
+
+  // Get active layer filters for current drilldown level
+  getActiveLayerFilters(): any[] {
+    if (this.currentDrilldownLevel > 1 && this.drilldownLayers && this.drilldownLayers.length > 0) {
+      const layerIndex = this.currentDrilldownLevel - 2; // -2 because level 1 is base drilldown
+      if (layerIndex < this.drilldownLayers.length && 
+          this.drilldownLayers[layerIndex].filters) {
+        return this.drilldownLayers[layerIndex].filters;
+      }
+    }
+    return [];
+  }
+
+  // Get filter options for dropdown/multiselect filters
+  getFilterOptions(filter: any): string[] {
+    if (filter.options) {
+      if (Array.isArray(filter.options)) {
+        return filter.options;
+      } else if (typeof filter.options === 'string') {
+        return filter.options.split(',').map(opt => opt.trim()).filter(opt => opt);
+      }
+    }
+    return [];
+  }
+
+  // Check if an option is selected for multiselect filters
+  isOptionSelected(filter: any, option: string): boolean {
+    if (!filter.value) {
+      return false;
+    }
+    
+    if (Array.isArray(filter.value)) {
+      return filter.value.includes(option);
+    }
+    
+    return filter.value === option;
+  }
+
+  // Handle base filter changes
+  onBaseFilterChange(filter: any): void {
+    console.log('Base filter changed:', filter);
+    // Refresh data when filter changes
+    this.fetchChartData();
+  }
+
+  // Handle drilldown filter changes
+  onDrilldownFilterChange(filter: any): void {
+    console.log('Drilldown filter changed:', filter);
+    // Refresh data when filter changes
+    this.fetchChartData();
+  }
+
+  // Handle layer filter changes
+  onLayerFilterChange(filter: any): void {
+    console.log('Layer filter changed:', filter);
+    // Refresh data when filter changes
+    this.fetchChartData();
+  }
+
+  // Handle multiselect changes
+  onMultiSelectChange(filter: any, option: string, event: any): void {
+    const checked = event.target.checked;
+    
+    // Initialize filter.value as array if it's not already
+    if (!Array.isArray(filter.value)) {
+      filter.value = [];
+    }
+    
+    if (checked) {
+      // Add option to array if not already present
+      if (!filter.value.includes(option)) {
+        filter.value.push(option);
+      }
+    } else {
+      // Remove option from array
+      filter.value = filter.value.filter((item: string) => item !== option);
+    }
+    
+    // Refresh data when filter changes
+    this.fetchChartData();
+  }
+
+  // Handle date range changes
+  onDateRangeChange(filter: any, dateRange: { start: string | null, end: string | null }): void {
+    filter.value = dateRange;
+    // Refresh data when filter changes
+    this.fetchChartData();
+  }
+
+  // Handle toggle changes
+  onToggleChange(filter: any, checked: boolean): void {
+    filter.value = checked;
+    // Refresh data when filter changes
+    this.fetchChartData();
+  }
+
+  // Toggle multiselect dropdown visibility
+  toggleMultiselect(filter: any, context: string): void {
+    const filterId = `${context}-${filter.field}`;
+    if (this.isMultiselectOpen(filter, context)) {
+      this.openMultiselects.delete(filterId);
+    } else {
+      // Close all other multiselects first
+      this.openMultiselects.clear();
+      this.openMultiselects.set(filterId, context);
+      
+      // Add document click handler to close dropdown when clicking outside
+      this.addDocumentClickHandler();
+    }
+  }
+
+  // Add document click handler to close dropdowns when clicking outside
+  private addDocumentClickHandler(): void {
+    if (!this.documentClickHandler) {
+      this.documentClickHandler = (event: MouseEvent) => {
+        const target = event.target as HTMLElement;
+        // Check if click is outside any multiselect dropdown
+        if (!target.closest('.multiselect-container')) {
+          this.openMultiselects.clear();
+          this.removeDocumentClickHandler();
+        }
+      };
+      
+      // Use setTimeout to ensure the click event that opened the dropdown doesn't immediately close it
+      setTimeout(() => {
+        document.addEventListener('click', this.documentClickHandler!);
+      }, 0);
+    }
+  }
+
+  // Remove document click handler
+  private removeDocumentClickHandler(): void {
+    if (this.documentClickHandler) {
+      document.removeEventListener('click', this.documentClickHandler);
+      this.documentClickHandler = null;
+    }
+  }
+
+  // Check if multiselect dropdown is open
+  isMultiselectOpen(filter: any, context: string): boolean {
+    const filterId = `${context}-${filter.field}`;
+    return this.openMultiselects.has(filterId);
+  }
+
+  // Get count of selected options for a multiselect filter
+  getSelectedOptionsCount(filter: any): number {
+    if (!filter.value) {
+      return 0;
+    }
+    
+    if (Array.isArray(filter.value)) {
+      return filter.value.length;
+    }
+    
+    return 0;
+  }
+
+  // Clear all filters
+  clearAllFilters(): void {
+    // Clear base filters
+    if (this.baseFilters) {
+      this.baseFilters.forEach(filter => {
+        if (filter.type === 'multiselect') {
+          filter.value = [];
+        } else if (filter.type === 'date-range') {
+          filter.value = { start: null, end: null };
+        } else if (filter.type === 'toggle') {
+          filter.value = false;
+        } else {
+          filter.value = '';
+        }
+      });
+    }
+    
+    // Clear drilldown filters
+    if (this.drilldownFilters) {
+      this.drilldownFilters.forEach(filter => {
+        if (filter.type === 'multiselect') {
+          filter.value = [];
+        } else if (filter.type === 'date-range') {
+          filter.value = { start: null, end: null };
+        } else if (filter.type === 'toggle') {
+          filter.value = false;
+        } else {
+          filter.value = '';
+        }
+      });
+    }
+    
+    // Clear layer filters
+    if (this.drilldownLayers) {
+      this.drilldownLayers.forEach(layer => {
+        if (layer.filters) {
+          layer.filters.forEach((filter: any) => {
+            if (filter.type === 'multiselect') {
+              filter.value = [];
+            } else if (filter.type === 'date-range') {
+              filter.value = { start: null, end: null };
+            } else if (filter.type === 'toggle') {
+              filter.value = false;
+            } else {
+              filter.value = '';
+            }
+          });
+        }
+      });
+    }
+    
+    // Close all multiselect dropdowns
+    this.openMultiselects.clear();
+    
+    // Refresh data
+    this.fetchChartData();
+  }
+  
+  // Helper function to replace alpha value in RGBA color string
+  private replaceAlpha(color: string, newAlpha: number): string {
+    // Match rgba(r, g, b, a) format and replace alpha value
+    return color.replace(/rgba\((\d+),\s*(\d+),\s*(\d+),\s*[\d.]+\)/, `rgba($1, $2, $3, ${newAlpha})`);
+  }
+  
+  // Function to generate different colors for bubbles
+  private generateBubbleColor(index: number, value: number, total: number): string {
+    // Generate colors based on index or value
+    // Using HSL color model for better color distribution
+    const hue = (index * 137.508) % 360; // Golden angle approximation for good distribution
+    const saturation = 80 + (index % 20); // High saturation for vibrant colors
+    const lightness = 40 + (index % 30); // Vary lightness for contrast
+    
+    // Convert HSL to RGB
+    const h = hue / 360;
+    const s = saturation / 100;
+    const l = lightness / 100;
+    
+    const rgb = this.hslToRgb(h, s, l);
+    return `rgba(${rgb.r}, ${rgb.g}, ${rgb.b}, 0.7)`;
+  }
+  
+  // Helper function to convert HSL to RGB
+  private hslToRgb(h: number, s: number, l: number): { r: number, g: number, b: number } {
+    let r, g, b;
+    
+    if (s === 0) {
+      r = g = b = l; // achromatic
+    } else {
+      const hue2rgb = (p: number, q: number, t: number) => {
+        if (t < 0) t += 1;
+        if (t > 1) t -= 1;
+        if (t < 1/6) return p + (q - p) * 6 * t;
+        if (t < 1/2) return q;
+        if (t < 2/3) return p + (q - p) * (2/3 - t) * 6;
+        return p;
+      };
+      
+      const q = l < 0.5 ? l * (1 + s) : l + s - l * s;
+      const p = 2 * l - q;
+      r = hue2rgb(p, q, h + 1/3);
+      g = hue2rgb(p, q, h);
+      b = hue2rgb(p, q, h - 1/3);
+    }
+    
+    return {
+      r: Math.round(r * 255),
+      g: Math.round(g * 255),
+      b: Math.round(b * 255)
+    };
+  }
+  
+  // Helper function to calculate logarithmic scaling
+  private logScale(value: number, min: number, max: number, minRadius: number, maxRadius: number): number {
+    if (min === max) return (minRadius + maxRadius) / 2;
+    
+    // Normalize value to 0-1 range
+    const normalized = (value - min) / (max - min);
+    
+    // Apply logarithmic scaling (base 10)
+    // Add 1 to avoid log(0) and scale to 1-10 range
+    const logValue = Math.log10(normalized * 9 + 1);
+    
+    // Scale to desired radius range
+    return minRadius + (logValue / Math.log10(10)) * (maxRadius - minRadius);
+  }
+  
+  // Transform data to bubble chart format
+  private transformToBubbleData(labels: any[], data: any[]): ChartDataset[] {
+    // For bubble charts, we need to transform the data into bubble format
+    // Bubble charts expect data in the format: {x: number, y: number, r: number}
+    console.log('Transforming data to bubble format:', { labels, data });
+    
+    // Handle null/undefined data
+    if (!labels || !data) {
+      console.log('Labels or data is null/undefined, returning empty dataset');
+      return [];
+    }
+    
+    // If we have the expected bubble data format, return it as is
+    if (data && data.length > 0 && data[0].data && data[0].data.length > 0 && 
+        typeof data[0].data[0] === 'object' && data[0].data[0].hasOwnProperty('x') && 
+        data[0].data[0].hasOwnProperty('y') && data[0].data[0].hasOwnProperty('r')) {
+      console.log('Data is already in bubble format, returning as is');
+      return data;
+    }
+    
+    // Transform the data properly for bubble chart
+    // Assuming labels are x-values and data[0].data are y-values
+    if (labels && data && data.length > 0 && data[0].data) {
+      console.log('Transforming regular data to bubble format');
+      const yValues = data[0].data;
+      const label = data[0].label || 'Dataset 1';
+      
+      // Handle case where yValues might not be an array
+      if (!Array.isArray(yValues)) {
+        console.log('yValues is not an array, returning empty dataset');
+        return [];
+      }
+      
+      console.log('yValues type:', typeof yValues);
+      console.log('yValues length:', yValues.length);
+      console.log('First few yValues:', yValues.slice(0, 5));
+      
+      // Find min and max values for scaling
+      let minValue = Infinity;
+      let maxValue = -Infinity;
+      const validYValues = [];
+      
+      // First pass: collect valid values and find min/max
+      for (let i = 0; i < yValues.length; i++) {
+        let y;
+        if (typeof yValues[i] === 'string') {
+          y = parseFloat(yValues[i]);
+        } else {
+          y = yValues[i];
+        }
+        
+        if (!isNaN(y)) {
+          validYValues.push(y);
+          minValue = Math.min(minValue, y);
+          maxValue = Math.max(maxValue, y);
+        }
+      }
+      
+      console.log('Value range:', { minValue, maxValue });
+      
+      // Adjust radius range based on number of data points
+      // For fewer points, we can use larger bubbles; for more points, smaller bubbles to prevent overlap
+      const dataPointCount = Math.min(labels.length, yValues.length);
+      let minRadius = 3;
+      let maxRadius = 30;
+      
+      // Adjust radius range based on data point count
+      if (dataPointCount > 50) {
+        minRadius = 2;
+        maxRadius = 20;
+      } else if (dataPointCount > 20) {
+        minRadius = 3;
+        maxRadius = 25;
+      }
+      
+      console.log('Radius range:', { minRadius, maxRadius, dataPointCount });
+      
+      // Create bubble points from labels (x) and data (y)
+      const bubblePoints = [];
+      const bubbleColors = [];
+      const minLength = Math.min(labels.length, yValues.length);
+      
+      console.log('Processing data points:', { labels, yValues, minLength });
+      
+      for (let i = 0; i < minLength; i++) {
+        // Log each point for debugging
+        console.log(`Processing point ${i}: label=${labels[i]}, yValue=${yValues[i]}, type=${typeof yValues[i]}`);
+        
+        // Convert y to number if it's a string
+        let y;
+        if (typeof yValues[i] === 'string') {
+          y = parseFloat(yValues[i]);
+          console.log(`Converted string yValue to number: ${yValues[i]} -> ${y}`);
+        } else {
+          y = yValues[i];
+        }
+        
+        // Handle NaN values
+        if (isNaN(y)) {
+          console.log(`Skipping point ${i} due to NaN y value: ${yValues[i]}`);
+          continue;
+        }
+        
+        // Calculate radius based on the y-value with logarithmic scaling
+        const r = this.logScale(y, minValue, maxValue, minRadius, maxRadius);
+        
+        console.log(`Value: ${y}, Radius: ${r}`);
+        
+        // For x-value, we'll use the index position since labels are strings
+        const x = i;
+        
+        // Generate a unique color for this bubble
+        const backgroundColor = this.generateBubbleColor(i, y, minLength);
+        
+        // Store the color for the dataset
+        bubbleColors.push(backgroundColor);
+        
+        // Add the point
+        const point = { 
+          x, 
+          y, 
+          r
+        };
+        console.log(`Adding point ${i}:`, point);
+        bubblePoints.push(point);
+      }
+      
+      console.log('Generated bubble points:', bubblePoints);
+      console.log('Generated bubble points count:', bubblePoints.length);
+      console.log('Generated bubble colors count:', bubbleColors.length);
+      
+      // If we have no valid points, return empty array
+      if (bubblePoints.length === 0) {
+        console.log('No valid bubble points generated, returning empty dataset');
+        return [];
+      }
+      
+      // Create a single dataset with all bubble points
+      const bubbleDatasets: ChartDataset[] = [
+        {
+          data: bubblePoints,
+          label: label,
+          backgroundColor: bubbleColors,
+          borderColor: bubbleColors.map(color => this.replaceAlpha(color, 1)), // Slightly more opaque border
+          hoverBackgroundColor: bubbleColors.map(color => this.replaceAlpha(color, 0.9)),
+          hoverBorderColor: 'rgba(255, 255, 255, 1)',
+          borderWidth: 2,
+          pointHoverRadius: 10,
+        }
+      ];
+      
+      console.log('Transformed bubble data:', bubbleDatasets);
+      return bubbleDatasets;
+    }
+    
+    console.log('Could not transform data, returning empty dataset');
+    // Return empty dataset instead of default data
+    return [];
+  }
 
   fetchChartData(): void {
     // Set flag to prevent recursive calls
     this.isFetchingData = true;
+    this.dataLoaded = false; // Mark data as not loaded yet
+    this.noDataAvailable = false; // Reset no data flag
+    
+    console.log('Starting fetchChartData, current state:', {
+      table: this.table,
+      xAxis: this.xAxis,
+      yAxis: this.yAxis,
+      connection: this.connection
+    });
     
     // If we're in drilldown mode, fetch the appropriate drilldown data
     if (this.currentDrilldownLevel > 0 && this.drilldownStack.length > 0) {
+      console.log('Fetching drilldown data');
       this.fetchDrilldownData();
       // Reset flag after fetching
       this.isFetchingData = false;
@@ -160,7 +758,49 @@ export class BubbleChartComponent implements OnInit, OnChanges {
           filterParams = JSON.stringify(filterObj);
         }
       }
-      console.log('Base filter parameters:', filterParams);
+      
+      // Add common filters to filter parameters
+      const commonFilters = this.filterService.getFilterValues();
+      console.log('Common filters from service:', commonFilters);
+      
+      if (Object.keys(commonFilters).length > 0) {
+        // Merge common filters with base filters
+        const mergedFilterObj = {};
+        
+        // Add base filters first
+        if (filterParams) {
+          try {
+            const baseFilterObj = JSON.parse(filterParams);
+            Object.assign(mergedFilterObj, baseFilterObj);
+          } catch (e) {
+            console.warn('Failed to parse base filter parameters:', e);
+          }
+        }
+        
+        // Add common filters using the field name as the key, not the filter id
+        Object.keys(commonFilters).forEach(filterId => {
+          const filterValue = commonFilters[filterId];
+          // Find the filter definition to get the field name
+          const filterDef = this.filterService.getFilters().find(f => f.id === filterId);
+          if (filterDef && filterDef.field) {
+            const fieldName = filterDef.field;
+            if (filterValue !== undefined && filterValue !== null && filterValue !== '') {
+              mergedFilterObj[fieldName] = filterValue;
+            }
+          } else {
+            // Fallback to using filterId as field name if no field is defined
+            if (filterValue !== undefined && filterValue !== null && filterValue !== '') {
+              mergedFilterObj[filterId] = filterValue;
+            }
+          }
+        });
+        
+        if (Object.keys(mergedFilterObj).length > 0) {
+          filterParams = JSON.stringify(mergedFilterObj);
+        }
+      }
+      
+      console.log('Final filter parameters:', filterParams);
       
       // Log the URL that will be called
       const url = `chart/getdashjson/bubble?tableName=${this.table}&xAxis=${this.xAxis}&yAxes=${yAxisString}${this.connection ? `&sureId=${this.connection}` : ''}`;
@@ -171,32 +811,82 @@ export class BubbleChartComponent implements OnInit, OnChanges {
       this.dashboardService.getChartData(this.table, 'bubble', this.xAxis, yAxisString, this.connection, '', '', filterParams).subscribe(
         (data: any) => {
           console.log('Received bubble chart data:', data);
-          if (data === null) {
-            console.warn('Bubble chart API returned null data. Check if the API endpoint is working correctly.');
-            this.noDataAvailable = true;
-            this.bubbleChartData = [];
-            // Reset flag after fetching
-            this.isFetchingData = false;
-            return;
-          }
           
-          // Handle the actual data structure returned by the API
-          if (data && data.chartLabels && data.chartData) {
+          // Reset chart data to empty first
+          this.bubbleChartData = [];
+          
+          if (data === null || data === undefined) {
+            console.warn('Bubble chart API returned null/undefined data. Check if the API endpoint is working correctly.');
+            this.noDataAvailable = true;
+          } else if (data && data.chartLabels && data.chartData) {
             // For bubble charts, we need to transform the data into bubble format
             // Bubble charts expect data in the format: {x: number, y: number, r: number}
-            this.noDataAvailable = data.chartLabels.length === 0;
-            this.bubbleChartData = this.transformToBubbleData(data.chartLabels, data.chartData);
-            console.log('Updated bubble chart with data:', this.bubbleChartData);
+            console.log('Processing chartLabels and chartData format');
+            const transformedData = this.transformToBubbleData(data.chartLabels, data.chartData);
+            console.log('Transformed data:', transformedData);
+            
+            // Check if we have valid data
+            let hasValidData = false;
+            if (transformedData && transformedData.length > 0) {
+              for (const dataset of transformedData) {
+                if (dataset.data && dataset.data.length > 0) {
+                  hasValidData = true;
+                  break;
+                }
+              }
+            }
+            
+            if (hasValidData) {
+              // Create a new array reference to trigger change detection
+              this.bubbleChartData = [...transformedData];
+              this.noDataAvailable = false;
+              console.log('Updated bubble chart with data:', this.bubbleChartData);
+            } else {
+              console.log('No valid data after transformation');
+              this.noDataAvailable = true;
+            }
           } else if (data && data.labels && data.datasets) {
             // Handle the original expected format as fallback
-            this.noDataAvailable = data.labels.length === 0;
-            this.bubbleChartData = data.datasets;
-            console.log('Updated bubble chart with legacy data format:', this.bubbleChartData);
+            console.log('Processing labels and datasets format');
+            // Check if we have valid data
+            let hasValidData = false;
+            if (data.datasets && data.datasets.length > 0) {
+              for (const dataset of data.datasets) {
+                if (dataset.data && dataset.data.length > 0) {
+                  hasValidData = true;
+                  break;
+                }
+              }
+            }
+            
+            if (hasValidData) {
+              // Create a new array reference to trigger change detection
+              this.bubbleChartData = [...data.datasets];
+              this.noDataAvailable = false;
+              console.log('Updated bubble chart with legacy data format:', this.bubbleChartData);
+            } else {
+              console.log('No valid data in legacy format');
+              this.noDataAvailable = true;
+            }
           } else {
             console.warn('Bubble chart received data does not have expected structure', data);
             this.noDataAvailable = true;
-            this.bubbleChartData = [];
           }
+          
+          this.dataLoaded = true; // Mark data as loaded
+          
+          console.log('Final state after data fetch:', {
+            noDataAvailable: this.noDataAvailable,
+            dataLoaded: this.dataLoaded,
+            bubbleChartDataLength: this.bubbleChartData.length,
+            isChartDataValid: this.isChartDataValid()
+          });
+          
+          // Trigger change detection with a small delay to ensure proper rendering
+          setTimeout(() => {
+            this.forceChartUpdate();
+          }, 100);
+          
           // Reset flag after fetching
           this.isFetchingData = false;
         },
@@ -204,6 +894,11 @@ export class BubbleChartComponent implements OnInit, OnChanges {
           console.error('Error fetching bubble chart data:', error);
           this.noDataAvailable = true;
           this.bubbleChartData = [];
+          this.dataLoaded = true;
+          // Trigger change detection
+          setTimeout(() => {
+            this.forceChartUpdate();
+          }, 100);
           // Reset flag after fetching
           this.isFetchingData = false;
         }
@@ -212,6 +907,11 @@ export class BubbleChartComponent implements OnInit, OnChanges {
       console.log('Missing required data for bubble chart:', { table: this.table, xAxis: this.xAxis, yAxis: this.yAxis, connection: this.connection });
       this.noDataAvailable = true;
       this.bubbleChartData = [];
+      this.dataLoaded = true;
+      // Trigger change detection
+      setTimeout(() => {
+        this.forceChartUpdate();
+      }, 100);
       // Reset flag after fetching
       this.isFetchingData = false;
     }
@@ -241,6 +941,10 @@ export class BubbleChartComponent implements OnInit, OnChanges {
         console.warn('Invalid drilldown layer index:', layerIndex);
         this.noDataAvailable = true;
         this.bubbleChartData = [];
+        this.dataLoaded = true;
+        setTimeout(() => {
+          this.forceChartUpdate();
+        }, 100);
         return;
       }
     }
@@ -252,6 +956,10 @@ export class BubbleChartComponent implements OnInit, OnChanges {
       console.warn('Missing drilldown configuration for level:', this.currentDrilldownLevel);
       this.noDataAvailable = true;
       this.bubbleChartData = [];
+      this.dataLoaded = true;
+      setTimeout(() => {
+        this.forceChartUpdate();
+      }, 100);
       return;
     }
     
@@ -307,6 +1015,35 @@ export class BubbleChartComponent implements OnInit, OnChanges {
       }
     }
     
+    // Add common filters to drilldown filter parameters
+    const commonFilters = this.filterService.getFilterValues();
+    if (Object.keys(commonFilters).length > 0) {
+      // Merge common filters with drilldown filters
+      const mergedFilterObj = {};
+      
+      // Add drilldown filters first
+      if (filterParams) {
+        try {
+          const drilldownFilterObj = JSON.parse(filterParams);
+          Object.assign(mergedFilterObj, drilldownFilterObj);
+        } catch (e) {
+          console.warn('Failed to parse drilldown filter parameters:', e);
+        }
+      }
+      
+      // Add common filters
+      Object.keys(commonFilters).forEach(key => {
+        const value = commonFilters[key];
+        if (value !== undefined && value !== null && value !== '') {
+          mergedFilterObj[key] = value;
+        }
+      });
+      
+      if (Object.keys(mergedFilterObj).length > 0) {
+        filterParams = JSON.stringify(mergedFilterObj);
+      }
+    }
+    
     // Log the URL that will be called
     const url = `chart/getdashjson/bubble?tableName=${actualApiUrl}&xAxis=${drilldownConfig.xAxis}&yAxes=${drilldownConfig.yAxis}${this.connection ? `&sureId=${this.connection}` : ''}`;
     console.log('Drilldown data URL:', url);
@@ -316,68 +1053,88 @@ export class BubbleChartComponent implements OnInit, OnChanges {
     this.dashboardService.getChartData(actualApiUrl, 'bubble', drilldownConfig.xAxis, drilldownConfig.yAxis, this.connection, parameterField, parameterValue, filterParams).subscribe(
       (data: any) => {
         console.log('Received drilldown data:', data);
-        if (data === null) {
-          console.warn('Drilldown API returned null data. Check if the API endpoint is working correctly.');
-          this.noDataAvailable = true;
-          this.bubbleChartData = [];
-          return;
-        }
         
-        // Handle the actual data structure returned by the API
-        if (data && data.chartLabels && data.chartData) {
+        // Reset chart data to empty first
+        this.bubbleChartData = [];
+        
+        if (data === null || data === undefined) {
+          console.warn('Drilldown API returned null/undefined data. Check if the API endpoint is working correctly.');
+          this.noDataAvailable = true;
+        } else if (data && data.chartLabels && data.chartData) {
           // For bubble charts, we need to transform the data into bubble format
-          // Bubble charts expect data in the format: {x: number, y: number, r: number}
-          this.noDataAvailable = data.chartLabels.length === 0;
-          this.bubbleChartData = this.transformToBubbleData(data.chartLabels, data.chartData);
-          console.log('Updated bubble chart with drilldown data:', this.bubbleChartData);
+          const transformedData = this.transformToBubbleData(data.chartLabels, data.chartData);
+          
+          // Check if we have valid data
+          let hasValidData = false;
+          if (transformedData && transformedData.length > 0) {
+            for (const dataset of transformedData) {
+              if (dataset.data && dataset.data.length > 0) {
+                hasValidData = true;
+                break;
+              }
+            }
+          }
+          
+          if (hasValidData) {
+            this.bubbleChartData = transformedData;
+            this.noDataAvailable = false;
+            console.log('Updated bubble chart with drilldown data:', this.bubbleChartData);
+          } else {
+            console.log('No valid data after transformation in drilldown');
+            this.noDataAvailable = true;
+          }
         } else if (data && data.labels && data.datasets) {
           // Handle the original expected format as fallback
-          this.noDataAvailable = data.labels.length === 0;
-          this.bubbleChartData = data.datasets;
-          console.log('Updated bubble chart with drilldown legacy data format:', this.bubbleChartData);
+          // Check if we have valid data
+          let hasValidData = false;
+          if (data.datasets && data.datasets.length > 0) {
+            for (const dataset of data.datasets) {
+              if (dataset.data && dataset.data.length > 0) {
+                hasValidData = true;
+                break;
+              }
+            }
+          }
+          
+          if (hasValidData) {
+            this.bubbleChartData = data.datasets;
+            this.noDataAvailable = false;
+            console.log('Updated bubble chart with drilldown legacy data format:', this.bubbleChartData);
+          } else {
+            console.log('No valid data in legacy format in drilldown');
+            this.noDataAvailable = true;
+          }
         } else {
           console.warn('Drilldown received data does not have expected structure', data);
           this.noDataAvailable = true;
-          this.bubbleChartData = [];
         }
+        
+        this.dataLoaded = true; // Mark data as loaded
+        
+        console.log('Final state after drilldown data fetch:', {
+          noDataAvailable: this.noDataAvailable,
+          dataLoaded: this.dataLoaded,
+          bubbleChartDataLength: this.bubbleChartData.length,
+          isChartDataValid: this.isChartDataValid()
+        });
+        
+        // Trigger change detection
+        setTimeout(() => {
+          this.forceChartUpdate();
+        }, 100);
       },
       (error) => {
         console.error('Error fetching drilldown data:', error);
         this.noDataAvailable = true;
         this.bubbleChartData = [];
+        this.dataLoaded = true;
+        setTimeout(() => {
+          this.forceChartUpdate();
+        }, 100);
       }
     );
   }
   
-  // Transform chart data to bubble chart format
-  private transformToBubbleData(labels: string[], datasets: any[]): ChartDataset[] {
-    // For bubble charts, we need to transform the data into bubble format
-    // Bubble charts expect data in the format: {x: number, y: number, r: number}
-    
-    // This is a simple transformation - in a real implementation, you might want to
-    // create a more sophisticated mapping based on your data structure
-    return datasets.map((dataset, index) => {
-      // Create bubble data points
-      const bubbleData = labels.map((label, i) => {
-        // Use x-axis data as x coordinate, y-axis data as y coordinate, and a fixed radius
-        const xValue = dataset.data[i] || 0;
-        const yValue = i < datasets.length ? (datasets[i].data[index] || 0) : 0;
-        const radius = 10; // Fixed radius for now
-        
-        return { x: xValue, y: yValue, r: radius };
-      });
-      
-      return {
-        data: bubbleData,
-        label: dataset.label || `Dataset ${index + 1}`,
-        backgroundColor: dataset.backgroundColor || `rgba(${Math.floor(Math.random() * 255)}, ${Math.floor(Math.random() * 255)}, ${Math.floor(Math.random() * 255)}, 0.6)`,
-        borderColor: dataset.borderColor || 'rgba(0, 0, 0, 1)',
-        hoverBackgroundColor: dataset.hoverBackgroundColor || 'rgba(255, 255, 255, 0.8)',
-        hoverBorderColor: dataset.hoverBorderColor || 'rgba(0, 0, 0, 1)'
-      };
-    });
-  }
-  
   // Reset to original data (go back to base level)
   resetToOriginalData(): void {
     console.log('Resetting to original data');
@@ -438,16 +1195,18 @@ export class BubbleChartComponent implements OnInit, OnChanges {
       // Get the index of the clicked element
       const clickedIndex = e.active[0].index;
       
-      // Get the label of the clicked element
-      // For bubble charts, we might not have labels in the same way as other charts
-      const clickedLabel = `Bubble ${clickedIndex}`;
+      // Get the dataset index
+      const datasetIndex = e.active[0].datasetIndex;
       
-      console.log('Clicked on bubble:', { index: clickedIndex, label: clickedLabel });
+      // Get the data point
+      const dataPoint = this.bubbleChartData[datasetIndex].data[clickedIndex];
+      
+      console.log('Clicked on bubble:', { datasetIndex, clickedIndex, dataPoint });
       
       // If we're not at the base level, store original data
       if (this.currentDrilldownLevel === 0) {
         // Store original data before entering drilldown mode
-        this.originalBubbleChartData = [...this.bubbleChartData];
+        this.originalBubbleChartData = JSON.parse(JSON.stringify(this.bubbleChartData));
         console.log('Stored original data for drilldown');
       }
       
@@ -489,9 +1248,10 @@ export class BubbleChartComponent implements OnInit, OnChanges {
         // Add this click to the drilldown stack
         const stackEntry = {
           level: nextDrilldownLevel,
+          datasetIndex: datasetIndex,
           clickedIndex: clickedIndex,
-          clickedLabel: clickedLabel,
-          clickedValue: clickedLabel // Using label as value for now
+          dataPoint: dataPoint,
+          clickedValue: dataPoint // Using data point as value for now
         };
         
         this.drilldownStack.push(stackEntry);
@@ -515,6 +1275,54 @@ export class BubbleChartComponent implements OnInit, OnChanges {
   }
 
   public chartHovered(e: any): void {
-    console.log(e);
+    console.log('Bubble chart hovered:', e);
+  }
+
+  // Method to check if chart data is valid
+  public isChartDataValid(): boolean {
+    console.log('Checking if chart data is valid:', this.bubbleChartData);
+    if (!this.bubbleChartData || this.bubbleChartData.length === 0) {
+      console.log('Chart data is null or empty');
+      return false;
+    }
+    
+    // Check if any dataset has data
+    for (const dataset of this.bubbleChartData) {
+      console.log('Checking dataset:', dataset);
+      if (dataset.data && dataset.data.length > 0) {
+        console.log('Dataset has data, length:', dataset.data.length);
+        // For bubble charts, check if data points have x, y, r properties
+        for (const point of dataset.data) {
+          console.log('Checking point:', point);
+          if (typeof point === 'object' && point.hasOwnProperty('x') && point.hasOwnProperty('y') && point.hasOwnProperty('r')) {
+            // Valid bubble point
+            console.log('Found valid bubble point');
+            return true;
+          }
+        }
+      }
+    }
+    
+    console.log('No valid chart data found');
+    return false;
+  }
+
+  // Method to force chart update
+  private forceChartUpdate(): void {
+    console.log('Forcing chart update');
+    console.log('Current bubbleChartData:', this.bubbleChartData);
+    console.log('Current bubbleChartData length:', this.bubbleChartData ? this.bubbleChartData.length : 0);
+    if (this.bubbleChartData && this.bubbleChartData.length > 0) {
+      console.log('First dataset data length:', this.bubbleChartData[0].data ? this.bubbleChartData[0].data.length : 0);
+    }
+    // Create a new reference to trigger change detection
+    if (this.bubbleChartData) {
+      this.bubbleChartData = [...this.bubbleChartData];
+    }
+    // Also update noDataAvailable to trigger UI changes
+    this.noDataAvailable = this.noDataAvailable;
+    console.log('Chart update forced, noDataAvailable:', this.noDataAvailable);
+    console.log('Chart update forced, bubbleChartData length:', this.bubbleChartData ? this.bubbleChartData.length : 0);
+    console.log('Chart update forced, isChartDataValid:', this.isChartDataValid());
   }
 }
\ No newline at end of file
diff --git a/frontend/angular-clarity-master/src/app/modules/main/builder/dashboardnew/gadgets/doughnut-chart/doughnut-chart.component.html b/frontend/angular-clarity-master/src/app/modules/main/builder/dashboardnew/gadgets/doughnut-chart/doughnut-chart.component.html
index 0828c55..1acc617 100644
--- a/frontend/angular-clarity-master/src/app/modules/main/builder/dashboardnew/gadgets/doughnut-chart/doughnut-chart.component.html
+++ b/frontend/angular-clarity-master/src/app/modules/main/builder/dashboardnew/gadgets/doughnut-chart/doughnut-chart.component.html
@@ -1,44 +1,315 @@
-<div class="doughnut-chart-container">
-  <!-- Drilldown mode indicator -->
-  <div *ngIf="currentDrilldownLevel > 0" style="background-color: #e0e0e0; padding: 5px; margin-bottom: 10px; border-radius: 4px; text-align: center;">
-    <span style="font-weight: bold; color: #333;">Drilldown Level: {{currentDrilldownLevel}}</span>
-    <button (click)="navigateBack()" style="margin-left: 10px; padding: 2px 8px; background-color: #007cba; color: white; border: none; border-radius: 3px; cursor: pointer;">
-      Back to Level {{currentDrilldownLevel - 1}}
-    </button>
-    <button (click)="resetToOriginalData()" style="margin-left: 10px; padding: 2px 8px; background-color: #dc3545; color: white; border: none; border-radius: 3px; cursor: pointer;">
-      Back to Main View
-    </button>
+<div class="chart-container">
+  <!-- Filter Controls Section -->
+  <div class="filter-section" *ngIf="hasActiveFilters()">
+    <!-- Base Filters -->
+    <div class="filter-group" *ngIf="baseFilters && baseFilters.length > 0">
+      <h4>Base Filters</h4>
+      <div class="filter-controls">
+        <div *ngFor="let filter of baseFilters" class="filter-item">
+          <div class="filter-label">{{ filter.field }} ({{ filter.type || 'text' }})</div>
+          
+          <!-- Text Filter -->
+          <div *ngIf="!filter.type || filter.type === 'text'" class="filter-input">
+            <input type="text" 
+                   [(ngModel)]="filter.value" 
+                   (ngModelChange)="onBaseFilterChange(filter)"
+                   [placeholder]="filter.field"
+                   class="clr-input filter-text-input">
+          </div>
+          
+          <!-- Dropdown Filter -->
+          <div *ngIf="filter.type === 'dropdown'" class="filter-input">
+            <select [(ngModel)]="filter.value" 
+                    (ngModelChange)="onBaseFilterChange(filter)"
+                    class="clr-select filter-select">
+              <option value="">Select {{ filter.field }}</option>
+              <option *ngFor="let option of getFilterOptions(filter)" [value]="option">{{ option }}</option>
+            </select>
+          </div>
+          
+          <!-- Multi-Select Filter - Updated to show key first, then dropdown on click -->
+          <div *ngIf="filter.type === 'multiselect'" class="filter-input multiselect-container">
+            <div class="multiselect-display" (click)="toggleMultiselect(filter, 'base')">
+              <span class="multiselect-label">{{ filter.field }}</span>
+              <span class="multiselect-value" *ngIf="getSelectedOptionsCount(filter) > 0">
+                ({{ getSelectedOptionsCount(filter) }} selected)
+              </span>
+              <clr-icon shape="caret down" class="dropdown-icon"></clr-icon>
+            </div>
+            <div class="multiselect-dropdown" *ngIf="isMultiselectOpen(filter, 'base')">
+              <div class="checkbox-group">
+                <div *ngFor="let option of getFilterOptions(filter); let i = index" class="checkbox-item">
+                  <input type="checkbox" 
+                         [checked]="isOptionSelected(filter, option)" 
+                         (change)="onMultiSelectChange(filter, option, $event)"
+                         [id]="'base-' + filter.field + '-' + i" 
+                         class="clr-checkbox">
+                  <label [for]="'base-' + filter.field + '-' + i" class="checkbox-label">{{ option }}</label>
+                </div>
+              </div>
+            </div>
+          </div>
+          
+          <!-- Date Range Filter -->
+          <div *ngIf="filter.type === 'date-range'" class="filter-input date-range">
+            <div class="date-input-group">
+              <input type="date" 
+                     [(ngModel)]="filter.value.start" 
+                     (ngModelChange)="onDateRangeChange(filter, { start: $event, end: filter.value.end })"
+                     placeholder="Start Date"
+                     class="clr-input filter-date">
+              <span class="date-separator">to</span>
+              <input type="date" 
+                     [(ngModel)]="filter.value.end" 
+                     (ngModelChange)="onDateRangeChange(filter, { start: filter.value.start, end: $event })"
+                     placeholder="End Date"
+                     class="clr-input filter-date">
+            </div>
+          </div>
+          
+          <!-- Toggle Filter -->
+          <div *ngIf="filter.type === 'toggle'" class="filter-input toggle">
+            <input type="checkbox" 
+                   [(ngModel)]="filter.value" 
+                   (ngModelChange)="onToggleChange(filter, $event)"
+                   clrToggle 
+                   class="clr-toggle">
+            <label class="toggle-label">{{ filter.field }}</label>
+          </div>
+        </div>
+      </div>
+    </div>
+    
+    <!-- Drilldown Filters -->
+    <div class="filter-group" *ngIf="drilldownFilters && drilldownFilters.length > 0 && currentDrilldownLevel > 0">
+      <h4>Drilldown Filters</h4>
+      <div class="filter-controls">
+        <div *ngFor="let filter of drilldownFilters" class="filter-item">
+          <div class="filter-label">{{ filter.field }} ({{ filter.type || 'text' }})</div>
+          
+          <!-- Text Filter -->
+          <div *ngIf="!filter.type || filter.type === 'text'" class="filter-input">
+            <input type="text" 
+                   [(ngModel)]="filter.value" 
+                   (ngModelChange)="onDrilldownFilterChange(filter)"
+                   [placeholder]="filter.field"
+                   class="clr-input filter-text-input">
+          </div>
+          
+          <!-- Dropdown Filter -->
+          <div *ngIf="filter.type === 'dropdown'" class="filter-input">
+            <select [(ngModel)]="filter.value" 
+                    (ngModelChange)="onDrilldownFilterChange(filter)"
+                    class="clr-select filter-select">
+              <option value="">Select {{ filter.field }}</option>
+              <option *ngFor="let option of getFilterOptions(filter)" [value]="option">{{ option }}</option>
+            </select>
+          </div>
+          
+          <!-- Multi-Select Filter - Updated to show key first, then dropdown on click -->
+          <div *ngIf="filter.type === 'multiselect'" class="filter-input multiselect-container">
+            <div class="multiselect-display" (click)="toggleMultiselect(filter, 'drilldown')">
+              <span class="multiselect-label">{{ filter.field }}</span>
+              <span class="multiselect-value" *ngIf="getSelectedOptionsCount(filter) > 0">
+                ({{ getSelectedOptionsCount(filter) }} selected)
+              </span>
+              <clr-icon shape="caret down" class="dropdown-icon"></clr-icon>
+            </div>
+            <div class="multiselect-dropdown" *ngIf="isMultiselectOpen(filter, 'drilldown')">
+              <div class="checkbox-group">
+                <div *ngFor="let option of getFilterOptions(filter); let i = index" class="checkbox-item">
+                  <input type="checkbox" 
+                         [checked]="isOptionSelected(filter, option)" 
+                         (change)="onMultiSelectChange(filter, option, $event)"
+                         [id]="'drilldown-' + filter.field + '-' + i" 
+                         class="clr-checkbox">
+                  <label [for]="'drilldown-' + filter.field + '-' + i" class="checkbox-label">{{ option }}</label>
+                </div>
+              </div>
+            </div>
+          </div>
+          
+          <!-- Date Range Filter -->
+          <div *ngIf="filter.type === 'date-range'" class="filter-input date-range">
+            <div class="date-input-group">
+              <input type="date" 
+                     [(ngModel)]="filter.value.start" 
+                     (ngModelChange)="onDateRangeChange(filter, { start: $event, end: filter.value.end })"
+                     placeholder="Start Date"
+                     class="clr-input filter-date">
+              <span class="date-separator">to</span>
+              <input type="date" 
+                     [(ngModel)]="filter.value.end" 
+                     (ngModelChange)="onDateRangeChange(filter, { start: filter.value.start, end: $event })"
+                     placeholder="End Date"
+                     class="clr-input filter-date">
+            </div>
+          </div>
+          
+          <!-- Toggle Filter -->
+          <div *ngIf="filter.type === 'toggle'" class="filter-input toggle">
+            <input type="checkbox" 
+                   [(ngModel)]="filter.value" 
+                   (ngModelChange)="onToggleChange(filter, $event)"
+                   clrToggle 
+                   class="clr-toggle">
+            <label class="toggle-label">{{ filter.field }}</label>
+          </div>
+        </div>
+      </div>
+    </div>
+    
+    <!-- Layer Filters -->
+    <div class="filter-group" *ngIf="hasActiveLayerFilters()">
+      <h4>Layer Filters</h4>
+      <div class="filter-controls">
+        <div *ngFor="let filter of getActiveLayerFilters()" class="filter-item">
+          <div class="filter-label">{{ filter.field }} ({{ filter.type || 'text' }})</div>
+          
+          <!-- Text Filter -->
+          <div *ngIf="!filter.type || filter.type === 'text'" class="filter-input">
+            <input type="text" 
+                   [(ngModel)]="filter.value" 
+                   (ngModelChange)="onLayerFilterChange(filter)"
+                   [placeholder]="filter.field"
+                   class="clr-input filter-text-input">
+          </div>
+          
+          <!-- Dropdown Filter -->
+          <div *ngIf="filter.type === 'dropdown'" class="filter-input">
+            <select [(ngModel)]="filter.value" 
+                    (ngModelChange)="onLayerFilterChange(filter)"
+                    class="clr-select filter-select">
+              <option value="">Select {{ filter.field }}</option>
+              <option *ngFor="let option of getFilterOptions(filter)" [value]="option">{{ option }}</option>
+            </select>
+          </div>
+          
+          <!-- Multi-Select Filter - Updated to show key first, then dropdown on click -->
+          <div *ngIf="filter.type === 'multiselect'" class="filter-input multiselect-container">
+            <div class="multiselect-display" (click)="toggleMultiselect(filter, 'layer')">
+              <span class="multiselect-label">{{ filter.field }}</span>
+              <span class="multiselect-value" *ngIf="getSelectedOptionsCount(filter) > 0">
+                ({{ getSelectedOptionsCount(filter) }} selected)
+              </span>
+              <clr-icon shape="caret down" class="dropdown-icon"></clr-icon>
+            </div>
+            <div class="multiselect-dropdown" *ngIf="isMultiselectOpen(filter, 'layer')">
+              <div class="checkbox-group">
+                <div *ngFor="let option of getFilterOptions(filter); let i = index" class="checkbox-item">
+                  <input type="checkbox" 
+                         [checked]="isOptionSelected(filter, option)" 
+                         (change)="onMultiSelectChange(filter, option, $event)"
+                         [id]="'layer-' + filter.field + '-' + i" 
+                         class="clr-checkbox">
+                  <label [for]="'layer-' + filter.field + '-' + i" class="checkbox-label">{{ option }}</label>
+                </div>
+              </div>
+            </div>
+          </div>
+          
+          <!-- Date Range Filter -->
+          <div *ngIf="filter.type === 'date-range'" class="filter-input date-range">
+            <div class="date-input-group">
+              <input type="date" 
+                     [(ngModel)]="filter.value.start" 
+                     (ngModelChange)="onDateRangeChange(filter, { start: $event, end: filter.value.end })"
+                     placeholder="Start Date"
+                     class="clr-input filter-date">
+              <span class="date-separator">to</span>
+              <input type="date" 
+                     [(ngModel)]="filter.value.end" 
+                     (ngModelChange)="onDateRangeChange(filter, { start: filter.value.start, end: $event })"
+                     placeholder="End Date"
+                     class="clr-input filter-date">
+            </div>
+          </div>
+          
+          <!-- Toggle Filter -->
+          <div *ngIf="filter.type === 'toggle'" class="filter-input toggle">
+            <input type="checkbox" 
+                   [(ngModel)]="filter.value" 
+                   (ngModelChange)="onToggleChange(filter, $event)"
+                   clrToggle 
+                   class="clr-toggle">
+            <label class="toggle-label">{{ filter.field }}</label>
+          </div>
+        </div>
+      </div>
+    </div>
+    
+    <!-- Clear Filters Button -->
+    <div class="filter-actions">
+      <button class="btn btn-sm btn-outline" (click)="clearAllFilters()">Clear All Filters</button>
+    </div>
   </div>
   
-  <h3 class="chart-title" *ngIf="charttitle">{{ charttitle }}</h3>
-  <div class="chart-wrapper">
-    <!-- Show loading indicator -->
-    <div class="loading-indicator" *ngIf="doughnutChartLabels.length === 0 && doughnutChartData.length === 0 && !noDataAvailable">
-      <div class="spinner"></div>
-      <p>Loading chart data...</p>
+  <!-- Header row with chart title and drilldown navigation -->
+  <div class="chart-header">
+    <div class="clr-row header-row">
+      <div class="clr-col-6">
+        <h3 class="chart-title" *ngIf="charttitle">{{ charttitle }}</h3>
+      </div>
+      <div class="clr-col-6" style="text-align: right;">
+        <!-- Add drilldown navigation controls -->
+        <button class="btn btn-sm btn-link" *ngIf="drilldownEnabled && drilldownStack.length > 0" (click)="navigateBack()">
+          <cds-icon shape="arrow" direction="left"></cds-icon>
+          Back to {{drilldownStack.length > 1 ? 'Previous Level' : 'Main Data'}}
+        </button>
+      </div>
     </div>
     
-    <!-- Show no data message -->
-    <div class="no-data-message" *ngIf="noDataAvailable">
-      <p>No chart data available</p>
+    <!-- Show current drilldown level -->
+    <div class="clr-row" *ngIf="drilldownEnabled && drilldownStack.length > 0">
+      <div class="clr-col-12">
+        <div class="alert alert-info" style="padding: 8px 12px; margin-bottom: 12px;">
+          <div class="alert-items">
+            <div class="alert-item static">
+              <div class="alert-icon-wrapper">
+                <cds-icon class="alert-icon" shape="info-circle"></cds-icon>
+              </div>
+              <span class="alert-text">
+                Drilldown Level: {{currentDrilldownLevel}} 
+                <span *ngIf="drilldownStack.length > 0">
+                  (Clicked on: {{drilldownStack[drilldownStack.length - 1].clickedLabel}})
+                </span>
+              </span>
+            </div>
+          </div>
+        </div>
+      </div>
     </div>
-    
-    <!-- Show chart when data is available -->
-    <canvas baseChart 
-      *ngIf="!noDataAvailable && doughnutChartLabels.length > 0 && doughnutChartData.length > 0"
-      [data]="doughnutChartData" 
-      [labels]="doughnutChartLabels" 
-      [type]="doughnutChartType"
-      [options]="doughnutChartOptions"
-      (chartHover)="chartHovered($event)"
-      (chartClick)="chartClicked($event)">
-    </canvas>
   </div>
-  <div class="chart-legend" *ngIf="!noDataAvailable && showlabel && doughnutChartLabels && doughnutChartLabels.length > 0">
+  
+  <div class="chart-wrapper">
+    <div class="chart-content" [class.loading]="isLoading">
+      <!-- Show no data message -->
+      <div class="no-data-message" *ngIf="noDataAvailable && doughnutChartLabels.length === 0">
+        <p>No chart data available</p>
+      </div>
+      
+      <!-- Show chart when data is available -->
+      <canvas baseChart 
+        [datasets]="doughnutChartData" 
+        [labels]="doughnutChartLabels" 
+        [type]="doughnutChartType"
+        [options]="doughnutChartOptions"
+        (chartHover)="chartHovered($event)"
+        (chartClick)="chartClicked($event)">
+      </canvas>
+      
+      <!-- Loading overlay -->
+      <div class="loading-overlay" *ngIf="isLoading">
+        <div class="shimmer-donut"></div>
+      </div>
+    </div>
+  </div>
+  
+  <div class="chart-legend" *ngIf="showlabel && doughnutChartLabels && doughnutChartLabels.length > 0">
     <div class="legend-item" *ngFor="let label of doughnutChartLabels; let i = index">
       <span class="legend-color" [style.background-color]="getLegendColor(i)"></span>
       <span class="legend-label">{{ label }}</span>
-      <span class="legend-value">{{ doughnutChartData && doughnutChartData[i] !== undefined ? doughnutChartData[i] : 0 }}</span>
+      <span class="legend-value">{{ doughnutChartData && doughnutChartData[0] && doughnutChartData[0].data && doughnutChartData[0].data[i] !== undefined ? doughnutChartData[0].data[i] : 0 }}</span>
     </div>
   </div>
 </div>
\ No newline at end of file
diff --git a/frontend/angular-clarity-master/src/app/modules/main/builder/dashboardnew/gadgets/doughnut-chart/doughnut-chart.component.scss b/frontend/angular-clarity-master/src/app/modules/main/builder/dashboardnew/gadgets/doughnut-chart/doughnut-chart.component.scss
index 6212182..f682297 100644
--- a/frontend/angular-clarity-master/src/app/modules/main/builder/dashboardnew/gadgets/doughnut-chart/doughnut-chart.component.scss
+++ b/frontend/angular-clarity-master/src/app/modules/main/builder/dashboardnew/gadgets/doughnut-chart/doughnut-chart.component.scss
@@ -1,184 +1,343 @@
-.doughnut-chart-container {
-  display: flex;
-  flex-direction: column;
-  height: 400px;
-  min-height: 400px;
-  padding: 20px;
-  background: linear-gradient(135deg, #ffffff 0%, #f8f9fa 100%);
-  border-radius: 12px;
-  box-shadow: 0 4px 20px rgba(0, 0, 0, 0.15);
-  font-family: 'Segoe UI', Tahoma, Geneva, Verdana, sans-serif;
-  transition: all 0.3s ease;
-  border: 1px solid #eaeaea;
-}
-
-.doughnut-chart-container:hover {
-  box-shadow: 0 6px 25px rgba(0, 0, 0, 0.2);
-  transform: translateY(-2px);
-}
-
-
-
-.chart-title {
-  font-size: 26px;
-  font-weight: 700;
-  color: #2c3e50;
-  margin-bottom: 20px;
-  text-align: center;
-  padding-bottom: 15px;
-  border-bottom: 2px solid #3498db;
-  text-shadow: 0 1px 2px rgba(0, 0, 0, 0.1);
-}
-
-.chart-wrapper {
-  position: relative;
-  flex: 1;
-  min-height: 250px;
-  margin: 15px 0;
-  background: #f8f9fa;
-  border: 1px solid #e9ecef;
-  border-radius: 8px;
-  padding: 10px;
-  display: flex;
-  align-items: center;
-  justify-content: center;
-}
-
-.chart-wrapper canvas {
-  max-width: 100%;
-  max-height: 100%;
-  filter: drop-shadow(0 2px 4px rgba(0,0,0,0.1));
-}
-
-.chart-wrapper canvas:hover {
-  filter: drop-shadow(0 4px 8px rgba(0,0,0,0.15));
-  transform: scale(1.02);
-  transition: all 0.3s ease;
-}
-
-.chart-legend {
-  display: flex;
-  flex-wrap: wrap;
-  justify-content: center;
-  gap: 15px;
-  margin-top: 20px;
-  padding: 20px;
-  background: linear-gradient(135deg, #f8f9fa 0%, #e9ecef 100%);
-  border-radius: 8px;
-  border: 1px solid #dee2e6;
-  box-shadow: inset 0 1px 3px rgba(0, 0, 0, 0.05);
-}
-
-.legend-item {
-  display: flex;
-  align-items: center;
-  padding: 12px 20px;
-  background: linear-gradient(135deg, #ffffff 0%, #f8f9fa 100%);
-  border-radius: 25px;
-  box-shadow: 0 2px 6px rgba(0, 0, 0, 0.1);
-  transition: all 0.3s ease;
-  border: 1px solid #eaeaea;
-  cursor: pointer;
-}
-
-.legend-item:hover {
-  transform: translateY(-3px);
-  box-shadow: 0 5px 15px rgba(0, 0, 0, 0.2);
-  border-color: #3498db;
-  background: linear-gradient(135deg, #f8f9fa 0%, #e9ecef 100%);
-}
-
-.legend-color {
-  width: 20px;
-  height: 20px;
-  border-radius: 50%;
-  margin-right: 12px;
-  display: inline-block;
-  border: 2px solid white;
-  box-shadow: 0 1px 3px rgba(0, 0, 0, 0.2);
-}
-
-.legend-label {
-  font-size: 16px;
-  font-weight: 600;
-  color: #2c3e50;
-  margin-right: 15px;
-  white-space: nowrap;
-  text-shadow: 0 1px 1px rgba(0, 0, 0, 0.1);
-}
-
-.legend-value {
-  font-size: 16px;
-  font-weight: 700;
-  color: #3498db;
-  background: linear-gradient(135deg, #e9ecef 0%, #dde1e5 100%);
-  padding: 6px 12px;
-  border-radius: 12px;
-  box-shadow: 0 1px 2px rgba(0, 0, 0, 0.1);
-  min-width: 40px;
-  text-align: center;
-}
-
-.loading-indicator, .no-data-message {
-  text-align: center;
-  padding: 30px;
-  color: #666;
-  font-size: 18px;
-  font-style: italic;
-  display: flex;
-  flex-direction: column;
-  align-items: center;
-  justify-content: center;
+// Chart container structure - simplified to match shield dashboard
+.chart-container {
   height: 100%;
-}
-
-.loading-indicator p, .no-data-message p {
-  margin: 10px 0 0 0;
-}
-
-.spinner {
-  border: 4px solid #f3f3f3;
-  border-top: 4px solid #3498db;
-  border-radius: 50%;
-  width: 40px;
-  height: 40px;
-  animation: spin 1s linear infinite;
-  margin-bottom: 10px;
-}
-
-@keyframes spin {
-  0% { transform: rotate(0deg); }
-  100% { transform: rotate(360deg); }
-}
-
-/* Responsive design */
-@media (max-width: 768px) {
-  .doughnut-chart-container {
+  min-height: 400px; // Ensure minimum height
+  display: flex;
+  flex-direction: column;
+  
+  // Filter section styling
+  .filter-section {
+    margin-bottom: 20px;
     padding: 15px;
+    border: 1px solid #ddd;
+    border-radius: 4px;
+    background-color: #f9f9f9;
   }
-  
-  .chart-title {
-    font-size: 20px;
+
+  .filter-group {
     margin-bottom: 15px;
+    
+    h4 {
+      margin-top: 0;
+      margin-bottom: 10px;
+      color: #333;
+      font-weight: 600;
+    }
   }
-  
-  .chart-wrapper {
-    min-height: 200px;
+
+  .filter-controls {
+    display: flex;
+    flex-wrap: wrap;
+    gap: 15px;
   }
-  
-  .chart-legend {
-    flex-direction: column;
-    align-items: center;
+
+  .filter-item {
+    flex: 1 1 300px;
+    min-width: 250px;
+    padding: 10px;
+    background: white;
+    border: 1px solid #e0e0e0;
+    border-radius: 4px;
   }
-  
-  .legend-item {
+
+  .filter-label {
+    font-weight: 500;
+    margin-bottom: 8px;
+    color: #555;
+    font-size: 14px;
+  }
+
+  .filter-input {
     width: 100%;
-    max-width: 300px;
+    
+    .filter-text-input,
+    .filter-select,
+    .filter-date {
+      width: 100%;
+      padding: 6px 12px;
+      border: 1px solid #ccc;
+      border-radius: 4px;
+      font-size: 14px;
+    }
+    
+    .filter-select {
+      height: 34px;
+    }
+  }
+
+  .multiselect-container {
+    position: relative;
+  }
+
+  .multiselect-display {
+    display: flex;
+    align-items: center;
     justify-content: space-between;
+    padding: 6px 12px;
+    border: 1px solid #ccc;
+    border-radius: 4px;
+    background: white;
+    cursor: pointer;
+    min-height: 34px;
+    
+    .multiselect-label {
+      flex: 1;
+      font-size: 14px;
+    }
+    
+    .multiselect-value {
+      color: #666;
+      font-size: 12px;
+      margin-right: 8px;
+    }
+    
+    .dropdown-icon {
+      flex-shrink: 0;
+      transition: transform 0.2s ease;
+    }
+    
+    &:hover {
+      border-color: #999;
+    }
+  }
+
+  .multiselect-dropdown {
+    position: absolute;
+    top: 100%;
+    left: 0;
+    right: 0;
+    z-index: 1000;
+    background: white;
+    border: 1px solid #ccc;
+    border-top: none;
+    border-radius: 0 0 4px 4px;
+    box-shadow: 0 2px 4px rgba(0,0,0,0.1);
+    max-height: 200px;
+    overflow-y: auto;
+    
+    .checkbox-group {
+      padding: 8px;
+      
+      .checkbox-item {
+        display: flex;
+        align-items: center;
+        gap: 8px;
+        padding: 4px 0;
+        
+        .checkbox-label {
+          margin: 0;
+          font-size: 14px;
+          cursor: pointer;
+        }
+      }
+    }
+  }
+
+  .date-range {
+    .date-input-group {
+      display: flex;
+      align-items: center;
+      gap: 8px;
+    }
+    
+    .date-separator {
+      margin: 0 5px;
+      color: #777;
+    }
+  }
+
+  .toggle {
+    display: flex;
+    align-items: center;
+    gap: 8px;
+    
+    .toggle-label {
+      margin: 0;
+      font-size: 14px;
+      cursor: pointer;
+    }
+  }
+
+  .filter-actions {
+    margin-top: 15px;
+    padding-top: 15px;
+    border-top: 1px solid #eee;
+    
+    .btn {
+      font-size: 13px;
+    }
   }
   
-  .no-data-message {
-    font-size: 16px;
-    padding: 20px;
+  // Chart header styling
+  .chart-header {
+    margin-bottom: 20px;
+    
+    .header-row {
+      margin-bottom: 15px;
+      padding-bottom: 10px;
+      border-bottom: 1px solid #eee;
+      
+      .chart-title {
+        margin: 0;
+        font-size: 18px;
+        font-weight: 600;
+        color: #0a192f;
+      }
+    }
+  }
+  
+  // Chart wrapper and content - simplified to match shield dashboard
+  .chart-wrapper {
+    flex: 1;
+    position: relative;
+    
+    .chart-content {
+      position: relative;
+      height: 100%;
+      min-height: 300px;
+      
+      &.loading {
+        opacity: 0.7;
+        
+        canvas {
+          filter: blur(2px);
+        }
+      }
+      
+      .no-data-message {
+        text-align: center;
+        padding: 20px;
+        color: #666;
+        font-style: italic;
+      }
+      
+      canvas {
+        max-width: 100%;
+        max-height: calc(100% - 40px); // Leave space for legend
+        transition: filter 0.3s ease;
+      }
+      
+      .loading-overlay {
+        position: absolute;
+        top: 0;
+        left: 0;
+        right: 0;
+        bottom: 0;
+        display: flex;
+        align-items: center;
+        justify-content: center;
+        background: rgba(255, 255, 255, 0.8);
+        
+        .shimmer-donut {
+          width: 120px;
+          height: 120px;
+          border-radius: 50%;
+          background: linear-gradient(90deg, #f0f0f0 25%, #e0e0e0 50%, #f0f0f0 75%);
+          background-size: 200% 100%;
+          animation: shimmer 1.5s infinite;
+        }
+      }
+    }
+  }
+  
+  // Chart legend - simplified
+  .chart-legend {
+    display: flex;
+    flex-wrap: wrap;
+    justify-content: center;
+    gap: 15px;
+    margin: 20px 0;
+    padding: 15px;
+    
+    .legend-item {
+      display: flex;
+      align-items: center;
+      padding: 8px 15px;
+      background: #f8f9fa;
+      border-radius: 20px;
+      border: 1px solid #e9ecef;
+      min-width: 120px;
+      justify-content: space-between;
+    }
+    
+    .legend-color {
+      width: 15px;
+      height: 15px;
+      border-radius: 50%;
+      margin-right: 8px;
+      display: inline-block;
+      flex-shrink: 0;
+    }
+    
+    .legend-label {
+      font-size: 14px;
+      font-weight: 500;
+      color: #2c3e50;
+      margin-right: 10px;
+      white-space: nowrap;
+      overflow: hidden;
+      text-overflow: ellipsis;
+    }
+    
+    .legend-value {
+      font-size: 14px;
+      font-weight: 600;
+      color: #3498db;
+      min-width: 30px;
+      text-align: right;
+    }
+  }
+}
+
+@keyframes shimmer {
+  0% {
+    background-position: -200% 0;
+  }
+  100% {
+    background-position: 200% 0;
+  }
+}
+
+// Responsive design
+@media (max-width: 768px) {
+  .chart-container {
+    .filter-controls {
+      flex-direction: column;
+    }
+    
+    .filter-item {
+      min-width: 100%;
+    }
+    
+    .chart-header {
+      .header-row {
+        .chart-title {
+          font-size: 16px;
+        }
+      }
+    }
+    
+    .chart-content {
+      min-height: 250px;
+    }
+    
+    .chart-legend {
+      flex-direction: column;
+      align-items: center;
+      
+      .legend-item {
+        width: 100%;
+        max-width: 300px;
+        justify-content: space-between;
+      }
+    }
+    
+    .chart-content {
+      min-height: 250px;
+      
+      canvas {
+        max-height: calc(100% - 60px); // More space for legend on mobile
+      }
+    }
   }
 }
\ No newline at end of file
diff --git a/frontend/angular-clarity-master/src/app/modules/main/builder/dashboardnew/gadgets/doughnut-chart/doughnut-chart.component.ts b/frontend/angular-clarity-master/src/app/modules/main/builder/dashboardnew/gadgets/doughnut-chart/doughnut-chart.component.ts
index 6582acc..09fc78e 100644
--- a/frontend/angular-clarity-master/src/app/modules/main/builder/dashboardnew/gadgets/doughnut-chart/doughnut-chart.component.ts
+++ b/frontend/angular-clarity-master/src/app/modules/main/builder/dashboardnew/gadgets/doughnut-chart/doughnut-chart.component.ts
@@ -1,12 +1,14 @@
-import { Component, OnInit, Input, OnChanges, SimpleChanges, AfterViewChecked } from '@angular/core';
+import { Component, OnInit, Input, OnChanges, SimpleChanges, AfterViewChecked, OnDestroy } from '@angular/core';
 import { Dashboard3Service } from 'src/app/services/builder/dashboard3.service';
+import { FilterService } from '../../common-filter/filter.service';
+import { Subscription } from 'rxjs';
 
 @Component({
   selector: 'app-doughnut-chart',
   templateUrl: './doughnut-chart.component.html',
   styleUrls: ['./doughnut-chart.component.scss']
 })
-export class DoughnutChartComponent implements OnInit, OnChanges, AfterViewChecked {
+export class DoughnutChartComponent implements OnInit, OnChanges, AfterViewChecked, OnDestroy {
   @Input() xAxis: string;
   @Input() yAxis: string | string[];
   @Input() table: string;
@@ -34,7 +36,21 @@ export class DoughnutChartComponent implements OnInit, OnChanges, AfterViewCheck
   @Input() drilldownLayers: any[] = []; // Array of drilldown layer configurations
 
   public doughnutChartLabels: string[] = ["Category A", "Category B", "Category C"];
-  public doughnutChartData: number[] = [30, 50, 20];
+  public doughnutChartData: any[] = [
+    {
+      data: [30, 50, 20],
+      backgroundColor: [
+        '#FF6384',
+        '#36A2EB',
+        '#FFCE56'
+      ],
+      hoverBackgroundColor: [
+        '#FF6384',
+        '#36A2EB',
+        '#FFCE56'
+      ]
+    }
+  ];
   public doughnutChartType: string = "doughnut";
   public doughnutChartOptions: any = {
     responsive: true,
@@ -70,6 +86,14 @@ export class DoughnutChartComponent implements OnInit, OnChanges, AfterViewCheck
         borderWidth: 2,
         borderColor: '#fff'
       }
+    },
+    layout: {
+      padding: {
+        top: 20,
+        bottom: 20,
+        left: 20,
+        right: 20
+      }
     }
   };
   
@@ -94,15 +118,40 @@ export class DoughnutChartComponent implements OnInit, OnChanges, AfterViewCheck
   // No data state
   noDataAvailable: boolean = false;
   
+  // Loading state
+  isLoading: boolean = false;
+  
   // Flag to prevent infinite loops
   private isFetchingData: boolean = false;
+  
+  // Subscriptions to unsubscribe on destroy
+  private subscriptions: Subscription[] = [];
 
-  constructor(private dashboardService: Dashboard3Service) { }
+  // Add properties for filter functionality
+  private openMultiselects: Map<string, string> = new Map(); // Map of filterId -> context
+  private documentClickHandler: ((event: MouseEvent) => void) | null = null;
+  private filtersInitialized: boolean = false;
+
+  constructor(
+    private dashboardService: Dashboard3Service,
+    private filterService: FilterService
+  ) { }
 
   ngOnInit(): void {
+    // Subscribe to filter changes
+    this.subscriptions.push(
+      this.filterService.filterState$.subscribe(filters => {
+        // When filters change, refresh the chart data
+        this.fetchChartData();
+      })
+    );
+    
     // Validate initial data
     this.validateChartData();
-    this.fetchChartData();
+    // Only fetch data if we have the required inputs, otherwise show default data
+    if (this.table && this.xAxis && this.yAxis) {
+      this.fetchChartData();
+    }
   }
   
   /**
@@ -122,17 +171,33 @@ export class DoughnutChartComponent implements OnInit, OnChanges, AfterViewCheck
     if (this.doughnutChartLabels.length === 0 && this.doughnutChartData.length === 0) {
       // Add default data to ensure chart visibility
       this.doughnutChartLabels = ["Category A", "Category B", "Category C"];
-      this.doughnutChartData = [30, 50, 20];
+      this.doughnutChartData = [
+        {
+          data: [30, 50, 20],
+          backgroundColor: [
+            '#FF6384',
+            '#36A2EB',
+            '#FFCE56'
+          ],
+          hoverBackgroundColor: [
+            '#FF6384',
+            '#36A2EB',
+            '#FFCE56'
+          ]
+        }
+      ];
     }
     
     // Ensure we have matching arrays
-    if (this.doughnutChartLabels.length !== this.doughnutChartData.length) {
-      const maxLength = Math.max(this.doughnutChartLabels.length, this.doughnutChartData.length);
+    if (this.doughnutChartLabels.length !== (this.doughnutChartData[0]?.data?.length || 0)) {
+      const maxLength = Math.max(this.doughnutChartLabels.length, this.doughnutChartData[0]?.data?.length || 0);
       while (this.doughnutChartLabels.length < maxLength) {
         this.doughnutChartLabels.push(`Label ${this.doughnutChartLabels.length + 1}`);
       }
-      while (this.doughnutChartData.length < maxLength) {
-        this.doughnutChartData.push(0);
+      if (this.doughnutChartData[0]) {
+        while (this.doughnutChartData[0].data.length < maxLength) {
+          this.doughnutChartData[0].data.push(0);
+        }
       }
     }
   }
@@ -148,6 +213,12 @@ export class DoughnutChartComponent implements OnInit, OnChanges, AfterViewCheck
   ngOnChanges(changes: SimpleChanges): void {
     console.log('DoughnutChartComponent input changes:', changes);
     
+    // Initialize filter values if they haven't been initialized yet
+    if (!this.filtersInitialized && (changes.baseFilters || changes.drilldownFilters || changes.drilldownLayers)) {
+      this.initializeFilterValues();
+      this.filtersInitialized = true;
+    }
+    
     // Check if any of the key properties have changed
     const xAxisChanged = changes.xAxis && !changes.xAxis.firstChange;
     const yAxisChanged = changes.yAxis && !changes.yAxis.firstChange;
@@ -169,6 +240,12 @@ export class DoughnutChartComponent implements OnInit, OnChanges, AfterViewCheck
       console.log('Chart configuration changed, fetching new data');
       this.fetchChartData();
     }
+    
+    // If we have the required inputs and haven't fetched data yet, fetch it
+    if ((xAxisChanged || yAxisChanged || tableChanged) && this.table && this.xAxis && this.yAxis && !this.isFetchingData) {
+      console.log('Required inputs available, fetching data');
+      this.fetchChartData();
+    }
   }
   
   ngAfterViewChecked() {
@@ -180,15 +257,340 @@ export class DoughnutChartComponent implements OnInit, OnChanges, AfterViewCheck
     });
   }
 
+  ngOnDestroy(): void {
+    this.subscriptions.forEach(sub => sub.unsubscribe());
+    // Clean up document click handler
+    this.removeDocumentClickHandler();
+  }
+  
+  // Initialize filter values with proper default values based on type
+  private initializeFilterValues(): void {
+    console.log('Initializing filter values');
+    
+    // Initialize base filters
+    if (this.baseFilters) {
+      this.baseFilters.forEach(filter => {
+        if (filter.value === undefined || filter.value === null) {
+          switch (filter.type) {
+            case 'multiselect':
+              filter.value = [];
+              break;
+            case 'date-range':
+              filter.value = { start: null, end: null };
+              break;
+            case 'toggle':
+              filter.value = false;
+              break;
+            default:
+              filter.value = '';
+          }
+        }
+      });
+    }
+    
+    // Initialize drilldown filters
+    if (this.drilldownFilters) {
+      this.drilldownFilters.forEach(filter => {
+        if (filter.value === undefined || filter.value === null) {
+          switch (filter.type) {
+            case 'multiselect':
+              filter.value = [];
+              break;
+            case 'date-range':
+              filter.value = { start: null, end: null };
+              break;
+            case 'toggle':
+              filter.value = false;
+              break;
+            default:
+              filter.value = '';
+          }
+        }
+      });
+    }
+    
+    // Initialize layer filters
+    if (this.drilldownLayers) {
+      this.drilldownLayers.forEach(layer => {
+        if (layer.filters) {
+          layer.filters.forEach((filter: any) => {
+            if (filter.value === undefined || filter.value === null) {
+              switch (filter.type) {
+                case 'multiselect':
+                  filter.value = [];
+                  break;
+                case 'date-range':
+                  filter.value = { start: null, end: null };
+                  break;
+                case 'toggle':
+                  filter.value = false;
+                  break;
+                default:
+                  filter.value = '';
+              }
+            }
+          });
+        }
+      });
+    }
+    
+    console.log('Filter values initialized:', {
+      baseFilters: this.baseFilters,
+      drilldownFilters: this.drilldownFilters,
+      drilldownLayers: this.drilldownLayers
+    });
+  }
+
+  // Check if there are active filters
+  hasActiveFilters(): boolean {
+    return (this.baseFilters && this.baseFilters.length > 0) || 
+           (this.drilldownFilters && this.drilldownFilters.length > 0) || 
+           this.hasActiveLayerFilters();
+  }
+
+  // Check if there are active layer filters for current drilldown level
+  hasActiveLayerFilters(): boolean {
+    if (this.currentDrilldownLevel > 1 && this.drilldownLayers && this.drilldownLayers.length > 0) {
+      const layerIndex = this.currentDrilldownLevel - 2; // -2 because level 1 is base drilldown
+      return layerIndex < this.drilldownLayers.length && 
+             this.drilldownLayers[layerIndex].filters && 
+             this.drilldownLayers[layerIndex].filters.length > 0;
+    }
+    return false;
+  }
+
+  // Get active layer filters for current drilldown level
+  getActiveLayerFilters(): any[] {
+    if (this.currentDrilldownLevel > 1 && this.drilldownLayers && this.drilldownLayers.length > 0) {
+      const layerIndex = this.currentDrilldownLevel - 2; // -2 because level 1 is base drilldown
+      if (layerIndex < this.drilldownLayers.length && 
+          this.drilldownLayers[layerIndex].filters) {
+        return this.drilldownLayers[layerIndex].filters;
+      }
+    }
+    return [];
+  }
+
+  // Get filter options for dropdown/multiselect filters
+  getFilterOptions(filter: any): string[] {
+    if (filter.options) {
+      if (Array.isArray(filter.options)) {
+        return filter.options;
+      } else if (typeof filter.options === 'string') {
+        return filter.options.split(',').map(opt => opt.trim()).filter(opt => opt);
+      }
+    }
+    return [];
+  }
+
+  // Check if an option is selected for multiselect filters
+  isOptionSelected(filter: any, option: string): boolean {
+    if (!filter.value) {
+      return false;
+    }
+    
+    if (Array.isArray(filter.value)) {
+      return filter.value.includes(option);
+    }
+    
+    return filter.value === option;
+  }
+
+  // Handle base filter changes
+  onBaseFilterChange(filter: any): void {
+    console.log('Base filter changed:', filter);
+    // Refresh data when filter changes
+    this.fetchChartData();
+  }
+
+  // Handle drilldown filter changes
+  onDrilldownFilterChange(filter: any): void {
+    console.log('Drilldown filter changed:', filter);
+    // Refresh data when filter changes
+    this.fetchChartData();
+  }
+
+  // Handle layer filter changes
+  onLayerFilterChange(filter: any): void {
+    console.log('Layer filter changed:', filter);
+    // Refresh data when filter changes
+    this.fetchChartData();
+  }
+
+  // Handle multiselect changes
+  onMultiSelectChange(filter: any, option: string, event: any): void {
+    const checked = event.target.checked;
+    
+    // Initialize filter.value as array if it's not already
+    if (!Array.isArray(filter.value)) {
+      filter.value = [];
+    }
+    
+    if (checked) {
+      // Add option to array if not already present
+      if (!filter.value.includes(option)) {
+        filter.value.push(option);
+      }
+    } else {
+      // Remove option from array
+      filter.value = filter.value.filter((item: string) => item !== option);
+    }
+    
+    // Refresh data when filter changes
+    this.fetchChartData();
+  }
+
+  // Handle date range changes
+  onDateRangeChange(filter: any, dateRange: { start: string | null, end: string | null }): void {
+    filter.value = dateRange;
+    // Refresh data when filter changes
+    this.fetchChartData();
+  }
+
+  // Handle toggle changes
+  onToggleChange(filter: any, checked: boolean): void {
+    filter.value = checked;
+    // Refresh data when filter changes
+    this.fetchChartData();
+  }
+
+  // Toggle multiselect dropdown visibility
+  toggleMultiselect(filter: any, context: string): void {
+    const filterId = `${context}-${filter.field}`;
+    if (this.isMultiselectOpen(filter, context)) {
+      this.openMultiselects.delete(filterId);
+    } else {
+      // Close all other multiselects first
+      this.openMultiselects.clear();
+      this.openMultiselects.set(filterId, context);
+      
+      // Add document click handler to close dropdown when clicking outside
+      this.addDocumentClickHandler();
+    }
+  }
+
+  // Add document click handler to close dropdowns when clicking outside
+  private addDocumentClickHandler(): void {
+    if (!this.documentClickHandler) {
+      this.documentClickHandler = (event: MouseEvent) => {
+        const target = event.target as HTMLElement;
+        // Check if click is outside any multiselect dropdown
+        if (!target.closest('.multiselect-container')) {
+          this.openMultiselects.clear();
+          this.removeDocumentClickHandler();
+        }
+      };
+      
+      // Use setTimeout to ensure the click event that opened the dropdown doesn't immediately close it
+      setTimeout(() => {
+        document.addEventListener('click', this.documentClickHandler!);
+      }, 0);
+    }
+  }
+
+  // Remove document click handler
+  private removeDocumentClickHandler(): void {
+    if (this.documentClickHandler) {
+      document.removeEventListener('click', this.documentClickHandler);
+      this.documentClickHandler = null;
+    }
+  }
+
+  // Check if multiselect dropdown is open
+  isMultiselectOpen(filter: any, context: string): boolean {
+    const filterId = `${context}-${filter.field}`;
+    return this.openMultiselects.has(filterId);
+  }
+
+  // Get count of selected options for a multiselect filter
+  getSelectedOptionsCount(filter: any): number {
+    if (!filter.value) {
+      return 0;
+    }
+    
+    if (Array.isArray(filter.value)) {
+      return filter.value.length;
+    }
+    
+    return 0;
+  }
+
+  // Clear all filters
+  clearAllFilters(): void {
+    // Clear base filters
+    if (this.baseFilters) {
+      this.baseFilters.forEach(filter => {
+        if (filter.type === 'multiselect') {
+          filter.value = [];
+        } else if (filter.type === 'date-range') {
+          filter.value = { start: null, end: null };
+        } else if (filter.type === 'toggle') {
+          filter.value = false;
+        } else {
+          filter.value = '';
+        }
+      });
+    }
+    
+    // Clear drilldown filters
+    if (this.drilldownFilters) {
+      this.drilldownFilters.forEach(filter => {
+        if (filter.type === 'multiselect') {
+          filter.value = [];
+        } else if (filter.type === 'date-range') {
+          filter.value = { start: null, end: null };
+        } else if (filter.type === 'toggle') {
+          filter.value = false;
+        } else {
+          filter.value = '';
+        }
+      });
+    }
+    
+    // Clear layer filters
+    if (this.drilldownLayers) {
+      this.drilldownLayers.forEach(layer => {
+        if (layer.filters) {
+          layer.filters.forEach((filter: any) => {
+            if (filter.type === 'multiselect') {
+              filter.value = [];
+            } else if (filter.type === 'date-range') {
+              filter.value = { start: null, end: null };
+            } else if (filter.type === 'toggle') {
+              filter.value = false;
+            } else {
+              filter.value = '';
+            }
+          });
+        }
+      });
+    }
+    
+    // Close all multiselect dropdowns
+    this.openMultiselects.clear();
+    
+    // Refresh data
+    this.fetchChartData();
+  }
+  
+  // Public method to refresh data when filters change
+  refreshData(): void {
+    this.fetchChartData();
+  }
+  
   fetchChartData(): void {
+    // Set loading state
+    this.isLoading = true;
+    
     // Set flag to prevent recursive calls
     this.isFetchingData = true;
     
     // If we're in drilldown mode, fetch the appropriate drilldown data
     if (this.currentDrilldownLevel > 0 && this.drilldownStack.length > 0) {
       this.fetchDrilldownData();
-      // Reset flag after fetching
+      // Reset flags after fetching
       this.isFetchingData = false;
+      this.isLoading = false;
       return;
     }
     
@@ -212,11 +614,53 @@ export class DoughnutChartComponent implements OnInit, OnChanges, AfterViewCheck
           filterParams = JSON.stringify(filterObj);
         }
       }
-      console.log('Base filter parameters:', filterParams);
+      
+      // Add common filters to filter parameters
+      const commonFilters = this.filterService.getFilterValues();
+      console.log('Common filters from service:', commonFilters);
+      
+      if (Object.keys(commonFilters).length > 0) {
+        // Merge common filters with base filters
+        const mergedFilterObj = {};
+        
+        // Add base filters first
+        if (filterParams) {
+          try {
+            const baseFilterObj = JSON.parse(filterParams);
+            Object.assign(mergedFilterObj, baseFilterObj);
+          } catch (e) {
+            console.warn('Failed to parse base filter parameters:', e);
+          }
+        }
+        
+        // Add common filters using the field name as the key, not the filter id
+        Object.keys(commonFilters).forEach(filterId => {
+          const filterValue = commonFilters[filterId];
+          // Find the filter definition to get the field name
+          const filterDef = this.filterService.getFilters().find(f => f.id === filterId);
+          if (filterDef && filterDef.field) {
+            const fieldName = filterDef.field;
+            if (filterValue !== undefined && filterValue !== null && filterValue !== '') {
+              mergedFilterObj[fieldName] = filterValue;
+            }
+          } else {
+            // Fallback to using filterId as field name if no field is defined
+            if (filterValue !== undefined && filterValue !== null && filterValue !== '') {
+              mergedFilterObj[filterId] = filterValue;
+            }
+          }
+        });
+        
+        if (Object.keys(mergedFilterObj).length > 0) {
+          filterParams = JSON.stringify(mergedFilterObj);
+        }
+      }
+      
+      console.log('Final filter parameters:', filterParams);
       
       // Log the URL that will be called
       const url = `chart/getdashjson/doughnut?tableName=${this.table}&xAxis=${this.xAxis}&yAxes=${yAxisString}${this.connection ? `&sureId=${this.connection}` : ''}`;
-      console.log('Doughnut chart data URL:', url);
+      console.log('Chart data URL:', url);
       
       // Fetch data from the dashboard service with parameter field and value
       // For base level, we pass empty parameter and value, but now also pass filters
@@ -224,89 +668,113 @@ export class DoughnutChartComponent implements OnInit, OnChanges, AfterViewCheck
         (data: any) => {
           console.log('Received doughnut chart data:', data);
           if (data === null) {
-            console.warn('Doughnut chart API returned null data. Check if the API endpoint is working correctly.');
+            console.warn('API returned null data. Check if the API endpoint is working correctly.');
             this.noDataAvailable = true;
             this.doughnutChartLabels = [];
             this.doughnutChartData = [];
-            // Validate and sanitize data to show default data
-            this.validateChartData();
-            // Reset flag after fetching
+            // Reset flags after fetching
             this.isFetchingData = false;
+            this.isLoading = false;
             return;
           }
           
           // Handle the actual data structure returned by the API
           if (data && data.chartLabels && data.chartData) {
-            // For doughnut charts, we need to extract the data differently
-            // The first dataset's data array contains the values for the doughnut chart
+            // Backend has already filtered the data, just display it
             this.noDataAvailable = data.chartLabels.length === 0;
-            this.doughnutChartLabels = data.chartLabels || [];
-            if (data.chartData && data.chartData.length > 0) {
-              this.doughnutChartData = data.chartData[0].data.map(value => {
-                // Convert to number if it's not already
-                const numValue = Number(value);
-                return isNaN(numValue) ? 0 : numValue;
-              });
+            this.doughnutChartLabels = data.chartLabels;
+            
+            // Handle different data structures
+            let chartDataValues;
+            if (Array.isArray(data.chartData)) {
+              // If chartData is already an array of values
+              if (data.chartData.length > 0 && typeof data.chartData[0] !== 'object') {
+                chartDataValues = data.chartData;
+              } 
+              // If chartData is an array with one object containing the data
+              else if (data.chartData.length > 0 && data.chartData[0].data) {
+                chartDataValues = data.chartData[0].data;
+              }
+              // Default case
+              else {
+                chartDataValues = data.chartData;
+              }
             } else {
-              this.doughnutChartData = [];
+              chartDataValues = [data.chartData];
             }
-            // Ensure labels and data arrays have the same length
-            this.syncLabelAndDataArrays();
-            // Validate and sanitize data
-            this.validateChartData();
-            // Trigger change detection
-            this.doughnutChartData = [...this.doughnutChartData];
+            
+            this.doughnutChartData = [
+              {
+                data: chartDataValues,
+                backgroundColor: this.chartColors.slice(0, chartDataValues.length),
+                hoverBackgroundColor: this.chartColors.slice(0, chartDataValues.length)
+              }
+            ];
             console.log('Updated doughnut chart with data:', { labels: this.doughnutChartLabels, data: this.doughnutChartData });
-          } else if (data && data.labels && data.data) {
-            // Handle the original expected format as fallback
+          } else if (data && data.labels && data.datasets) {
+            // Backend has already filtered the data, just display it
             this.noDataAvailable = data.labels.length === 0;
-            this.doughnutChartLabels = data.labels || [];
-            this.doughnutChartData = data.data.map(value => {
-              // Convert to number if it's not already
-              const numValue = Number(value);
-              return isNaN(numValue) ? 0 : numValue;
-            });
-            // Ensure labels and data arrays have the same length
-            this.syncLabelAndDataArrays();
-            // Validate and sanitize data
-            this.validateChartData();
-            // Trigger change detection
-            this.doughnutChartData = [...this.doughnutChartData];
+            this.doughnutChartLabels = data.labels;
+            this.doughnutChartData = data.datasets;
             console.log('Updated doughnut chart with legacy data format:', { labels: this.doughnutChartLabels, data: this.doughnutChartData });
           } else {
-            console.warn('Doughnut chart received data does not have expected structure', data);
-            // Reset to default data
+            console.warn('Received data does not have expected structure', data);
             this.noDataAvailable = true;
-            this.doughnutChartLabels = [];
-            this.doughnutChartData = [];
-            // Validate and sanitize data to show default data
-            this.validateChartData();
+            // Keep default data instead of empty arrays
+            this.doughnutChartLabels = ["Category A", "Category B", "Category C"];
+            this.doughnutChartData = [
+              {
+                data: [30, 50, 20],
+                backgroundColor: [
+                  '#FF6384',
+                  '#36A2EB',
+                  '#FFCE56'
+                ],
+                hoverBackgroundColor: [
+                  '#FF6384',
+                  '#36A2EB',
+                  '#FFCE56'
+                ]
+              }
+            ];
           }
-          // Reset flag after fetching
+          // Reset flags after fetching
           this.isFetchingData = false;
+          this.isLoading = false;
         },
         (error) => {
           console.error('Error fetching doughnut chart data:', error);
           this.noDataAvailable = true;
-          this.doughnutChartLabels = [];
-          this.doughnutChartData = [];
-          // Validate and sanitize data to show default data
-          this.validateChartData();
-          // Reset flag after fetching
+          // Keep default data in case of error
+          this.doughnutChartLabels = ["Category A", "Category B", "Category C"];
+          this.doughnutChartData = [
+            {
+              data: [30, 50, 20],
+              backgroundColor: [
+                '#FF6384',
+                '#36A2EB',
+                '#FFCE56'
+              ],
+              hoverBackgroundColor: [
+                '#FF6384',
+                '#36A2EB',
+                '#FFCE56'
+              ]
+            }
+          ];
+          // Reset flags after fetching
           this.isFetchingData = false;
+          this.isLoading = false;
         }
       );
     } else {
-      console.log('Missing required data for doughnut chart, showing default data:', { table: this.table, xAxis: this.xAxis, yAxis: this.yAxis, connection: this.connection });
-      // Don't set noDataAvailable to true when there's no required data
-      // This allows static data to be displayed
-      this.noDataAvailable = false;
-      // Validate the chart data to ensure we have some data to display
-      this.validateChartData();
-      // Force a redraw to ensure the chart displays
-      this.doughnutChartData = [...this.doughnutChartData];
-      // Reset flag after fetching
+      console.log('Missing required data for chart:', { table: this.table, xAxis: this.xAxis, yAxis: this.yAxis, connection: this.connection });
+      this.noDataAvailable = true;
+      this.doughnutChartLabels = [];
+      this.doughnutChartData = [];
+      // Reset flags after fetching
       this.isFetchingData = false;
+      this.isLoading = false;
     }
   }
   
@@ -402,6 +870,35 @@ export class DoughnutChartComponent implements OnInit, OnChanges, AfterViewCheck
       }
     }
     
+    // Add common filters to drilldown filter parameters
+    const commonFilters = this.filterService.getFilterValues();
+    if (Object.keys(commonFilters).length > 0) {
+      // Merge common filters with drilldown filters
+      const mergedFilterObj = {};
+      
+      // Add drilldown filters first
+      if (filterParams) {
+        try {
+          const drilldownFilterObj = JSON.parse(filterParams);
+          Object.assign(mergedFilterObj, drilldownFilterObj);
+        } catch (e) {
+          console.warn('Failed to parse drilldown filter parameters:', e);
+        }
+      }
+      
+      // Add common filters
+      Object.keys(commonFilters).forEach(key => {
+        const value = commonFilters[key];
+        if (value !== undefined && value !== null && value !== '') {
+          mergedFilterObj[key] = value;
+        }
+      });
+      
+      if (Object.keys(mergedFilterObj).length > 0) {
+        filterParams = JSON.stringify(mergedFilterObj);
+      }
+    }
+    
     // Log the URL that will be called
     const url = `chart/getdashjson/doughnut?tableName=${actualApiUrl}&xAxis=${drilldownConfig.xAxis}&yAxes=${drilldownConfig.yAxis}${this.connection ? `&sureId=${this.connection}` : ''}`;
     console.log('Drilldown data URL:', url);
@@ -421,59 +918,66 @@ export class DoughnutChartComponent implements OnInit, OnChanges, AfterViewCheck
         
         // Handle the actual data structure returned by the API
         if (data && data.chartLabels && data.chartData) {
-          // For doughnut charts, we need to extract the data differently
-          // The first dataset's data array contains the values for the doughnut chart
+          // Backend has already filtered the data, just display it
           this.noDataAvailable = data.chartLabels.length === 0;
-          this.doughnutChartLabels = data.chartLabels || [];
-          if (data.chartData && data.chartData.length > 0) {
-            this.doughnutChartData = data.chartData[0].data.map(value => {
-              // Convert to number if it's not already
-              const numValue = Number(value);
-              return isNaN(numValue) ? 0 : numValue;
-            });
+          this.doughnutChartLabels = data.chartLabels;
+          
+          // Handle different data structures
+          let chartDataValues;
+          if (Array.isArray(data.chartData)) {
+            // If chartData is already an array of values
+            if (data.chartData.length > 0 && typeof data.chartData[0] !== 'object') {
+              chartDataValues = data.chartData;
+            } 
+            // If chartData is an array with one object containing the data
+            else if (data.chartData.length > 0 && data.chartData[0].data) {
+              chartDataValues = data.chartData[0].data;
+            }
+            // Default case
+            else {
+              chartDataValues = data.chartData;
+            }
           } else {
-            this.doughnutChartData = [];
+            chartDataValues = [data.chartData];
           }
-          // Ensure labels and data arrays have the same length
-          this.syncLabelAndDataArrays();
-          // Validate and sanitize data
-          this.validateChartData();
-          // Trigger change detection
-          this.doughnutChartData = [...this.doughnutChartData];
+          
+          this.doughnutChartData = [
+            {
+              data: chartDataValues,
+              backgroundColor: this.chartColors.slice(0, chartDataValues.length),
+              hoverBackgroundColor: this.chartColors.slice(0, chartDataValues.length)
+            }
+          ];
           console.log('Updated doughnut chart with drilldown data:', { labels: this.doughnutChartLabels, data: this.doughnutChartData });
-        } else if (data && data.labels && data.data) {
-          // Handle the original expected format as fallback
+          // Set loading state to false
+          this.isLoading = false;
+        } else if (data && data.labels && data.datasets) {
+          // Backend has already filtered the data, just display it
           this.noDataAvailable = data.labels.length === 0;
-          this.doughnutChartLabels = data.labels || [];
-          this.doughnutChartData = data.data.map(value => {
-            // Convert to number if it's not already
-            const numValue = Number(value);
-            return isNaN(numValue) ? 0 : numValue;
-          });
-          // Ensure labels and data arrays have the same length
-          this.syncLabelAndDataArrays();
-          // Validate and sanitize data
-          this.validateChartData();
-          // Trigger change detection
-          this.doughnutChartData = [...this.doughnutChartData];
+          this.doughnutChartLabels = data.labels;
+          this.doughnutChartData = data.datasets;
           console.log('Updated doughnut chart with drilldown legacy data format:', { labels: this.doughnutChartLabels, data: this.doughnutChartData });
+          // Set loading state to false
+          this.isLoading = false;
         } else {
           console.warn('Drilldown received data does not have expected structure', data);
           this.noDataAvailable = true;
-          this.doughnutChartLabels = [];
-          this.doughnutChartData = [];
-          // Validate and sanitize data
-          this.validateChartData();
+          // Keep current data instead of empty arrays
+          // Set loading state to false
+          this.isLoading = false;
         }
       },
       (error) => {
         console.error('Error fetching drilldown data:', error);
         this.noDataAvailable = true;
-        this.doughnutChartLabels = [];
-        this.doughnutChartData = [];
         // Keep current data in case of error
+        // Set loading state to false
+        this.isLoading = false;
       }
     );
+    
+    // Set loading state
+    this.isLoading = true;
   }
   
   // Reset to original data (go back to base level)
@@ -490,7 +994,7 @@ export class DoughnutChartComponent implements OnInit, OnChanges, AfterViewCheck
       console.log('Restored original labels');
     }
     if (this.originalDoughnutChartData.length > 0) {
-      this.doughnutChartData = [...this.originalDoughnutChartData];
+      this.doughnutChartData = JSON.parse(JSON.stringify(this.originalDoughnutChartData));
       console.log('Restored original data');
     }
     
@@ -531,44 +1035,11 @@ export class DoughnutChartComponent implements OnInit, OnChanges, AfterViewCheck
       this.resetToOriginalData();
     }
   }
-  
-  /**
-   * Get color for legend item
-   * @param index Index of the legend item
-   */
-  public getLegendColor(index: number): string {
+
+  // Get legend color for a specific index
+  getLegendColor(index: number): string {
     return this.chartColors[index % this.chartColors.length];
   }
-  
-  /**
-   * Ensure labels and data arrays have the same length
-   */
-  private syncLabelAndDataArrays(): void {
-    // Handle empty arrays
-    if (this.doughnutChartLabels.length === 0 && this.doughnutChartData.length === 0) {
-      return;
-    }
-    
-    const maxLength = Math.max(this.doughnutChartLabels.length, this.doughnutChartData.length);
-    
-    // Pad the shorter array with default values
-    while (this.doughnutChartLabels.length < maxLength) {
-      this.doughnutChartLabels.push(`Label ${this.doughnutChartLabels.length + 1}`);
-    }
-    
-    while (this.doughnutChartData.length < maxLength) {
-      this.doughnutChartData.push(0);
-    }
-    
-    // Truncate the longer array if needed
-    if (this.doughnutChartLabels.length > maxLength) {
-      this.doughnutChartLabels = this.doughnutChartLabels.slice(0, maxLength);
-    }
-    
-    if (this.doughnutChartData.length > maxLength) {
-      this.doughnutChartData = this.doughnutChartData.slice(0, maxLength);
-    }
-  }
 
   // events
   public chartClicked(e: any): void {
@@ -656,6 +1127,6 @@ export class DoughnutChartComponent implements OnInit, OnChanges, AfterViewCheck
   }
 
   public chartHovered(e: any): void {
-    console.log(e);
+    console.log('Doughnut chart hovered:', e);
   }
 }
\ No newline at end of file
diff --git a/frontend/angular-clarity-master/src/app/modules/main/builder/dashboardnew/gadgets/dynamic-chart/dynamic-chart.component.html b/frontend/angular-clarity-master/src/app/modules/main/builder/dashboardnew/gadgets/dynamic-chart/dynamic-chart.component.html
index ea261c3..b49f170 100644
--- a/frontend/angular-clarity-master/src/app/modules/main/builder/dashboardnew/gadgets/dynamic-chart/dynamic-chart.component.html
+++ b/frontend/angular-clarity-master/src/app/modules/main/builder/dashboardnew/gadgets/dynamic-chart/dynamic-chart.component.html
@@ -1,4 +1,285 @@
 <div class="dynamic-chart-container">
+  <!-- Filter Controls Section -->
+  <div class="filter-section" *ngIf="hasActiveFilters()">
+    <!-- Base Filters -->
+    <div class="filter-group" *ngIf="baseFilters && baseFilters.length > 0">
+      <h4>Base Filters</h4>
+      <div class="filter-controls">
+        <div *ngFor="let filter of baseFilters" class="filter-item">
+          <div class="filter-label">{{ filter.field }} ({{ filter.type || 'text' }})</div>
+          
+          <!-- Text Filter -->
+          <div *ngIf="!filter.type || filter.type === 'text'" class="filter-input">
+            <input type="text" 
+                   [(ngModel)]="filter.value" 
+                   (ngModelChange)="onBaseFilterChange(filter)"
+                   [placeholder]="filter.field"
+                   class="clr-input filter-text-input">
+          </div>
+          
+          <!-- Dropdown Filter -->
+          <div *ngIf="filter.type === 'dropdown'" class="filter-input">
+            <select [(ngModel)]="filter.value" 
+                    (ngModelChange)="onBaseFilterChange(filter)"
+                    class="clr-select filter-select">
+              <option value="">Select {{ filter.field }}</option>
+              <option *ngFor="let option of getFilterOptions(filter)" [value]="option">{{ option }}</option>
+            </select>
+          </div>
+          
+          <!-- Multi-Select Filter - Updated to show key first, then dropdown on click -->
+          <div *ngIf="filter.type === 'multiselect'" class="filter-input multiselect-container">
+            <div class="multiselect-display" (click)="toggleMultiselect(filter, 'base')">
+              <span class="multiselect-label">{{ filter.field }}</span>
+              <span class="multiselect-value" *ngIf="getSelectedOptionsCount(filter) > 0">
+                ({{ getSelectedOptionsCount(filter) }} selected)
+              </span>
+              <clr-icon shape="caret down" class="dropdown-icon"></clr-icon>
+            </div>
+            <div class="multiselect-dropdown" *ngIf="isMultiselectOpen(filter, 'base')">
+              <div class="checkbox-group">
+                <div *ngFor="let option of getFilterOptions(filter); let i = index" class="checkbox-item">
+                  <input type="checkbox" 
+                         [checked]="isOptionSelected(filter, option)" 
+                         (change)="onMultiSelectChange(filter, option, $event)"
+                         [id]="'base-' + filter.field + '-' + i" 
+                         class="clr-checkbox">
+                  <label [for]="'base-' + filter.field + '-' + i" class="checkbox-label">{{ option }}</label>
+                </div>
+              </div>
+            </div>
+          </div>
+          
+          <!-- Date Range Filter -->
+          <div *ngIf="filter.type === 'date-range'" class="filter-input date-range">
+            <div class="date-input-group">
+              <input type="date" 
+                     [(ngModel)]="filter.value.start" 
+                     (ngModelChange)="onDateRangeChange(filter, { start: $event, end: filter.value.end })"
+                     placeholder="Start Date"
+                     class="clr-input filter-date">
+              <span class="date-separator">to</span>
+              <input type="date" 
+                     [(ngModel)]="filter.value.end" 
+                     (ngModelChange)="onDateRangeChange(filter, { start: filter.value.start, end: $event })"
+                     placeholder="End Date"
+                     class="clr-input filter-date">
+            </div>
+          </div>
+          
+          <!-- Toggle Filter -->
+          <div *ngIf="filter.type === 'toggle'" class="filter-input toggle">
+            <input type="checkbox" 
+                   [(ngModel)]="filter.value" 
+                   (ngModelChange)="onToggleChange(filter, $event)"
+                   clrToggle 
+                   class="clr-toggle">
+            <label class="toggle-label">{{ filter.field }}</label>
+          </div>
+        </div>
+      </div>
+    </div>
+    
+    <!-- Drilldown Filters -->
+    <div class="filter-group" *ngIf="drilldownFilters && drilldownFilters.length > 0 && currentDrilldownLevel > 0">
+      <h4>Drilldown Filters</h4>
+      <div class="filter-controls">
+        <div *ngFor="let filter of drilldownFilters" class="filter-item">
+          <div class="filter-label">{{ filter.field }} ({{ filter.type || 'text' }})</div>
+          
+          <!-- Text Filter -->
+          <div *ngIf="!filter.type || filter.type === 'text'" class="filter-input">
+            <input type="text" 
+                   [(ngModel)]="filter.value" 
+                   (ngModelChange)="onDrilldownFilterChange(filter)"
+                   [placeholder]="filter.field"
+                   class="clr-input filter-text-input">
+          </div>
+          
+          <!-- Dropdown Filter -->
+          <div *ngIf="filter.type === 'dropdown'" class="filter-input">
+            <select [(ngModel)]="filter.value" 
+                    (ngModelChange)="onDrilldownFilterChange(filter)"
+                    class="clr-select filter-select">
+              <option value="">Select {{ filter.field }}</option>
+              <option *ngFor="let option of getFilterOptions(filter)" [value]="option">{{ option }}</option>
+            </select>
+          </div>
+          
+          <!-- Multi-Select Filter - Updated to show key first, then dropdown on click -->
+          <div *ngIf="filter.type === 'multiselect'" class="filter-input multiselect-container">
+            <div class="multiselect-display" (click)="toggleMultiselect(filter, 'drilldown')">
+              <span class="multiselect-label">{{ filter.field }}</span>
+              <span class="multiselect-value" *ngIf="getSelectedOptionsCount(filter) > 0">
+                ({{ getSelectedOptionsCount(filter) }} selected)
+              </span>
+              <clr-icon shape="caret down" class="dropdown-icon"></clr-icon>
+            </div>
+            <div class="multiselect-dropdown" *ngIf="isMultiselectOpen(filter, 'drilldown')">
+              <div class="checkbox-group">
+                <div *ngFor="let option of getFilterOptions(filter); let i = index" class="checkbox-item">
+                  <input type="checkbox" 
+                         [checked]="isOptionSelected(filter, option)" 
+                         (change)="onMultiSelectChange(filter, option, $event)"
+                         [id]="'drilldown-' + filter.field + '-' + i" 
+                         class="clr-checkbox">
+                  <label [for]="'drilldown-' + filter.field + '-' + i" class="checkbox-label">{{ option }}</label>
+                </div>
+              </div>
+            </div>
+          </div>
+          
+          <!-- Date Range Filter -->
+          <div *ngIf="filter.type === 'date-range'" class="filter-input date-range">
+            <div class="date-input-group">
+              <input type="date" 
+                     [(ngModel)]="filter.value.start" 
+                     (ngModelChange)="onDateRangeChange(filter, { start: $event, end: filter.value.end })"
+                     placeholder="Start Date"
+                     class="clr-input filter-date">
+              <span class="date-separator">to</span>
+              <input type="date" 
+                     [(ngModel)]="filter.value.end" 
+                     (ngModelChange)="onDateRangeChange(filter, { start: filter.value.start, end: $event })"
+                     placeholder="End Date"
+                     class="clr-input filter-date">
+            </div>
+          </div>
+          
+          <!-- Toggle Filter -->
+          <div *ngIf="filter.type === 'toggle'" class="filter-input toggle">
+            <input type="checkbox" 
+                   [(ngModel)]="filter.value" 
+                   (ngModelChange)="onToggleChange(filter, $event)"
+                   clrToggle 
+                   class="clr-toggle">
+            <label class="toggle-label">{{ filter.field }}</label>
+          </div>
+        </div>
+      </div>
+    </div>
+    
+    <!-- Layer Filters -->
+    <div class="filter-group" *ngIf="hasActiveLayerFilters()">
+      <h4>Layer Filters</h4>
+      <div class="filter-controls">
+        <div *ngFor="let filter of getActiveLayerFilters()" class="filter-item">
+          <div class="filter-label">{{ filter.field }} ({{ filter.type || 'text' }})</div>
+          
+          <!-- Text Filter -->
+          <div *ngIf="!filter.type || filter.type === 'text'" class="filter-input">
+            <input type="text" 
+                   [(ngModel)]="filter.value" 
+                   (ngModelChange)="onLayerFilterChange(filter)"
+                   [placeholder]="filter.field"
+                   class="clr-input filter-text-input">
+          </div>
+          
+          <!-- Dropdown Filter -->
+          <div *ngIf="filter.type === 'dropdown'" class="filter-input">
+            <select [(ngModel)]="filter.value" 
+                    (ngModelChange)="onLayerFilterChange(filter)"
+                    class="clr-select filter-select">
+              <option value="">Select {{ filter.field }}</option>
+              <option *ngFor="let option of getFilterOptions(filter)" [value]="option">{{ option }}</option>
+            </select>
+          </div>
+          
+          <!-- Multi-Select Filter - Updated to show key first, then dropdown on click -->
+          <div *ngIf="filter.type === 'multiselect'" class="filter-input multiselect-container">
+            <div class="multiselect-display" (click)="toggleMultiselect(filter, 'layer')">
+              <span class="multiselect-label">{{ filter.field }}</span>
+              <span class="multiselect-value" *ngIf="getSelectedOptionsCount(filter) > 0">
+                ({{ getSelectedOptionsCount(filter) }} selected)
+              </span>
+              <clr-icon shape="caret down" class="dropdown-icon"></clr-icon>
+            </div>
+            <div class="multiselect-dropdown" *ngIf="isMultiselectOpen(filter, 'layer')">
+              <div class="checkbox-group">
+                <div *ngFor="let option of getFilterOptions(filter); let i = index" class="checkbox-item">
+                  <input type="checkbox" 
+                         [checked]="isOptionSelected(filter, option)" 
+                         (change)="onMultiSelectChange(filter, option, $event)"
+                         [id]="'layer-' + filter.field + '-' + i" 
+                         class="clr-checkbox">
+                  <label [for]="'layer-' + filter.field + '-' + i" class="checkbox-label">{{ option }}</label>
+                </div>
+              </div>
+            </div>
+          </div>
+          
+          <!-- Date Range Filter -->
+          <div *ngIf="filter.type === 'date-range'" class="filter-input date-range">
+            <div class="date-input-group">
+              <input type="date" 
+                     [(ngModel)]="filter.value.start" 
+                     (ngModelChange)="onDateRangeChange(filter, { start: $event, end: filter.value.end })"
+                     placeholder="Start Date"
+                     class="clr-input filter-date">
+              <span class="date-separator">to</span>
+              <input type="date" 
+                     [(ngModel)]="filter.value.end" 
+                     (ngModelChange)="onDateRangeChange(filter, { start: filter.value.start, end: $event })"
+                     placeholder="End Date"
+                     class="clr-input filter-date">
+            </div>
+          </div>
+          
+          <!-- Toggle Filter -->
+          <div *ngIf="filter.type === 'toggle'" class="filter-input toggle">
+            <input type="checkbox" 
+                   [(ngModel)]="filter.value" 
+                   (ngModelChange)="onToggleChange(filter, $event)"
+                   clrToggle 
+                   class="clr-toggle">
+            <label class="toggle-label">{{ filter.field }}</label>
+          </div>
+        </div>
+      </div>
+    </div>
+    
+    <!-- Clear Filters Button -->
+    <div class="filter-actions">
+      <button class="btn btn-sm btn-outline" (click)="clearAllFilters()">Clear All Filters</button>
+    </div>
+  </div>
+  
+  <!-- Header row with chart title and drilldown navigation -->
+  <div class="clr-row header-row">
+    <div class="clr-col-6">
+      <h3 class="chart-title">{{charttitle || 'Dynamic Chart'}}</h3>
+    </div>
+    <div class="clr-col-6" style="text-align: right;">
+      <!-- Add drilldown navigation controls -->
+      <button class="btn btn-sm btn-link" *ngIf="drilldownEnabled && drilldownStack.length > 0" (click)="navigateBack()">
+        <cds-icon shape="arrow" direction="left"></cds-icon>
+        Back to {{drilldownStack.length > 1 ? 'Previous Level' : 'Main Data'}}
+      </button>
+    </div>
+  </div>
+  
+  <!-- Show current drilldown level -->
+  <div class="clr-row" *ngIf="drilldownEnabled && drilldownStack.length > 0">
+    <div class="clr-col-12">
+      <div class="alert alert-info" style="padding: 8px 12px; margin-bottom: 12px;">
+        <div class="alert-items">
+          <div class="alert-item static">
+            <div class="alert-icon-wrapper">
+              <cds-icon class="alert-icon" shape="info-circle"></cds-icon>
+            </div>
+            <span class="alert-text">
+              Drilldown Level: {{currentDrilldownLevel}} 
+              <span *ngIf="drilldownStack.length > 0">
+                (Clicked on: {{drilldownStack[drilldownStack.length - 1].clickedLabel}})
+              </span>
+            </span>
+          </div>
+        </div>
+      </div>
+    </div>
+  </div>
+  
+  <!-- Existing content -->
   <!-- Drilldown mode indicator -->
   <div *ngIf="currentDrilldownLevel > 0" style="background-color: #e0e0e0; padding: 5px; margin-bottom: 10px; border-radius: 4px; text-align: center;">
     <span style="font-weight: bold; color: #333;">Drilldown Level: {{currentDrilldownLevel}}</span>
diff --git a/frontend/angular-clarity-master/src/app/modules/main/builder/dashboardnew/gadgets/dynamic-chart/dynamic-chart.component.scss b/frontend/angular-clarity-master/src/app/modules/main/builder/dashboardnew/gadgets/dynamic-chart/dynamic-chart.component.scss
index e69de29..a9282e4 100644
--- a/frontend/angular-clarity-master/src/app/modules/main/builder/dashboardnew/gadgets/dynamic-chart/dynamic-chart.component.scss
+++ b/frontend/angular-clarity-master/src/app/modules/main/builder/dashboardnew/gadgets/dynamic-chart/dynamic-chart.component.scss
@@ -0,0 +1,192 @@
+.filter-section {
+  margin-bottom: 20px;
+  padding: 15px;
+  border: 1px solid #ddd;
+  border-radius: 4px;
+  background-color: #f9f9f9;
+}
+
+.filter-group {
+  margin-bottom: 15px;
+  
+  h4 {
+    margin-top: 0;
+    margin-bottom: 10px;
+    color: #333;
+    font-weight: 600;
+  }
+}
+
+.filter-controls {
+  display: flex;
+  flex-wrap: wrap;
+  gap: 15px;
+}
+
+.filter-item {
+  flex: 1 1 300px;
+  min-width: 250px;
+  padding: 10px;
+  background: white;
+  border: 1px solid #e0e0e0;
+  border-radius: 4px;
+}
+
+.filter-label {
+  font-weight: 500;
+  margin-bottom: 8px;
+  color: #555;
+  font-size: 14px;
+}
+
+.filter-input {
+  width: 100%;
+  
+  .filter-text-input,
+  .filter-select,
+  .filter-date {
+    width: 100%;
+    padding: 6px 12px;
+    border: 1px solid #ccc;
+    border-radius: 4px;
+    font-size: 14px;
+  }
+  
+  .filter-select {
+    height: 34px;
+  }
+}
+
+.multiselect-container {
+  position: relative;
+}
+
+.multiselect-display {
+  display: flex;
+  align-items: center;
+  justify-content: space-between;
+  padding: 6px 12px;
+  border: 1px solid #ccc;
+  border-radius: 4px;
+  background: white;
+  cursor: pointer;
+  min-height: 34px;
+  
+  .multiselect-label {
+    flex: 1;
+    font-size: 14px;
+  }
+  
+  .multiselect-value {
+    color: #666;
+    font-size: 12px;
+    margin-right: 8px;
+  }
+  
+  .dropdown-icon {
+    flex-shrink: 0;
+    transition: transform 0.2s ease;
+  }
+  
+  &:hover {
+    border-color: #999;
+  }
+}
+
+.multiselect-dropdown {
+  position: absolute;
+  top: 100%;
+  left: 0;
+  right: 0;
+  z-index: 1000;
+  background: white;
+  border: 1px solid #ccc;
+  border-top: none;
+  border-radius: 0 0 4px 4px;
+  box-shadow: 0 2px 4px rgba(0,0,0,0.1);
+  max-height: 200px;
+  overflow-y: auto;
+  
+  .checkbox-group {
+    padding: 8px;
+    
+    .checkbox-item {
+      display: flex;
+      align-items: center;
+      gap: 8px;
+      padding: 4px 0;
+      
+      .checkbox-label {
+        margin: 0;
+        font-size: 14px;
+        cursor: pointer;
+      }
+    }
+  }
+}
+
+.date-range {
+  .date-input-group {
+    display: flex;
+    align-items: center;
+    gap: 8px;
+  }
+  
+  .date-separator {
+    margin: 0 5px;
+    color: #777;
+  }
+}
+
+.toggle {
+  display: flex;
+  align-items: center;
+  gap: 8px;
+  
+  .toggle-label {
+    margin: 0;
+    font-size: 14px;
+    cursor: pointer;
+  }
+}
+
+.filter-actions {
+  margin-top: 15px;
+  padding-top: 15px;
+  border-top: 1px solid #eee;
+  
+  .btn {
+    font-size: 13px;
+  }
+}
+
+// New header row styling
+.header-row {
+  margin-bottom: 15px;
+  padding-bottom: 10px;
+  border-bottom: 1px solid #eee;
+  
+  .chart-title {
+    margin: 0;
+    font-size: 18px;
+    font-weight: 600;
+    color: #333;
+  }
+}
+
+// Responsive design
+@media (max-width: 768px) {
+  .filter-controls {
+    flex-direction: column;
+  }
+  
+  .filter-item {
+    min-width: 100%;
+  }
+  
+  .header-row {
+    .chart-title {
+      font-size: 16px;
+    }
+  }
+}
\ No newline at end of file
diff --git a/frontend/angular-clarity-master/src/app/modules/main/builder/dashboardnew/gadgets/dynamic-chart/dynamic-chart.component.ts b/frontend/angular-clarity-master/src/app/modules/main/builder/dashboardnew/gadgets/dynamic-chart/dynamic-chart.component.ts
index a7523e2..646685e 100644
--- a/frontend/angular-clarity-master/src/app/modules/main/builder/dashboardnew/gadgets/dynamic-chart/dynamic-chart.component.ts
+++ b/frontend/angular-clarity-master/src/app/modules/main/builder/dashboardnew/gadgets/dynamic-chart/dynamic-chart.component.ts
@@ -2,6 +2,8 @@ import { Component, OnInit, ViewChild, Input, OnChanges, SimpleChanges } from '@
 import { ChartConfiguration, ChartData, ChartDataset } from 'chart.js';
 import { BaseChartDirective } from 'ng2-charts';
 import { Dashboard3Service } from 'src/app/services/builder/dashboard3.service';
+import { FilterService } from '../../common-filter/filter.service';
+import { Subscription } from 'rxjs';
 
 @Component({
   selector: 'app-dynamic-chart',
@@ -37,9 +39,20 @@ export class DynamicChartComponent implements OnInit, OnChanges {
 
   @ViewChild(BaseChartDirective) chart: BaseChartDirective | undefined;
 
-  constructor(private dashboardService: Dashboard3Service) { }
+  constructor(
+    private dashboardService: Dashboard3Service,
+    private filterService: FilterService
+  ) { }
 
   ngOnInit(): void {
+    // Subscribe to filter changes
+    this.subscriptions.push(
+      this.filterService.filterState$.subscribe(filters => {
+        // When filters change, refresh the chart data
+        this.fetchChartData();
+      })
+    );
+    
     // Initialize with default data
     this.fetchChartData();
   }
@@ -47,6 +60,12 @@ export class DynamicChartComponent implements OnInit, OnChanges {
   ngOnChanges(changes: SimpleChanges): void {
     console.log('DynamicChartComponent input changes:', changes);
     
+    // Initialize filter values if they haven't been initialized yet
+    if (!this.filtersInitialized && (changes.baseFilters || changes.drilldownFilters || changes.drilldownLayers)) {
+      this.initializeFilterValues();
+      this.filtersInitialized = true;
+    }
+    
     // Check if any of the key properties have changed
     const xAxisChanged = changes.xAxis && !changes.xAxis.firstChange;
     const yAxisChanged = changes.yAxis && !changes.yAxis.firstChange;
@@ -106,6 +125,14 @@ export class DynamicChartComponent implements OnInit, OnChanges {
   
   // Flag to prevent infinite loops
   private isFetchingData: boolean = false;
+  
+  // Add properties for filter functionality
+  private openMultiselects: Map<string, string> = new Map(); // Map of filterId -> context
+  private documentClickHandler: ((event: MouseEvent) => void) | null = null;
+  private filtersInitialized: boolean = false;
+  
+  // Subscriptions to unsubscribe on destroy
+  private subscriptions: Subscription[] = [];
 	
 	fetchChartData(): void {
     // Set flag to prevent recursive calls
@@ -139,7 +166,49 @@ export class DynamicChartComponent implements OnInit, OnChanges {
           filterParams = JSON.stringify(filterObj);
         }
       }
-      console.log('Base filter parameters:', filterParams);
+      
+      // Add common filters to filter parameters
+      const commonFilters = this.filterService.getFilterValues();
+      console.log('Common filters from service:', commonFilters);
+      
+      if (Object.keys(commonFilters).length > 0) {
+        // Merge common filters with base filters
+        const mergedFilterObj = {};
+        
+        // Add base filters first
+        if (filterParams) {
+          try {
+            const baseFilterObj = JSON.parse(filterParams);
+            Object.assign(mergedFilterObj, baseFilterObj);
+          } catch (e) {
+            console.warn('Failed to parse base filter parameters:', e);
+          }
+        }
+        
+        // Add common filters using the field name as the key, not the filter id
+        Object.keys(commonFilters).forEach(filterId => {
+          const filterValue = commonFilters[filterId];
+          // Find the filter definition to get the field name
+          const filterDef = this.filterService.getFilters().find(f => f.id === filterId);
+          if (filterDef && filterDef.field) {
+            const fieldName = filterDef.field;
+            if (filterValue !== undefined && filterValue !== null && filterValue !== '') {
+              mergedFilterObj[fieldName] = filterValue;
+            }
+          } else {
+            // Fallback to using filterId as field name if no field is defined
+            if (filterValue !== undefined && filterValue !== null && filterValue !== '') {
+              mergedFilterObj[filterId] = filterValue;
+            }
+          }
+        });
+        
+        if (Object.keys(mergedFilterObj).length > 0) {
+          filterParams = JSON.stringify(mergedFilterObj);
+        }
+      }
+      
+      console.log('Final filter parameters:', filterParams);
       
       // Log the URL that will be called
       const url = `chart/getdashjson/dynamic?tableName=${this.table}&xAxis=${this.xAxis}&yAxes=${yAxisString}${this.connection ? `&sureId=${this.connection}` : ''}`;
@@ -504,4 +573,322 @@ export class DynamicChartComponent implements OnInit, OnChanges {
     }
     this.dynamicChartData = _dynamicChartData;
   }
+  
+  ngOnDestroy(): void {
+    // Unsubscribe from all subscriptions to prevent memory leaks
+    this.subscriptions.forEach(subscription => subscription.unsubscribe());
+    
+    // Remove document click handler if it exists
+    this.removeDocumentClickHandler();
+  }
+  
+  // Initialize filter values with proper default values based on type
+  private initializeFilterValues(): void {
+    console.log('Initializing filter values');
+    
+    // Initialize base filters
+    if (this.baseFilters) {
+      this.baseFilters.forEach(filter => {
+        if (filter.value === undefined || filter.value === null) {
+          switch (filter.type) {
+            case 'multiselect':
+              filter.value = [];
+              break;
+            case 'date-range':
+              filter.value = { start: null, end: null };
+              break;
+            case 'toggle':
+              filter.value = false;
+              break;
+            default:
+              filter.value = '';
+          }
+        }
+      });
+    }
+    
+    // Initialize drilldown filters
+    if (this.drilldownFilters) {
+      this.drilldownFilters.forEach(filter => {
+        if (filter.value === undefined || filter.value === null) {
+          switch (filter.type) {
+            case 'multiselect':
+              filter.value = [];
+              break;
+            case 'date-range':
+              filter.value = { start: null, end: null };
+              break;
+            case 'toggle':
+              filter.value = false;
+              break;
+            default:
+              filter.value = '';
+          }
+        }
+      });
+    }
+    
+    // Initialize layer filters
+    if (this.drilldownLayers) {
+      this.drilldownLayers.forEach(layer => {
+        if (layer.filters) {
+          layer.filters.forEach((filter: any) => {
+            if (filter.value === undefined || filter.value === null) {
+              switch (filter.type) {
+                case 'multiselect':
+                  filter.value = [];
+                  break;
+                case 'date-range':
+                  filter.value = { start: null, end: null };
+                  break;
+                case 'toggle':
+                  filter.value = false;
+                  break;
+                default:
+                  filter.value = '';
+              }
+            }
+          });
+        }
+      });
+    }
+    
+    console.log('Filter values initialized:', {
+      baseFilters: this.baseFilters,
+      drilldownFilters: this.drilldownFilters,
+      drilldownLayers: this.drilldownLayers
+    });
+  }
+
+  // Check if there are active filters
+  hasActiveFilters(): boolean {
+    return (this.baseFilters && this.baseFilters.length > 0) || 
+           (this.drilldownFilters && this.drilldownFilters.length > 0) || 
+           this.hasActiveLayerFilters();
+  }
+
+  // Check if there are active layer filters for current drilldown level
+  hasActiveLayerFilters(): boolean {
+    if (this.currentDrilldownLevel > 1 && this.drilldownLayers && this.drilldownLayers.length > 0) {
+      const layerIndex = this.currentDrilldownLevel - 2; // -2 because level 1 is base drilldown
+      return layerIndex < this.drilldownLayers.length && 
+             this.drilldownLayers[layerIndex].filters && 
+             this.drilldownLayers[layerIndex].filters.length > 0;
+    }
+    return false;
+  }
+
+  // Get active layer filters for current drilldown level
+  getActiveLayerFilters(): any[] {
+    if (this.currentDrilldownLevel > 1 && this.drilldownLayers && this.drilldownLayers.length > 0) {
+      const layerIndex = this.currentDrilldownLevel - 2; // -2 because level 1 is base drilldown
+      if (layerIndex < this.drilldownLayers.length && 
+          this.drilldownLayers[layerIndex].filters) {
+        return this.drilldownLayers[layerIndex].filters;
+      }
+    }
+    return [];
+  }
+
+  // Get filter options for dropdown/multiselect filters
+  getFilterOptions(filter: any): string[] {
+    if (filter.options) {
+      if (Array.isArray(filter.options)) {
+        return filter.options;
+      } else if (typeof filter.options === 'string') {
+        return filter.options.split(',').map(opt => opt.trim()).filter(opt => opt);
+      }
+    }
+    return [];
+  }
+
+  // Check if an option is selected for multiselect filters
+  isOptionSelected(filter: any, option: string): boolean {
+    if (!filter.value) {
+      return false;
+    }
+    
+    if (Array.isArray(filter.value)) {
+      return filter.value.includes(option);
+    }
+    
+    return filter.value === option;
+  }
+
+  // Handle base filter changes
+  onBaseFilterChange(filter: any): void {
+    console.log('Base filter changed:', filter);
+    // Refresh data when filter changes
+    this.fetchChartData();
+  }
+
+  // Handle drilldown filter changes
+  onDrilldownFilterChange(filter: any): void {
+    console.log('Drilldown filter changed:', filter);
+    // Refresh data when filter changes
+    this.fetchChartData();
+  }
+
+  // Handle layer filter changes
+  onLayerFilterChange(filter: any): void {
+    console.log('Layer filter changed:', filter);
+    // Refresh data when filter changes
+    this.fetchChartData();
+  }
+
+  // Handle multiselect changes
+  onMultiSelectChange(filter: any, option: string, event: any): void {
+    const checked = event.target.checked;
+    
+    // Initialize filter.value as array if it's not already
+    if (!Array.isArray(filter.value)) {
+      filter.value = [];
+    }
+    
+    if (checked) {
+      // Add option to array if not already present
+      if (!filter.value.includes(option)) {
+        filter.value.push(option);
+      }
+    } else {
+      // Remove option from array
+      filter.value = filter.value.filter((item: string) => item !== option);
+    }
+    
+    // Refresh data when filter changes
+    this.fetchChartData();
+  }
+
+  // Handle date range changes
+  onDateRangeChange(filter: any, dateRange: { start: string | null, end: string | null }): void {
+    filter.value = dateRange;
+    // Refresh data when filter changes
+    this.fetchChartData();
+  }
+
+  // Handle toggle changes
+  onToggleChange(filter: any, checked: boolean): void {
+    filter.value = checked;
+    // Refresh data when filter changes
+    this.fetchChartData();
+  }
+
+  // Toggle multiselect dropdown visibility
+  toggleMultiselect(filter: any, context: string): void {
+    const filterId = `${context}-${filter.field}`;
+    if (this.isMultiselectOpen(filter, context)) {
+      this.openMultiselects.delete(filterId);
+    } else {
+      // Close all other multiselects first
+      this.openMultiselects.clear();
+      this.openMultiselects.set(filterId, context);
+      
+      // Add document click handler to close dropdown when clicking outside
+      this.addDocumentClickHandler();
+    }
+  }
+
+  // Add document click handler to close dropdowns when clicking outside
+  private addDocumentClickHandler(): void {
+    if (!this.documentClickHandler) {
+      this.documentClickHandler = (event: MouseEvent) => {
+        const target = event.target as HTMLElement;
+        // Check if click is outside any multiselect dropdown
+        if (!target.closest('.multiselect-container')) {
+          this.openMultiselects.clear();
+          this.removeDocumentClickHandler();
+        }
+      };
+      
+      // Use setTimeout to ensure the click event that opened the dropdown doesn't immediately close it
+      setTimeout(() => {
+        document.addEventListener('click', this.documentClickHandler!);
+      }, 0);
+    }
+  }
+
+  // Remove document click handler
+  private removeDocumentClickHandler(): void {
+    if (this.documentClickHandler) {
+      document.removeEventListener('click', this.documentClickHandler);
+      this.documentClickHandler = null;
+    }
+  }
+
+  // Check if multiselect dropdown is open
+  isMultiselectOpen(filter: any, context: string): boolean {
+    const filterId = `${context}-${filter.field}`;
+    return this.openMultiselects.has(filterId);
+  }
+
+  // Get count of selected options for a multiselect filter
+  getSelectedOptionsCount(filter: any): number {
+    if (!filter.value) {
+      return 0;
+    }
+    
+    if (Array.isArray(filter.value)) {
+      return filter.value.length;
+    }
+    
+    return 0;
+  }
+
+  // Clear all filters
+  clearAllFilters(): void {
+    // Clear base filters
+    if (this.baseFilters) {
+      this.baseFilters.forEach(filter => {
+        if (filter.type === 'multiselect') {
+          filter.value = [];
+        } else if (filter.type === 'date-range') {
+          filter.value = { start: null, end: null };
+        } else if (filter.type === 'toggle') {
+          filter.value = false;
+        } else {
+          filter.value = '';
+        }
+      });
+    }
+    
+    // Clear drilldown filters
+    if (this.drilldownFilters) {
+      this.drilldownFilters.forEach(filter => {
+        if (filter.type === 'multiselect') {
+          filter.value = [];
+        } else if (filter.type === 'date-range') {
+          filter.value = { start: null, end: null };
+        } else if (filter.type === 'toggle') {
+          filter.value = false;
+        } else {
+          filter.value = '';
+        }
+      });
+    }
+    
+    // Clear layer filters
+    if (this.drilldownLayers) {
+      this.drilldownLayers.forEach(layer => {
+        if (layer.filters) {
+          layer.filters.forEach((filter: any) => {
+            if (filter.type === 'multiselect') {
+              filter.value = [];
+            } else if (filter.type === 'date-range') {
+              filter.value = { start: null, end: null };
+            } else if (filter.type === 'toggle') {
+              filter.value = false;
+            } else {
+              filter.value = '';
+            }
+          });
+        }
+      });
+    }
+    
+    // Close all multiselect dropdowns
+    this.openMultiselects.clear();
+    
+    // Refresh data
+    this.fetchChartData();
+  }
 }
\ No newline at end of file
diff --git a/frontend/angular-clarity-master/src/app/modules/main/builder/dashboardnew/gadgets/financial-chart/financial-chart.component.html b/frontend/angular-clarity-master/src/app/modules/main/builder/dashboardnew/gadgets/financial-chart/financial-chart.component.html
index 6df8f0e..e4b9c59 100644
--- a/frontend/angular-clarity-master/src/app/modules/main/builder/dashboardnew/gadgets/financial-chart/financial-chart.component.html
+++ b/frontend/angular-clarity-master/src/app/modules/main/builder/dashboardnew/gadgets/financial-chart/financial-chart.component.html
@@ -1,4 +1,285 @@
 <div class="financial-chart-container">
+  <!-- Filter Controls Section -->
+  <div class="filter-section" *ngIf="hasActiveFilters()">
+    <!-- Base Filters -->
+    <div class="filter-group" *ngIf="baseFilters && baseFilters.length > 0">
+      <h4>Base Filters</h4>
+      <div class="filter-controls">
+        <div *ngFor="let filter of baseFilters" class="filter-item">
+          <div class="filter-label">{{ filter.field }} ({{ filter.type || 'text' }})</div>
+          
+          <!-- Text Filter -->
+          <div *ngIf="!filter.type || filter.type === 'text'" class="filter-input">
+            <input type="text" 
+                   [(ngModel)]="filter.value" 
+                   (ngModelChange)="onBaseFilterChange(filter)"
+                   [placeholder]="filter.field"
+                   class="clr-input filter-text-input">
+          </div>
+          
+          <!-- Dropdown Filter -->
+          <div *ngIf="filter.type === 'dropdown'" class="filter-input">
+            <select [(ngModel)]="filter.value" 
+                    (ngModelChange)="onBaseFilterChange(filter)"
+                    class="clr-select filter-select">
+              <option value="">Select {{ filter.field }}</option>
+              <option *ngFor="let option of getFilterOptions(filter)" [value]="option">{{ option }}</option>
+            </select>
+          </div>
+          
+          <!-- Multi-Select Filter - Updated to show key first, then dropdown on click -->
+          <div *ngIf="filter.type === 'multiselect'" class="filter-input multiselect-container">
+            <div class="multiselect-display" (click)="toggleMultiselect(filter, 'base')">
+              <span class="multiselect-label">{{ filter.field }}</span>
+              <span class="multiselect-value" *ngIf="getSelectedOptionsCount(filter) > 0">
+                ({{ getSelectedOptionsCount(filter) }} selected)
+              </span>
+              <clr-icon shape="caret down" class="dropdown-icon"></clr-icon>
+            </div>
+            <div class="multiselect-dropdown" *ngIf="isMultiselectOpen(filter, 'base')">
+              <div class="checkbox-group">
+                <div *ngFor="let option of getFilterOptions(filter); let i = index" class="checkbox-item">
+                  <input type="checkbox" 
+                         [checked]="isOptionSelected(filter, option)" 
+                         (change)="onMultiSelectChange(filter, option, $event)"
+                         [id]="'base-' + filter.field + '-' + i" 
+                         class="clr-checkbox">
+                  <label [for]="'base-' + filter.field + '-' + i" class="checkbox-label">{{ option }}</label>
+                </div>
+              </div>
+            </div>
+          </div>
+          
+          <!-- Date Range Filter -->
+          <div *ngIf="filter.type === 'date-range'" class="filter-input date-range">
+            <div class="date-input-group">
+              <input type="date" 
+                     [(ngModel)]="filter.value.start" 
+                     (ngModelChange)="onDateRangeChange(filter, { start: $event, end: filter.value.end })"
+                     placeholder="Start Date"
+                     class="clr-input filter-date">
+              <span class="date-separator">to</span>
+              <input type="date" 
+                     [(ngModel)]="filter.value.end" 
+                     (ngModelChange)="onDateRangeChange(filter, { start: filter.value.start, end: $event })"
+                     placeholder="End Date"
+                     class="clr-input filter-date">
+            </div>
+          </div>
+          
+          <!-- Toggle Filter -->
+          <div *ngIf="filter.type === 'toggle'" class="filter-input toggle">
+            <input type="checkbox" 
+                   [(ngModel)]="filter.value" 
+                   (ngModelChange)="onToggleChange(filter, $event)"
+                   clrToggle 
+                   class="clr-toggle">
+            <label class="toggle-label">{{ filter.field }}</label>
+          </div>
+        </div>
+      </div>
+    </div>
+    
+    <!-- Drilldown Filters -->
+    <div class="filter-group" *ngIf="drilldownFilters && drilldownFilters.length > 0 && currentDrilldownLevel > 0">
+      <h4>Drilldown Filters</h4>
+      <div class="filter-controls">
+        <div *ngFor="let filter of drilldownFilters" class="filter-item">
+          <div class="filter-label">{{ filter.field }} ({{ filter.type || 'text' }})</div>
+          
+          <!-- Text Filter -->
+          <div *ngIf="!filter.type || filter.type === 'text'" class="filter-input">
+            <input type="text" 
+                   [(ngModel)]="filter.value" 
+                   (ngModelChange)="onDrilldownFilterChange(filter)"
+                   [placeholder]="filter.field"
+                   class="clr-input filter-text-input">
+          </div>
+          
+          <!-- Dropdown Filter -->
+          <div *ngIf="filter.type === 'dropdown'" class="filter-input">
+            <select [(ngModel)]="filter.value" 
+                    (ngModelChange)="onDrilldownFilterChange(filter)"
+                    class="clr-select filter-select">
+              <option value="">Select {{ filter.field }}</option>
+              <option *ngFor="let option of getFilterOptions(filter)" [value]="option">{{ option }}</option>
+            </select>
+          </div>
+          
+          <!-- Multi-Select Filter - Updated to show key first, then dropdown on click -->
+          <div *ngIf="filter.type === 'multiselect'" class="filter-input multiselect-container">
+            <div class="multiselect-display" (click)="toggleMultiselect(filter, 'drilldown')">
+              <span class="multiselect-label">{{ filter.field }}</span>
+              <span class="multiselect-value" *ngIf="getSelectedOptionsCount(filter) > 0">
+                ({{ getSelectedOptionsCount(filter) }} selected)
+              </span>
+              <clr-icon shape="caret down" class="dropdown-icon"></clr-icon>
+            </div>
+            <div class="multiselect-dropdown" *ngIf="isMultiselectOpen(filter, 'drilldown')">
+              <div class="checkbox-group">
+                <div *ngFor="let option of getFilterOptions(filter); let i = index" class="checkbox-item">
+                  <input type="checkbox" 
+                         [checked]="isOptionSelected(filter, option)" 
+                         (change)="onMultiSelectChange(filter, option, $event)"
+                         [id]="'drilldown-' + filter.field + '-' + i" 
+                         class="clr-checkbox">
+                  <label [for]="'drilldown-' + filter.field + '-' + i" class="checkbox-label">{{ option }}</label>
+                </div>
+              </div>
+            </div>
+          </div>
+          
+          <!-- Date Range Filter -->
+          <div *ngIf="filter.type === 'date-range'" class="filter-input date-range">
+            <div class="date-input-group">
+              <input type="date" 
+                     [(ngModel)]="filter.value.start" 
+                     (ngModelChange)="onDateRangeChange(filter, { start: $event, end: filter.value.end })"
+                     placeholder="Start Date"
+                     class="clr-input filter-date">
+              <span class="date-separator">to</span>
+              <input type="date" 
+                     [(ngModel)]="filter.value.end" 
+                     (ngModelChange)="onDateRangeChange(filter, { start: filter.value.start, end: $event })"
+                     placeholder="End Date"
+                     class="clr-input filter-date">
+            </div>
+          </div>
+          
+          <!-- Toggle Filter -->
+          <div *ngIf="filter.type === 'toggle'" class="filter-input toggle">
+            <input type="checkbox" 
+                   [(ngModel)]="filter.value" 
+                   (ngModelChange)="onToggleChange(filter, $event)"
+                   clrToggle 
+                   class="clr-toggle">
+            <label class="toggle-label">{{ filter.field }}</label>
+          </div>
+        </div>
+      </div>
+    </div>
+    
+    <!-- Layer Filters -->
+    <div class="filter-group" *ngIf="hasActiveLayerFilters()">
+      <h4>Layer Filters</h4>
+      <div class="filter-controls">
+        <div *ngFor="let filter of getActiveLayerFilters()" class="filter-item">
+          <div class="filter-label">{{ filter.field }} ({{ filter.type || 'text' }})</div>
+          
+          <!-- Text Filter -->
+          <div *ngIf="!filter.type || filter.type === 'text'" class="filter-input">
+            <input type="text" 
+                   [(ngModel)]="filter.value" 
+                   (ngModelChange)="onLayerFilterChange(filter)"
+                   [placeholder]="filter.field"
+                   class="clr-input filter-text-input">
+          </div>
+          
+          <!-- Dropdown Filter -->
+          <div *ngIf="filter.type === 'dropdown'" class="filter-input">
+            <select [(ngModel)]="filter.value" 
+                    (ngModelChange)="onLayerFilterChange(filter)"
+                    class="clr-select filter-select">
+              <option value="">Select {{ filter.field }}</option>
+              <option *ngFor="let option of getFilterOptions(filter)" [value]="option">{{ option }}</option>
+            </select>
+          </div>
+          
+          <!-- Multi-Select Filter - Updated to show key first, then dropdown on click -->
+          <div *ngIf="filter.type === 'multiselect'" class="filter-input multiselect-container">
+            <div class="multiselect-display" (click)="toggleMultiselect(filter, 'layer')">
+              <span class="multiselect-label">{{ filter.field }}</span>
+              <span class="multiselect-value" *ngIf="getSelectedOptionsCount(filter) > 0">
+                ({{ getSelectedOptionsCount(filter) }} selected)
+              </span>
+              <clr-icon shape="caret down" class="dropdown-icon"></clr-icon>
+            </div>
+            <div class="multiselect-dropdown" *ngIf="isMultiselectOpen(filter, 'layer')">
+              <div class="checkbox-group">
+                <div *ngFor="let option of getFilterOptions(filter); let i = index" class="checkbox-item">
+                  <input type="checkbox" 
+                         [checked]="isOptionSelected(filter, option)" 
+                         (change)="onMultiSelectChange(filter, option, $event)"
+                         [id]="'layer-' + filter.field + '-' + i" 
+                         class="clr-checkbox">
+                  <label [for]="'layer-' + filter.field + '-' + i" class="checkbox-label">{{ option }}</label>
+                </div>
+              </div>
+            </div>
+          </div>
+          
+          <!-- Date Range Filter -->
+          <div *ngIf="filter.type === 'date-range'" class="filter-input date-range">
+            <div class="date-input-group">
+              <input type="date" 
+                     [(ngModel)]="filter.value.start" 
+                     (ngModelChange)="onDateRangeChange(filter, { start: $event, end: filter.value.end })"
+                     placeholder="Start Date"
+                     class="clr-input filter-date">
+              <span class="date-separator">to</span>
+              <input type="date" 
+                     [(ngModel)]="filter.value.end" 
+                     (ngModelChange)="onDateRangeChange(filter, { start: filter.value.start, end: $event })"
+                     placeholder="End Date"
+                     class="clr-input filter-date">
+            </div>
+          </div>
+          
+          <!-- Toggle Filter -->
+          <div *ngIf="filter.type === 'toggle'" class="filter-input toggle">
+            <input type="checkbox" 
+                   [(ngModel)]="filter.value" 
+                   (ngModelChange)="onToggleChange(filter, $event)"
+                   clrToggle 
+                   class="clr-toggle">
+            <label class="toggle-label">{{ filter.field }}</label>
+          </div>
+        </div>
+      </div>
+    </div>
+    
+    <!-- Clear Filters Button -->
+    <div class="filter-actions">
+      <button class="btn btn-sm btn-outline" (click)="clearAllFilters()">Clear All Filters</button>
+    </div>
+  </div>
+  
+  <!-- Header row with chart title and drilldown navigation -->
+  <div class="clr-row header-row">
+    <div class="clr-col-6">
+      <h3 class="chart-title">{{charttitle || 'Financial Chart'}}</h3>
+    </div>
+    <div class="clr-col-6" style="text-align: right;">
+      <!-- Add drilldown navigation controls -->
+      <button class="btn btn-sm btn-link" *ngIf="drilldownEnabled && drilldownStack.length > 0" (click)="navigateBack()">
+        <cds-icon shape="arrow" direction="left"></cds-icon>
+        Back to {{drilldownStack.length > 1 ? 'Previous Level' : 'Main Data'}}
+      </button>
+    </div>
+  </div>
+  
+  <!-- Show current drilldown level -->
+  <div class="clr-row" *ngIf="drilldownEnabled && drilldownStack.length > 0">
+    <div class="clr-col-12">
+      <div class="alert alert-info" style="padding: 8px 12px; margin-bottom: 12px;">
+        <div class="alert-items">
+          <div class="alert-item static">
+            <div class="alert-icon-wrapper">
+              <cds-icon class="alert-icon" shape="info-circle"></cds-icon>
+            </div>
+            <span class="alert-text">
+              Drilldown Level: {{currentDrilldownLevel}} 
+              <span *ngIf="drilldownStack.length > 0">
+                (Clicked on: {{drilldownStack[drilldownStack.length - 1].clickedLabel}})
+              </span>
+            </span>
+          </div>
+        </div>
+      </div>
+    </div>
+  </div>
+  
+  <!-- Existing content -->
   <!-- Drilldown mode indicator -->
   <div *ngIf="currentDrilldownLevel > 0" style="background-color: #e0e0e0; padding: 5px; margin-bottom: 10px; border-radius: 4px; text-align: center;">
     <span style="font-weight: bold; color: #333;">Drilldown Level: {{currentDrilldownLevel}}</span>
diff --git a/frontend/angular-clarity-master/src/app/modules/main/builder/dashboardnew/gadgets/financial-chart/financial-chart.component.scss b/frontend/angular-clarity-master/src/app/modules/main/builder/dashboardnew/gadgets/financial-chart/financial-chart.component.scss
index 03eca40..a9282e4 100644
--- a/frontend/angular-clarity-master/src/app/modules/main/builder/dashboardnew/gadgets/financial-chart/financial-chart.component.scss
+++ b/frontend/angular-clarity-master/src/app/modules/main/builder/dashboardnew/gadgets/financial-chart/financial-chart.component.scss
@@ -1,108 +1,192 @@
-.financial-chart-container {
-  display: flex;
-  flex-direction: column;
-  height: 400px;
-  min-height: 400px;
-  padding: 20px;
-  background: linear-gradient(135deg, #ffffff 0%, #f8f9fa 100%);
-  border-radius: 12px;
-  box-shadow: 0 4px 20px rgba(0, 0, 0, 0.15);
-  font-family: 'Segoe UI', Tahoma, Geneva, Verdana, sans-serif;
-  transition: all 0.3s ease;
-  border: 1px solid #eaeaea;
-}
-
-.financial-chart-container:hover {
-  box-shadow: 0 6px 25px rgba(0, 0, 0, 0.2);
-  transform: translateY(-2px);
-}
-
-.chart-title {
-  font-size: 26px;
-  font-weight: 700;
-  color: #2c3e50;
+.filter-section {
   margin-bottom: 20px;
-  text-align: center;
-  padding-bottom: 15px;
-  border-bottom: 2px solid #3498db;
-  text-shadow: 0 1px 2px rgba(0, 0, 0, 0.1);
+  padding: 15px;
+  border: 1px solid #ddd;
+  border-radius: 4px;
+  background-color: #f9f9f9;
 }
 
-.chart-wrapper {
-  position: relative;
-  flex: 1;
-  min-height: 250px;
-  margin: 15px 0;
-  background: #f8f9fa;
-  border: 1px solid #e9ecef;
-  border-radius: 8px;
-  padding: 10px;
-  display: flex;
-  align-items: center;
-  justify-content: center;
-}
-
-.chart-wrapper canvas {
-  max-width: 100%;
-  max-height: 100%;
-  filter: drop-shadow(0 2px 4px rgba(0,0,0,0.1));
-}
-
-.chart-wrapper canvas:hover {
-  filter: drop-shadow(0 4px 8px rgba(0,0,0,0.15));
-  transform: scale(1.02);
-  transition: all 0.3s ease;
-}
-
-.loading-indicator, .no-data-message {
-  text-align: center;
-  padding: 30px;
-  color: #666;
-  font-size: 18px;
-  font-style: italic;
-  display: flex;
-  flex-direction: column;
-  align-items: center;
-  justify-content: center;
-  height: 100%;
-}
-
-.loading-indicator p, .no-data-message p {
-  margin: 10px 0 0 0;
-}
-
-.spinner {
-  border: 4px solid #f3f3f3;
-  border-top: 4px solid #3498db;
-  border-radius: 50%;
-  width: 40px;
-  height: 40px;
-  animation: spin 1s linear infinite;
-  margin-bottom: 10px;
-}
-
-@keyframes spin {
-  0% { transform: rotate(0deg); }
-  100% { transform: rotate(360deg); }
-}
-
-/* Responsive design */
-@media (max-width: 768px) {
-  .financial-chart-container {
-    padding: 15px;
+.filter-group {
+  margin-bottom: 15px;
+  
+  h4 {
+    margin-top: 0;
+    margin-bottom: 10px;
+    color: #333;
+    font-weight: 600;
   }
+}
+
+.filter-controls {
+  display: flex;
+  flex-wrap: wrap;
+  gap: 15px;
+}
+
+.filter-item {
+  flex: 1 1 300px;
+  min-width: 250px;
+  padding: 10px;
+  background: white;
+  border: 1px solid #e0e0e0;
+  border-radius: 4px;
+}
+
+.filter-label {
+  font-weight: 500;
+  margin-bottom: 8px;
+  color: #555;
+  font-size: 14px;
+}
+
+.filter-input {
+  width: 100%;
+  
+  .filter-text-input,
+  .filter-select,
+  .filter-date {
+    width: 100%;
+    padding: 6px 12px;
+    border: 1px solid #ccc;
+    border-radius: 4px;
+    font-size: 14px;
+  }
+  
+  .filter-select {
+    height: 34px;
+  }
+}
+
+.multiselect-container {
+  position: relative;
+}
+
+.multiselect-display {
+  display: flex;
+  align-items: center;
+  justify-content: space-between;
+  padding: 6px 12px;
+  border: 1px solid #ccc;
+  border-radius: 4px;
+  background: white;
+  cursor: pointer;
+  min-height: 34px;
+  
+  .multiselect-label {
+    flex: 1;
+    font-size: 14px;
+  }
+  
+  .multiselect-value {
+    color: #666;
+    font-size: 12px;
+    margin-right: 8px;
+  }
+  
+  .dropdown-icon {
+    flex-shrink: 0;
+    transition: transform 0.2s ease;
+  }
+  
+  &:hover {
+    border-color: #999;
+  }
+}
+
+.multiselect-dropdown {
+  position: absolute;
+  top: 100%;
+  left: 0;
+  right: 0;
+  z-index: 1000;
+  background: white;
+  border: 1px solid #ccc;
+  border-top: none;
+  border-radius: 0 0 4px 4px;
+  box-shadow: 0 2px 4px rgba(0,0,0,0.1);
+  max-height: 200px;
+  overflow-y: auto;
+  
+  .checkbox-group {
+    padding: 8px;
+    
+    .checkbox-item {
+      display: flex;
+      align-items: center;
+      gap: 8px;
+      padding: 4px 0;
+      
+      .checkbox-label {
+        margin: 0;
+        font-size: 14px;
+        cursor: pointer;
+      }
+    }
+  }
+}
+
+.date-range {
+  .date-input-group {
+    display: flex;
+    align-items: center;
+    gap: 8px;
+  }
+  
+  .date-separator {
+    margin: 0 5px;
+    color: #777;
+  }
+}
+
+.toggle {
+  display: flex;
+  align-items: center;
+  gap: 8px;
+  
+  .toggle-label {
+    margin: 0;
+    font-size: 14px;
+    cursor: pointer;
+  }
+}
+
+.filter-actions {
+  margin-top: 15px;
+  padding-top: 15px;
+  border-top: 1px solid #eee;
+  
+  .btn {
+    font-size: 13px;
+  }
+}
+
+// New header row styling
+.header-row {
+  margin-bottom: 15px;
+  padding-bottom: 10px;
+  border-bottom: 1px solid #eee;
   
   .chart-title {
-    font-size: 20px;
-    margin-bottom: 15px;
+    margin: 0;
+    font-size: 18px;
+    font-weight: 600;
+    color: #333;
+  }
+}
+
+// Responsive design
+@media (max-width: 768px) {
+  .filter-controls {
+    flex-direction: column;
   }
   
-  .chart-wrapper {
-    min-height: 200px;
+  .filter-item {
+    min-width: 100%;
   }
   
-  .no-data-message {
-    font-size: 16px;
-    padding: 20px;
+  .header-row {
+    .chart-title {
+      font-size: 16px;
+    }
   }
 }
\ No newline at end of file
diff --git a/frontend/angular-clarity-master/src/app/modules/main/builder/dashboardnew/gadgets/financial-chart/financial-chart.component.ts b/frontend/angular-clarity-master/src/app/modules/main/builder/dashboardnew/gadgets/financial-chart/financial-chart.component.ts
index 7c11055..2528fba 100644
--- a/frontend/angular-clarity-master/src/app/modules/main/builder/dashboardnew/gadgets/financial-chart/financial-chart.component.ts
+++ b/frontend/angular-clarity-master/src/app/modules/main/builder/dashboardnew/gadgets/financial-chart/financial-chart.component.ts
@@ -1,5 +1,8 @@
 import { Component, OnInit, Input, OnChanges, SimpleChanges } from '@angular/core';
 import { Dashboard3Service } from 'src/app/services/builder/dashboard3.service';
+import { FilterService } from '../../common-filter/filter.service';
+import { Subscription } from 'rxjs';
+import { AlertsService } from 'src/app/services/fnd/alerts.service';
 
 @Component({
   selector: 'app-financial-chart',
@@ -33,9 +36,21 @@ export class FinancialChartComponent implements OnInit, OnChanges {
   // Multi-layer drilldown configuration inputs
   @Input() drilldownLayers: any[] = []; // Array of drilldown layer configurations
 
-  constructor(private dashboardService: Dashboard3Service) { }
+  constructor(
+    private dashboardService: Dashboard3Service,
+    private filterService: FilterService,
+    private alertService: AlertsService
+  ) { }
 
   ngOnInit(): void {
+    // Subscribe to filter changes
+    this.subscriptions.push(
+      this.filterService.filterState$.subscribe(filters => {
+        // When filters change, refresh the chart data
+        this.fetchChartData();
+      })
+    );
+    
     // Initialize with default data
     this.fetchChartData();
   }
@@ -43,6 +58,14 @@ export class FinancialChartComponent implements OnInit, OnChanges {
   ngOnChanges(changes: SimpleChanges): void {
     console.log('FinancialChartComponent input changes:', changes);
     
+    // Initialize filter values if they haven't been initialized yet
+    if (!this.filtersInitialized && (changes.baseFilters || changes.drilldownFilters || changes.drilldownLayers)) {
+      this.initializeFilterValues();
+      // Load filter options for dropdown/multiselect filters
+      this.loadFilterOptions();
+      this.filtersInitialized = true;
+    }
+    
     // Check if any of the key properties have changed
     const xAxisChanged = changes.xAxis && !changes.xAxis.firstChange;
     const yAxisChanged = changes.yAxis && !changes.yAxis.firstChange;
@@ -86,6 +109,14 @@ export class FinancialChartComponent implements OnInit, OnChanges {
   // Flag to prevent infinite loops
   private isFetchingData: boolean = false;
   
+  // Add properties for filter functionality
+  private openMultiselects: Map<string, string> = new Map(); // Map of filterId -> context
+  private documentClickHandler: ((event: MouseEvent) => void) | null = null;
+  private filtersInitialized: boolean = false;
+  
+  // Subscriptions to unsubscribe on destroy
+  private subscriptions: Subscription[] = [];
+  
   fetchChartData(): void {
     // Set flag to prevent recursive calls
     this.isFetchingData = true;
@@ -118,7 +149,49 @@ export class FinancialChartComponent implements OnInit, OnChanges {
           filterParams = JSON.stringify(filterObj);
         }
       }
-      console.log('Base filter parameters:', filterParams);
+      
+      // Add common filters to filter parameters
+      const commonFilters = this.filterService.getFilterValues();
+      console.log('Common filters from service:', commonFilters);
+      
+      if (Object.keys(commonFilters).length > 0) {
+        // Merge common filters with base filters
+        const mergedFilterObj = {};
+        
+        // Add base filters first
+        if (filterParams) {
+          try {
+            const baseFilterObj = JSON.parse(filterParams);
+            Object.assign(mergedFilterObj, baseFilterObj);
+          } catch (e) {
+            console.warn('Failed to parse base filter parameters:', e);
+          }
+        }
+        
+        // Add common filters using the field name as the key, not the filter id
+        Object.keys(commonFilters).forEach(filterId => {
+          const filterValue = commonFilters[filterId];
+          // Find the filter definition to get the field name
+          const filterDef = this.filterService.getFilters().find(f => f.id === filterId);
+          if (filterDef && filterDef.field) {
+            const fieldName = filterDef.field;
+            if (filterValue !== undefined && filterValue !== null && filterValue !== '') {
+              mergedFilterObj[fieldName] = filterValue;
+            }
+          } else {
+            // Fallback to using filterId as field name if no field is defined
+            if (filterValue !== undefined && filterValue !== null && filterValue !== '') {
+              mergedFilterObj[filterId] = filterValue;
+            }
+          }
+        });
+        
+        if (Object.keys(mergedFilterObj).length > 0) {
+          filterParams = JSON.stringify(mergedFilterObj);
+        }
+      }
+      
+      console.log('Final filter parameters:', filterParams);
       
       // Log the URL that will be called
       const url = `chart/getdashjson/financial?tableName=${this.table}&xAxis=${this.xAxis}&yAxes=${yAxisString}${this.connection ? `&sureId=${this.connection}` : ''}`;
@@ -496,4 +569,520 @@ export class FinancialChartComponent implements OnInit, OnChanges {
   public chartHovered(e: any): void {
     console.log(e);
   }
+  
+  // Initialize filter values with proper default values based on type
+  private initializeFilterValues(): void {
+    console.log('Initializing filter values');
+    
+    // Initialize base filters
+    if (this.baseFilters) {
+      this.baseFilters.forEach(filter => {
+        // Ensure filter has required properties
+        if (!filter.type) filter.type = 'text';
+        if (!filter.options) filter.options = '';
+        if (!filter.availableValues) filter.availableValues = '';
+        
+        if (filter.value === undefined || filter.value === null) {
+          switch (filter.type) {
+            case 'multiselect':
+              filter.value = [];
+              break;
+            case 'date-range':
+              filter.value = { start: null, end: null };
+              break;
+            case 'toggle':
+              filter.value = false;
+              break;
+            default:
+              filter.value = '';
+          }
+        }
+      });
+    }
+    
+    // Initialize drilldown filters
+    if (this.drilldownFilters) {
+      this.drilldownFilters.forEach(filter => {
+        // Ensure filter has required properties
+        if (!filter.type) filter.type = 'text';
+        if (!filter.options) filter.options = '';
+        if (!filter.availableValues) filter.availableValues = '';
+        
+        if (filter.value === undefined || filter.value === null) {
+          switch (filter.type) {
+            case 'multiselect':
+              filter.value = [];
+              break;
+            case 'date-range':
+              filter.value = { start: null, end: null };
+              break;
+            case 'toggle':
+              filter.value = false;
+              break;
+            default:
+              filter.value = '';
+          }
+        }
+      });
+    }
+    
+    // Initialize layer filters
+    if (this.drilldownLayers) {
+      this.drilldownLayers.forEach(layer => {
+        if (layer.filters) {
+          layer.filters.forEach((filter: any) => {
+            // Ensure filter has required properties
+            if (!filter.type) filter.type = 'text';
+            if (!filter.options) filter.options = '';
+            if (!filter.availableValues) filter.availableValues = '';
+            
+            if (filter.value === undefined || filter.value === null) {
+              switch (filter.type) {
+                case 'multiselect':
+                  filter.value = [];
+                  break;
+                case 'date-range':
+                  filter.value = { start: null, end: null };
+                  break;
+                case 'toggle':
+                  filter.value = false;
+                  break;
+                default:
+                  filter.value = '';
+              }
+            }
+          });
+        }
+      });
+    }
+    
+    console.log('Filter values initialized:', {
+      baseFilters: this.baseFilters,
+      drilldownFilters: this.drilldownFilters,
+      drilldownLayers: this.drilldownLayers
+    });
+  }
+
+  // Check if there are active filters
+  hasActiveFilters(): boolean {
+    return (this.baseFilters && this.baseFilters.length > 0) || 
+           (this.drilldownFilters && this.drilldownFilters.length > 0) || 
+           this.hasActiveLayerFilters();
+  }
+
+  // Check if there are active layer filters for current drilldown level
+  hasActiveLayerFilters(): boolean {
+    if (this.currentDrilldownLevel > 1 && this.drilldownLayers && this.drilldownLayers.length > 0) {
+      const layerIndex = this.currentDrilldownLevel - 2; // -2 because level 1 is base drilldown
+      return layerIndex < this.drilldownLayers.length && 
+             this.drilldownLayers[layerIndex].filters && 
+             this.drilldownLayers[layerIndex].filters.length > 0;
+    }
+    return false;
+  }
+
+  // Get active layer filters for current drilldown level
+  getActiveLayerFilters(): any[] {
+    if (this.currentDrilldownLevel > 1 && this.drilldownLayers && this.drilldownLayers.length > 0) {
+      const layerIndex = this.currentDrilldownLevel - 2; // -2 because level 1 is base drilldown
+      if (layerIndex < this.drilldownLayers.length && 
+          this.drilldownLayers[layerIndex].filters) {
+        return this.drilldownLayers[layerIndex].filters;
+      }
+    }
+    return [];
+  }
+
+  // Get filter options for dropdown/multiselect filters
+  getFilterOptions(filter: any): string[] {
+    if (filter.options) {
+      if (Array.isArray(filter.options)) {
+        return filter.options;
+      } else if (typeof filter.options === 'string') {
+        return filter.options.split(',').map(opt => opt.trim()).filter(opt => opt);
+      }
+    }
+    return [];
+  }
+
+  // Check if an option is selected for multiselect filters
+  isOptionSelected(filter: any, option: string): boolean {
+    if (!filter.value) {
+      return false;
+    }
+    
+    if (Array.isArray(filter.value)) {
+      return filter.value.includes(option);
+    }
+    
+    return filter.value === option;
+  }
+
+  // Handle base filter changes
+  onBaseFilterChange(filter: any): void {
+    console.log('Base filter changed:', filter);
+    // Refresh data when filter changes
+    this.fetchChartData();
+  }
+
+  // Handle drilldown filter changes
+  onDrilldownFilterChange(filter: any): void {
+    console.log('Drilldown filter changed:', filter);
+    // Refresh data when filter changes
+    this.fetchChartData();
+  }
+
+  // Handle layer filter changes
+  onLayerFilterChange(filter: any): void {
+    console.log('Layer filter changed:', filter);
+    // Refresh data when filter changes
+    this.fetchChartData();
+  }
+
+  // Handle multiselect changes
+  onMultiSelectChange(filter: any, option: string, event: any): void {
+    const checked = event.target.checked;
+    
+    // Initialize filter.value as array if it's not already
+    if (!Array.isArray(filter.value)) {
+      filter.value = [];
+    }
+    
+    if (checked) {
+      // Add option to array if not already present
+      if (!filter.value.includes(option)) {
+        filter.value.push(option);
+      }
+    } else {
+      // Remove option from array
+      filter.value = filter.value.filter((item: string) => item !== option);
+    }
+    
+    // Refresh data when filter changes
+    this.fetchChartData();
+  }
+
+  // Handle date range changes
+  onDateRangeChange(filter: any, dateRange: { start: string | null, end: string | null }): void {
+    filter.value = dateRange;
+    // Refresh data when filter changes
+    this.fetchChartData();
+  }
+
+  // Handle toggle changes
+  onToggleChange(filter: any, checked: boolean): void {
+    filter.value = checked;
+    // Refresh data when filter changes
+    this.fetchChartData();
+  }
+
+  // Toggle multiselect dropdown visibility
+  toggleMultiselect(filter: any, context: string): void {
+    const filterId = `${context}-${filter.field}`;
+    if (this.isMultiselectOpen(filter, context)) {
+      this.openMultiselects.delete(filterId);
+    } else {
+      // Close all other multiselects first
+      this.openMultiselects.clear();
+      this.openMultiselects.set(filterId, context);
+      
+      // Add document click handler to close dropdown when clicking outside
+      this.addDocumentClickHandler();
+    }
+  }
+
+  // Add document click handler to close dropdowns when clicking outside
+  private addDocumentClickHandler(): void {
+    if (!this.documentClickHandler) {
+      this.documentClickHandler = (event: MouseEvent) => {
+        const target = event.target as HTMLElement;
+        // Check if click is outside any multiselect dropdown
+        if (!target.closest('.multiselect-container')) {
+          this.openMultiselects.clear();
+          this.removeDocumentClickHandler();
+        }
+      };
+      
+      // Use setTimeout to ensure the click event that opened the dropdown doesn't immediately close it
+      setTimeout(() => {
+        document.addEventListener('click', this.documentClickHandler!);
+      }, 0);
+    }
+  }
+
+  // Remove document click handler
+  private removeDocumentClickHandler(): void {
+    if (this.documentClickHandler) {
+      document.removeEventListener('click', this.documentClickHandler);
+      this.documentClickHandler = null;
+    }
+  }
+
+  // Check if multiselect dropdown is open
+  isMultiselectOpen(filter: any, context: string): boolean {
+    const filterId = `${context}-${filter.field}`;
+    return this.openMultiselects.has(filterId);
+  }
+
+  // Get count of selected options for a multiselect filter
+  getSelectedOptionsCount(filter: any): number {
+    if (!filter.value) {
+      return 0;
+    }
+    
+    if (Array.isArray(filter.value)) {
+      return filter.value.length;
+    }
+    
+    return 0;
+  }
+
+  // Clear all filters
+  clearAllFilters(): void {
+    // Clear base filters
+    if (this.baseFilters) {
+      this.baseFilters.forEach(filter => {
+        if (filter.type === 'multiselect') {
+          filter.value = [];
+        } else if (filter.type === 'date-range') {
+          filter.value = { start: null, end: null };
+        } else if (filter.type === 'toggle') {
+          filter.value = false;
+        } else {
+          filter.value = '';
+        }
+      });
+    }
+    
+    // Clear drilldown filters
+    if (this.drilldownFilters) {
+      this.drilldownFilters.forEach(filter => {
+        if (filter.type === 'multiselect') {
+          filter.value = [];
+        } else if (filter.type === 'date-range') {
+          filter.value = { start: null, end: null };
+        } else if (filter.type === 'toggle') {
+          filter.value = false;
+        } else {
+          filter.value = '';
+        }
+      });
+    }
+    
+    // Clear layer filters
+    if (this.drilldownLayers) {
+      this.drilldownLayers.forEach(layer => {
+        if (layer.filters) {
+          layer.filters.forEach((filter: any) => {
+            if (filter.type === 'multiselect') {
+              filter.value = [];
+            } else if (filter.type === 'date-range') {
+              filter.value = { start: null, end: null };
+            } else if (filter.type === 'toggle') {
+              filter.value = false;
+            } else {
+              filter.value = '';
+            }
+          });
+        }
+      });
+    }
+    
+    // Close all multiselect dropdowns
+    this.openMultiselects.clear();
+    
+    // Refresh data
+    this.fetchChartData();
+  }
+  
+  ngOnDestroy(): void {
+    // Unsubscribe from all subscriptions to prevent memory leaks
+    this.subscriptions.forEach(subscription => subscription.unsubscribe());
+    
+    // Remove document click handler if it exists
+    this.removeDocumentClickHandler();
+  }
+
+  // Load filter options for dropdown and multiselect filters
+  private loadFilterOptions(): void {
+    console.log('Loading filter options');
+    
+    // Load options for base filters
+    if (this.baseFilters && this.table) {
+      this.baseFilters.forEach((filter, index) => {
+        if ((filter.type === 'dropdown' || filter.type === 'multiselect') && filter.field) {
+          this.loadFilterValuesForField(this.table, this.connection, filter.field, index, 'base');
+        }
+      });
+    }
+    
+    // Load options for drilldown filters
+    if (this.drilldownFilters && this.drilldownApiUrl) {
+      this.drilldownFilters.forEach((filter, index) => {
+        if ((filter.type === 'dropdown' || filter.type === 'multiselect') && filter.field) {
+          this.loadFilterValuesForField(this.drilldownApiUrl, this.connection, filter.field, index, 'drilldown');
+        }
+      });
+    }
+    
+    // Load options for layer filters
+    if (this.drilldownLayers) {
+      this.drilldownLayers.forEach((layer, layerIndex) => {
+        if (layer.filters && layer.apiUrl) {
+          layer.filters.forEach((filter, filterIndex) => {
+            if ((filter.type === 'dropdown' || filter.type === 'multiselect') && filter.field) {
+              this.loadFilterValuesForField(layer.apiUrl, this.connection, filter.field, filterIndex, 'layer', layerIndex);
+            }
+          });
+        }
+      });
+    }
+  }
+
+  // Load filter values for a specific field
+  private loadFilterValuesForField(
+    apiUrl: string, 
+    connectionId: number | undefined, 
+    field: string, 
+    filterIndex: number, 
+    filterType: 'base' | 'drilldown' | 'layer',
+    layerIndex?: number
+  ): void {
+    if (apiUrl && field) {
+      this.alertService.getValuesFromUrl(apiUrl, connectionId, field).subscribe(
+        (values: string[]) => {
+          console.log(`Loaded filter values for ${filterType} filter ${field}:`, values);
+          
+          // Update the filter with available values
+          if (filterType === 'base') {
+            const filter = this.baseFilters[filterIndex];
+            if (filter) {
+              filter.availableValues = values.join(', ');
+              // For dropdown/multiselect types, also update the options
+              if (filter.type === 'dropdown' || filter.type === 'multiselect') {
+                filter.options = filter.availableValues;
+              }
+            }
+          } else if (filterType === 'drilldown') {
+            const filter = this.drilldownFilters[filterIndex];
+            if (filter) {
+              filter.availableValues = values.join(', ');
+              // For dropdown/multiselect types, also update the options
+              if (filter.type === 'dropdown' || filter.type === 'multiselect') {
+                filter.options = filter.availableValues;
+              }
+            }
+          } else if (filterType === 'layer' && layerIndex !== undefined) {
+            const layer = this.drilldownLayers[layerIndex];
+            if (layer && layer.filters) {
+              const filter = layer.filters[filterIndex];
+              if (filter) {
+                filter.availableValues = values.join(', ');
+                // For dropdown/multiselect types, also update the options
+                if (filter.type === 'dropdown' || filter.type === 'multiselect') {
+                  filter.options = filter.availableValues;
+                }
+              }
+            }
+          }
+        },
+        (error) => {
+          console.error('Error loading available values for field:', field, error);
+        }
+      );
+    }
+  }
+
+  // Handle base filter field change
+  onBaseFilterFieldChange(index: number, field: string): void {
+    const filter = this.baseFilters[index];
+    if (filter) {
+      filter.field = field;
+      // If field changes, reset value and options
+      filter.value = '';
+      filter.options = '';
+      filter.availableValues = '';
+      
+      // If we have a field and table URL, load available values
+      if (field && this.table && (filter.type === 'dropdown' || filter.type === 'multiselect')) {
+        this.loadFilterValuesForField(this.table, this.connection, field, index, 'base');
+      }
+    }
+  }
+
+  // Handle base filter type change
+  onBaseFilterTypeChange(index: number, type: string): void {
+    const filter = this.baseFilters[index];
+    if (filter) {
+      filter.type = type;
+      // If type changes to dropdown/multiselect and we have a field, load available values
+      if ((type === 'dropdown' || type === 'multiselect') && filter.field && this.table) {
+        this.loadFilterValuesForField(this.table, this.connection, filter.field, index, 'base');
+      }
+    }
+  }
+
+  // Handle drilldown filter field change
+  onDrilldownFilterFieldChange(index: number, field: string): void {
+    const filter = this.drilldownFilters[index];
+    if (filter) {
+      filter.field = field;
+      // If field changes, reset value and options
+      filter.value = '';
+      filter.options = '';
+      filter.availableValues = '';
+      
+      // If we have a field and drilldown API URL, load available values
+      if (field && this.drilldownApiUrl && (filter.type === 'dropdown' || filter.type === 'multiselect')) {
+        this.loadFilterValuesForField(this.drilldownApiUrl, this.connection, field, index, 'drilldown');
+      }
+    }
+  }
+
+  // Handle drilldown filter type change
+  onDrilldownFilterTypeChange(index: number, type: string): void {
+    const filter = this.drilldownFilters[index];
+    if (filter) {
+      filter.type = type;
+      // If type changes to dropdown/multiselect and we have a field, load available values
+      if ((type === 'dropdown' || type === 'multiselect') && filter.field && this.drilldownApiUrl) {
+        this.loadFilterValuesForField(this.drilldownApiUrl, this.connection, filter.field, index, 'drilldown');
+      }
+    }
+  }
+
+  // Handle layer filter field change
+  onLayerFilterFieldChange(layerIndex: number, filterIndex: number, field: string): void {
+    const layer = this.drilldownLayers[layerIndex];
+    if (layer && layer.filters) {
+      const filter = layer.filters[filterIndex];
+      if (filter) {
+        filter.field = field;
+        // If field changes, reset value and options
+        filter.value = '';
+        filter.options = '';
+        filter.availableValues = '';
+        
+        // If we have a field and layer API URL, load available values
+        if (field && layer.apiUrl && (filter.type === 'dropdown' || filter.type === 'multiselect')) {
+          this.loadFilterValuesForField(layer.apiUrl, this.connection, field, filterIndex, 'layer', layerIndex);
+        }
+      }
+    }
+  }
+
+  // Handle layer filter type change
+  onLayerFilterTypeChange(layerIndex: number, filterIndex: number, type: string): void {
+    const layer = this.drilldownLayers[layerIndex];
+    if (layer && layer.filters) {
+      const filter = layer.filters[filterIndex];
+      if (filter) {
+        filter.type = type;
+        // If type changes to dropdown/multiselect and we have a field, load available values
+        if ((type === 'dropdown' || type === 'multiselect') && filter.field && layer.apiUrl) {
+          this.loadFilterValuesForField(layer.apiUrl, this.connection, filter.field, filterIndex, 'layer', layerIndex);
+        }
+      }
+    }
+  }
 }
\ No newline at end of file
diff --git a/frontend/angular-clarity-master/src/app/modules/main/builder/dashboardnew/gadgets/grid-view/grid-view.component.html b/frontend/angular-clarity-master/src/app/modules/main/builder/dashboardnew/gadgets/grid-view/grid-view.component.html
index 2aad01b..67590d9 100644
--- a/frontend/angular-clarity-master/src/app/modules/main/builder/dashboardnew/gadgets/grid-view/grid-view.component.html
+++ b/frontend/angular-clarity-master/src/app/modules/main/builder/dashboardnew/gadgets/grid-view/grid-view.component.html
@@ -1,12 +1,289 @@
 <div style="display: block;">
   <div class="dg-wrapper">
-    <div class="clr-row">
-      <div class="clr-col-8">
-        <h3>{{charttitle || 'Data Grid'}}</h3>
+    <!-- Filter Controls Section -->
+    <div class="filter-section" *ngIf="hasActiveFilters()">
+      <!-- Base Filters -->
+      <div class="filter-group" *ngIf="baseFilters && baseFilters.length > 0">
+        <h4>Base Filters</h4>
+        <div class="filter-controls">
+          <div *ngFor="let filter of baseFilters" class="filter-item">
+            <div class="filter-label">{{ filter.field }} ({{ filter.type || 'text' }})</div>
+            
+            <!-- Text Filter -->
+            <div *ngIf="!filter.type || filter.type === 'text'" class="filter-input">
+              <input type="text" 
+                     [(ngModel)]="filter.value" 
+                     (ngModelChange)="onBaseFilterChange(filter)"
+                     [placeholder]="filter.field"
+                     class="clr-input filter-text-input">
+            </div>
+            
+            <!-- Dropdown Filter -->
+            <div *ngIf="filter.type === 'dropdown'" class="filter-input">
+              <select [(ngModel)]="filter.value" 
+                      (ngModelChange)="onBaseFilterChange(filter)"
+                      class="clr-select filter-select">
+                <option value="">Select {{ filter.field }}</option>
+                <option *ngFor="let option of getFilterOptions(filter)" [value]="option">{{ option }}</option>
+              </select>
+            </div>
+            
+            <!-- Multi-Select Filter - Updated to show key first, then dropdown on click -->
+            <div *ngIf="filter.type === 'multiselect'" class="filter-input multiselect-container">
+              <div class="multiselect-display" (click)="toggleMultiselect(filter, 'base')">
+                <span class="multiselect-label">{{ filter.field }}</span>
+                <span class="multiselect-value" *ngIf="getSelectedOptionsCount(filter) > 0">
+                  ({{ getSelectedOptionsCount(filter) }} selected)
+                </span>
+                <clr-icon shape="caret down" class="dropdown-icon"></clr-icon>
+              </div>
+              <div class="multiselect-dropdown" *ngIf="isMultiselectOpen(filter, 'base')">
+                <div class="checkbox-group">
+                  <div *ngFor="let option of getFilterOptions(filter); let i = index" class="checkbox-item">
+                    <input type="checkbox" 
+                           [checked]="isOptionSelected(filter, option)" 
+                           (change)="onMultiSelectChange(filter, option, $event)"
+                           [id]="'base-' + filter.field + '-' + i" 
+                           class="clr-checkbox">
+                    <label [for]="'base-' + filter.field + '-' + i" class="checkbox-label">{{ option }}</label>
+                  </div>
+                </div>
+              </div>
+            </div>
+            
+            <!-- Date Range Filter -->
+            <div *ngIf="filter.type === 'date-range'" class="filter-input date-range">
+              <div class="date-input-group">
+                <input type="date" 
+                       [(ngModel)]="filter.value.start" 
+                       (ngModelChange)="onDateRangeChange(filter, { start: $event, end: filter.value.end })"
+                       placeholder="Start Date"
+                       class="clr-input filter-date">
+                <span class="date-separator">to</span>
+                <input type="date" 
+                       [(ngModel)]="filter.value.end" 
+                       (ngModelChange)="onDateRangeChange(filter, { start: filter.value.start, end: $event })"
+                       placeholder="End Date"
+                       class="clr-input filter-date">
+              </div>
+            </div>
+            
+            <!-- Toggle Filter -->
+            <div *ngIf="filter.type === 'toggle'" class="filter-input toggle">
+              <input type="checkbox" 
+                     [(ngModel)]="filter.value" 
+                     (ngModelChange)="onToggleChange(filter, $event)"
+                     clrToggle 
+                     class="clr-toggle">
+              <label class="toggle-label">{{ filter.field }}</label>
+            </div>
+          </div>
+        </div>
+      </div>
+      
+      <!-- Drilldown Filters -->
+      <div class="filter-group" *ngIf="drilldownFilters && drilldownFilters.length > 0 && currentDrilldownLevel > 0">
+        <h4>Drilldown Filters</h4>
+        <div class="filter-controls">
+          <div *ngFor="let filter of drilldownFilters" class="filter-item">
+            <div class="filter-label">{{ filter.field }} ({{ filter.type || 'text' }})</div>
+            
+            <!-- Text Filter -->
+            <div *ngIf="!filter.type || filter.type === 'text'" class="filter-input">
+              <input type="text" 
+                     [(ngModel)]="filter.value" 
+                     (ngModelChange)="onDrilldownFilterChange(filter)"
+                     [placeholder]="filter.field"
+                     class="clr-input filter-text-input">
+            </div>
+            
+            <!-- Dropdown Filter -->
+            <div *ngIf="filter.type === 'dropdown'" class="filter-input">
+              <select [(ngModel)]="filter.value" 
+                      (ngModelChange)="onDrilldownFilterChange(filter)"
+                      class="clr-select filter-select">
+                <option value="">Select {{ filter.field }}</option>
+                <option *ngFor="let option of getFilterOptions(filter)" [value]="option">{{ option }}</option>
+              </select>
+            </div>
+            
+            <!-- Multi-Select Filter - Updated to show key first, then dropdown on click -->
+            <div *ngIf="filter.type === 'multiselect'" class="filter-input multiselect-container">
+              <div class="multiselect-display" (click)="toggleMultiselect(filter, 'drilldown')">
+                <span class="multiselect-label">{{ filter.field }}</span>
+                <span class="multiselect-value" *ngIf="getSelectedOptionsCount(filter) > 0">
+                  ({{ getSelectedOptionsCount(filter) }} selected)
+                </span>
+                <clr-icon shape="caret down" class="dropdown-icon"></clr-icon>
+              </div>
+              <div class="multiselect-dropdown" *ngIf="isMultiselectOpen(filter, 'drilldown')">
+                <div class="checkbox-group">
+                  <div *ngFor="let option of getFilterOptions(filter); let i = index" class="checkbox-item">
+                    <input type="checkbox" 
+                           [checked]="isOptionSelected(filter, option)" 
+                           (change)="onMultiSelectChange(filter, option, $event)"
+                           [id]="'drilldown-' + filter.field + '-' + i" 
+                           class="clr-checkbox">
+                    <label [for]="'drilldown-' + filter.field + '-' + i" class="checkbox-label">{{ option }}</label>
+                  </div>
+                </div>
+              </div>
+            </div>
+            
+            <!-- Date Range Filter -->
+            <div *ngIf="filter.type === 'date-range'" class="filter-input date-range">
+              <div class="date-input-group">
+                <input type="date" 
+                       [(ngModel)]="filter.value.start" 
+                       (ngModelChange)="onDateRangeChange(filter, { start: $event, end: filter.value.end })"
+                       placeholder="Start Date"
+                       class="clr-input filter-date">
+                <span class="date-separator">to</span>
+                <input type="date" 
+                       [(ngModel)]="filter.value.end" 
+                       (ngModelChange)="onDateRangeChange(filter, { start: filter.value.start, end: $event })"
+                       placeholder="End Date"
+                       class="clr-input filter-date">
+              </div>
+            </div>
+            
+            <!-- Toggle Filter -->
+            <div *ngIf="filter.type === 'toggle'" class="filter-input toggle">
+              <input type="checkbox" 
+                     [(ngModel)]="filter.value" 
+                     (ngModelChange)="onToggleChange(filter, $event)"
+                     clrToggle 
+                     class="clr-toggle">
+              <label class="toggle-label">{{ filter.field }}</label>
+            </div>
+          </div>
+        </div>
+      </div>
+      
+      <!-- Layer Filters -->
+      <div class="filter-group" *ngIf="hasActiveLayerFilters()">
+        <h4>Layer Filters</h4>
+        <div class="filter-controls">
+          <div *ngFor="let filter of getActiveLayerFilters()" class="filter-item">
+            <div class="filter-label">{{ filter.field }} ({{ filter.type || 'text' }})</div>
+            
+            <!-- Text Filter -->
+            <div *ngIf="!filter.type || filter.type === 'text'" class="filter-input">
+              <input type="text" 
+                     [(ngModel)]="filter.value" 
+                     (ngModelChange)="onLayerFilterChange(filter)"
+                     [placeholder]="filter.field"
+                     class="clr-input filter-text-input">
+            </div>
+            
+            <!-- Dropdown Filter -->
+            <div *ngIf="filter.type === 'dropdown'" class="filter-input">
+              <select [(ngModel)]="filter.value" 
+                      (ngModelChange)="onLayerFilterChange(filter)"
+                      class="clr-select filter-select">
+                <option value="">Select {{ filter.field }}</option>
+                <option *ngFor="let option of getFilterOptions(filter)" [value]="option">{{ option }}</option>
+              </select>
+            </div>
+            
+            <!-- Multi-Select Filter - Updated to show key first, then dropdown on click -->
+            <div *ngIf="filter.type === 'multiselect'" class="filter-input multiselect-container">
+              <div class="multiselect-display" (click)="toggleMultiselect(filter, 'layer')">
+                <span class="multiselect-label">{{ filter.field }}</span>
+                <span class="multiselect-value" *ngIf="getSelectedOptionsCount(filter) > 0">
+                  ({{ getSelectedOptionsCount(filter) }} selected)
+                </span>
+                <clr-icon shape="caret down" class="dropdown-icon"></clr-icon>
+              </div>
+              <div class="multiselect-dropdown" *ngIf="isMultiselectOpen(filter, 'layer')">
+                <div class="checkbox-group">
+                  <div *ngFor="let option of getFilterOptions(filter); let i = index" class="checkbox-item">
+                    <input type="checkbox" 
+                           [checked]="isOptionSelected(filter, option)" 
+                           (change)="onMultiSelectChange(filter, option, $event)"
+                           [id]="'layer-' + filter.field + '-' + i" 
+                           class="clr-checkbox">
+                    <label [for]="'layer-' + filter.field + '-' + i" class="checkbox-label">{{ option }}</label>
+                  </div>
+                </div>
+              </div>
+            </div>
+            
+            <!-- Date Range Filter -->
+            <div *ngIf="filter.type === 'date-range'" class="filter-input date-range">
+              <div class="date-input-group">
+                <input type="date" 
+                       [(ngModel)]="filter.value.start" 
+                       (ngModelChange)="onDateRangeChange(filter, { start: $event, end: filter.value.end })"
+                       placeholder="Start Date"
+                       class="clr-input filter-date">
+                <span class="date-separator">to</span>
+                <input type="date" 
+                       [(ngModel)]="filter.value.end" 
+                       (ngModelChange)="onDateRangeChange(filter, { start: filter.value.start, end: $event })"
+                       placeholder="End Date"
+                       class="clr-input filter-date">
+              </div>
+            </div>
+            
+            <!-- Toggle Filter -->
+            <div *ngIf="filter.type === 'toggle'" class="filter-input toggle">
+              <input type="checkbox" 
+                     [(ngModel)]="filter.value" 
+                     (ngModelChange)="onToggleChange(filter, $event)"
+                     clrToggle 
+                     class="clr-toggle">
+              <label class="toggle-label">{{ filter.field }}</label>
+            </div>
+          </div>
+        </div>
+      </div>
+      
+      <!-- Clear Filters Button -->
+      <div class="filter-actions">
+        <button class="btn btn-sm btn-outline" (click)="clearAllFilters()">Clear All Filters</button>
       </div>
     </div>
+    
+    <div class="clr-row">
+      <!-- <div class="clr-col-8">
+        <h3>{{charttitle || 'Data Grid'}}</h3>
+      </div> -->
+      <!-- Add drilldown navigation controls -->
+      <div class="clr-col-4" *ngIf="drilldownEnabled && drilldownStack.length > 0" style="text-align: right;">
+        <button class="btn btn-sm btn-link" (click)="navigateBack()">
+          <cds-icon shape="arrow" direction="left"></cds-icon>
+          Back to {{drilldownStack.length > 1 ? 'Previous Level' : 'Main Data'}}
+        </button>
+      </div>
+    </div>
+    
+    <!-- Show current drilldown level -->
+    <div class="clr-row" *ngIf="drilldownEnabled && drilldownStack.length > 0">
+      <div class="clr-col-12">
+        <div class="alert alert-info" style="padding: 8px 12px; margin-bottom: 12px;">
+          <div class="alert-items">
+            <div class="alert-item static">
+              <div class="alert-icon-wrapper">
+                <cds-icon class="alert-icon" shape="info-circle"></cds-icon>
+              </div>
+              <span class="alert-text">
+                Drilldown Level: {{currentDrilldownLevel}} 
+                <span *ngIf="drilldownStack.length > 0">
+                  (Clicked on: {{drilldownStack[drilldownStack.length - 1].clickedKey}} = {{drilldownStack[drilldownStack.length - 1].clickedValue}})
+                </span>
+              </span>
+            </div>
+          </div>
+        </div>
+      </div>
+    </div>
+    
     <clr-datagrid [clrDgLoading]="loading">
-      <clr-dg-placeholder> <ng-template #loadingSpinner><clr-spinner>Loading ... </clr-spinner></ng-template>
+      <clr-dg-placeholder> 
+        <ng-template #loadingSpinner>
+          <clr-spinner>Loading ... </clr-spinner>
+        </ng-template>
         <div *ngIf="error;else loadingSpinner">{{error}}</div>
       </clr-dg-placeholder>
 
@@ -19,7 +296,7 @@
 
       <clr-dg-row *clrDgItems="let item of givendata" [clrDgItem]="item">
         <!-- Dynamic cells based on response keys -->
-        <clr-dg-cell *ngFor="let header of dynamicHeaders">
+        <clr-dg-cell *ngFor="let header of dynamicHeaders" (click)="onRowClick(item, header.key)">
           {{item[header.key]}}
         </clr-dg-cell>
       </clr-dg-row>
diff --git a/frontend/angular-clarity-master/src/app/modules/main/builder/dashboardnew/gadgets/grid-view/grid-view.component.scss b/frontend/angular-clarity-master/src/app/modules/main/builder/dashboardnew/gadgets/grid-view/grid-view.component.scss
index 99c5f44..a2d9ba4 100644
--- a/frontend/angular-clarity-master/src/app/modules/main/builder/dashboardnew/gadgets/grid-view/grid-view.component.scss
+++ b/frontend/angular-clarity-master/src/app/modules/main/builder/dashboardnew/gadgets/grid-view/grid-view.component.scss
@@ -1,12 +1,180 @@
-@import '../../../../../../../styles1.scss';
-input.ng-invalid.ng-touched {
-  border-color: red;
+.filter-section {
+  margin-bottom: 20px;
+  padding: 15px;
+  border: 1px solid #ddd;
+  border-radius: 4px;
+  background-color: #f9f9f9;
 }
 
-.error_mess {
-  color: red;
+.filter-group {
+  margin-bottom: 15px;
+  
+  h4 {
+    margin-top: 0;
+    margin-bottom: 10px;
+    color: #333;
+    font-weight: 600;
+  }
 }
-clr-datagrid{
-    height: 400px; /* Adjust the height as needed */
+
+.filter-controls {
+  display: flex;
+  flex-wrap: wrap;
+  gap: 15px;
+}
+
+.filter-item {
+  flex: 1 1 300px;
+  min-width: 250px;
+  padding: 10px;
+  background: white;
+  border: 1px solid #e0e0e0;
+  border-radius: 4px;
+}
+
+.filter-label {
+  font-weight: 500;
+  margin-bottom: 8px;
+  color: #555;
+  font-size: 14px;
+}
+
+.filter-input {
+  width: 100%;
+  
+  .filter-text-input,
+  .filter-select,
+  .filter-date {
+    width: 100%;
+    padding: 6px 12px;
+    border: 1px solid #ccc;
+    border-radius: 4px;
+    font-size: 14px;
+  }
+  
+  .filter-select {
+    height: 34px;
+  }
+}
+
+.multiselect-container {
+  position: relative;
+}
+
+.multiselect-display {
+  display: flex;
+  align-items: center;
+  justify-content: space-between;
+  padding: 6px 12px;
+  border: 1px solid #ccc;
+  border-radius: 4px;
+  background: white;
+  cursor: pointer;
+  min-height: 34px;
+  
+  .multiselect-label {
+    flex: 1;
+    font-size: 14px;
+  }
+  
+  .multiselect-value {
+    color: #666;
+    font-size: 12px;
+    margin-right: 8px;
+  }
+  
+  .dropdown-icon {
+    flex-shrink: 0;
+    transition: transform 0.2s ease;
+  }
+  
+  &:hover {
+    border-color: #999;
+  }
+}
+
+.multiselect-dropdown {
+  position: absolute;
+  top: 100%;
+  left: 0;
+  right: 0;
+  z-index: 1000;
+  background: white;
+  border: 1px solid #ccc;
+  border-top: none;
+  border-radius: 0 0 4px 4px;
+  box-shadow: 0 2px 4px rgba(0,0,0,0.1);
+  max-height: 200px;
   overflow-y: auto;
+  
+  .checkbox-group {
+    padding: 8px;
+    
+    .checkbox-item {
+      display: flex;
+      align-items: center;
+      gap: 8px;
+      padding: 4px 0;
+      
+      .checkbox-label {
+        margin: 0;
+        font-size: 14px;
+        cursor: pointer;
+      }
+    }
+  }
+}
+
+.date-range {
+  .date-input-group {
+    display: flex;
+    align-items: center;
+    gap: 8px;
+  }
+  
+  .date-separator {
+    margin: 0 5px;
+    color: #777;
+  }
+}
+
+.toggle {
+  display: flex;
+  align-items: center;
+  gap: 8px;
+  
+  .toggle-label {
+    margin: 0;
+    font-size: 14px;
+    cursor: pointer;
+  }
+}
+
+.filter-actions {
+  margin-top: 15px;
+  padding-top: 15px;
+  border-top: 1px solid #eee;
+  
+  .btn {
+    font-size: 13px;
+  }
+}
+
+.dg-wrapper {
+  padding: 15px;
+}
+
+clr-datagrid {
+  margin-top: 10px;
+}
+
+// Responsive design
+@media (max-width: 768px) {
+  .filter-controls {
+    flex-direction: column;
+  }
+  
+  .filter-item {
+    min-width: 100%;
+  }
 }
\ No newline at end of file
diff --git a/frontend/angular-clarity-master/src/app/modules/main/builder/dashboardnew/gadgets/grid-view/grid-view.component.ts b/frontend/angular-clarity-master/src/app/modules/main/builder/dashboardnew/gadgets/grid-view/grid-view.component.ts
index 06f3023..bccaa81 100644
--- a/frontend/angular-clarity-master/src/app/modules/main/builder/dashboardnew/gadgets/grid-view/grid-view.component.ts
+++ b/frontend/angular-clarity-master/src/app/modules/main/builder/dashboardnew/gadgets/grid-view/grid-view.component.ts
@@ -1,13 +1,17 @@
-import { Component, OnInit, Input, OnChanges, SimpleChanges } from '@angular/core';
+import { Component, OnInit, Input, OnChanges, OnDestroy, SimpleChanges, ViewChild } from '@angular/core';
 import { UsergrpmaintainceService } from 'src/app/services/admin/usergrpmaintaince.service';
 import { Dashboard3Service } from 'src/app/services/builder/dashboard3.service';
+// Add FilterService import
+import { FilterService } from '../../common-filter/filter.service';
+// Add Subscription import
+import { Subscription } from 'rxjs';
 
 @Component({
   selector: 'app-grid-view',
   templateUrl: './grid-view.component.html',
   styleUrls: ['./grid-view.component.scss']
 })
-export class GridViewComponent implements OnInit, OnChanges {
+export class GridViewComponent implements OnInit, OnChanges, OnDestroy {
   @Input() xAxis: string;
   @Input() yAxis: string | string[];
   @Input() table: string;
@@ -23,6 +27,16 @@ export class GridViewComponent implements OnInit, OnChanges {
   @Input() datasource: string;
   @Input() fieldName: string;
   @Input() connection: number; // Add connection input
+  // Drilldown configuration inputs
+  @Input() drilldownEnabled: boolean = false;
+  @Input() drilldownApiUrl: string;
+  @Input() drilldownXAxis: string;
+  @Input() drilldownYAxis: string;
+  @Input() drilldownParameter: string; // Add drilldown parameter input
+  @Input() baseFilters: any[] = []; // Add base filters input
+  @Input() drilldownFilters: any[] = []; // Add drilldown filters input
+  // Multi-layer drilldown configuration inputs
+  @Input() drilldownLayers: any[] = []; // Array of drilldown layer configurations
 
   loading = false;
   givendata: any[] = [];
@@ -38,13 +52,46 @@ export class GridViewComponent implements OnInit, OnChanges {
   submitted = false;
   dynamicHeaders: any[] = [];
 
-  constructor(
+  // Multi-layer drilldown state tracking
+  drilldownStack: any[] = []; // Stack to track drilldown navigation history
+  currentDrilldownLevel: number = 0; // Current drilldown level (0 = base level)
+  originalGridData: any[] = [];
 
+  // No data state
+  noDataAvailable: boolean = false;
+
+  // Flag to prevent infinite loops
+  private isFetchingData: boolean = false;
+
+  // Add subscriptions to unsubscribe on destroy
+  private subscriptions: Subscription[] = [];
+
+  // Add a flag to track if filters have been initialized
+  private filtersInitialized: boolean = false;
+
+  // Add properties to track open multiselect dropdowns
+  private openMultiselects: Map<string, string> = new Map(); // Map of filterId -> context
+
+  // Add property to track document click handler
+  private documentClickHandler: ((event: MouseEvent) => void) | null = null;
+
+  constructor(
     private mainservice: UsergrpmaintainceService,
     private dashboardService: Dashboard3Service,
+    // Add FilterService to constructor
+    private filterService: FilterService
   ) { }
 
   ngOnInit(): void {
+    // Subscribe to filter changes
+    this.subscriptions.push(
+      this.filterService.filterState$.subscribe(filters => {
+        // When filters change, refresh the grid data
+        console.log('GridView: Filter state changed:', filters);
+        this.fetchGridData();
+      })
+    );
+
     this.fetchGridData();
   }
 
@@ -55,87 +102,585 @@ export class GridViewComponent implements OnInit, OnChanges {
     const xAxisChanged = changes.xAxis && !changes.xAxis.firstChange;
     const yAxisChanged = changes.yAxis && !changes.yAxis.firstChange;
     const tableChanged = changes.table && !changes.table.firstChange;
-    const connectionChanged = changes.connection && !changes.connection.firstChange; // Add connection change detection
+    const connectionChanged = changes.connection && !changes.connection.firstChange;
+    const baseFiltersChanged = changes.baseFilters && !changes.baseFilters.firstChange;
+    // Drilldown configuration changes
+    const drilldownEnabledChanged = changes.drilldownEnabled && !changes.drilldownEnabled.firstChange;
+    const drilldownApiUrlChanged = changes.drilldownApiUrl && !changes.drilldownApiUrl.firstChange;
+    const drilldownXAxisChanged = changes.drilldownXAxis && !changes.drilldownXAxis.firstChange;
+    const drilldownYAxisChanged = changes.drilldownYAxis && !changes.drilldownYAxis.firstChange;
+    const drilldownLayersChanged = changes.drilldownLayers && !changes.drilldownLayers.firstChange;
+
+    // Initialize filter values if they haven't been initialized yet
+    if (!this.filtersInitialized && (changes.baseFilters || changes.drilldownFilters || changes.drilldownLayers)) {
+      this.initializeFilterValues();
+      this.filtersInitialized = true;
+    }
 
     // Respond to input changes
-    if (xAxisChanged || yAxisChanged || tableChanged || connectionChanged) {
-      console.log('X or Y axis or table or connection changed, fetching new data');
-      // Only fetch data if xAxis, yAxis, table, or connection has changed (and it's not the first change)
+    if (!this.isFetchingData && (xAxisChanged || yAxisChanged || tableChanged || connectionChanged || baseFiltersChanged ||
+      drilldownEnabledChanged || drilldownApiUrlChanged || drilldownXAxisChanged || drilldownYAxisChanged ||
+      drilldownLayersChanged)) {
+      console.log('X or Y axis or table or connection or base filters or drilldown config changed, fetching new data');
+      // Only fetch data if xAxis, yAxis, table, connection, baseFilters or drilldown config has changed (and it's not the first change)
       this.fetchGridData();
     }
   }
 
+  // Initialize filter values with proper default values based on type
+  private initializeFilterValues(): void {
+    console.log('Initializing filter values');
+    
+    // Initialize base filters
+    if (this.baseFilters) {
+      this.baseFilters.forEach(filter => {
+        if (filter.value === undefined || filter.value === null) {
+          switch (filter.type) {
+            case 'multiselect':
+              filter.value = [];
+              break;
+            case 'date-range':
+              filter.value = { start: null, end: null };
+              break;
+            case 'toggle':
+              filter.value = false;
+              break;
+            default:
+              filter.value = '';
+          }
+        }
+      });
+    }
+    
+    // Initialize drilldown filters
+    if (this.drilldownFilters) {
+      this.drilldownFilters.forEach(filter => {
+        if (filter.value === undefined || filter.value === null) {
+          switch (filter.type) {
+            case 'multiselect':
+              filter.value = [];
+              break;
+            case 'date-range':
+              filter.value = { start: null, end: null };
+              break;
+            case 'toggle':
+              filter.value = false;
+              break;
+            default:
+              filter.value = '';
+          }
+        }
+      });
+    }
+    
+    // Initialize layer filters
+    if (this.drilldownLayers) {
+      this.drilldownLayers.forEach(layer => {
+        if (layer.filters) {
+          layer.filters.forEach((filter: any) => {
+            if (filter.value === undefined || filter.value === null) {
+              switch (filter.type) {
+                case 'multiselect':
+                  filter.value = [];
+                  break;
+                case 'date-range':
+                  filter.value = { start: null, end: null };
+                  break;
+                case 'toggle':
+                  filter.value = false;
+                  break;
+                default:
+                  filter.value = '';
+              }
+            }
+          });
+        }
+      });
+    }
+    
+    console.log('Filter values initialized:', {
+      baseFilters: this.baseFilters,
+      drilldownFilters: this.drilldownFilters,
+      drilldownLayers: this.drilldownLayers
+    });
+  }
+
   // Dynamic headers for the grid
-  
+
   fetchGridData(): void {
+    // Set flag to prevent recursive calls
+    this.isFetchingData = true;
+
+    // If we're in drilldown mode, fetch the appropriate drilldown data
+    if (this.currentDrilldownLevel > 0 && this.drilldownStack.length > 0) {
+      this.fetchDrilldownData();
+      // Reset flag after fetching
+      this.isFetchingData = false;
+      return;
+    }
+
     // If we have the necessary data, fetch grid data from the service
-    if (this.table && this.xAxis) {
-      console.log('Fetching grid data for:', { table: this.table, xAxis: this.xAxis, yAxis: this.yAxis, connection: this.connection });
+    // if (this.table && this.xAxis) {
+    if (this.table) {
+
+      console.log('=== GRID VIEW DEBUG INFO ===');
+      console.log('Table:', this.table);
+      console.log('X-Axis:', this.xAxis);
+      console.log('Y-Axis:', this.yAxis);
+      console.log('Connection:', this.connection);
 
       // Convert yAxis to string if it's an array
       const yAxisString = Array.isArray(this.yAxis) ? this.yAxis.join(',') : this.yAxis;
 
+      // Get the parameter value from the drilldown stack for base level (should be empty)
+      let parameterValue = '';
+
+      // Log the URL that will be called
+      let url = `chart/getdashjson/grid?tableName=${this.table}&xAxis=${this.xAxis}&yAxes=${yAxisString}${this.connection ? `&sureId=${this.connection}` : ''}`;
+      console.log('Grid data URL:', url);
+
+      // Get filter parameters from base filters
+      const filterObj = {};
+
+      // Add base filters
+      if (this.baseFilters && this.baseFilters.length > 0) {
+        this.baseFilters.forEach(filter => {
+          if (filter.field && filter.value) {
+            filterObj[filter.field] = filter.value;
+          }
+        });
+      }
+
+      // Add common filters directly as key-value pairs
+      const commonFilters = this.filterService.getFilterValues();
+      const filterDefinitions = this.filterService.getFilters();
+
+      // Add common filters using the field name as the key
+      Object.keys(commonFilters).forEach(filterId => {
+        const filterValue = commonFilters[filterId];
+
+        // Find the filter definition to get the field name
+        const filterDef = this.filterService.getFilters().find(f => f.id === filterId);
+
+        if (filterDef && filterDef.field) {
+          const fieldName = filterDef.field;
+          if (filterValue !== undefined && filterValue !== null && filterValue !== '') {
+            filterObj[fieldName] = filterValue;
+          }
+        }
+      });
+
+      // Convert to JSON string for API call
+      let filterParams = '';
+      if (Object.keys(filterObj).length > 0) {
+        filterParams = JSON.stringify(filterObj);
+      }
+
+      console.log('GridView: Final filter object to send to API:', filterObj);
+
       // Fetch data from the dashboard service, similar to other chart components
-      this.dashboardService.getChartData(this.table, 'grid', this.xAxis, yAxisString, this.connection).subscribe(
+      this.dashboardService.getChartData(this.table, 'grid', this.xAxis, yAxisString, this.connection, '', '', filterParams).subscribe(
         (data: any) => {
+          console.log('=== GRID VIEW DATA RESPONSE ===');
           console.log('Received grid data:', data);
           if (data === null) {
             console.warn('Grid API returned null data. Check if the API endpoint is working correctly.');
             this.error = "No data Available";
+            this.noDataAvailable = true;
+            // Reset flag after fetching
+            this.isFetchingData = false;
             return;
           }
-          
+
           // Handle the actual data structure returned by the API
           if (data && data.chartData) {
             this.givendata = data.chartData;
             this.extractDynamicHeaders(data.chartData);
             this.error = this.givendata.length === 0 ? "No data Available" : undefined;
+            this.noDataAvailable = this.givendata.length === 0;
             console.log('Updated grid with data:', this.givendata);
           } else if (data && data.data) {
             // Handle the original expected format as fallback
             this.givendata = data.data;
             this.extractDynamicHeaders(data.data);
             this.error = this.givendata.length === 0 ? "No data Available" : undefined;
+            this.noDataAvailable = this.givendata.length === 0;
             console.log('Updated grid with legacy data format:', this.givendata);
           } else if (Array.isArray(data)) {
             // Handle case where data is directly an array
             this.givendata = data;
             this.extractDynamicHeaders(data);
             this.error = this.givendata.length === 0 ? "No data Available" : undefined;
+            this.noDataAvailable = this.givendata.length === 0;
             console.log('Updated grid with array data:', this.givendata);
           } else {
             console.warn('Grid received data does not have expected structure', data);
             this.error = "No valid data received";
             this.givendata = [];
+            this.noDataAvailable = true;
           }
+          // Reset flag after fetching
+          this.isFetchingData = false;
         }, (error) => {
           console.log('Error fetching grid data:', error);
           this.error = "Server Error";
+          this.noDataAvailable = true;
+          // Reset flag after fetching
+          this.isFetchingData = false;
         });
     } else if (this.table) {
       console.log('Missing xAxis, falling back to default data fetching');
       // Fallback to default data fetching when only table is provided
-       // Convert yAxis to string if it's an array
+      // Convert yAxis to string if it's an array
       const yAxisString = Array.isArray(this.yAxis) ? this.yAxis.join(',') : this.yAxis;
 
       // Fetch data from the dashboard service, similar to other chart components
       this.dashboardService.getChartData(this.table, 'grid', this.xAxis, yAxisString, this.connection).subscribe(
         (data: any) => {
-      // this.mainservice.getAll().subscribe((data: any) => {
-        console.log('recv data ', data);
-        this.givendata = Array.isArray(data) ? data : [];
-        this.extractDynamicHeaders(data);
-        this.error = this.givendata && this.givendata.length === 0 ? "No data Available" : undefined;
-      }, (error) => {
-        console.log(error);
-        this.error = "Server Error";
-      });
+          // this.mainservice.getAll().subscribe((data: any) => {
+          console.log('recv data ', data);
+          this.givendata = Array.isArray(data) ? data : [];
+          this.extractDynamicHeaders(data);
+          this.error = this.givendata && this.givendata.length === 0 ? "No data Available" : undefined;
+          this.noDataAvailable = this.givendata && this.givendata.length === 0;
+          // Reset flag after fetching
+          this.isFetchingData = false;
+        }, (error) => {
+          console.log(error);
+          this.error = "Server Error";
+          this.noDataAvailable = true;
+          // Reset flag after fetching
+          this.isFetchingData = false;
+        });
     } else {
       console.log('Missing required data for grid:', { table: this.table });
       this.error = "Table name is required";
+      this.noDataAvailable = true;
+      // Reset flag after fetching
+      this.isFetchingData = false;
     }
   }
-  
+
+  // Fetch drilldown data based on current drilldown level
+  fetchDrilldownData(): void {
+    console.log('Fetching drilldown data, current level:', this.currentDrilldownLevel);
+    console.log('Drilldown stack:', this.drilldownStack);
+
+    // Get the current drilldown configuration based on the current level
+    let drilldownConfig;
+    if (this.currentDrilldownLevel === 1) {
+      // Base drilldown level
+      drilldownConfig = {
+        apiUrl: this.drilldownApiUrl,
+        xAxis: this.drilldownXAxis,
+        yAxis: this.drilldownYAxis,
+        parameter: this.drilldownParameter
+      };
+    } else {
+      // Multi-layer drilldown level
+      const layerIndex = this.currentDrilldownLevel - 2; // -2 because level 1 is base drilldown
+      if (layerIndex >= 0 && layerIndex < this.drilldownLayers.length) {
+        drilldownConfig = this.drilldownLayers[layerIndex];
+      } else {
+        console.warn('Invalid drilldown layer index:', layerIndex);
+        this.error = "Invalid drilldown configuration";
+        this.givendata = [];
+        this.noDataAvailable = true;
+        return;
+      }
+    }
+
+    console.log('Drilldown config for level', this.currentDrilldownLevel, ':', drilldownConfig);
+
+    // Check if we have valid drilldown configuration
+    if (!drilldownConfig || !drilldownConfig.apiUrl || !drilldownConfig.xAxis || !drilldownConfig.yAxis) {
+      console.warn('Missing drilldown configuration for level:', this.currentDrilldownLevel);
+      this.error = "Missing drilldown configuration";
+      this.givendata = [];
+      this.noDataAvailable = true;
+      return;
+    }
+
+    // Get the parameter value from the drilldown stack
+    let parameterValue = '';
+    if (this.drilldownStack.length > 0) {
+      const lastEntry = this.drilldownStack[this.drilldownStack.length - 1];
+      parameterValue = lastEntry.clickedValue || '';
+      console.log('Parameter value from last click:', parameterValue);
+    }
+
+    // Get the parameter field from drilldown config
+    const parameterField = drilldownConfig.parameter || '';
+    console.log('Parameter field:', parameterField);
+
+    console.log('Fetching drilldown data for level:', this.currentDrilldownLevel, {
+      apiUrl: drilldownConfig.apiUrl,
+      xAxis: drilldownConfig.xAxis,
+      yAxis: drilldownConfig.yAxis,
+      parameterField: parameterField,
+      parameterValue: parameterValue,
+      connection: this.connection
+    });
+
+    // Build the actual API URL with parameter replacement
+    let actualApiUrl = drilldownConfig.apiUrl;
+    console.log('Original API URL:', actualApiUrl);
+    console.log('Parameter value to use:', parameterValue);
+    console.log('Parameter field:', parameterField);
+
+    // Check if the URL contains angle brackets for parameter replacement
+    const hasAngleBrackets = /<[^>]+>/.test(actualApiUrl);
+
+    if (hasAngleBrackets && parameterValue) {
+      // Replace angle brackets placeholder with actual value
+      console.log('Replacing angle brackets with parameter value');
+      const encodedValue = encodeURIComponent(parameterValue);
+      actualApiUrl = actualApiUrl.replace(/<[^>]+>/g, encodedValue);
+      console.log('URL after angle bracket replacement:', actualApiUrl);
+    }
+
+    // Log the URL that will be called
+    let url = `chart/getdashjson/grid?tableName=${actualApiUrl}&xAxis=${drilldownConfig.xAxis}&yAxes=${drilldownConfig.yAxis}${this.connection ? `&sureId=${this.connection}` : ''}`;
+    if (parameterField && parameterValue) {
+      url += `&parameter=${encodeURIComponent(parameterField)}&parameterValue=${encodeURIComponent(parameterValue)}`;
+    }
+    console.log('Drilldown data URL:', url);
+
+    // Convert drilldown layer filters to filter parameters (if applicable)
+    const filterObj = {};
+
+    // Add drilldown layer filters
+    if (drilldownConfig.filters && drilldownConfig.filters.length > 0) {
+      drilldownConfig.filters.forEach((filter: any) => {
+        if (filter.field && filter.value) {
+          filterObj[filter.field] = filter.value;
+        }
+      });
+    }
+
+    // Add drilldownFilters
+    if (this.drilldownFilters && this.drilldownFilters.length > 0) {
+      this.drilldownFilters.forEach(filter => {
+        if (filter.field && filter.value) {
+          filterObj[filter.field] = filter.value;
+        }
+      });
+    }
+
+    // Add common filters
+    const commonFilters = this.filterService.getFilterValues();
+    const filterDefinitions = this.filterService.getFilters();
+    Object.keys(commonFilters).forEach(filterId => {
+      const filterValue = commonFilters[filterId];
+
+      // Find the filter definition to get the field name
+      const filterDef = this.filterService.getFilters().find(f => f.id === filterId);
+
+      if (filterDef && filterDef.field) {
+        const fieldName = filterDef.field;
+        if (filterValue !== undefined && filterValue !== null && filterValue !== '') {
+          filterObj[fieldName] = filterValue;
+        }
+      }
+    });
+
+    // Convert to JSON string for API call
+    let drilldownFilterParams = '';
+    if (Object.keys(filterObj).length > 0) {
+      drilldownFilterParams = JSON.stringify(filterObj);
+    }
+
+    console.log('Drilldown filter parameters:', drilldownFilterParams);
+
+    // For drilldown level, we pass the parameter value from the drilldown stack and drilldown filters
+    this.dashboardService.getChartData(
+      drilldownConfig.apiUrl, 'grid',
+      drilldownConfig.xAxis, drilldownConfig.yAxis,
+      this.connection,
+      parameterField, parameterValue,
+      drilldownFilterParams
+    ).subscribe(
+      (data: any) => {
+        console.log('Received drilldown data:', data);
+        if (data === null) {
+          console.warn('Drilldown API returned null data. Check if the API endpoint is working correctly.');
+          this.error = "No data Available";
+          this.givendata = [];
+          this.noDataAvailable = true;
+          return;
+        }
+
+        // Handle the actual data structure returned by the API
+        if (data && data.chartData) {
+          this.givendata = data.chartData;
+          this.extractDynamicHeaders(data.chartData);
+          this.error = this.givendata.length === 0 ? "No data Available" : undefined;
+          this.noDataAvailable = this.givendata.length === 0;
+          console.log('Updated grid with drilldown data:', this.givendata);
+        } else if (data && data.data) {
+          // Handle the original expected format as fallback
+          this.givendata = data.data;
+          this.extractDynamicHeaders(data.data);
+          this.error = this.givendata.length === 0 ? "No data Available" : undefined;
+          this.noDataAvailable = this.givendata.length === 0;
+          console.log('Updated grid with drilldown legacy data format:', this.givendata);
+        } else if (Array.isArray(data)) {
+          // Handle case where data is directly an array
+          this.givendata = data;
+          this.extractDynamicHeaders(data);
+          this.error = this.givendata.length === 0 ? "No data Available" : undefined;
+          this.noDataAvailable = this.givendata.length === 0;
+          console.log('Updated grid with drilldown array data:', this.givendata);
+        } else {
+          console.warn('Drilldown received data does not have expected structure', data);
+          this.error = "No valid data received";
+          this.givendata = [];
+          this.noDataAvailable = true;
+        }
+      },
+      (error) => {
+        console.error('Error fetching drilldown data:', error);
+        this.error = "Server Error";
+        this.givendata = [];
+        this.noDataAvailable = true;
+      }
+    );
+  }
+
+  // Reset to original data (go back to base level)
+  resetToOriginalData(): void {
+    console.log('Resetting to original data');
+    console.log('Current stack before reset:', this.drilldownStack);
+    console.log('Current level before reset:', this.currentDrilldownLevel);
+
+    this.currentDrilldownLevel = 0;
+    this.drilldownStack = [];
+
+    if (this.originalGridData.length > 0) {
+      // Create a deep copy to avoid reference issues
+      this.givendata = JSON.parse(JSON.stringify(this.originalGridData));
+      this.extractDynamicHeaders(this.givendata);
+      console.log('Restored original data');
+    }
+
+    console.log('After reset - data:', this.givendata);
+
+    // Re-fetch original data
+    this.fetchGridData();
+  }
+
+  // Navigate back to previous drilldown level
+  navigateBack(): void {
+    console.log('Navigating back, current stack:', this.drilldownStack);
+    console.log('Current level:', this.currentDrilldownLevel);
+
+    if (this.drilldownStack.length > 0) {
+      // Remove the last entry from the stack
+      const removedEntry = this.drilldownStack.pop();
+      console.log('Removed entry from stack:', removedEntry);
+
+      // Update the current drilldown level
+      this.currentDrilldownLevel = this.drilldownStack.length;
+      console.log('New level after pop:', this.currentDrilldownLevel);
+      console.log('Stack after pop:', this.drilldownStack);
+
+      if (this.drilldownStack.length > 0) {
+        // Fetch data for the previous level
+        console.log('Fetching data for previous level');
+        this.fetchDrilldownData();
+      } else {
+        // Back to base level
+        console.log('Back to base level, resetting to original data');
+        this.resetToOriginalData();
+      }
+    } else {
+      // Already at base level, reset to original data
+      console.log('Already at base level, resetting to original data');
+      this.resetToOriginalData();
+    }
+  }
+
+  // Method to handle grid row clicks for drilldown
+  onRowClick(item: any, key: string): void {
+    console.log('Grid row clicked:', { item, key });
+
+    // If drilldown is enabled
+    if (this.drilldownEnabled) {
+      // Get the value for the clicked key
+      const clickedValue = item[key];
+
+      console.log('Clicked on row value:', { key, value: clickedValue });
+
+      // If we're not at the base level, store original data
+      if (this.currentDrilldownLevel === 0) {
+        // Store original data before entering drilldown mode
+        // Create a deep copy to avoid reference issues
+        this.originalGridData = JSON.parse(JSON.stringify(this.givendata));
+        console.log('Stored original data for drilldown');
+      }
+
+      // Determine the next drilldown level
+      const nextDrilldownLevel = this.currentDrilldownLevel + 1;
+
+      console.log('Next drilldown level will be:', nextDrilldownLevel);
+
+      // Check if there's a drilldown configuration for this level
+      let hasDrilldownConfig = false;
+      let drilldownConfig;
+
+      if (nextDrilldownLevel === 1) {
+        // Base drilldown level
+        drilldownConfig = {
+          apiUrl: this.drilldownApiUrl,
+          xAxis: this.drilldownXAxis,
+          yAxis: this.drilldownYAxis,
+          parameter: this.drilldownParameter
+        };
+        hasDrilldownConfig = !!this.drilldownApiUrl && !!this.drilldownXAxis && !!this.drilldownYAxis;
+      } else {
+        // Multi-layer drilldown level
+        const layerIndex = nextDrilldownLevel - 2; // -2 because level 1 is base drilldown
+        if (layerIndex < this.drilldownLayers.length) {
+          drilldownConfig = this.drilldownLayers[layerIndex];
+          hasDrilldownConfig = drilldownConfig.enabled &&
+            !!drilldownConfig.apiUrl &&
+            !!drilldownConfig.xAxis &&
+            !!drilldownConfig.yAxis;
+        }
+      }
+
+      console.log('Drilldown config for next level:', drilldownConfig);
+      console.log('Has drilldown config:', hasDrilldownConfig);
+
+      // If there's a drilldown configuration for the next level, proceed
+      if (hasDrilldownConfig) {
+        // Add this click to the drilldown stack
+        const stackEntry = {
+          level: nextDrilldownLevel,
+          clickedKey: key,
+          clickedValue: clickedValue
+        };
+
+        this.drilldownStack.push(stackEntry);
+
+        console.log('Added to drilldown stack:', stackEntry);
+        console.log('Current drilldown stack:', this.drilldownStack);
+
+        // Update the current drilldown level
+        this.currentDrilldownLevel = nextDrilldownLevel;
+
+        console.log('Entering drilldown level:', this.currentDrilldownLevel);
+
+        // Fetch drilldown data for the new level
+        this.fetchDrilldownData();
+      } else {
+        console.log('No drilldown configuration for level:', nextDrilldownLevel);
+      }
+    } else {
+      console.log('Drilldown not enabled');
+    }
+  }
+
   /**
    * Extract dynamic headers from the data
    * @param data Array of data objects
@@ -143,7 +688,7 @@ export class GridViewComponent implements OnInit, OnChanges {
   private extractDynamicHeaders(data: any): void {
     // Ensure data is an array
     const dataArray = Array.isArray(data) ? data : [];
-    
+
     if (dataArray && dataArray.length > 0) {
       // Get all unique keys from the data objects
       const allKeys = new Set<string>();
@@ -152,19 +697,19 @@ export class GridViewComponent implements OnInit, OnChanges {
           Object.keys(item).forEach(key => allKeys.add(key));
         }
       });
-      
+
       // Convert to array of header objects with key and display name
       this.dynamicHeaders = Array.from(allKeys).map(key => ({
         key: key,
         displayName: this.formatHeader(key)
       }));
-      
+
       console.log('Dynamic headers extracted:', this.dynamicHeaders);
     } else {
       this.dynamicHeaders = [];
     }
   }
-  
+
   /**
    * Format header name for better display
    * @param key The key to format
@@ -175,4 +720,261 @@ export class GridViewComponent implements OnInit, OnChanges {
       .replace(/([A-Z])/g, ' $1')
       .replace(/^./, str => str.toUpperCase());
   }
+
+  // Check if there are active filters
+  hasActiveFilters(): boolean {
+    return (this.baseFilters && this.baseFilters.length > 0) || 
+           (this.drilldownFilters && this.drilldownFilters.length > 0) || 
+           this.hasActiveLayerFilters();
+  }
+
+  // Check if there are active layer filters for current drilldown level
+  hasActiveLayerFilters(): boolean {
+    if (this.currentDrilldownLevel > 1 && this.drilldownLayers && this.drilldownLayers.length > 0) {
+      const layerIndex = this.currentDrilldownLevel - 2; // -2 because level 1 is base drilldown
+      return layerIndex < this.drilldownLayers.length && 
+             this.drilldownLayers[layerIndex].filters && 
+             this.drilldownLayers[layerIndex].filters.length > 0;
+    }
+    return false;
+  }
+
+  // Get active layer filters for current drilldown level
+  getActiveLayerFilters(): any[] {
+    if (this.currentDrilldownLevel > 1 && this.drilldownLayers && this.drilldownLayers.length > 0) {
+      const layerIndex = this.currentDrilldownLevel - 2; // -2 because level 1 is base drilldown
+      if (layerIndex < this.drilldownLayers.length && 
+          this.drilldownLayers[layerIndex].filters) {
+        return this.drilldownLayers[layerIndex].filters;
+      }
+    }
+    return [];
+  }
+
+  // Get filter options for dropdown/multiselect filters
+  getFilterOptions(filter: any): string[] {
+    if (filter.options) {
+      if (Array.isArray(filter.options)) {
+        return filter.options;
+      } else if (typeof filter.options === 'string') {
+        return filter.options.split(',').map(opt => opt.trim()).filter(opt => opt);
+      }
+    }
+    return [];
+  }
+
+  // Check if an option is selected for multiselect filters
+  isOptionSelected(filter: any, option: string): boolean {
+    if (!filter.value) {
+      return false;
+    }
+    
+    if (Array.isArray(filter.value)) {
+      return filter.value.includes(option);
+    }
+    
+    return filter.value === option;
+  }
+
+  // Handle base filter changes
+  onBaseFilterChange(filter: any): void {
+    console.log('Base filter changed:', filter);
+    // Refresh data when filter changes
+    this.fetchGridData();
+  }
+
+  // Handle drilldown filter changes
+  onDrilldownFilterChange(filter: any): void {
+    console.log('Drilldown filter changed:', filter);
+    // Refresh data when filter changes
+    this.fetchGridData();
+  }
+
+  // Handle layer filter changes
+  onLayerFilterChange(filter: any): void {
+    console.log('Layer filter changed:', filter);
+    // Refresh data when filter changes
+    this.fetchGridData();
+  }
+
+  // Handle multiselect changes
+  onMultiSelectChange(filter: any, option: string, event: any): void {
+    const checked = event.target.checked;
+    
+    // Initialize filter.value as array if it's not already
+    if (!Array.isArray(filter.value)) {
+      filter.value = [];
+    }
+    
+    if (checked) {
+      // Add option to array if not already present
+      if (!filter.value.includes(option)) {
+        filter.value.push(option);
+      }
+    } else {
+      // Remove option from array
+      filter.value = filter.value.filter((item: string) => item !== option);
+    }
+    
+    // Refresh data when filter changes
+    this.fetchGridData();
+  }
+
+  // Handle date range changes
+  onDateRangeChange(filter: any, dateRange: { start: string | null, end: string | null }): void {
+    filter.value = dateRange;
+    // Refresh data when filter changes
+    this.fetchGridData();
+  }
+
+  // Handle toggle changes
+  onToggleChange(filter: any, checked: boolean): void {
+    filter.value = checked;
+    // Refresh data when filter changes
+    this.fetchGridData();
+  }
+
+  // Toggle multiselect dropdown visibility
+  toggleMultiselect(filter: any, context: string): void {
+    const filterId = `${context}-${filter.field}`;
+    if (this.isMultiselectOpen(filter, context)) {
+      this.openMultiselects.delete(filterId);
+    } else {
+      // Close all other multiselects first
+      this.openMultiselects.clear();
+      this.openMultiselects.set(filterId, context);
+      
+      // Add document click handler to close dropdown when clicking outside
+      this.addDocumentClickHandler();
+    }
+  }
+
+  // Add document click handler to close dropdowns when clicking outside
+  private addDocumentClickHandler(): void {
+    if (!this.documentClickHandler) {
+      this.documentClickHandler = (event: MouseEvent) => {
+        const target = event.target as HTMLElement;
+        // Check if click is outside any multiselect dropdown
+        if (!target.closest('.multiselect-container')) {
+          this.openMultiselects.clear();
+          this.removeDocumentClickHandler();
+        }
+      };
+      
+      // Use setTimeout to ensure the click event that opened the dropdown doesn't immediately close it
+      setTimeout(() => {
+        document.addEventListener('click', this.documentClickHandler!);
+      }, 0);
+    }
+  }
+
+  // Remove document click handler
+  private removeDocumentClickHandler(): void {
+    if (this.documentClickHandler) {
+      document.removeEventListener('click', this.documentClickHandler);
+      this.documentClickHandler = null;
+    }
+  }
+
+  // Check if multiselect dropdown is open
+  isMultiselectOpen(filter: any, context: string): boolean {
+    const filterId = `${context}-${filter.field}`;
+    return this.openMultiselects.has(filterId);
+  }
+
+  // Get count of selected options for a multiselect filter
+  getSelectedOptionsCount(filter: any): number {
+    if (!filter.value) {
+      return 0;
+    }
+    
+    if (Array.isArray(filter.value)) {
+      return filter.value.length;
+    }
+    
+    return 0;
+  }
+
+  // Clear all filters
+  clearAllFilters(): void {
+    // Clear base filters
+    if (this.baseFilters) {
+      this.baseFilters.forEach(filter => {
+        if (filter.type === 'multiselect') {
+          filter.value = [];
+        } else if (filter.type === 'date-range') {
+          filter.value = { start: null, end: null };
+        } else if (filter.type === 'toggle') {
+          filter.value = false;
+        } else {
+          filter.value = '';
+        }
+      });
+    }
+    
+    // Clear drilldown filters
+    if (this.drilldownFilters) {
+      this.drilldownFilters.forEach(filter => {
+        if (filter.type === 'multiselect') {
+          filter.value = [];
+        } else if (filter.type === 'date-range') {
+          filter.value = { start: null, end: null };
+        } else if (filter.type === 'toggle') {
+          filter.value = false;
+        } else {
+          filter.value = '';
+        }
+      });
+    }
+    
+    // Clear layer filters
+    if (this.drilldownLayers) {
+      this.drilldownLayers.forEach(layer => {
+        if (layer.filters) {
+          layer.filters.forEach((filter: any) => {
+            if (filter.type === 'multiselect') {
+              filter.value = [];
+            } else if (filter.type === 'date-range') {
+              filter.value = { start: null, end: null };
+            } else if (filter.type === 'toggle') {
+              filter.value = false;
+            } else {
+              filter.value = '';
+            }
+          });
+        }
+      });
+    }
+    
+    // Close all multiselect dropdowns
+    this.openMultiselects.clear();
+    
+    // Refresh data
+    this.fetchGridData();
+  }
+
+  ngOnDestroy() {
+    // Unsubscribe from all subscriptions to prevent memory leaks
+    console.log('GridViewComponent ngOnDestroy called, unsubscribing from', this.subscriptions.length, 'subscriptions');
+    this.subscriptions.forEach(subscription => {
+      if (subscription && !subscription.closed) {
+        subscription.unsubscribe();
+      }
+    });
+    this.subscriptions = [];
+
+    // Clear data to help with garbage collection
+    this.givendata = [];
+    this.dynamicHeaders = [];
+    this.drilldownStack = [];
+    this.originalGridData = [];
+
+    // Clear multiselect tracking
+    this.openMultiselects.clear();
+    
+    // Remove document click handler
+    this.removeDocumentClickHandler();
+    
+    console.log('GridViewComponent destroyed and cleaned up');
+  }
 }
\ No newline at end of file
diff --git a/frontend/angular-clarity-master/src/app/modules/main/builder/dashboardnew/gadgets/line-chart/line-chart.component.html b/frontend/angular-clarity-master/src/app/modules/main/builder/dashboardnew/gadgets/line-chart/line-chart.component.html
index 63edfd9..8d9331b 100644
--- a/frontend/angular-clarity-master/src/app/modules/main/builder/dashboardnew/gadgets/line-chart/line-chart.component.html
+++ b/frontend/angular-clarity-master/src/app/modules/main/builder/dashboardnew/gadgets/line-chart/line-chart.component.html
@@ -1,13 +1,282 @@
-<div style="display: block">
-  <!-- Drilldown mode indicator -->
-  <div *ngIf="currentDrilldownLevel > 0" style="background-color: #e0e0e0; padding: 5px; margin-bottom: 10px; border-radius: 4px; text-align: center;">
-    <span style="font-weight: bold; color: #333;">Drilldown Level: {{currentDrilldownLevel}}</span>
-    <button (click)="navigateBack()" style="margin-left: 10px; padding: 2px 8px; background-color: #007cba; color: white; border: none; border-radius: 3px; cursor: pointer;">
-      Back to Level {{currentDrilldownLevel - 1}}
-    </button>
-    <button (click)="resetToOriginalData()" style="margin-left: 10px; padding: 2px 8px; background-color: #dc3545; color: white; border: none; border-radius: 3px; cursor: pointer;">
-      Back to Main View
-    </button>
+<div style="display: block; height: 100%; width: 100%;">
+  <!-- Filter Controls Section -->
+  <div class="filter-section" *ngIf="hasActiveFilters()">
+    <!-- Base Filters -->
+    <div class="filter-group" *ngIf="baseFilters && baseFilters.length > 0">
+      <h4>Base Filters</h4>
+      <div class="filter-controls">
+        <div *ngFor="let filter of baseFilters" class="filter-item">
+          <div class="filter-label">{{ filter.field }} ({{ filter.type || 'text' }})</div>
+          
+          <!-- Text Filter -->
+          <div *ngIf="!filter.type || filter.type === 'text'" class="filter-input">
+            <input type="text" 
+                   [(ngModel)]="filter.value" 
+                   (ngModelChange)="onBaseFilterChange(filter)"
+                   [placeholder]="filter.field"
+                   class="clr-input filter-text-input">
+          </div>
+          
+          <!-- Dropdown Filter -->
+          <div *ngIf="filter.type === 'dropdown'" class="filter-input">
+            <select [(ngModel)]="filter.value" 
+                    (ngModelChange)="onBaseFilterChange(filter)"
+                    class="clr-select filter-select">
+              <option value="">Select {{ filter.field }}</option>
+              <option *ngFor="let option of getFilterOptions(filter)" [value]="option">{{ option }}</option>
+            </select>
+          </div>
+          
+          <!-- Multi-Select Filter - Updated to show key first, then dropdown on click -->
+          <div *ngIf="filter.type === 'multiselect'" class="filter-input multiselect-container">
+            <div class="multiselect-display" (click)="toggleMultiselect(filter, 'base')">
+              <span class="multiselect-label">{{ filter.field }}</span>
+              <span class="multiselect-value" *ngIf="getSelectedOptionsCount(filter) > 0">
+                ({{ getSelectedOptionsCount(filter) }} selected)
+              </span>
+              <clr-icon shape="caret down" class="dropdown-icon"></clr-icon>
+            </div>
+            <div class="multiselect-dropdown" *ngIf="isMultiselectOpen(filter, 'base')">
+              <div class="checkbox-group">
+                <div *ngFor="let option of getFilterOptions(filter); let i = index" class="checkbox-item">
+                  <input type="checkbox" 
+                         [checked]="isOptionSelected(filter, option)" 
+                         (change)="onMultiSelectChange(filter, option, $event)"
+                         [id]="'base-' + filter.field + '-' + i" 
+                         class="clr-checkbox">
+                  <label [for]="'base-' + filter.field + '-' + i" class="checkbox-label">{{ option }}</label>
+                </div>
+              </div>
+            </div>
+          </div>
+          
+          <!-- Date Range Filter -->
+          <div *ngIf="filter.type === 'date-range'" class="filter-input date-range">
+            <div class="date-input-group">
+              <input type="date" 
+                     [(ngModel)]="filter.value.start" 
+                     (ngModelChange)="onDateRangeChange(filter, { start: $event, end: filter.value.end })"
+                     placeholder="Start Date"
+                     class="clr-input filter-date">
+              <span class="date-separator">to</span>
+              <input type="date" 
+                     [(ngModel)]="filter.value.end" 
+                     (ngModelChange)="onDateRangeChange(filter, { start: filter.value.start, end: $event })"
+                     placeholder="End Date"
+                     class="clr-input filter-date">
+            </div>
+          </div>
+          
+          <!-- Toggle Filter -->
+          <div *ngIf="filter.type === 'toggle'" class="filter-input toggle">
+            <input type="checkbox" 
+                   [(ngModel)]="filter.value" 
+                   (ngModelChange)="onToggleChange(filter, $event)"
+                   clrToggle 
+                   class="clr-toggle">
+            <label class="toggle-label">{{ filter.field }}</label>
+          </div>
+        </div>
+      </div>
+    </div>
+    
+    <!-- Drilldown Filters -->
+    <div class="filter-group" *ngIf="drilldownFilters && drilldownFilters.length > 0 && currentDrilldownLevel > 0">
+      <h4>Drilldown Filters</h4>
+      <div class="filter-controls">
+        <div *ngFor="let filter of drilldownFilters" class="filter-item">
+          <div class="filter-label">{{ filter.field }} ({{ filter.type || 'text' }})</div>
+          
+          <!-- Text Filter -->
+          <div *ngIf="!filter.type || filter.type === 'text'" class="filter-input">
+            <input type="text" 
+                   [(ngModel)]="filter.value" 
+                   (ngModelChange)="onDrilldownFilterChange(filter)"
+                   [placeholder]="filter.field"
+                   class="clr-input filter-text-input">
+          </div>
+          
+          <!-- Dropdown Filter -->
+          <div *ngIf="filter.type === 'dropdown'" class="filter-input">
+            <select [(ngModel)]="filter.value" 
+                    (ngModelChange)="onDrilldownFilterChange(filter)"
+                    class="clr-select filter-select">
+              <option value="">Select {{ filter.field }}</option>
+              <option *ngFor="let option of getFilterOptions(filter)" [value]="option">{{ option }}</option>
+            </select>
+          </div>
+          
+          <!-- Multi-Select Filter - Updated to show key first, then dropdown on click -->
+          <div *ngIf="filter.type === 'multiselect'" class="filter-input multiselect-container">
+            <div class="multiselect-display" (click)="toggleMultiselect(filter, 'drilldown')">
+              <span class="multiselect-label">{{ filter.field }}</span>
+              <span class="multiselect-value" *ngIf="getSelectedOptionsCount(filter) > 0">
+                ({{ getSelectedOptionsCount(filter) }} selected)
+              </span>
+              <clr-icon shape="caret down" class="dropdown-icon"></clr-icon>
+            </div>
+            <div class="multiselect-dropdown" *ngIf="isMultiselectOpen(filter, 'drilldown')">
+              <div class="checkbox-group">
+                <div *ngFor="let option of getFilterOptions(filter); let i = index" class="checkbox-item">
+                  <input type="checkbox" 
+                         [checked]="isOptionSelected(filter, option)" 
+                         (change)="onMultiSelectChange(filter, option, $event)"
+                         [id]="'drilldown-' + filter.field + '-' + i" 
+                         class="clr-checkbox">
+                  <label [for]="'drilldown-' + filter.field + '-' + i" class="checkbox-label">{{ option }}</label>
+                </div>
+              </div>
+            </div>
+          </div>
+          
+          <!-- Date Range Filter -->
+          <div *ngIf="filter.type === 'date-range'" class="filter-input date-range">
+            <div class="date-input-group">
+              <input type="date" 
+                     [(ngModel)]="filter.value.start" 
+                     (ngModelChange)="onDateRangeChange(filter, { start: $event, end: filter.value.end })"
+                     placeholder="Start Date"
+                     class="clr-input filter-date">
+              <span class="date-separator">to</span>
+              <input type="date" 
+                     [(ngModel)]="filter.value.end" 
+                     (ngModelChange)="onDateRangeChange(filter, { start: filter.value.start, end: $event })"
+                     placeholder="End Date"
+                     class="clr-input filter-date">
+            </div>
+          </div>
+          
+          <!-- Toggle Filter -->
+          <div *ngIf="filter.type === 'toggle'" class="filter-input toggle">
+            <input type="checkbox" 
+                   [(ngModel)]="filter.value" 
+                   (ngModelChange)="onToggleChange(filter, $event)"
+                   clrToggle 
+                   class="clr-toggle">
+            <label class="toggle-label">{{ filter.field }}</label>
+          </div>
+        </div>
+      </div>
+    </div>
+    
+    <!-- Layer Filters -->
+    <div class="filter-group" *ngIf="hasActiveLayerFilters()">
+      <h4>Layer Filters</h4>
+      <div class="filter-controls">
+        <div *ngFor="let filter of getActiveLayerFilters()" class="filter-item">
+          <div class="filter-label">{{ filter.field }} ({{ filter.type || 'text' }})</div>
+          
+          <!-- Text Filter -->
+          <div *ngIf="!filter.type || filter.type === 'text'" class="filter-input">
+            <input type="text" 
+                   [(ngModel)]="filter.value" 
+                   (ngModelChange)="onLayerFilterChange(filter)"
+                   [placeholder]="filter.field"
+                   class="clr-input filter-text-input">
+          </div>
+          
+          <!-- Dropdown Filter -->
+          <div *ngIf="filter.type === 'dropdown'" class="filter-input">
+            <select [(ngModel)]="filter.value" 
+                    (ngModelChange)="onLayerFilterChange(filter)"
+                    class="clr-select filter-select">
+              <option value="">Select {{ filter.field }}</option>
+              <option *ngFor="let option of getFilterOptions(filter)" [value]="option">{{ option }}</option>
+            </select>
+          </div>
+          
+          <!-- Multi-Select Filter - Updated to show key first, then dropdown on click -->
+          <div *ngIf="filter.type === 'multiselect'" class="filter-input multiselect-container">
+            <div class="multiselect-display" (click)="toggleMultiselect(filter, 'layer')">
+              <span class="multiselect-label">{{ filter.field }}</span>
+              <span class="multiselect-value" *ngIf="getSelectedOptionsCount(filter) > 0">
+                ({{ getSelectedOptionsCount(filter) }} selected)
+              </span>
+              <clr-icon shape="caret down" class="dropdown-icon"></clr-icon>
+            </div>
+            <div class="multiselect-dropdown" *ngIf="isMultiselectOpen(filter, 'layer')">
+              <div class="checkbox-group">
+                <div *ngFor="let option of getFilterOptions(filter); let i = index" class="checkbox-item">
+                  <input type="checkbox" 
+                         [checked]="isOptionSelected(filter, option)" 
+                         (change)="onMultiSelectChange(filter, option, $event)"
+                         [id]="'layer-' + filter.field + '-' + i" 
+                         class="clr-checkbox">
+                  <label [for]="'layer-' + filter.field + '-' + i" class="checkbox-label">{{ option }}</label>
+                </div>
+              </div>
+            </div>
+          </div>
+          
+          <!-- Date Range Filter -->
+          <div *ngIf="filter.type === 'date-range'" class="filter-input date-range">
+            <div class="date-input-group">
+              <input type="date" 
+                     [(ngModel)]="filter.value.start" 
+                     (ngModelChange)="onDateRangeChange(filter, { start: $event, end: filter.value.end })"
+                     placeholder="Start Date"
+                     class="clr-input filter-date">
+              <span class="date-separator">to</span>
+              <input type="date" 
+                     [(ngModel)]="filter.value.end" 
+                     (ngModelChange)="onDateRangeChange(filter, { start: filter.value.start, end: $event })"
+                     placeholder="End Date"
+                     class="clr-input filter-date">
+            </div>
+          </div>
+          
+          <!-- Toggle Filter -->
+          <div *ngIf="filter.type === 'toggle'" class="filter-input toggle">
+            <input type="checkbox" 
+                   [(ngModel)]="filter.value" 
+                   (ngModelChange)="onToggleChange(filter, $event)"
+                   clrToggle 
+                   class="clr-toggle">
+            <label class="toggle-label">{{ filter.field }}</label>
+          </div>
+        </div>
+      </div>
+    </div>
+    
+    <!-- Clear Filters Button -->
+    <div class="filter-actions">
+      <button class="btn btn-sm btn-outline" (click)="clearAllFilters()">Clear All Filters</button>
+    </div>
+  </div>
+  
+  <!-- Header row with chart title and drilldown navigation -->
+  <div class="clr-row header-row">
+    <div class="clr-col-6">
+      <h3 class="chart-title">{{charttitle || 'Line Chart'}}</h3>
+    </div>
+    <div class="clr-col-6" style="text-align: right;">
+      <!-- Add drilldown navigation controls -->
+      <button class="btn btn-sm btn-link" *ngIf="drilldownEnabled && drilldownStack.length > 0" (click)="navigateBack()">
+        <cds-icon shape="arrow" direction="left"></cds-icon>
+        Back to {{drilldownStack.length > 1 ? 'Previous Level' : 'Main Data'}}
+      </button>
+    </div>
+  </div>
+  
+  <!-- Show current drilldown level -->
+  <div class="clr-row" *ngIf="drilldownEnabled && drilldownStack.length > 0">
+    <div class="clr-col-12">
+      <div class="alert alert-info" style="padding: 8px 12px; margin-bottom: 12px;">
+        <div class="alert-items">
+          <div class="alert-item static">
+            <div class="alert-icon-wrapper">
+              <cds-icon class="alert-icon" shape="info-circle"></cds-icon>
+            </div>
+            <span class="alert-text">
+              Drilldown Level: {{currentDrilldownLevel}} 
+              <span *ngIf="drilldownStack.length > 0">
+                (Clicked on: {{drilldownStack[drilldownStack.length - 1].clickedLabel}})
+              </span>
+            </span>
+          </div>
+        </div>
+      </div>
+    </div>
   </div>
   
   <!-- No data message -->
@@ -16,12 +285,11 @@
   </div>
   
   <!-- Chart display -->
-  <div *ngIf="!noDataAvailable">
+  <div *ngIf="!noDataAvailable" style="position: relative; height: calc(100% - 50px);">
     <canvas baseChart
                 [datasets]="lineChartData"
                 [labels]="lineChartLabels"
                 [options]="lineChartOptions"
-           
                 [legend]="lineChartLegend"
                 [type]="lineChartType"
                 (chartHover)="chartHovered($event)"
diff --git a/frontend/angular-clarity-master/src/app/modules/main/builder/dashboardnew/gadgets/line-chart/line-chart.component.scss b/frontend/angular-clarity-master/src/app/modules/main/builder/dashboardnew/gadgets/line-chart/line-chart.component.scss
index e69de29..a9282e4 100644
--- a/frontend/angular-clarity-master/src/app/modules/main/builder/dashboardnew/gadgets/line-chart/line-chart.component.scss
+++ b/frontend/angular-clarity-master/src/app/modules/main/builder/dashboardnew/gadgets/line-chart/line-chart.component.scss
@@ -0,0 +1,192 @@
+.filter-section {
+  margin-bottom: 20px;
+  padding: 15px;
+  border: 1px solid #ddd;
+  border-radius: 4px;
+  background-color: #f9f9f9;
+}
+
+.filter-group {
+  margin-bottom: 15px;
+  
+  h4 {
+    margin-top: 0;
+    margin-bottom: 10px;
+    color: #333;
+    font-weight: 600;
+  }
+}
+
+.filter-controls {
+  display: flex;
+  flex-wrap: wrap;
+  gap: 15px;
+}
+
+.filter-item {
+  flex: 1 1 300px;
+  min-width: 250px;
+  padding: 10px;
+  background: white;
+  border: 1px solid #e0e0e0;
+  border-radius: 4px;
+}
+
+.filter-label {
+  font-weight: 500;
+  margin-bottom: 8px;
+  color: #555;
+  font-size: 14px;
+}
+
+.filter-input {
+  width: 100%;
+  
+  .filter-text-input,
+  .filter-select,
+  .filter-date {
+    width: 100%;
+    padding: 6px 12px;
+    border: 1px solid #ccc;
+    border-radius: 4px;
+    font-size: 14px;
+  }
+  
+  .filter-select {
+    height: 34px;
+  }
+}
+
+.multiselect-container {
+  position: relative;
+}
+
+.multiselect-display {
+  display: flex;
+  align-items: center;
+  justify-content: space-between;
+  padding: 6px 12px;
+  border: 1px solid #ccc;
+  border-radius: 4px;
+  background: white;
+  cursor: pointer;
+  min-height: 34px;
+  
+  .multiselect-label {
+    flex: 1;
+    font-size: 14px;
+  }
+  
+  .multiselect-value {
+    color: #666;
+    font-size: 12px;
+    margin-right: 8px;
+  }
+  
+  .dropdown-icon {
+    flex-shrink: 0;
+    transition: transform 0.2s ease;
+  }
+  
+  &:hover {
+    border-color: #999;
+  }
+}
+
+.multiselect-dropdown {
+  position: absolute;
+  top: 100%;
+  left: 0;
+  right: 0;
+  z-index: 1000;
+  background: white;
+  border: 1px solid #ccc;
+  border-top: none;
+  border-radius: 0 0 4px 4px;
+  box-shadow: 0 2px 4px rgba(0,0,0,0.1);
+  max-height: 200px;
+  overflow-y: auto;
+  
+  .checkbox-group {
+    padding: 8px;
+    
+    .checkbox-item {
+      display: flex;
+      align-items: center;
+      gap: 8px;
+      padding: 4px 0;
+      
+      .checkbox-label {
+        margin: 0;
+        font-size: 14px;
+        cursor: pointer;
+      }
+    }
+  }
+}
+
+.date-range {
+  .date-input-group {
+    display: flex;
+    align-items: center;
+    gap: 8px;
+  }
+  
+  .date-separator {
+    margin: 0 5px;
+    color: #777;
+  }
+}
+
+.toggle {
+  display: flex;
+  align-items: center;
+  gap: 8px;
+  
+  .toggle-label {
+    margin: 0;
+    font-size: 14px;
+    cursor: pointer;
+  }
+}
+
+.filter-actions {
+  margin-top: 15px;
+  padding-top: 15px;
+  border-top: 1px solid #eee;
+  
+  .btn {
+    font-size: 13px;
+  }
+}
+
+// New header row styling
+.header-row {
+  margin-bottom: 15px;
+  padding-bottom: 10px;
+  border-bottom: 1px solid #eee;
+  
+  .chart-title {
+    margin: 0;
+    font-size: 18px;
+    font-weight: 600;
+    color: #333;
+  }
+}
+
+// Responsive design
+@media (max-width: 768px) {
+  .filter-controls {
+    flex-direction: column;
+  }
+  
+  .filter-item {
+    min-width: 100%;
+  }
+  
+  .header-row {
+    .chart-title {
+      font-size: 16px;
+    }
+  }
+}
\ No newline at end of file
diff --git a/frontend/angular-clarity-master/src/app/modules/main/builder/dashboardnew/gadgets/line-chart/line-chart.component.ts b/frontend/angular-clarity-master/src/app/modules/main/builder/dashboardnew/gadgets/line-chart/line-chart.component.ts
index 92b8826..bdee0d6 100644
--- a/frontend/angular-clarity-master/src/app/modules/main/builder/dashboardnew/gadgets/line-chart/line-chart.component.ts
+++ b/frontend/angular-clarity-master/src/app/modules/main/builder/dashboardnew/gadgets/line-chart/line-chart.component.ts
@@ -1,12 +1,14 @@
-import { Component, OnInit, Input, OnChanges, SimpleChanges } from '@angular/core';
+import { Component, OnInit, Input, OnChanges, SimpleChanges, OnDestroy } from '@angular/core';
 import { Dashboard3Service } from 'src/app/services/builder/dashboard3.service';
+import { FilterService } from '../../common-filter/filter.service';
+import { Subscription } from 'rxjs';
 
 @Component({
   selector: 'app-line-chart',
   templateUrl: './line-chart.component.html',
   styleUrls: ['./line-chart.component.scss']
 })
-export class LineChartComponent implements OnInit, OnChanges {
+export class LineChartComponent implements OnInit, OnChanges, OnDestroy {
   @Input() xAxis: string;
   @Input() yAxis: string | string[];
   @Input() table: string;
@@ -82,10 +84,29 @@ export class LineChartComponent implements OnInit, OnChanges {
   
   // Flag to prevent infinite loops
   private isFetchingData: boolean = false;
+  
+  // Subscriptions to unsubscribe on destroy
+  private subscriptions: Subscription[] = [];
 
-  constructor(private dashboardService: Dashboard3Service) { }
+  // Add properties for filter functionality
+  private openMultiselects: Map<string, string> = new Map(); // Map of filterId -> context
+  private documentClickHandler: ((event: MouseEvent) => void) | null = null;
+  private filtersInitialized: boolean = false;
+
+  constructor(
+    private dashboardService: Dashboard3Service,
+    private filterService: FilterService
+  ) { }
 
   ngOnInit(): void {
+    // Subscribe to filter changes
+    this.subscriptions.push(
+      this.filterService.filterState$.subscribe(filters => {
+        // When filters change, refresh the chart data
+        this.fetchChartData();
+      })
+    );
+    
     // Initialize with default data
     this.fetchChartData();
   }
@@ -93,6 +114,12 @@ export class LineChartComponent implements OnInit, OnChanges {
   ngOnChanges(changes: SimpleChanges): void {
     console.log('LineChartComponent input changes:', changes);
     
+    // Initialize filter values if they haven't been initialized yet
+    if (!this.filtersInitialized && (changes.baseFilters || changes.drilldownFilters || changes.drilldownLayers)) {
+      this.initializeFilterValues();
+      this.filtersInitialized = true;
+    }
+    
     // Check if any of the key properties have changed
     const xAxisChanged = changes.xAxis && !changes.xAxis.firstChange;
     const yAxisChanged = changes.yAxis && !changes.yAxis.firstChange;
@@ -122,6 +149,327 @@ export class LineChartComponent implements OnInit, OnChanges {
     }
   }
 
+  ngOnDestroy(): void {
+    this.subscriptions.forEach(sub => sub.unsubscribe());
+    // Clean up document click handler
+    this.removeDocumentClickHandler();
+  }
+  
+  // Initialize filter values with proper default values based on type
+  private initializeFilterValues(): void {
+    console.log('Initializing filter values');
+    
+    // Initialize base filters
+    if (this.baseFilters) {
+      this.baseFilters.forEach(filter => {
+        if (filter.value === undefined || filter.value === null) {
+          switch (filter.type) {
+            case 'multiselect':
+              filter.value = [];
+              break;
+            case 'date-range':
+              filter.value = { start: null, end: null };
+              break;
+            case 'toggle':
+              filter.value = false;
+              break;
+            default:
+              filter.value = '';
+          }
+        }
+      });
+    }
+    
+    // Initialize drilldown filters
+    if (this.drilldownFilters) {
+      this.drilldownFilters.forEach(filter => {
+        if (filter.value === undefined || filter.value === null) {
+          switch (filter.type) {
+            case 'multiselect':
+              filter.value = [];
+              break;
+            case 'date-range':
+              filter.value = { start: null, end: null };
+              break;
+            case 'toggle':
+              filter.value = false;
+              break;
+            default:
+              filter.value = '';
+          }
+        }
+      });
+    }
+    
+    // Initialize layer filters
+    if (this.drilldownLayers) {
+      this.drilldownLayers.forEach(layer => {
+        if (layer.filters) {
+          layer.filters.forEach((filter: any) => {
+            if (filter.value === undefined || filter.value === null) {
+              switch (filter.type) {
+                case 'multiselect':
+                  filter.value = [];
+                  break;
+                case 'date-range':
+                  filter.value = { start: null, end: null };
+                  break;
+                case 'toggle':
+                  filter.value = false;
+                  break;
+                default:
+                  filter.value = '';
+              }
+            }
+          });
+        }
+      });
+    }
+    
+    console.log('Filter values initialized:', {
+      baseFilters: this.baseFilters,
+      drilldownFilters: this.drilldownFilters,
+      drilldownLayers: this.drilldownLayers
+    });
+  }
+
+  // Check if there are active filters
+  hasActiveFilters(): boolean {
+    return (this.baseFilters && this.baseFilters.length > 0) || 
+           (this.drilldownFilters && this.drilldownFilters.length > 0) || 
+           this.hasActiveLayerFilters();
+  }
+
+  // Check if there are active layer filters for current drilldown level
+  hasActiveLayerFilters(): boolean {
+    if (this.currentDrilldownLevel > 1 && this.drilldownLayers && this.drilldownLayers.length > 0) {
+      const layerIndex = this.currentDrilldownLevel - 2; // -2 because level 1 is base drilldown
+      return layerIndex < this.drilldownLayers.length && 
+             this.drilldownLayers[layerIndex].filters && 
+             this.drilldownLayers[layerIndex].filters.length > 0;
+    }
+    return false;
+  }
+
+  // Get active layer filters for current drilldown level
+  getActiveLayerFilters(): any[] {
+    if (this.currentDrilldownLevel > 1 && this.drilldownLayers && this.drilldownLayers.length > 0) {
+      const layerIndex = this.currentDrilldownLevel - 2; // -2 because level 1 is base drilldown
+      if (layerIndex < this.drilldownLayers.length && 
+          this.drilldownLayers[layerIndex].filters) {
+        return this.drilldownLayers[layerIndex].filters;
+      }
+    }
+    return [];
+  }
+
+  // Get filter options for dropdown/multiselect filters
+  getFilterOptions(filter: any): string[] {
+    if (filter.options) {
+      if (Array.isArray(filter.options)) {
+        return filter.options;
+      } else if (typeof filter.options === 'string') {
+        return filter.options.split(',').map(opt => opt.trim()).filter(opt => opt);
+      }
+    }
+    return [];
+  }
+
+  // Check if an option is selected for multiselect filters
+  isOptionSelected(filter: any, option: string): boolean {
+    if (!filter.value) {
+      return false;
+    }
+    
+    if (Array.isArray(filter.value)) {
+      return filter.value.includes(option);
+    }
+    
+    return filter.value === option;
+  }
+
+  // Handle base filter changes
+  onBaseFilterChange(filter: any): void {
+    console.log('Base filter changed:', filter);
+    // Refresh data when filter changes
+    this.fetchChartData();
+  }
+
+  // Handle drilldown filter changes
+  onDrilldownFilterChange(filter: any): void {
+    console.log('Drilldown filter changed:', filter);
+    // Refresh data when filter changes
+    this.fetchChartData();
+  }
+
+  // Handle layer filter changes
+  onLayerFilterChange(filter: any): void {
+    console.log('Layer filter changed:', filter);
+    // Refresh data when filter changes
+    this.fetchChartData();
+  }
+
+  // Handle multiselect changes
+  onMultiSelectChange(filter: any, option: string, event: any): void {
+    const checked = event.target.checked;
+    
+    // Initialize filter.value as array if it's not already
+    if (!Array.isArray(filter.value)) {
+      filter.value = [];
+    }
+    
+    if (checked) {
+      // Add option to array if not already present
+      if (!filter.value.includes(option)) {
+        filter.value.push(option);
+      }
+    } else {
+      // Remove option from array
+      filter.value = filter.value.filter((item: string) => item !== option);
+    }
+    
+    // Refresh data when filter changes
+    this.fetchChartData();
+  }
+
+  // Handle date range changes
+  onDateRangeChange(filter: any, dateRange: { start: string | null, end: string | null }): void {
+    filter.value = dateRange;
+    // Refresh data when filter changes
+    this.fetchChartData();
+  }
+
+  // Handle toggle changes
+  onToggleChange(filter: any, checked: boolean): void {
+    filter.value = checked;
+    // Refresh data when filter changes
+    this.fetchChartData();
+  }
+
+  // Toggle multiselect dropdown visibility
+  toggleMultiselect(filter: any, context: string): void {
+    const filterId = `${context}-${filter.field}`;
+    if (this.isMultiselectOpen(filter, context)) {
+      this.openMultiselects.delete(filterId);
+    } else {
+      // Close all other multiselects first
+      this.openMultiselects.clear();
+      this.openMultiselects.set(filterId, context);
+      
+      // Add document click handler to close dropdown when clicking outside
+      this.addDocumentClickHandler();
+    }
+  }
+
+  // Add document click handler to close dropdowns when clicking outside
+  private addDocumentClickHandler(): void {
+    if (!this.documentClickHandler) {
+      this.documentClickHandler = (event: MouseEvent) => {
+        const target = event.target as HTMLElement;
+        // Check if click is outside any multiselect dropdown
+        if (!target.closest('.multiselect-container')) {
+          this.openMultiselects.clear();
+          this.removeDocumentClickHandler();
+        }
+      };
+      
+      // Use setTimeout to ensure the click event that opened the dropdown doesn't immediately close it
+      setTimeout(() => {
+        document.addEventListener('click', this.documentClickHandler!);
+      }, 0);
+    }
+  }
+
+  // Remove document click handler
+  private removeDocumentClickHandler(): void {
+    if (this.documentClickHandler) {
+      document.removeEventListener('click', this.documentClickHandler);
+      this.documentClickHandler = null;
+    }
+  }
+
+  // Check if multiselect dropdown is open
+  isMultiselectOpen(filter: any, context: string): boolean {
+    const filterId = `${context}-${filter.field}`;
+    return this.openMultiselects.has(filterId);
+  }
+
+  // Get count of selected options for a multiselect filter
+  getSelectedOptionsCount(filter: any): number {
+    if (!filter.value) {
+      return 0;
+    }
+    
+    if (Array.isArray(filter.value)) {
+      return filter.value.length;
+    }
+    
+    return 0;
+  }
+
+  // Clear all filters
+  clearAllFilters(): void {
+    // Clear base filters
+    if (this.baseFilters) {
+      this.baseFilters.forEach(filter => {
+        if (filter.type === 'multiselect') {
+          filter.value = [];
+        } else if (filter.type === 'date-range') {
+          filter.value = { start: null, end: null };
+        } else if (filter.type === 'toggle') {
+          filter.value = false;
+        } else {
+          filter.value = '';
+        }
+      });
+    }
+    
+    // Clear drilldown filters
+    if (this.drilldownFilters) {
+      this.drilldownFilters.forEach(filter => {
+        if (filter.type === 'multiselect') {
+          filter.value = [];
+        } else if (filter.type === 'date-range') {
+          filter.value = { start: null, end: null };
+        } else if (filter.type === 'toggle') {
+          filter.value = false;
+        } else {
+          filter.value = '';
+        }
+      });
+    }
+    
+    // Clear layer filters
+    if (this.drilldownLayers) {
+      this.drilldownLayers.forEach(layer => {
+        if (layer.filters) {
+          layer.filters.forEach((filter: any) => {
+            if (filter.type === 'multiselect') {
+              filter.value = [];
+            } else if (filter.type === 'date-range') {
+              filter.value = { start: null, end: null };
+            } else if (filter.type === 'toggle') {
+              filter.value = false;
+            } else {
+              filter.value = '';
+            }
+          });
+        }
+      });
+    }
+    
+    // Close all multiselect dropdowns
+    this.openMultiselects.clear();
+    
+    // Refresh data
+    this.fetchChartData();
+  }
+  
+  // Public method to refresh data when filters change
+  refreshData(): void {
+    this.fetchChartData();
+  }
+  
   fetchChartData(): void {
     // Set flag to prevent recursive calls
     this.isFetchingData = true;
@@ -154,7 +502,49 @@ export class LineChartComponent implements OnInit, OnChanges {
           filterParams = JSON.stringify(filterObj);
         }
       }
-      console.log('Base filter parameters:', filterParams);
+      
+      // Add common filters to filter parameters
+      const commonFilters = this.filterService.getFilterValues();
+      console.log('Common filters from service:', commonFilters);
+      
+      if (Object.keys(commonFilters).length > 0) {
+        // Merge common filters with base filters
+        const mergedFilterObj = {};
+        
+        // Add base filters first
+        if (filterParams) {
+          try {
+            const baseFilterObj = JSON.parse(filterParams);
+            Object.assign(mergedFilterObj, baseFilterObj);
+          } catch (e) {
+            console.warn('Failed to parse base filter parameters:', e);
+          }
+        }
+        
+        // Add common filters using the field name as the key, not the filter id
+        Object.keys(commonFilters).forEach(filterId => {
+          const filterValue = commonFilters[filterId];
+          // Find the filter definition to get the field name
+          const filterDef = this.filterService.getFilters().find(f => f.id === filterId);
+          if (filterDef && filterDef.field) {
+            const fieldName = filterDef.field;
+            if (filterValue !== undefined && filterValue !== null && filterValue !== '') {
+              mergedFilterObj[fieldName] = filterValue;
+            }
+          } else {
+            // Fallback to using filterId as field name if no field is defined
+            if (filterValue !== undefined && filterValue !== null && filterValue !== '') {
+              mergedFilterObj[filterId] = filterValue;
+            }
+          }
+        });
+        
+        if (Object.keys(mergedFilterObj).length > 0) {
+          filterParams = JSON.stringify(mergedFilterObj);
+        }
+      }
+      
+      console.log('Final filter parameters:', filterParams);
       
       // Log the URL that will be called
       const url = `chart/getdashjson/line?tableName=${this.table}&xAxis=${this.xAxis}&yAxes=${yAxisString}${this.connection ? `&sureId=${this.connection}` : ''}`;
@@ -313,6 +703,35 @@ export class LineChartComponent implements OnInit, OnChanges {
       }
     }
     
+    // Add common filters to drilldown filter parameters
+    const commonFilters = this.filterService.getFilterValues();
+    if (Object.keys(commonFilters).length > 0) {
+      // Merge common filters with drilldown filters
+      const mergedFilterObj = {};
+      
+      // Add drilldown filters first
+      if (filterParams) {
+        try {
+          const drilldownFilterObj = JSON.parse(filterParams);
+          Object.assign(mergedFilterObj, drilldownFilterObj);
+        } catch (e) {
+          console.warn('Failed to parse drilldown filter parameters:', e);
+        }
+      }
+      
+      // Add common filters
+      Object.keys(commonFilters).forEach(key => {
+        const value = commonFilters[key];
+        if (value !== undefined && value !== null && value !== '') {
+          mergedFilterObj[key] = value;
+        }
+      });
+      
+      if (Object.keys(mergedFilterObj).length > 0) {
+        filterParams = JSON.stringify(mergedFilterObj);
+      }
+    }
+    
     // Log the URL that will be called
     const url = `chart/getdashjson/line?tableName=${actualApiUrl}&xAxis=${drilldownConfig.xAxis}&yAxes=${drilldownConfig.yAxis}${this.connection ? `&sureId=${this.connection}` : ''}`;
     console.log('Drilldown data URL:', url);
diff --git a/frontend/angular-clarity-master/src/app/modules/main/builder/dashboardnew/gadgets/pie-chart/pie-chart.component.html b/frontend/angular-clarity-master/src/app/modules/main/builder/dashboardnew/gadgets/pie-chart/pie-chart.component.html
index 87ceda0..0e9c001 100644
--- a/frontend/angular-clarity-master/src/app/modules/main/builder/dashboardnew/gadgets/pie-chart/pie-chart.component.html
+++ b/frontend/angular-clarity-master/src/app/modules/main/builder/dashboardnew/gadgets/pie-chart/pie-chart.component.html
@@ -1,19 +1,287 @@
 <div class="pie-chart-container">
-  <!-- Drilldown mode indicator -->
-  <div *ngIf="currentDrilldownLevel > 0" style="background-color: #e0e0e0; padding: 5px; margin-bottom: 10px; border-radius: 4px; text-align: center;">
-    <span style="font-weight: bold; color: #333;">Drilldown Level: {{currentDrilldownLevel}}</span>
-    <button (click)="navigateBack()" style="margin-left: 10px; padding: 2px 8px; background-color: #007cba; color: white; border: none; border-radius: 3px; cursor: pointer;">
-      Back to Level {{currentDrilldownLevel - 1}}
-    </button>
-    <button (click)="resetToOriginalData()" style="margin-left: 10px; padding: 2px 8px; background-color: #dc3545; color: white; border: none; border-radius: 3px; cursor: pointer;">
-      Back to Main View
-    </button>
+  <!-- Filter Controls Section -->
+  <div class="filter-section" *ngIf="hasActiveFilters()">
+    <!-- Base Filters -->
+    <div class="filter-group" *ngIf="baseFilters && baseFilters.length > 0">
+      <h4>Base Filters</h4>
+      <div class="filter-controls">
+        <div *ngFor="let filter of baseFilters" class="filter-item">
+          <div class="filter-label">{{ filter.field }} ({{ filter.type || 'text' }})</div>
+          
+          <!-- Text Filter -->
+          <div *ngIf="!filter.type || filter.type === 'text'" class="filter-input">
+            <input type="text" 
+                   [(ngModel)]="filter.value" 
+                   (ngModelChange)="onBaseFilterChange(filter)"
+                   [placeholder]="filter.field"
+                   class="clr-input filter-text-input">
+          </div>
+          
+          <!-- Dropdown Filter -->
+          <div *ngIf="filter.type === 'dropdown'" class="filter-input">
+            <select [(ngModel)]="filter.value" 
+                    (ngModelChange)="onBaseFilterChange(filter)"
+                    class="clr-select filter-select">
+              <option value="">Select {{ filter.field }}</option>
+              <option *ngFor="let option of getFilterOptions(filter)" [value]="option">{{ option }}</option>
+            </select>
+          </div>
+          
+          <!-- Multi-Select Filter - Updated to show key first, then dropdown on click -->
+          <div *ngIf="filter.type === 'multiselect'" class="filter-input multiselect-container">
+            <div class="multiselect-display" (click)="toggleMultiselect(filter, 'base')">
+              <span class="multiselect-label">{{ filter.field }}</span>
+              <span class="multiselect-value" *ngIf="getSelectedOptionsCount(filter) > 0">
+                ({{ getSelectedOptionsCount(filter) }} selected)
+              </span>
+              <clr-icon shape="caret down" class="dropdown-icon"></clr-icon>
+            </div>
+            <div class="multiselect-dropdown" *ngIf="isMultiselectOpen(filter, 'base')">
+              <div class="checkbox-group">
+                <div *ngFor="let option of getFilterOptions(filter); let i = index" class="checkbox-item">
+                  <input type="checkbox" 
+                         [checked]="isOptionSelected(filter, option)" 
+                         (change)="onMultiSelectChange(filter, option, $event)"
+                         [id]="'base-' + filter.field + '-' + i" 
+                         class="clr-checkbox">
+                  <label [for]="'base-' + filter.field + '-' + i" class="checkbox-label">{{ option }}</label>
+                </div>
+              </div>
+            </div>
+          </div>
+          
+          <!-- Date Range Filter -->
+          <div *ngIf="filter.type === 'date-range'" class="filter-input date-range">
+            <div class="date-input-group">
+              <input type="date" 
+                     [(ngModel)]="filter.value.start" 
+                     (ngModelChange)="onDateRangeChange(filter, { start: $event, end: filter.value.end })"
+                     placeholder="Start Date"
+                     class="clr-input filter-date">
+              <span class="date-separator">to</span>
+              <input type="date" 
+                     [(ngModel)]="filter.value.end" 
+                     (ngModelChange)="onDateRangeChange(filter, { start: filter.value.start, end: $event })"
+                     placeholder="End Date"
+                     class="clr-input filter-date">
+            </div>
+          </div>
+          
+          <!-- Toggle Filter -->
+          <div *ngIf="filter.type === 'toggle'" class="filter-input toggle">
+            <input type="checkbox" 
+                   [(ngModel)]="filter.value" 
+                   (ngModelChange)="onToggleChange(filter, $event)"
+                   clrToggle 
+                   class="clr-toggle">
+            <label class="toggle-label">{{ filter.field }}</label>
+          </div>
+        </div>
+      </div>
+    </div>
+    
+    <!-- Drilldown Filters -->
+    <div class="filter-group" *ngIf="drilldownFilters && drilldownFilters.length > 0 && currentDrilldownLevel > 0">
+      <h4>Drilldown Filters</h4>
+      <div class="filter-controls">
+        <div *ngFor="let filter of drilldownFilters" class="filter-item">
+          <div class="filter-label">{{ filter.field }} ({{ filter.type || 'text' }})</div>
+          
+          <!-- Text Filter -->
+          <div *ngIf="!filter.type || filter.type === 'text'" class="filter-input">
+            <input type="text" 
+                   [(ngModel)]="filter.value" 
+                   (ngModelChange)="onDrilldownFilterChange(filter)"
+                   [placeholder]="filter.field"
+                   class="clr-input filter-text-input">
+          </div>
+          
+          <!-- Dropdown Filter -->
+          <div *ngIf="filter.type === 'dropdown'" class="filter-input">
+            <select [(ngModel)]="filter.value" 
+                    (ngModelChange)="onDrilldownFilterChange(filter)"
+                    class="clr-select filter-select">
+              <option value="">Select {{ filter.field }}</option>
+              <option *ngFor="let option of getFilterOptions(filter)" [value]="option">{{ option }}</option>
+            </select>
+          </div>
+          
+          <!-- Multi-Select Filter - Updated to show key first, then dropdown on click -->
+          <div *ngIf="filter.type === 'multiselect'" class="filter-input multiselect-container">
+            <div class="multiselect-display" (click)="toggleMultiselect(filter, 'drilldown')">
+              <span class="multiselect-label">{{ filter.field }}</span>
+              <span class="multiselect-value" *ngIf="getSelectedOptionsCount(filter) > 0">
+                ({{ getSelectedOptionsCount(filter) }} selected)
+              </span>
+              <clr-icon shape="caret down" class="dropdown-icon"></clr-icon>
+            </div>
+            <div class="multiselect-dropdown" *ngIf="isMultiselectOpen(filter, 'drilldown')">
+              <div class="checkbox-group">
+                <div *ngFor="let option of getFilterOptions(filter); let i = index" class="checkbox-item">
+                  <input type="checkbox" 
+                         [checked]="isOptionSelected(filter, option)" 
+                         (change)="onMultiSelectChange(filter, option, $event)"
+                         [id]="'drilldown-' + filter.field + '-' + i" 
+                         class="clr-checkbox">
+                  <label [for]="'drilldown-' + filter.field + '-' + i" class="checkbox-label">{{ option }}</label>
+                </div>
+              </div>
+            </div>
+          </div>
+          
+          <!-- Date Range Filter -->
+          <div *ngIf="filter.type === 'date-range'" class="filter-input date-range">
+            <div class="date-input-group">
+              <input type="date" 
+                     [(ngModel)]="filter.value.start" 
+                     (ngModelChange)="onDateRangeChange(filter, { start: $event, end: filter.value.end })"
+                     placeholder="Start Date"
+                     class="clr-input filter-date">
+              <span class="date-separator">to</span>
+              <input type="date" 
+                     [(ngModel)]="filter.value.end" 
+                     (ngModelChange)="onDateRangeChange(filter, { start: filter.value.start, end: $event })"
+                     placeholder="End Date"
+                     class="clr-input filter-date">
+            </div>
+          </div>
+          
+          <!-- Toggle Filter -->
+          <div *ngIf="filter.type === 'toggle'" class="filter-input toggle">
+            <input type="checkbox" 
+                   [(ngModel)]="filter.value" 
+                   (ngModelChange)="onToggleChange(filter, $event)"
+                   clrToggle 
+                   class="clr-toggle">
+            <label class="toggle-label">{{ filter.field }}</label>
+          </div>
+        </div>
+      </div>
+    </div>
+    
+    <!-- Layer Filters -->
+    <div class="filter-group" *ngIf="hasActiveLayerFilters()">
+      <h4>Layer Filters</h4>
+      <div class="filter-controls">
+        <div *ngFor="let filter of getActiveLayerFilters()" class="filter-item">
+          <div class="filter-label">{{ filter.field }} ({{ filter.type || 'text' }})</div>
+          
+          <!-- Text Filter -->
+          <div *ngIf="!filter.type || filter.type === 'text'" class="filter-input">
+            <input type="text" 
+                   [(ngModel)]="filter.value" 
+                   (ngModelChange)="onLayerFilterChange(filter)"
+                   [placeholder]="filter.field"
+                   class="clr-input filter-text-input">
+          </div>
+          
+          <!-- Dropdown Filter -->
+          <div *ngIf="filter.type === 'dropdown'" class="filter-input">
+            <select [(ngModel)]="filter.value" 
+                    (ngModelChange)="onLayerFilterChange(filter)"
+                    class="clr-select filter-select">
+              <option value="">Select {{ filter.field }}</option>
+              <option *ngFor="let option of getFilterOptions(filter)" [value]="option">{{ option }}</option>
+            </select>
+          </div>
+          
+          <!-- Multi-Select Filter - Updated to show key first, then dropdown on click -->
+          <div *ngIf="filter.type === 'multiselect'" class="filter-input multiselect-container">
+            <div class="multiselect-display" (click)="toggleMultiselect(filter, 'layer')">
+              <span class="multiselect-label">{{ filter.field }}</span>
+              <span class="multiselect-value" *ngIf="getSelectedOptionsCount(filter) > 0">
+                ({{ getSelectedOptionsCount(filter) }} selected)
+              </span>
+              <clr-icon shape="caret down" class="dropdown-icon"></clr-icon>
+            </div>
+            <div class="multiselect-dropdown" *ngIf="isMultiselectOpen(filter, 'layer')">
+              <div class="checkbox-group">
+                <div *ngFor="let option of getFilterOptions(filter); let i = index" class="checkbox-item">
+                  <input type="checkbox" 
+                         [checked]="isOptionSelected(filter, option)" 
+                         (change)="onMultiSelectChange(filter, option, $event)"
+                         [id]="'layer-' + filter.field + '-' + i" 
+                         class="clr-checkbox">
+                  <label [for]="'layer-' + filter.field + '-' + i" class="checkbox-label">{{ option }}</label>
+                </div>
+              </div>
+            </div>
+          </div>
+          
+          <!-- Date Range Filter -->
+          <div *ngIf="filter.type === 'date-range'" class="filter-input date-range">
+            <div class="date-input-group">
+              <input type="date" 
+                     [(ngModel)]="filter.value.start" 
+                     (ngModelChange)="onDateRangeChange(filter, { start: $event, end: filter.value.end })"
+                     placeholder="Start Date"
+                     class="clr-input filter-date">
+              <span class="date-separator">to</span>
+              <input type="date" 
+                     [(ngModel)]="filter.value.end" 
+                     (ngModelChange)="onDateRangeChange(filter, { start: filter.value.start, end: $event })"
+                     placeholder="End Date"
+                     class="clr-input filter-date">
+            </div>
+          </div>
+          
+          <!-- Toggle Filter -->
+          <div *ngIf="filter.type === 'toggle'" class="filter-input toggle">
+            <input type="checkbox" 
+                   [(ngModel)]="filter.value" 
+                   (ngModelChange)="onToggleChange(filter, $event)"
+                   clrToggle 
+                   class="clr-toggle">
+            <label class="toggle-label">{{ filter.field }}</label>
+          </div>
+        </div>
+      </div>
+    </div>
+    
+    <!-- Clear Filters Button -->
+    <div class="filter-actions">
+      <button class="btn btn-sm btn-outline" (click)="clearAllFilters()">Clear All Filters</button>
+    </div>
+  </div>
+  
+  <!-- Header row with chart title and drilldown navigation -->
+  <div class="clr-row header-row">
+    <div class="clr-col-6">
+      <h3 class="chart-title" *ngIf="charttitle">{{ charttitle }}</h3>
+    </div>
+    <div class="clr-col-6" style="text-align: right;">
+      <!-- Add drilldown navigation controls -->
+      <button class="btn btn-sm btn-link" *ngIf="drilldownEnabled && drilldownStack.length > 0" (click)="navigateBack()">
+        <cds-icon shape="arrow" direction="left"></cds-icon>
+        Back to {{drilldownStack.length > 1 ? 'Previous Level' : 'Main Data'}}
+      </button>
+    </div>
+  </div>
+  
+  <!-- Show current drilldown level -->
+  <div class="clr-row" *ngIf="drilldownEnabled && drilldownStack.length > 0">
+    <div class="clr-col-12">
+      <div class="alert alert-info" style="padding: 8px 12px; margin-bottom: 12px;">
+        <div class="alert-items">
+          <div class="alert-item static">
+            <div class="alert-icon-wrapper">
+              <cds-icon class="alert-icon" shape="info-circle"></cds-icon>
+            </div>
+            <span class="alert-text">
+              Drilldown Level: {{currentDrilldownLevel}} 
+              <span *ngIf="drilldownStack.length > 0">
+                (Clicked on: {{drilldownStack[drilldownStack.length - 1].clickedLabel}})
+              </span>
+            </span>
+          </div>
+        </div>
+      </div>
+    </div>
   </div>
   
-  <h3 class="chart-title" *ngIf="charttitle">{{ charttitle }}</h3>
   <div class="chart-wrapper">
     <!-- Show loading indicator -->
-    <div class="loading-indicator" *ngIf="pieChartLabels.length === 0 && pieChartData.length === 0 && !noDataAvailable">
+    <div class="loading-indicator" *ngIf="pieChartLabels.length === 0 && pieChartData.length === 0 && !noDataAvailable && !isFetchingData">
       <div class="spinner"></div>
       <p>Loading chart data...</p>
     </div>
@@ -23,15 +291,15 @@
       <p>No chart data available</p>
     </div>
     
-    <!-- Show chart when data is available -->
+    <!-- Show chart when data is available or show default data -->
     <canvas baseChart 
-      *ngIf="pieChartLabels.length > 0 && pieChartData.length > 0"
-      [data]="pieChartData" 
+      [datasets]="pieChartDatasets" 
       [labels]="pieChartLabels" 
       [type]="pieChartType"
       [options]="pieChartOptions"
       (chartHover)="chartHovered($event)"
-      (chartClick)="chartClicked($event)">
+      (chartClick)="chartClicked($event)"
+      [style.display]="shouldShowChart() ? 'block' : 'none'">
     </canvas>
   </div>
   <div class="chart-legend" *ngIf="showlabel && pieChartLabels && pieChartLabels.length > 0">
diff --git a/frontend/angular-clarity-master/src/app/modules/main/builder/dashboardnew/gadgets/pie-chart/pie-chart.component.scss b/frontend/angular-clarity-master/src/app/modules/main/builder/dashboardnew/gadgets/pie-chart/pie-chart.component.scss
index ba07969..de8a953 100644
--- a/frontend/angular-clarity-master/src/app/modules/main/builder/dashboardnew/gadgets/pie-chart/pie-chart.component.scss
+++ b/frontend/angular-clarity-master/src/app/modules/main/builder/dashboardnew/gadgets/pie-chart/pie-chart.component.scss
@@ -149,10 +149,192 @@
   100% { transform: rotate(360deg); }
 }
 
-/* Responsive design */
+// Filter section styles
+.filter-section {
+  margin-bottom: 20px;
+  padding: 15px;
+  border: 1px solid #ddd;
+  border-radius: 4px;
+  background-color: #f9f9f9;
+}
+
+.filter-group {
+  margin-bottom: 15px;
+  
+  h4 {
+    margin-top: 0;
+    margin-bottom: 10px;
+    color: #333;
+    font-weight: 600;
+  }
+}
+
+.filter-controls {
+  display: flex;
+  flex-wrap: wrap;
+  gap: 15px;
+}
+
+.filter-item {
+  flex: 1 1 300px;
+  min-width: 250px;
+  padding: 10px;
+  background: white;
+  border: 1px solid #e0e0e0;
+  border-radius: 4px;
+}
+
+.filter-label {
+  font-weight: 500;
+  margin-bottom: 8px;
+  color: #555;
+  font-size: 14px;
+}
+
+.filter-input {
+  width: 100%;
+  
+  .filter-text-input,
+  .filter-select,
+  .filter-date {
+    width: 100%;
+    padding: 6px 12px;
+    border: 1px solid #ccc;
+    border-radius: 4px;
+    font-size: 14px;
+  }
+  
+  .filter-select {
+    height: 34px;
+  }
+}
+
+.multiselect-container {
+  position: relative;
+}
+
+.multiselect-display {
+  display: flex;
+  align-items: center;
+  justify-content: space-between;
+  padding: 6px 12px;
+  border: 1px solid #ccc;
+  border-radius: 4px;
+  background: white;
+  cursor: pointer;
+  min-height: 34px;
+  
+  .multiselect-label {
+    flex: 1;
+    font-size: 14px;
+  }
+  
+  .multiselect-value {
+    color: #666;
+    font-size: 12px;
+    margin-right: 8px;
+  }
+  
+  .dropdown-icon {
+    flex-shrink: 0;
+    transition: transform 0.2s ease;
+  }
+  
+  &:hover {
+    border-color: #999;
+  }
+}
+
+.multiselect-dropdown {
+  position: absolute;
+  top: 100%;
+  left: 0;
+  right: 0;
+  z-index: 1000;
+  background: white;
+  border: 1px solid #ccc;
+  border-top: none;
+  border-radius: 0 0 4px 4px;
+  box-shadow: 0 2px 4px rgba(0,0,0,0.1);
+  max-height: 200px;
+  overflow-y: auto;
+  
+  .checkbox-group {
+    padding: 8px;
+    
+    .checkbox-item {
+      display: flex;
+      align-items: center;
+      gap: 8px;
+      padding: 4px 0;
+      
+      .checkbox-label {
+        margin: 0;
+        font-size: 14px;
+        cursor: pointer;
+      }
+    }
+  }
+}
+
+.date-range {
+  .date-input-group {
+    display: flex;
+    align-items: center;
+    gap: 8px;
+  }
+  
+  .date-separator {
+    margin: 0 5px;
+    color: #777;
+  }
+}
+
+.toggle {
+  display: flex;
+  align-items: center;
+  gap: 8px;
+  
+  .toggle-label {
+    margin: 0;
+    font-size: 14px;
+    cursor: pointer;
+  }
+}
+
+.filter-actions {
+  margin-top: 15px;
+  padding-top: 15px;
+  border-top: 1px solid #eee;
+  
+  .btn {
+    font-size: 13px;
+  }
+}
+
+// New header row styling
+.header-row {
+  margin-bottom: 15px;
+  padding-bottom: 10px;
+  border-bottom: 1px solid #eee;
+  
+  .chart-title {
+    margin: 0;
+    font-size: 18px;
+    font-weight: 600;
+    color: #333;
+    text-align: left;
+    padding-bottom: 0;
+    border-bottom: none;
+  }
+}
+
+// Responsive design
 @media (max-width: 768px) {
   .pie-chart-container {
     padding: 15px;
+    height: auto;
+    min-height: 300px;
   }
   
   .chart-title {
@@ -179,4 +361,18 @@
     font-size: 16px;
     padding: 20px;
   }
+  
+  .filter-controls {
+    flex-direction: column;
+  }
+  
+  .filter-item {
+    min-width: 100%;
+  }
+  
+  .header-row {
+    .chart-title {
+      font-size: 16px;
+    }
+  }
 }
\ No newline at end of file
diff --git a/frontend/angular-clarity-master/src/app/modules/main/builder/dashboardnew/gadgets/pie-chart/pie-chart.component.ts b/frontend/angular-clarity-master/src/app/modules/main/builder/dashboardnew/gadgets/pie-chart/pie-chart.component.ts
index 523feb4..eabb63c 100644
--- a/frontend/angular-clarity-master/src/app/modules/main/builder/dashboardnew/gadgets/pie-chart/pie-chart.component.ts
+++ b/frontend/angular-clarity-master/src/app/modules/main/builder/dashboardnew/gadgets/pie-chart/pie-chart.component.ts
@@ -1,12 +1,14 @@
-import { Component, OnInit, Input, OnChanges, SimpleChanges, AfterViewChecked } from '@angular/core';
+import { Component, OnInit, Input, OnChanges, SimpleChanges, AfterViewChecked, OnDestroy } from '@angular/core';
 import { Dashboard3Service } from 'src/app/services/builder/dashboard3.service';
+import { FilterService } from '../../common-filter/filter.service';
+import { Subscription } from 'rxjs';
 
 @Component({
   selector: 'app-pie-chart',
   templateUrl: './pie-chart.component.html',
   styleUrls: ['./pie-chart.component.scss']
 })
-export class PieChartComponent implements OnInit, OnChanges, AfterViewChecked {
+export class PieChartComponent implements OnInit, OnChanges, AfterViewChecked, OnDestroy {
   @Input() xAxis: string;
   @Input() yAxis: string | string[];
   @Input() table: string;
@@ -35,6 +37,12 @@ export class PieChartComponent implements OnInit, OnChanges, AfterViewChecked {
 
   public pieChartLabels: string[] = ['Category A', 'Category B', 'Category C'];
   public pieChartData: number[] = [30, 50, 20];
+  public pieChartDatasets: any[] = [
+    {
+      data: [30, 50, 20],
+      label: 'Dataset 1'
+    }
+  ];
   public pieChartType: string = 'pie';
   public pieChartOptions: any = {
     responsive: true,
@@ -94,9 +102,20 @@ export class PieChartComponent implements OnInit, OnChanges, AfterViewChecked {
   noDataAvailable: boolean = false;
   
   // Flag to prevent infinite loops
-  private isFetchingData: boolean = false;
+   isFetchingData: boolean = false;
+  
+  // Subscriptions to unsubscribe on destroy
+  private subscriptions: Subscription[] = [];
 
-  constructor(private dashboardService: Dashboard3Service) { }
+  // Add properties for filter functionality
+  private openMultiselects: Map<string, string> = new Map(); // Map of filterId -> context
+  private documentClickHandler: ((event: MouseEvent) => void) | null = null;
+  private filtersInitialized: boolean = false;
+
+  constructor(
+    private dashboardService: Dashboard3Service,
+    private filterService: FilterService
+  ) { }
 
   /**
    * Force chart redraw
@@ -108,15 +127,39 @@ export class PieChartComponent implements OnInit, OnChanges, AfterViewChecked {
   }
   
   ngOnInit(): void {
+    // Subscribe to filter changes
+    this.subscriptions.push(
+      this.filterService.filterState$.subscribe(filters => {
+        // When filters change, refresh the chart data
+        this.fetchChartData();
+      })
+    );
+    
     console.log('PieChartComponent initialized with default data:', { labels: this.pieChartLabels, data: this.pieChartData });
     // Validate initial data
     this.validateChartData();
-    this.fetchChartData();
+    // Initialize datasets with default data
+    this.pieChartDatasets = [
+      {
+        data: this.pieChartData,
+        label: 'Dataset 1'
+      }
+    ];
+    // Only fetch data if we have the required inputs, otherwise show default data
+    if (this.table && this.xAxis && this.yAxis) {
+      this.fetchChartData();
+    }
   }
 
   ngOnChanges(changes: SimpleChanges): void {
     console.log('PieChartComponent input changes:', changes);
     
+    // Initialize filter values if they haven't been initialized yet
+    if (!this.filtersInitialized && (changes.baseFilters || changes.drilldownFilters || changes.drilldownLayers)) {
+      this.initializeFilterValues();
+      this.filtersInitialized = true;
+    }
+    
     // Check if any of the key properties have changed
     const xAxisChanged = changes.xAxis && !changes.xAxis.firstChange;
     const yAxisChanged = changes.yAxis && !changes.yAxis.firstChange;
@@ -138,8 +181,335 @@ export class PieChartComponent implements OnInit, OnChanges, AfterViewChecked {
       console.log('Chart configuration changed, fetching new data');
       this.fetchChartData();
     }
+    
+    // If we have the required inputs and haven't fetched data yet, fetch it
+    if ((xAxisChanged || yAxisChanged || tableChanged) && this.table && this.xAxis && this.yAxis && !this.isFetchingData) {
+      console.log('Required inputs available, fetching data');
+      this.fetchChartData();
+    }
   }
 
+  ngOnDestroy(): void {
+    this.subscriptions.forEach(sub => sub.unsubscribe());
+    // Clean up document click handler
+    this.removeDocumentClickHandler();
+  }
+  
+  // Initialize filter values with proper default values based on type
+  private initializeFilterValues(): void {
+    console.log('Initializing filter values');
+    
+    // Initialize base filters
+    if (this.baseFilters) {
+      this.baseFilters.forEach(filter => {
+        if (filter.value === undefined || filter.value === null) {
+          switch (filter.type) {
+            case 'multiselect':
+              filter.value = [];
+              break;
+            case 'date-range':
+              filter.value = { start: null, end: null };
+              break;
+            case 'toggle':
+              filter.value = false;
+              break;
+            default:
+              filter.value = '';
+          }
+        }
+      });
+    }
+    
+    // Initialize drilldown filters
+    if (this.drilldownFilters) {
+      this.drilldownFilters.forEach(filter => {
+        if (filter.value === undefined || filter.value === null) {
+          switch (filter.type) {
+            case 'multiselect':
+              filter.value = [];
+              break;
+            case 'date-range':
+              filter.value = { start: null, end: null };
+              break;
+            case 'toggle':
+              filter.value = false;
+              break;
+            default:
+              filter.value = '';
+          }
+        }
+      });
+    }
+    
+    // Initialize layer filters
+    if (this.drilldownLayers) {
+      this.drilldownLayers.forEach(layer => {
+        if (layer.filters) {
+          layer.filters.forEach((filter: any) => {
+            if (filter.value === undefined || filter.value === null) {
+              switch (filter.type) {
+                case 'multiselect':
+                  filter.value = [];
+                  break;
+                case 'date-range':
+                  filter.value = { start: null, end: null };
+                  break;
+                case 'toggle':
+                  filter.value = false;
+                  break;
+                default:
+                  filter.value = '';
+              }
+            }
+          });
+        }
+      });
+    }
+    
+    console.log('Filter values initialized:', {
+      baseFilters: this.baseFilters,
+      drilldownFilters: this.drilldownFilters,
+      drilldownLayers: this.drilldownLayers
+    });
+  }
+
+  // Check if there are active filters
+  hasActiveFilters(): boolean {
+    return (this.baseFilters && this.baseFilters.length > 0) || 
+           (this.drilldownFilters && this.drilldownFilters.length > 0) || 
+           this.hasActiveLayerFilters();
+  }
+
+  // Check if there are active layer filters for current drilldown level
+  hasActiveLayerFilters(): boolean {
+    if (this.currentDrilldownLevel > 1 && this.drilldownLayers && this.drilldownLayers.length > 0) {
+      const layerIndex = this.currentDrilldownLevel - 2; // -2 because level 1 is base drilldown
+      return layerIndex < this.drilldownLayers.length && 
+             this.drilldownLayers[layerIndex].filters && 
+             this.drilldownLayers[layerIndex].filters.length > 0;
+    }
+    return false;
+  }
+
+  // Get active layer filters for current drilldown level
+  getActiveLayerFilters(): any[] {
+    if (this.currentDrilldownLevel > 1 && this.drilldownLayers && this.drilldownLayers.length > 0) {
+      const layerIndex = this.currentDrilldownLevel - 2; // -2 because level 1 is base drilldown
+      if (layerIndex < this.drilldownLayers.length && 
+          this.drilldownLayers[layerIndex].filters) {
+        return this.drilldownLayers[layerIndex].filters;
+      }
+    }
+    return [];
+  }
+
+  // Get filter options for dropdown/multiselect filters
+  getFilterOptions(filter: any): string[] {
+    if (filter.options) {
+      if (Array.isArray(filter.options)) {
+        return filter.options;
+      } else if (typeof filter.options === 'string') {
+        return filter.options.split(',').map(opt => opt.trim()).filter(opt => opt);
+      }
+    }
+    return [];
+  }
+
+  // Check if an option is selected for multiselect filters
+  isOptionSelected(filter: any, option: string): boolean {
+    if (!filter.value) {
+      return false;
+    }
+    
+    if (Array.isArray(filter.value)) {
+      return filter.value.includes(option);
+    }
+    
+    return filter.value === option;
+  }
+
+  // Handle base filter changes
+  onBaseFilterChange(filter: any): void {
+    console.log('Base filter changed:', filter);
+    // Refresh data when filter changes
+    this.fetchChartData();
+  }
+
+  // Handle drilldown filter changes
+  onDrilldownFilterChange(filter: any): void {
+    console.log('Drilldown filter changed:', filter);
+    // Refresh data when filter changes
+    this.fetchChartData();
+  }
+
+  // Handle layer filter changes
+  onLayerFilterChange(filter: any): void {
+    console.log('Layer filter changed:', filter);
+    // Refresh data when filter changes
+    this.fetchChartData();
+  }
+
+  // Handle multiselect changes
+  onMultiSelectChange(filter: any, option: string, event: any): void {
+    const checked = event.target.checked;
+    
+    // Initialize filter.value as array if it's not already
+    if (!Array.isArray(filter.value)) {
+      filter.value = [];
+    }
+    
+    if (checked) {
+      // Add option to array if not already present
+      if (!filter.value.includes(option)) {
+        filter.value.push(option);
+      }
+    } else {
+      // Remove option from array
+      filter.value = filter.value.filter((item: string) => item !== option);
+    }
+    
+    // Refresh data when filter changes
+    this.fetchChartData();
+  }
+
+  // Handle date range changes
+  onDateRangeChange(filter: any, dateRange: { start: string | null, end: string | null }): void {
+    filter.value = dateRange;
+    // Refresh data when filter changes
+    this.fetchChartData();
+  }
+
+  // Handle toggle changes
+  onToggleChange(filter: any, checked: boolean): void {
+    filter.value = checked;
+    // Refresh data when filter changes
+    this.fetchChartData();
+  }
+
+  // Toggle multiselect dropdown visibility
+  toggleMultiselect(filter: any, context: string): void {
+    const filterId = `${context}-${filter.field}`;
+    if (this.isMultiselectOpen(filter, context)) {
+      this.openMultiselects.delete(filterId);
+    } else {
+      // Close all other multiselects first
+      this.openMultiselects.clear();
+      this.openMultiselects.set(filterId, context);
+      
+      // Add document click handler to close dropdown when clicking outside
+      this.addDocumentClickHandler();
+    }
+  }
+
+  // Add document click handler to close dropdowns when clicking outside
+  private addDocumentClickHandler(): void {
+    if (!this.documentClickHandler) {
+      this.documentClickHandler = (event: MouseEvent) => {
+        const target = event.target as HTMLElement;
+        // Check if click is outside any multiselect dropdown
+        if (!target.closest('.multiselect-container')) {
+          this.openMultiselects.clear();
+          this.removeDocumentClickHandler();
+        }
+      };
+      
+      // Use setTimeout to ensure the click event that opened the dropdown doesn't immediately close it
+      setTimeout(() => {
+        document.addEventListener('click', this.documentClickHandler!);
+      }, 0);
+    }
+  }
+
+  // Remove document click handler
+  private removeDocumentClickHandler(): void {
+    if (this.documentClickHandler) {
+      document.removeEventListener('click', this.documentClickHandler);
+      this.documentClickHandler = null;
+    }
+  }
+
+  // Check if multiselect dropdown is open
+  isMultiselectOpen(filter: any, context: string): boolean {
+    const filterId = `${context}-${filter.field}`;
+    return this.openMultiselects.has(filterId);
+  }
+
+  // Get count of selected options for a multiselect filter
+  getSelectedOptionsCount(filter: any): number {
+    if (!filter.value) {
+      return 0;
+    }
+    
+    if (Array.isArray(filter.value)) {
+      return filter.value.length;
+    }
+    
+    return 0;
+  }
+
+  // Clear all filters
+  clearAllFilters(): void {
+    // Clear base filters
+    if (this.baseFilters) {
+      this.baseFilters.forEach(filter => {
+        if (filter.type === 'multiselect') {
+          filter.value = [];
+        } else if (filter.type === 'date-range') {
+          filter.value = { start: null, end: null };
+        } else if (filter.type === 'toggle') {
+          filter.value = false;
+        } else {
+          filter.value = '';
+        }
+      });
+    }
+    
+    // Clear drilldown filters
+    if (this.drilldownFilters) {
+      this.drilldownFilters.forEach(filter => {
+        if (filter.type === 'multiselect') {
+          filter.value = [];
+        } else if (filter.type === 'date-range') {
+          filter.value = { start: null, end: null };
+        } else if (filter.type === 'toggle') {
+          filter.value = false;
+        } else {
+          filter.value = '';
+        }
+      });
+    }
+    
+    // Clear layer filters
+    if (this.drilldownLayers) {
+      this.drilldownLayers.forEach(layer => {
+        if (layer.filters) {
+          layer.filters.forEach((filter: any) => {
+            if (filter.type === 'multiselect') {
+              filter.value = [];
+            } else if (filter.type === 'date-range') {
+              filter.value = { start: null, end: null };
+            } else if (filter.type === 'toggle') {
+              filter.value = false;
+            } else {
+              filter.value = '';
+            }
+          });
+        }
+      });
+    }
+    
+    // Close all multiselect dropdowns
+    this.openMultiselects.clear();
+    
+    // Refresh data
+    this.fetchChartData();
+  }
+  
+  // Public method to refresh data when filters change
+  refreshData(): void {
+    this.fetchChartData();
+  }
+  
   fetchChartData(): void {
     // Set flag to prevent recursive calls
     this.isFetchingData = true;
@@ -172,11 +542,53 @@ export class PieChartComponent implements OnInit, OnChanges, AfterViewChecked {
           filterParams = JSON.stringify(filterObj);
         }
       }
-      console.log('Base filter parameters:', filterParams);
+      
+      // Add common filters to filter parameters
+      const commonFilters = this.filterService.getFilterValues();
+      console.log('Common filters from service:', commonFilters);
+      
+      if (Object.keys(commonFilters).length > 0) {
+        // Merge common filters with base filters
+        const mergedFilterObj = {};
+        
+        // Add base filters first
+        if (filterParams) {
+          try {
+            const baseFilterObj = JSON.parse(filterParams);
+            Object.assign(mergedFilterObj, baseFilterObj);
+          } catch (e) {
+            console.warn('Failed to parse base filter parameters:', e);
+          }
+        }
+        
+        // Add common filters using the field name as the key, not the filter id
+        Object.keys(commonFilters).forEach(filterId => {
+          const filterValue = commonFilters[filterId];
+          // Find the filter definition to get the field name
+          const filterDef = this.filterService.getFilters().find(f => f.id === filterId);
+          if (filterDef && filterDef.field) {
+            const fieldName = filterDef.field;
+            if (filterValue !== undefined && filterValue !== null && filterValue !== '') {
+              mergedFilterObj[fieldName] = filterValue;
+            }
+          } else {
+            // Fallback to using filterId as field name if no field is defined
+            if (filterValue !== undefined && filterValue !== null && filterValue !== '') {
+              mergedFilterObj[filterId] = filterValue;
+            }
+          }
+        });
+        
+        if (Object.keys(mergedFilterObj).length > 0) {
+          filterParams = JSON.stringify(mergedFilterObj);
+        }
+      }
+      
+      console.log('Final filter parameters:', filterParams);
       
       // Log the URL that will be called
       const url = `chart/getdashjson/pie?tableName=${this.table}&xAxis=${this.xAxis}&yAxes=${yAxisString}${this.connection ? `&sureId=${this.connection}` : ''}`;
-      console.log('Pie chart data URL:', url);
+      console.log('Chart data URL:', url);
       
       // Fetch data from the dashboard service with parameter field and value
       // For base level, we pass empty parameter and value, but now also pass filters
@@ -184,12 +596,8 @@ export class PieChartComponent implements OnInit, OnChanges, AfterViewChecked {
         (data: any) => {
           console.log('Received pie chart data:', data);
           if (data === null) {
-            console.warn('Pie chart API returned null data. Check if the API endpoint is working correctly.');
+            console.warn('API returned null data. Check if the API endpoint is working correctly.');
             this.noDataAvailable = true;
-            this.pieChartLabels = [];
-            this.pieChartData = [];
-            // Validate and sanitize data to show default data
-            this.validateChartData();
             // Reset flag after fetching
             this.isFetchingData = false;
             return;
@@ -197,50 +605,57 @@ export class PieChartComponent implements OnInit, OnChanges, AfterViewChecked {
           
           // Handle the actual data structure returned by the API
           if (data && data.chartLabels && data.chartData) {
-            // For pie charts, we need to extract the data differently
-            // The first dataset's data array contains the values for the pie chart
+            // Backend has already filtered the data, just display it
             this.noDataAvailable = data.chartLabels.length === 0;
-            this.pieChartLabels = data.chartLabels || [];
-            if (data.chartData && data.chartData.length > 0) {
-              this.pieChartData = data.chartData[0].data.map(value => {
-                // Convert to number if it's not already
-                const numValue = Number(value);
-                return isNaN(numValue) ? 0 : numValue;
-              });
+            this.pieChartLabels = data.chartLabels;
+            
+            // Extract the actual data values from the chartData array
+            // chartData is an array with one object containing the data
+            if (data.chartData.length > 0 && data.chartData[0].data) {
+              this.pieChartData = data.chartData[0].data;
             } else {
               this.pieChartData = [];
             }
-            // Ensure labels and data arrays have the same length
-            this.syncLabelAndDataArrays();
-            // Validate and sanitize data
-            this.validateChartData();
+            
             // Trigger change detection
+            this.pieChartLabels = [...this.pieChartLabels];
             this.pieChartData = [...this.pieChartData];
+            this.pieChartDatasets = [
+              {
+                data: this.pieChartData,
+                label: 'Dataset 1'
+              }
+            ];
             console.log('Updated pie chart with data:', { labels: this.pieChartLabels, data: this.pieChartData });
-          } else if (data && data.labels && data.data) {
-            // Handle the original expected format as fallback
+          } else if (data && data.labels && data.datasets) {
+            // Backend has already filtered the data, just display it
             this.noDataAvailable = data.labels.length === 0;
-            this.pieChartLabels = data.labels || [];
-            this.pieChartData = data.data.map(value => {
-              // Convert to number if it's not already
-              const numValue = Number(value);
-              return isNaN(numValue) ? 0 : numValue;
-            });
-            // Ensure labels and data arrays have the same length
-            this.syncLabelAndDataArrays();
-            // Validate and sanitize data
-            this.validateChartData();
+            this.pieChartLabels = data.labels;
+            this.pieChartData = data.datasets[0]?.data || [];
             // Trigger change detection
+            this.pieChartLabels = [...this.pieChartLabels];
             this.pieChartData = [...this.pieChartData];
+            this.pieChartDatasets = [
+              {
+                data: this.pieChartData,
+                label: 'Dataset 1'
+              }
+            ];
             console.log('Updated pie chart with legacy data format:', { labels: this.pieChartLabels, data: this.pieChartData });
           } else {
-            console.warn('Pie chart received data does not have expected structure', data);
-            // Reset to default data
+            console.warn('Received data does not have expected structure', data);
             this.noDataAvailable = true;
-            this.pieChartLabels = [];
-            this.pieChartData = [];
-            // Validate and sanitize data to show default data
-            this.validateChartData();
+            // Keep default data if no data is available
+            if (this.pieChartLabels.length === 0 && this.pieChartData.length === 0) {
+              this.pieChartLabels = ['Category A', 'Category B', 'Category C'];
+              this.pieChartData = [30, 50, 20];
+              this.pieChartDatasets = [
+                {
+                  data: this.pieChartData,
+                  label: 'Dataset 1'
+                }
+              ];
+            }
           }
           // Reset flag after fetching
           this.isFetchingData = false;
@@ -248,23 +663,13 @@ export class PieChartComponent implements OnInit, OnChanges, AfterViewChecked {
         (error) => {
           console.error('Error fetching pie chart data:', error);
           this.noDataAvailable = true;
-          this.pieChartLabels = [];
-          this.pieChartData = [];
-          // Validate and sanitize data to show default data
-          this.validateChartData();
           // Reset flag after fetching
           this.isFetchingData = false;
         }
       );
     } else {
-      console.log('Missing required data for pie chart, showing default data:', { table: this.table, xAxis: this.xAxis, yAxis: this.yAxis, connection: this.connection });
-      // Don't set noDataAvailable to true when there's no required data
-      // This allows static data to be displayed
-      this.noDataAvailable = false;
-      // Validate the chart data to ensure we have some data to display
-      this.validateChartData();
-      // Force a redraw to ensure the chart displays
-      this.pieChartData = [...this.pieChartData];
+      console.log('Missing required data for chart:', { table: this.table, xAxis: this.xAxis, yAxis: this.yAxis, connection: this.connection });
+      this.noDataAvailable = true;
       // Reset flag after fetching
       this.isFetchingData = false;
     }
@@ -293,8 +698,6 @@ export class PieChartComponent implements OnInit, OnChanges, AfterViewChecked {
       } else {
         console.warn('Invalid drilldown layer index:', layerIndex);
         this.noDataAvailable = true;
-        this.pieChartLabels = [];
-        this.pieChartData = [];
         return;
       }
     }
@@ -305,8 +708,6 @@ export class PieChartComponent implements OnInit, OnChanges, AfterViewChecked {
     if (!drilldownConfig || !drilldownConfig.apiUrl || !drilldownConfig.xAxis || !drilldownConfig.yAxis) {
       console.warn('Missing drilldown configuration for level:', this.currentDrilldownLevel);
       this.noDataAvailable = true;
-      this.pieChartLabels = [];
-      this.pieChartData = [];
       return;
     }
     
@@ -362,6 +763,35 @@ export class PieChartComponent implements OnInit, OnChanges, AfterViewChecked {
       }
     }
     
+    // Add common filters to drilldown filter parameters
+    const commonFilters = this.filterService.getFilterValues();
+    if (Object.keys(commonFilters).length > 0) {
+      // Merge common filters with drilldown filters
+      const mergedFilterObj = {};
+      
+      // Add drilldown filters first
+      if (filterParams) {
+        try {
+          const drilldownFilterObj = JSON.parse(filterParams);
+          Object.assign(mergedFilterObj, drilldownFilterObj);
+        } catch (e) {
+          console.warn('Failed to parse drilldown filter parameters:', e);
+        }
+      }
+      
+      // Add common filters
+      Object.keys(commonFilters).forEach(key => {
+        const value = commonFilters[key];
+        if (value !== undefined && value !== null && value !== '') {
+          mergedFilterObj[key] = value;
+        }
+      });
+      
+      if (Object.keys(mergedFilterObj).length > 0) {
+        filterParams = JSON.stringify(mergedFilterObj);
+      }
+    }
+    
     // Log the URL that will be called
     const url = `chart/getdashjson/pie?tableName=${actualApiUrl}&xAxis=${drilldownConfig.xAxis}&yAxes=${drilldownConfig.yAxis}${this.connection ? `&sureId=${this.connection}` : ''}`;
     console.log('Drilldown data URL:', url);
@@ -374,64 +804,57 @@ export class PieChartComponent implements OnInit, OnChanges, AfterViewChecked {
         if (data === null) {
           console.warn('Drilldown API returned null data. Check if the API endpoint is working correctly.');
           this.noDataAvailable = true;
-          this.pieChartLabels = [];
-          this.pieChartData = [];
           return;
         }
         
         // Handle the actual data structure returned by the API
         if (data && data.chartLabels && data.chartData) {
-          // For pie charts, we need to extract the data differently
-          // The first dataset's data array contains the values for the pie chart
+          // Backend has already filtered the data, just display it
           this.noDataAvailable = data.chartLabels.length === 0;
-          this.pieChartLabels = data.chartLabels || [];
-          if (data.chartData && data.chartData.length > 0) {
-            this.pieChartData = data.chartData[0].data.map(value => {
-              // Convert to number if it's not already
-              const numValue = Number(value);
-              return isNaN(numValue) ? 0 : numValue;
-            });
+          this.pieChartLabels = data.chartLabels;
+          
+          // Extract the actual data values from the chartData array
+          // chartData is an array with one object containing the data
+          if (data.chartData.length > 0 && data.chartData[0].data) {
+            this.pieChartData = data.chartData[0].data;
           } else {
             this.pieChartData = [];
           }
-          // Ensure labels and data arrays have the same length
-          this.syncLabelAndDataArrays();
-          // Validate and sanitize data
-          this.validateChartData();
+          
           // Trigger change detection
+          this.pieChartLabels = [...this.pieChartLabels];
           this.pieChartData = [...this.pieChartData];
+          this.pieChartDatasets = [
+            {
+              data: this.pieChartData,
+              label: 'Dataset 1'
+            }
+          ];
           console.log('Updated pie chart with drilldown data:', { labels: this.pieChartLabels, data: this.pieChartData });
-        } else if (data && data.labels && data.data) {
-          // Handle the original expected format as fallback
+        } else if (data && data.labels && data.datasets) {
+          // Backend has already filtered the data, just display it
           this.noDataAvailable = data.labels.length === 0;
-          this.pieChartLabels = data.labels || [];
-          this.pieChartData = data.data.map(value => {
-            // Convert to number if it's not already
-            const numValue = Number(value);
-            return isNaN(numValue) ? 0 : numValue;
-          });
-          // Ensure labels and data arrays have the same length
-          this.syncLabelAndDataArrays();
-          // Validate and sanitize data
-          this.validateChartData();
+          this.pieChartLabels = data.labels;
+          this.pieChartData = data.datasets[0]?.data || [];
           // Trigger change detection
+          this.pieChartLabels = [...this.pieChartLabels];
           this.pieChartData = [...this.pieChartData];
+          this.pieChartDatasets = [
+            {
+              data: this.pieChartData,
+              label: 'Dataset 1'
+            }
+          ];
           console.log('Updated pie chart with drilldown legacy data format:', { labels: this.pieChartLabels, data: this.pieChartData });
         } else {
           console.warn('Drilldown received data does not have expected structure', data);
           this.noDataAvailable = true;
-          this.pieChartLabels = [];
-          this.pieChartData = [];
-          // Validate and sanitize data
-          this.validateChartData();
+          // Keep current data if no data is available
         }
       },
       (error) => {
         console.error('Error fetching drilldown data:', error);
         this.noDataAvailable = true;
-        this.pieChartLabels = [];
-        this.pieChartData = [];
-        // Keep current data in case of error
       }
     );
   }
@@ -492,84 +915,54 @@ export class PieChartComponent implements OnInit, OnChanges, AfterViewChecked {
     }
   }
 
-  /**
-   * Get color for legend item
-   * @param index Index of the legend item
-   */
-  public getLegendColor(index: number): string {
-    return this.chartColors[index % this.chartColors.length];
+  // Validate chart data to ensure labels and data arrays have the same length
+  private validateChartData(): void {
+    if (this.pieChartLabels && this.pieChartData) {
+      // For pie charts, we need to ensure labels and data arrays have the same length
+      const labelCount = this.pieChartLabels.length;
+      const dataCount = this.pieChartData.length;
+      
+      if (labelCount !== dataCount) {
+        console.warn('Pie chart labels and data arrays have different lengths:', { labels: labelCount, data: dataCount });
+        // Pad or truncate data array to match label count
+        if (dataCount < labelCount) {
+          // Pad with zeros
+          while (this.pieChartData.length < labelCount) {
+            this.pieChartData.push(0);
+          }
+        } else if (dataCount > labelCount) {
+          // Truncate data array
+          this.pieChartData = this.pieChartData.slice(0, labelCount);
+        }
+      }
+    }
   }
 
-  /**
-   * Ensure labels and data arrays have the same length
-   */
-  private syncLabelAndDataArrays(): void {
-    // Ensure we have matching arrays
-    if (this.pieChartLabels.length !== this.pieChartData.length) {
-      const maxLength = Math.max(this.pieChartLabels.length, this.pieChartData.length);
-      while (this.pieChartLabels.length < maxLength) {
-        this.pieChartLabels.push(`Label ${this.pieChartLabels.length + 1}`);
-      }
-      while (this.pieChartData.length < maxLength) {
-        this.pieChartData.push(0);
-      }
-    }
+  // Get legend color for a specific index
+  getLegendColor(index: number): string {
+    return this.chartColors[index % this.chartColors.length];
   }
   
-  /**
-   * Validate and sanitize chart data
-   */
-  private validateChartData(): void {
-    console.log('Validating chart data:', { labels: this.pieChartLabels, data: this.pieChartData });
-    
-    // Ensure we have valid arrays
-    if (!Array.isArray(this.pieChartLabels)) {
-      this.pieChartLabels = [];
+  // Method to determine if chart should be displayed
+  shouldShowChart(): boolean {
+    // Show chart if we have data
+    if (this.pieChartLabels.length > 0 && this.pieChartData.length > 0) {
+      return true;
     }
     
-    if (!Array.isArray(this.pieChartData)) {
-      this.pieChartData = [];
+    // Show chart if we're still fetching data
+    if (this.isFetchingData) {
+      return true;
     }
     
-    // Ensure we have some data to display
-    if (this.pieChartLabels.length === 0 && this.pieChartData.length === 0) {
-      // Add default data to ensure chart visibility
-      this.pieChartLabels = ['Category A', 'Category B', 'Category C'];
-      this.pieChartData = [30, 50, 20];
-      console.log('Added default data for chart display');
+    // Show chart if we have default data
+    if (this.pieChartLabels.length > 0 && this.originalPieChartLabels.length > 0) {
+      return true;
     }
     
-    // Ensure labels and data arrays have the same length
-    this.syncLabelAndDataArrays();
-    
-    // Ensure all data values are numbers
-    this.pieChartData = this.pieChartData.map(value => {
-      const numValue = Number(value);
-      return isNaN(numValue) ? 0 : numValue;
-    });
-    
-    console.log('After validation:', { labels: this.pieChartLabels, data: this.pieChartData });
+    return false;
   }
-  
-  ngAfterViewChecked() {
-    // Debugging: Log component state after view checks
-    console.log('PieChartComponent state:', {
-      labels: this.pieChartLabels,
-      data: this.pieChartData,
-      hasData: this.pieChartLabels.length > 0 && this.pieChartData.length > 0
-    });
-  }
-  
-  /**
-   * Check if chart data is valid and ready to display
-   */
-  public isChartDataValid(): boolean {
-    return this.pieChartLabels && this.pieChartData && 
-           Array.isArray(this.pieChartLabels) && Array.isArray(this.pieChartData) &&
-           this.pieChartLabels.length > 0 && this.pieChartData.length > 0 &&
-           this.pieChartLabels.length === this.pieChartData.length;
-  }
-  
+
   // events
   public chartClicked(e: any): void {
     console.log('Pie chart clicked:', e);
@@ -656,6 +1049,10 @@ export class PieChartComponent implements OnInit, OnChanges, AfterViewChecked {
   }
 
   public chartHovered(e: any): void {
-    console.log(e);
+    console.log('Pie chart hovered:', e);
   }
-}
\ No newline at end of file
+
+  ngAfterViewChecked(): void {
+    // This lifecycle hook can be used if needed for post-render operations
+  }
+}    
\ No newline at end of file
diff --git a/frontend/angular-clarity-master/src/app/modules/main/builder/dashboardnew/gadgets/polar-chart/polar-chart.component.html b/frontend/angular-clarity-master/src/app/modules/main/builder/dashboardnew/gadgets/polar-chart/polar-chart.component.html
index 421e078..080c7c4 100644
--- a/frontend/angular-clarity-master/src/app/modules/main/builder/dashboardnew/gadgets/polar-chart/polar-chart.component.html
+++ b/frontend/angular-clarity-master/src/app/modules/main/builder/dashboardnew/gadgets/polar-chart/polar-chart.component.html
@@ -1,10 +1,292 @@
-
-<div style="display: block">
-  <canvas baseChart
-    [datasets]="polarAreaChartData"
-    [labels]="polarAreaChartLabels"
-    [type]="polarAreaChartType"
-    (chartHover)="chartHovered($event)"
-   (chartClick)="chartClicked($event)">
-  </canvas>
-</div>
+<div style="display: block; height: 100%; width: 100%;">
+  <!-- Filter Controls Section -->
+  <div class="filter-section" *ngIf="hasActiveFilters()">
+    <!-- Base Filters -->
+    <div class="filter-group" *ngIf="baseFilters && baseFilters.length > 0">
+      <h4>Base Filters</h4>
+      <div class="filter-controls">
+        <div *ngFor="let filter of baseFilters" class="filter-item">
+          <div class="filter-label">{{ filter.field }} ({{ filter.type || 'text' }})</div>
+          
+          <!-- Text Filter -->
+          <div *ngIf="!filter.type || filter.type === 'text'" class="filter-input">
+            <input type="text" 
+                   [(ngModel)]="filter.value" 
+                   (ngModelChange)="onBaseFilterChange(filter)"
+                   [placeholder]="filter.field"
+                   class="clr-input filter-text-input">
+          </div>
+          
+          <!-- Dropdown Filter -->
+          <div *ngIf="filter.type === 'dropdown'" class="filter-input">
+            <select [(ngModel)]="filter.value" 
+                    (ngModelChange)="onBaseFilterChange(filter)"
+                    class="clr-select filter-select">
+              <option value="">Select {{ filter.field }}</option>
+              <option *ngFor="let option of getFilterOptions(filter)" [value]="option">{{ option }}</option>
+            </select>
+          </div>
+          
+          <!-- Multi-Select Filter - Updated to show key first, then dropdown on click -->
+          <div *ngIf="filter.type === 'multiselect'" class="filter-input multiselect-container">
+            <div class="multiselect-display" (click)="toggleMultiselect(filter, 'base')">
+              <span class="multiselect-label">{{ filter.field }}</span>
+              <span class="multiselect-value" *ngIf="getSelectedOptionsCount(filter) > 0">
+                ({{ getSelectedOptionsCount(filter) }} selected)
+              </span>
+              <clr-icon shape="caret down" class="dropdown-icon"></clr-icon>
+            </div>
+            <div class="multiselect-dropdown" *ngIf="isMultiselectOpen(filter, 'base')">
+              <div class="checkbox-group">
+                <div *ngFor="let option of getFilterOptions(filter); let i = index" class="checkbox-item">
+                  <input type="checkbox" 
+                         [checked]="isOptionSelected(filter, option)" 
+                         (change)="onMultiSelectChange(filter, option, $event)"
+                         [id]="'base-' + filter.field + '-' + i" 
+                         class="clr-checkbox">
+                  <label [for]="'base-' + filter.field + '-' + i" class="checkbox-label">{{ option }}</label>
+                </div>
+              </div>
+            </div>
+          </div>
+          
+          <!-- Date Range Filter -->
+          <div *ngIf="filter.type === 'date-range'" class="filter-input date-range">
+            <div class="date-input-group">
+              <input type="date" 
+                     [(ngModel)]="filter.value.start" 
+                     (ngModelChange)="onDateRangeChange(filter, { start: $event, end: filter.value.end })"
+                     placeholder="Start Date"
+                     class="clr-input filter-date">
+              <span class="date-separator">to</span>
+              <input type="date" 
+                     [(ngModel)]="filter.value.end" 
+                     (ngModelChange)="onDateRangeChange(filter, { start: filter.value.start, end: $event })"
+                     placeholder="End Date"
+                     class="clr-input filter-date">
+            </div>
+          </div>
+          
+          <!-- Toggle Filter -->
+          <div *ngIf="filter.type === 'toggle'" class="filter-input toggle">
+            <input type="checkbox" 
+                   [(ngModel)]="filter.value" 
+                   (ngModelChange)="onToggleChange(filter, $event)"
+                   clrToggle 
+                   class="clr-toggle">
+            <label class="toggle-label">{{ filter.field }}</label>
+          </div>
+        </div>
+      </div>
+    </div>
+    
+    <!-- Drilldown Filters -->
+    <div class="filter-group" *ngIf="drilldownFilters && drilldownFilters.length > 0 && currentDrilldownLevel > 0">
+      <h4>Drilldown Filters</h4>
+      <div class="filter-controls">
+        <div *ngFor="let filter of drilldownFilters" class="filter-item">
+          <div class="filter-label">{{ filter.field }} ({{ filter.type || 'text' }})</div>
+          
+          <!-- Text Filter -->
+          <div *ngIf="!filter.type || filter.type === 'text'" class="filter-input">
+            <input type="text" 
+                   [(ngModel)]="filter.value" 
+                   (ngModelChange)="onDrilldownFilterChange(filter)"
+                   [placeholder]="filter.field"
+                   class="clr-input filter-text-input">
+          </div>
+          
+          <!-- Dropdown Filter -->
+          <div *ngIf="filter.type === 'dropdown'" class="filter-input">
+            <select [(ngModel)]="filter.value" 
+                    (ngModelChange)="onDrilldownFilterChange(filter)"
+                    class="clr-select filter-select">
+              <option value="">Select {{ filter.field }}</option>
+              <option *ngFor="let option of getFilterOptions(filter)" [value]="option">{{ option }}</option>
+            </select>
+          </div>
+          
+          <!-- Multi-Select Filter - Updated to show key first, then dropdown on click -->
+          <div *ngIf="filter.type === 'multiselect'" class="filter-input multiselect-container">
+            <div class="multiselect-display" (click)="toggleMultiselect(filter, 'drilldown')">
+              <span class="multiselect-label">{{ filter.field }}</span>
+              <span class="multiselect-value" *ngIf="getSelectedOptionsCount(filter) > 0">
+                ({{ getSelectedOptionsCount(filter) }} selected)
+              </span>
+              <clr-icon shape="caret down" class="dropdown-icon"></clr-icon>
+            </div>
+            <div class="multiselect-dropdown" *ngIf="isMultiselectOpen(filter, 'drilldown')">
+              <div class="checkbox-group">
+                <div *ngFor="let option of getFilterOptions(filter); let i = index" class="checkbox-item">
+                  <input type="checkbox" 
+                         [checked]="isOptionSelected(filter, option)" 
+                         (change)="onMultiSelectChange(filter, option, $event)"
+                         [id]="'drilldown-' + filter.field + '-' + i" 
+                         class="clr-checkbox">
+                  <label [for]="'drilldown-' + filter.field + '-' + i" class="checkbox-label">{{ option }}</label>
+                </div>
+              </div>
+            </div>
+          </div>
+          
+          <!-- Date Range Filter -->
+          <div *ngIf="filter.type === 'date-range'" class="filter-input date-range">
+            <div class="date-input-group">
+              <input type="date" 
+                     [(ngModel)]="filter.value.start" 
+                     (ngModelChange)="onDateRangeChange(filter, { start: $event, end: filter.value.end })"
+                     placeholder="Start Date"
+                     class="clr-input filter-date">
+              <span class="date-separator">to</span>
+              <input type="date" 
+                     [(ngModel)]="filter.value.end" 
+                     (ngModelChange)="onDateRangeChange(filter, { start: filter.value.start, end: $event })"
+                     placeholder="End Date"
+                     class="clr-input filter-date">
+            </div>
+          </div>
+          
+          <!-- Toggle Filter -->
+          <div *ngIf="filter.type === 'toggle'" class="filter-input toggle">
+            <input type="checkbox" 
+                   [(ngModel)]="filter.value" 
+                   (ngModelChange)="onToggleChange(filter, $event)"
+                   clrToggle 
+                   class="clr-toggle">
+            <label class="toggle-label">{{ filter.field }}</label>
+          </div>
+        </div>
+      </div>
+    </div>
+    
+    <!-- Layer Filters -->
+    <div class="filter-group" *ngIf="hasActiveLayerFilters()">
+      <h4>Layer Filters</h4>
+      <div class="filter-controls">
+        <div *ngFor="let filter of getActiveLayerFilters()" class="filter-item">
+          <div class="filter-label">{{ filter.field }} ({{ filter.type || 'text' }})</div>
+          
+          <!-- Text Filter -->
+          <div *ngIf="!filter.type || filter.type === 'text'" class="filter-input">
+            <input type="text" 
+                   [(ngModel)]="filter.value" 
+                   (ngModelChange)="onLayerFilterChange(filter)"
+                   [placeholder]="filter.field"
+                   class="clr-input filter-text-input">
+          </div>
+          
+          <!-- Dropdown Filter -->
+          <div *ngIf="filter.type === 'dropdown'" class="filter-input">
+            <select [(ngModel)]="filter.value" 
+                    (ngModelChange)="onLayerFilterChange(filter)"
+                    class="clr-select filter-select">
+              <option value="">Select {{ filter.field }}</option>
+              <option *ngFor="let option of getFilterOptions(filter)" [value]="option">{{ option }}</option>
+            </select>
+          </div>
+          
+          <!-- Multi-Select Filter - Updated to show key first, then dropdown on click -->
+          <div *ngIf="filter.type === 'multiselect'" class="filter-input multiselect-container">
+            <div class="multiselect-display" (click)="toggleMultiselect(filter, 'layer')">
+              <span class="multiselect-label">{{ filter.field }}</span>
+              <span class="multiselect-value" *ngIf="getSelectedOptionsCount(filter) > 0">
+                ({{ getSelectedOptionsCount(filter) }} selected)
+              </span>
+              <clr-icon shape="caret down" class="dropdown-icon"></clr-icon>
+            </div>
+            <div class="multiselect-dropdown" *ngIf="isMultiselectOpen(filter, 'layer')">
+              <div class="checkbox-group">
+                <div *ngFor="let option of getFilterOptions(filter); let i = index" class="checkbox-item">
+                  <input type="checkbox" 
+                         [checked]="isOptionSelected(filter, option)" 
+                         (change)="onMultiSelectChange(filter, option, $event)"
+                         [id]="'layer-' + filter.field + '-' + i" 
+                         class="clr-checkbox">
+                  <label [for]="'layer-' + filter.field + '-' + i" class="checkbox-label">{{ option }}</label>
+                </div>
+              </div>
+            </div>
+          </div>
+          
+          <!-- Date Range Filter -->
+          <div *ngIf="filter.type === 'date-range'" class="filter-input date-range">
+            <div class="date-input-group">
+              <input type="date" 
+                     [(ngModel)]="filter.value.start" 
+                     (ngModelChange)="onDateRangeChange(filter, { start: $event, end: filter.value.end })"
+                     placeholder="Start Date"
+                     class="clr-input filter-date">
+              <span class="date-separator">to</span>
+              <input type="date" 
+                     [(ngModel)]="filter.value.end" 
+                     (ngModelChange)="onDateRangeChange(filter, { start: filter.value.start, end: $event })"
+                     placeholder="End Date"
+                     class="clr-input filter-date">
+            </div>
+          </div>
+          
+          <!-- Toggle Filter -->
+          <div *ngIf="filter.type === 'toggle'" class="filter-input toggle">
+            <input type="checkbox" 
+                   [(ngModel)]="filter.value" 
+                   (ngModelChange)="onToggleChange(filter, $event)"
+                   clrToggle 
+                   class="clr-toggle">
+            <label class="toggle-label">{{ filter.field }}</label>
+          </div>
+        </div>
+      </div>
+    </div>
+    
+    <!-- Clear Filters Button -->
+    <div class="filter-actions">
+      <button class="btn btn-sm btn-outline" (click)="clearAllFilters()">Clear All Filters</button>
+    </div>
+  </div>
+  
+  <!-- Header row with chart title and drilldown navigation -->
+  <div class="clr-row header-row">
+    <div class="clr-col-6">
+      <h3 class="chart-title">{{charttitle || 'Polar Chart'}}</h3>
+    </div>
+    <div class="clr-col-6" style="text-align: right;">
+      <!-- Add drilldown navigation controls -->
+      <button class="btn btn-sm btn-link" *ngIf="drilldownEnabled && drilldownStack.length > 0" (click)="navigateBack()">
+        <cds-icon shape="arrow" direction="left"></cds-icon>
+        Back to {{drilldownStack.length > 1 ? 'Previous Level' : 'Main Data'}}
+      </button>
+    </div>
+  </div>
+  
+  <!-- Show current drilldown level -->
+  <div class="clr-row" *ngIf="drilldownEnabled && drilldownStack.length > 0">
+    <div class="clr-col-12">
+      <div class="alert alert-info" style="padding: 8px 12px; margin-bottom: 12px;">
+        <div class="alert-items">
+          <div class="alert-item static">
+            <div class="alert-icon-wrapper">
+              <cds-icon class="alert-icon" shape="info-circle"></cds-icon>
+            </div>
+            <span class="alert-text">
+              Drilldown Level: {{currentDrilldownLevel}} 
+              <span *ngIf="drilldownStack.length > 0">
+                (Clicked on: {{drilldownStack[drilldownStack.length - 1].clickedLabel}})
+              </span>
+            </span>
+          </div>
+        </div>
+      </div>
+    </div>
+  </div>
+  
+  <div style="position: relative; height: calc(100% - 80px); padding: 0 10px 30px 10px;">
+    <canvas baseChart
+      [datasets]="polarAreaChartData"
+      [labels]="polarAreaChartLabels"
+      [options]="polarAreaChartOptions"
+      [type]="polarAreaChartType"
+      (chartHover)="chartHovered($event)"
+     (chartClick)="chartClicked($event)">
+    </canvas>
+  </div>
+</div>
\ No newline at end of file
diff --git a/frontend/angular-clarity-master/src/app/modules/main/builder/dashboardnew/gadgets/polar-chart/polar-chart.component.scss b/frontend/angular-clarity-master/src/app/modules/main/builder/dashboardnew/gadgets/polar-chart/polar-chart.component.scss
index df302b2..a9282e4 100644
--- a/frontend/angular-clarity-master/src/app/modules/main/builder/dashboardnew/gadgets/polar-chart/polar-chart.component.scss
+++ b/frontend/angular-clarity-master/src/app/modules/main/builder/dashboardnew/gadgets/polar-chart/polar-chart.component.scss
@@ -1,18 +1,192 @@
-// Polar Chart Component Styles
-div[style*="display: block"] {
+.filter-section {
+  margin-bottom: 20px;
+  padding: 15px;
+  border: 1px solid #ddd;
+  border-radius: 4px;
+  background-color: #f9f9f9;
+}
+
+.filter-group {
+  margin-bottom: 15px;
+  
+  h4 {
+    margin-top: 0;
+    margin-bottom: 10px;
+    color: #333;
+    font-weight: 600;
+  }
+}
+
+.filter-controls {
+  display: flex;
+  flex-wrap: wrap;
+  gap: 15px;
+}
+
+.filter-item {
+  flex: 1 1 300px;
+  min-width: 250px;
+  padding: 10px;
+  background: white;
+  border: 1px solid #e0e0e0;
+  border-radius: 4px;
+}
+
+.filter-label {
+  font-weight: 500;
+  margin-bottom: 8px;
+  color: #555;
+  font-size: 14px;
+}
+
+.filter-input {
+  width: 100%;
+  
+  .filter-text-input,
+  .filter-select,
+  .filter-date {
+    width: 100%;
+    padding: 6px 12px;
+    border: 1px solid #ccc;
+    border-radius: 4px;
+    font-size: 14px;
+  }
+  
+  .filter-select {
+    height: 34px;
+  }
+}
+
+.multiselect-container {
   position: relative;
-  width: 100%;
-  height: 100%;
 }
 
-canvas {
-  max-width: 100%;
-  max-height: 100%;
+.multiselect-display {
+  display: flex;
+  align-items: center;
+  justify-content: space-between;
+  padding: 6px 12px;
+  border: 1px solid #ccc;
+  border-radius: 4px;
+  background: white;
+  cursor: pointer;
+  min-height: 34px;
+  
+  .multiselect-label {
+    flex: 1;
+    font-size: 14px;
+  }
+  
+  .multiselect-value {
+    color: #666;
+    font-size: 12px;
+    margin-right: 8px;
+  }
+  
+  .dropdown-icon {
+    flex-shrink: 0;
+    transition: transform 0.2s ease;
+  }
+  
+  &:hover {
+    border-color: #999;
+  }
 }
 
-// Ensure the chart container has proper sizing
-:host {
-  display: block;
-  width: 100%;
-  height: 100%;
+.multiselect-dropdown {
+  position: absolute;
+  top: 100%;
+  left: 0;
+  right: 0;
+  z-index: 1000;
+  background: white;
+  border: 1px solid #ccc;
+  border-top: none;
+  border-radius: 0 0 4px 4px;
+  box-shadow: 0 2px 4px rgba(0,0,0,0.1);
+  max-height: 200px;
+  overflow-y: auto;
+  
+  .checkbox-group {
+    padding: 8px;
+    
+    .checkbox-item {
+      display: flex;
+      align-items: center;
+      gap: 8px;
+      padding: 4px 0;
+      
+      .checkbox-label {
+        margin: 0;
+        font-size: 14px;
+        cursor: pointer;
+      }
+    }
+  }
+}
+
+.date-range {
+  .date-input-group {
+    display: flex;
+    align-items: center;
+    gap: 8px;
+  }
+  
+  .date-separator {
+    margin: 0 5px;
+    color: #777;
+  }
+}
+
+.toggle {
+  display: flex;
+  align-items: center;
+  gap: 8px;
+  
+  .toggle-label {
+    margin: 0;
+    font-size: 14px;
+    cursor: pointer;
+  }
+}
+
+.filter-actions {
+  margin-top: 15px;
+  padding-top: 15px;
+  border-top: 1px solid #eee;
+  
+  .btn {
+    font-size: 13px;
+  }
+}
+
+// New header row styling
+.header-row {
+  margin-bottom: 15px;
+  padding-bottom: 10px;
+  border-bottom: 1px solid #eee;
+  
+  .chart-title {
+    margin: 0;
+    font-size: 18px;
+    font-weight: 600;
+    color: #333;
+  }
+}
+
+// Responsive design
+@media (max-width: 768px) {
+  .filter-controls {
+    flex-direction: column;
+  }
+  
+  .filter-item {
+    min-width: 100%;
+  }
+  
+  .header-row {
+    .chart-title {
+      font-size: 16px;
+    }
+  }
 }
\ No newline at end of file
diff --git a/frontend/angular-clarity-master/src/app/modules/main/builder/dashboardnew/gadgets/polar-chart/polar-chart.component.ts b/frontend/angular-clarity-master/src/app/modules/main/builder/dashboardnew/gadgets/polar-chart/polar-chart.component.ts
index 871b8c2..18f6ee6 100644
--- a/frontend/angular-clarity-master/src/app/modules/main/builder/dashboardnew/gadgets/polar-chart/polar-chart.component.ts
+++ b/frontend/angular-clarity-master/src/app/modules/main/builder/dashboardnew/gadgets/polar-chart/polar-chart.component.ts
@@ -1,5 +1,7 @@
 import { Component, OnInit, Input, OnChanges, SimpleChanges } from '@angular/core';
 import { Dashboard3Service } from 'src/app/services/builder/dashboard3.service';
+import { FilterService } from '../../common-filter/filter.service';
+import { Subscription } from 'rxjs';
 
 @Component({
   selector: 'app-polar-chart',
@@ -33,9 +35,20 @@ export class PolarChartComponent implements OnInit, OnChanges {
   // Multi-layer drilldown configuration inputs
   @Input() drilldownLayers: any[] = []; // Array of drilldown layer configurations
 
-  constructor(private dashboardService: Dashboard3Service) { }
+  constructor(
+    private dashboardService: Dashboard3Service,
+    private filterService: FilterService
+  ) { }
 
   ngOnInit(): void {
+    // Subscribe to filter changes
+    this.subscriptions.push(
+      this.filterService.filterState$.subscribe(filters => {
+        // When filters change, refresh the chart data
+        this.fetchChartData();
+      })
+    );
+    
     // Initialize with default data
     this.fetchChartData();
   }
@@ -43,6 +56,12 @@ export class PolarChartComponent implements OnInit, OnChanges {
   ngOnChanges(changes: SimpleChanges): void {
     console.log('PolarChartComponent input changes:', changes);
     
+    // Initialize filter values if they haven't been initialized yet
+    if (!this.filtersInitialized && (changes.baseFilters || changes.drilldownFilters || changes.drilldownLayers)) {
+      this.initializeFilterValues();
+      this.filtersInitialized = true;
+    }
+    
     // Check if any of the key properties have changed
     const xAxisChanged = changes.xAxis && !changes.xAxis.firstChange;
     const yAxisChanged = changes.yAxis && !changes.yAxis.firstChange;
@@ -71,6 +90,32 @@ export class PolarChartComponent implements OnInit, OnChanges {
     { data: [ 300, 500, 100, 40, 120 ], label: 'Series 1'}
   ];
 
+  public polarAreaChartOptions: any = {
+    responsive: true,
+    maintainAspectRatio: false,
+    layout: {
+      padding: {
+        left: 10,
+        right: 10,
+        top: 10,
+        bottom: 30
+      }
+    },
+    plugins: {
+      legend: {
+        display: true,
+        position: 'top'
+      }
+    },
+    scales: {
+      r: {
+        ticks: {
+          backdropColor: 'rgba(0, 0, 0, 0)'
+        }
+      }
+    }
+  };
+
   public polarAreaChartType: string = 'polarArea';
   
   // Multi-layer drilldown state tracking
@@ -85,6 +130,324 @@ export class PolarChartComponent implements OnInit, OnChanges {
   // Flag to prevent infinite loops
   private isFetchingData: boolean = false;
   
+  // Subscriptions to unsubscribe on destroy
+  private subscriptions: Subscription[] = [];
+
+  // Add properties for filter functionality
+  private openMultiselects: Map<string, string> = new Map(); // Map of filterId -> context
+  private documentClickHandler: ((event: MouseEvent) => void) | null = null;
+  private filtersInitialized: boolean = false;
+  
+  // Initialize filter values with proper default values based on type
+  private initializeFilterValues(): void {
+    console.log('Initializing filter values');
+    
+    // Initialize base filters
+    if (this.baseFilters) {
+      this.baseFilters.forEach(filter => {
+        if (filter.value === undefined || filter.value === null) {
+          switch (filter.type) {
+            case 'multiselect':
+              filter.value = [];
+              break;
+            case 'date-range':
+              filter.value = { start: null, end: null };
+              break;
+            case 'toggle':
+              filter.value = false;
+              break;
+            default:
+              filter.value = '';
+          }
+        }
+      });
+    }
+    
+    // Initialize drilldown filters
+    if (this.drilldownFilters) {
+      this.drilldownFilters.forEach(filter => {
+        if (filter.value === undefined || filter.value === null) {
+          switch (filter.type) {
+            case 'multiselect':
+              filter.value = [];
+              break;
+            case 'date-range':
+              filter.value = { start: null, end: null };
+              break;
+            case 'toggle':
+              filter.value = false;
+              break;
+            default:
+              filter.value = '';
+          }
+        }
+      });
+    }
+    
+    // Initialize layer filters
+    if (this.drilldownLayers) {
+      this.drilldownLayers.forEach(layer => {
+        if (layer.filters) {
+          layer.filters.forEach((filter: any) => {
+            if (filter.value === undefined || filter.value === null) {
+              switch (filter.type) {
+                case 'multiselect':
+                  filter.value = [];
+                  break;
+                case 'date-range':
+                  filter.value = { start: null, end: null };
+                  break;
+                case 'toggle':
+                  filter.value = false;
+                  break;
+                default:
+                  filter.value = '';
+              }
+            }
+          });
+        }
+      });
+    }
+    
+    console.log('Filter values initialized:', {
+      baseFilters: this.baseFilters,
+      drilldownFilters: this.drilldownFilters,
+      drilldownLayers: this.drilldownLayers
+    });
+  }
+
+  // Check if there are active filters
+  hasActiveFilters(): boolean {
+    return (this.baseFilters && this.baseFilters.length > 0) || 
+           (this.drilldownFilters && this.drilldownFilters.length > 0) || 
+           this.hasActiveLayerFilters();
+  }
+
+  // Check if there are active layer filters for current drilldown level
+  hasActiveLayerFilters(): boolean {
+    if (this.currentDrilldownLevel > 1 && this.drilldownLayers && this.drilldownLayers.length > 0) {
+      const layerIndex = this.currentDrilldownLevel - 2; // -2 because level 1 is base drilldown
+      return layerIndex < this.drilldownLayers.length && 
+             this.drilldownLayers[layerIndex].filters && 
+             this.drilldownLayers[layerIndex].filters.length > 0;
+    }
+    return false;
+  }
+
+  // Get active layer filters for current drilldown level
+  getActiveLayerFilters(): any[] {
+    if (this.currentDrilldownLevel > 1 && this.drilldownLayers && this.drilldownLayers.length > 0) {
+      const layerIndex = this.currentDrilldownLevel - 2; // -2 because level 1 is base drilldown
+      if (layerIndex < this.drilldownLayers.length && 
+          this.drilldownLayers[layerIndex].filters) {
+        return this.drilldownLayers[layerIndex].filters;
+      }
+    }
+    return [];
+  }
+
+  // Get filter options for dropdown/multiselect filters
+  getFilterOptions(filter: any): string[] {
+    if (filter.options) {
+      if (Array.isArray(filter.options)) {
+        return filter.options;
+      } else if (typeof filter.options === 'string') {
+        return filter.options.split(',').map(opt => opt.trim()).filter(opt => opt);
+      }
+    }
+    return [];
+  }
+
+  // Check if an option is selected for multiselect filters
+  isOptionSelected(filter: any, option: string): boolean {
+    if (!filter.value) {
+      return false;
+    }
+    
+    if (Array.isArray(filter.value)) {
+      return filter.value.includes(option);
+    }
+    
+    return filter.value === option;
+  }
+
+  // Handle base filter changes
+  onBaseFilterChange(filter: any): void {
+    console.log('Base filter changed:', filter);
+    // Refresh data when filter changes
+    this.fetchChartData();
+  }
+
+  // Handle drilldown filter changes
+  onDrilldownFilterChange(filter: any): void {
+    console.log('Drilldown filter changed:', filter);
+    // Refresh data when filter changes
+    this.fetchChartData();
+  }
+
+  // Handle layer filter changes
+  onLayerFilterChange(filter: any): void {
+    console.log('Layer filter changed:', filter);
+    // Refresh data when filter changes
+    this.fetchChartData();
+  }
+
+  // Handle multiselect changes
+  onMultiSelectChange(filter: any, option: string, event: any): void {
+    const checked = event.target.checked;
+    
+    // Initialize filter.value as array if it's not already
+    if (!Array.isArray(filter.value)) {
+      filter.value = [];
+    }
+    
+    if (checked) {
+      // Add option to array if not already present
+      if (!filter.value.includes(option)) {
+        filter.value.push(option);
+      }
+    } else {
+      // Remove option from array
+      filter.value = filter.value.filter((item: string) => item !== option);
+    }
+    
+    // Refresh data when filter changes
+    this.fetchChartData();
+  }
+
+  // Handle date range changes
+  onDateRangeChange(filter: any, dateRange: { start: string | null, end: string | null }): void {
+    filter.value = dateRange;
+    // Refresh data when filter changes
+    this.fetchChartData();
+  }
+
+  // Handle toggle changes
+  onToggleChange(filter: any, checked: boolean): void {
+    filter.value = checked;
+    // Refresh data when filter changes
+    this.fetchChartData();
+  }
+
+  // Toggle multiselect dropdown visibility
+  toggleMultiselect(filter: any, context: string): void {
+    const filterId = `${context}-${filter.field}`;
+    if (this.isMultiselectOpen(filter, context)) {
+      this.openMultiselects.delete(filterId);
+    } else {
+      // Close all other multiselects first
+      this.openMultiselects.clear();
+      this.openMultiselects.set(filterId, context);
+      
+      // Add document click handler to close dropdown when clicking outside
+      this.addDocumentClickHandler();
+    }
+  }
+
+  // Add document click handler to close dropdowns when clicking outside
+  private addDocumentClickHandler(): void {
+    if (!this.documentClickHandler) {
+      this.documentClickHandler = (event: MouseEvent) => {
+        const target = event.target as HTMLElement;
+        // Check if click is outside any multiselect dropdown
+        if (!target.closest('.multiselect-container')) {
+          this.openMultiselects.clear();
+          this.removeDocumentClickHandler();
+        }
+      };
+      
+      // Use setTimeout to ensure the click event that opened the dropdown doesn't immediately close it
+      setTimeout(() => {
+        document.addEventListener('click', this.documentClickHandler!);
+      }, 0);
+    }
+  }
+
+  // Remove document click handler
+  private removeDocumentClickHandler(): void {
+    if (this.documentClickHandler) {
+      document.removeEventListener('click', this.documentClickHandler);
+      this.documentClickHandler = null;
+    }
+  }
+
+  // Check if multiselect dropdown is open
+  isMultiselectOpen(filter: any, context: string): boolean {
+    const filterId = `${context}-${filter.field}`;
+    return this.openMultiselects.has(filterId);
+  }
+
+  // Get count of selected options for a multiselect filter
+  getSelectedOptionsCount(filter: any): number {
+    if (!filter.value) {
+      return 0;
+    }
+    
+    if (Array.isArray(filter.value)) {
+      return filter.value.length;
+    }
+    
+    return 0;
+  }
+
+  // Clear all filters
+  clearAllFilters(): void {
+    // Clear base filters
+    if (this.baseFilters) {
+      this.baseFilters.forEach(filter => {
+        if (filter.type === 'multiselect') {
+          filter.value = [];
+        } else if (filter.type === 'date-range') {
+          filter.value = { start: null, end: null };
+        } else if (filter.type === 'toggle') {
+          filter.value = false;
+        } else {
+          filter.value = '';
+        }
+      });
+    }
+    
+    // Clear drilldown filters
+    if (this.drilldownFilters) {
+      this.drilldownFilters.forEach(filter => {
+        if (filter.type === 'multiselect') {
+          filter.value = [];
+        } else if (filter.type === 'date-range') {
+          filter.value = { start: null, end: null };
+        } else if (filter.type === 'toggle') {
+          filter.value = false;
+        } else {
+          filter.value = '';
+        }
+      });
+    }
+    
+    // Clear layer filters
+    if (this.drilldownLayers) {
+      this.drilldownLayers.forEach(layer => {
+        if (layer.filters) {
+          layer.filters.forEach((filter: any) => {
+            if (filter.type === 'multiselect') {
+              filter.value = [];
+            } else if (filter.type === 'date-range') {
+              filter.value = { start: null, end: null };
+            } else if (filter.type === 'toggle') {
+              filter.value = false;
+            } else {
+              filter.value = '';
+            }
+          });
+        }
+      });
+    }
+    
+    // Close all multiselect dropdowns
+    this.openMultiselects.clear();
+    
+    // Refresh data
+    this.fetchChartData();
+  }
+  
   fetchChartData(): void {
     // Set flag to prevent recursive calls
     this.isFetchingData = true;
@@ -117,7 +480,49 @@ export class PolarChartComponent implements OnInit, OnChanges {
           filterParams = JSON.stringify(filterObj);
         }
       }
-      console.log('Base filter parameters:', filterParams);
+      
+      // Add common filters to filter parameters
+      const commonFilters = this.filterService.getFilterValues();
+      console.log('Common filters from service:', commonFilters);
+      
+      if (Object.keys(commonFilters).length > 0) {
+        // Merge common filters with base filters
+        const mergedFilterObj = {};
+        
+        // Add base filters first
+        if (filterParams) {
+          try {
+            const baseFilterObj = JSON.parse(filterParams);
+            Object.assign(mergedFilterObj, baseFilterObj);
+          } catch (e) {
+            console.warn('Failed to parse base filter parameters:', e);
+          }
+        }
+        
+        // Add common filters using the field name as the key, not the filter id
+        Object.keys(commonFilters).forEach(filterId => {
+          const filterValue = commonFilters[filterId];
+          // Find the filter definition to get the field name
+          const filterDef = this.filterService.getFilters().find(f => f.id === filterId);
+          if (filterDef && filterDef.field) {
+            const fieldName = filterDef.field;
+            if (filterValue !== undefined && filterValue !== null && filterValue !== '') {
+              mergedFilterObj[fieldName] = filterValue;
+            }
+          } else {
+            // Fallback to using filterId as field name if no field is defined
+            if (filterValue !== undefined && filterValue !== null && filterValue !== '') {
+              mergedFilterObj[filterId] = filterValue;
+            }
+          }
+        });
+        
+        if (Object.keys(mergedFilterObj).length > 0) {
+          filterParams = JSON.stringify(mergedFilterObj);
+        }
+      }
+      
+      console.log('Final filter parameters:', filterParams);
       
       // Log the URL that will be called
       const url = `chart/getdashjson/polar?tableName=${this.table}&xAxis=${this.xAxis}&yAxes=${yAxisString}${this.connection ? `&sureId=${this.connection}` : ''}`;
@@ -132,7 +537,12 @@ export class PolarChartComponent implements OnInit, OnChanges {
             console.warn('Polar chart API returned null data. Check if the API endpoint is working correctly.');
             this.noDataAvailable = true;
             this.polarAreaChartLabels = [];
-            this.polarAreaChartData = [];
+            this.polarAreaChartData = [
+            {
+              data: [],
+              label: 'Dataset 1'
+            }
+          ];
             // Reset flag after fetching
             this.isFetchingData = false;
             return;
@@ -145,32 +555,54 @@ export class PolarChartComponent implements OnInit, OnChanges {
             this.noDataAvailable = data.chartLabels.length === 0;
             this.polarAreaChartLabels = data.chartLabels;
             if (data.chartData && data.chartData.length > 0) {
-              this.polarAreaChartData = data.chartData[0].data.map(value => {
+              // Convert the data to the expected format for polar area charts
+              const chartValues = data.chartData[0].data.map(value => {
                 // Convert to number if it's not already
                 return isNaN(Number(value)) ? 0 : Number(value);
               });
+              // Assign data in the correct format (array of objects with data property)
+              this.polarAreaChartData = [
+                {
+                  data: chartValues,
+                  label: data.chartData[0].label || 'Dataset 1'
+                }
+              ];
             } else {
-              this.polarAreaChartData = [];
+              this.polarAreaChartData = [
+                {
+                  data: [],
+                  label: 'Dataset 1'
+                }
+              ];
             }
-            // Trigger change detection
-            this.polarAreaChartData = [...this.polarAreaChartData];
             console.log('Updated polar chart with data:', { labels: this.polarAreaChartLabels, data: this.polarAreaChartData });
           } else if (data && data.labels && data.data) {
             // Handle the original expected format as fallback
             this.noDataAvailable = data.labels.length === 0;
             this.polarAreaChartLabels = data.labels;
-            this.polarAreaChartData = data.data.map(value => {
+            // Convert the data to the expected format for polar area charts
+            const chartValues = data.data.map(value => {
               // Convert to number if it's not already
               return isNaN(Number(value)) ? 0 : Number(value);
             });
-            // Trigger change detection
-            this.polarAreaChartData = [...this.polarAreaChartData];
+            // Assign data in the correct format (array of objects with data property)
+            this.polarAreaChartData = [
+              {
+                data: chartValues,
+                label: 'Dataset 1'
+              }
+            ];
             console.log('Updated polar chart with legacy data format:', { labels: this.polarAreaChartLabels, data: this.polarAreaChartData });
           } else {
             console.warn('Polar chart received data does not have expected structure', data);
             this.noDataAvailable = true;
             this.polarAreaChartLabels = [];
-            this.polarAreaChartData = [];
+            this.polarAreaChartData = [
+              {
+                data: [],
+                label: 'Dataset 1'
+              }
+            ];
           }
           // Reset flag after fetching
           this.isFetchingData = false;
@@ -179,7 +611,12 @@ export class PolarChartComponent implements OnInit, OnChanges {
           console.error('Error fetching polar chart data:', error);
           this.noDataAvailable = true;
           this.polarAreaChartLabels = [];
-          this.polarAreaChartData = [];
+          this.polarAreaChartData = [
+            {
+              data: [],
+              label: 'Dataset 1'
+            }
+          ];
           // Reset flag after fetching
           this.isFetchingData = false;
           // Keep default data in case of error
@@ -189,7 +626,12 @@ export class PolarChartComponent implements OnInit, OnChanges {
       console.log('Missing required data for polar chart:', { table: this.table, xAxis: this.xAxis, yAxis: this.yAxis, connection: this.connection });
       this.noDataAvailable = true;
       this.polarAreaChartLabels = [];
-      this.polarAreaChartData = [];
+      this.polarAreaChartData = [
+            {
+              data: [],
+              label: 'Dataset 1'
+            }
+          ];
       // Reset flag after fetching
       this.isFetchingData = false;
     }
@@ -219,7 +661,12 @@ export class PolarChartComponent implements OnInit, OnChanges {
         console.warn('Invalid drilldown layer index:', layerIndex);
         this.noDataAvailable = true;
         this.polarAreaChartLabels = [];
-        this.polarAreaChartData = [];
+        this.polarAreaChartData = [
+            {
+              data: [],
+              label: 'Dataset 1'
+            }
+          ];
         return;
       }
     }
@@ -231,7 +678,12 @@ export class PolarChartComponent implements OnInit, OnChanges {
       console.warn('Missing drilldown configuration for level:', this.currentDrilldownLevel);
       this.noDataAvailable = true;
       this.polarAreaChartLabels = [];
-      this.polarAreaChartData = [];
+      this.polarAreaChartData = [
+            {
+              data: [],
+              label: 'Dataset 1'
+            }
+          ];
       return;
     }
     
@@ -287,6 +739,35 @@ export class PolarChartComponent implements OnInit, OnChanges {
       }
     }
     
+    // Add common filters to drilldown filter parameters
+    const commonFilters = this.filterService.getFilterValues();
+    if (Object.keys(commonFilters).length > 0) {
+      // Merge common filters with drilldown filters
+      const mergedFilterObj = {};
+      
+      // Add drilldown filters first
+      if (filterParams) {
+        try {
+          const drilldownFilterObj = JSON.parse(filterParams);
+          Object.assign(mergedFilterObj, drilldownFilterObj);
+        } catch (e) {
+          console.warn('Failed to parse drilldown filter parameters:', e);
+        }
+      }
+      
+      // Add common filters
+      Object.keys(commonFilters).forEach(key => {
+        const value = commonFilters[key];
+        if (value !== undefined && value !== null && value !== '') {
+          mergedFilterObj[key] = value;
+        }
+      });
+      
+      if (Object.keys(mergedFilterObj).length > 0) {
+        filterParams = JSON.stringify(mergedFilterObj);
+      }
+    }
+    
     // Log the URL that will be called
     const url = `chart/getdashjson/polar?tableName=${actualApiUrl}&xAxis=${drilldownConfig.xAxis}&yAxes=${drilldownConfig.yAxis}${this.connection ? `&sureId=${this.connection}` : ''}`;
     console.log('Drilldown data URL:', url);
@@ -300,23 +781,40 @@ export class PolarChartComponent implements OnInit, OnChanges {
           console.warn('Drilldown API returned null data. Check if the API endpoint is working correctly.');
           this.noDataAvailable = true;
           this.polarAreaChartLabels = [];
-          this.polarAreaChartData = [];
+          this.polarAreaChartData = [
+            {
+              data: [],
+              label: 'Dataset 1'
+            }
+          ];
           return;
         }
         
         // Handle the actual data structure returned by the API
         if (data && data.chartLabels && data.chartData) {
           // For polar charts, we need to extract the data differently
-          // The first dataset's data array contains the values for the polar chart
           this.noDataAvailable = data.chartLabels.length === 0;
           this.polarAreaChartLabels = data.chartLabels;
           if (data.chartData && data.chartData.length > 0) {
-            this.polarAreaChartData = data.chartData[0].data.map(value => {
+            // Convert the data to the expected format for polar area charts
+            const chartValues = data.chartData[0].data.map(value => {
               // Convert to number if it's not already
               return isNaN(Number(value)) ? 0 : Number(value);
             });
+            // Assign data in the correct format (array of objects with data property)
+            this.polarAreaChartData = [
+              {
+                data: chartValues,
+                label: data.chartData[0].label || 'Dataset 1'
+              }
+            ];
           } else {
-            this.polarAreaChartData = [];
+            this.polarAreaChartData = [
+            {
+              data: [],
+              label: 'Dataset 1'
+            }
+          ];
           }
           // Trigger change detection
           this.polarAreaChartData = [...this.polarAreaChartData];
@@ -325,10 +823,18 @@ export class PolarChartComponent implements OnInit, OnChanges {
           // Handle the original expected format as fallback
           this.noDataAvailable = data.labels.length === 0;
           this.polarAreaChartLabels = data.labels;
-          this.polarAreaChartData = data.data.map(value => {
+          // Convert the data to the expected format for polar area charts
+          const chartValues = data.data.map(value => {
             // Convert to number if it's not already
             return isNaN(Number(value)) ? 0 : Number(value);
           });
+          // Assign data in the correct format (array of objects with data property)
+          this.polarAreaChartData = [
+            {
+              data: chartValues,
+              label: 'Dataset 1'
+            }
+          ];
           // Trigger change detection
           this.polarAreaChartData = [...this.polarAreaChartData];
           console.log('Updated polar chart with drilldown legacy data format:', { labels: this.polarAreaChartLabels, data: this.polarAreaChartData });
@@ -336,14 +842,24 @@ export class PolarChartComponent implements OnInit, OnChanges {
           console.warn('Drilldown received data does not have expected structure', data);
           this.noDataAvailable = true;
           this.polarAreaChartLabels = [];
-          this.polarAreaChartData = [];
+          this.polarAreaChartData = [
+            {
+              data: [],
+              label: 'Dataset 1'
+            }
+          ];
         }
       },
       (error) => {
         console.error('Error fetching drilldown data:', error);
         this.noDataAvailable = true;
         this.polarAreaChartLabels = [];
-        this.polarAreaChartData = [];
+        this.polarAreaChartData = [
+            {
+              data: [],
+              label: 'Dataset 1'
+            }
+          ];
         // Keep current data in case of error
       }
     );
@@ -417,13 +933,13 @@ export class PolarChartComponent implements OnInit, OnChanges {
       // Get the label of the clicked element
       const clickedLabel = this.polarAreaChartLabels[clickedIndex];
       
-      console.log('Clicked on polar area:', { index: clickedIndex, label: clickedLabel });
+      console.log('Clicked on polar point:', { index: clickedIndex, label: clickedLabel });
       
       // If we're not at the base level, store original data
       if (this.currentDrilldownLevel === 0) {
         // Store original data before entering drilldown mode
         this.originalPolarAreaChartLabels = [...this.polarAreaChartLabels];
-        this.originalPolarAreaChartData = [...this.polarAreaChartData];
+        this.originalPolarAreaChartData = JSON.parse(JSON.stringify(this.polarAreaChartData));
         console.log('Stored original data for drilldown');
       }
       
@@ -491,6 +1007,12 @@ export class PolarChartComponent implements OnInit, OnChanges {
   }
 
   public chartHovered(e: any): void {
-    console.log(e);
+    console.log('Polar chart hovered:', e);
   }
-}
\ No newline at end of file
+
+  ngOnDestroy(): void {
+    this.subscriptions.forEach(sub => sub.unsubscribe());
+    // Clean up document click handler
+    this.removeDocumentClickHandler();
+  }
+}      
\ No newline at end of file
diff --git a/frontend/angular-clarity-master/src/app/modules/main/builder/dashboardnew/gadgets/radar-chart/radar-chart.component.html b/frontend/angular-clarity-master/src/app/modules/main/builder/dashboardnew/gadgets/radar-chart/radar-chart.component.html
index 50f80cd..fca1ae0 100644
--- a/frontend/angular-clarity-master/src/app/modules/main/builder/dashboardnew/gadgets/radar-chart/radar-chart.component.html
+++ b/frontend/angular-clarity-master/src/app/modules/main/builder/dashboardnew/gadgets/radar-chart/radar-chart.component.html
@@ -1,13 +1,282 @@
-<div style="display: block">
-  <!-- Drilldown mode indicator -->
-  <div *ngIf="currentDrilldownLevel > 0" style="background-color: #e0e0e0; padding: 5px; margin-bottom: 10px; border-radius: 4px; text-align: center;">
-    <span style="font-weight: bold; color: #333;">Drilldown Level: {{currentDrilldownLevel}}</span>
-    <button (click)="navigateBack()" style="margin-left: 10px; padding: 2px 8px; background-color: #007cba; color: white; border: none; border-radius: 3px; cursor: pointer;">
-      Back to Level {{currentDrilldownLevel - 1}}
-    </button>
-    <button (click)="resetToOriginalData()" style="margin-left: 10px; padding: 2px 8px; background-color: #dc3545; color: white; border: none; border-radius: 3px; cursor: pointer;">
-      Back to Main View
-    </button>
+<div style="display: block; height: 100%; width: 100%;">
+  <!-- Filter Controls Section -->
+  <div class="filter-section" *ngIf="hasActiveFilters()">
+    <!-- Base Filters -->
+    <div class="filter-group" *ngIf="baseFilters && baseFilters.length > 0">
+      <h4>Base Filters</h4>
+      <div class="filter-controls">
+        <div *ngFor="let filter of baseFilters" class="filter-item">
+          <div class="filter-label">{{ filter.field }} ({{ filter.type || 'text' }})</div>
+          
+          <!-- Text Filter -->
+          <div *ngIf="!filter.type || filter.type === 'text'" class="filter-input">
+            <input type="text" 
+                   [(ngModel)]="filter.value" 
+                   (ngModelChange)="onBaseFilterChange(filter)"
+                   [placeholder]="filter.field"
+                   class="clr-input filter-text-input">
+          </div>
+          
+          <!-- Dropdown Filter -->
+          <div *ngIf="filter.type === 'dropdown'" class="filter-input">
+            <select [(ngModel)]="filter.value" 
+                    (ngModelChange)="onBaseFilterChange(filter)"
+                    class="clr-select filter-select">
+              <option value="">Select {{ filter.field }}</option>
+              <option *ngFor="let option of getFilterOptions(filter)" [value]="option">{{ option }}</option>
+            </select>
+          </div>
+          
+          <!-- Multi-Select Filter - Updated to show key first, then dropdown on click -->
+          <div *ngIf="filter.type === 'multiselect'" class="filter-input multiselect-container">
+            <div class="multiselect-display" (click)="toggleMultiselect(filter, 'base')">
+              <span class="multiselect-label">{{ filter.field }}</span>
+              <span class="multiselect-value" *ngIf="getSelectedOptionsCount(filter) > 0">
+                ({{ getSelectedOptionsCount(filter) }} selected)
+              </span>
+              <clr-icon shape="caret down" class="dropdown-icon"></clr-icon>
+            </div>
+            <div class="multiselect-dropdown" *ngIf="isMultiselectOpen(filter, 'base')">
+              <div class="checkbox-group">
+                <div *ngFor="let option of getFilterOptions(filter); let i = index" class="checkbox-item">
+                  <input type="checkbox" 
+                         [checked]="isOptionSelected(filter, option)" 
+                         (change)="onMultiSelectChange(filter, option, $event)"
+                         [id]="'base-' + filter.field + '-' + i" 
+                         class="clr-checkbox">
+                  <label [for]="'base-' + filter.field + '-' + i" class="checkbox-label">{{ option }}</label>
+                </div>
+              </div>
+            </div>
+          </div>
+          
+          <!-- Date Range Filter -->
+          <div *ngIf="filter.type === 'date-range'" class="filter-input date-range">
+            <div class="date-input-group">
+              <input type="date" 
+                     [(ngModel)]="filter.value.start" 
+                     (ngModelChange)="onDateRangeChange(filter, { start: $event, end: filter.value.end })"
+                     placeholder="Start Date"
+                     class="clr-input filter-date">
+              <span class="date-separator">to</span>
+              <input type="date" 
+                     [(ngModel)]="filter.value.end" 
+                     (ngModelChange)="onDateRangeChange(filter, { start: filter.value.start, end: $event })"
+                     placeholder="End Date"
+                     class="clr-input filter-date">
+            </div>
+          </div>
+          
+          <!-- Toggle Filter -->
+          <div *ngIf="filter.type === 'toggle'" class="filter-input toggle">
+            <input type="checkbox" 
+                   [(ngModel)]="filter.value" 
+                   (ngModelChange)="onToggleChange(filter, $event)"
+                   clrToggle 
+                   class="clr-toggle">
+            <label class="toggle-label">{{ filter.field }}</label>
+          </div>
+        </div>
+      </div>
+    </div>
+    
+    <!-- Drilldown Filters -->
+    <div class="filter-group" *ngIf="drilldownFilters && drilldownFilters.length > 0 && currentDrilldownLevel > 0">
+      <h4>Drilldown Filters</h4>
+      <div class="filter-controls">
+        <div *ngFor="let filter of drilldownFilters" class="filter-item">
+          <div class="filter-label">{{ filter.field }} ({{ filter.type || 'text' }})</div>
+          
+          <!-- Text Filter -->
+          <div *ngIf="!filter.type || filter.type === 'text'" class="filter-input">
+            <input type="text" 
+                   [(ngModel)]="filter.value" 
+                   (ngModelChange)="onDrilldownFilterChange(filter)"
+                   [placeholder]="filter.field"
+                   class="clr-input filter-text-input">
+          </div>
+          
+          <!-- Dropdown Filter -->
+          <div *ngIf="filter.type === 'dropdown'" class="filter-input">
+            <select [(ngModel)]="filter.value" 
+                    (ngModelChange)="onDrilldownFilterChange(filter)"
+                    class="clr-select filter-select">
+              <option value="">Select {{ filter.field }}</option>
+              <option *ngFor="let option of getFilterOptions(filter)" [value]="option">{{ option }}</option>
+            </select>
+          </div>
+          
+          <!-- Multi-Select Filter - Updated to show key first, then dropdown on click -->
+          <div *ngIf="filter.type === 'multiselect'" class="filter-input multiselect-container">
+            <div class="multiselect-display" (click)="toggleMultiselect(filter, 'drilldown')">
+              <span class="multiselect-label">{{ filter.field }}</span>
+              <span class="multiselect-value" *ngIf="getSelectedOptionsCount(filter) > 0">
+                ({{ getSelectedOptionsCount(filter) }} selected)
+              </span>
+              <clr-icon shape="caret down" class="dropdown-icon"></clr-icon>
+            </div>
+            <div class="multiselect-dropdown" *ngIf="isMultiselectOpen(filter, 'drilldown')">
+              <div class="checkbox-group">
+                <div *ngFor="let option of getFilterOptions(filter); let i = index" class="checkbox-item">
+                  <input type="checkbox" 
+                         [checked]="isOptionSelected(filter, option)" 
+                         (change)="onMultiSelectChange(filter, option, $event)"
+                         [id]="'drilldown-' + filter.field + '-' + i" 
+                         class="clr-checkbox">
+                  <label [for]="'drilldown-' + filter.field + '-' + i" class="checkbox-label">{{ option }}</label>
+                </div>
+              </div>
+            </div>
+          </div>
+          
+          <!-- Date Range Filter -->
+          <div *ngIf="filter.type === 'date-range'" class="filter-input date-range">
+            <div class="date-input-group">
+              <input type="date" 
+                     [(ngModel)]="filter.value.start" 
+                     (ngModelChange)="onDateRangeChange(filter, { start: $event, end: filter.value.end })"
+                     placeholder="Start Date"
+                     class="clr-input filter-date">
+              <span class="date-separator">to</span>
+              <input type="date" 
+                     [(ngModel)]="filter.value.end" 
+                     (ngModelChange)="onDateRangeChange(filter, { start: filter.value.start, end: $event })"
+                     placeholder="End Date"
+                     class="clr-input filter-date">
+            </div>
+          </div>
+          
+          <!-- Toggle Filter -->
+          <div *ngIf="filter.type === 'toggle'" class="filter-input toggle">
+            <input type="checkbox" 
+                   [(ngModel)]="filter.value" 
+                   (ngModelChange)="onToggleChange(filter, $event)"
+                   clrToggle 
+                   class="clr-toggle">
+            <label class="toggle-label">{{ filter.field }}</label>
+          </div>
+        </div>
+      </div>
+    </div>
+    
+    <!-- Layer Filters -->
+    <div class="filter-group" *ngIf="hasActiveLayerFilters()">
+      <h4>Layer Filters</h4>
+      <div class="filter-controls">
+        <div *ngFor="let filter of getActiveLayerFilters()" class="filter-item">
+          <div class="filter-label">{{ filter.field }} ({{ filter.type || 'text' }})</div>
+          
+          <!-- Text Filter -->
+          <div *ngIf="!filter.type || filter.type === 'text'" class="filter-input">
+            <input type="text" 
+                   [(ngModel)]="filter.value" 
+                   (ngModelChange)="onLayerFilterChange(filter)"
+                   [placeholder]="filter.field"
+                   class="clr-input filter-text-input">
+          </div>
+          
+          <!-- Dropdown Filter -->
+          <div *ngIf="filter.type === 'dropdown'" class="filter-input">
+            <select [(ngModel)]="filter.value" 
+                    (ngModelChange)="onLayerFilterChange(filter)"
+                    class="clr-select filter-select">
+              <option value="">Select {{ filter.field }}</option>
+              <option *ngFor="let option of getFilterOptions(filter)" [value]="option">{{ option }}</option>
+            </select>
+          </div>
+          
+          <!-- Multi-Select Filter - Updated to show key first, then dropdown on click -->
+          <div *ngIf="filter.type === 'multiselect'" class="filter-input multiselect-container">
+            <div class="multiselect-display" (click)="toggleMultiselect(filter, 'layer')">
+              <span class="multiselect-label">{{ filter.field }}</span>
+              <span class="multiselect-value" *ngIf="getSelectedOptionsCount(filter) > 0">
+                ({{ getSelectedOptionsCount(filter) }} selected)
+              </span>
+              <clr-icon shape="caret down" class="dropdown-icon"></clr-icon>
+            </div>
+            <div class="multiselect-dropdown" *ngIf="isMultiselectOpen(filter, 'layer')">
+              <div class="checkbox-group">
+                <div *ngFor="let option of getFilterOptions(filter); let i = index" class="checkbox-item">
+                  <input type="checkbox" 
+                         [checked]="isOptionSelected(filter, option)" 
+                         (change)="onMultiSelectChange(filter, option, $event)"
+                         [id]="'layer-' + filter.field + '-' + i" 
+                         class="clr-checkbox">
+                  <label [for]="'layer-' + filter.field + '-' + i" class="checkbox-label">{{ option }}</label>
+                </div>
+              </div>
+            </div>
+          </div>
+          
+          <!-- Date Range Filter -->
+          <div *ngIf="filter.type === 'date-range'" class="filter-input date-range">
+            <div class="date-input-group">
+              <input type="date" 
+                     [(ngModel)]="filter.value.start" 
+                     (ngModelChange)="onDateRangeChange(filter, { start: $event, end: filter.value.end })"
+                     placeholder="Start Date"
+                     class="clr-input filter-date">
+              <span class="date-separator">to</span>
+              <input type="date" 
+                     [(ngModel)]="filter.value.end" 
+                     (ngModelChange)="onDateRangeChange(filter, { start: filter.value.start, end: $event })"
+                     placeholder="End Date"
+                     class="clr-input filter-date">
+            </div>
+          </div>
+          
+          <!-- Toggle Filter -->
+          <div *ngIf="filter.type === 'toggle'" class="filter-input toggle">
+            <input type="checkbox" 
+                   [(ngModel)]="filter.value" 
+                   (ngModelChange)="onToggleChange(filter, $event)"
+                   clrToggle 
+                   class="clr-toggle">
+            <label class="toggle-label">{{ filter.field }}</label>
+          </div>
+        </div>
+      </div>
+    </div>
+    
+    <!-- Clear Filters Button -->
+    <div class="filter-actions">
+      <button class="btn btn-sm btn-outline" (click)="clearAllFilters()">Clear All Filters</button>
+    </div>
+  </div>
+  
+  <!-- Header row with chart title and drilldown navigation -->
+  <div class="clr-row header-row">
+    <div class="clr-col-6">
+      <h3 class="chart-title">{{charttitle || 'Radar Chart'}}</h3>
+    </div>
+    <div class="clr-col-6" style="text-align: right;">
+      <!-- Add drilldown navigation controls -->
+      <button class="btn btn-sm btn-link" *ngIf="drilldownEnabled && drilldownStack.length > 0" (click)="navigateBack()">
+        <cds-icon shape="arrow" direction="left"></cds-icon>
+        Back to {{drilldownStack.length > 1 ? 'Previous Level' : 'Main Data'}}
+      </button>
+    </div>
+  </div>
+  
+  <!-- Show current drilldown level -->
+  <div class="clr-row" *ngIf="drilldownEnabled && drilldownStack.length > 0">
+    <div class="clr-col-12">
+      <div class="alert alert-info" style="padding: 8px 12px; margin-bottom: 12px;">
+        <div class="alert-items">
+          <div class="alert-item static">
+            <div class="alert-icon-wrapper">
+              <cds-icon class="alert-icon" shape="info-circle"></cds-icon>
+            </div>
+            <span class="alert-text">
+              Drilldown Level: {{currentDrilldownLevel}} 
+              <span *ngIf="drilldownStack.length > 0">
+                (Clicked on: {{drilldownStack[drilldownStack.length - 1].clickedLabel}})
+              </span>
+            </span>
+          </div>
+        </div>
+      </div>
+    </div>
   </div>
   
   <!-- No data message -->
@@ -16,7 +285,7 @@
   </div>
   
   <!-- Chart display -->
-  <div *ngIf="!noDataAvailable">
+  <div *ngIf="!noDataAvailable" style="position: relative; height: calc(100% - 50px);">
     <canvas baseChart
       [datasets]="radarChartData"
       [labels]="radarChartLabels"
diff --git a/frontend/angular-clarity-master/src/app/modules/main/builder/dashboardnew/gadgets/radar-chart/radar-chart.component.scss b/frontend/angular-clarity-master/src/app/modules/main/builder/dashboardnew/gadgets/radar-chart/radar-chart.component.scss
index e69de29..a9282e4 100644
--- a/frontend/angular-clarity-master/src/app/modules/main/builder/dashboardnew/gadgets/radar-chart/radar-chart.component.scss
+++ b/frontend/angular-clarity-master/src/app/modules/main/builder/dashboardnew/gadgets/radar-chart/radar-chart.component.scss
@@ -0,0 +1,192 @@
+.filter-section {
+  margin-bottom: 20px;
+  padding: 15px;
+  border: 1px solid #ddd;
+  border-radius: 4px;
+  background-color: #f9f9f9;
+}
+
+.filter-group {
+  margin-bottom: 15px;
+  
+  h4 {
+    margin-top: 0;
+    margin-bottom: 10px;
+    color: #333;
+    font-weight: 600;
+  }
+}
+
+.filter-controls {
+  display: flex;
+  flex-wrap: wrap;
+  gap: 15px;
+}
+
+.filter-item {
+  flex: 1 1 300px;
+  min-width: 250px;
+  padding: 10px;
+  background: white;
+  border: 1px solid #e0e0e0;
+  border-radius: 4px;
+}
+
+.filter-label {
+  font-weight: 500;
+  margin-bottom: 8px;
+  color: #555;
+  font-size: 14px;
+}
+
+.filter-input {
+  width: 100%;
+  
+  .filter-text-input,
+  .filter-select,
+  .filter-date {
+    width: 100%;
+    padding: 6px 12px;
+    border: 1px solid #ccc;
+    border-radius: 4px;
+    font-size: 14px;
+  }
+  
+  .filter-select {
+    height: 34px;
+  }
+}
+
+.multiselect-container {
+  position: relative;
+}
+
+.multiselect-display {
+  display: flex;
+  align-items: center;
+  justify-content: space-between;
+  padding: 6px 12px;
+  border: 1px solid #ccc;
+  border-radius: 4px;
+  background: white;
+  cursor: pointer;
+  min-height: 34px;
+  
+  .multiselect-label {
+    flex: 1;
+    font-size: 14px;
+  }
+  
+  .multiselect-value {
+    color: #666;
+    font-size: 12px;
+    margin-right: 8px;
+  }
+  
+  .dropdown-icon {
+    flex-shrink: 0;
+    transition: transform 0.2s ease;
+  }
+  
+  &:hover {
+    border-color: #999;
+  }
+}
+
+.multiselect-dropdown {
+  position: absolute;
+  top: 100%;
+  left: 0;
+  right: 0;
+  z-index: 1000;
+  background: white;
+  border: 1px solid #ccc;
+  border-top: none;
+  border-radius: 0 0 4px 4px;
+  box-shadow: 0 2px 4px rgba(0,0,0,0.1);
+  max-height: 200px;
+  overflow-y: auto;
+  
+  .checkbox-group {
+    padding: 8px;
+    
+    .checkbox-item {
+      display: flex;
+      align-items: center;
+      gap: 8px;
+      padding: 4px 0;
+      
+      .checkbox-label {
+        margin: 0;
+        font-size: 14px;
+        cursor: pointer;
+      }
+    }
+  }
+}
+
+.date-range {
+  .date-input-group {
+    display: flex;
+    align-items: center;
+    gap: 8px;
+  }
+  
+  .date-separator {
+    margin: 0 5px;
+    color: #777;
+  }
+}
+
+.toggle {
+  display: flex;
+  align-items: center;
+  gap: 8px;
+  
+  .toggle-label {
+    margin: 0;
+    font-size: 14px;
+    cursor: pointer;
+  }
+}
+
+.filter-actions {
+  margin-top: 15px;
+  padding-top: 15px;
+  border-top: 1px solid #eee;
+  
+  .btn {
+    font-size: 13px;
+  }
+}
+
+// New header row styling
+.header-row {
+  margin-bottom: 15px;
+  padding-bottom: 10px;
+  border-bottom: 1px solid #eee;
+  
+  .chart-title {
+    margin: 0;
+    font-size: 18px;
+    font-weight: 600;
+    color: #333;
+  }
+}
+
+// Responsive design
+@media (max-width: 768px) {
+  .filter-controls {
+    flex-direction: column;
+  }
+  
+  .filter-item {
+    min-width: 100%;
+  }
+  
+  .header-row {
+    .chart-title {
+      font-size: 16px;
+    }
+  }
+}
\ No newline at end of file
diff --git a/frontend/angular-clarity-master/src/app/modules/main/builder/dashboardnew/gadgets/radar-chart/radar-chart.component.ts b/frontend/angular-clarity-master/src/app/modules/main/builder/dashboardnew/gadgets/radar-chart/radar-chart.component.ts
index f470aed..a2637a2 100644
--- a/frontend/angular-clarity-master/src/app/modules/main/builder/dashboardnew/gadgets/radar-chart/radar-chart.component.ts
+++ b/frontend/angular-clarity-master/src/app/modules/main/builder/dashboardnew/gadgets/radar-chart/radar-chart.component.ts
@@ -1,5 +1,7 @@
 import { Component, OnInit, Input, OnChanges, SimpleChanges } from '@angular/core';
 import { Dashboard3Service } from 'src/app/services/builder/dashboard3.service';
+import { FilterService } from '../../common-filter/filter.service';
+import { Subscription } from 'rxjs';
 
 @Component({
   selector: 'app-radar-chart',
@@ -61,16 +63,41 @@ export class RadarChartComponent implements OnInit, OnChanges {
   
   // Flag to prevent infinite loops
   private isFetchingData: boolean = false;
+  
+  // Subscriptions to unsubscribe on destroy
+  private subscriptions: Subscription[] = [];
 
-  constructor(private dashboardService: Dashboard3Service) { }
+  // Add properties for filter functionality
+  private openMultiselects: Map<string, string> = new Map(); // Map of filterId -> context
+  private documentClickHandler: ((event: MouseEvent) => void) | null = null;
+  private filtersInitialized: boolean = false;
+
+  constructor(
+    private dashboardService: Dashboard3Service,
+    private filterService: FilterService
+  ) { }
 
   ngOnInit(): void {
+    // Subscribe to filter changes
+    this.subscriptions.push(
+      this.filterService.filterState$.subscribe(filters => {
+        // When filters change, refresh the chart data
+        this.fetchChartData();
+      })
+    );
+    
     this.fetchChartData();
   }
 
   ngOnChanges(changes: SimpleChanges): void {
     console.log('RadarChartComponent input changes:', changes);
     
+    // Initialize filter values if they haven't been initialized yet
+    if (!this.filtersInitialized && (changes.baseFilters || changes.drilldownFilters || changes.drilldownLayers)) {
+      this.initializeFilterValues();
+      this.filtersInitialized = true;
+    }
+    
     // Check if any of the key properties have changed
     const xAxisChanged = changes.xAxis && !changes.xAxis.firstChange;
     const yAxisChanged = changes.yAxis && !changes.yAxis.firstChange;
@@ -93,7 +120,317 @@ export class RadarChartComponent implements OnInit, OnChanges {
       this.fetchChartData();
     }
   }
+  
+  // Initialize filter values with proper default values based on type
+  private initializeFilterValues(): void {
+    console.log('Initializing filter values');
+    
+    // Initialize base filters
+    if (this.baseFilters) {
+      this.baseFilters.forEach(filter => {
+        if (filter.value === undefined || filter.value === null) {
+          switch (filter.type) {
+            case 'multiselect':
+              filter.value = [];
+              break;
+            case 'date-range':
+              filter.value = { start: null, end: null };
+              break;
+            case 'toggle':
+              filter.value = false;
+              break;
+            default:
+              filter.value = '';
+          }
+        }
+      });
+    }
+    
+    // Initialize drilldown filters
+    if (this.drilldownFilters) {
+      this.drilldownFilters.forEach(filter => {
+        if (filter.value === undefined || filter.value === null) {
+          switch (filter.type) {
+            case 'multiselect':
+              filter.value = [];
+              break;
+            case 'date-range':
+              filter.value = { start: null, end: null };
+              break;
+            case 'toggle':
+              filter.value = false;
+              break;
+            default:
+              filter.value = '';
+          }
+        }
+      });
+    }
+    
+    // Initialize layer filters
+    if (this.drilldownLayers) {
+      this.drilldownLayers.forEach(layer => {
+        if (layer.filters) {
+          layer.filters.forEach((filter: any) => {
+            if (filter.value === undefined || filter.value === null) {
+              switch (filter.type) {
+                case 'multiselect':
+                  filter.value = [];
+                  break;
+                case 'date-range':
+                  filter.value = { start: null, end: null };
+                  break;
+                case 'toggle':
+                  filter.value = false;
+                  break;
+                default:
+                  filter.value = '';
+              }
+            }
+          });
+        }
+      });
+    }
+    
+    console.log('Filter values initialized:', {
+      baseFilters: this.baseFilters,
+      drilldownFilters: this.drilldownFilters,
+      drilldownLayers: this.drilldownLayers
+    });
+  }
 
+  // Check if there are active filters
+  hasActiveFilters(): boolean {
+    return (this.baseFilters && this.baseFilters.length > 0) || 
+           (this.drilldownFilters && this.drilldownFilters.length > 0) || 
+           this.hasActiveLayerFilters();
+  }
+
+  // Check if there are active layer filters for current drilldown level
+  hasActiveLayerFilters(): boolean {
+    if (this.currentDrilldownLevel > 1 && this.drilldownLayers && this.drilldownLayers.length > 0) {
+      const layerIndex = this.currentDrilldownLevel - 2; // -2 because level 1 is base drilldown
+      return layerIndex < this.drilldownLayers.length && 
+             this.drilldownLayers[layerIndex].filters && 
+             this.drilldownLayers[layerIndex].filters.length > 0;
+    }
+    return false;
+  }
+
+  // Get active layer filters for current drilldown level
+  getActiveLayerFilters(): any[] {
+    if (this.currentDrilldownLevel > 1 && this.drilldownLayers && this.drilldownLayers.length > 0) {
+      const layerIndex = this.currentDrilldownLevel - 2; // -2 because level 1 is base drilldown
+      if (layerIndex < this.drilldownLayers.length && 
+          this.drilldownLayers[layerIndex].filters) {
+        return this.drilldownLayers[layerIndex].filters;
+      }
+    }
+    return [];
+  }
+
+  // Get filter options for dropdown/multiselect filters
+  getFilterOptions(filter: any): string[] {
+    if (filter.options) {
+      if (Array.isArray(filter.options)) {
+        return filter.options;
+      } else if (typeof filter.options === 'string') {
+        return filter.options.split(',').map(opt => opt.trim()).filter(opt => opt);
+      }
+    }
+    return [];
+  }
+
+  // Check if an option is selected for multiselect filters
+  isOptionSelected(filter: any, option: string): boolean {
+    if (!filter.value) {
+      return false;
+    }
+    
+    if (Array.isArray(filter.value)) {
+      return filter.value.includes(option);
+    }
+    
+    return filter.value === option;
+  }
+
+  // Handle base filter changes
+  onBaseFilterChange(filter: any): void {
+    console.log('Base filter changed:', filter);
+    // Refresh data when filter changes
+    this.fetchChartData();
+  }
+
+  // Handle drilldown filter changes
+  onDrilldownFilterChange(filter: any): void {
+    console.log('Drilldown filter changed:', filter);
+    // Refresh data when filter changes
+    this.fetchChartData();
+  }
+
+  // Handle layer filter changes
+  onLayerFilterChange(filter: any): void {
+    console.log('Layer filter changed:', filter);
+    // Refresh data when filter changes
+    this.fetchChartData();
+  }
+
+  // Handle multiselect changes
+  onMultiSelectChange(filter: any, option: string, event: any): void {
+    const checked = event.target.checked;
+    
+    // Initialize filter.value as array if it's not already
+    if (!Array.isArray(filter.value)) {
+      filter.value = [];
+    }
+    
+    if (checked) {
+      // Add option to array if not already present
+      if (!filter.value.includes(option)) {
+        filter.value.push(option);
+      }
+    } else {
+      // Remove option from array
+      filter.value = filter.value.filter((item: string) => item !== option);
+    }
+    
+    // Refresh data when filter changes
+    this.fetchChartData();
+  }
+
+  // Handle date range changes
+  onDateRangeChange(filter: any, dateRange: { start: string | null, end: string | null }): void {
+    filter.value = dateRange;
+    // Refresh data when filter changes
+    this.fetchChartData();
+  }
+
+  // Handle toggle changes
+  onToggleChange(filter: any, checked: boolean): void {
+    filter.value = checked;
+    // Refresh data when filter changes
+    this.fetchChartData();
+  }
+
+  // Toggle multiselect dropdown visibility
+  toggleMultiselect(filter: any, context: string): void {
+    const filterId = `${context}-${filter.field}`;
+    if (this.isMultiselectOpen(filter, context)) {
+      this.openMultiselects.delete(filterId);
+    } else {
+      // Close all other multiselects first
+      this.openMultiselects.clear();
+      this.openMultiselects.set(filterId, context);
+      
+      // Add document click handler to close dropdown when clicking outside
+      this.addDocumentClickHandler();
+    }
+  }
+
+  // Add document click handler to close dropdowns when clicking outside
+  private addDocumentClickHandler(): void {
+    if (!this.documentClickHandler) {
+      this.documentClickHandler = (event: MouseEvent) => {
+        const target = event.target as HTMLElement;
+        // Check if click is outside any multiselect dropdown
+        if (!target.closest('.multiselect-container')) {
+          this.openMultiselects.clear();
+          this.removeDocumentClickHandler();
+        }
+      };
+      
+      // Use setTimeout to ensure the click event that opened the dropdown doesn't immediately close it
+      setTimeout(() => {
+        document.addEventListener('click', this.documentClickHandler!);
+      }, 0);
+    }
+  }
+
+  // Remove document click handler
+  private removeDocumentClickHandler(): void {
+    if (this.documentClickHandler) {
+      document.removeEventListener('click', this.documentClickHandler);
+      this.documentClickHandler = null;
+    }
+  }
+
+  // Check if multiselect dropdown is open
+  isMultiselectOpen(filter: any, context: string): boolean {
+    const filterId = `${context}-${filter.field}`;
+    return this.openMultiselects.has(filterId);
+  }
+
+  // Get count of selected options for a multiselect filter
+  getSelectedOptionsCount(filter: any): number {
+    if (!filter.value) {
+      return 0;
+    }
+    
+    if (Array.isArray(filter.value)) {
+      return filter.value.length;
+    }
+    
+    return 0;
+  }
+
+  // Clear all filters
+  clearAllFilters(): void {
+    // Clear base filters
+    if (this.baseFilters) {
+      this.baseFilters.forEach(filter => {
+        if (filter.type === 'multiselect') {
+          filter.value = [];
+        } else if (filter.type === 'date-range') {
+          filter.value = { start: null, end: null };
+        } else if (filter.type === 'toggle') {
+          filter.value = false;
+        } else {
+          filter.value = '';
+        }
+      });
+    }
+    
+    // Clear drilldown filters
+    if (this.drilldownFilters) {
+      this.drilldownFilters.forEach(filter => {
+        if (filter.type === 'multiselect') {
+          filter.value = [];
+        } else if (filter.type === 'date-range') {
+          filter.value = { start: null, end: null };
+        } else if (filter.type === 'toggle') {
+          filter.value = false;
+        } else {
+          filter.value = '';
+        }
+      });
+    }
+    
+    // Clear layer filters
+    if (this.drilldownLayers) {
+      this.drilldownLayers.forEach(layer => {
+        if (layer.filters) {
+          layer.filters.forEach((filter: any) => {
+            if (filter.type === 'multiselect') {
+              filter.value = [];
+            } else if (filter.type === 'date-range') {
+              filter.value = { start: null, end: null };
+            } else if (filter.type === 'toggle') {
+              filter.value = false;
+            } else {
+              filter.value = '';
+            }
+          });
+        }
+      });
+    }
+    
+    // Close all multiselect dropdowns
+    this.openMultiselects.clear();
+    
+    // Refresh data
+    this.fetchChartData();
+  }
+  
   fetchChartData(): void {
     // Set flag to prevent recursive calls
     this.isFetchingData = true;
@@ -126,7 +463,49 @@ export class RadarChartComponent implements OnInit, OnChanges {
           filterParams = JSON.stringify(filterObj);
         }
       }
-      console.log('Base filter parameters:', filterParams);
+      
+      // Add common filters to filter parameters
+      const commonFilters = this.filterService.getFilterValues();
+      console.log('Common filters from service:', commonFilters);
+      
+      if (Object.keys(commonFilters).length > 0) {
+        // Merge common filters with base filters
+        const mergedFilterObj = {};
+        
+        // Add base filters first
+        if (filterParams) {
+          try {
+            const baseFilterObj = JSON.parse(filterParams);
+            Object.assign(mergedFilterObj, baseFilterObj);
+          } catch (e) {
+            console.warn('Failed to parse base filter parameters:', e);
+          }
+        }
+        
+        // Add common filters using the field name as the key, not the filter id
+        Object.keys(commonFilters).forEach(filterId => {
+          const filterValue = commonFilters[filterId];
+          // Find the filter definition to get the field name
+          const filterDef = this.filterService.getFilters().find(f => f.id === filterId);
+          if (filterDef && filterDef.field) {
+            const fieldName = filterDef.field;
+            if (filterValue !== undefined && filterValue !== null && filterValue !== '') {
+              mergedFilterObj[fieldName] = filterValue;
+            }
+          } else {
+            // Fallback to using filterId as field name if no field is defined
+            if (filterValue !== undefined && filterValue !== null && filterValue !== '') {
+              mergedFilterObj[filterId] = filterValue;
+            }
+          }
+        });
+        
+        if (Object.keys(mergedFilterObj).length > 0) {
+          filterParams = JSON.stringify(mergedFilterObj);
+        }
+      }
+      
+      console.log('Final filter parameters:', filterParams);
       
       // Log the URL that will be called
       const url = `chart/getdashjson/radar?tableName=${this.table}&xAxis=${this.xAxis}&yAxes=${yAxisString}${this.connection ? `&sureId=${this.connection}` : ''}`;
@@ -298,6 +677,35 @@ export class RadarChartComponent implements OnInit, OnChanges {
       }
     }
     
+    // Add common filters to drilldown filter parameters
+    const commonFilters = this.filterService.getFilterValues();
+    if (Object.keys(commonFilters).length > 0) {
+      // Merge common filters with drilldown filters
+      const mergedFilterObj = {};
+      
+      // Add drilldown filters first
+      if (filterParams) {
+        try {
+          const drilldownFilterObj = JSON.parse(filterParams);
+          Object.assign(mergedFilterObj, drilldownFilterObj);
+        } catch (e) {
+          console.warn('Failed to parse drilldown filter parameters:', e);
+        }
+      }
+      
+      // Add common filters
+      Object.keys(commonFilters).forEach(key => {
+        const value = commonFilters[key];
+        if (value !== undefined && value !== null && value !== '') {
+          mergedFilterObj[key] = value;
+        }
+      });
+      
+      if (Object.keys(mergedFilterObj).length > 0) {
+        filterParams = JSON.stringify(mergedFilterObj);
+      }
+    }
+    
     // Log the URL that will be called
     const url = `chart/getdashjson/radar?tableName=${actualApiUrl}&xAxis=${drilldownConfig.xAxis}&yAxes=${drilldownConfig.yAxis}${this.connection ? `&sureId=${this.connection}` : ''}`;
     console.log('Drilldown data URL:', url);
@@ -321,7 +729,6 @@ export class RadarChartComponent implements OnInit, OnChanges {
           this.noDataAvailable = data.chartLabels.length === 0;
           this.radarChartLabels = data.chartLabels;
           // For radar charts, we need to ensure the data is properly formatted
-          // Each dataset should have a data array with numeric values
           this.radarChartData = data.chartData.map(dataset => ({
             ...dataset,
             data: dataset.data ? dataset.data.map(value => {
@@ -358,6 +765,7 @@ export class RadarChartComponent implements OnInit, OnChanges {
         this.noDataAvailable = true;
         this.radarChartLabels = [];
         this.radarChartData = [];
+        // Keep current data in case of error
       }
     );
   }
@@ -436,7 +844,7 @@ export class RadarChartComponent implements OnInit, OnChanges {
       if (this.currentDrilldownLevel === 0) {
         // Store original data before entering drilldown mode
         this.originalRadarChartLabels = [...this.radarChartLabels];
-        this.originalRadarChartData = [...this.radarChartData];
+        this.originalRadarChartData = JSON.parse(JSON.stringify(this.radarChartData));
         console.log('Stored original data for drilldown');
       }
       
@@ -504,6 +912,12 @@ export class RadarChartComponent implements OnInit, OnChanges {
   }
 
   public chartHovered(e: any): void {
-    console.log(e);
+    console.log('Radar chart hovered:', e);
+  }
+
+  ngOnDestroy(): void {
+    this.subscriptions.forEach(sub => sub.unsubscribe());
+    // Clean up document click handler
+    this.removeDocumentClickHandler();
   }
 }
\ No newline at end of file
diff --git a/frontend/angular-clarity-master/src/app/modules/main/builder/dashboardnew/gadgets/scatter-chart/scatter-chart.component.html b/frontend/angular-clarity-master/src/app/modules/main/builder/dashboardnew/gadgets/scatter-chart/scatter-chart.component.html
index 03d532b..1da95d9 100644
--- a/frontend/angular-clarity-master/src/app/modules/main/builder/dashboardnew/gadgets/scatter-chart/scatter-chart.component.html
+++ b/frontend/angular-clarity-master/src/app/modules/main/builder/dashboardnew/gadgets/scatter-chart/scatter-chart.component.html
@@ -1,13 +1,282 @@
-<div style="display: block">
-  <!-- Drilldown mode indicator -->
-  <div *ngIf="currentDrilldownLevel > 0" style="background-color: #e0e0e0; padding: 5px; margin-bottom: 10px; border-radius: 4px; text-align: center;">
-    <span style="font-weight: bold; color: #333;">Drilldown Level: {{currentDrilldownLevel}}</span>
-    <button (click)="navigateBack()" style="margin-left: 10px; padding: 2px 8px; background-color: #007cba; color: white; border: none; border-radius: 3px; cursor: pointer;">
-      Back to Level {{currentDrilldownLevel - 1}}
-    </button>
-    <button (click)="resetToOriginalData()" style="margin-left: 10px; padding: 2px 8px; background-color: #dc3545; color: white; border: none; border-radius: 3px; cursor: pointer;">
-      Back to Main View
-    </button>
+<div style="display: block; height: 100%; width: 100%;">
+  <!-- Filter Controls Section -->
+  <div class="filter-section" *ngIf="hasActiveFilters()">
+    <!-- Base Filters -->
+    <div class="filter-group" *ngIf="baseFilters && baseFilters.length > 0">
+      <h4>Base Filters</h4>
+      <div class="filter-controls">
+        <div *ngFor="let filter of baseFilters" class="filter-item">
+          <div class="filter-label">{{ filter.field }} ({{ filter.type || 'text' }})</div>
+          
+          <!-- Text Filter -->
+          <div *ngIf="!filter.type || filter.type === 'text'" class="filter-input">
+            <input type="text" 
+                   [(ngModel)]="filter.value" 
+                   (ngModelChange)="onBaseFilterChange(filter)"
+                   [placeholder]="filter.field"
+                   class="clr-input filter-text-input">
+          </div>
+          
+          <!-- Dropdown Filter -->
+          <div *ngIf="filter.type === 'dropdown'" class="filter-input">
+            <select [(ngModel)]="filter.value" 
+                    (ngModelChange)="onBaseFilterChange(filter)"
+                    class="clr-select filter-select">
+              <option value="">Select {{ filter.field }}</option>
+              <option *ngFor="let option of getFilterOptions(filter)" [value]="option">{{ option }}</option>
+            </select>
+          </div>
+          
+          <!-- Multi-Select Filter - Updated to show key first, then dropdown on click -->
+          <div *ngIf="filter.type === 'multiselect'" class="filter-input multiselect-container">
+            <div class="multiselect-display" (click)="toggleMultiselect(filter, 'base')">
+              <span class="multiselect-label">{{ filter.field }}</span>
+              <span class="multiselect-value" *ngIf="getSelectedOptionsCount(filter) > 0">
+                ({{ getSelectedOptionsCount(filter) }} selected)
+              </span>
+              <clr-icon shape="caret down" class="dropdown-icon"></clr-icon>
+            </div>
+            <div class="multiselect-dropdown" *ngIf="isMultiselectOpen(filter, 'base')">
+              <div class="checkbox-group">
+                <div *ngFor="let option of getFilterOptions(filter); let i = index" class="checkbox-item">
+                  <input type="checkbox" 
+                         [checked]="isOptionSelected(filter, option)" 
+                         (change)="onMultiSelectChange(filter, option, $event)"
+                         [id]="'base-' + filter.field + '-' + i" 
+                         class="clr-checkbox">
+                  <label [for]="'base-' + filter.field + '-' + i" class="checkbox-label">{{ option }}</label>
+                </div>
+              </div>
+            </div>
+          </div>
+          
+          <!-- Date Range Filter -->
+          <div *ngIf="filter.type === 'date-range'" class="filter-input date-range">
+            <div class="date-input-group">
+              <input type="date" 
+                     [(ngModel)]="filter.value.start" 
+                     (ngModelChange)="onDateRangeChange(filter, { start: $event, end: filter.value.end })"
+                     placeholder="Start Date"
+                     class="clr-input filter-date">
+              <span class="date-separator">to</span>
+              <input type="date" 
+                     [(ngModel)]="filter.value.end" 
+                     (ngModelChange)="onDateRangeChange(filter, { start: filter.value.start, end: $event })"
+                     placeholder="End Date"
+                     class="clr-input filter-date">
+            </div>
+          </div>
+          
+          <!-- Toggle Filter -->
+          <div *ngIf="filter.type === 'toggle'" class="filter-input toggle">
+            <input type="checkbox" 
+                   [(ngModel)]="filter.value" 
+                   (ngModelChange)="onToggleChange(filter, $event)"
+                   clrToggle 
+                   class="clr-toggle">
+            <label class="toggle-label">{{ filter.field }}</label>
+          </div>
+        </div>
+      </div>
+    </div>
+    
+    <!-- Drilldown Filters -->
+    <div class="filter-group" *ngIf="drilldownFilters && drilldownFilters.length > 0 && currentDrilldownLevel > 0">
+      <h4>Drilldown Filters</h4>
+      <div class="filter-controls">
+        <div *ngFor="let filter of drilldownFilters" class="filter-item">
+          <div class="filter-label">{{ filter.field }} ({{ filter.type || 'text' }})</div>
+          
+          <!-- Text Filter -->
+          <div *ngIf="!filter.type || filter.type === 'text'" class="filter-input">
+            <input type="text" 
+                   [(ngModel)]="filter.value" 
+                   (ngModelChange)="onDrilldownFilterChange(filter)"
+                   [placeholder]="filter.field"
+                   class="clr-input filter-text-input">
+          </div>
+          
+          <!-- Dropdown Filter -->
+          <div *ngIf="filter.type === 'dropdown'" class="filter-input">
+            <select [(ngModel)]="filter.value" 
+                    (ngModelChange)="onDrilldownFilterChange(filter)"
+                    class="clr-select filter-select">
+              <option value="">Select {{ filter.field }}</option>
+              <option *ngFor="let option of getFilterOptions(filter)" [value]="option">{{ option }}</option>
+            </select>
+          </div>
+          
+          <!-- Multi-Select Filter - Updated to show key first, then dropdown on click -->
+          <div *ngIf="filter.type === 'multiselect'" class="filter-input multiselect-container">
+            <div class="multiselect-display" (click)="toggleMultiselect(filter, 'drilldown')">
+              <span class="multiselect-label">{{ filter.field }}</span>
+              <span class="multiselect-value" *ngIf="getSelectedOptionsCount(filter) > 0">
+                ({{ getSelectedOptionsCount(filter) }} selected)
+              </span>
+              <clr-icon shape="caret down" class="dropdown-icon"></clr-icon>
+            </div>
+            <div class="multiselect-dropdown" *ngIf="isMultiselectOpen(filter, 'drilldown')">
+              <div class="checkbox-group">
+                <div *ngFor="let option of getFilterOptions(filter); let i = index" class="checkbox-item">
+                  <input type="checkbox" 
+                         [checked]="isOptionSelected(filter, option)" 
+                         (change)="onMultiSelectChange(filter, option, $event)"
+                         [id]="'drilldown-' + filter.field + '-' + i" 
+                         class="clr-checkbox">
+                  <label [for]="'drilldown-' + filter.field + '-' + i" class="checkbox-label">{{ option }}</label>
+                </div>
+              </div>
+            </div>
+          </div>
+          
+          <!-- Date Range Filter -->
+          <div *ngIf="filter.type === 'date-range'" class="filter-input date-range">
+            <div class="date-input-group">
+              <input type="date" 
+                     [(ngModel)]="filter.value.start" 
+                     (ngModelChange)="onDateRangeChange(filter, { start: $event, end: filter.value.end })"
+                     placeholder="Start Date"
+                     class="clr-input filter-date">
+              <span class="date-separator">to</span>
+              <input type="date" 
+                     [(ngModel)]="filter.value.end" 
+                     (ngModelChange)="onDateRangeChange(filter, { start: filter.value.start, end: $event })"
+                     placeholder="End Date"
+                     class="clr-input filter-date">
+            </div>
+          </div>
+          
+          <!-- Toggle Filter -->
+          <div *ngIf="filter.type === 'toggle'" class="filter-input toggle">
+            <input type="checkbox" 
+                   [(ngModel)]="filter.value" 
+                   (ngModelChange)="onToggleChange(filter, $event)"
+                   clrToggle 
+                   class="clr-toggle">
+            <label class="toggle-label">{{ filter.field }}</label>
+          </div>
+        </div>
+      </div>
+    </div>
+    
+    <!-- Layer Filters -->
+    <div class="filter-group" *ngIf="hasActiveLayerFilters()">
+      <h4>Layer Filters</h4>
+      <div class="filter-controls">
+        <div *ngFor="let filter of getActiveLayerFilters()" class="filter-item">
+          <div class="filter-label">{{ filter.field }} ({{ filter.type || 'text' }})</div>
+          
+          <!-- Text Filter -->
+          <div *ngIf="!filter.type || filter.type === 'text'" class="filter-input">
+            <input type="text" 
+                   [(ngModel)]="filter.value" 
+                   (ngModelChange)="onLayerFilterChange(filter)"
+                   [placeholder]="filter.field"
+                   class="clr-input filter-text-input">
+          </div>
+          
+          <!-- Dropdown Filter -->
+          <div *ngIf="filter.type === 'dropdown'" class="filter-input">
+            <select [(ngModel)]="filter.value" 
+                    (ngModelChange)="onLayerFilterChange(filter)"
+                    class="clr-select filter-select">
+              <option value="">Select {{ filter.field }}</option>
+              <option *ngFor="let option of getFilterOptions(filter)" [value]="option">{{ option }}</option>
+            </select>
+          </div>
+          
+          <!-- Multi-Select Filter - Updated to show key first, then dropdown on click -->
+          <div *ngIf="filter.type === 'multiselect'" class="filter-input multiselect-container">
+            <div class="multiselect-display" (click)="toggleMultiselect(filter, 'layer')">
+              <span class="multiselect-label">{{ filter.field }}</span>
+              <span class="multiselect-value" *ngIf="getSelectedOptionsCount(filter) > 0">
+                ({{ getSelectedOptionsCount(filter) }} selected)
+              </span>
+              <clr-icon shape="caret down" class="dropdown-icon"></clr-icon>
+            </div>
+            <div class="multiselect-dropdown" *ngIf="isMultiselectOpen(filter, 'layer')">
+              <div class="checkbox-group">
+                <div *ngFor="let option of getFilterOptions(filter); let i = index" class="checkbox-item">
+                  <input type="checkbox" 
+                         [checked]="isOptionSelected(filter, option)" 
+                         (change)="onMultiSelectChange(filter, option, $event)"
+                         [id]="'layer-' + filter.field + '-' + i" 
+                         class="clr-checkbox">
+                  <label [for]="'layer-' + filter.field + '-' + i" class="checkbox-label">{{ option }}</label>
+                </div>
+              </div>
+            </div>
+          </div>
+          
+          <!-- Date Range Filter -->
+          <div *ngIf="filter.type === 'date-range'" class="filter-input date-range">
+            <div class="date-input-group">
+              <input type="date" 
+                     [(ngModel)]="filter.value.start" 
+                     (ngModelChange)="onDateRangeChange(filter, { start: $event, end: filter.value.end })"
+                     placeholder="Start Date"
+                     class="clr-input filter-date">
+              <span class="date-separator">to</span>
+              <input type="date" 
+                     [(ngModel)]="filter.value.end" 
+                     (ngModelChange)="onDateRangeChange(filter, { start: filter.value.start, end: $event })"
+                     placeholder="End Date"
+                     class="clr-input filter-date">
+            </div>
+          </div>
+          
+          <!-- Toggle Filter -->
+          <div *ngIf="filter.type === 'toggle'" class="filter-input toggle">
+            <input type="checkbox" 
+                   [(ngModel)]="filter.value" 
+                   (ngModelChange)="onToggleChange(filter, $event)"
+                   clrToggle 
+                   class="clr-toggle">
+            <label class="toggle-label">{{ filter.field }}</label>
+          </div>
+        </div>
+      </div>
+    </div>
+    
+    <!-- Clear Filters Button -->
+    <div class="filter-actions">
+      <button class="btn btn-sm btn-outline" (click)="clearAllFilters()">Clear All Filters</button>
+    </div>
+  </div>
+  
+  <!-- Header row with chart title and drilldown navigation -->
+  <div class="clr-row header-row">
+    <div class="clr-col-6">
+      <h3 class="chart-title">{{charttitle || 'Scatter Chart'}}</h3>
+    </div>
+    <div class="clr-col-6" style="text-align: right;">
+      <!-- Add drilldown navigation controls -->
+      <button class="btn btn-sm btn-link" *ngIf="drilldownEnabled && drilldownStack.length > 0" (click)="navigateBack()">
+        <cds-icon shape="arrow" direction="left"></cds-icon>
+        Back to {{drilldownStack.length > 1 ? 'Previous Level' : 'Main Data'}}
+      </button>
+    </div>
+  </div>
+  
+  <!-- Show current drilldown level -->
+  <div class="clr-row" *ngIf="drilldownEnabled && drilldownStack.length > 0">
+    <div class="clr-col-12">
+      <div class="alert alert-info" style="padding: 8px 12px; margin-bottom: 12px;">
+        <div class="alert-items">
+          <div class="alert-item static">
+            <div class="alert-icon-wrapper">
+              <cds-icon class="alert-icon" shape="info-circle"></cds-icon>
+            </div>
+            <span class="alert-text">
+              Drilldown Level: {{currentDrilldownLevel}} 
+              <span *ngIf="drilldownStack.length > 0">
+                (Clicked on: {{drilldownStack[drilldownStack.length - 1].clickedLabel}})
+              </span>
+            </span>
+          </div>
+        </div>
+      </div>
+    </div>
   </div>
   
   <!-- No data message -->
@@ -16,9 +285,10 @@
   </div>
   
   <!-- Chart display -->
-  <div *ngIf="!noDataAvailable">
+  <div *ngIf="!noDataAvailable" style="position: relative; height: calc(100% - 70px); min-height: 300px;">
     <canvas baseChart
       [datasets]="scatterChartData"
+      [options]="scatterChartOptions"
       [type]="scatterChartType"
       (chartHover)="chartHovered($event)"
       (chartClick)="chartClicked($event)">
diff --git a/frontend/angular-clarity-master/src/app/modules/main/builder/dashboardnew/gadgets/scatter-chart/scatter-chart.component.scss b/frontend/angular-clarity-master/src/app/modules/main/builder/dashboardnew/gadgets/scatter-chart/scatter-chart.component.scss
index e69de29..a9282e4 100644
--- a/frontend/angular-clarity-master/src/app/modules/main/builder/dashboardnew/gadgets/scatter-chart/scatter-chart.component.scss
+++ b/frontend/angular-clarity-master/src/app/modules/main/builder/dashboardnew/gadgets/scatter-chart/scatter-chart.component.scss
@@ -0,0 +1,192 @@
+.filter-section {
+  margin-bottom: 20px;
+  padding: 15px;
+  border: 1px solid #ddd;
+  border-radius: 4px;
+  background-color: #f9f9f9;
+}
+
+.filter-group {
+  margin-bottom: 15px;
+  
+  h4 {
+    margin-top: 0;
+    margin-bottom: 10px;
+    color: #333;
+    font-weight: 600;
+  }
+}
+
+.filter-controls {
+  display: flex;
+  flex-wrap: wrap;
+  gap: 15px;
+}
+
+.filter-item {
+  flex: 1 1 300px;
+  min-width: 250px;
+  padding: 10px;
+  background: white;
+  border: 1px solid #e0e0e0;
+  border-radius: 4px;
+}
+
+.filter-label {
+  font-weight: 500;
+  margin-bottom: 8px;
+  color: #555;
+  font-size: 14px;
+}
+
+.filter-input {
+  width: 100%;
+  
+  .filter-text-input,
+  .filter-select,
+  .filter-date {
+    width: 100%;
+    padding: 6px 12px;
+    border: 1px solid #ccc;
+    border-radius: 4px;
+    font-size: 14px;
+  }
+  
+  .filter-select {
+    height: 34px;
+  }
+}
+
+.multiselect-container {
+  position: relative;
+}
+
+.multiselect-display {
+  display: flex;
+  align-items: center;
+  justify-content: space-between;
+  padding: 6px 12px;
+  border: 1px solid #ccc;
+  border-radius: 4px;
+  background: white;
+  cursor: pointer;
+  min-height: 34px;
+  
+  .multiselect-label {
+    flex: 1;
+    font-size: 14px;
+  }
+  
+  .multiselect-value {
+    color: #666;
+    font-size: 12px;
+    margin-right: 8px;
+  }
+  
+  .dropdown-icon {
+    flex-shrink: 0;
+    transition: transform 0.2s ease;
+  }
+  
+  &:hover {
+    border-color: #999;
+  }
+}
+
+.multiselect-dropdown {
+  position: absolute;
+  top: 100%;
+  left: 0;
+  right: 0;
+  z-index: 1000;
+  background: white;
+  border: 1px solid #ccc;
+  border-top: none;
+  border-radius: 0 0 4px 4px;
+  box-shadow: 0 2px 4px rgba(0,0,0,0.1);
+  max-height: 200px;
+  overflow-y: auto;
+  
+  .checkbox-group {
+    padding: 8px;
+    
+    .checkbox-item {
+      display: flex;
+      align-items: center;
+      gap: 8px;
+      padding: 4px 0;
+      
+      .checkbox-label {
+        margin: 0;
+        font-size: 14px;
+        cursor: pointer;
+      }
+    }
+  }
+}
+
+.date-range {
+  .date-input-group {
+    display: flex;
+    align-items: center;
+    gap: 8px;
+  }
+  
+  .date-separator {
+    margin: 0 5px;
+    color: #777;
+  }
+}
+
+.toggle {
+  display: flex;
+  align-items: center;
+  gap: 8px;
+  
+  .toggle-label {
+    margin: 0;
+    font-size: 14px;
+    cursor: pointer;
+  }
+}
+
+.filter-actions {
+  margin-top: 15px;
+  padding-top: 15px;
+  border-top: 1px solid #eee;
+  
+  .btn {
+    font-size: 13px;
+  }
+}
+
+// New header row styling
+.header-row {
+  margin-bottom: 15px;
+  padding-bottom: 10px;
+  border-bottom: 1px solid #eee;
+  
+  .chart-title {
+    margin: 0;
+    font-size: 18px;
+    font-weight: 600;
+    color: #333;
+  }
+}
+
+// Responsive design
+@media (max-width: 768px) {
+  .filter-controls {
+    flex-direction: column;
+  }
+  
+  .filter-item {
+    min-width: 100%;
+  }
+  
+  .header-row {
+    .chart-title {
+      font-size: 16px;
+    }
+  }
+}
\ No newline at end of file
diff --git a/frontend/angular-clarity-master/src/app/modules/main/builder/dashboardnew/gadgets/scatter-chart/scatter-chart.component.ts b/frontend/angular-clarity-master/src/app/modules/main/builder/dashboardnew/gadgets/scatter-chart/scatter-chart.component.ts
index 9cac735..97bd14a 100644
--- a/frontend/angular-clarity-master/src/app/modules/main/builder/dashboardnew/gadgets/scatter-chart/scatter-chart.component.ts
+++ b/frontend/angular-clarity-master/src/app/modules/main/builder/dashboardnew/gadgets/scatter-chart/scatter-chart.component.ts
@@ -1,6 +1,8 @@
 import { Component, OnInit, Input, OnChanges, SimpleChanges } from '@angular/core';
-import { ChartData,ChartDataset } from 'chart.js';
+import { ChartData,ChartDataset,ChartOptions } from 'chart.js';
 import { Dashboard3Service } from 'src/app/services/builder/dashboard3.service';
+import { FilterService } from '../../common-filter/filter.service';
+import { Subscription } from 'rxjs';
 
 @Component({
   selector: 'app-scatter-chart',
@@ -34,9 +36,20 @@ export class ScatterChartComponent implements OnInit, OnChanges {
   // Multi-layer drilldown configuration inputs
   @Input() drilldownLayers: any[] = []; // Array of drilldown layer configurations
 
-  constructor(private dashboardService: Dashboard3Service) { }
+  constructor(
+    private dashboardService: Dashboard3Service,
+    private filterService: FilterService
+  ) { }
 
   ngOnInit(): void {
+    // Subscribe to filter changes
+    this.subscriptions.push(
+      this.filterService.filterState$.subscribe(filters => {
+        // When filters change, refresh the chart data
+        this.fetchChartData();
+      })
+    );
+    
     // Initialize with default data
     this.fetchChartData();
   }
@@ -44,6 +57,12 @@ export class ScatterChartComponent implements OnInit, OnChanges {
   ngOnChanges(changes: SimpleChanges): void {
     console.log('ScatterChartComponent input changes:', changes);
     
+    // Initialize filter values if they haven't been initialized yet
+    if (!this.filtersInitialized && (changes.baseFilters || changes.drilldownFilters || changes.drilldownLayers)) {
+      this.initializeFilterValues();
+      this.filtersInitialized = true;
+    }
+    
     // Check if any of the key properties have changed
     const xAxisChanged = changes.xAxis && !changes.xAxis.firstChange;
     const yAxisChanged = changes.yAxis && !changes.yAxis.firstChange;
@@ -94,6 +113,89 @@ export class ScatterChartComponent implements OnInit, OnChanges {
       ],
     },
   ];
+  
+  public scatterChartOptions: any = {
+    responsive: true,
+    maintainAspectRatio: false,
+    scales: {
+      x: {
+        type: 'linear',
+        position: 'bottom',
+        title: {
+          display: true,
+          text: 'X Axis'
+        },
+        ticks: {
+          autoSkip: true,
+          maxTicksLimit: 10,
+          callback: function(value: any) {
+            if (typeof value === 'number') {
+              // Format large numbers for better readability
+              if (Math.abs(value) >= 1000000) {
+                return (value / 1000000).toFixed(1) + 'M';
+              } else if (Math.abs(value) >= 1000) {
+                return (value / 1000).toFixed(1) + 'K';
+              }
+              return value.toString();
+            }
+            return value;
+          }
+        },
+        grid: {
+          display: true,
+          color: 'rgba(0, 0, 0, 0.1)'
+        }
+      },
+      y: {
+        title: {
+          display: true,
+          text: 'Y Axis'
+        },
+        ticks: {
+          autoSkip: true,
+          maxTicksLimit: 10,
+          callback: function(value: any) {
+            if (typeof value === 'number') {
+              // Format large numbers for better readability
+              if (Math.abs(value) >= 1000000) {
+                return (value / 1000000).toFixed(1) + 'M';
+              } else if (Math.abs(value) >= 1000) {
+                return (value / 1000).toFixed(1) + 'K';
+              }
+              return value.toString();
+            }
+            return value;
+          }
+        },
+        grid: {
+          display: true,
+          color: 'rgba(0, 0, 0, 0.1)'
+        }
+      }
+    },
+    plugins: {
+      legend: {
+        display: true,
+        position: 'top',
+      },
+      tooltip: {
+        callbacks: {
+          label: function(context: any) {
+            return `(${context.parsed.x}, ${context.parsed.y})`;
+          }
+        }
+      }
+    },
+    layout: {
+      padding: {
+        left: 15,
+        right: 15,
+        top: 15,
+        bottom: 60  // Add padding at the bottom to ensure X-axis visibility
+      }
+    }
+  };
+
   public scatterChartType: string = 'scatter';
   
   // Multi-layer drilldown state tracking
@@ -107,6 +209,417 @@ export class ScatterChartComponent implements OnInit, OnChanges {
   // Flag to prevent infinite loops
   private isFetchingData: boolean = false;
   
+  // Subscriptions to unsubscribe on destroy
+  private subscriptions: Subscription[] = [];
+
+  // Add properties for filter functionality
+  private openMultiselects: Map<string, string> = new Map(); // Map of filterId -> context
+  private documentClickHandler: ((event: MouseEvent) => void) | null = null;
+  private filtersInitialized: boolean = false;
+  
+  // Initialize filter values with proper default values based on type
+  private initializeFilterValues(): void {
+    console.log('Initializing filter values');
+    
+    // Initialize base filters
+    if (this.baseFilters) {
+      this.baseFilters.forEach(filter => {
+        if (filter.value === undefined || filter.value === null) {
+          switch (filter.type) {
+            case 'multiselect':
+              filter.value = [];
+              break;
+            case 'date-range':
+              filter.value = { start: null, end: null };
+              break;
+            case 'toggle':
+              filter.value = false;
+              break;
+            default:
+              filter.value = '';
+          }
+        }
+      });
+    }
+    
+    // Initialize drilldown filters
+    if (this.drilldownFilters) {
+      this.drilldownFilters.forEach(filter => {
+        if (filter.value === undefined || filter.value === null) {
+          switch (filter.type) {
+            case 'multiselect':
+              filter.value = [];
+              break;
+            case 'date-range':
+              filter.value = { start: null, end: null };
+              break;
+            case 'toggle':
+              filter.value = false;
+              break;
+            default:
+              filter.value = '';
+          }
+        }
+      });
+    }
+    
+    // Initialize layer filters
+    if (this.drilldownLayers) {
+      this.drilldownLayers.forEach(layer => {
+        if (layer.filters) {
+          layer.filters.forEach((filter: any) => {
+            if (filter.value === undefined || filter.value === null) {
+              switch (filter.type) {
+                case 'multiselect':
+                  filter.value = [];
+                  break;
+                case 'date-range':
+                  filter.value = { start: null, end: null };
+                  break;
+                case 'toggle':
+                  filter.value = false;
+                  break;
+                default:
+                  filter.value = '';
+              }
+            }
+          });
+        }
+      });
+    }
+    
+    console.log('Filter values initialized:', {
+      baseFilters: this.baseFilters,
+      drilldownFilters: this.drilldownFilters,
+      drilldownLayers: this.drilldownLayers
+    });
+  }
+
+  // Check if there are active filters
+  hasActiveFilters(): boolean {
+    return (this.baseFilters && this.baseFilters.length > 0) || 
+           (this.drilldownFilters && this.drilldownFilters.length > 0) || 
+           this.hasActiveLayerFilters();
+  }
+
+  // Check if there are active layer filters for current drilldown level
+  hasActiveLayerFilters(): boolean {
+    if (this.currentDrilldownLevel > 1 && this.drilldownLayers && this.drilldownLayers.length > 0) {
+      const layerIndex = this.currentDrilldownLevel - 2; // -2 because level 1 is base drilldown
+      return layerIndex < this.drilldownLayers.length && 
+             this.drilldownLayers[layerIndex].filters && 
+             this.drilldownLayers[layerIndex].filters.length > 0;
+    }
+    return false;
+  }
+
+  // Get active layer filters for current drilldown level
+  getActiveLayerFilters(): any[] {
+    if (this.currentDrilldownLevel > 1 && this.drilldownLayers && this.drilldownLayers.length > 0) {
+      const layerIndex = this.currentDrilldownLevel - 2; // -2 because level 1 is base drilldown
+      if (layerIndex < this.drilldownLayers.length && 
+          this.drilldownLayers[layerIndex].filters) {
+        return this.drilldownLayers[layerIndex].filters;
+      }
+    }
+    return [];
+  }
+
+  // Get filter options for dropdown/multiselect filters
+  getFilterOptions(filter: any): string[] {
+    if (filter.options) {
+      if (Array.isArray(filter.options)) {
+        return filter.options;
+      } else if (typeof filter.options === 'string') {
+        return filter.options.split(',').map(opt => opt.trim()).filter(opt => opt);
+      }
+    }
+    return [];
+  }
+
+  // Check if an option is selected for multiselect filters
+  isOptionSelected(filter: any, option: string): boolean {
+    if (!filter.value) {
+      return false;
+    }
+    
+    if (Array.isArray(filter.value)) {
+      return filter.value.includes(option);
+    }
+    
+    return filter.value === option;
+  }
+
+  // Handle base filter changes
+  onBaseFilterChange(filter: any): void {
+    console.log('Base filter changed:', filter);
+    // Refresh data when filter changes
+    this.fetchChartData();
+  }
+
+  // Handle drilldown filter changes
+  onDrilldownFilterChange(filter: any): void {
+    console.log('Drilldown filter changed:', filter);
+    // Refresh data when filter changes
+    this.fetchChartData();
+  }
+
+  // Handle layer filter changes
+  onLayerFilterChange(filter: any): void {
+    console.log('Layer filter changed:', filter);
+    // Refresh data when filter changes
+    this.fetchChartData();
+  }
+
+  // Handle multiselect changes
+  onMultiSelectChange(filter: any, option: string, event: any): void {
+    const checked = event.target.checked;
+    
+    // Initialize filter.value as array if it's not already
+    if (!Array.isArray(filter.value)) {
+      filter.value = [];
+    }
+    
+    if (checked) {
+      // Add option to array if not already present
+      if (!filter.value.includes(option)) {
+        filter.value.push(option);
+      }
+    } else {
+      // Remove option from array
+      filter.value = filter.value.filter((item: string) => item !== option);
+    }
+    
+    // Refresh data when filter changes
+    this.fetchChartData();
+  }
+
+  // Handle date range changes
+  onDateRangeChange(filter: any, dateRange: { start: string | null, end: string | null }): void {
+    filter.value = dateRange;
+    // Refresh data when filter changes
+    this.fetchChartData();
+  }
+
+  // Handle toggle changes
+  onToggleChange(filter: any, checked: boolean): void {
+    filter.value = checked;
+    // Refresh data when filter changes
+    this.fetchChartData();
+  }
+
+  // Toggle multiselect dropdown visibility
+  toggleMultiselect(filter: any, context: string): void {
+    const filterId = `${context}-${filter.field}`;
+    if (this.isMultiselectOpen(filter, context)) {
+      this.openMultiselects.delete(filterId);
+    } else {
+      // Close all other multiselects first
+      this.openMultiselects.clear();
+      this.openMultiselects.set(filterId, context);
+      
+      // Add document click handler to close dropdown when clicking outside
+      this.addDocumentClickHandler();
+    }
+  }
+
+  // Add document click handler to close dropdowns when clicking outside
+  private addDocumentClickHandler(): void {
+    if (!this.documentClickHandler) {
+      this.documentClickHandler = (event: MouseEvent) => {
+        const target = event.target as HTMLElement;
+        // Check if click is outside any multiselect dropdown
+        if (!target.closest('.multiselect-container')) {
+          this.openMultiselects.clear();
+          this.removeDocumentClickHandler();
+        }
+      };
+      
+      // Use setTimeout to ensure the click event that opened the dropdown doesn't immediately close it
+      setTimeout(() => {
+        document.addEventListener('click', this.documentClickHandler!);
+      }, 0);
+    }
+  }
+
+  // Remove document click handler
+  private removeDocumentClickHandler(): void {
+    if (this.documentClickHandler) {
+      document.removeEventListener('click', this.documentClickHandler);
+      this.documentClickHandler = null;
+    }
+  }
+
+  // Check if multiselect dropdown is open
+  isMultiselectOpen(filter: any, context: string): boolean {
+    const filterId = `${context}-${filter.field}`;
+    return this.openMultiselects.has(filterId);
+  }
+
+  // Get count of selected options for a multiselect filter
+  getSelectedOptionsCount(filter: any): number {
+    if (!filter.value) {
+      return 0;
+    }
+    
+    if (Array.isArray(filter.value)) {
+      return filter.value.length;
+    }
+    
+    return 0;
+  }
+
+  // Clear all filters
+  clearAllFilters(): void {
+    // Clear base filters
+    if (this.baseFilters) {
+      this.baseFilters.forEach(filter => {
+        if (filter.type === 'multiselect') {
+          filter.value = [];
+        } else if (filter.type === 'date-range') {
+          filter.value = { start: null, end: null };
+        } else if (filter.type === 'toggle') {
+          filter.value = false;
+        } else {
+          filter.value = '';
+        }
+      });
+    }
+    
+    // Clear drilldown filters
+    if (this.drilldownFilters) {
+      this.drilldownFilters.forEach(filter => {
+        if (filter.type === 'multiselect') {
+          filter.value = [];
+        } else if (filter.type === 'date-range') {
+          filter.value = { start: null, end: null };
+        } else if (filter.type === 'toggle') {
+          filter.value = false;
+        } else {
+          filter.value = '';
+        }
+      });
+    }
+    
+    // Clear layer filters
+    if (this.drilldownLayers) {
+      this.drilldownLayers.forEach(layer => {
+        if (layer.filters) {
+          layer.filters.forEach((filter: any) => {
+            if (filter.type === 'multiselect') {
+              filter.value = [];
+            } else if (filter.type === 'date-range') {
+              filter.value = { start: null, end: null };
+            } else if (filter.type === 'toggle') {
+              filter.value = false;
+            } else {
+              filter.value = '';
+            }
+          });
+        }
+      });
+    }
+    
+    // Close all multiselect dropdowns
+    this.openMultiselects.clear();
+    
+    // Refresh data
+    this.fetchChartData();
+  }
+  
+  // Transform data to scatter chart format
+  private transformToScatterData(labels: any[], data: any[]): ChartDataset[] {
+    // For scatter charts, we need to transform the data into scatter format
+    // Scatter charts expect data in the format: {x: number, y: number}
+    console.log('Transforming data to scatter format:', { labels, data });
+    
+    // If we have the expected scatter data format, return it as is
+    if (data && data.length > 0 && data[0].data && data[0].data.length > 0 && 
+        typeof data[0].data[0] === 'object' && data[0].data[0].hasOwnProperty('x') && 
+        data[0].data[0].hasOwnProperty('y')) {
+      return data;
+    }
+    
+    // Transform the data properly for scatter chart
+    // Assuming labels are x-values and data[0].data are y-values
+    if (labels && data && data.length > 0 && data[0].data) {
+      const yValues = data[0].data;
+      const label = data[0].label || 'Dataset 1';
+      
+      // Create scatter points from labels (x) and data (y)
+      const scatterPoints = [];
+      const minLength = Math.min(labels.length, yValues.length);
+      
+      for (let i = 0; i < minLength; i++) {
+        // Convert to numbers if they're strings
+        const x = typeof labels[i] === 'string' ? parseFloat(labels[i]) : labels[i];
+        const y = typeof yValues[i] === 'string' ? parseFloat(yValues[i]) : yValues[i];
+        
+        // Only add valid points
+        if (!isNaN(x) && !isNaN(y)) {
+          scatterPoints.push({ x, y });
+        }
+      }
+      
+      // Generate different colors for each point to avoid all points showing the same color
+      const backgroundColors = [];
+      const borderColors = [];
+      
+      for (let i = 0; i < scatterPoints.length; i++) {
+        // Generate a color based on the point index for variety
+        const hue = (i * 137.508) % 360; // Use golden angle to spread colors
+        backgroundColors.push(`hsla(${hue}, 70%, 50%, 0.6)`);
+        borderColors.push(`hsla(${hue}, 70%, 40%, 1)`);
+      }
+      
+      // Create a single dataset with all scatter points
+      const scatterDatasets: ChartDataset[] = [
+        {
+          data: scatterPoints,
+          label: label,
+          pointRadius: 8,
+          pointHoverRadius: 10,
+          backgroundColor: backgroundColors,
+          borderColor: borderColors,
+          borderWidth: 1,
+          pointHoverBackgroundColor: 'rgba(255, 99, 132, 1)',
+        }
+      ];
+      
+      console.log('Transformed scatter data:', scatterDatasets);
+      return scatterDatasets;
+    }
+    
+    // Otherwise, create a default scatter dataset
+    const scatterDatasets: ChartDataset[] = [
+      {
+        data: [
+          { x: 1, y: 1 },
+          { x: 2, y: 3 },
+          { x: 3, y: -2 },
+          { x: 4, y: 4 },
+          { x: 5, y: -3 },
+        ],
+        label: 'Dataset 1',
+        pointRadius: 10,
+        backgroundColor: [
+          'red',
+          'green',
+          'blue',
+          'purple',
+          'yellow',
+          'brown',
+          'magenta',
+          'cyan',
+          'orange',
+          'pink'
+        ],
+      }
+    ];
+    
+    return scatterDatasets;
+  }
+
   fetchChartData(): void {
     // Set flag to prevent recursive calls
     this.isFetchingData = true;
@@ -139,7 +652,49 @@ export class ScatterChartComponent implements OnInit, OnChanges {
           filterParams = JSON.stringify(filterObj);
         }
       }
-      console.log('Base filter parameters:', filterParams);
+      
+      // Add common filters to filter parameters
+      const commonFilters = this.filterService.getFilterValues();
+      console.log('Common filters from service:', commonFilters);
+      
+      if (Object.keys(commonFilters).length > 0) {
+        // Merge common filters with base filters
+        const mergedFilterObj = {};
+        
+        // Add base filters first
+        if (filterParams) {
+          try {
+            const baseFilterObj = JSON.parse(filterParams);
+            Object.assign(mergedFilterObj, baseFilterObj);
+          } catch (e) {
+            console.warn('Failed to parse base filter parameters:', e);
+          }
+        }
+        
+        // Add common filters using the field name as the key, not the filter id
+        Object.keys(commonFilters).forEach(filterId => {
+          const filterValue = commonFilters[filterId];
+          // Find the filter definition to get the field name
+          const filterDef = this.filterService.getFilters().find(f => f.id === filterId);
+          if (filterDef && filterDef.field) {
+            const fieldName = filterDef.field;
+            if (filterValue !== undefined && filterValue !== null && filterValue !== '') {
+              mergedFilterObj[fieldName] = filterValue;
+            }
+          } else {
+            // Fallback to using filterId as field name if no field is defined
+            if (filterValue !== undefined && filterValue !== null && filterValue !== '') {
+              mergedFilterObj[filterId] = filterValue;
+            }
+          }
+        });
+        
+        if (Object.keys(mergedFilterObj).length > 0) {
+          filterParams = JSON.stringify(mergedFilterObj);
+        }
+      }
+      
+      console.log('Final filter parameters:', filterParams);
       
       // Log the URL that will be called
       const url = `chart/getdashjson/scatter?tableName=${this.table}&xAxis=${this.xAxis}&yAxes=${yAxisString}${this.connection ? `&sureId=${this.connection}` : ''}`;
@@ -165,11 +720,19 @@ export class ScatterChartComponent implements OnInit, OnChanges {
             // Scatter charts expect data in the format: {x: number, y: number}
             this.noDataAvailable = data.chartLabels.length === 0;
             this.scatterChartData = this.transformToScatterData(data.chartLabels, data.chartData);
+            
+            // Update chart options with axis titles
+            this.updateChartOptionsWithAxisTitles();
+            
             console.log('Updated scatter chart with data:', this.scatterChartData);
           } else if (data && data.labels && data.datasets) {
             // Handle the original expected format as fallback
             this.noDataAvailable = data.labels.length === 0;
             this.scatterChartData = data.datasets;
+            
+            // Update chart options with axis titles
+            this.updateChartOptionsWithAxisTitles();
+            
             console.log('Updated scatter chart with legacy data format:', this.scatterChartData);
           } else {
             console.warn('Scatter chart received data does not have expected structure', data);
@@ -197,6 +760,20 @@ export class ScatterChartComponent implements OnInit, OnChanges {
     }
   }
   
+  // Update chart options with axis titles
+  private updateChartOptionsWithAxisTitles(): void {
+    // Update X axis title
+    if (this.scatterChartOptions.scales && this.scatterChartOptions.scales.x) {
+      this.scatterChartOptions.scales.x.title.text = this.xAxis || 'X Axis';
+    }
+    
+    // Update Y axis title
+    if (this.scatterChartOptions.scales && this.scatterChartOptions.scales.y) {
+      const yAxisLabel = Array.isArray(this.yAxis) ? this.yAxis[0] : this.yAxis;
+      this.scatterChartOptions.scales.y.title.text = yAxisLabel || 'Y Axis';
+    }
+  }
+  
   // Fetch drilldown data based on current drilldown level
   fetchDrilldownData(): void {
     console.log('Fetching drilldown data, current level:', this.currentDrilldownLevel);
@@ -287,24 +864,34 @@ export class ScatterChartComponent implements OnInit, OnChanges {
       }
     }
     
-    // Convert drilldownFilters to filter parameters for drilldown level
-    let drilldownFilterParams = '';
-    if (this.drilldownFilters && this.drilldownFilters.length > 0) {
-      const filterObj = {};
-      this.drilldownFilters.forEach(filter => {
-        if (filter.field && filter.value) {
-          filterObj[filter.field] = filter.value;
+    // Add common filters to drilldown filter parameters
+    const commonFilters = this.filterService.getFilterValues();
+    if (Object.keys(commonFilters).length > 0) {
+      // Merge common filters with drilldown filters
+      const mergedFilterObj = {};
+      
+      // Add drilldown filters first
+      if (filterParams) {
+        try {
+          const drilldownFilterObj = JSON.parse(filterParams);
+          Object.assign(mergedFilterObj, drilldownFilterObj);
+        } catch (e) {
+          console.warn('Failed to parse drilldown filter parameters:', e);
+        }
+      }
+      
+      // Add common filters
+      Object.keys(commonFilters).forEach(key => {
+        const value = commonFilters[key];
+        if (value !== undefined && value !== null && value !== '') {
+          mergedFilterObj[key] = value;
         }
       });
-      if (Object.keys(filterObj).length > 0) {
-        drilldownFilterParams = JSON.stringify(filterObj);
+      
+      if (Object.keys(mergedFilterObj).length > 0) {
+        filterParams = JSON.stringify(mergedFilterObj);
       }
     }
-    console.log('Drilldown filter parameters:', drilldownFilterParams);
-    
-    // Use drilldown filters if available, otherwise use layer filters
-    const finalFilterParams = drilldownFilterParams || filterParams;
-    console.log('Final filter parameters:', finalFilterParams);
     
     // Log the URL that will be called
     const url = `chart/getdashjson/scatter?tableName=${actualApiUrl}&xAxis=${drilldownConfig.xAxis}&yAxes=${drilldownConfig.yAxis}${this.connection ? `&sureId=${this.connection}` : ''}`;
@@ -312,7 +899,7 @@ export class ScatterChartComponent implements OnInit, OnChanges {
     
     // Fetch data from the dashboard service with parameter field and value
     // Backend handles filtering, we just pass the parameter field and value
-    this.dashboardService.getChartData(actualApiUrl, 'scatter', drilldownConfig.xAxis, drilldownConfig.yAxis, this.connection, parameterField, parameterValue, finalFilterParams).subscribe(
+    this.dashboardService.getChartData(actualApiUrl, 'scatter', drilldownConfig.xAxis, drilldownConfig.yAxis, this.connection, parameterField, parameterValue, filterParams).subscribe(
       (data: any) => {
         console.log('Received drilldown data:', data);
         if (data === null) {
@@ -325,7 +912,6 @@ export class ScatterChartComponent implements OnInit, OnChanges {
         // Handle the actual data structure returned by the API
         if (data && data.chartLabels && data.chartData) {
           // For scatter charts, we need to transform the data into scatter format
-          // Scatter charts expect data in the format: {x: number, y: number}
           this.noDataAvailable = data.chartLabels.length === 0;
           this.scatterChartData = this.transformToScatterData(data.chartLabels, data.chartData);
           console.log('Updated scatter chart with drilldown data:', this.scatterChartData);
@@ -349,33 +935,6 @@ export class ScatterChartComponent implements OnInit, OnChanges {
     );
   }
   
-  // Transform chart data to scatter chart format
-  private transformToScatterData(labels: string[], datasets: any[]): ChartDataset[] {
-    // For scatter charts, we need to transform the data into scatter format
-    // Scatter charts expect data in the format: {x: number, y: number}
-    
-    // This is a simple transformation - in a real implementation, you might want to
-    // create a more sophisticated mapping based on your data structure
-    return datasets.map((dataset, index) => {
-      // Create scatter data points
-      const scatterData = labels.map((label, i) => {
-        // Use x-axis data as x coordinate, y-axis data as y coordinate
-        const xValue = dataset.data[i] || 0;
-        const yValue = i < datasets.length ? (datasets[i].data[index] || 0) : 0;
-        
-        return { x: xValue, y: yValue };
-      });
-      
-      return {
-        data: scatterData,
-        label: dataset.label || `Dataset ${index + 1}`,
-        backgroundColor: dataset.backgroundColor || `rgba(${Math.floor(Math.random() * 255)}, ${Math.floor(Math.random() * 255)}, ${Math.floor(Math.random() * 255)}, 0.6)`,
-        borderColor: dataset.borderColor || 'rgba(0, 0, 0, 1)',
-        pointRadius: dataset.pointRadius || 5
-      };
-    });
-  }
-  
   // Reset to original data (go back to base level)
   resetToOriginalData(): void {
     console.log('Resetting to original data');
@@ -436,16 +995,18 @@ export class ScatterChartComponent implements OnInit, OnChanges {
       // Get the index of the clicked element
       const clickedIndex = e.active[0].index;
       
-      // Get the label of the clicked element
-      // For scatter charts, we might not have labels in the same way as other charts
-      const clickedLabel = `Point ${clickedIndex}`;
+      // Get the dataset index
+      const datasetIndex = e.active[0].datasetIndex;
       
-      console.log('Clicked on scatter point:', { index: clickedIndex, label: clickedLabel });
+      // Get the data point
+      const dataPoint = this.scatterChartData[datasetIndex].data[clickedIndex];
+      
+      console.log('Clicked on scatter point:', { datasetIndex, clickedIndex, dataPoint });
       
       // If we're not at the base level, store original data
       if (this.currentDrilldownLevel === 0) {
         // Store original data before entering drilldown mode
-        this.originalScatterChartData = [...this.scatterChartData];
+        this.originalScatterChartData = JSON.parse(JSON.stringify(this.scatterChartData));
         console.log('Stored original data for drilldown');
       }
       
@@ -487,9 +1048,10 @@ export class ScatterChartComponent implements OnInit, OnChanges {
         // Add this click to the drilldown stack
         const stackEntry = {
           level: nextDrilldownLevel,
+          datasetIndex: datasetIndex,
           clickedIndex: clickedIndex,
-          clickedLabel: clickedLabel,
-          clickedValue: clickedLabel // Using label as value for now
+          dataPoint: dataPoint,
+          clickedValue: dataPoint // Using data point as value for now
         };
         
         this.drilldownStack.push(stackEntry);
@@ -513,6 +1075,12 @@ export class ScatterChartComponent implements OnInit, OnChanges {
   }
 
   public chartHovered(e: any): void {
-    console.log(e);
+    console.log('Scatter chart hovered:', e);
   }
-}  
+
+  ngOnDestroy(): void {
+    this.subscriptions.forEach(sub => sub.unsubscribe());
+    // Clean up document click handler
+    this.removeDocumentClickHandler();
+  }
+}
diff --git a/frontend/angular-clarity-master/src/app/modules/main/builder/dashboardnew/gadgets/shield-dashboard/README.md b/frontend/angular-clarity-master/src/app/modules/main/builder/dashboardnew/gadgets/shield-dashboard/README.md
new file mode 100644
index 0000000..beb38a0
--- /dev/null
+++ b/frontend/angular-clarity-master/src/app/modules/main/builder/dashboardnew/gadgets/shield-dashboard/README.md
@@ -0,0 +1,125 @@
+# Shield Dashboard
+
+A professional analytics dashboard UI similar to the "Shield Overall Dashboard" design.
+
+## Components
+
+### Layout
+- **Left Sidebar**: Contains application name, KPI metrics, and filter controls
+- **Main Dashboard Area**: Grid-based responsive layout with various data visualization components
+
+### Components
+
+1. **Sidebar Filters**
+   - Application header with title
+   - KPI metrics display (Total Leads, Total Deals)
+   - Filter controls (Sales Rep, Partner, Traction Channel, Sub Product Line)
+   - Reset filters button
+
+2. **Bar Chart**
+   - Title: "Deal Stage Wise Progress"
+   - Visualizes deal progress across different stages
+   - Responsive design with loading shimmer effect
+
+3. **Donut Charts**
+   - End Customer Stage Split
+   - Segment Penetration
+   - Interactive with tooltips
+
+4. **Map Chart**
+   - Dealer locations with colored markers
+   - Interactive hover tooltips showing dealer status
+   - Legend for status colors
+
+5. **Data Table**
+   - Cross/Up Selling Scope
+   - Scrollable with sticky header
+   - Alternating row colors
+   - Sortable columns
+   - Probability bars with color coding
+
+6. **Deal Details Card**
+   - Company Name, Stage, Description, Amount, Stage Days
+   - Color-coded deal stages
+   - Responsive grid layout
+
+7. **Quarterwise Flow**
+   - Placeholder for chart configuration
+   - "Chart configuration incomplete" message
+
+## Features
+
+### Responsiveness
+- Grid-based layout adapts to different screen sizes
+- Mobile-friendly design with stacked layout on small screens
+- Flexible components that resize appropriately
+
+### Filter Functionality
+- Global filters that affect all dashboard components
+- Shared state management using BehaviorSubject
+- Real-time updates when filters change
+- Reset filters functionality
+
+### Visual Design
+- Dark Navy Blue for headers and bars
+- Bright Orange for highlights and KPI boxes
+- White background for charts and tables
+- Modern color scheme with consistent styling
+
+### Interactive Elements
+- Chart tooltips on hover
+- Interactive map with dealer status information
+- Sortable data table
+- Loading shimmer effects during data updates
+
+## Technical Implementation
+
+### Technologies Used
+- Angular 16
+- Chart.js with ng2-charts
+- Clarity Design System
+- SCSS for styling
+
+### State Management
+- Shared service using BehaviorSubject for filter state
+- Reactive components that update based on filter changes
+- Simulated data updates (no backend integration)
+
+### Responsive Design
+- CSS Grid and Flexbox layouts
+- Media queries for different screen sizes
+- Relative units for scalable components
+
+## Component Structure
+
+```
+shield-dashboard/
+├── shield-dashboard.component.ts|.html|.scss
+├── services/
+│   └── dashboard-filter.service.ts
+├── components/
+│   ├── sidebar-filters/
+│   │   ├── sidebar-filters.component.ts|.html|.scss
+│   ├── bar-chart/
+│   │   ├── bar-chart.component.ts|.html|.scss
+│   ├── donut-chart/
+│   │   ├── donut-chart.component.ts|.html|.scss
+│   ├── map-chart/
+│   │   ├── map-chart.component.ts|.html|.scss
+│   ├── data-table/
+│   │   ├── data-table.component.ts|.html|.scss
+│   ├── deal-details-card/
+│   │   ├── deal-details-card.component.ts|.html|.scss
+│   ├── quarterwise-flow/
+│   │   ├── quarterwise-flow.component.ts|.html|.scss
+│   └── loading-shimmer/
+│       ├── loading-shimmer.component.ts|.html|.scss
+└── shield-dashboard-routing.module.ts
+```
+
+## Usage
+
+To navigate to the Shield Dashboard, visit:
+`/cns-portal/shield-dashboard`
+
+The dashboard is fully responsive and will adapt to different screen sizes. All components are interconnected through the shared filter service, so changing any filter will update all visualizations in real-time.
\ No newline at end of file
diff --git a/frontend/angular-clarity-master/src/app/modules/main/builder/dashboardnew/gadgets/shield-dashboard/components/bar-chart/bar-chart.component.html b/frontend/angular-clarity-master/src/app/modules/main/builder/dashboardnew/gadgets/shield-dashboard/components/bar-chart/bar-chart.component.html
new file mode 100644
index 0000000..39f22df
--- /dev/null
+++ b/frontend/angular-clarity-master/src/app/modules/main/builder/dashboardnew/gadgets/shield-dashboard/components/bar-chart/bar-chart.component.html
@@ -0,0 +1,20 @@
+<div class="chart-container">
+  <div class="chart-header">
+    <h3>Deal Stage Wise Progress</h3>
+  </div>
+  <div class="chart-wrapper">
+    <div class="chart-content" [class.loading]="isLoading">
+      <canvas 
+        baseChart 
+        [data]="barChartData"
+        [options]="barChartOptions"
+        [type]="barChartType"
+        (chartClick)="chartClicked($event)"
+        (chartHover)="chartHovered($event)">
+      </canvas>
+      <div class="loading-overlay" *ngIf="isLoading">
+        <div class="shimmer-bar"></div>
+      </div>
+    </div>
+  </div>
+</div>
\ No newline at end of file
diff --git a/frontend/angular-clarity-master/src/app/modules/main/builder/dashboardnew/gadgets/shield-dashboard/components/bar-chart/bar-chart.component.scss b/frontend/angular-clarity-master/src/app/modules/main/builder/dashboardnew/gadgets/shield-dashboard/components/bar-chart/bar-chart.component.scss
new file mode 100644
index 0000000..0f2b47c
--- /dev/null
+++ b/frontend/angular-clarity-master/src/app/modules/main/builder/dashboardnew/gadgets/shield-dashboard/components/bar-chart/bar-chart.component.scss
@@ -0,0 +1,70 @@
+.chart-container {
+  height: 100%;
+  display: flex;
+  flex-direction: column;
+  
+  .chart-header {
+    margin-bottom: 20px;
+    
+    h3 {
+      font-size: 18px;
+      font-weight: 600;
+      color: #0a192f;
+      margin: 0;
+    }
+  }
+  
+  .chart-wrapper {
+    flex: 1;
+    position: relative;
+    
+    .chart-content {
+      position: relative;
+      height: 100%;
+      
+      &.loading {
+        opacity: 0.7;
+        
+        canvas {
+          filter: blur(2px);
+        }
+      }
+      
+      canvas {
+        max-width: 100%;
+        max-height: 100%;
+        transition: filter 0.3s ease;
+      }
+      
+      .loading-overlay {
+        position: absolute;
+        top: 0;
+        left: 0;
+        right: 0;
+        bottom: 0;
+        display: flex;
+        align-items: center;
+        justify-content: center;
+        background: rgba(255, 255, 255, 0.8);
+        
+        .shimmer-bar {
+          width: 80%;
+          height: 20px;
+          background: linear-gradient(90deg, #f0f0f0 25%, #e0e0e0 50%, #f0f0f0 75%);
+          background-size: 200% 100%;
+          animation: shimmer 1.5s infinite;
+          border-radius: 4px;
+        }
+      }
+    }
+  }
+}
+
+@keyframes shimmer {
+  0% {
+    background-position: -200% 0;
+  }
+  100% {
+    background-position: 200% 0;
+  }
+}
\ No newline at end of file
diff --git a/frontend/angular-clarity-master/src/app/modules/main/builder/dashboardnew/gadgets/shield-dashboard/components/bar-chart/bar-chart.component.ts b/frontend/angular-clarity-master/src/app/modules/main/builder/dashboardnew/gadgets/shield-dashboard/components/bar-chart/bar-chart.component.ts
new file mode 100644
index 0000000..8ed0664
--- /dev/null
+++ b/frontend/angular-clarity-master/src/app/modules/main/builder/dashboardnew/gadgets/shield-dashboard/components/bar-chart/bar-chart.component.ts
@@ -0,0 +1,140 @@
+import { Component, OnInit, ViewChild, AfterViewInit, OnDestroy } from '@angular/core';
+import { BaseChartDirective } from 'ng2-charts';
+import { ChartConfiguration, ChartData, ChartEvent, ChartType } from 'chart.js';
+import { DashboardFilterService } from '../../services/dashboard-filter.service';
+import { Subscription } from 'rxjs';
+
+@Component({
+  selector: 'app-shield-bar-chart',
+  templateUrl: './bar-chart.component.html',
+  styleUrls: ['./bar-chart.component.scss']
+})
+export class BarChartComponent implements OnInit, AfterViewInit, OnDestroy {
+  @ViewChild(BaseChartDirective) chart?: BaseChartDirective;
+  
+  private filterSubscription: Subscription = new Subscription();
+  
+  // Loading state
+  isLoading: boolean = false;
+
+  public barChartOptions: ChartConfiguration['options'] = {
+    responsive: true,
+    maintainAspectRatio: false,
+    scales: {
+      x: {
+        grid: {
+          color: 'rgba(0, 0, 0, 0.05)'
+        },
+        ticks: {
+          color: '#64748b'
+        }
+      },
+      y: {
+        beginAtZero: true,
+        grid: {
+          color: 'rgba(0, 0, 0, 0.05)'
+        },
+        ticks: {
+          color: '#64748b'
+        }
+      }
+    },
+    plugins: {
+      legend: {
+        display: false
+      },
+      tooltip: {
+        backgroundColor: 'rgba(10, 25, 47, 0.9)',
+        titleColor: '#ff6b35',
+        bodyColor: '#ffffff',
+        borderColor: 'rgba(255, 107, 53, 0.3)',
+        borderWidth: 1,
+        cornerRadius: 6
+      }
+    }
+  };
+
+  public barChartType: ChartType = 'bar';
+  public barChartPlugins = [];
+
+  public barChartData: ChartData<'bar'> = {
+    labels: ['Prospecting', 'Qualification', 'Needs Analysis', 'Value Proposition', 'Decision Making', 'Negotiation'],
+    datasets: [
+      {
+        data: [65, 59, 80, 81, 56, 55],
+        label: 'Deal Progress',
+        backgroundColor: '#0a192f',
+        borderColor: '#0a192f',
+        borderWidth: 1,
+        borderRadius: 4
+      }
+    ]
+  };
+
+  constructor(private filterService: DashboardFilterService) { }
+
+  ngOnInit(): void {
+    // Subscribe to filter changes
+    this.filterSubscription.add(
+      this.filterService.filterState$.subscribe(filters => {
+        this.updateChartData(filters);
+      })
+    );
+  }
+
+  ngAfterViewInit(): void {
+    // Initial chart render
+    this.updateChart();
+  }
+  
+  ngOnDestroy(): void {
+    // Unsubscribe from all subscriptions
+    this.filterSubscription.unsubscribe();
+  }
+
+  // Update chart data based on filters
+  updateChartData(filters: any): void {
+    // Show loading state
+    this.isLoading = true;
+    
+    // Simulate data change based on filters
+    // In a real implementation, this would fetch new data from an API
+    const baseData = [65, 59, 80, 81, 56, 55];
+    
+    // Apply filter effects (simplified logic)
+    let multiplier = 1;
+    if (filters.salesRep) multiplier *= 0.9;
+    if (filters.partner) multiplier *= 0.85;
+    if (filters.tractionChannel) multiplier *= 0.95;
+    if (filters.subProductLine) multiplier *= 0.8;
+    
+    // Add a small delay to simulate loading
+    setTimeout(() => {
+      this.barChartData.datasets[0].data = baseData.map(value => 
+        Math.floor(value * multiplier)
+      );
+      
+      // Update chart
+      this.updateChart();
+      
+      // Hide loading state
+      this.isLoading = false;
+    }, 300);
+  }
+
+  // Update chart with new data
+  updateChart(): void {
+    if (this.chart) {
+      this.chart.update();
+    }
+  }
+
+  // events
+  public chartClicked({ event, active }: { event?: ChartEvent, active?: {}[] }): void {
+    console.log(event, active);
+  }
+
+  public chartHovered({ event, active }: { event?: ChartEvent, active?: {}[] }): void {
+    console.log(event, active);
+  }
+}
\ No newline at end of file
diff --git a/frontend/angular-clarity-master/src/app/modules/main/builder/dashboardnew/gadgets/shield-dashboard/components/data-table/data-table.component.html b/frontend/angular-clarity-master/src/app/modules/main/builder/dashboardnew/gadgets/shield-dashboard/components/data-table/data-table.component.html
new file mode 100644
index 0000000..b637376
--- /dev/null
+++ b/frontend/angular-clarity-master/src/app/modules/main/builder/dashboardnew/gadgets/shield-dashboard/components/data-table/data-table.component.html
@@ -0,0 +1,78 @@
+<div class="table-container">
+  <div class="table-header">
+    <h3>Cross/Up Selling Scope</h3>
+  </div>
+  <div class="table-wrapper">
+    <table class="data-table">
+      <thead>
+        <tr>
+          <th (click)="sortTable('companyName')" class="sortable">
+            Company Name
+            <span class="sort-indicator" *ngIf="sortColumn === 'companyName'">
+              <clr-icon *ngIf="sortDirection === 'asc'" shape="arrow up"></clr-icon>
+              <clr-icon *ngIf="sortDirection === 'desc'" shape="arrow down"></clr-icon>
+            </span>
+          </th>
+          <th (click)="sortTable('contactPerson')" class="sortable">
+            Contact Person
+            <span class="sort-indicator" *ngIf="sortColumn === 'contactPerson'">
+              <clr-icon *ngIf="sortDirection === 'asc'" shape="arrow up"></clr-icon>
+              <clr-icon *ngIf="sortDirection === 'desc'" shape="arrow down"></clr-icon>
+            </span>
+          </th>
+          <th (click)="sortTable('product')" class="sortable">
+            Product
+            <span class="sort-indicator" *ngIf="sortColumn === 'product'">
+              <clr-icon *ngIf="sortDirection === 'asc'" shape="arrow up"></clr-icon>
+              <clr-icon *ngIf="sortDirection === 'desc'" shape="arrow down"></clr-icon>
+            </span>
+          </th>
+          <th (click)="sortTable('potentialValue')" class="sortable">
+            Potential Value
+            <span class="sort-indicator" *ngIf="sortColumn === 'potentialValue'">
+              <clr-icon *ngIf="sortDirection === 'asc'" shape="arrow up"></clr-icon>
+              <clr-icon *ngIf="sortDirection === 'desc'" shape="arrow down"></clr-icon>
+            </span>
+          </th>
+          <th (click)="sortTable('probability')" class="sortable">
+            Probability
+            <span class="sort-indicator" *ngIf="sortColumn === 'probability'">
+              <clr-icon *ngIf="sortDirection === 'asc'" shape="arrow up"></clr-icon>
+              <clr-icon *ngIf="sortDirection === 'desc'" shape="arrow down"></clr-icon>
+            </span>
+          </th>
+          <th (click)="sortTable('nextAction')" class="sortable">
+            Next Action
+            <span class="sort-indicator" *ngIf="sortColumn === 'nextAction'">
+              <clr-icon *ngIf="sortDirection === 'asc'" shape="arrow up"></clr-icon>
+              <clr-icon *ngIf="sortDirection === 'desc'" shape="arrow down"></clr-icon>
+            </span>
+          </th>
+          <th (click)="sortTable('actionDate')" class="sortable">
+            Action Date
+            <span class="sort-indicator" *ngIf="sortColumn === 'actionDate'">
+              <clr-icon *ngIf="sortDirection === 'asc'" shape="arrow up"></clr-icon>
+              <clr-icon *ngIf="sortDirection === 'desc'" shape="arrow down"></clr-icon>
+            </span>
+          </th>
+        </tr>
+      </thead>
+      <tbody>
+        <tr *ngFor="let item of crossSellingData; let i = index" [class.even]="i % 2 === 0">
+          <td>{{ item.companyName }}</td>
+          <td>{{ item.contactPerson }}</td>
+          <td>{{ item.product }}</td>
+          <td>{{ formatCurrency(item.potentialValue) }}</td>
+          <td>
+            <div class="probability-bar">
+              <div class="probability-fill" [style.width.%]="item.probability" [style.background-color]="item.probability > 70 ? '#0a192f' : item.probability > 50 ? '#ff6b35' : '#64748b'"></div>
+              <span class="probability-text">{{ formatProbability(item.probability) }}</span>
+            </div>
+          </td>
+          <td>{{ item.nextAction }}</td>
+          <td>{{ item.actionDate }}</td>
+        </tr>
+      </tbody>
+    </table>
+  </div>
+</div>
\ No newline at end of file
diff --git a/frontend/angular-clarity-master/src/app/modules/main/builder/dashboardnew/gadgets/shield-dashboard/components/data-table/data-table.component.scss b/frontend/angular-clarity-master/src/app/modules/main/builder/dashboardnew/gadgets/shield-dashboard/components/data-table/data-table.component.scss
new file mode 100644
index 0000000..59a1454
--- /dev/null
+++ b/frontend/angular-clarity-master/src/app/modules/main/builder/dashboardnew/gadgets/shield-dashboard/components/data-table/data-table.component.scss
@@ -0,0 +1,107 @@
+.table-container {
+  height: 100%;
+  display: flex;
+  flex-direction: column;
+  
+  .table-header {
+    margin-bottom: 20px;
+    
+    h3 {
+      font-size: 18px;
+      font-weight: 600;
+      color: #0a192f;
+      margin: 0;
+    }
+  }
+  
+  .table-wrapper {
+    flex: 1;
+    overflow: auto;
+    
+    .data-table {
+      width: 100%;
+      border-collapse: collapse;
+      background: white;
+      
+      thead {
+        background: #f1f5f9;
+        position: sticky;
+        top: 0;
+        z-index: 5;
+        
+        th {
+          padding: 12px 15px;
+          text-align: left;
+          font-weight: 600;
+          color: #0a192f;
+          border-bottom: 2px solid #e2e8f0;
+          cursor: pointer;
+          user-select: none;
+          position: relative;
+          
+          &:hover {
+            background: #e2e8f0;
+          }
+          
+          &.sortable {
+            padding-right: 30px;
+          }
+          
+          .sort-indicator {
+            position: absolute;
+            right: 10px;
+            top: 50%;
+            transform: translateY(-50%);
+            color: #ff6b35;
+          }
+        }
+      }
+      
+      tbody {
+        tr {
+          border-bottom: 1px solid #e2e8f0;
+          
+          &.even {
+            background: #f8fafc;
+          }
+          
+          &:hover {
+            background: #f1f5f9;
+          }
+          
+          td {
+            padding: 12px 15px;
+            color: #334155;
+            font-size: 14px;
+            
+            .probability-bar {
+              position: relative;
+              width: 100%;
+              height: 20px;
+              background: #e2e8f0;
+              border-radius: 10px;
+              overflow: hidden;
+              
+              .probability-fill {
+                height: 100%;
+                border-radius: 10px;
+                transition: width 0.3s ease;
+              }
+              
+              .probability-text {
+                position: absolute;
+                top: 50%;
+                left: 50%;
+                transform: translate(-50%, -50%);
+                font-size: 12px;
+                font-weight: 500;
+                color: white;
+                text-shadow: 0 1px 1px rgba(0, 0, 0, 0.5);
+              }
+            }
+          }
+        }
+      }
+    }
+  }
+}
\ No newline at end of file
diff --git a/frontend/angular-clarity-master/src/app/modules/main/builder/dashboardnew/gadgets/shield-dashboard/components/data-table/data-table.component.ts b/frontend/angular-clarity-master/src/app/modules/main/builder/dashboardnew/gadgets/shield-dashboard/components/data-table/data-table.component.ts
new file mode 100644
index 0000000..3c1f598
--- /dev/null
+++ b/frontend/angular-clarity-master/src/app/modules/main/builder/dashboardnew/gadgets/shield-dashboard/components/data-table/data-table.component.ts
@@ -0,0 +1,117 @@
+import { Component, OnInit, OnDestroy } from '@angular/core';
+import { DashboardFilterService } from '../../services/dashboard-filter.service';
+import { Subscription } from 'rxjs';
+
+interface CrossSellingItem {
+  id: number;
+  companyName: string;
+  contactPerson: string;
+  product: string;
+  potentialValue: number;
+  probability: number;
+  nextAction: string;
+  actionDate: string;
+}
+
+@Component({
+  selector: 'app-shield-data-table',
+  templateUrl: './data-table.component.html',
+  styleUrls: ['./data-table.component.scss']
+})
+export class DataTableComponent implements OnInit, OnDestroy {
+  private filterSubscription: Subscription = new Subscription();
+  
+  // Mock data for cross/up selling scope
+  originalCrossSellingData: CrossSellingItem[] = [
+    { id: 1, companyName: 'Tech Solutions Inc', contactPerson: 'John Smith', product: 'Product A', potentialValue: 50000, probability: 75, nextAction: 'Follow-up call', actionDate: '2023-06-15' },
+    { id: 2, companyName: 'Global Enterprises', contactPerson: 'Sarah Johnson', product: 'Product B', potentialValue: 75000, probability: 60, nextAction: 'Send proposal', actionDate: '2023-06-18' },
+    { id: 3, companyName: 'Innovative Systems', contactPerson: 'Mike Brown', product: 'Product C', potentialValue: 30000, probability: 85, nextAction: 'Demo scheduled', actionDate: '2023-06-20' },
+    { id: 4, companyName: 'Future Tech Ltd', contactPerson: 'Emily Davis', product: 'Product A', potentialValue: 45000, probability: 70, nextAction: 'Send quote', actionDate: '2023-06-22' },
+    { id: 5, companyName: 'Digital Dynamics', contactPerson: 'Robert Wilson', product: 'Product B', potentialValue: 60000, probability: 55, nextAction: 'Meeting scheduled', actionDate: '2023-06-25' },
+    { id: 6, companyName: 'Alpha Solutions', contactPerson: 'Lisa Miller', product: 'Product C', potentialValue: 40000, probability: 80, nextAction: 'Follow-up email', actionDate: '2023-06-28' },
+    { id: 7, companyName: 'Beta Innovations', contactPerson: 'David Taylor', product: 'Product A', potentialValue: 55000, probability: 65, nextAction: 'Product demo', actionDate: '2023-06-28' },
+    { id: 8, companyName: 'Gamma Technologies', contactPerson: 'Jennifer Anderson', product: 'Product B', potentialValue: 70000, probability: 50, nextAction: 'Proposal review', actionDate: '2023-07-05' }
+  ];
+  
+  crossSellingData: CrossSellingItem[] = [...this.originalCrossSellingData];
+
+  // Sorting properties
+  sortColumn: keyof CrossSellingItem = 'companyName';
+  sortDirection: 'asc' | 'desc' = 'asc';
+
+  constructor(private filterService: DashboardFilterService) { }
+
+  ngOnInit(): void {
+    // Subscribe to filter changes
+    this.filterSubscription.add(
+      this.filterService.filterState$.subscribe(filters => {
+        this.updateTableData(filters);
+      })
+    );
+  }
+  
+  ngOnDestroy(): void {
+    // Unsubscribe from all subscriptions
+    this.filterSubscription.unsubscribe();
+  }
+
+  // Update table data based on filters
+  updateTableData(filters: any): void {
+    // Simulate data change based on filters
+    // In a real implementation, this would fetch new data from an API
+    
+    if (filters.salesRep || filters.partner || filters.tractionChannel || filters.subProductLine) {
+      // Apply filter effects (simplified logic)
+      const filteredData = this.originalCrossSellingData.filter(item => {
+        // Simple filtering logic - in a real app, this would be more sophisticated
+        return Math.random() > 0.3; // Randomly filter out some items
+      });
+      
+      this.crossSellingData = filteredData;
+    } else {
+      // No filters applied, show all data
+      this.crossSellingData = [...this.originalCrossSellingData];
+    }
+    
+    // Re-apply current sorting
+    this.sortTable(this.sortColumn);
+  }
+
+  // Sort table by column
+  sortTable(column: keyof CrossSellingItem): void {
+    if (this.sortColumn === column) {
+      this.sortDirection = this.sortDirection === 'asc' ? 'desc' : 'asc';
+    } else {
+      this.sortColumn = column;
+      this.sortDirection = 'asc';
+    }
+
+    this.crossSellingData.sort((a, b) => {
+      const aValue = a[column];
+      const bValue = b[column];
+
+      if (aValue < bValue) {
+        return this.sortDirection === 'asc' ? -1 : 1;
+      }
+      if (aValue > bValue) {
+        return this.sortDirection === 'asc' ? 1 : -1;
+      }
+      return 0;
+    });
+  }
+
+  // Format currency
+  formatCurrency(value: number): string {
+    return new Intl.NumberFormat('en-US', {
+      style: 'currency',
+      currency: 'USD',
+      minimumFractionDigits: 0,
+      maximumFractionDigits: 0
+    }).format(value);
+  }
+
+  // Format probability as percentage
+  formatProbability(probability: number): string {
+    return `${probability}%`;
+  }
+}
\ No newline at end of file
diff --git a/frontend/angular-clarity-master/src/app/modules/main/builder/dashboardnew/gadgets/shield-dashboard/components/deal-details-card/deal-details-card.component.html b/frontend/angular-clarity-master/src/app/modules/main/builder/dashboardnew/gadgets/shield-dashboard/components/deal-details-card/deal-details-card.component.html
new file mode 100644
index 0000000..f02e7af
--- /dev/null
+++ b/frontend/angular-clarity-master/src/app/modules/main/builder/dashboardnew/gadgets/shield-dashboard/components/deal-details-card/deal-details-card.component.html
@@ -0,0 +1,36 @@
+<div class="deal-details-container">
+  <div class="deal-details-header">
+    <h3>Deal Details</h3>
+  </div>
+  <div class="deal-cards">
+    <div class="deal-card" *ngFor="let deal of dealDetails">
+      <div class="deal-header">
+        <div class="company-name">{{ deal.companyName }}</div>
+        <div class="deal-stage" [style.background-color]="getStageColor(deal.stage)">
+          {{ deal.stage }}
+        </div>
+      </div>
+      <div class="deal-description">
+        {{ deal.description }}
+      </div>
+      <div class="deal-info">
+        <div class="info-item">
+          <div class="info-label">Amount</div>
+          <div class="info-value">{{ formatCurrency(deal.amount) }}</div>
+        </div>
+        <div class="info-item">
+          <div class="info-label">Stage Days</div>
+          <div class="info-value">{{ deal.stageDays }} days</div>
+        </div>
+        <div class="info-item">
+          <div class="info-label">Contact</div>
+          <div class="info-value">{{ deal.contactPerson }}</div>
+        </div>
+        <div class="info-item">
+          <div class="info-label">Last Contact</div>
+          <div class="info-value">{{ deal.lastContact }}</div>
+        </div>
+      </div>
+    </div>
+  </div>
+</div>
\ No newline at end of file
diff --git a/frontend/angular-clarity-master/src/app/modules/main/builder/dashboardnew/gadgets/shield-dashboard/components/deal-details-card/deal-details-card.component.scss b/frontend/angular-clarity-master/src/app/modules/main/builder/dashboardnew/gadgets/shield-dashboard/components/deal-details-card/deal-details-card.component.scss
new file mode 100644
index 0000000..e82e719
--- /dev/null
+++ b/frontend/angular-clarity-master/src/app/modules/main/builder/dashboardnew/gadgets/shield-dashboard/components/deal-details-card/deal-details-card.component.scss
@@ -0,0 +1,102 @@
+.deal-details-container {
+  height: 100%;
+  display: flex;
+  flex-direction: column;
+  
+  .deal-details-header {
+    margin-bottom: 20px;
+    
+    h3 {
+      font-size: 18px;
+      font-weight: 600;
+      color: #0a192f;
+      margin: 0;
+    }
+  }
+  
+  .deal-cards {
+    flex: 1;
+    display: flex;
+    flex-direction: column;
+    gap: 15px;
+    overflow-y: auto;
+    
+    .deal-card {
+      background: white;
+      border-radius: 10px;
+      padding: 20px;
+      box-shadow: 0 2px 8px rgba(0, 0, 0, 0.05);
+      border: 1px solid #e2e8f0;
+      transition: transform 0.2s ease, box-shadow 0.2s ease;
+      
+      &:hover {
+        transform: translateY(-2px);
+        box-shadow: 0 4px 12px rgba(0, 0, 0, 0.1);
+      }
+      
+      .deal-header {
+        display: flex;
+        justify-content: space-between;
+        align-items: flex-start;
+        margin-bottom: 15px;
+        
+        .company-name {
+          font-size: 18px;
+          font-weight: 600;
+          color: #0a192f;
+          flex: 1;
+        }
+        
+        .deal-stage {
+          padding: 6px 12px;
+          border-radius: 20px;
+          font-size: 12px;
+          font-weight: 500;
+          color: white;
+          text-align: center;
+          min-width: 120px;
+        }
+      }
+      
+      .deal-description {
+        color: #64748b;
+        font-size: 14px;
+        line-height: 1.5;
+        margin-bottom: 20px;
+      }
+      
+      .deal-info {
+        display: grid;
+        grid-template-columns: repeat(2, 1fr);
+        gap: 15px;
+        
+        .info-item {
+          .info-label {
+            font-size: 12px;
+            color: #94a3b8;
+            margin-bottom: 4px;
+          }
+          
+          .info-value {
+            font-size: 14px;
+            font-weight: 500;
+            color: #0a192f;
+          }
+        }
+      }
+    }
+  }
+}
+
+// Responsive design
+@media (max-width: 768px) {
+  .deal-details-container {
+    .deal-cards {
+      .deal-card {
+        .deal-info {
+          grid-template-columns: 1fr;
+        }
+      }
+    }
+  }
+}
\ No newline at end of file
diff --git a/frontend/angular-clarity-master/src/app/modules/main/builder/dashboardnew/gadgets/shield-dashboard/components/deal-details-card/deal-details-card.component.ts b/frontend/angular-clarity-master/src/app/modules/main/builder/dashboardnew/gadgets/shield-dashboard/components/deal-details-card/deal-details-card.component.ts
new file mode 100644
index 0000000..66bfe5a
--- /dev/null
+++ b/frontend/angular-clarity-master/src/app/modules/main/builder/dashboardnew/gadgets/shield-dashboard/components/deal-details-card/deal-details-card.component.ts
@@ -0,0 +1,119 @@
+import { Component, OnInit, OnDestroy } from '@angular/core';
+import { DashboardFilterService } from '../../services/dashboard-filter.service';
+import { Subscription } from 'rxjs';
+
+interface DealDetail {
+  id: number;
+  companyName: string;
+  stage: string;
+  description: string;
+  amount: number;
+  stageDays: number;
+  contactPerson: string;
+  lastContact: string;
+}
+
+@Component({
+  selector: 'app-shield-deal-details-card',
+  templateUrl: './deal-details-card.component.html',
+  styleUrls: ['./deal-details-card.component.scss']
+})
+export class DealDetailsCardComponent implements OnInit, OnDestroy {
+  private filterSubscription: Subscription = new Subscription();
+  
+  // Mock deal details data
+  originalDealDetails: DealDetail[] = [
+    {
+      id: 1,
+      companyName: 'Tech Solutions Inc',
+      stage: 'Negotiation',
+      description: 'Enterprise software solution for HR management',
+      amount: 125000,
+      stageDays: 15,
+      contactPerson: 'John Smith',
+      lastContact: '2023-06-10'
+    },
+    {
+      id: 2,
+      companyName: 'Global Enterprises',
+      stage: 'Decision Making',
+      description: 'Cloud infrastructure services migration',
+      amount: 85000,
+      stageDays: 8,
+      contactPerson: 'Sarah Johnson',
+      lastContact: '2023-06-12'
+    },
+    {
+      id: 3,
+      companyName: 'Innovative Systems',
+      stage: 'Value Proposition',
+      description: 'Custom AI implementation for logistics',
+      amount: 210000,
+      stageDays: 22,
+      contactPerson: 'Mike Brown',
+      lastContact: '2023-06-05'
+    }
+  ];
+  
+  dealDetails: DealDetail[] = [...this.originalDealDetails];
+
+  // Stage colors
+  stageColors: { [key: string]: string } = {
+    'Prospecting': '#93c5fd',
+    'Qualification': '#60a5fa',
+    'Needs Analysis': '#3b82f6',
+    'Value Proposition': '#1d4ed8',
+    'Decision Making': '#0a192f',
+    'Negotiation': '#ff6b35'
+  };
+
+  constructor(private filterService: DashboardFilterService) { }
+
+  ngOnInit(): void {
+    // Subscribe to filter changes
+    this.filterSubscription.add(
+      this.filterService.filterState$.subscribe(filters => {
+        this.updateDealData(filters);
+      })
+    );
+  }
+  
+  ngOnDestroy(): void {
+    // Unsubscribe from all subscriptions
+    this.filterSubscription.unsubscribe();
+  }
+
+  // Update deal data based on filters
+  updateDealData(filters: any): void {
+    // Simulate data change based on filters
+    // In a real implementation, this would fetch new data from an API
+    
+    if (filters.salesRep || filters.partner || filters.tractionChannel || filters.subProductLine) {
+      // Apply filter effects (simplified logic)
+      const filteredData = this.originalDealDetails.filter(item => {
+        // Simple filtering logic - in a real app, this would be more sophisticated
+        return Math.random() > 0.2; // Randomly filter out some items
+      });
+      
+      this.dealDetails = filteredData;
+    } else {
+      // No filters applied, show all data
+      this.dealDetails = [...this.originalDealDetails];
+    }
+  }
+
+  // Get stage color
+  getStageColor(stage: string): string {
+    return this.stageColors[stage] || '#64748b';
+  }
+
+  // Format currency
+  formatCurrency(value: number): string {
+    return new Intl.NumberFormat('en-US', {
+      style: 'currency',
+      currency: 'USD',
+      minimumFractionDigits: 0,
+      maximumFractionDigits: 0
+    }).format(value);
+  }
+}
\ No newline at end of file
diff --git a/frontend/angular-clarity-master/src/app/modules/main/builder/dashboardnew/gadgets/shield-dashboard/components/donut-chart/donut-chart.component.html b/frontend/angular-clarity-master/src/app/modules/main/builder/dashboardnew/gadgets/shield-dashboard/components/donut-chart/donut-chart.component.html
new file mode 100644
index 0000000..2d1d1df
--- /dev/null
+++ b/frontend/angular-clarity-master/src/app/modules/main/builder/dashboardnew/gadgets/shield-dashboard/components/donut-chart/donut-chart.component.html
@@ -0,0 +1,21 @@
+<div class="chart-container">
+  <div class="chart-header">
+    <h3>{{ chartTitle }}</h3>
+  </div>
+  <div class="chart-wrapper">
+    <div class="chart-content" [class.loading]="isLoading">
+      <canvas 
+        baseChart 
+        [datasets]="chartData.datasets"
+        [labels]="chartData.labels"
+        [options]="donutChartOptions"
+        [type]="donutChartType"
+        (chartClick)="chartClicked($event)"
+        (chartHover)="chartHovered($event)">
+      </canvas>
+      <div class="loading-overlay" *ngIf="isLoading">
+        <div class="shimmer-donut"></div>
+      </div>
+    </div>
+  </div>
+</div>
\ No newline at end of file
diff --git a/frontend/angular-clarity-master/src/app/modules/main/builder/dashboardnew/gadgets/shield-dashboard/components/donut-chart/donut-chart.component.scss b/frontend/angular-clarity-master/src/app/modules/main/builder/dashboardnew/gadgets/shield-dashboard/components/donut-chart/donut-chart.component.scss
new file mode 100644
index 0000000..b30144f
--- /dev/null
+++ b/frontend/angular-clarity-master/src/app/modules/main/builder/dashboardnew/gadgets/shield-dashboard/components/donut-chart/donut-chart.component.scss
@@ -0,0 +1,70 @@
+.chart-container {
+  height: 100%;
+  display: flex;
+  flex-direction: column;
+  
+  .chart-header {
+    margin-bottom: 20px;
+    
+    h3 {
+      font-size: 18px;
+      font-weight: 600;
+      color: #0a192f;
+      margin: 0;
+    }
+  }
+  
+  .chart-wrapper {
+    flex: 1;
+    position: relative;
+    
+    .chart-content {
+      position: relative;
+      height: 100%;
+      
+      &.loading {
+        opacity: 0.7;
+        
+        canvas {
+          filter: blur(2px);
+        }
+      }
+      
+      canvas {
+        max-width: 100%;
+        max-height: 100%;
+        transition: filter 0.3s ease;
+      }
+      
+      .loading-overlay {
+        position: absolute;
+        top: 0;
+        left: 0;
+        right: 0;
+        bottom: 0;
+        display: flex;
+        align-items: center;
+        justify-content: center;
+        background: rgba(255, 255, 255, 0.8);
+        
+        .shimmer-donut {
+          width: 120px;
+          height: 120px;
+          border-radius: 50%;
+          background: linear-gradient(90deg, #f0f0f0 25%, #e0e0e0 50%, #f0f0f0 75%);
+          background-size: 200% 100%;
+          animation: shimmer 1.5s infinite;
+        }
+      }
+    }
+  }
+}
+
+@keyframes shimmer {
+  0% {
+    background-position: -200% 0;
+  }
+  100% {
+    background-position: 200% 0;
+  }
+}
\ No newline at end of file
diff --git a/frontend/angular-clarity-master/src/app/modules/main/builder/dashboardnew/gadgets/shield-dashboard/components/donut-chart/donut-chart.component.ts b/frontend/angular-clarity-master/src/app/modules/main/builder/dashboardnew/gadgets/shield-dashboard/components/donut-chart/donut-chart.component.ts
new file mode 100644
index 0000000..f986f07
--- /dev/null
+++ b/frontend/angular-clarity-master/src/app/modules/main/builder/dashboardnew/gadgets/shield-dashboard/components/donut-chart/donut-chart.component.ts
@@ -0,0 +1,195 @@
+import { Component, Input, OnInit, ViewChild, OnDestroy } from '@angular/core';
+import { BaseChartDirective } from 'ng2-charts';
+import { ChartConfiguration, ChartData, ChartEvent, ChartType } from 'chart.js';
+import { DashboardFilterService } from '../../services/dashboard-filter.service';
+import { Subscription } from 'rxjs';
+
+@Component({
+  selector: 'app-shield-donut-chart',
+  templateUrl: './donut-chart.component.html',
+  styleUrls: ['./donut-chart.component.scss']
+})
+export class DonutChartComponent implements OnInit, OnDestroy {
+  @Input() chartType: 'endCustomer' | 'segmentPenetration' = 'endCustomer';
+  
+  @ViewChild(BaseChartDirective) chart?: BaseChartDirective;
+  
+  private filterSubscription: Subscription = new Subscription();
+  
+  // Loading state
+  isLoading: boolean = false;
+
+  public donutChartOptions: ChartConfiguration['options'] = {
+    responsive: true,
+    maintainAspectRatio: false,
+    plugins: {
+      legend: {
+        display: true,
+        position: 'bottom',
+        labels: {
+          color: '#64748b',
+          font: {
+            size: 12
+          },
+          padding: 20
+        }
+      },
+      tooltip: {
+        backgroundColor: 'rgba(10, 25, 47, 0.9)',
+        titleColor: '#ff6b35',
+        bodyColor: '#ffffff',
+        borderColor: 'rgba(255, 107, 53, 0.3)',
+        borderWidth: 1,
+        cornerRadius: 6,
+        callbacks: {
+          label: function(context) {
+            const label = context.label || '';
+            const value = context.parsed;
+            return `${label}: ${value}`;
+          }
+        }
+      }
+    }
+  };
+
+  public donutChartType: ChartType = 'doughnut';
+  public donutChartPlugins = [];
+
+  // Data for End Customer Stage Split
+  public endCustomerData: ChartData<'doughnut'> = {
+    labels: ['Prospecting', 'Qualification', 'Needs Analysis', 'Value Proposition', 'Decision Making'],
+    datasets: [
+      {
+        data: [30, 25, 20, 15, 10],
+        backgroundColor: [
+          '#0a192f',
+          '#1e3a8a',
+          '#3b82f6',
+          '#60a5fa',
+          '#93c5fd'
+        ],
+        hoverBackgroundColor: [
+          '#1e3a8a',
+          '#3b82f6',
+          '#60a5fa',
+          '#93c5fd',
+          '#bfdbfe'
+        ],
+        borderWidth: 0
+      }
+    ]
+  };
+
+  // Data for Segment Penetration
+  public segmentPenetrationData: ChartData<'doughnut'> = {
+    labels: ['Enterprise', 'Mid-Market', 'SMB', 'Startup'],
+    datasets: [
+      {
+        data: [40, 30, 20, 10],
+        backgroundColor: [
+          '#ff6b35',
+          '#ff8c66',
+          '#ffb099',
+          '#ffd6cc'
+        ],
+        hoverBackgroundColor: [
+          '#ff8c66',
+          '#ffb099',
+          '#ffd6cc',
+          '#ffffff'
+        ],
+        borderWidth: 0
+      }
+    ]
+  };
+
+  constructor(private filterService: DashboardFilterService) { }
+
+  ngOnInit(): void {
+    // Subscribe to filter changes
+    this.filterSubscription.add(
+      this.filterService.filterState$.subscribe(filters => {
+        this.updateChartData(filters);
+      })
+    );
+  }
+  
+  ngOnDestroy(): void {
+    // Unsubscribe from all subscriptions
+    this.filterSubscription.unsubscribe();
+  }
+
+  // Get chart data based on chart type
+  get chartData(): ChartData<'doughnut'> {
+    return this.chartType === 'endCustomer' ? this.endCustomerData : this.segmentPenetrationData;
+  }
+
+  // Get chart title based on chart type
+  get chartTitle(): string {
+    return this.chartType === 'endCustomer' 
+      ? 'End Customer Stage Split' 
+      : 'Segment Penetration';
+  }
+
+  // Update chart data based on filters
+  updateChartData(filters: any): void {
+    // Show loading state
+    this.isLoading = true;
+    
+    // Simulate data change based on filters
+    // In a real implementation, this would fetch new data from an API
+    
+    // Add a small delay to simulate loading
+    setTimeout(() => {
+      if (this.chartType === 'endCustomer') {
+        const baseData = [30, 25, 20, 15, 10];
+        
+        // Apply filter effects (simplified logic)
+        let multiplier = 1;
+        if (filters.salesRep) multiplier *= 0.9;
+        if (filters.partner) multiplier *= 0.85;
+        if (filters.tractionChannel) multiplier *= 0.95;
+        if (filters.subProductLine) multiplier *= 0.8;
+        
+        this.endCustomerData.datasets[0].data = baseData.map(value => 
+          Math.floor(value * multiplier)
+        );
+      } else {
+        const baseData = [40, 30, 20, 10];
+        
+        // Apply filter effects (simplified logic)
+        let multiplier = 1;
+        if (filters.salesRep) multiplier *= 0.85;
+        if (filters.partner) multiplier *= 0.9;
+        if (filters.tractionChannel) multiplier *= 0.95;
+        if (filters.subProductLine) multiplier *= 0.75;
+        
+        this.segmentPenetrationData.datasets[0].data = baseData.map(value => 
+          Math.floor(value * multiplier)
+        );
+      }
+      
+      // Update chart
+      this.updateChart();
+      
+      // Hide loading state
+      this.isLoading = false;
+    }, 300);
+  }
+
+  // Update chart with new data
+  updateChart(): void {
+    if (this.chart) {
+      this.chart.update();
+    }
+  }
+
+  // events
+  public chartClicked({ event, active }: { event?: ChartEvent, active?: {}[] }): void {
+    console.log(event, active);
+  }
+
+  public chartHovered({ event, active }: { event?: ChartEvent, active?: {}[] }): void {
+    console.log(event, active);
+  }
+}
\ No newline at end of file
diff --git a/frontend/angular-clarity-master/src/app/modules/main/builder/dashboardnew/gadgets/shield-dashboard/components/loading-shimmer/loading-shimmer.component.scss b/frontend/angular-clarity-master/src/app/modules/main/builder/dashboardnew/gadgets/shield-dashboard/components/loading-shimmer/loading-shimmer.component.scss
new file mode 100644
index 0000000..a365e59
--- /dev/null
+++ b/frontend/angular-clarity-master/src/app/modules/main/builder/dashboardnew/gadgets/shield-dashboard/components/loading-shimmer/loading-shimmer.component.scss
@@ -0,0 +1,45 @@
+.shimmer-container {
+  position: relative;
+  overflow: hidden;
+  
+  .shimmer-content {
+    transition: opacity 0.3s ease;
+  }
+  
+  .shimmer-overlay {
+    position: absolute;
+    top: 0;
+    left: 0;
+    right: 0;
+    bottom: 0;
+    background: rgba(255, 255, 255, 0.7);
+    display: flex;
+    align-items: center;
+    justify-content: center;
+    z-index: 100;
+    
+    .shimmer-animation {
+      width: 100%;
+      height: 100%;
+      background: linear-gradient(90deg, #f0f0f0 25%, #e0e0e0 50%, #f0f0f0 75%);
+      background-size: 200% 100%;
+      animation: shimmer 1.5s infinite;
+      border-radius: 8px;
+    }
+  }
+  
+  &.active {
+    .shimmer-content {
+      opacity: 0.5;
+    }
+  }
+}
+
+@keyframes shimmer {
+  0% {
+    background-position: -200% 0;
+  }
+  100% {
+    background-position: 200% 0;
+  }
+}
\ No newline at end of file
diff --git a/frontend/angular-clarity-master/src/app/modules/main/builder/dashboardnew/gadgets/shield-dashboard/components/loading-shimmer/loading-shimmer.component.ts b/frontend/angular-clarity-master/src/app/modules/main/builder/dashboardnew/gadgets/shield-dashboard/components/loading-shimmer/loading-shimmer.component.ts
new file mode 100644
index 0000000..d17d8e3
--- /dev/null
+++ b/frontend/angular-clarity-master/src/app/modules/main/builder/dashboardnew/gadgets/shield-dashboard/components/loading-shimmer/loading-shimmer.component.ts
@@ -0,0 +1,19 @@
+import { Component, Input } from '@angular/core';
+
+@Component({
+  selector: 'app-shield-loading-shimmer',
+  template: `
+    <div class="shimmer-container" [ngClass]="{ 'active': loading }">
+      <div class="shimmer-content">
+        <ng-content></ng-content>
+      </div>
+      <div class="shimmer-overlay" *ngIf="loading">
+        <div class="shimmer-animation"></div>
+      </div>
+    </div>
+  `,
+  styleUrls: ['./loading-shimmer.component.scss']
+})
+export class LoadingShimmerComponent {
+  @Input() loading: boolean = false;
+}
\ No newline at end of file
diff --git a/frontend/angular-clarity-master/src/app/modules/main/builder/dashboardnew/gadgets/shield-dashboard/components/map-chart/map-chart.component.html b/frontend/angular-clarity-master/src/app/modules/main/builder/dashboardnew/gadgets/shield-dashboard/components/map-chart/map-chart.component.html
new file mode 100644
index 0000000..d11c78d
--- /dev/null
+++ b/frontend/angular-clarity-master/src/app/modules/main/builder/dashboardnew/gadgets/shield-dashboard/components/map-chart/map-chart.component.html
@@ -0,0 +1,43 @@
+<div class="map-container">
+  <div class="map-header">
+    <h3>Dealer Locations</h3>
+  </div>
+  <div class="map-wrapper">
+    <!-- Simple map representation with dealer markers -->
+    <div class="map-placeholder">
+      <div class="india-map">
+        <!-- Simplified India map outline -->
+        <div class="map-outline"></div>
+        
+        <!-- Dealer markers -->
+        <div 
+          *ngFor="let dealer of dealerLocations" 
+          class="dealer-marker"
+          [style.left]="dealer.lng * 0.8 + 10 + '%'"
+          [style.top]="100 - (dealer.lat * 1.2) + '%'"
+          [style.background-color]="getStatusColor(dealer.status)"
+          (mouseenter)="onDealerHover(dealer)"
+          (mouseleave)="onDealerLeave()"
+          [attr.data-tooltip]="dealer.name + ' - ' + dealer.city + ' (' + getStatusLabel(dealer.status) + ')'">
+        </div>
+      </div>
+      
+      <!-- Legend -->
+      <div class="map-legend">
+        <div class="legend-item" *ngFor="let status of ['active', 'inactive', 'training', 'onboarding']">
+          <div class="legend-color" [style.background-color]="getStatusColor(status)"></div>
+          <div class="legend-label">{{ getStatusLabel(status) }}</div>
+        </div>
+      </div>
+      
+      <!-- Dealer info tooltip -->
+      <div class="dealer-tooltip" *ngIf="hoveredDealer" [style.left]="hoveredDealer.lng * 0.8 + 12 + '%'" [style.top]="100 - (hoveredDealer.lat * 1.2) - 5 + '%'">
+        <div class="tooltip-content">
+          <div class="dealer-name">{{ hoveredDealer.name }}</div>
+          <div class="dealer-location">{{ hoveredDealer.city }}, {{ hoveredDealer.state }}</div>
+          <div class="dealer-status" [style.color]="getStatusColor(hoveredDealer.status)">{{ getStatusLabel(hoveredDealer.status) }}</div>
+        </div>
+      </div>
+    </div>
+  </div>
+</div>
\ No newline at end of file
diff --git a/frontend/angular-clarity-master/src/app/modules/main/builder/dashboardnew/gadgets/shield-dashboard/components/map-chart/map-chart.component.scss b/frontend/angular-clarity-master/src/app/modules/main/builder/dashboardnew/gadgets/shield-dashboard/components/map-chart/map-chart.component.scss
new file mode 100644
index 0000000..71e33d3
--- /dev/null
+++ b/frontend/angular-clarity-master/src/app/modules/main/builder/dashboardnew/gadgets/shield-dashboard/components/map-chart/map-chart.component.scss
@@ -0,0 +1,135 @@
+.map-container {
+  height: 100%;
+  display: flex;
+  flex-direction: column;
+  
+  .map-header {
+    margin-bottom: 20px;
+    
+    h3 {
+      font-size: 18px;
+      font-weight: 600;
+      color: #0a192f;
+      margin: 0;
+    }
+  }
+  
+  .map-wrapper {
+    flex: 1;
+    position: relative;
+    
+    .map-placeholder {
+      height: 100%;
+      background: #f8fafc;
+      border-radius: 8px;
+      position: relative;
+      overflow: hidden;
+      
+      .india-map {
+        width: 100%;
+        height: 100%;
+        position: relative;
+        background: #e2e8f0;
+        
+        .map-outline {
+          position: absolute;
+          top: 10%;
+          left: 10%;
+          right: 10%;
+          bottom: 10%;
+          background: #cbd5e1;
+          border-radius: 50% 40% 45% 50% / 40% 50% 40% 45%;
+          box-shadow: inset 0 0 20px rgba(0, 0, 0, 0.1);
+        }
+        
+        .dealer-marker {
+          position: absolute;
+          width: 16px;
+          height: 16px;
+          border-radius: 50%;
+          cursor: pointer;
+          transform: translate(-50%, -50%);
+          box-shadow: 0 2px 6px rgba(0, 0, 0, 0.3);
+          transition: transform 0.2s ease, box-shadow 0.2s ease;
+          
+          &:hover {
+            transform: translate(-50%, -50%) scale(1.3);
+            box-shadow: 0 4px 12px rgba(0, 0, 0, 0.4);
+            z-index: 10;
+          }
+        }
+      }
+      
+      .map-legend {
+        position: absolute;
+        bottom: 20px;
+        left: 20px;
+        background: rgba(255, 255, 255, 0.9);
+        border-radius: 8px;
+        padding: 12px;
+        box-shadow: 0 2px 10px rgba(0, 0, 0, 0.1);
+        display: flex;
+        gap: 15px;
+        
+        .legend-item {
+          display: flex;
+          align-items: center;
+          gap: 6px;
+          
+          .legend-color {
+            width: 12px;
+            height: 12px;
+            border-radius: 50%;
+          }
+          
+          .legend-label {
+            font-size: 12px;
+            color: #64748b;
+          }
+        }
+      }
+      
+      .dealer-tooltip {
+        position: absolute;
+        background: rgba(10, 25, 47, 0.95);
+        color: white;
+        border-radius: 6px;
+        padding: 10px 15px;
+        transform: translate(-50%, -100%);
+        margin-top: -10px;
+        z-index: 100;
+        box-shadow: 0 4px 12px rgba(0, 0, 0, 0.2);
+        min-width: 180px;
+        
+        &::after {
+          content: '';
+          position: absolute;
+          top: 100%;
+          left: 50%;
+          margin-left: -5px;
+          border-width: 5px;
+          border-style: solid;
+          border-color: rgba(10, 25, 47, 0.95) transparent transparent transparent;
+        }
+        
+        .tooltip-content {
+          .dealer-name {
+            font-weight: 600;
+            margin-bottom: 4px;
+          }
+          
+          .dealer-location {
+            font-size: 13px;
+            color: #cbd5e1;
+            margin-bottom: 4px;
+          }
+          
+          .dealer-status {
+            font-size: 12px;
+            font-weight: 500;
+          }
+        }
+      }
+    }
+  }
+}
\ No newline at end of file
diff --git a/frontend/angular-clarity-master/src/app/modules/main/builder/dashboardnew/gadgets/shield-dashboard/components/map-chart/map-chart.component.ts b/frontend/angular-clarity-master/src/app/modules/main/builder/dashboardnew/gadgets/shield-dashboard/components/map-chart/map-chart.component.ts
new file mode 100644
index 0000000..08310bf
--- /dev/null
+++ b/frontend/angular-clarity-master/src/app/modules/main/builder/dashboardnew/gadgets/shield-dashboard/components/map-chart/map-chart.component.ts
@@ -0,0 +1,109 @@
+import { Component, OnInit, OnDestroy } from '@angular/core';
+import { DashboardFilterService } from '../../services/dashboard-filter.service';
+import { Subscription } from 'rxjs';
+
+interface DealerLocation {
+  id: number;
+  name: string;
+  lat: number;
+  lng: number;
+  status: 'active' | 'inactive' | 'training' | 'onboarding';
+  city: string;
+  state: string;
+}
+
+@Component({
+  selector: 'app-shield-map-chart',
+  templateUrl: './map-chart.component.html',
+  styleUrls: ['./map-chart.component.scss']
+})
+export class MapChartComponent implements OnInit, OnDestroy {
+  private filterSubscription: Subscription = new Subscription();
+  
+  // Mock dealer location data
+  originalDealerLocations: DealerLocation[] = [
+    { id: 1, name: 'ABC Motors', lat: 28.6139, lng: 77.2090, status: 'active', city: 'New Delhi', state: 'Delhi' },
+    { id: 2, name: 'XYZ Auto', lat: 19.0760, lng: 72.8777, status: 'active', city: 'Mumbai', state: 'Maharashtra' },
+    { id: 3, name: 'PQR Dealers', lat: 13.0827, lng: 80.2707, status: 'training', city: 'Chennai', state: 'Tamil Nadu' },
+    { id: 4, name: 'LMN Enterprises', lat: 12.9716, lng: 77.5946, status: 'inactive', city: 'Bangalore', state: 'Karnataka' },
+    { id: 5, name: 'DEF Solutions', lat: 22.5726, lng: 88.3639, status: 'active', city: 'Kolkata', state: 'West Bengal' },
+    { id: 6, name: 'GHI Services', lat: 25.3176, lng: 82.9739, status: 'onboarding', city: 'Varanasi', state: 'Uttar Pradesh' },
+    { id: 7, name: 'JKL Group', lat: 23.0225, lng: 72.5714, status: 'active', city: 'Ahmedabad', state: 'Gujarat' },
+    { id: 8, name: 'MNO Corp', lat: 18.5204, lng: 73.8567, status: 'training', city: 'Pune', state: 'Maharashtra' }
+  ];
+  
+  dealerLocations: DealerLocation[] = [...this.originalDealerLocations];
+
+  // Status colors
+  statusColors = {
+    active: '#0a192f',
+    inactive: '#64748b',
+    training: '#ff6b35',
+    onboarding: '#f59e0b'
+  };
+
+  // Status labels
+  statusLabels = {
+    active: 'Active',
+    inactive: 'Inactive',
+    training: 'Training',
+    onboarding: 'Onboarding'
+  };
+
+  hoveredDealer: DealerLocation | null = null;
+
+  constructor(private filterService: DashboardFilterService) { }
+
+  ngOnInit(): void {
+    // Subscribe to filter changes
+    this.filterSubscription.add(
+      this.filterService.filterState$.subscribe(filters => {
+        this.updateMapData(filters);
+      })
+    );
+  }
+  
+  ngOnDestroy(): void {
+    // Unsubscribe from all subscriptions
+    this.filterSubscription.unsubscribe();
+  }
+
+  // Update map data based on filters
+  updateMapData(filters: any): void {
+    // Simulate data change based on filters
+    // In a real implementation, this would fetch new data from an API
+    
+    if (filters.salesRep || filters.partner || filters.tractionChannel || filters.subProductLine) {
+      // Apply filter effects (simplified logic)
+      const filteredData = this.originalDealerLocations.filter(location => {
+        // Simple filtering logic - in a real app, this would be more sophisticated
+        return Math.random() > 0.25; // Randomly filter out some locations
+      });
+      
+      this.dealerLocations = filteredData;
+    } else {
+      // No filters applied, show all data
+      this.dealerLocations = [...this.originalDealerLocations];
+    }
+  }
+
+  // Get status color based on dealer status
+  getStatusColor(status: string): string {
+    return (this.statusColors as any)[status] || '#64748b';
+  }
+
+  // Get status label based on dealer status
+  getStatusLabel(status: string): string {
+    return (this.statusLabels as any)[status] || status;
+  }
+
+  // Handle dealer hover
+  onDealerHover(dealer: DealerLocation): void {
+    this.hoveredDealer = dealer;
+  }
+
+  // Handle dealer leave
+  onDealerLeave(): void {
+    this.hoveredDealer = null;
+  }
+}
\ No newline at end of file
diff --git a/frontend/angular-clarity-master/src/app/modules/main/builder/dashboardnew/gadgets/shield-dashboard/components/quarterwise-flow/quarterwise-flow.component.html b/frontend/angular-clarity-master/src/app/modules/main/builder/dashboardnew/gadgets/shield-dashboard/components/quarterwise-flow/quarterwise-flow.component.html
new file mode 100644
index 0000000..bdb8fa1
--- /dev/null
+++ b/frontend/angular-clarity-master/src/app/modules/main/builder/dashboardnew/gadgets/shield-dashboard/components/quarterwise-flow/quarterwise-flow.component.html
@@ -0,0 +1,20 @@
+<div class="quarterwise-flow-container">
+  <div class="quarterwise-flow-header">
+    <h3>Quarterwise Flow</h3>
+  </div>
+  <div class="quarterwise-flow-content">
+    <div class="placeholder-message">
+      <div class="message-icon">
+        <i class="info-icon">ℹ️</i>
+      </div>
+      <div class="message-text">
+        <h4>Chart Configuration Incomplete</h4>
+        <p>Please configure the quarterwise flow chart settings to visualize the data.</p>
+      </div>
+      <button class="configure-button">
+        <i class="config-icon">⚙️</i>
+        Configure Chart
+      </button>
+    </div>
+  </div>
+</div>
\ No newline at end of file
diff --git a/frontend/angular-clarity-master/src/app/modules/main/builder/dashboardnew/gadgets/shield-dashboard/components/quarterwise-flow/quarterwise-flow.component.scss b/frontend/angular-clarity-master/src/app/modules/main/builder/dashboardnew/gadgets/shield-dashboard/components/quarterwise-flow/quarterwise-flow.component.scss
new file mode 100644
index 0000000..054b5f0
--- /dev/null
+++ b/frontend/angular-clarity-master/src/app/modules/main/builder/dashboardnew/gadgets/shield-dashboard/components/quarterwise-flow/quarterwise-flow.component.scss
@@ -0,0 +1,70 @@
+.quarterwise-flow-container {
+  height: 100%;
+  display: flex;
+  flex-direction: column;
+  
+  .quarterwise-flow-header {
+    margin-bottom: 20px;
+    
+    h3 {
+      font-size: 18px;
+      font-weight: 600;
+      color: #0a192f;
+      margin: 0;
+    }
+  }
+  
+  .quarterwise-flow-content {
+    flex: 1;
+    display: flex;
+    align-items: center;
+    justify-content: center;
+    
+    .placeholder-message {
+      text-align: center;
+      padding: 30px;
+      background: #f8fafc;
+      border-radius: 12px;
+      border: 1px dashed #cbd5e1;
+      
+      .message-icon {
+        color: #94a3b8;
+        margin-bottom: 20px;
+      }
+      
+      .message-text {
+        h4 {
+          color: #0a192f;
+          margin: 0 0 10px 0;
+          font-weight: 600;
+        }
+        
+        p {
+          color: #64748b;
+          margin: 0 0 20px 0;
+          font-size: 14px;
+          line-height: 1.5;
+        }
+      }
+      
+      .configure-button {
+        padding: 10px 20px;
+        background: #0a192f;
+        color: white;
+        border: none;
+        border-radius: 6px;
+        font-size: 14px;
+        font-weight: 500;
+        cursor: pointer;
+        display: inline-flex;
+        align-items: center;
+        gap: 8px;
+        transition: background-color 0.2s ease;
+        
+        &:hover {
+          background: #1e3a8a;
+        }
+      }
+    }
+  }
+}
\ No newline at end of file
diff --git a/frontend/angular-clarity-master/src/app/modules/main/builder/dashboardnew/gadgets/shield-dashboard/components/quarterwise-flow/quarterwise-flow.component.ts b/frontend/angular-clarity-master/src/app/modules/main/builder/dashboardnew/gadgets/shield-dashboard/components/quarterwise-flow/quarterwise-flow.component.ts
new file mode 100644
index 0000000..678b47d
--- /dev/null
+++ b/frontend/angular-clarity-master/src/app/modules/main/builder/dashboardnew/gadgets/shield-dashboard/components/quarterwise-flow/quarterwise-flow.component.ts
@@ -0,0 +1,15 @@
+import { Component, OnInit } from '@angular/core';
+
+@Component({
+  selector: 'app-shield-quarterwise-flow',
+  templateUrl: './quarterwise-flow.component.html',
+  styleUrls: ['./quarterwise-flow.component.scss']
+})
+export class QuarterwiseFlowComponent implements OnInit {
+
+  constructor() { }
+
+  ngOnInit(): void {
+  }
+
+}
\ No newline at end of file
diff --git a/frontend/angular-clarity-master/src/app/modules/main/builder/dashboardnew/gadgets/shield-dashboard/components/sidebar-filters/sidebar-filters.component.html b/frontend/angular-clarity-master/src/app/modules/main/builder/dashboardnew/gadgets/shield-dashboard/components/sidebar-filters/sidebar-filters.component.html
new file mode 100644
index 0000000..87f3121
--- /dev/null
+++ b/frontend/angular-clarity-master/src/app/modules/main/builder/dashboardnew/gadgets/shield-dashboard/components/sidebar-filters/sidebar-filters.component.html
@@ -0,0 +1,3 @@
+<div class="sidebar-filters">
+  <!-- Component Palette Button and List have been moved to the main shield dashboard component -->
+</div>
\ No newline at end of file
diff --git a/frontend/angular-clarity-master/src/app/modules/main/builder/dashboardnew/gadgets/shield-dashboard/components/sidebar-filters/sidebar-filters.component.html.new b/frontend/angular-clarity-master/src/app/modules/main/builder/dashboardnew/gadgets/shield-dashboard/components/sidebar-filters/sidebar-filters.component.html.new
new file mode 100644
index 0000000..95849af
--- /dev/null
+++ b/frontend/angular-clarity-master/src/app/modules/main/builder/dashboardnew/gadgets/shield-dashboard/components/sidebar-filters/sidebar-filters.component.html.new
@@ -0,0 +1,25 @@
+<div class="sidebar-filters">
+  <!-- Component Palette Button -->
+  <div class="component-palette-section">
+    <button class="component-palette-button" (click)="toggleComponentPalette()">
+      <clr-icon shape="plus-circle"></clr-icon>
+      Add Components
+    </button>
+    
+    <!-- Component Palette (hidden by default) -->
+    <div class="component-palette" *ngIf="showComponentPalette">
+      <h3 class="palette-title">Available Components</h3>
+      <div class="component-list">
+        <div 
+          *ngFor="let component of availableComponents" 
+          class="component-item"
+          draggable="true"
+          (dragstart)="onComponentDragStart($event, component)"
+          (dragend)="onComponentDragEnd($event)">
+          <clr-icon shape="drag-handle" class="drag-icon"></clr-icon>
+          {{ component.name }}
+        </div>
+      </div>
+    </div>
+  </div>
+</div>
\ No newline at end of file
diff --git a/frontend/angular-clarity-master/src/app/modules/main/builder/dashboardnew/gadgets/shield-dashboard/components/sidebar-filters/sidebar-filters.component.scss b/frontend/angular-clarity-master/src/app/modules/main/builder/dashboardnew/gadgets/shield-dashboard/components/sidebar-filters/sidebar-filters.component.scss
new file mode 100644
index 0000000..6ddf655
--- /dev/null
+++ b/frontend/angular-clarity-master/src/app/modules/main/builder/dashboardnew/gadgets/shield-dashboard/components/sidebar-filters/sidebar-filters.component.scss
@@ -0,0 +1,216 @@
+.sidebar-filters {
+  height: 100%;
+  display: flex;
+  flex-direction: column;
+  
+  .componentbtn {
+    margin: 10px;
+    width: calc(100% - 20px);
+  }
+  
+  .nav-list {
+    padding: 0;
+    margin: 0 10px;
+    
+    .nav-link {
+      display: flex;
+      align-items: center;
+      padding: 8px 12px;
+      margin-bottom: 5px;
+      background: #f8f9fa;
+      border: 1px solid #e9ecef;
+      border-radius: 4px;
+      cursor: move;
+      
+      &:hover {
+        background: #e9ecef;
+      }
+      
+      .has-badge {
+        margin-left: auto;
+      }
+    }
+  }
+  
+  .app-header {
+    margin-bottom: 30px;
+    
+    .app-name {
+      font-size: 24px;
+      font-weight: 700;
+      margin: 0 0 5px 0;
+      color: #ff6b35;
+    }
+    
+    .dashboard-title {
+      font-size: 18px;
+      font-weight: 500;
+      margin: 0;
+      color: #cbd5e1;
+    }
+  }
+  
+  .kpi-section {
+    display: flex;
+    flex-direction: column;
+    gap: 15px;
+    margin-bottom: 30px;
+    
+    .kpi-card {
+      background: rgba(255, 255, 255, 0.1);
+      border-radius: 10px;
+      padding: 15px;
+      text-align: center;
+      
+      .kpi-title {
+        font-size: 14px;
+        color: #94a3b8;
+        margin-bottom: 8px;
+      }
+      
+      .kpi-value {
+        font-size: 24px;
+        font-weight: 700;
+        color: white;
+      }
+    }
+    
+    .total-leads {
+      border-left: 3px solid #ff6b35;
+    }
+    
+    .total-deals {
+      border-left: 3px solid #0a192f;
+    }
+  }
+  
+  .component-palette-section {
+    margin: 20px;
+    
+    .component-palette-button {
+      width: 100%;
+      padding: 12px;
+      background: rgba(255, 107, 53, 0.2);
+      color: white;
+      border: 1px solid rgba(255, 107, 53, 0.5);
+      border-radius: 8px;
+      font-size: 16px;
+      font-weight: 500;
+      cursor: pointer;
+      transition: all 0.2s ease;
+      display: flex;
+      align-items: center;
+      justify-content: center;
+      gap: 8px;
+      
+      &:hover {
+        background: rgba(255, 107, 53, 0.3);
+        border-color: #ff6b35;
+      }
+    }
+    
+    .component-palette {
+      margin-top: 15px;
+      background: rgba(255, 255, 255, 0.05);
+      border-radius: 8px;
+      padding: 15px;
+      
+      .palette-title {
+        font-size: 16px;
+        color: white;
+        margin: 0 0 15px 0;
+        text-align: center;
+      }
+      
+      .component-list {
+        display: flex;
+        flex-direction: column;
+        gap: 10px;
+        
+        .component-item {
+          padding: 10px 15px;
+          background: rgba(255, 255, 255, 0.1);
+          border: 1px solid rgba(255, 255, 255, 0.2);
+          border-radius: 6px;
+          color: white;
+          cursor: move;
+          display: flex;
+          align-items: center;
+          gap: 10px;
+          transition: all 0.2s ease;
+          
+          &:hover {
+            background: rgba(255, 107, 53, 0.2);
+            border-color: #ff6b35;
+          }
+          
+          .drag-icon {
+            font-size: 16px;
+          }
+        }
+      }
+    }
+  }
+  
+  .filters-section {
+    flex: 1;
+    
+    .filters-title {
+      font-size: 18px;
+      color: white;
+      margin: 0 0 20px 0;
+      padding-bottom: 10px;
+      border-bottom: 1px solid rgba(255, 255, 255, 0.1);
+    }
+    
+    .filter-group {
+      margin-bottom: 20px;
+      
+      label {
+        display: block;
+        font-size: 14px;
+        color: #cbd5e1;
+        margin-bottom: 8px;
+      }
+      
+      .filter-select {
+        width: 100%;
+        padding: 10px 15px;
+        background: rgba(255, 255, 255, 0.1);
+        border: 1px solid rgba(255, 255, 255, 0.2);
+        border-radius: 8px;
+        color: white;
+        font-size: 14px;
+        
+        &:focus {
+          outline: none;
+          border-color: #ff6b35;
+          box-shadow: 0 0 0 2px rgba(255, 107, 53, 0.2);
+        }
+        
+        option {
+          background: #0a192f;
+          color: white;
+        }
+      }
+    }
+    
+    .reset-button {
+      width: 100%;
+      padding: 12px;
+      background: rgba(255, 255, 255, 0.1);
+      color: white;
+      border: 1px solid rgba(255, 255, 255, 0.2);
+      border-radius: 8px;
+      font-size: 16px;
+      font-weight: 500;
+      cursor: pointer;
+      transition: all 0.2s ease;
+      
+      &:hover {
+        background: rgba(255, 107, 53, 0.2);
+        border-color: #ff6b35;
+      }
+    }
+  }
+}
\ No newline at end of file
diff --git a/frontend/angular-clarity-master/src/app/modules/main/builder/dashboardnew/gadgets/shield-dashboard/components/sidebar-filters/sidebar-filters.component.ts b/frontend/angular-clarity-master/src/app/modules/main/builder/dashboardnew/gadgets/shield-dashboard/components/sidebar-filters/sidebar-filters.component.ts
new file mode 100644
index 0000000..295f2c1
--- /dev/null
+++ b/frontend/angular-clarity-master/src/app/modules/main/builder/dashboardnew/gadgets/shield-dashboard/components/sidebar-filters/sidebar-filters.component.ts
@@ -0,0 +1,16 @@
+import { Component, OnInit } from '@angular/core';
+import { DashboardFilterService } from '../../services/dashboard-filter.service';
+
+@Component({
+  selector: 'app-shield-sidebar-filters',
+  templateUrl: './sidebar-filters.component.html',
+  styleUrls: ['./sidebar-filters.component.scss']
+})
+export class SidebarFiltersComponent implements OnInit {
+
+  constructor(private filterService: DashboardFilterService) { }
+
+  ngOnInit(): void {
+    // Component initialization
+  }
+}
\ No newline at end of file
diff --git a/frontend/angular-clarity-master/src/app/modules/main/builder/dashboardnew/gadgets/shield-dashboard/components/sidebar-filters/sidebar-filters.component.ts.new b/frontend/angular-clarity-master/src/app/modules/main/builder/dashboardnew/gadgets/shield-dashboard/components/sidebar-filters/sidebar-filters.component.ts.new
new file mode 100644
index 0000000..295f2c1
--- /dev/null
+++ b/frontend/angular-clarity-master/src/app/modules/main/builder/dashboardnew/gadgets/shield-dashboard/components/sidebar-filters/sidebar-filters.component.ts.new
@@ -0,0 +1,16 @@
+import { Component, OnInit } from '@angular/core';
+import { DashboardFilterService } from '../../services/dashboard-filter.service';
+
+@Component({
+  selector: 'app-shield-sidebar-filters',
+  templateUrl: './sidebar-filters.component.html',
+  styleUrls: ['./sidebar-filters.component.scss']
+})
+export class SidebarFiltersComponent implements OnInit {
+
+  constructor(private filterService: DashboardFilterService) { }
+
+  ngOnInit(): void {
+    // Component initialization
+  }
+}
\ No newline at end of file
diff --git a/frontend/angular-clarity-master/src/app/modules/main/builder/dashboardnew/gadgets/shield-dashboard/index.ts b/frontend/angular-clarity-master/src/app/modules/main/builder/dashboardnew/gadgets/shield-dashboard/index.ts
new file mode 100644
index 0000000..337ea1a
--- /dev/null
+++ b/frontend/angular-clarity-master/src/app/modules/main/builder/dashboardnew/gadgets/shield-dashboard/index.ts
@@ -0,0 +1,10 @@
+export * from './shield-dashboard.component';
+
+// Export all components
+export * from './components/sidebar-filters/sidebar-filters.component';
+export * from './components/bar-chart/bar-chart.component';
+export * from './components/donut-chart/donut-chart.component';
+export * from './components/map-chart/map-chart.component';
+export * from './components/data-table/data-table.component';
+export * from './components/deal-details-card/deal-details-card.component';
+export * from './components/quarterwise-flow/quarterwise-flow.component';
\ No newline at end of file
diff --git a/frontend/angular-clarity-master/src/app/modules/main/builder/dashboardnew/gadgets/shield-dashboard/services/dashboard-filter.service.ts b/frontend/angular-clarity-master/src/app/modules/main/builder/dashboardnew/gadgets/shield-dashboard/services/dashboard-filter.service.ts
new file mode 100644
index 0000000..97e4593
--- /dev/null
+++ b/frontend/angular-clarity-master/src/app/modules/main/builder/dashboardnew/gadgets/shield-dashboard/services/dashboard-filter.service.ts
@@ -0,0 +1,84 @@
+import { Injectable } from '@angular/core';
+import { BehaviorSubject, Observable } from 'rxjs';
+
+// Define the filter state interface
+export interface FilterState {
+  salesRep: string;
+  partner: string;
+  tractionChannel: string;
+  subProductLine: string;
+}
+
+@Injectable({
+  providedIn: 'root'
+})
+export class DashboardFilterService {
+  // Shared filter state using BehaviorSubject
+  private filterStateSubject = new BehaviorSubject<FilterState>({
+    salesRep: '',
+    partner: '',
+    tractionChannel: '',
+    subProductLine: ''
+  });
+  
+  public filterState$ = this.filterStateSubject.asObservable();
+  
+  // KPI data
+  private kpiDataSubject = new BehaviorSubject<{ totalLeads: number; totalDeals: number }>({
+    totalLeads: 1248,
+    totalDeals: 842
+  });
+  
+  public kpiData$ = this.kpiDataSubject.asObservable();
+
+  constructor() { }
+  
+  // Update filter state
+  updateFilter(filterType: keyof FilterState, value: string): void {
+    const currentState = this.filterStateSubject.value;
+    const newState = { ...currentState, [filterType]: value };
+    this.filterStateSubject.next(newState);
+    
+    // Simulate KPI data change based on filters
+    this.updateKpiData(newState);
+  }
+  
+  // Reset all filters to default values
+  resetFilters(): void {
+    this.filterStateSubject.next({
+      salesRep: '',
+      partner: '',
+      tractionChannel: '',
+      subProductLine: ''
+    });
+    
+    // Reset KPI data to default values
+    this.kpiDataSubject.next({
+      totalLeads: 1248,
+      totalDeals: 842
+    });
+  }
+  
+  // Update KPI data based on filters (simulated)
+  private updateKpiData(filters: FilterState): void {
+    // This is a simplified simulation - in a real app, this would come from an API
+    let totalLeads = 1248;
+    let totalDeals = 842;
+    
+    // Apply filter effects (simplified logic)
+    if (filters.salesRep) totalLeads = Math.floor(totalLeads * 0.8);
+    if (filters.partner) totalDeals = Math.floor(totalDeals * 0.9);
+    if (filters.tractionChannel) totalLeads = Math.floor(totalLeads * 0.85);
+    if (filters.subProductLine) totalDeals = Math.floor(totalDeals * 0.95);
+    
+    this.kpiDataSubject.next({
+      totalLeads,
+      totalDeals
+    });
+  }
+  
+  // Get current filter values
+  getCurrentFilters(): FilterState {
+    return this.filterStateSubject.value;
+  }
+}
\ No newline at end of file
diff --git a/frontend/angular-clarity-master/src/app/modules/main/builder/dashboardnew/gadgets/shield-dashboard/shield-dashboard-routing.module.ts b/frontend/angular-clarity-master/src/app/modules/main/builder/dashboardnew/gadgets/shield-dashboard/shield-dashboard-routing.module.ts
new file mode 100644
index 0000000..c14cfdb
--- /dev/null
+++ b/frontend/angular-clarity-master/src/app/modules/main/builder/dashboardnew/gadgets/shield-dashboard/shield-dashboard-routing.module.ts
@@ -0,0 +1,16 @@
+import { NgModule } from '@angular/core';
+import { RouterModule, Routes } from '@angular/router';
+import { ShieldDashboardComponent } from './shield-dashboard.component';
+
+const routes: Routes = [
+  {
+    path: '',
+    component: ShieldDashboardComponent
+  }
+];
+
+@NgModule({
+  imports: [RouterModule.forChild(routes)],
+  exports: [RouterModule]
+})
+export class ShieldDashboardRoutingModule { }
\ No newline at end of file
diff --git a/frontend/angular-clarity-master/src/app/modules/main/builder/dashboardnew/gadgets/shield-dashboard/shield-dashboard.component.html b/frontend/angular-clarity-master/src/app/modules/main/builder/dashboardnew/gadgets/shield-dashboard/shield-dashboard.component.html
new file mode 100644
index 0000000..6393fb8
--- /dev/null
+++ b/frontend/angular-clarity-master/src/app/modules/main/builder/dashboardnew/gadgets/shield-dashboard/shield-dashboard.component.html
@@ -0,0 +1,493 @@
+<div class="shield-dashboard">
+  <div class="dashboard-container">
+    <!-- Sidebar Filters -->
+    <div class="sidebar">
+      <button class="btn componentbtn" (click)="toggleComponentPalette()">
+        <clr-icon shape="plus"></clr-icon> Component
+      </button>
+      
+      <ul class="nav-list" style="list-style-type: none;" *ngIf="showComponentPalette">
+        <li *ngFor="let widget of WidgetsMock">
+          <!--
+            Draggable widget from store using vanilla javascript event (dragstart)
+            onDrag() is call, it take $event and a widget identifier as parameters
+          -->
+          <a draggable="true" class="nav-link" (dragstart)="onDrag($event, widget.identifier)">
+            <clr-icon shape="drag-handle" style="margin-right: 10px;"></clr-icon>
+            {{ widget.name }}
+            <clr-icon shape="plugin" class="has-badge"></clr-icon>
+          </a>
+        </li>
+      </ul>
+    </div>
+    
+    <!-- Main Dashboard Content -->
+    <div class="main-content">
+      <!-- Deleted Items Section -->
+      <div class="deleted-items-section" *ngIf="deletedItems.length > 0">
+        <h3>Deleted Items</h3>
+        <div class="deleted-items-list">
+          <div *ngFor="let item of deletedItems" class="deleted-item">
+            <span>{{ item.name }}</span>
+            <button class="btn btn-sm btn-primary" (click)="restoreItem(item)">
+              <clr-icon shape="undo"></clr-icon> Restore
+            </button>
+          </div>
+        </div>
+        <button class="btn btn-sm btn-danger" (click)="clearDeletedItems()">
+          <clr-icon shape="trash"></clr-icon> Clear All
+        </button>
+      </div>
+      
+      <!-- Dashboard Grid with Drag and Drop -->
+      <gridster [options]="options" (drop)="onDrop($event)" style="background-color: transparent; min-height: 500px;">
+        <gridster-item [item]="item" *ngFor="let item of dashboard">
+          <!-- Remove Button -->
+          <button class="btn btn-icon btn-danger" style="margin-left: 10px; margin-top: 10px;" (click)="removeItem(item)">
+            <clr-icon shape="trash"></clr-icon>
+          </button>
+          
+          <!-- Edit Button -->
+          <button class="btn btn-icon" style="margin-top: 10px; float: right;" (click)="editGadget(item)">
+            <clr-icon shape="pencil"></clr-icon>
+          </button>
+          
+          <!-- Drag Handle -->
+          <button class="btn btn-icon drag-handler" style="margin-left: 10px; margin-top: 10px;">
+            <clr-icon shape="drag-handle"></clr-icon>
+          </button>
+          
+          <!-- Chart Components -->
+          <div class="grid-item-content">
+            <h4 style="margin-top: 0px; margin-left: 10px;">{{item.name}}</h4>
+            <div *ngIf="item.chartType === 'bar-chart'">
+              <app-shield-bar-chart></app-shield-bar-chart>
+            </div>
+            <div *ngIf="item.chartType === 'donut-chart' && item.name === 'End Customer Donut'">
+              <app-shield-donut-chart chartType="endCustomer"></app-shield-donut-chart>
+            </div>
+            <div *ngIf="item.chartType === 'donut-chart' && item.name === 'Segment Penetration Donut'">
+              <app-shield-donut-chart chartType="segmentPenetration"></app-shield-donut-chart>
+            </div>
+            <div *ngIf="item.chartType === 'map-chart'">
+              <app-shield-map-chart></app-shield-map-chart>
+            </div>
+            <div *ngIf="item.chartType === 'data-table'">
+              <app-shield-data-table></app-shield-data-table>
+            </div>
+            <div *ngIf="item.chartType === 'deal-details'">
+              <app-shield-deal-details-card></app-shield-deal-details-card>
+            </div>
+            <div *ngIf="item.chartType === 'quarterwise-flow'">
+              <app-shield-quarterwise-flow></app-shield-quarterwise-flow>
+            </div>
+          </div>
+        </gridster-item>
+      </gridster>
+    </div>
+  </div>
+</div>
+
+<!-- Configuration Modal -->
+<clr-modal [(clrModalOpen)]="modeledit" [clrModalStaticBackdrop]="true" clrModalSize="lg">
+  <h3 class="modal-title">Configure Chart</h3>
+  <div class="modal-body" *ngIf="selectedItem">
+    <form [formGroup]="configForm" class="clr-form-horizontal">
+      <!-- Chart Title -->
+      <div class="clr-row">
+        <div class="clr-col-12">
+          <clr-input-container>
+            <label for="charttitle">Chart Title</label>
+            <input id="charttitle" type="text" formControlName="charttitle" clrInput />
+            <clr-control-helper>Enter a descriptive title for your chart</clr-control-helper>
+          </clr-input-container>
+        </div>
+      </div>
+      
+      <!-- Connection Selection Field -->
+      <div class="clr-row">
+        <div class="clr-col-12">
+          <clr-select-container>
+            <label for="connection">Connection</label>
+            <select id="connection" formControlName="connection" clrSelect>
+              <option value="">Select Connection</option>
+              <option *ngFor="let conn of sureconnectData" [value]="conn.id">
+                {{conn.connection_name || conn.id}}
+              </option>
+            </select>
+            <clr-control-helper>Select a SureConnect connection to use for this chart</clr-control-helper>
+          </clr-select-container>
+        </div>
+      </div>
+      
+      <!-- Chart Options (except for Data Table and Deal Details) -->
+      <div class="clr-row" *ngIf="selectedItem?.name !== 'Data Table' && selectedItem?.name !== 'Deal Details'">
+        <div class="clr-col-12">
+          <div class="clr-form-control clr-row">
+            <div class="clr-col-12">
+              <clr-checkbox-container>
+                <clr-checkbox-wrapper>
+                  <input type="checkbox" id="chartlegend" formControlName="chartlegend" clrCheckbox />
+                  <label for="chartlegend">Show Chart Legend</label>
+                </clr-checkbox-wrapper>
+                <clr-checkbox-wrapper>
+                  <input type="checkbox" id="showlabel" formControlName="showlabel" clrCheckbox />
+                  <label for="showlabel">Show Chart Label</label>
+                </clr-checkbox-wrapper>
+              </clr-checkbox-container>
+            </div>
+          </div>
+        </div>
+      </div>
+      
+      <!-- API URL -->
+      <div class="clr-row">
+        <div class="clr-col-12">
+          <clr-input-container>
+            <label for="table">API URL</label>
+            <div class="clr-input-group">
+              <input type="text" id="table" formControlName="table" clrInput />
+              <button class="btn btn-icon btn-primary" (click)="getColumns(configForm.value.connection, configForm.value.table)" type="button">
+                <clr-icon shape="refresh"></clr-icon>
+              </button>
+            </div>
+            <clr-control-helper>Enter the API endpoint for your data source</clr-control-helper>
+          </clr-input-container>
+        </div>
+      </div>
+      
+      <!-- X-Axis (except for Data Table and Deal Details) -->
+      <div class="clr-row" *ngIf="selectedItem?.name !== 'Data Table' && selectedItem?.name !== 'Deal Details'">
+        <div class="clr-col-12">
+          <clr-select-container>
+            <label for="xAxis">X-Axis</label>
+            <select id="xAxis" formControlName="xAxis" clrSelect>
+              <option value="">Select Column</option>
+              <option *ngFor="let data of columnData" [value]="data">{{data}}</option>
+            </select>
+            <clr-control-helper>Select the column to use for the X-axis</clr-control-helper>
+          </clr-select-container>
+        </div>
+      </div>
+      
+      <!-- Y-Axis (except for Data Table and Deal Details) -->
+      <div class="clr-row" *ngIf="selectedItem?.name !== 'Data Table' && selectedItem?.name !== 'Deal Details'">
+        <div class="clr-col-12">
+          <clr-combobox-container>
+            <label for="yAxis">Y-Axis (Numeric)</label>
+            <clr-combobox id="yAxis" formControlName="yAxis" clrMulti="true" required>
+              <ng-container *clrOptionSelected="let selected">
+                {{selected}}
+              </ng-container>
+              <clr-options>
+                <clr-option *clrOptionItems="let state of columnData" [clrValue]="state">
+                  {{state}}
+                </clr-option>
+              </clr-options>
+            </clr-combobox>
+            <clr-control-helper>Select one or more columns for the Y-axis</clr-control-helper>
+          </clr-combobox-container>
+        </div>
+      </div>
+      
+      <!-- Base API Filters Section -->
+      <div class="clr-row section-divider">
+        <div class="clr-col-12">
+          <h4>Base API Filters</h4>
+          <p class="clr-subtext">Configure filters for the main API (applied regardless of drilldown settings)</p>
+          
+          <!-- Add Base Filter Button -->
+          <button class="btn btn-sm btn-primary" (click)="addBaseFilter()" type="button">
+            <clr-icon shape="plus"></clr-icon> Add Filter
+          </button>
+          
+          <!-- Base Filter Fields List -->
+          <div *ngFor="let filter of selectedItem?.baseFilters; let i = index" class="filter-item">
+            <div class="filter-header">
+              <span>Filter {{i + 1}}</span>
+              <button class="btn btn-icon btn-danger btn-sm" (click)="removeBaseFilter(i)" type="button">
+                <clr-icon shape="trash"></clr-icon>
+              </button>
+            </div>
+            
+            <div class="clr-row filter-content">
+              <div class="clr-col-5">
+                <clr-input-container>
+                  <label [attr.for]="'baseFilterField' + i">Field Name</label>
+                  <input type="text" [id]="'baseFilterField' + i" [(ngModel)]="filter.field" [ngModelOptions]="{standalone: true}" clrInput />
+                </clr-input-container>
+              </div>
+              
+              <div class="clr-col-5">
+                <clr-input-container>
+                  <label [attr.for]="'baseFilterValue' + i">Filter Value</label>
+                  <input type="text" [id]="'baseFilterValue' + i" [(ngModel)]="filter.value" [ngModelOptions]="{standalone: true}" clrInput />
+                </clr-input-container>
+              </div>
+              
+              <div class="clr-col-2">
+                <button class="btn btn-icon btn-danger btn-sm" (click)="removeBaseFilter(i)" type="button">
+                  <clr-icon shape="trash"></clr-icon>
+                </button>
+              </div>
+            </div>
+          </div>
+        </div>
+      </div>
+      
+      <!-- Base Drilldown Configuration Section -->
+      <div class="clr-row section-divider">
+        <div class="clr-col-12">
+          <h4>Base Drilldown Configuration</h4>
+          <clr-checkbox-container>
+            <clr-checkbox-wrapper>
+              <input type="checkbox" id="drilldownEnabled" [(ngModel)]="selectedItem.drilldownEnabled" [ngModelOptions]="{standalone: true}" clrCheckbox />
+              <label for="drilldownEnabled">Enable Base Drilldown</label>
+            </clr-checkbox-wrapper>
+          </clr-checkbox-container>
+          <p class="clr-subtext">Enable drilldown functionality for this chart</p>
+        </div>
+      </div>
+
+      <!-- Drilldown API URL -->
+      <div class="clr-row" *ngIf="selectedItem?.drilldownEnabled">
+        <div class="clr-col-12">
+          <clr-input-container>
+            <label for="drilldownApiUrl">Base Drilldown API URL</label>
+            <div class="clr-input-group">
+              <input type="text" id="drilldownApiUrl" [(ngModel)]="selectedItem.drilldownApiUrl" [ngModelOptions]="{standalone: true}" clrInput />
+              <button class="btn btn-icon btn-primary" (click)="refreshDrilldownColumns()" [disabled]="!selectedItem.drilldownApiUrl" type="button">
+                <clr-icon shape="refresh"></clr-icon>
+              </button>
+            </div>
+            <clr-control-helper>Enter the API URL for base drilldown data. Use angle brackets for parameters, e.g., http://api.example.com/data/&lt;country&gt;</clr-control-helper>
+          </clr-input-container>
+        </div>
+      </div>
+
+      <!-- Drilldown X-Axis -->
+      <div class="clr-row" *ngIf="selectedItem?.drilldownEnabled">
+        <div class="clr-col-12">
+          <clr-select-container>
+            <label for="drilldownXAxis">Base Drilldown X-Axis</label>
+            <select id="drilldownXAxis" [(ngModel)]="selectedItem.drilldownXAxis" [ngModelOptions]="{standalone: true}" clrSelect>
+              <option value="">Select X-Axis Column</option>
+              <option *ngFor="let column of drilldownColumnData" [value]="column">{{column}}</option>
+            </select>
+            <clr-control-helper>Select the column to use for X-axis in base drilldown view</clr-control-helper>
+          </clr-select-container>
+        </div>
+      </div>
+
+      <!-- Drilldown Y-Axis (except for Deal Details) -->
+      <div class="clr-row" *ngIf="selectedItem?.drilldownEnabled && selectedItem?.name !== 'Deal Details'">
+        <div class="clr-col-12">
+          <clr-select-container>
+            <label for="drilldownYAxis">Base Drilldown Y-Axis</label>
+            <select id="drilldownYAxis" [(ngModel)]="selectedItem.drilldownYAxis" [ngModelOptions]="{standalone: true}" clrSelect>
+              <option value="">Select Y-Axis Column</option>
+              <option *ngFor="let column of drilldownColumnData" [value]="column">{{column}}</option>
+            </select>
+            <clr-control-helper>Select the column to use for Y-axis in base drilldown view</clr-control-helper>
+          </clr-select-container>
+        </div>
+      </div>
+
+      <!-- Drilldown Parameter -->
+      <div class="clr-row" *ngIf="selectedItem?.drilldownEnabled">
+        <div class="clr-col-12">
+          <clr-select-container>
+            <label for="drilldownParameter">Base Drilldown Parameter</label>
+            <select id="drilldownParameter" [(ngModel)]="selectedItem.drilldownParameter" [ngModelOptions]="{standalone: true}" clrSelect>
+              <option value="">Select Parameter Column</option>
+              <option *ngFor="let column of drilldownColumnData" [value]="column">{{column}}</option>
+            </select>
+            <clr-control-helper>Select the column to use as parameter for URL template replacement in base drilldown</clr-control-helper>
+          </clr-select-container>
+        </div>
+      </div>
+
+      <!-- Base Drilldown Filter Configuration -->
+      <div class="clr-row section-divider" *ngIf="selectedItem?.drilldownEnabled">
+        <div class="clr-col-12">
+          <h5>Base Drilldown Filters</h5>
+          <p class="clr-subtext">Configure filters for the base drilldown level</p>
+          
+          <!-- Add Drilldown Filter Button -->
+          <button class="btn btn-sm btn-primary" (click)="addDrilldownFilter()" type="button">
+            <clr-icon shape="plus"></clr-icon> Add Filter
+          </button>
+          
+          <!-- Drilldown Filter Fields List -->
+          <div *ngFor="let filter of selectedItem?.drilldownFilters; let i = index" class="filter-item">
+            <div class="filter-header">
+              <span>Filter {{i + 1}}</span>
+              <button class="btn btn-icon btn-danger btn-sm" (click)="removeDrilldownFilter(i)" type="button">
+                <clr-icon shape="trash"></clr-icon>
+              </button>
+            </div>
+            
+            <div class="clr-row filter-content">
+              <div class="clr-col-5">
+                <clr-input-container>
+                  <label [attr.for]="'drilldownFilterField' + i">Field Name</label>
+                  <input type="text" [id]="'drilldownFilterField' + i" [(ngModel)]="filter.field" [ngModelOptions]="{standalone: true}" clrInput />
+                </clr-input-container>
+              </div>
+              
+              <div class="clr-col-5">
+                <clr-input-container>
+                  <label [attr.for]="'drilldownFilterValue' + i">Filter Value</label>
+                  <input type="text" [id]="'drilldownFilterValue' + i" [(ngModel)]="filter.value" [ngModelOptions]="{standalone: true}" clrInput />
+                </clr-input-container>
+              </div>
+              
+              <div class="clr-col-2">
+                <button class="btn btn-icon btn-danger btn-sm" (click)="removeDrilldownFilter(i)" type="button">
+                  <clr-icon shape="trash"></clr-icon>
+                </button>
+              </div>
+            </div>
+          </div>
+        </div>
+      </div>
+
+      <!-- Multi-Layer Drilldown Configurations -->
+      <div class="clr-row section-divider" *ngIf="selectedItem?.drilldownEnabled">
+        <div class="clr-col-12">
+          <h4>Multi-Layer Drilldown Configurations</h4>
+          <button class="btn btn-sm btn-primary" (click)="addDrilldownLayer()" type="button">
+            <clr-icon shape="plus"></clr-icon> Add Drilldown Layer
+          </button>
+          <p class="clr-subtext">Add additional drilldown layers for multi-level navigation</p>
+        </div>
+      </div>
+
+      <!-- Dynamic Drilldown Layers -->
+      <div class="clr-row" *ngFor="let layer of selectedItem?.drilldownLayers; let i = index">
+        <div class="clr-col-12 drilldown-layer">
+          <div class="layer-header">
+            <h5>Drilldown Layer {{i + 1}}</h5>
+            <button class="btn btn-icon btn-danger btn-sm" (click)="removeDrilldownLayer(i)" type="button">
+              <clr-icon shape="trash"></clr-icon>
+            </button>
+          </div>
+          
+          <clr-checkbox-container>
+            <clr-checkbox-wrapper>
+              <input type="checkbox" [id]="'layerEnabled' + i" [(ngModel)]="layer.enabled" [ngModelOptions]="{standalone: true}" clrCheckbox />
+              <label [for]="'layerEnabled' + i">Enable Layer {{i + 1}} Drilldown</label>
+            </clr-checkbox-wrapper>
+          </clr-checkbox-container>
+          
+          <!-- Layer API URL -->
+          <div class="clr-row">
+            <div class="clr-col-12">
+              <clr-input-container>
+                <label [for]="'layerApiUrl' + i">Layer {{i + 1}} API URL</label>
+                <div class="clr-input-group">
+                  <input type="text" [id]="'layerApiUrl' + i" [(ngModel)]="layer.apiUrl" clrInput [ngModelOptions]="{standalone: true}" />
+                  <button class="btn btn-icon btn-primary" (click)="refreshDrilldownLayerColumns(i)" [disabled]="!layer.apiUrl" type="button">
+                    <clr-icon shape="refresh"></clr-icon>
+                  </button>
+                </div>
+                <clr-control-helper>Enter the API URL for layer {{i + 1}} drilldown data. Use angle brackets for parameters, e.g., http://api.example.com/data/&lt;state&gt;</clr-control-helper>
+              </clr-input-container>
+            </div>
+          </div>
+          
+          <!-- Layer X-Axis -->
+          <div class="clr-row">
+            <div class="clr-col-12">
+              <clr-select-container>
+                <label [for]="'layerXAxis' + i">Layer {{i + 1}} X-Axis</label>
+                <select [id]="'layerXAxis' + i" [(ngModel)]="layer.xAxis" [ngModelOptions]="{standalone: true}" clrSelect>
+                  <option value="">Select X-Axis Column</option>
+                  <option *ngFor="let column of layerColumnData[i] || []" [value]="column">{{column}}</option>
+                </select>
+                <clr-control-helper>Select the column to use for X-axis in layer {{i + 1}} drilldown view</clr-control-helper>
+              </clr-select-container>
+            </div>
+          </div>
+          
+          <!-- Layer Y-Axis (except for Deal Details) -->
+          <div class="clr-row" *ngIf="selectedItem?.name !== 'Deal Details'">
+            <div class="clr-col-12">
+              <clr-select-container>
+                <label [for]="'layerYAxis' + i">Layer {{i + 1}} Y-Axis</label>
+                <select [id]="'layerYAxis' + i" [(ngModel)]="layer.yAxis" [ngModelOptions]="{standalone: true}" clrSelect>
+                  <option value="">Select Y-Axis Column</option>
+                  <option *ngFor="let column of layerColumnData[i] || []" [value]="column">{{column}}</option>
+                </select>
+                <clr-control-helper>Select the column to use for Y-axis in layer {{i + 1}} drilldown view</clr-control-helper>
+              </clr-select-container>
+            </div>
+          </div>
+
+          <!-- Parameter Selection for Drilldown Layer -->
+          <div class="clr-row">
+            <div class="clr-col-12">
+              <clr-select-container>
+                <label [for]="'layerParameter' + i">Layer {{i + 1}} Parameter</label>
+                <select [id]="'layerParameter' + i" [(ngModel)]="layer.parameter" [ngModelOptions]="{standalone: true}" clrSelect>
+                  <option value="">Select Parameter Column</option>
+                  <option *ngFor="let column of layerColumnData[i] || []" [value]="column">{{column}}</option>
+                </select>
+                <clr-control-helper>Select the column to use as parameter for URL template replacement in layer {{i + 1}} drilldown</clr-control-helper>
+              </clr-select-container>
+            </div>
+          </div>
+
+          <!-- Layer Filter Configuration -->
+          <div class="clr-row section-divider">
+            <div class="clr-col-12">
+              <h5>Layer {{i + 1}} Filters</h5>
+              <p class="clr-subtext">Configure filters for this drilldown layer</p>
+              
+              <!-- Add Layer Filter Button -->
+              <button class="btn btn-sm btn-primary" (click)="addLayerFilter(i)" type="button">
+                <clr-icon shape="plus"></clr-icon> Add Filter
+              </button>
+              
+              <!-- Layer Filter Fields List -->
+              <div *ngFor="let filter of layer.filters; let j = index" class="filter-item">
+                <div class="filter-header">
+                  <span>Filter {{j + 1}}</span>
+                  <button class="btn btn-icon btn-danger btn-sm" (click)="removeLayerFilter(i, j)" type="button">
+                    <clr-icon shape="trash"></clr-icon>
+                  </button>
+                </div>
+                
+                <div class="clr-row filter-content">
+                  <div class="clr-col-5">
+                    <clr-input-container>
+                      <label [attr.for]="'layerFilterField' + i + '_' + j">Field Name</label>
+                      <input type="text" [id]="'layerFilterField' + i + '_' + j" [(ngModel)]="filter.field" [ngModelOptions]="{standalone: true}" clrInput />
+                    </clr-input-container>
+                  </div>
+                  
+                  <div class="clr-col-5">
+                    <clr-input-container>
+                      <label [attr.for]="'layerFilterValue' + i + '_' + j">Filter Value</label>
+                      <input type="text" [id]="'layerFilterValue' + i + '_' + j" [(ngModel)]="filter.value" [ngModelOptions]="{standalone: true}" clrInput />
+                    </clr-input-container>
+                  </div>
+                  
+                  <div class="clr-col-2">
+                    <button class="btn btn-icon btn-danger btn-sm" (click)="removeLayerFilter(i, j)" type="button">
+                      <clr-icon shape="trash"></clr-icon>
+                    </button>
+                  </div>
+                </div>
+              </div>
+            </div>
+          </div>
+        </div>
+      </div>
+    </form>
+  </div>
+  <div class="modal-footer">
+    <button type="button" class="btn btn-outline" (click)="cancelConfiguration()">Cancel</button>
+    <button type="button" class="btn btn-primary" (click)="saveConfiguration()">Save</button>
+  </div>
+</clr-modal>
\ No newline at end of file
diff --git a/frontend/angular-clarity-master/src/app/modules/main/builder/dashboardnew/gadgets/shield-dashboard/shield-dashboard.component.scss b/frontend/angular-clarity-master/src/app/modules/main/builder/dashboardnew/gadgets/shield-dashboard/shield-dashboard.component.scss
new file mode 100644
index 0000000..dbce2de
--- /dev/null
+++ b/frontend/angular-clarity-master/src/app/modules/main/builder/dashboardnew/gadgets/shield-dashboard/shield-dashboard.component.scss
@@ -0,0 +1,220 @@
+.shield-dashboard {
+  padding: 20px;
+  background-color: #f5f5f5;
+  min-height: 100vh;
+}
+
+.dashboard-container {
+  display: flex;
+  gap: 20px;
+}
+
+.sidebar {
+  flex: 0 0 250px;
+  background: white;
+  border-radius: 4px;
+  box-shadow: 0 2px 4px rgba(0,0,0,0.1);
+  padding: 15px;
+}
+
+.main-content {
+  flex: 1;
+  display: flex;
+  flex-direction: column;
+  gap: 20px;
+}
+
+.kpi-section {
+  display: flex;
+  gap: 20px;
+  margin-bottom: 20px;
+}
+
+.kpi-card {
+  flex: 1;
+  background: white;
+  border-radius: 4px;
+  box-shadow: 0 2px 4px rgba(0,0,0,0.1);
+  padding: 20px;
+  text-align: center;
+}
+
+.kpi-title {
+  font-size: 14px;
+  color: #666;
+  margin-bottom: 10px;
+}
+
+.kpi-value {
+  font-size: 24px;
+  font-weight: bold;
+  color: #333;
+}
+
+.total-leads {
+  border-top: 4px solid #4285f4;
+}
+
+.total-deals {
+  border-top: 4px solid #0f9d58;
+}
+
+.deleted-items-section {
+  background: white;
+  border-radius: 4px;
+  box-shadow: 0 2px 4px rgba(0,0,0,0.1);
+  padding: 20px;
+  
+  h3 {
+    margin-top: 0;
+    color: #333;
+    border-bottom: 1px solid #eee;
+    padding-bottom: 10px;
+  }
+  
+  .deleted-items-list {
+    display: flex;
+    flex-wrap: wrap;
+    gap: 10px;
+    margin-bottom: 15px;
+    
+    .deleted-item {
+      display: flex;
+      align-items: center;
+      gap: 10px;
+      background: #f8f9fa;
+      border: 1px solid #e9ecef;
+      border-radius: 4px;
+      padding: 8px 12px;
+      
+      span {
+        font-size: 14px;
+        color: #495057;
+      }
+    }
+  }
+}
+
+.dashboard-grid {
+  display: grid;
+  grid-template-columns: repeat(auto-fill, minmax(400px, 1fr));
+  gap: 20px;
+}
+
+.grid-item {
+  background: white;
+  border-radius: 4px;
+  box-shadow: 0 2px 4px rgba(0,0,0,0.1);
+  padding: 15px;
+  position: relative;
+}
+
+.grid-item-content {
+  margin-top: 30px;
+}
+
+.drag-handler {
+  cursor: move;
+}
+
+.drop-zone-indicator {
+  display: flex;
+  align-items: center;
+  justify-content: center;
+  min-height: 500px;
+  background-color: #f8f9fa;
+  border: 2px dashed #dee2e6;
+  border-radius: 4px;
+  color: #6c757d;
+  font-size: 18px;
+  text-align: center;
+  
+  p {
+    margin: 0;
+  }
+}
+
+/* Gridster specific styles */
+gridster {
+  background: transparent !important;
+}
+
+gridster-item {
+  background: white;
+  border-radius: 4px;
+  box-shadow: 0 2px 4px rgba(0,0,0,0.1);
+  overflow: hidden;
+}
+
+/* Configuration Modal Styles */
+.section-divider {
+  margin-top: 20px;
+  padding-top: 15px;
+  border-top: 1px solid #eee;
+}
+
+.section-divider:first-child {
+  border-top: none;
+  padding-top: 0;
+  margin-top: 0;
+}
+
+.filter-item {
+  margin-bottom: 15px;
+  padding: 12px;
+  border: 1px solid #e9ecef;
+  border-radius: 4px;
+  background-color: #f8f9fa;
+}
+
+.filter-header {
+  display: flex;
+  justify-content: space-between;
+  align-items: center;
+  margin-bottom: 10px;
+}
+
+.filter-content {
+  margin-top: 10px;
+}
+
+.drilldown-layer {
+  margin-top: 20px;
+  padding: 15px;
+  border: 1px solid #dee2e6;
+  border-radius: 4px;
+  background-color: #ffffff;
+}
+
+.layer-header {
+  display: flex;
+  justify-content: space-between;
+  align-items: center;
+  margin-bottom: 15px;
+  padding-bottom: 10px;
+  border-bottom: 1px solid #eee;
+}
+
+.layer-header h5 {
+  margin: 0;
+  color: #495057;
+}
+
+/* Responsive design */
+@media (max-width: 768px) {
+  .dashboard-container {
+    flex-direction: column;
+  }
+  
+  .sidebar {
+    flex: 0 0 auto;
+  }
+  
+  .kpi-section {
+    flex-direction: column;
+  }
+  
+  .filter-item .clr-row > div {
+    margin-bottom: 10px;
+  }
+}
\ No newline at end of file
diff --git a/frontend/angular-clarity-master/src/app/modules/main/builder/dashboardnew/gadgets/shield-dashboard/shield-dashboard.component.ts b/frontend/angular-clarity-master/src/app/modules/main/builder/dashboardnew/gadgets/shield-dashboard/shield-dashboard.component.ts
new file mode 100644
index 0000000..5fec6fc
--- /dev/null
+++ b/frontend/angular-clarity-master/src/app/modules/main/builder/dashboardnew/gadgets/shield-dashboard/shield-dashboard.component.ts
@@ -0,0 +1,596 @@
+import { Component, OnInit } from '@angular/core';
+import { GridsterConfig, GridsterItem } from 'angular-gridster2';
+import { FormBuilder, FormGroup } from '@angular/forms';
+import { DatastoreService } from 'src/app/services/fnd/datastore.service';
+import { AlertsService } from 'src/app/services/fnd/alerts.service';
+import { SureconnectService } from '../../sureconnect/sureconnect.service';
+
+interface ShieldDashboardItem extends GridsterItem {
+  chartType: string;
+  name: string;
+  id: number;
+  component?: any;
+  // Configuration properties
+  charttitle?: string;
+  connection?: string;
+  table?: string;
+  xAxis?: string;
+  yAxis?: string[];
+  chartlegend?: boolean;
+  showlabel?: boolean;
+  baseFilters?: any[];
+  drilldownEnabled?: boolean;
+  drilldownApiUrl?: string;
+  drilldownXAxis?: string;
+  drilldownYAxis?: string;
+  drilldownParameter?: string;
+  drilldownFilters?: any[];
+  drilldownLayers?: any[];
+}
+
+interface WidgetModel {
+  name: string;
+  identifier: string;
+}
+
+@Component({
+  selector: 'app-shield-dashboard',
+  templateUrl: './shield-dashboard.component.html',
+  styleUrls: ['./shield-dashboard.component.scss']
+})
+export class ShieldDashboardComponent implements OnInit {
+  options: GridsterConfig;
+  dashboard: Array<ShieldDashboardItem>;
+  
+  // Configuration modal
+  configModalOpen = false;
+  modeledit = false; // Add this to match the main dashboard pattern
+  configForm: FormGroup;
+  selectedItem: ShieldDashboardItem | null = null;
+  
+  // Component palette
+  showComponentPalette = false;
+  WidgetsMock: WidgetModel[] = [
+    {
+      name: 'Bar Chart',
+      identifier: 'bar_chart'
+    },
+    {
+      name: 'Doughnut Chart',
+      identifier: 'doughnut_chart'
+    },
+    {
+      name: 'Map Chart',
+      identifier: 'map_chart'
+    },
+    {
+      name: 'Data Table',
+      identifier: 'grid_view'
+    },
+    {
+      name: 'Deal Details',
+      identifier: 'to_do_chart'
+    },
+    {
+      name: 'Quarterwise Flow',
+      identifier: 'line_chart'
+    },
+    {
+      name: 'Compact Filter',
+      identifier: 'compact_filter'
+    }
+  ];
+  
+  // Services data
+  storedata: any[] = [];
+  columnData: any[] = [];
+  sureconnectData: any[] = [];
+  drilldownColumnData: any[] = [];
+  layerColumnData: { [key: number]: any[] } = {};
+  
+  // Keep track of deleted items
+  deletedItems: Array<ShieldDashboardItem> = [];
+
+  constructor(
+    private _fb: FormBuilder,
+    private datastoreService: DatastoreService,
+    private alertService: AlertsService,
+    private sureconnectService: SureconnectService
+  ) { }
+
+  ngOnInit(): void {
+    this.options = {
+      gridType: 'fit',
+      enableEmptyCellDrop: true,
+      emptyCellDropCallback: this.onDrop,
+      pushItems: true,
+      swap: true,
+      pushDirections: { north: true, east: true, south: true, west: true },
+      resizable: { enabled: true },
+      itemChangeCallback: this.itemChange.bind(this),
+      draggable: {
+        enabled: true,
+        ignoreContent: true,
+        dropOverItems: true,
+        dragHandleClass: 'drag-handler',
+        ignoreContentClass: 'no-drag',
+      },
+      displayGrid: 'always',
+      minCols: 10,
+      minRows: 10,
+      itemResizeCallback: this.itemResize.bind(this)
+    };
+
+    // Initialize the dashboard with empty canvas
+    this.dashboard = [];
+    
+    // Initialize form
+    this.configForm = this._fb.group({
+      charttitle: [''],
+      connection: [''],
+      table: [''],
+      xAxis: [''],
+      yAxis: [''],
+      chartlegend: [true],
+      showlabel: [true]
+    });
+    
+    // Load service data
+    this.loadServicesData();
+  }
+  
+  // Load initial data from services
+  loadServicesData() {
+    // Load sureconnect data
+    this.sureconnectService.getAll().subscribe((data: any[]) => {
+      this.sureconnectData = data;
+    });
+    
+    // Load datastore data
+    this.datastoreService.getAll().subscribe((data) => {
+      this.storedata = data as any[];
+    });
+  }
+  
+  // Toggle component palette visibility
+  toggleComponentPalette(): void {
+    this.showComponentPalette = !this.showComponentPalette;
+  }
+  
+  // Handle drag start event for components - matching the working implementation
+  onDrag(event: DragEvent, identifier: string): void {
+    console.log("on drag", identifier);
+    console.log("on drag ", event);
+    if (event.dataTransfer) {
+      event.dataTransfer.setData('widgetIdentifier', identifier);
+    }
+  }
+
+  onDrop(ev: any) {
+    // Handle dropping new components onto the dashboard
+    console.log('Item dropped:', ev);
+    
+    // Get the component identifier from the drag event
+    const componentType = ev.dataTransfer ? ev.dataTransfer.getData('widgetIdentifier') : '';
+    console.log('Component type dropped:', componentType);
+    
+    if (componentType) {
+      this.addComponentToDashboard(componentType);
+    } else {
+      console.log('No component type found in drag data');
+    }
+  }
+  
+  // Add a new component to the dashboard
+  addComponentToDashboard(componentType: string) {
+    // Generate a new ID for the component
+    const newId = this.dashboard.length > 0 ? Math.max(...this.dashboard.map(item => item.id), 0) + 1 : 1;
+    
+    let newItem: ShieldDashboardItem;
+    
+    switch (componentType) {
+      case "bar_chart":
+        newItem = { 
+          cols: 5, 
+          rows: 6, 
+          y: 0, 
+          x: 0, 
+          chartType: 'bar-chart', 
+          name: 'Bar Chart', 
+          id: newId,
+          chartlegend: true,
+          showlabel: true,
+          baseFilters: [],
+          drilldownEnabled: false,
+          drilldownLayers: []
+        };
+        break;
+      case "doughnut_chart":
+        // For doughnut charts, we'll need to determine which one based on existing items
+        const donutCount = this.dashboard.filter(item => item.chartType === 'donut-chart').length;
+        if (donutCount % 2 === 0) {
+          newItem = { 
+            cols: 5, 
+            rows: 6, 
+            y: 0, 
+            x: 0, 
+            chartType: 'donut-chart', 
+            name: 'End Customer Donut', 
+            id: newId,
+            chartlegend: true,
+            showlabel: true,
+            baseFilters: [],
+            drilldownEnabled: false,
+            drilldownLayers: []
+          };
+        } else {
+          newItem = { 
+            cols: 5, 
+            rows: 6, 
+            y: 0, 
+            x: 0, 
+            chartType: 'donut-chart', 
+            name: 'Segment Penetration Donut', 
+            id: newId,
+            chartlegend: true,
+            showlabel: true,
+            baseFilters: [],
+            drilldownEnabled: false,
+            drilldownLayers: []
+          };
+        }
+        break;
+      case "map_chart":
+        newItem = { 
+          cols: 5, 
+          rows: 6, 
+          y: 0, 
+          x: 0, 
+          chartType: 'map-chart', 
+          name: 'Map Chart', 
+          id: newId,
+          chartlegend: true,
+          showlabel: true,
+          baseFilters: [],
+          drilldownEnabled: false,
+          drilldownLayers: []
+        };
+        break;
+      case "grid_view":
+        newItem = { 
+          cols: 10, 
+          rows: 6, 
+          y: 0, 
+          x: 0, 
+          chartType: 'data-table', 
+          name: 'Data Table', 
+          id: newId,
+          chartlegend: true,
+          showlabel: true,
+          baseFilters: [],
+          drilldownEnabled: false,
+          drilldownLayers: []
+        };
+        break;
+      case "to_do_chart":
+        newItem = { 
+          cols: 5, 
+          rows: 6, 
+          y: 0, 
+          x: 0, 
+          chartType: 'deal-details', 
+          name: 'Deal Details', 
+          id: newId,
+          chartlegend: true,
+          showlabel: true,
+          baseFilters: [],
+          drilldownEnabled: false,
+          drilldownLayers: []
+        };
+        break;
+      case "line_chart":
+        newItem = { 
+          cols: 5, 
+          rows: 6, 
+          y: 0, 
+          x: 0, 
+          chartType: 'quarterwise-flow', 
+          name: 'Quarterwise Flow', 
+          id: newId,
+          chartlegend: true,
+          showlabel: true,
+          baseFilters: [],
+          drilldownEnabled: false,
+          drilldownLayers: []
+        };
+        break;
+      case "compact_filter":
+        newItem = { 
+          cols: 3, 
+          rows: 2, 
+          y: 0, 
+          x: 0, 
+          chartType: 'compact-filter', 
+          name: 'Compact Filter', 
+          id: newId,
+          baseFilters: [],
+          drilldownEnabled: false,
+          drilldownLayers: []
+        };
+        break;
+      default:
+        newItem = { 
+          cols: 5, 
+          rows: 6, 
+          y: 0, 
+          x: 0, 
+          chartType: componentType, 
+          name: componentType, 
+          id: newId,
+          chartlegend: true,
+          showlabel: true,
+          baseFilters: [],
+          drilldownEnabled: false,
+          drilldownLayers: []
+        };
+    }
+    
+    // Add the new item to the dashboard
+    this.dashboard.push(newItem);
+  }
+
+  removeItem(item: ShieldDashboardItem) {
+    // Add the item to deleted items list before removing
+    this.deletedItems.push({...item});
+    
+    // Remove the item from the dashboard
+    this.dashboard.splice(this.dashboard.indexOf(item), 1);
+  }
+  
+  // Restore a deleted item
+  restoreItem(item: ShieldDashboardItem) {
+    // Remove from deleted items
+    this.deletedItems.splice(this.deletedItems.indexOf(item), 1);
+    
+    // Add back to dashboard
+    this.dashboard.push(item);
+  }
+  
+  // Clear all deleted items
+  clearDeletedItems() {
+    this.deletedItems = [];
+  }
+
+  itemChange() {
+    console.log('Item changed:', this.dashboard);
+  }
+  
+  itemResize(item: any, itemComponent: any) {
+    console.log('Item resized:', item);
+    // Trigger a window resize event to notify charts to resize
+    window.dispatchEvent(new Event('resize'));
+  }
+  
+  /**
+   * Extract only the relevant chart configuration properties to pass to chart components
+   * This prevents errors when trying to set properties that don't exist on the components
+   */
+  getChartInputs(item: any): any {
+    // Only pass properties that are relevant to chart components
+    const chartInputs = {
+      chartType: item.chartType,
+      name: item.name,
+      charttitle: item.charttitle,
+      connection: item.connection,
+      table: item.table,
+      xAxis: item.xAxis,
+      yAxis: item.yAxis,
+      chartlegend: item.chartlegend,
+      showlabel: item.showlabel,
+      baseFilters: item.baseFilters || [],
+      drilldownEnabled: item.drilldownEnabled,
+      drilldownApiUrl: item.drilldownApiUrl,
+      drilldownXAxis: item.drilldownXAxis,
+      drilldownYAxis: item.drilldownYAxis,
+      drilldownParameter: item.drilldownParameter,
+      drilldownFilters: item.drilldownFilters || [],
+      drilldownLayers: item.drilldownLayers || []
+    };
+    
+    // Remove undefined properties to avoid passing unnecessary data
+    Object.keys(chartInputs).forEach(key => {
+      if (chartInputs[key] === undefined) {
+        delete chartInputs[key];
+      }
+    });
+    
+    return chartInputs;
+  }
+  
+  // Open configuration modal for a chart
+  editGadget(item: ShieldDashboardItem) {
+    console.log('Opening configuration modal for item:', item);
+    this.selectedItem = item;
+    this.modeledit = true; // Use modeledit instead of configModalOpen
+    
+    // Initialize form with item data
+    this.configForm.patchValue({
+      charttitle: item.charttitle || '',
+      connection: item.connection || '',
+      table: item.table || '',
+      xAxis: item.xAxis || '',
+      yAxis: item.yAxis || [],
+      chartlegend: item.chartlegend !== undefined ? item.chartlegend : true,
+      showlabel: item.showlabel !== undefined ? item.showlabel : true
+    });
+    
+    console.log('Form values after patch:', this.configForm.value);
+    
+    // Load columns if table is set
+    if (item.table) {
+      this.getColumns(item.connection, item.table);
+    }
+    
+    // Load drilldown columns if drilldown API URL is set
+    if (item.drilldownApiUrl) {
+      this.refreshDrilldownColumns();
+    }
+  }
+  
+  // Save configuration changes
+  saveConfiguration() {
+    if (this.selectedItem) {
+      const formData = this.configForm.value;
+      console.log('Saving configuration:', formData);
+      
+      // Update the selected item with form data
+      Object.assign(this.selectedItem, formData);
+      
+      // Close the modal
+      this.modeledit = false; // Use modeledit instead of configModalOpen
+      this.selectedItem = null;
+    }
+  }
+  
+  // Cancel configuration changes
+  cancelConfiguration() {
+    console.log('Canceling configuration');
+    this.modeledit = false; // Use modeledit instead of configModalOpen
+    this.selectedItem = null;
+  }
+  
+  // Get tables from datastore
+  getTables(id: string) {
+    this.alertService.getTablefromstore(parseInt(id, 10)).subscribe(gateway => {
+      console.log(gateway);
+      // Handle table data
+    }, (error) => {
+      console.log(error);
+    });
+  }
+  
+  // Get columns from API
+  getColumns(connectionId: string, table: string) {
+    const connId = connectionId ? parseInt(connectionId, 10) : undefined;
+    this.alertService.getColumnfromurl(table, connId).subscribe(data => {
+      console.log('Column data:', data);
+      this.columnData = data;
+    }, (error) => {
+      console.log(error);
+      this.columnData = [];
+    });
+  }
+  
+  // Refresh drilldown columns
+  refreshDrilldownColumns() {
+    if (this.selectedItem && this.selectedItem.drilldownApiUrl) {
+      const connId = this.selectedItem.connection ? parseInt(this.selectedItem.connection, 10) : undefined;
+      this.alertService.getColumnfromurl(this.selectedItem.drilldownApiUrl, connId).subscribe(data => {
+        console.log('Drilldown column data:', data);
+        this.drilldownColumnData = data;
+      }, (error) => {
+        console.log('Error fetching drilldown columns:', error);
+        this.drilldownColumnData = [];
+      });
+    }
+  }
+  
+  // Add base filter
+  addBaseFilter() {
+    if (this.selectedItem) {
+      if (!this.selectedItem.baseFilters) {
+        this.selectedItem.baseFilters = [];
+      }
+      this.selectedItem.baseFilters.push({ field: '', value: '' });
+    }
+  }
+  
+  // Remove base filter
+  removeBaseFilter(index: number) {
+    if (this.selectedItem && this.selectedItem.baseFilters) {
+      this.selectedItem.baseFilters.splice(index, 1);
+    }
+  }
+  
+  // Add drilldown filter
+  addDrilldownFilter() {
+    if (this.selectedItem) {
+      if (!this.selectedItem.drilldownFilters) {
+        this.selectedItem.drilldownFilters = [];
+      }
+      this.selectedItem.drilldownFilters.push({ field: '', value: '' });
+    }
+  }
+  
+  // Remove drilldown filter
+  removeDrilldownFilter(index: number) {
+    if (this.selectedItem && this.selectedItem.drilldownFilters) {
+      this.selectedItem.drilldownFilters.splice(index, 1);
+    }
+  }
+  
+  // Add drilldown layer
+  addDrilldownLayer() {
+    if (this.selectedItem) {
+      if (!this.selectedItem.drilldownLayers) {
+        this.selectedItem.drilldownLayers = [];
+      }
+      this.selectedItem.drilldownLayers.push({
+        enabled: false,
+        apiUrl: '',
+        xAxis: '',
+        yAxis: '',
+        parameter: '',
+        filters: []
+      });
+    }
+  }
+  
+  // Remove drilldown layer
+  removeDrilldownLayer(index: number) {
+    if (this.selectedItem && this.selectedItem.drilldownLayers) {
+      this.selectedItem.drilldownLayers.splice(index, 1);
+    }
+  }
+  
+  // Add layer filter
+  addLayerFilter(layerIndex: number) {
+    if (this.selectedItem && this.selectedItem.drilldownLayers) {
+      const layer = this.selectedItem.drilldownLayers[layerIndex];
+      if (layer) {
+        if (!layer.filters) {
+          layer.filters = [];
+        }
+        layer.filters.push({ field: '', value: '' });
+      }
+    }
+  }
+  
+  // Refresh drilldown columns for a specific layer
+  refreshDrilldownLayerColumns(layerIndex: number) {
+    if (this.selectedItem && this.selectedItem.drilldownLayers && this.selectedItem.drilldownLayers[layerIndex]) {
+      const layer = this.selectedItem.drilldownLayers[layerIndex];
+      if (layer && layer.apiUrl) {
+        const connId = this.selectedItem.connection ? parseInt(this.selectedItem.connection, 10) : undefined;
+        this.alertService.getColumnfromurl(layer.apiUrl, connId).subscribe(data => {
+          console.log(`Drilldown layer ${layerIndex} column data:`, data);
+          // Store layer column data in the layerColumnData property
+          this.layerColumnData[layerIndex] = data;
+        }, (error) => {
+          console.log(`Error fetching drilldown layer ${layerIndex} columns:`, error);
+          this.layerColumnData[layerIndex] = [];
+        });
+      }
+    }
+  }
+  
+  // Remove layer filter
+  removeLayerFilter(layerIndex: number, filterIndex: number) {
+    if (this.selectedItem && this.selectedItem.drilldownLayers) {
+      const layer = this.selectedItem.drilldownLayers[layerIndex];
+      if (layer && layer.filters) {
+        layer.filters.splice(filterIndex, 1);
+      }
+    }
+  }
+}
\ No newline at end of file
diff --git a/frontend/angular-clarity-master/src/app/modules/main/builder/dashboardnew/gadgets/shield-dashboard/shield-dashboard.component.ts.fixed b/frontend/angular-clarity-master/src/app/modules/main/builder/dashboardnew/gadgets/shield-dashboard/shield-dashboard.component.ts.fixed
new file mode 100644
index 0000000..32eb2b3
--- /dev/null
+++ b/frontend/angular-clarity-master/src/app/modules/main/builder/dashboardnew/gadgets/shield-dashboard/shield-dashboard.component.ts.fixed
@@ -0,0 +1,223 @@
+import { Component, OnInit } from '@angular/core';
+import { GridsterConfig, GridsterItem } from 'angular-gridster2';
+
+interface ShieldDashboardItem extends GridsterItem {
+  chartType: string;
+  name: string;
+  id: number;
+  component?: any;
+}
+
+@Component({
+  selector: 'app-shield-dashboard',
+  templateUrl: './shield-dashboard.component.html',
+  styleUrls: ['./shield-dashboard.component.scss']
+})
+export class ShieldDashboardComponent implements OnInit {
+  options: GridsterConfig;
+  dashboard: Array<ShieldDashboardItem>;
+  
+  // Keep track of deleted items
+  deletedItems: Array<ShieldDashboardItem> = [];
+
+  constructor() { }
+
+  ngOnInit(): void {
+    this.options = {
+      gridType: 'fit',
+      enableEmptyCellDrop: true,
+      emptyCellDropCallback: this.onDrop,
+      pushItems: true,
+      swap: true,
+      pushDirections: { north: true, east: true, south: true, west: true },
+      resizable: { enabled: true },
+      itemChangeCallback: this.itemChange.bind(this),
+      draggable: {
+        enabled: true,
+        ignoreContent: true,
+        dropOverItems: true,
+        dragHandleClass: 'drag-handler',
+        ignoreContentClass: 'no-drag',
+      },
+      displayGrid: 'always',
+      minCols: 10,
+      minRows: 10,
+      itemResizeCallback: this.itemResize.bind(this)
+    };
+
+    // Initialize the dashboard with empty canvas
+    this.dashboard = [];
+  }
+
+  onDrop = (event: any) => {
+    // Handle dropping new components onto the dashboard
+    console.log('Item dropped:', event);
+    
+    // Get the component identifier from the drag event
+    const componentType = event.dataTransfer ? event.dataTransfer.getData('widgetIdentifier') : '';
+    console.log('Component type dropped:', componentType);
+    
+    if (componentType) {
+      this.addComponentToDashboard(componentType);
+    } else {
+      console.log('No component type found in drag data');
+    }
+  }
+  
+  // Add a new component to the dashboard
+  addComponentToDashboard(componentType: string) {
+    // Generate a new ID for the component
+    const newId = this.dashboard.length > 0 ? Math.max(...this.dashboard.map(item => item.id), 0) + 1 : 1;
+    
+    let newItem: ShieldDashboardItem;
+    
+    switch (componentType) {
+      case "bar_chart":
+        newItem = { 
+          cols: 5, 
+          rows: 6, 
+          y: 0, 
+          x: 0, 
+          chartType: 'bar-chart', 
+          name: 'Bar Chart', 
+          id: newId
+        };
+        break;
+      case "doughnut_chart":
+        // For doughnut charts, we'll need to determine which one based on existing items
+        const donutCount = this.dashboard.filter(item => item.chartType === 'donut-chart').length;
+        if (donutCount % 2 === 0) {
+          newItem = { 
+            cols: 5, 
+            rows: 6, 
+            y: 0, 
+            x: 0, 
+            chartType: 'donut-chart', 
+            name: 'End Customer Donut', 
+            id: newId
+          };
+        } else {
+          newItem = { 
+            cols: 5, 
+            rows: 6, 
+            y: 0, 
+            x: 0, 
+            chartType: 'donut-chart', 
+            name: 'Segment Penetration Donut', 
+            id: newId
+          };
+        }
+        break;
+      case "map_chart":
+        newItem = { 
+          cols: 5, 
+          rows: 6, 
+          y: 0, 
+          x: 0, 
+          chartType: 'map-chart', 
+          name: 'Map Chart', 
+          id: newId
+        };
+        break;
+      case "grid_view":
+        newItem = { 
+          cols: 10, 
+          rows: 6, 
+          y: 0, 
+          x: 0, 
+          chartType: 'data-table', 
+          name: 'Data Table', 
+          id: newId
+        };
+        break;
+      case "to_do_chart":
+        newItem = { 
+          cols: 5, 
+          rows: 6, 
+          y: 0, 
+          x: 0, 
+          chartType: 'deal-details', 
+          name: 'Deal Details', 
+          id: newId
+        };
+        break;
+      case "line_chart":
+        newItem = { 
+          cols: 5, 
+          rows: 6, 
+          y: 0, 
+          x: 0, 
+          chartType: 'quarterwise-flow', 
+          name: 'Quarterwise Flow', 
+          id: newId
+        };
+        break;
+      default:
+        newItem = { 
+          cols: 5, 
+          rows: 6, 
+          y: 0, 
+          x: 0, 
+          chartType: componentType, 
+          name: componentType, 
+          id: newId
+        };
+    }
+    
+    // Add the new item to the dashboard
+    this.dashboard.push(newItem);
+  }
+
+  removeItem(item: ShieldDashboardItem) {
+    // Add the item to deleted items list before removing
+    this.deletedItems.push({...item});
+    
+    // Remove the item from the dashboard
+    this.dashboard.splice(this.dashboard.indexOf(item), 1);
+  }
+  
+  // Restore a deleted item
+  restoreItem(item: ShieldDashboardItem) {
+    // Remove from deleted items
+    this.deletedItems.splice(this.deletedItems.indexOf(item), 1);
+    
+    // Add back to dashboard
+    this.dashboard.push(item);
+  }
+  
+  // Clear all deleted items
+  clearDeletedItems() {
+    this.deletedItems = [];
+  }
+
+  itemChange() {
+    console.log('Item changed:', this.dashboard);
+  }
+  
+  itemResize(item: any, itemComponent: any) {
+    console.log('Item resized:', item);
+    // Trigger a window resize event to notify charts to resize
+    window.dispatchEvent(new Event('resize'));
+  }
+  
+  /**
+   * Extract only the relevant chart configuration properties to pass to chart components
+   * This prevents errors when trying to set properties that don't exist on the components
+   */
+  getChartInputs(item: any): any {
+    // Only pass properties that are relevant to chart components
+    const chartInputs = {
+      chartType: item.chartType,
+      name: item.name
+    };
+    
+    // Remove undefined properties to avoid passing unnecessary data
+    Object.keys(chartInputs).forEach(key => {
+      if (chartInputs[key] === undefined) {
+        delete chartInputs[key];
+      }
+    });
+    
+    return chartInputs;
+  }
+}
\ No newline at end of file
diff --git a/frontend/angular-clarity-master/src/app/modules/main/builder/dashboardnew/gadgets/shield-dashboard/shield-dashboard.module.ts b/frontend/angular-clarity-master/src/app/modules/main/builder/dashboardnew/gadgets/shield-dashboard/shield-dashboard.module.ts
new file mode 100644
index 0000000..9a048b8
--- /dev/null
+++ b/frontend/angular-clarity-master/src/app/modules/main/builder/dashboardnew/gadgets/shield-dashboard/shield-dashboard.module.ts
@@ -0,0 +1,44 @@
+import { NgModule, CUSTOM_ELEMENTS_SCHEMA, NO_ERRORS_SCHEMA } from '@angular/core';
+import { CommonModule } from '@angular/common';
+import { FormsModule, ReactiveFormsModule } from '@angular/forms';
+import { ClarityModule } from '@clr/angular';
+import { GridsterModule } from 'angular-gridster2';
+import { NgChartsModule } from 'ng2-charts';
+import { DynamicModule } from 'ng-dynamic-component';
+
+import { ShieldDashboardRoutingModule } from './shield-dashboard-routing.module';
+import { ShieldDashboardComponent } from './shield-dashboard.component';
+import { SidebarFiltersComponent } from './components/sidebar-filters/sidebar-filters.component';
+import { BarChartComponent } from './components/bar-chart/bar-chart.component';
+import { DonutChartComponent } from './components/donut-chart/donut-chart.component';
+import { MapChartComponent } from './components/map-chart/map-chart.component';
+import { DataTableComponent } from './components/data-table/data-table.component';
+import { DealDetailsCardComponent } from './components/deal-details-card/deal-details-card.component';
+import { QuarterwiseFlowComponent } from './components/quarterwise-flow/quarterwise-flow.component';
+import { LoadingShimmerComponent } from './components/loading-shimmer/loading-shimmer.component';
+
+@NgModule({
+  declarations: [
+    ShieldDashboardComponent,
+    SidebarFiltersComponent,
+    BarChartComponent,
+    DonutChartComponent,
+    MapChartComponent,
+    DataTableComponent,
+    DealDetailsCardComponent,
+    QuarterwiseFlowComponent,
+    LoadingShimmerComponent
+  ],
+  imports: [
+    CommonModule,
+    FormsModule,
+    ReactiveFormsModule,
+    ClarityModule,
+    GridsterModule,
+    NgChartsModule,
+    DynamicModule,
+    ShieldDashboardRoutingModule
+  ],
+  schemas: [CUSTOM_ELEMENTS_SCHEMA, NO_ERRORS_SCHEMA]
+})
+export class ShieldDashboardModule { }
\ No newline at end of file
diff --git a/frontend/angular-clarity-master/src/app/modules/main/builder/dashboardnew/gadgets/to-do-chart/to-do-chart.component.html b/frontend/angular-clarity-master/src/app/modules/main/builder/dashboardnew/gadgets/to-do-chart/to-do-chart.component.html
index c9e47d0..16a2e1d 100644
--- a/frontend/angular-clarity-master/src/app/modules/main/builder/dashboardnew/gadgets/to-do-chart/to-do-chart.component.html
+++ b/frontend/angular-clarity-master/src/app/modules/main/builder/dashboardnew/gadgets/to-do-chart/to-do-chart.component.html
@@ -1,27 +1,307 @@
-<table class="table">
-  <thead>
-  <th class="c-col">#</th>
-  <th>Item</th>
-  <th></th>
-  </thead>
-  <tr class="ui basic segment" *ngFor="let todo of todoList; let i = index">
-      <td class="c-col">{{i + 1}}</td>
-      <td>{{todo}}</td>
-      <td style="text-align:right">
-          <a routerLink="." (click)="removeTodo(i)">
-              <clr-icon shape="times"></clr-icon>
-          </a>
-      </td>
-  </tr>
-  <tr>
-      <td></td>
-      <td>
-        <input [(ngModel)]="todo" placeholder="Add Todo" class="clr-input">
-      </td>
-      <td style="text-align:right">
-          <a  routerLink="." color='primary' (click)="addTodo(todo)">
-              <clr-icon shape="plus"></clr-icon>
-          </a>
-      </td>
-  </tr>
-</table>
+<div class="to-do-chart-container">
+  <!-- Filter Controls Section -->
+  <div class="filter-section" *ngIf="hasActiveFilters()">
+    <!-- Base Filters -->
+    <div class="filter-group" *ngIf="baseFilters && baseFilters.length > 0">
+      <h4>Base Filters</h4>
+      <div class="filter-controls">
+        <div *ngFor="let filter of baseFilters" class="filter-item">
+          <div class="filter-label">{{ filter.field }} ({{ filter.type || 'text' }})</div>
+          
+          <!-- Text Filter -->
+          <div *ngIf="!filter.type || filter.type === 'text'" class="filter-input">
+            <input type="text" 
+                   [(ngModel)]="filter.value" 
+                   (ngModelChange)="onBaseFilterChange(filter)"
+                   [placeholder]="filter.field"
+                   class="clr-input filter-text-input">
+          </div>
+          
+          <!-- Dropdown Filter -->
+          <div *ngIf="filter.type === 'dropdown'" class="filter-input">
+            <select [(ngModel)]="filter.value" 
+                    (ngModelChange)="onBaseFilterChange(filter)"
+                    class="clr-select filter-select">
+              <option value="">Select {{ filter.field }}</option>
+              <option *ngFor="let option of getFilterOptions(filter)" [value]="option">{{ option }}</option>
+            </select>
+          </div>
+          
+          <!-- Multi-Select Filter - Updated to show key first, then dropdown on click -->
+          <div *ngIf="filter.type === 'multiselect'" class="filter-input multiselect-container">
+            <div class="multiselect-display" (click)="toggleMultiselect(filter, 'base')">
+              <span class="multiselect-label">{{ filter.field }}</span>
+              <span class="multiselect-value" *ngIf="getSelectedOptionsCount(filter) > 0">
+                ({{ getSelectedOptionsCount(filter) }} selected)
+              </span>
+              <clr-icon shape="caret down" class="dropdown-icon"></clr-icon>
+            </div>
+            <div class="multiselect-dropdown" *ngIf="isMultiselectOpen(filter, 'base')">
+              <div class="checkbox-group">
+                <div *ngFor="let option of getFilterOptions(filter); let i = index" class="checkbox-item">
+                  <input type="checkbox" 
+                         [checked]="isOptionSelected(filter, option)" 
+                         (change)="onMultiSelectChange(filter, option, $event)"
+                         [id]="'base-' + filter.field + '-' + i" 
+                         class="clr-checkbox">
+                  <label [for]="'base-' + filter.field + '-' + i" class="checkbox-label">{{ option }}</label>
+                </div>
+              </div>
+            </div>
+          </div>
+          
+          <!-- Date Range Filter -->
+          <div *ngIf="filter.type === 'date-range'" class="filter-input date-range">
+            <div class="date-input-group">
+              <input type="date" 
+                     [(ngModel)]="filter.value.start" 
+                     (ngModelChange)="onDateRangeChange(filter, { start: $event, end: filter.value.end })"
+                     placeholder="Start Date"
+                     class="clr-input filter-date">
+              <span class="date-separator">to</span>
+              <input type="date" 
+                     [(ngModel)]="filter.value.end" 
+                     (ngModelChange)="onDateRangeChange(filter, { start: filter.value.start, end: $event })"
+                     placeholder="End Date"
+                     class="clr-input filter-date">
+            </div>
+          </div>
+          
+          <!-- Toggle Filter -->
+          <div *ngIf="filter.type === 'toggle'" class="filter-input toggle">
+            <input type="checkbox" 
+                   [(ngModel)]="filter.value" 
+                   (ngModelChange)="onToggleChange(filter, $event)"
+                   clrToggle 
+                   class="clr-toggle">
+            <label class="toggle-label">{{ filter.field }}</label>
+          </div>
+        </div>
+      </div>
+    </div>
+    
+    <!-- Drilldown Filters -->
+    <div class="filter-group" *ngIf="drilldownFilters && drilldownFilters.length > 0 && currentDrilldownLevel > 0">
+      <h4>Drilldown Filters</h4>
+      <div class="filter-controls">
+        <div *ngFor="let filter of drilldownFilters" class="filter-item">
+          <div class="filter-label">{{ filter.field }} ({{ filter.type || 'text' }})</div>
+          
+          <!-- Text Filter -->
+          <div *ngIf="!filter.type || filter.type === 'text'" class="filter-input">
+            <input type="text" 
+                   [(ngModel)]="filter.value" 
+                   (ngModelChange)="onDrilldownFilterChange(filter)"
+                   [placeholder]="filter.field"
+                   class="clr-input filter-text-input">
+          </div>
+          
+          <!-- Dropdown Filter -->
+          <div *ngIf="filter.type === 'dropdown'" class="filter-input">
+            <select [(ngModel)]="filter.value" 
+                    (ngModelChange)="onDrilldownFilterChange(filter)"
+                    class="clr-select filter-select">
+              <option value="">Select {{ filter.field }}</option>
+              <option *ngFor="let option of getFilterOptions(filter)" [value]="option">{{ option }}</option>
+            </select>
+          </div>
+          
+          <!-- Multi-Select Filter - Updated to show key first, then dropdown on click -->
+          <div *ngIf="filter.type === 'multiselect'" class="filter-input multiselect-container">
+            <div class="multiselect-display" (click)="toggleMultiselect(filter, 'drilldown')">
+              <span class="multiselect-label">{{ filter.field }}</span>
+              <span class="multiselect-value" *ngIf="getSelectedOptionsCount(filter) > 0">
+                ({{ getSelectedOptionsCount(filter) }} selected)
+              </span>
+              <clr-icon shape="caret down" class="dropdown-icon"></clr-icon>
+            </div>
+            <div class="multiselect-dropdown" *ngIf="isMultiselectOpen(filter, 'drilldown')">
+              <div class="checkbox-group">
+                <div *ngFor="let option of getFilterOptions(filter); let i = index" class="checkbox-item">
+                  <input type="checkbox" 
+                         [checked]="isOptionSelected(filter, option)" 
+                         (change)="onMultiSelectChange(filter, option, $event)"
+                         [id]="'drilldown-' + filter.field + '-' + i" 
+                         class="clr-checkbox">
+                  <label [for]="'drilldown-' + filter.field + '-' + i" class="checkbox-label">{{ option }}</label>
+                </div>
+              </div>
+            </div>
+          </div>
+          
+          <!-- Date Range Filter -->
+          <div *ngIf="filter.type === 'date-range'" class="filter-input date-range">
+            <div class="date-input-group">
+              <input type="date" 
+                     [(ngModel)]="filter.value.start" 
+                     (ngModelChange)="onDateRangeChange(filter, { start: $event, end: filter.value.end })"
+                     placeholder="Start Date"
+                     class="clr-input filter-date">
+              <span class="date-separator">to</span>
+              <input type="date" 
+                     [(ngModel)]="filter.value.end" 
+                     (ngModelChange)="onDateRangeChange(filter, { start: filter.value.start, end: $event })"
+                     placeholder="End Date"
+                     class="clr-input filter-date">
+            </div>
+          </div>
+          
+          <!-- Toggle Filter -->
+          <div *ngIf="filter.type === 'toggle'" class="filter-input toggle">
+            <input type="checkbox" 
+                   [(ngModel)]="filter.value" 
+                   (ngModelChange)="onToggleChange(filter, $event)"
+                   clrToggle 
+                   class="clr-toggle">
+            <label class="toggle-label">{{ filter.field }}</label>
+          </div>
+        </div>
+      </div>
+    </div>
+    
+    <!-- Layer Filters -->
+    <div class="filter-group" *ngIf="hasActiveLayerFilters()">
+      <h4>Layer Filters</h4>
+      <div class="filter-controls">
+        <div *ngFor="let filter of getActiveLayerFilters()" class="filter-item">
+          <div class="filter-label">{{ filter.field }} ({{ filter.type || 'text' }})</div>
+          
+          <!-- Text Filter -->
+          <div *ngIf="!filter.type || filter.type === 'text'" class="filter-input">
+            <input type="text" 
+                   [(ngModel)]="filter.value" 
+                   (ngModelChange)="onLayerFilterChange(filter)"
+                   [placeholder]="filter.field"
+                   class="clr-input filter-text-input">
+          </div>
+          
+          <!-- Dropdown Filter -->
+          <div *ngIf="filter.type === 'dropdown'" class="filter-input">
+            <select [(ngModel)]="filter.value" 
+                    (ngModelChange)="onLayerFilterChange(filter)"
+                    class="clr-select filter-select">
+              <option value="">Select {{ filter.field }}</option>
+              <option *ngFor="let option of getFilterOptions(filter)" [value]="option">{{ option }}</option>
+            </select>
+          </div>
+          
+          <!-- Multi-Select Filter - Updated to show key first, then dropdown on click -->
+          <div *ngIf="filter.type === 'multiselect'" class="filter-input multiselect-container">
+            <div class="multiselect-display" (click)="toggleMultiselect(filter, 'layer')">
+              <span class="multiselect-label">{{ filter.field }}</span>
+              <span class="multiselect-value" *ngIf="getSelectedOptionsCount(filter) > 0">
+                ({{ getSelectedOptionsCount(filter) }} selected)
+              </span>
+              <clr-icon shape="caret down" class="dropdown-icon"></clr-icon>
+            </div>
+            <div class="multiselect-dropdown" *ngIf="isMultiselectOpen(filter, 'layer')">
+              <div class="checkbox-group">
+                <div *ngFor="let option of getFilterOptions(filter); let i = index" class="checkbox-item">
+                  <input type="checkbox" 
+                         [checked]="isOptionSelected(filter, option)" 
+                         (change)="onMultiSelectChange(filter, option, $event)"
+                         [id]="'layer-' + filter.field + '-' + i" 
+                         class="clr-checkbox">
+                  <label [for]="'layer-' + filter.field + '-' + i" class="checkbox-label">{{ option }}</label>
+                </div>
+              </div>
+            </div>
+          </div>
+          
+          <!-- Date Range Filter -->
+          <div *ngIf="filter.type === 'date-range'" class="filter-input date-range">
+            <div class="date-input-group">
+              <input type="date" 
+                     [(ngModel)]="filter.value.start" 
+                     (ngModelChange)="onDateRangeChange(filter, { start: $event, end: filter.value.end })"
+                     placeholder="Start Date"
+                     class="clr-input filter-date">
+              <span class="date-separator">to</span>
+              <input type="date" 
+                     [(ngModel)]="filter.value.end" 
+                     (ngModelChange)="onDateRangeChange(filter, { start: filter.value.start, end: $event })"
+                     placeholder="End Date"
+                     class="clr-input filter-date">
+            </div>
+          </div>
+          
+          <!-- Toggle Filter -->
+          <div *ngIf="filter.type === 'toggle'" class="filter-input toggle">
+            <input type="checkbox" 
+                   [(ngModel)]="filter.value" 
+                   (ngModelChange)="onToggleChange(filter, $event)"
+                   clrToggle 
+                   class="clr-toggle">
+            <label class="toggle-label">{{ filter.field }}</label>
+          </div>
+        </div>
+      </div>
+    </div>
+    
+    <!-- Clear Filters Button -->
+    <div class="filter-actions">
+      <button class="btn btn-sm btn-outline" (click)="clearAllFilters()">Clear All Filters</button>
+    </div>
+  </div>
+  
+  <!-- Header row with chart title and drilldown navigation -->
+  <div class="clr-row header-row">
+    <div class="clr-col-6">
+      <h3 class="chart-title">{{charttitle || 'To Do Chart'}}</h3>
+    </div>
+    <div class="clr-col-6" style="text-align: right;">
+      <!-- Add drilldown navigation controls -->
+      <button class="btn btn-sm btn-link" *ngIf="drilldownEnabled && drilldownStack.length > 0" (click)="navigateBack()">
+        <cds-icon shape="arrow" direction="left"></cds-icon>
+        Back to {{drilldownStack.length > 1 ? 'Previous Level' : 'Main Data'}}
+      </button>
+    </div>
+  </div>
+  
+  <!-- Show current drilldown level -->
+  <div class="clr-row" *ngIf="drilldownEnabled && drilldownStack.length > 0">
+    <div class="clr-col-12">
+      <div class="alert alert-info" style="padding: 8px 12px; margin-bottom: 12px;">
+        <div class="alert-items">
+          <div class="alert-item static">
+            <div class="alert-icon-wrapper">
+              <cds-icon class="alert-icon" shape="info-circle"></cds-icon>
+            </div>
+            <span class="alert-text">
+              Drilldown Level: {{currentDrilldownLevel}} 
+              <span *ngIf="drilldownStack.length > 0">
+                (Clicked on: {{drilldownStack[drilldownStack.length - 1].clickedLabel}})
+              </span>
+            </span>
+          </div>
+        </div>
+      </div>
+    </div>
+  </div>
+  
+  <!-- Existing content -->
+  <div class="todo-table-container">
+    <table class="table todo-table">
+      <thead>
+      <th class="c-col">#</th>
+      <th>Item</th>
+      <th></th>
+      </thead>
+      <tr class="ui basic segment" *ngFor="let todo of todoList; let i = index">
+          <td class="c-col">{{i + 1}}</td>
+          <td>{{todo}}</td>
+          <td style="text-align:right">
+              <a (click)="removeTodo(i)" class="remove-button">
+                  <clr-icon shape="times"></clr-icon>
+              </a>
+          </td>
+      </tr>
+    </table>
+  </div>
+  <div class="add-todo-section">
+    <input [(ngModel)]="todo" (keyup.enter)="addTodo(todo)" placeholder="Add Todo" class="clr-input todo-input">
+    <button (click)="addTodo(todo)" class="btn btn-primary add-button">
+      <clr-icon shape="plus"></clr-icon> Add
+    </button>
+  </div>
+</div>
\ No newline at end of file
diff --git a/frontend/angular-clarity-master/src/app/modules/main/builder/dashboardnew/gadgets/to-do-chart/to-do-chart.component.scss b/frontend/angular-clarity-master/src/app/modules/main/builder/dashboardnew/gadgets/to-do-chart/to-do-chart.component.scss
index e69de29..598a4bc 100644
--- a/frontend/angular-clarity-master/src/app/modules/main/builder/dashboardnew/gadgets/to-do-chart/to-do-chart.component.scss
+++ b/frontend/angular-clarity-master/src/app/modules/main/builder/dashboardnew/gadgets/to-do-chart/to-do-chart.component.scss
@@ -0,0 +1,289 @@
+// To Do Chart specific styles
+.to-do-chart-container {
+  padding: 20px;
+  height: 100%;
+  display: flex;
+  flex-direction: column;
+}
+
+.todo-table-container {
+  flex: 1;
+  overflow-y: auto;
+  max-height: 400px;
+  border: 1px solid #ddd;
+  border-radius: 4px;
+  margin-bottom: 20px; // Add margin at the bottom for spacing
+  
+  .todo-table {
+    width: 100%;
+    border-collapse: collapse;
+    margin: 0;
+    
+    th, td {
+      padding: 12px;
+      text-align: left;
+      border-bottom: 1px solid #ddd;
+    }
+    
+    th {
+      background-color: #f2f2f2;
+      font-weight: bold;
+      position: sticky;
+      top: 0;
+      z-index: 10;
+    }
+    
+    tr:hover {
+      background-color: #f5f5f5;
+    }
+    
+    .c-col {
+      width: 50px;
+    }
+    
+    // Add padding at the bottom of the table body
+    tbody {
+      tr:last-child td {
+        padding-bottom: 20px; // Extra padding for the last row
+      }
+    }
+  }
+}
+
+.add-todo-section {
+  display: flex;
+  gap: 10px;
+  margin-top: 15px;
+  padding: 20px; // Increased padding all around
+  border-top: 1px solid #eee;
+  border: 1px solid #ddd;
+  border-radius: 4px;
+  background-color: #f9f9f9;
+  
+  .todo-input {
+    flex: 1;
+    padding: 12px; // Increased padding for better touch targets
+    border: 1px solid #ccc;
+    border-radius: 4px;
+    font-size: 14px;
+  }
+  
+  .add-button {
+    white-space: nowrap;
+    padding: 12px 20px; // Increased padding for better touch targets
+  }
+}
+
+.remove-button {
+  background: none;
+  border: none;
+  cursor: pointer;
+  padding: 8px; // Increased padding for better touch targets
+  border-radius: 3px;
+  color: #dc3545;
+  
+  &:hover {
+    background-color: #e0e0e0;
+  }
+}
+
+.filter-section {
+  margin-bottom: 20px;
+  padding: 15px;
+  border: 1px solid #ddd;
+  border-radius: 4px;
+  background-color: #f9f9f9;
+}
+
+.filter-group {
+  margin-bottom: 15px;
+  
+  h4 {
+    margin-top: 0;
+    margin-bottom: 10px;
+    color: #333;
+    font-weight: 600;
+  }
+}
+
+.filter-controls {
+  display: flex;
+  flex-wrap: wrap;
+  gap: 15px;
+}
+
+.filter-item {
+  flex: 1 1 300px;
+  min-width: 250px;
+  padding: 10px;
+  background: white;
+  border: 1px solid #e0e0e0;
+  border-radius: 4px;
+}
+
+.filter-label {
+  font-weight: 500;
+  margin-bottom: 8px;
+  color: #555;
+  font-size: 14px;
+}
+
+.filter-input {
+  width: 100%;
+  
+  .filter-text-input,
+  .filter-select,
+  .filter-date {
+    width: 100%;
+    padding: 6px 12px;
+    border: 1px solid #ccc;
+    border-radius: 4px;
+    font-size: 14px;
+  }
+  
+  .filter-select {
+    height: 34px;
+  }
+}
+
+.multiselect-container {
+  position: relative;
+}
+
+.multiselect-display {
+  display: flex;
+  align-items: center;
+  justify-content: space-between;
+  padding: 6px 12px;
+  border: 1px solid #ccc;
+  border-radius: 4px;
+  background: white;
+  cursor: pointer;
+  min-height: 34px;
+  
+  .multiselect-label {
+    flex: 1;
+    font-size: 14px;
+  }
+  
+  .multiselect-value {
+    color: #666;
+    font-size: 12px;
+    margin-right: 8px;
+  }
+  
+  .dropdown-icon {
+    flex-shrink: 0;
+    transition: transform 0.2s ease;
+  }
+  
+  &:hover {
+    border-color: #999;
+  }
+}
+
+.multiselect-dropdown {
+  position: absolute;
+  top: 100%;
+  left: 0;
+  right: 0;
+  z-index: 1000;
+  background: white;
+  border: 1px solid #ccc;
+  border-top: none;
+  border-radius: 0 0 4px 4px;
+  box-shadow: 0 2px 4px rgba(0,0,0,0.1);
+  max-height: 200px;
+  overflow-y: auto;
+  
+  .checkbox-group {
+    padding: 8px;
+    
+    .checkbox-item {
+      display: flex;
+      align-items: center;
+      gap: 8px;
+      padding: 4px 0;
+      
+      .checkbox-label {
+        margin: 0;
+        font-size: 14px;
+        cursor: pointer;
+      }
+    }
+  }
+}
+
+.date-range {
+  .date-input-group {
+    display: flex;
+    align-items: center;
+    gap: 8px;
+  }
+  
+  .date-separator {
+    margin: 0 5px;
+    color: #777;
+  }
+}
+
+.toggle {
+  display: flex;
+  align-items: center;
+  gap: 8px;
+  
+  .toggle-label {
+    margin: 0;
+    font-size: 14px;
+    cursor: pointer;
+  }
+}
+
+.filter-actions {
+  margin-top: 15px;
+  padding-top: 15px;
+  border-top: 1px solid #eee;
+  
+  .btn {
+    font-size: 13px;
+  }
+}
+
+// New header row styling
+.header-row {
+  margin-bottom: 15px;
+  padding-bottom: 10px;
+  border-bottom: 1px solid #eee;
+  
+  .chart-title {
+    margin: 0;
+    font-size: 18px;
+    font-weight: 600;
+    color: #333;
+  }
+}
+
+// Responsive design
+@media (max-width: 768px) {
+  .filter-controls {
+    flex-direction: column;
+  }
+  
+  .filter-item {
+    min-width: 100%;
+  }
+  
+  .header-row {
+    .chart-title {
+      font-size: 16px;
+    }
+  }
+  
+  .add-todo-section {
+    flex-direction: column;
+  }
+  
+  .to-do-chart-container {
+    padding: 15px; // Adjust padding for mobile
+  }
+}
\ No newline at end of file
diff --git a/frontend/angular-clarity-master/src/app/modules/main/builder/dashboardnew/gadgets/to-do-chart/to-do-chart.component.ts b/frontend/angular-clarity-master/src/app/modules/main/builder/dashboardnew/gadgets/to-do-chart/to-do-chart.component.ts
index ae84296..1866f1d 100644
--- a/frontend/angular-clarity-master/src/app/modules/main/builder/dashboardnew/gadgets/to-do-chart/to-do-chart.component.ts
+++ b/frontend/angular-clarity-master/src/app/modules/main/builder/dashboardnew/gadgets/to-do-chart/to-do-chart.component.ts
@@ -1,4 +1,7 @@
 import { Component, OnInit, Input, OnChanges, SimpleChanges } from '@angular/core';
+import { Dashboard3Service } from 'src/app/services/builder/dashboard3.service';
+import { FilterService } from '../../common-filter/filter.service';
+import { Subscription } from 'rxjs';
 
 @Component({
   selector: 'app-to-do-chart',
@@ -21,15 +24,49 @@ export class ToDoChartComponent implements OnInit, OnChanges {
   @Input() datasource: string;
   @Input() fieldName: string;
   @Input() connection: number; // Add connection input
+  // Drilldown configuration inputs
+  @Input() drilldownEnabled: boolean = false;
+  @Input() drilldownApiUrl: string;
+  @Input() drilldownXAxis: string;
+  @Input() drilldownYAxis: string;
+  @Input() drilldownParameter: string; // Add drilldown parameter input
+  @Input() baseFilters: any[] = []; // Add base filters input
+  @Input() drilldownFilters: any[] = []; // Add drilldown filters input
+  // Multi-layer drilldown configuration inputs
+  @Input() drilldownLayers: any[] = []; // Array of drilldown layer configurations
+  
+  // Multi-layer drilldown state tracking
+  drilldownStack: any[] = []; // Stack to track drilldown navigation history
+  currentDrilldownLevel: number = 0; // Current drilldown level (0 = base level)
+  originalTodoList: string[] = [];
 
-  constructor() { }
-
+  constructor(
+    private dashboardService: Dashboard3Service,
+    private filterService: FilterService
+  ) { }
+  
   ngOnInit(): void {
+    // Subscribe to filter changes
+    this.subscriptions.push(
+      this.filterService.filterState$.subscribe(filters => {
+        // When filters change, refresh the chart data
+        this.fetchToDoData();
+      })
+    );
+    
+    // Initialize with default data
+    this.fetchToDoData();
   }
   
   ngOnChanges(changes: SimpleChanges): void {
     console.log('ToDoChartComponent input changes:', changes);
     
+    // Initialize filter values if they haven't been initialized yet
+    if (!this.filtersInitialized && (changes.baseFilters || changes.drilldownFilters || changes.drilldownLayers)) {
+      this.initializeFilterValues();
+      this.filtersInitialized = true;
+    }
+    
     // Check if any of the key properties have changed
     const xAxisChanged = changes.xAxis && !changes.xAxis.firstChange;
     const yAxisChanged = changes.yAxis && !changes.yAxis.firstChange;
@@ -46,26 +83,119 @@ export class ToDoChartComponent implements OnInit, OnChanges {
   
   data: any;
   todo: string;
-  todoList = ['todo 1'];
+  todoList: string[] = [];
+  
+  // Add properties for filter functionality
+  private openMultiselects: Map<string, string> = new Map(); // Map of filterId -> context
+  private documentClickHandler: ((event: MouseEvent) => void) | null = null;
+  private filtersInitialized: boolean = false;
+  
+  // Subscriptions to unsubscribe on destroy
+  private subscriptions: Subscription[] = [];
   
   fetchToDoData(): void {
     // If we have the necessary data, fetch to-do data from the service
-    if (this.table) {
-      console.log('Fetching to-do data for:', { table: this.table });
+    if (this.table && this.xAxis) {
+      console.log('Fetching to-do data for:', { table: this.table, xAxis: this.xAxis, connection: this.connection });
       
-      // For to-do chart, we might want to fetch data differently
-      // This is a placeholder implementation - you may need to adjust based on your API
-      console.log('To-do chart would fetch data from table:', this.table);
+      // Convert baseFilters to filter parameters
+      let filterParams = '';
+      if (this.baseFilters && this.baseFilters.length > 0) {
+        const filterObj = {};
+        this.baseFilters.forEach(filter => {
+          if (filter.field && filter.value) {
+            filterObj[filter.field] = filter.value;
+          }
+        });
+        if (Object.keys(filterObj).length > 0) {
+          filterParams = JSON.stringify(filterObj);
+        }
+      }
       
-      // In a real implementation, you would connect to your service here
-      // For now, we'll just keep the default to-do list
+      // Add common filters to filter parameters
+      const commonFilters = this.filterService.getFilterValues();
+      console.log('Common filters from service:', commonFilters);
+      
+      if (Object.keys(commonFilters).length > 0) {
+        // Merge common filters with base filters
+        const mergedFilterObj = {};
+        
+        // Add base filters first
+        if (filterParams) {
+          try {
+            const baseFilterObj = JSON.parse(filterParams);
+            Object.assign(mergedFilterObj, baseFilterObj);
+          } catch (e) {
+            console.warn('Failed to parse base filter parameters:', e);
+          }
+        }
+        
+        // Add common filters using the field name as the key, not the filter id
+        Object.keys(commonFilters).forEach(filterId => {
+          const filterValue = commonFilters[filterId];
+          // Find the filter definition to get the field name
+          const filterDef = this.filterService.getFilters().find(f => f.id === filterId);
+          if (filterDef && filterDef.field) {
+            const fieldName = filterDef.field;
+            if (filterValue !== undefined && filterValue !== null && filterValue !== '') {
+              mergedFilterObj[fieldName] = filterValue;
+            }
+          } else {
+            // Fallback to using filterId as field name if no field is defined
+            if (filterValue !== undefined && filterValue !== null && filterValue !== '') {
+              mergedFilterObj[filterId] = filterValue;
+            }
+          }
+        });
+        
+        if (Object.keys(mergedFilterObj).length > 0) {
+          filterParams = JSON.stringify(mergedFilterObj);
+        }
+      }
+      
+      console.log('Final filter parameters:', filterParams);
+      
+      // Fetch data from the dashboard service
+      this.dashboardService.getChartData(this.table, 'todo', this.xAxis, '', this.connection, '', '', filterParams).subscribe(
+        (data: any) => {
+          console.log('Received to-do chart data:', data);
+          if (data === null) {
+            console.warn('To-do chart API returned null data. Check if the API endpoint is working correctly.');
+            this.todoList = [];
+            return;
+          }
+          
+          // Handle the actual data structure returned by the API
+          if (data && data.chartLabels) {
+            // Use chartLabels as the todo items
+            this.todoList = data.chartLabels;
+          } else if (data && data.labels) {
+            // Fallback to labels if chartLabels is not available
+            this.todoList = data.labels;
+          } else {
+            console.warn('To-do chart received data does not have expected structure', data);
+            this.todoList = [];
+          }
+        },
+        (error) => {
+          console.error('Error fetching to-do chart data:', error);
+          this.todoList = [];
+        }
+      );
     } else {
-      console.log('Missing required data for to-do chart:', { table: this.table });
+      console.log('Missing required data for to-do chart:', { table: this.table, xAxis: this.xAxis });
+      // Initialize with default data if no table is specified
+      if (this.todoList.length === 0) {
+        this.todoList = ['Sample Task 1', 'Sample Task 2', 'Sample Task 3'];
+      }
     }
   }
 
   public addTodo(todo: string) {
-    this.todoList.push(todo);
+    if (todo && todo.trim() !== '') {
+      this.todoList.push(todo.trim());
+      this.todo = ''; // Clear the input field
+    }
   }
 
   public removeTodo(todoIx: number) {
@@ -73,4 +203,353 @@ export class ToDoChartComponent implements OnInit, OnChanges {
         this.todoList.splice(todoIx, 1);
     }
   }
+  
+  // Navigate back to previous drilldown level
+  navigateBack(): void {
+    console.log('Navigating back, current stack:', this.drilldownStack);
+    console.log('Current level:', this.currentDrilldownLevel);
+    
+    if (this.drilldownStack.length > 0) {
+      // Remove the last entry from the stack
+      const removedEntry = this.drilldownStack.pop();
+      console.log('Removed entry from stack:', removedEntry);
+      
+      // Update the current drilldown level
+      this.currentDrilldownLevel = this.drilldownStack.length;
+      console.log('New level after pop:', this.currentDrilldownLevel);
+      console.log('Stack after pop:', this.drilldownStack);
+      
+      if (this.drilldownStack.length > 0) {
+        // Fetch data for the previous level
+        console.log('Fetching data for previous level');
+        this.fetchToDoData();
+      } else {
+        // Back to base level
+        console.log('Back to base level, resetting to original data');
+        this.todoList = [...this.originalTodoList];
+      }
+    } else {
+      // Already at base level, reset to original data
+      console.log('Already at base level, resetting to original data');
+      this.todoList = [...this.originalTodoList];
+    }
+  }
+  
+  // Initialize filter values with proper default values based on type
+  private initializeFilterValues(): void {
+    console.log('Initializing filter values');
+    
+    // Initialize base filters
+    if (this.baseFilters) {
+      this.baseFilters.forEach(filter => {
+        if (filter.value === undefined || filter.value === null) {
+          switch (filter.type) {
+            case 'multiselect':
+              filter.value = [];
+              break;
+            case 'date-range':
+              filter.value = { start: null, end: null };
+              break;
+            case 'toggle':
+              filter.value = false;
+              break;
+            default:
+              filter.value = '';
+          }
+        }
+      });
+    }
+    
+    // Initialize drilldown filters
+    if (this.drilldownFilters) {
+      this.drilldownFilters.forEach(filter => {
+        if (filter.value === undefined || filter.value === null) {
+          switch (filter.type) {
+            case 'multiselect':
+              filter.value = [];
+              break;
+            case 'date-range':
+              filter.value = { start: null, end: null };
+              break;
+            case 'toggle':
+              filter.value = false;
+              break;
+            default:
+              filter.value = '';
+          }
+        }
+      });
+    }
+    
+    // Initialize layer filters
+    if (this.drilldownLayers) {
+      this.drilldownLayers.forEach(layer => {
+        if (layer.filters) {
+          layer.filters.forEach((filter: any) => {
+            if (filter.value === undefined || filter.value === null) {
+              switch (filter.type) {
+                case 'multiselect':
+                  filter.value = [];
+                  break;
+                case 'date-range':
+                  filter.value = { start: null, end: null };
+                  break;
+                case 'toggle':
+                  filter.value = false;
+                  break;
+                default:
+                  filter.value = '';
+              }
+            }
+          });
+        }
+      });
+    }
+    
+    console.log('Filter values initialized:', {
+      baseFilters: this.baseFilters,
+      drilldownFilters: this.drilldownFilters,
+      drilldownLayers: this.drilldownLayers
+    });
+  }
+
+  // Check if there are active filters
+  hasActiveFilters(): boolean {
+    return (this.baseFilters && this.baseFilters.length > 0) || 
+           (this.drilldownFilters && this.drilldownFilters.length > 0) || 
+           this.hasActiveLayerFilters();
+  }
+
+  // Check if there are active layer filters for current drilldown level
+  hasActiveLayerFilters(): boolean {
+    if (this.currentDrilldownLevel > 1 && this.drilldownLayers && this.drilldownLayers.length > 0) {
+      const layerIndex = this.currentDrilldownLevel - 2; // -2 because level 1 is base drilldown
+      return layerIndex < this.drilldownLayers.length && 
+             this.drilldownLayers[layerIndex].filters && 
+             this.drilldownLayers[layerIndex].filters.length > 0;
+    }
+    return false;
+  }
+
+  // Get active layer filters for current drilldown level
+  getActiveLayerFilters(): any[] {
+    if (this.currentDrilldownLevel > 1 && this.drilldownLayers && this.drilldownLayers.length > 0) {
+      const layerIndex = this.currentDrilldownLevel - 2; // -2 because level 1 is base drilldown
+      if (layerIndex < this.drilldownLayers.length && 
+          this.drilldownLayers[layerIndex].filters) {
+        return this.drilldownLayers[layerIndex].filters;
+      }
+    }
+    return [];
+  }
+
+  // Get filter options for dropdown/multiselect filters
+  getFilterOptions(filter: any): string[] {
+    if (filter.options) {
+      if (Array.isArray(filter.options)) {
+        return filter.options;
+      } else if (typeof filter.options === 'string') {
+        return filter.options.split(',').map(opt => opt.trim()).filter(opt => opt);
+      }
+    }
+    return [];
+  }
+
+  // Check if an option is selected for multiselect filters
+  isOptionSelected(filter: any, option: string): boolean {
+    if (!filter.value) {
+      return false;
+    }
+    
+    if (Array.isArray(filter.value)) {
+      return filter.value.includes(option);
+    }
+    
+    return filter.value === option;
+  }
+
+  // Handle base filter changes
+  onBaseFilterChange(filter: any): void {
+    console.log('Base filter changed:', filter);
+    // Refresh data when filter changes
+    this.fetchToDoData();
+  }
+
+  // Handle drilldown filter changes
+  onDrilldownFilterChange(filter: any): void {
+    console.log('Drilldown filter changed:', filter);
+    // Refresh data when filter changes
+    this.fetchToDoData();
+  }
+
+  // Handle layer filter changes
+  onLayerFilterChange(filter: any): void {
+    console.log('Layer filter changed:', filter);
+    // Refresh data when filter changes
+    this.fetchToDoData();
+  }
+
+  // Handle multiselect changes
+  onMultiSelectChange(filter: any, option: string, event: any): void {
+    const checked = event.target.checked;
+    
+    // Initialize filter.value as array if it's not already
+    if (!Array.isArray(filter.value)) {
+      filter.value = [];
+    }
+    
+    if (checked) {
+      // Add option to array if not already present
+      if (!filter.value.includes(option)) {
+        filter.value.push(option);
+      }
+    } else {
+      // Remove option from array
+      filter.value = filter.value.filter((item: string) => item !== option);
+    }
+    
+    // Refresh data when filter changes
+    this.fetchToDoData();
+  }
+
+  // Handle date range changes
+  onDateRangeChange(filter: any, dateRange: { start: string | null, end: string | null }): void {
+    filter.value = dateRange;
+    // Refresh data when filter changes
+    this.fetchToDoData();
+  }
+
+  // Handle toggle changes
+  onToggleChange(filter: any, checked: boolean): void {
+    filter.value = checked;
+    // Refresh data when filter changes
+    this.fetchToDoData();
+  }
+
+  // Toggle multiselect dropdown visibility
+  toggleMultiselect(filter: any, context: string): void {
+    const filterId = `${context}-${filter.field}`;
+    if (this.isMultiselectOpen(filter, context)) {
+      this.openMultiselects.delete(filterId);
+    } else {
+      // Close all other multiselects first
+      this.openMultiselects.clear();
+      this.openMultiselects.set(filterId, context);
+      
+      // Add document click handler to close dropdown when clicking outside
+      this.addDocumentClickHandler();
+    }
+  }
+
+  // Add document click handler to close dropdowns when clicking outside
+  private addDocumentClickHandler(): void {
+    if (!this.documentClickHandler) {
+      this.documentClickHandler = (event: MouseEvent) => {
+        const target = event.target as HTMLElement;
+        // Check if click is outside any multiselect dropdown
+        if (!target.closest('.multiselect-container')) {
+          this.openMultiselects.clear();
+          this.removeDocumentClickHandler();
+        }
+      };
+      
+      // Use setTimeout to ensure the click event that opened the dropdown doesn't immediately close it
+      setTimeout(() => {
+        document.addEventListener('click', this.documentClickHandler!);
+      }, 0);
+    }
+  }
+
+  // Remove document click handler
+  private removeDocumentClickHandler(): void {
+    if (this.documentClickHandler) {
+      document.removeEventListener('click', this.documentClickHandler);
+      this.documentClickHandler = null;
+    }
+  }
+
+  // Check if multiselect dropdown is open
+  isMultiselectOpen(filter: any, context: string): boolean {
+    const filterId = `${context}-${filter.field}`;
+    return this.openMultiselects.has(filterId);
+  }
+
+  // Get count of selected options for a multiselect filter
+  getSelectedOptionsCount(filter: any): number {
+    if (!filter.value) {
+      return 0;
+    }
+    
+    if (Array.isArray(filter.value)) {
+      return filter.value.length;
+    }
+    
+    return 0;
+  }
+
+  // Clear all filters
+  clearAllFilters(): void {
+    // Clear base filters
+    if (this.baseFilters) {
+      this.baseFilters.forEach(filter => {
+        if (filter.type === 'multiselect') {
+          filter.value = [];
+        } else if (filter.type === 'date-range') {
+          filter.value = { start: null, end: null };
+        } else if (filter.type === 'toggle') {
+          filter.value = false;
+        } else {
+          filter.value = '';
+        }
+      });
+    }
+    
+    // Clear drilldown filters
+    if (this.drilldownFilters) {
+      this.drilldownFilters.forEach(filter => {
+        if (filter.type === 'multiselect') {
+          filter.value = [];
+        } else if (filter.type === 'date-range') {
+          filter.value = { start: null, end: null };
+        } else if (filter.type === 'toggle') {
+          filter.value = false;
+        } else {
+          filter.value = '';
+        }
+      });
+    }
+    
+    // Clear layer filters
+    if (this.drilldownLayers) {
+      this.drilldownLayers.forEach(layer => {
+        if (layer.filters) {
+          layer.filters.forEach((filter: any) => {
+            if (filter.type === 'multiselect') {
+              filter.value = [];
+            } else if (filter.type === 'date-range') {
+              filter.value = { start: null, end: null };
+            } else if (filter.type === 'toggle') {
+              filter.value = false;
+            } else {
+              filter.value = '';
+            }
+          });
+        }
+      });
+    }
+    
+    // Close all multiselect dropdowns
+    this.openMultiselects.clear();
+    
+    // Refresh data
+    this.fetchToDoData();
+  }
+  
+  ngOnDestroy(): void {
+    // Unsubscribe from all subscriptions to prevent memory leaks
+    this.subscriptions.forEach(subscription => subscription.unsubscribe());
+    
+    // Remove document click handler if it exists
+    this.removeDocumentClickHandler();
+  }
 }
\ No newline at end of file
diff --git a/frontend/angular-clarity-master/src/app/modules/main/builder/dashboardnew/gadgets/unified-chart/index.ts b/frontend/angular-clarity-master/src/app/modules/main/builder/dashboardnew/gadgets/unified-chart/index.ts
new file mode 100644
index 0000000..3552a7e
--- /dev/null
+++ b/frontend/angular-clarity-master/src/app/modules/main/builder/dashboardnew/gadgets/unified-chart/index.ts
@@ -0,0 +1 @@
+export * from './unified-chart.component';
\ No newline at end of file
diff --git a/frontend/angular-clarity-master/src/app/modules/main/builder/dashboardnew/gadgets/unified-chart/unified-chart.component.html b/frontend/angular-clarity-master/src/app/modules/main/builder/dashboardnew/gadgets/unified-chart/unified-chart.component.html
new file mode 100644
index 0000000..cf50dfa
--- /dev/null
+++ b/frontend/angular-clarity-master/src/app/modules/main/builder/dashboardnew/gadgets/unified-chart/unified-chart.component.html
@@ -0,0 +1,296 @@
+<div class="chart-container" *ngIf="!noDataAvailable && !isLoading">
+  <!-- Back button for drilldown navigation -->
+  <div class="drilldown-back" *ngIf="currentDrilldownLevel > 0">
+    <button class="btn btn-sm btn-secondary" (click)="navigateBack()">
+      <clr-icon shape="arrow" dir="left"></clr-icon>
+      Back
+    </button>
+    <span class="drilldown-level">Level: {{ currentDrilldownLevel }}</span>
+  </div>
+
+  <!-- Chart title -->
+  <div class="chart-title" *ngIf="charttitle">
+    <h4>{{ charttitle }}</h4>
+  </div>
+
+  <!-- Filter toggle icon -->
+  <div class="filter-toggle-icon" *ngIf="hasFilters()" (click)="toggleFilters()">
+    <clr-icon shape="filter" size="24" 
+              [style.color]="showFilters ? '#007cba' : '#666'"
+              title="Toggle Filters">
+    </clr-icon>
+    <span>
+      {{ showFilters ? 'Hide Filters' : 'Show Filters' }}
+    </span>
+  </div>
+
+  <!-- Render different chart types based on chartType input -->
+  <div class="chart-wrapper">
+    <!-- Dynamic Chart Container - uses extracted dynamic options and styles but static template -->
+    <div *ngIf="dynamicTemplate || chartType" class="chart-canvas-container">
+      <canvas baseChart
+        [datasets]="chartData"
+        [labels]="chartLabels"
+        [options]="chartOptions"
+        [legend]="chartLegend"
+        [chartType]="chartType || 'bar'"
+        (chartClick)="chartClicked($event)"
+        (chartHover)="chartHovered($event)">
+      </canvas>
+    </div>
+
+    <!-- Fallback for when no chart type is specified -->
+    <div *ngIf="!dynamicTemplate && !chartType" class="chart-canvas-container">
+      <canvas baseChart
+        [datasets]="chartData"
+        [labels]="chartLabels"
+        [options]="chartOptions"
+        [legend]="chartLegend"
+        [chartType]="'bar'"
+        (chartClick)="chartClicked($event)"
+        (chartHover)="chartHovered($event)">
+      </canvas>
+    </div>
+  </div>
+
+  <!-- Collapsible Base Filters -->
+  <div class="filters-section" *ngIf="baseFilters && baseFilters.length > 0 && showFilters">
+    <h5>Filters</h5>
+    <div class="filters-container">
+      <div class="filter-item" *ngFor="let filter of baseFilters; let i = index">
+        <!-- Text Filter -->
+        <div *ngIf="!filter.type || filter.type === 'text'" class="filter-text">
+          <label>{{ filter.field || 'Filter ' + (i + 1) }}</label>
+          <input type="text" [(ngModel)]="filter.value" (ngModelChange)="onBaseFilterChange(filter)" 
+                 class="form-control" placeholder="Enter {{ filter.field || 'value' }}">
+        </div>
+
+        <!-- Dropdown Filter -->
+        <div *ngIf="filter.type === 'dropdown'" class="filter-dropdown">
+          <label>{{ filter.field || 'Filter ' + (i + 1) }}</label>
+          <select [(ngModel)]="filter.value" (ngModelChange)="onBaseFilterChange(filter)" class="form-control">
+            <option value="">Select {{ filter.field || 'value' }}</option>
+            <option *ngFor="let option of getFilterOptions(filter)" [value]="option">
+              {{ option }}
+            </option>
+          </select>
+        </div>
+
+        <!-- Multiselect Filter -->
+        <div *ngIf="filter.type === 'multiselect'" class="filter-multiselect">
+          <label>{{ filter.field || 'Filter ' + (i + 1) }}</label>
+          <div class="multiselect-container">
+            <div class="multiselect-display" (click)="toggleMultiselect(filter, 'base')">
+              <span *ngIf="!filter.value || (Array.isArray(filter.value) && filter.value.length === 0)">Select {{ filter.field || 'options' }}</span>
+              <span *ngIf="filter.value && !Array.isArray(filter.value)">
+                {{ filter.value }}
+              </span>
+              <span *ngIf="filter.value && Array.isArray(filter.value) && filter.value.length > 0">
+                {{ filter.value.length }} selected
+              </span>
+            </div>
+            <div class="multiselect-dropdown" *ngIf="isMultiselectOpen(filter, 'base')">
+              <div class="multiselect-option" *ngFor="let option of getFilterOptions(filter)">
+                <input type="checkbox" 
+                       [checked]="isOptionSelected(filter, option)"
+                       (change)="onMultiSelectChange(filter, option, $event)"
+                       id="base-{{ filter.field }}-{{ option }}">
+                <label [for]="'base-' + filter.field + '-' + option">{{ option }}</label>
+              </div>
+            </div>
+          </div>
+        </div>
+
+        <!-- Date Range Filter -->
+        <div *ngIf="filter.type === 'date-range'" class="filter-date-range">
+          <label>{{ filter.field || 'Filter ' + (i + 1) }}</label>
+          <div class="date-range-inputs">
+            <input type="date" [(ngModel)]="filter.value.start" (ngModelChange)="onDateRangeInputChange(filter, 'start', $event)" 
+                   class="form-control" placeholder="Start Date">
+            <input type="date" [(ngModel)]="filter.value.end" (ngModelChange)="onDateRangeInputChange(filter, 'end', $event)" 
+                   class="form-control" placeholder="End Date">
+          </div>
+        </div>
+
+        <!-- Toggle Filter -->
+        <div *ngIf="filter.type === 'toggle'" class="filter-toggle">
+          <label>{{ filter.field || 'Filter ' + (i + 1) }}</label>
+          <div class="toggle-switch">
+            <input type="checkbox" [(ngModel)]="filter.value" (ngModelChange)="onToggleChange(filter, $event.target.checked)" 
+                   id="toggle-{{ filter.field }}">
+            <label [for]="'toggle-' + filter.field" class="toggle-label">
+              <span class="toggle-slider"></span>
+            </label>
+          </div>
+        </div>
+      </div>
+    </div>
+  </div>
+
+  <!-- Drilldown Filters -->
+  <div class="filters-section" *ngIf="drilldownFilters && drilldownFilters.length > 0 && currentDrilldownLevel > 0 && showFilters">
+    <h5>Drilldown Filters</h5>
+    <div class="filters-container">
+      <div class="filter-item" *ngFor="let filter of drilldownFilters; let i = index">
+        <!-- Text Filter -->
+        <div *ngIf="!filter.type || filter.type === 'text'" class="filter-text">
+          <label>{{ filter.field || 'Filter ' + (i + 1) }}</label>
+          <input type="text" [(ngModel)]="filter.value" (ngModelChange)="onDrilldownFilterChange(filter)" 
+                 class="form-control" placeholder="Enter {{ filter.field || 'value' }}">
+        </div>
+
+        <!-- Dropdown Filter -->
+        <div *ngIf="filter.type === 'dropdown'" class="filter-dropdown">
+          <label>{{ filter.field || 'Filter ' + (i + 1) }}</label>
+          <select [(ngModel)]="filter.value" (ngModelChange)="onDrilldownFilterChange(filter)" class="form-control">
+            <option value="">Select {{ filter.field || 'value' }}</option>
+            <option *ngFor="let option of getFilterOptions(filter)" [value]="option">
+              {{ option }}
+            </option>
+          </select>
+        </div>
+
+        <!-- Multiselect Filter -->
+        <div *ngIf="filter.type === 'multiselect'" class="filter-multiselect">
+          <label>{{ filter.field || 'Filter ' + (i + 1) }}</label>
+          <div class="multiselect-container">
+            <div class="multiselect-display" (click)="toggleMultiselect(filter, 'drilldown')">
+              <span *ngIf="!filter.value || (Array.isArray(filter.value) && filter.value.length === 0)">Select {{ filter.field || 'options' }}</span>
+              <span *ngIf="filter.value && !Array.isArray(filter.value)">
+                {{ filter.value }}
+              </span>
+              <span *ngIf="filter.value && Array.isArray(filter.value) && filter.value.length > 0">
+                {{ filter.value.length }} selected
+              </span>
+            </div>
+            <div class="multiselect-dropdown" *ngIf="isMultiselectOpen(filter, 'drilldown')">
+              <div class="multiselect-option" *ngFor="let option of getFilterOptions(filter)">
+                <input type="checkbox" 
+                       [checked]="isOptionSelected(filter, option)"
+                       (change)="onMultiSelectChange(filter, option, $event)"
+                       id="drilldown-{{ filter.field }}-{{ option }}">
+                <label [for]="'drilldown-' + filter.field + '-' + option">{{ option }}</label>
+              </div>
+            </div>
+          </div>
+        </div>
+
+        <!-- Date Range Filter -->
+        <div *ngIf="filter.type === 'date-range'" class="filter-date-range">
+          <label>{{ filter.field || 'Filter ' + (i + 1) }}</label>
+          <div class="date-range-inputs">
+            <input type="date" [(ngModel)]="filter.value.start" (ngModelChange)="onDateRangeInputChange(filter, 'start', $event)" 
+                   class="form-control" placeholder="Start Date">
+            <input type="date" [(ngModel)]="filter.value.end" (ngModelChange)="onDateRangeInputChange(filter, 'end', $event)" 
+                   class="form-control" placeholder="End Date">
+          </div>
+        </div>
+
+        <!-- Toggle Filter -->
+        <div *ngIf="filter.type === 'toggle'" class="filter-toggle">
+          <label>{{ filter.field || 'Filter ' + (i + 1) }}</label>
+          <div class="toggle-switch">
+            <input type="checkbox" [(ngModel)]="filter.value" (ngModelChange)="onToggleChange(filter, $event.target.checked)" 
+                   id="drilldown-toggle-{{ filter.field }}">
+            <label [for]="'drilldown-toggle-' + filter.field" class="toggle-label">
+              <span class="toggle-slider"></span>
+            </label>
+          </div>
+        </div>
+      </div>
+    </div>
+  </div>
+
+  <!-- Layer Filters -->
+  <div class="filters-section" *ngIf="hasActiveLayerFilters() && showFilters">
+    <h5>Layer Filters</h5>
+    <div class="filters-container">
+      <div class="filter-item" *ngFor="let filter of getActiveLayerFilters(); let i = index">
+        <!-- Text Filter -->
+        <div *ngIf="!filter.type || filter.type === 'text'" class="filter-text">
+          <label>{{ filter.field || 'Filter ' + (i + 1) }}</label>
+          <input type="text" [(ngModel)]="filter.value" (ngModelChange)="onLayerFilterChange(filter)" 
+                 class="form-control" placeholder="Enter {{ filter.field || 'value' }}">
+        </div>
+
+        <!-- Dropdown Filter -->
+        <div *ngIf="filter.type === 'dropdown'" class="filter-dropdown">
+          <label>{{ filter.field || 'Filter ' + (i + 1) }}</label>
+          <select [(ngModel)]="filter.value" (ngModelChange)="onLayerFilterChange(filter)" class="form-control">
+            <option value="">Select {{ filter.field || 'value' }}</option>
+            <option *ngFor="let option of getFilterOptions(filter)" [value]="option">
+              {{ option }}
+            </option>
+          </select>
+        </div>
+
+        <!-- Multiselect Filter -->
+        <div *ngIf="filter.type === 'multiselect'" class="filter-multiselect">
+          <label>{{ filter.field || 'Filter ' + (i + 1) }}</label>
+          <div class="multiselect-container">
+            <div class="multiselect-display" (click)="toggleMultiselect(filter, 'layer')">
+              <span *ngIf="!filter.value || (Array.isArray(filter.value) && filter.value.length === 0)">Select {{ filter.field || 'options' }}</span>
+              <span *ngIf="filter.value && !Array.isArray(filter.value)">
+                {{ filter.value }}
+              </span>
+              <span *ngIf="filter.value && Array.isArray(filter.value) && filter.value.length > 0">
+                {{ filter.value.length }} selected
+              </span>
+            </div>
+            <div class="multiselect-dropdown" *ngIf="isMultiselectOpen(filter, 'layer')">
+              <div class="multiselect-option" *ngFor="let option of getFilterOptions(filter)">
+                <input type="checkbox" 
+                       [checked]="isOptionSelected(filter, option)"
+                       (change)="onMultiSelectChange(filter, option, $event)"
+                       id="layer-{{ filter.field }}-{{ option }}">
+                <label [for]="'layer-' + filter.field + '-' + option">{{ option }}</label>
+              </div>
+            </div>
+          </div>
+        </div>
+
+        <!-- Date Range Filter -->
+        <div *ngIf="filter.type === 'date-range'" class="filter-date-range">
+          <label>{{ filter.field || 'Filter ' + (i + 1) }}</label>
+          <div class="date-range-inputs">
+            <input type="date" [(ngModel)]="filter.value.start" (ngModelChange)="onDateRangeInputChange(filter, 'start', $event)" 
+                   class="form-control" placeholder="Start Date">
+            <input type="date" [(ngModel)]="filter.value.end" (ngModelChange)="onDateRangeInputChange(filter, 'end', $event)" 
+                   class="form-control" placeholder="End Date">
+          </div>
+        </div>
+
+        <!-- Toggle Filter -->
+        <div *ngIf="filter.type === 'toggle'" class="filter-toggle">
+          <label>{{ filter.field || 'Filter ' + (i + 1) }}</label>
+          <div class="toggle-switch">
+            <input type="checkbox" [(ngModel)]="filter.value" (ngModelChange)="onToggleChange(filter, $event.target.checked)" 
+                   id="layer-toggle-{{ filter.field }}">
+            <label [for]="'layer-toggle-' + filter.field" class="toggle-label">
+              <span class="toggle-slider"></span>
+            </label>
+          </div>
+        </div>
+      </div>
+    </div>
+  </div>
+
+  <!-- Clear Filters Button -->
+  <div class="clear-filters" *ngIf="hasActiveFilters() && showFilters">
+    <button class="btn btn-sm btn-outline" (click)="clearAllFilters()">
+      Clear All Filters
+    </button>
+  </div>
+</div>
+
+<!-- No Data Available Message -->
+<div class="no-data-message" *ngIf="noDataAvailable && !isLoading">
+  <p>No data available for the selected filters.</p>
+  <button class="btn btn-sm btn-primary" (click)="fetchChartData()">Retry</button>
+</div>
+
+<!-- Loading Indicator -->
+<div class="loading-indicator" *ngIf="isLoading">
+  <div class="spinner"></div>
+  <p>Loading chart data...</p>
+</div>
\ No newline at end of file
diff --git a/frontend/angular-clarity-master/src/app/modules/main/builder/dashboardnew/gadgets/unified-chart/unified-chart.component.scss b/frontend/angular-clarity-master/src/app/modules/main/builder/dashboardnew/gadgets/unified-chart/unified-chart.component.scss
new file mode 100644
index 0000000..4cd6c2e
--- /dev/null
+++ b/frontend/angular-clarity-master/src/app/modules/main/builder/dashboardnew/gadgets/unified-chart/unified-chart.component.scss
@@ -0,0 +1,307 @@
+.chart-container {
+  position: relative;
+  height: 100%;
+  width: 100%;
+  padding: 10px;
+}
+
+.drilldown-back {
+  display: flex;
+  align-items: center;
+  margin-bottom: 10px;
+  
+  .drilldown-level {
+    margin-left: 10px;
+    font-size: 14px;
+    color: #666;
+  }
+}
+
+.chart-title {
+  text-align: center;
+  margin-bottom: 15px;
+  
+  h4 {
+    margin: 0;
+    color: #333;
+  }
+}
+
+.chart-wrapper {
+  position: relative;
+  height: calc(100% - 100px);
+  min-height: 400px;
+  padding: 10px;
+}
+
+.chart-canvas-container {
+  position: relative;
+  height: 100%;
+  width: 100%;
+  padding: 15px;
+  box-sizing: border-box;
+  
+  canvas {
+    display: block;
+    max-width: 100%;
+    max-height: 100%;
+  }
+}
+
+.filter-toggle-icon {
+  display: flex;
+  align-items: center;
+  justify-content: flex-end;
+  padding: 5px;
+  cursor: pointer;
+  
+  clr-icon {
+    transition: color 0.3s ease;
+    
+    &:hover {
+      color: #007cba !important;
+    }
+  }
+  
+  span {
+    margin-left: 5px;
+    font-size: 12px;
+    color: #666;
+    transition: color 0.3s ease;
+  }
+  
+  &:hover span {
+    color: #007cba;
+  }
+}
+
+.filters-section {
+  margin-top: 20px;
+  padding: 15px;
+  border: 1px solid #e0e0e0;
+  border-radius: 4px;
+  background-color: #f9f9f9;
+  
+  h5 {
+    margin-top: 0;
+    margin-bottom: 10px;
+    color: #333;
+  }
+}
+
+.filters-container {
+  display: flex;
+  flex-wrap: wrap;
+  gap: 15px;
+}
+
+.filter-item {
+  flex: 1 1 200px;
+  min-width: 150px;
+  
+  label {
+    display: block;
+    margin-bottom: 5px;
+    font-weight: 500;
+    color: #555;
+  }
+  
+  .form-control {
+    width: 100%;
+    padding: 8px;
+    border: 1px solid #ccc;
+    border-radius: 4px;
+    font-size: 14px;
+  }
+}
+
+.filter-text,
+.filter-dropdown,
+.filter-date-range {
+  .form-control {
+    height: 36px;
+  }
+}
+
+.date-range-inputs {
+  display: flex;
+  gap: 10px;
+  
+  .form-control {
+    flex: 1;
+  }
+}
+
+.filter-multiselect {
+  position: relative;
+  
+  .multiselect-container {
+    position: relative;
+  }
+  
+  .multiselect-display {
+    width: 100%;
+    padding: 8px;
+    border: 1px solid #ccc;
+    border-radius: 4px;
+    background-color: white;
+    cursor: pointer;
+    min-height: 36px;
+    display: flex;
+    align-items: center;
+  }
+  
+  .multiselect-dropdown {
+    position: absolute;
+    top: 100%;
+    left: 0;
+    right: 0;
+    background-color: white;
+    border: 1px solid #ccc;
+    border-radius: 4px;
+    box-shadow: 0 2px 8px rgba(0, 0, 0, 0.15);
+    z-index: 1000;
+    max-height: 200px;
+    overflow-y: auto;
+  }
+  
+  .multiselect-option {
+    padding: 8px 12px;
+    border-bottom: 1px solid #eee;
+    
+    &:last-child {
+      border-bottom: none;
+    }
+    
+    &:hover {
+      background-color: #f5f5f5;
+    }
+    
+    input[type="checkbox"] {
+      margin-right: 8px;
+    }
+    
+    label {
+      margin: 0;
+      font-weight: normal;
+      cursor: pointer;
+    }
+  }
+}
+
+.filter-toggle {
+  display: flex;
+  align-items: center;
+  gap: 10px;
+  
+  .toggle-switch {
+    position: relative;
+    display: inline-block;
+    width: 50px;
+    height: 24px;
+  }
+  
+  .toggle-switch input {
+    opacity: 0;
+    width: 0;
+    height: 0;
+  }
+  
+  .toggle-label {
+    position: absolute;
+    cursor: pointer;
+    top: 0;
+    left: 0;
+    right: 0;
+    bottom: 0;
+    background-color: #ccc;
+    transition: .4s;
+    border-radius: 24px;
+  }
+  
+  .toggle-slider {
+    position: absolute;
+    content: "";
+    height: 16px;
+    width: 16px;
+    left: 4px;
+    bottom: 4px;
+    background-color: white;
+    transition: .4s;
+    border-radius: 50%;
+  }
+  
+  input:checked + .toggle-label {
+    background-color: #2196F3;
+  }
+  
+  input:checked + .toggle-label .toggle-slider {
+    transform: translateX(26px);
+  }
+}
+
+.clear-filters {
+  margin-top: 15px;
+  text-align: center;
+}
+
+.no-data-message {
+  display: flex;
+  flex-direction: column;
+  align-items: center;
+  justify-content: center;
+  height: 300px;
+  text-align: center;
+  color: #666;
+  
+  p {
+    margin-bottom: 15px;
+    font-size: 16px;
+  }
+}
+
+.loading-indicator {
+  display: flex;
+  flex-direction: column;
+  align-items: center;
+  justify-content: center;
+  height: 300px;
+  
+  .spinner {
+    width: 40px;
+    height: 40px;
+    border: 4px solid #f3f3f3;
+    border-top: 4px solid #3498db;
+    border-radius: 50%;
+    animation: spin 1s linear infinite;
+    margin-bottom: 15px;
+  }
+  
+  p {
+    margin: 0;
+    color: #666;
+  }
+}
+
+@keyframes spin {
+  0% { transform: rotate(0deg); }
+  100% { transform: rotate(360deg); }
+}
+
+@media (max-width: 768px) {
+  .filters-container {
+    flex-direction: column;
+  }
+  
+  .filter-item {
+    min-width: 100%;
+  }
+  
+  .chart-wrapper {
+    min-height: 250px;
+  }
+  
+  .chart-canvas-container {
+    padding: 10px;
+  }
+}
\ No newline at end of file
diff --git a/frontend/angular-clarity-master/src/app/modules/main/builder/dashboardnew/gadgets/unified-chart/unified-chart.component.spec.ts b/frontend/angular-clarity-master/src/app/modules/main/builder/dashboardnew/gadgets/unified-chart/unified-chart.component.spec.ts
new file mode 100644
index 0000000..94a60e4
--- /dev/null
+++ b/frontend/angular-clarity-master/src/app/modules/main/builder/dashboardnew/gadgets/unified-chart/unified-chart.component.spec.ts
@@ -0,0 +1,21 @@
+import { ComponentFixture, TestBed } from '@angular/core/testing';
+
+import { UnifiedChartComponent } from './unified-chart.component';
+
+describe('UnifiedChartComponent', () => {
+  let component: UnifiedChartComponent;
+  let fixture: ComponentFixture<UnifiedChartComponent>;
+
+  beforeEach(() => {
+    TestBed.configureTestingModule({
+      declarations: [UnifiedChartComponent]
+    });
+    fixture = TestBed.createComponent(UnifiedChartComponent);
+    component = fixture.componentInstance;
+    fixture.detectChanges();
+  });
+
+  it('should create', () => {
+    expect(component).toBeTruthy();
+  });
+});
\ No newline at end of file
diff --git a/frontend/angular-clarity-master/src/app/modules/main/builder/dashboardnew/gadgets/unified-chart/unified-chart.component.ts b/frontend/angular-clarity-master/src/app/modules/main/builder/dashboardnew/gadgets/unified-chart/unified-chart.component.ts
new file mode 100644
index 0000000..b877eb8
--- /dev/null
+++ b/frontend/angular-clarity-master/src/app/modules/main/builder/dashboardnew/gadgets/unified-chart/unified-chart.component.ts
@@ -0,0 +1,2096 @@
+import { Component, Input, OnInit, OnChanges, OnDestroy, SimpleChanges, ViewChild, ElementRef, Renderer2 } from '@angular/core';
+import { Dashboard3Service } from '../../../../../../services/builder/dashboard3.service';
+import { FilterService } from '../../common-filter/filter.service';
+import { Subscription } from 'rxjs';
+import { BaseChartDirective } from 'ng2-charts';
+import { ChartConfiguration, ChartDataset } from 'chart.js';
+import { DynamicChartLoaderService } from '../../chart-config/dynamic-chart-loader.service';
+
+@Component({
+  selector: 'app-unified-chart',
+  templateUrl: './unified-chart.component.html',
+  styleUrls: ['./unified-chart.component.scss']
+})
+export class UnifiedChartComponent implements OnInit, OnChanges, OnDestroy {
+  @Input() chartType: string;
+  @Input() xAxis: string;
+  @Input() yAxis: string | string[];
+  @Input() table: string;
+  @Input() datastore: string;
+  @Input() charttitle: string;
+  @Input() chartlegend: boolean = true;
+  @Input() showlabel: boolean = true;
+  @Input() chartcolor: boolean;
+  @Input() slices: boolean;
+  @Input() donut: boolean;
+  @Input() charturl: string;
+  @Input() chartparameter: string;
+  @Input() datasource: string;
+  @Input() fieldName: string;
+  @Input() connection: number;
+
+  // Drilldown configuration inputs
+  @Input() drilldownEnabled: boolean = false;
+  @Input() drilldownApiUrl: string;
+  @Input() drilldownXAxis: string;
+  @Input() drilldownYAxis: string;
+  @Input() drilldownParameter: string;
+  @Input() baseFilters: any[] = [];
+  @Input() drilldownFilters: any[] = [];
+  @Input() drilldownLayers: any[] = [];
+
+  @ViewChild(BaseChartDirective) chart?: BaseChartDirective;
+
+  // Chart data properties
+  chartLabels: string[] = [];
+  chartData: any[] = [];
+  chartOptions: any = {};
+  chartPlugins = [];
+  chartLegend: boolean = true;
+
+  // Bubble chart specific properties
+  bubbleChartData: ChartDataset[] = [];
+
+  // No data state
+  noDataAvailable: boolean = false;
+
+  // Loading state
+  isLoading: boolean = false;
+
+  // Multi-layer drilldown state tracking
+  drilldownStack: any[] = [];
+  currentDrilldownLevel: number = 0;
+  originalChartData: any = {};
+
+  // Filter visibility toggle
+  showFilters: boolean = false;
+
+  // Flag to prevent infinite loops
+  private isFetchingData: boolean = false;
+
+  // Subscriptions to unsubscribe on destroy
+  private subscriptions: Subscription[] = [];
+
+  // Filter properties
+  private openMultiselects: Map<string, string> = new Map();
+  private documentClickHandler: ((event: MouseEvent) => void) | null = null;
+  private filtersInitialized: boolean = false;
+
+  // Dynamic template properties
+  dynamicTemplate: string = '';
+  dynamicStyles: string = '';
+  dynamicOptions: any = null;
+  
+  // Properties to hold extracted values from dynamic template
+  extractedChartType: string = '';
+  extractedDatasetsBinding: string = '';
+  extractedLabelsBinding: string = '';
+  extractedOptionsBinding: string = '';
+  extractedLegendBinding: string = '';
+  extractedChartClickBinding: string = '';
+  extractedChartHoverBinding: string = '';
+
+  // Add setter to log when dynamicTemplate changes
+  setDynamicTemplate(value: string) {
+    console.log('Setting dynamic template:', value);
+    this.dynamicTemplate = value;
+    
+    // Extract values from the dynamic template
+    this.extractTemplateValues(value);
+    
+    // Apply dynamic options if they were extracted
+    if (this.dynamicOptions) {
+      this.mergeDynamicOptions();
+    }
+    
+    // Apply dynamic styles if they were extracted
+    if (this.dynamicStyles) {
+      this.applyDynamicStyles();
+    }
+    
+    // Trigger change detection to ensure the template is rendered
+    setTimeout(() => {
+      console.log('Dynamic template updated in DOM');
+      // Check if the dynamic template container exists
+      const dynamicContainer = this.el.nativeElement.querySelector('.dynamic-template-container');
+      console.log('Dynamic template container:', dynamicContainer);
+      if (dynamicContainer) {
+        console.log('Dynamic container innerHTML:', dynamicContainer.innerHTML);
+      }
+      // Check if the canvas element exists in the DOM
+      const canvasElements = this.el.nativeElement.querySelectorAll('canvas');
+      console.log('Canvas elements found in DOM:', canvasElements.length);
+      if (canvasElements.length > 0) {
+        console.log('First canvas element:', canvasElements[0]);
+        // Check if it has the baseChart directive processed
+        const firstCanvas = canvasElements[0];
+        console.log('Canvas has baseChart directive processed:', firstCanvas.classList.contains('chartjs-render-monitor'));
+      } else {
+        console.log('No canvas elements found - checking if template was inserted but not processed');
+        // Check if there's HTML content in the dynamic container
+        if (dynamicContainer) {
+          const htmlContent = dynamicContainer.innerHTML;
+          console.log('HTML content in dynamic container:', htmlContent);
+          if (htmlContent && htmlContent.includes('canvas')) {
+            console.log('Canvas tag found in HTML but not processed by Angular');
+          }
+        }
+      }
+    }, 100);
+  }
+
+  // Extract values from dynamic template HTML
+  private extractTemplateValues(template: string): void {
+    console.log('Extracting values from template:', template);
+    
+    // Reset extracted values
+    this.extractedChartType = this.chartType || '';
+    this.extractedDatasetsBinding = 'chartData';
+    this.extractedLabelsBinding = 'chartLabels';
+    this.extractedOptionsBinding = 'chartOptions';
+    this.extractedLegendBinding = 'chartLegend';
+    this.extractedChartClickBinding = 'chartClicked($event)';
+    this.extractedChartHoverBinding = 'chartHovered($event)';
+    
+    if (!template) {
+      console.log('No template to extract values from');
+      return;
+    }
+    
+    // Parse the template to extract bindings
+    // Look for [chartType] binding
+    const chartTypeMatch = template.match(/\[chartType\]="([^"]+)"/);
+    if (chartTypeMatch && chartTypeMatch[1]) {
+      this.extractedChartType = chartTypeMatch[1];
+      console.log('Extracted chartType binding:', this.extractedChartType);
+    }
+    
+    // Look for [datasets] binding
+    const datasetsMatch = template.match(/\[datasets\]="([^"]+)"/);
+    if (datasetsMatch && datasetsMatch[1]) {
+      this.extractedDatasetsBinding = datasetsMatch[1];
+      console.log('Extracted datasets binding:', this.extractedDatasetsBinding);
+    }
+    
+    // Look for [labels] binding
+    const labelsMatch = template.match(/\[labels\]="([^"]+)"/);
+    if (labelsMatch && labelsMatch[1]) {
+      this.extractedLabelsBinding = labelsMatch[1];
+      console.log('Extracted labels binding:', this.extractedLabelsBinding);
+    }
+    
+    // Look for [options] binding
+    const optionsMatch = template.match(/\[options\]="([^"]+)"/);
+    if (optionsMatch && optionsMatch[1]) {
+      this.extractedOptionsBinding = optionsMatch[1];
+      console.log('Extracted options binding:', this.extractedOptionsBinding);
+    }
+    
+    // Look for [legend] binding
+    const legendMatch = template.match(/\[legend\]="([^"]+)"/);
+    if (legendMatch && legendMatch[1]) {
+      this.extractedLegendBinding = legendMatch[1];
+      console.log('Extracted legend binding:', this.extractedLegendBinding);
+    }
+    
+    // Look for (chartClick) binding
+    const chartClickMatch = template.match(/\(chartClick\)="([^"]+)"/);
+    if (chartClickMatch && chartClickMatch[1]) {
+      this.extractedChartClickBinding = chartClickMatch[1];
+      console.log('Extracted chartClick binding:', this.extractedChartClickBinding);
+    }
+    
+    // Look for (chartHover) binding
+    const chartHoverMatch = template.match(/\(chartHover\)="([^"]+)"/);
+    if (chartHoverMatch && chartHoverMatch[1]) {
+      this.extractedChartHoverBinding = chartHoverMatch[1];
+      console.log('Extracted chartHover binding:', this.extractedChartHoverBinding);
+    }
+    
+    // Extract CSS styles if present in the template
+    const styleMatch = template.match(/<style[^>]*>([\s\S]*?)<\/style>/i);
+    if (styleMatch && styleMatch[1]) {
+      this.dynamicStyles = styleMatch[1];
+      console.log('Extracted CSS styles:', this.dynamicStyles);
+    }
+  }
+
+  constructor(
+    private dashboardService: Dashboard3Service,
+    private filterService: FilterService,
+    private dynamicChartLoader: DynamicChartLoaderService,
+    private renderer: Renderer2,
+    private el: ElementRef
+  ) { }
+
+  ngOnInit(): void {
+    // Subscribe to filter changes
+    this.subscriptions.push(
+      this.filterService.filterState$.subscribe(filters => {
+        this.fetchChartData();
+      })
+    );
+
+    // Log initial input values for debugging
+    console.log('UnifiedChartComponent ngOnInit - initial input values:', {
+      chartType: this.chartType,
+      xAxis: this.xAxis,
+      yAxis: this.yAxis,
+      table: this.table,
+      baseFilters: this.baseFilters,
+      drilldownFilters: this.drilldownFilters,
+      drilldownLayers: this.drilldownLayers
+    });
+
+    // Check if filters are available
+    console.log('Has filters in ngOnInit:', this.hasFilters());
+
+    // Initialize filter values if they haven't been initialized yet
+    if (!this.filtersInitialized) {
+      this.initializeFilterValues();
+      this.filtersInitialized = true;
+    }
+
+    // Initialize chart options with default structure
+    this.initializeChartOptions();
+
+    // Load dynamic template and options for this chart type
+    this.loadDynamicChartConfig();
+
+    this.fetchChartData();
+  }
+
+  ngOnChanges(changes: SimpleChanges): void {
+    console.log('UnifiedChartComponent input changes:', changes);
+
+    // Log chartType changes specifically
+    if (changes.chartType) {
+      console.log('Chart type changed from', changes.chartType.previousValue, 'to', changes.chartType.currentValue);
+    }
+
+    // Log all input values for debugging
+    console.log('Current input values:', {
+      chartType: this.chartType,
+      xAxis: this.xAxis,
+      yAxis: this.yAxis,
+      table: this.table,
+      baseFilters: this.baseFilters,
+      drilldownFilters: this.drilldownFilters,
+      drilldownLayers: this.drilldownLayers
+    });
+
+    // Initialize filter values if they haven't been initialized yet
+    if (!this.filtersInitialized && (changes.baseFilters || changes.drilldownFilters || changes.drilldownLayers)) {
+      this.initializeFilterValues();
+      this.filtersInitialized = true;
+    }
+
+    // Check if any of the key properties have changed
+    const chartTypeChanged = changes.chartType && !changes.chartType.firstChange;
+    const xAxisChanged = changes.xAxis && !changes.xAxis.firstChange;
+    const yAxisChanged = changes.yAxis && !changes.yAxis.firstChange;
+    const tableChanged = changes.table && !changes.table.firstChange;
+    const connectionChanged = changes.connection && !changes.connection.firstChange;
+    const baseFiltersChanged = changes.baseFilters && !changes.baseFilters.firstChange;
+    const drilldownFiltersChanged = changes.drilldownFilters && !changes.drilldownFilters.firstChange;
+
+    // Drilldown configuration changes
+    const drilldownEnabledChanged = changes.drilldownEnabled && !changes.drilldownEnabled.firstChange;
+    const drilldownApiUrlChanged = changes.drilldownApiUrl && !changes.drilldownApiUrl.firstChange;
+    const drilldownXAxisChanged = changes.drilldownXAxis && !changes.drilldownXAxis.firstChange;
+    const drilldownYAxisChanged = changes.drilldownYAxis && !changes.drilldownYAxis.firstChange;
+    const drilldownLayersChanged = changes.drilldownLayers && !changes.drilldownLayers.firstChange;
+
+    // Log base filters changes for debugging
+    if (baseFiltersChanged) {
+      console.log('Base filters changed:', changes.baseFilters);
+      console.log('Current base filters:', this.baseFilters);
+      // Log detailed information about each filter
+      if (this.baseFilters && Array.isArray(this.baseFilters)) {
+        this.baseFilters.forEach((filter, index) => {
+          console.log(`Base filter ${index} details:`, {
+            field: filter.field,
+            value: filter.value,
+            type: filter.type,
+            options: filter.options
+          });
+        });
+      }
+    }
+
+    // Also log when baseFilters is not changed but we still have filters
+    if (!baseFiltersChanged && this.baseFilters && this.baseFilters.length > 0) {
+      console.log('Base filters present but not changed, logging current state:');
+      this.baseFilters.forEach((filter, index) => {
+        console.log(`Base filter ${index} details:`, {
+          field: filter.field,
+          value: filter.value,
+          type: filter.type,
+          options: filter.options
+        });
+      });
+    }
+
+    // Load dynamic template and options if chart type changed
+    if (chartTypeChanged) {
+      this.loadDynamicChartConfig();
+    }
+
+    // Only fetch data if the actual chart configuration changed and we're not already fetching
+    if (!this.isFetchingData && (chartTypeChanged || xAxisChanged || yAxisChanged || tableChanged || connectionChanged || baseFiltersChanged || drilldownFiltersChanged ||
+      drilldownEnabledChanged || drilldownApiUrlChanged || drilldownXAxisChanged || drilldownYAxisChanged ||
+      drilldownLayersChanged)) {
+      console.log('Chart configuration changed, fetching new data');
+      this.initializeChartOptions();
+      this.fetchChartData();
+    }
+
+    // Update legend visibility if it changed
+    if (changes.chartlegend !== undefined) {
+      this.chartLegend = changes.chartlegend.currentValue;
+      // Ensure chartOptions and required structures exist before accessing legend
+      if (!this.chartOptions) {
+        this.chartOptions = {};
+      }
+      if (!this.chartOptions.plugins) {
+        this.chartOptions.plugins = {};
+      }
+      if (!this.chartOptions.plugins.legend) {
+        this.chartOptions.plugins.legend = { display: this.chartLegend };
+      } else {
+        this.chartOptions.plugins.legend.display = this.chartLegend;
+      }
+      console.log('Chart legend changed to:', this.chartLegend);
+    }
+  }
+
+  ngOnDestroy(): void {
+    // Unsubscribe from all subscriptions
+    this.subscriptions.forEach(sub => sub.unsubscribe());
+
+    // Remove document click handler
+    if (this.documentClickHandler) {
+      document.removeEventListener('click', this.documentClickHandler);
+    }
+  }
+
+  // Load dynamic chart configuration (template, styles, and options) for the current chart type
+  private loadDynamicChartConfig(): void {
+    if (!this.chartType) {
+      console.log('No chart type specified, skipping dynamic chart config loading');
+      return;
+    }
+
+    console.log(`Loading dynamic chart configuration for chart type: ${this.chartType}`);
+    console.log('Current dynamic template:', this.dynamicTemplate);
+
+    // Get chart type by name and load its configuration
+    console.log('Calling getChartTypeByName with:', this.chartType);
+    this.dynamicChartLoader.getChartTypeByName(this.chartType).subscribe({
+      next: (chartType) => {
+        console.log('Received chart type by name :', chartType);
+        if (chartType) {
+          console.log('Found chart type:', chartType);
+
+          // Load the complete configuration for this chart type
+          console.log('Loading chart configuration for chart type ID:', chartType.id);
+          this.dynamicChartLoader.loadChartConfiguration(chartType.id).subscribe({
+            next: (config) => {
+              console.log('Received chart configuration:', config);
+              console.log('Loaded chart configuration:', config);
+
+              // Apply the first template if available (for CSS styles)
+              if (config.templates && config.templates.length > 0) {
+                const defaultTemplate = config.templates.find(t => t.isDefault) || config.templates[0];
+                if (defaultTemplate) {
+                  const templateHtml = defaultTemplate.templateHtml || '';
+                  console.log('Template HTML to be set:', templateHtml);
+                  this.setDynamicTemplate(templateHtml);
+                  this.dynamicStyles = defaultTemplate.templateCss || '';
+
+                  // Apply styles to the component
+                  this.applyDynamicStyles();
+
+                  console.log('Applied dynamic template and styles', {
+                    template: this.dynamicTemplate,
+                    styles: this.dynamicStyles
+                  });
+                }
+              } else {
+                console.log('No templates found for chart type:', this.chartType);
+              }
+
+              // Apply dynamic options if available
+              console.log('Checking for dynamic fields:', config.dynamicFields);
+              if (config.dynamicFields && config.dynamicFields.length > 0) {
+                // Find the field that contains chart options
+                const optionsField = config.dynamicFields.find(field =>
+                  field.fieldName === 'chartOptions' || field.fieldName.toLowerCase().includes('options'));
+
+                if (!optionsField) {
+                  console.log('No chartOptions field found in dynamic fields');
+                }
+
+                if (optionsField && optionsField.fieldOptions) {
+                  try {
+                    this.dynamicOptions = JSON.parse(optionsField.fieldOptions);
+                    console.log('Applied dynamic chart options:', this.dynamicOptions);
+
+                    // Merge dynamic options with current chart options
+                    this.mergeDynamicOptions();
+                  } catch (e) {
+                    console.error('Error parsing dynamic chart options:', e);
+                  }
+                }
+              } else {
+                console.log('No dynamic fields found for chart type:', this.chartType);
+              }
+            },
+            error: (error) => {
+              console.error('Error loading chart configuration:', error);
+            }
+          });
+        } else {
+          console.log(`Chart type ${this.chartType} not found in database`);
+          // Log available chart types for debugging
+          console.log('Available chart types in database:');
+          this.dynamicChartLoader.loadAllChartConfigurations().subscribe({
+            next: (chartTypes) => {
+              console.log('All chart types:', chartTypes);
+            },
+            error: (error) => {
+              console.error('Error loading chart types:', error);
+            }
+          });
+        }
+      },
+      error: (error) => {
+        console.error('Error loading chart type:', error);
+      }
+    });
+  }
+
+  // Merge dynamic options with current chart options
+  private mergeDynamicOptions(): void {
+    if (this.dynamicOptions) {
+      console.log('Merging dynamic options with existing chart options:', {
+        existing: this.chartOptions,
+        dynamic: this.dynamicOptions
+      });
+      
+      // Deep merge dynamic options with existing chart options
+      this.chartOptions = this.deepMerge(this.chartOptions, this.dynamicOptions);
+      
+      console.log('Merged chart options:', this.chartOptions);
+
+      // If we have a chart instance, update it
+      if (this.chart) {
+        this.chart.options = this.chartOptions;
+        this.chart.render();
+      }
+    }
+  }
+  
+  // Helper method for deep merging objects
+  private deepMerge(target: any, source: any): any {
+    const result = { ...target };
+    
+    for (const key in source) {
+      if (source.hasOwnProperty(key)) {
+        if (typeof source[key] === 'object' && source[key] !== null && !Array.isArray(source[key])) {
+          // Recursively merge objects
+          result[key] = this.deepMerge(result[key] || {}, source[key]);
+        } else {
+          // Override with source value
+          result[key] = source[key];
+        }
+      }
+    }
+    
+    return result;
+  }
+
+  // Apply dynamic styles to the component
+  private applyDynamicStyles(): void {
+    // Remove any previously applied dynamic styles
+    const existingStyles = this.el.nativeElement.querySelectorAll('.dynamic-chart-styles');
+    existingStyles.forEach((style: HTMLElement) => {
+      style.remove();
+    });
+
+    // Apply new styles if available
+    if (this.dynamicStyles) {
+      const styleElement = this.renderer.createElement('style');
+      this.renderer.setAttribute(styleElement, 'class', 'dynamic-chart-styles');
+      this.renderer.setProperty(styleElement, 'textContent', this.dynamicStyles);
+      this.renderer.appendChild(this.el.nativeElement, styleElement);
+      console.log('Applied dynamic styles to component');
+    }
+  }
+
+  // Initialize chart after dynamic template is rendered
+  private initializeDynamicChart(): void {
+    // This is a complex issue - Angular directives in dynamically inserted HTML
+    // don't get processed automatically. We would need to use a different approach
+    // such as creating components dynamically or using a different template mechanism.
+    console.log('Initializing dynamic chart - this is where we would handle chart initialization');
+    
+    // NOTE: The baseChart directive in dynamically inserted HTML via [innerHTML] 
+    // will not be processed by Angular. This is a limitation of Angular's change detection.
+    // Possible solutions:
+    // 1. Use Angular's dynamic component creation API
+    // 2. Modify the approach to use a different template mechanism
+    // 3. Keep the canvas element in the static template and only load options dynamically
+  }
+
+  // Check if filters are available
+  hasFilters(): boolean {
+    const hasBaseFilters = this.baseFilters && this.baseFilters.length > 0;
+    console.log('Checking for filters - baseFilters:', this.baseFilters, 'hasBaseFilters:', hasBaseFilters);
+    return hasBaseFilters;
+  }
+
+  // Toggle filter visibility
+  toggleFilters(): void {
+    console.log('Toggling filters. Current state:', this.showFilters);
+    console.log('Base filters available:', this.hasFilters());
+    this.showFilters = !this.showFilters;
+    console.log('New state:', this.showFilters);
+  }
+
+  // Initialize filter values with proper default values based on type
+  private initializeFilterValues(): void {
+    console.log('Initializing filter values');
+    console.log('Base filters before initialization:', this.baseFilters);
+
+    // Initialize base filters
+    if (this.baseFilters && Array.isArray(this.baseFilters)) {
+      this.baseFilters.forEach((filter, index) => {
+        console.log(`Processing base filter ${index}:`, filter);
+        if (filter.value === undefined || filter.value === null) {
+          switch (filter.type) {
+            case 'multiselect':
+              filter.value = [];
+              break;
+            case 'date-range':
+              filter.value = { start: null, end: null };
+              break;
+            case 'toggle':
+              filter.value = false;
+              break;
+            default:
+              filter.value = '';
+          }
+          console.log(`Initialized base filter ${index} value to:`, filter.value);
+        } else {
+          console.log(`Base filter ${index} already has value:`, filter.value);
+        }
+      });
+    } else {
+      // Initialize as empty array if not provided
+      this.baseFilters = [];
+    }
+
+    console.log('Base filters after initialization:', this.baseFilters);
+
+    // Initialize drilldown filters
+    if (this.drilldownFilters && Array.isArray(this.drilldownFilters)) {
+      this.drilldownFilters.forEach((filter, index) => {
+        console.log(`Processing drilldown filter ${index}:`, filter);
+        if (filter.value === undefined || filter.value === null) {
+          switch (filter.type) {
+            case 'multiselect':
+              filter.value = [];
+              break;
+            case 'date-range':
+              filter.value = { start: null, end: null };
+              break;
+            case 'toggle':
+              filter.value = false;
+              break;
+            default:
+              filter.value = '';
+          }
+          console.log(`Initialized drilldown filter ${index} value to:`, filter.value);
+        } else {
+          console.log(`Drilldown filter ${index} already has value:`, filter.value);
+        }
+      });
+    } else {
+      // Initialize as empty array if not provided
+      this.drilldownFilters = [];
+    }
+
+    // Initialize layer filters
+    if (this.drilldownLayers && Array.isArray(this.drilldownLayers)) {
+      this.drilldownLayers.forEach((layer, layerIndex) => {
+        console.log(`Processing drilldown layer ${layerIndex}:`, layer);
+        if (layer.filters && Array.isArray(layer.filters)) {
+          layer.filters.forEach((filter, filterIndex) => {
+            console.log(`Processing layer ${layerIndex} filter ${filterIndex}:`, filter);
+            if (filter.value === undefined || filter.value === null) {
+              switch (filter.type) {
+                case 'multiselect':
+                  filter.value = [];
+                  break;
+                case 'date-range':
+                  filter.value = { start: null, end: null };
+                  break;
+                case 'toggle':
+                  filter.value = false;
+                  break;
+                default:
+                  filter.value = '';
+              }
+              console.log(`Initialized layer ${layerIndex} filter ${filterIndex} value to:`, filter.value);
+            } else {
+              console.log(`Layer ${layerIndex} filter ${filterIndex} already has value:`, filter.value);
+            }
+          });
+        }
+      });
+    } else {
+      // Initialize as empty array if not provided
+      this.drilldownLayers = [];
+    }
+
+    console.log('Filter values initialized:', {
+      baseFilters: this.baseFilters,
+      drilldownFilters: this.drilldownFilters,
+      drilldownLayers: this.drilldownLayers
+    });
+  }
+
+  // Initialize chart options based on chart type
+  private initializeChartOptions(): void {
+    // Initialize with default structure to ensure plugins.legend exists
+    this.chartOptions = {
+      responsive: true,
+      maintainAspectRatio: false,
+      plugins: {
+        legend: {
+          display: true,
+          position: 'top'
+        }
+      }
+    };
+
+    // If we have dynamic options, use them instead of the default ones
+    if (this.dynamicOptions) {
+      this.mergeDynamicOptions();
+      return;
+    }
+
+    switch (this.chartType) {
+      case 'bar':
+        this.initializeBarChartOptions();
+        break;
+      case 'line':
+        this.initializeLineChartOptions();
+        break;
+      case 'pie':
+        this.initializePieChartOptions();
+        break;
+      case 'doughnut':
+        this.initializeDoughnutChartOptions();
+        break;
+      case 'bubble':
+        this.initializeBubbleChartOptions();
+        break;
+      case 'radar':
+        this.initializeRadarChartOptions();
+        break;
+      case 'polar':
+        this.initializePolarChartOptions();
+        break;
+      case 'scatter':
+        this.initializeScatterChartOptions();
+        break;
+      default:
+        this.initializeDefaultChartOptions();
+    }
+  }
+
+  private initializeBarChartOptions(): void {
+    this.chartOptions = {
+      responsive: true,
+      maintainAspectRatio: false,
+      barPercentage: 0.6, // Reduced from 0.8 to create more spacing between bars
+      categoryPercentage: 0.8, // Reduced from 0.9 to create more spacing between categories
+      scales: {
+        x: {
+          ticks: {
+            autoSkip: false,
+            maxRotation: 45,
+            minRotation: 45,
+            padding: 15,
+            font: {
+              size: 12
+            }
+          },
+          grid: {
+            display: false
+          }
+        },
+        y: {
+          beginAtZero: true,
+          ticks: {
+            font: {
+              size: 12
+            }
+          },
+          // Add some padding to the y-axis to prevent bars from touching the top
+          suggestedMax: 10
+        }
+      },
+      plugins: {
+        legend: {
+          display: true,
+          position: 'top',
+          labels: {
+            font: {
+              size: 12
+            },
+            // Add padding to legend items
+            padding: 20
+          }
+        },
+        tooltip: {
+          enabled: true,
+          // Improve tooltip appearance
+          backgroundColor: 'rgba(0, 0, 0, 0.8)',
+          titleFont: {
+            size: 14
+          },
+          bodyFont: {
+            size: 12
+          }
+        }
+      },
+      layout: {
+        padding: {
+          bottom: 60,
+          left: 15,
+          right: 15,
+          top: 15
+        }
+      },
+      // Add bar chart specific options
+      indexAxis: 'x', // Horizontal bars
+      elements: {
+        bar: {
+          borderWidth: 2, // Increased border width for better visibility
+          borderSkipped: false, // Show all borders for better separation
+          // Add border color to make bars more distinct
+          borderColor: 'rgba(255, 255, 255, 0.8)' // White border for better separation
+        }
+      },
+      // Animation settings for smoother transitions
+      animation: {
+        duration: 1000,
+        easing: 'easeInOutQuart'
+      }
+    };
+  }
+
+  private initializeLineChartOptions(): void {
+    this.chartOptions = {
+      responsive: true,
+      maintainAspectRatio: false,
+      scales: {
+        x: {
+          ticks: {
+            autoSkip: false,
+            maxRotation: 45,
+            minRotation: 45,
+            padding: 15,
+            font: {
+              size: 12
+            }
+          },
+          grid: {
+            display: false
+          }
+        },
+        y: {
+          beginAtZero: true,
+          ticks: {
+            font: {
+              size: 12
+            }
+          }
+        }
+      },
+      plugins: {
+        legend: {
+          display: true,
+          position: 'top',
+          labels: {
+            font: {
+              size: 12
+            }
+          }
+        },
+        tooltip: {
+          enabled: true
+        }
+      },
+      layout: {
+        padding: {
+          bottom: 60,
+          left: 15,
+          right: 15,
+          top: 15
+        }
+      }
+    };
+  }
+
+  private initializePieChartOptions(): void {
+    this.chartOptions = {
+      responsive: true,
+      maintainAspectRatio: false,
+      plugins: {
+        legend: {
+          display: true,
+          position: 'top',
+          labels: {
+            font: {
+              size: 12
+            }
+          }
+        },
+        tooltip: {
+          enabled: true
+        }
+      }
+    };
+  }
+
+  private initializeDoughnutChartOptions(): void {
+    this.chartOptions = {
+      responsive: true,
+      maintainAspectRatio: false,
+      plugins: {
+        legend: {
+          display: true,
+          position: 'top',
+          labels: {
+            font: {
+              size: 12
+            }
+          }
+        },
+        tooltip: {
+          enabled: true
+        }
+      }
+    };
+  }
+
+  private initializeBubbleChartOptions(): void {
+    this.chartOptions = {
+      responsive: true,
+      maintainAspectRatio: false,
+      scales: {
+        x: {
+          beginAtZero: true,
+          title: {
+            display: true,
+            text: 'X Axis'
+          },
+          ticks: {
+            autoSkip: false,
+            maxRotation: 45,
+            minRotation: 45
+          }
+        },
+        y: {
+          beginAtZero: true,
+          title: {
+            display: true,
+            text: 'Y Axis'
+          }
+        }
+      },
+      plugins: {
+        legend: {
+          display: true,
+          position: 'top',
+        },
+        tooltip: {
+          enabled: true,
+          mode: 'point',
+          intersect: false,
+          callbacks: {
+            label: function (context: any) {
+              const point: any = context.raw;
+              if (point && point.hasOwnProperty('y') && point.hasOwnProperty('r')) {
+                const yValue = parseFloat(point.y);
+                const rValue = parseFloat(point.r);
+                if (!isNaN(yValue) && !isNaN(rValue)) {
+                  return `Value: ${yValue.toFixed(2)}, Size: ${rValue.toFixed(1)}`;
+                }
+              }
+              return context.dataset.label || '';
+            }
+          }
+        }
+      },
+      animation: {
+        duration: 800,
+        easing: 'easeInOutQuart'
+      },
+      elements: {
+        point: {
+          hoverRadius: 12,
+          hoverBorderWidth: 3
+        }
+      },
+      layout: {
+        padding: {
+          left: 10,
+          right: 10,
+          top: 10,
+          bottom: 30
+        }
+      }
+    };
+  }
+
+  private initializeRadarChartOptions(): void {
+    this.chartOptions = {
+      responsive: true,
+      maintainAspectRatio: false,
+      scales: {
+        r: {
+          angleLines: {
+            display: true
+          },
+          suggestedMin: 0,
+          ticks: {
+            backdropColor: 'rgba(0, 0, 0, 0)'
+          }
+        }
+      },
+      plugins: {
+        legend: {
+          display: true,
+          position: 'top'
+        }
+      }
+    };
+  }
+
+  private initializePolarChartOptions(): void {
+    this.chartOptions = {
+      responsive: true,
+      maintainAspectRatio: false,
+      plugins: {
+        legend: {
+          display: true,
+          position: 'top'
+        }
+      }
+    };
+  }
+
+  private initializeScatterChartOptions(): void {
+    this.chartOptions = {
+      responsive: true,
+      maintainAspectRatio: false,
+      scales: {
+        x: {
+          type: 'linear',
+          position: 'bottom'
+        }
+      },
+      plugins: {
+        legend: {
+          display: true,
+          position: 'top'
+        }
+      }
+    };
+  }
+
+  private initializeDefaultChartOptions(): void {
+    this.chartOptions = {
+      responsive: true,
+      maintainAspectRatio: false,
+      plugins: {
+        legend: {
+          display: true,
+          position: 'top'
+        }
+      }
+    };
+  }
+
+  fetchChartData(): void {
+    // Set flag to prevent recursive calls
+    this.isFetchingData = true;
+    this.isLoading = true;
+    this.noDataAvailable = false;
+
+    // Ensure chart options are initialized
+    if (!this.chartOptions) {
+      this.initializeChartOptions();
+    }
+
+    console.log('Starting fetchChartData for chart type:', this.chartType);
+
+    // If we're in drilldown mode, fetch the appropriate drilldown data
+    if (this.currentDrilldownLevel > 0 && this.drilldownStack.length > 0) {
+      console.log('Fetching drilldown data');
+      this.fetchDrilldownData();
+      return;
+    }
+
+    // If we have the necessary data, fetch chart data from the service
+    if (this.table && this.xAxis && this.yAxis) {
+      console.log('Fetching chart data for:', {
+        chartType: this.chartType,
+        table: this.table,
+        xAxis: this.xAxis,
+        yAxis: this.yAxis,
+        connection: this.connection
+      });
+
+      // Convert yAxis to string if it's an array
+      const yAxisString = Array.isArray(this.yAxis) ? this.yAxis.join(',') : this.yAxis;
+
+      // Convert baseFilters to filter parameters
+      let filterParams = '';
+      if (this.baseFilters && this.baseFilters.length > 0) {
+        const filterObj = {};
+        this.baseFilters.forEach(filter => {
+          if (filter.field && filter.value) {
+            filterObj[filter.field] = filter.value;
+          }
+        });
+        if (Object.keys(filterObj).length > 0) {
+          filterParams = JSON.stringify(filterObj);
+        }
+      }
+
+      // Add common filters to filter parameters
+      const commonFilters = this.filterService.getFilterValues();
+      console.log('Common filters from service:', commonFilters);
+
+      if (Object.keys(commonFilters).length > 0) {
+        // Merge common filters with base filters
+        const mergedFilterObj = {};
+
+        // Add base filters first
+        if (filterParams) {
+          try {
+            const baseFilterObj = JSON.parse(filterParams);
+            Object.assign(mergedFilterObj, baseFilterObj);
+          } catch (e) {
+            console.warn('Failed to parse base filter parameters:', e);
+          }
+        }
+
+        // Add common filters using the field name as the key, not the filter id
+        Object.keys(commonFilters).forEach(filterId => {
+          const filterValue = commonFilters[filterId];
+          // Find the filter definition to get the field name
+          const filterDef = this.filterService.getFilters().find(f => f.id === filterId);
+          if (filterDef && filterDef.field) {
+            const fieldName = filterDef.field;
+            if (filterValue !== undefined && filterValue !== null && filterValue !== '') {
+              mergedFilterObj[fieldName] = filterValue;
+            }
+          } else {
+            // Fallback to using filterId as field name if no field is defined
+            if (filterValue !== undefined && filterValue !== null && filterValue !== '') {
+              mergedFilterObj[filterId] = filterValue;
+            }
+          }
+        });
+
+        if (Object.keys(mergedFilterObj).length > 0) {
+          filterParams = JSON.stringify(mergedFilterObj);
+        }
+      }
+
+      console.log('Final filter parameters:', filterParams);
+
+      // Fetch data from the dashboard service
+      this.dashboardService.getChartData(
+        this.table,
+        this.chartType,
+        this.xAxis,
+        yAxisString,
+        this.connection,
+        '',
+        '',
+        filterParams
+      ).subscribe(
+        (data: any) => {
+          console.log('Received chart data:', data);
+
+          if (data === null || data === undefined) {
+            console.warn('Chart API returned null/undefined data.');
+            this.noDataAvailable = true;
+          } else if (data && data.chartLabels && data.chartData) {
+            // Handle the standard format
+            this.noDataAvailable = data.chartLabels.length === 0;
+
+            if (this.chartType === 'bubble') {
+              // For bubble charts, transform the data
+              this.bubbleChartData = this.transformToBubbleData(data.chartLabels, data.chartData);
+            } else {
+              this.chartLabels = data.chartLabels;
+              this.chartData = data.chartData;
+            }
+          } else if (data && data.labels && data.datasets) {
+            // Handle the legacy format
+            this.noDataAvailable = data.labels.length === 0;
+
+            if (this.chartType === 'bubble') {
+              // For bubble charts, use the datasets directly
+              this.bubbleChartData = data.datasets;
+            } else {
+              this.chartLabels = data.labels;
+              this.chartData = data.datasets;
+            }
+          } else {
+            console.warn('Chart received data does not have expected structure', data);
+            this.noDataAvailable = true;
+          }
+
+          // Reset flags after fetching
+          this.isFetchingData = false;
+          this.isLoading = false;
+
+          // Trigger chart update
+          setTimeout(() => {
+            if (this.chart) {
+              this.chart.update();
+            }
+          }, 100);
+        },
+        (error) => {
+          console.error('Error fetching chart data:', error);
+          this.noDataAvailable = true;
+          this.chartLabels = [];
+          this.chartData = [];
+          this.bubbleChartData = [];
+
+          // Reset flags after fetching
+          this.isFetchingData = false;
+          this.isLoading = false;
+        }
+      );
+    } else {
+      console.log('Missing required data for chart:', {
+        chartType: this.chartType,
+        table: this.table,
+        xAxis: this.xAxis,
+        yAxis: this.yAxis,
+        connection: this.connection
+      });
+      this.noDataAvailable = true;
+      this.chartLabels = [];
+      this.chartData = [];
+      this.bubbleChartData = [];
+
+      // Reset flags after fetching
+      this.isFetchingData = false;
+      this.isLoading = false;
+    }
+  }
+
+  // Fetch drilldown data based on current drilldown level
+  fetchDrilldownData(): void {
+    console.log('Fetching drilldown data, current level:', this.currentDrilldownLevel);
+    console.log('Drilldown stack:', this.drilldownStack);
+
+    // Get the current drilldown configuration based on the current level
+    let drilldownConfig;
+    if (this.currentDrilldownLevel === 1) {
+      // Base drilldown level
+      drilldownConfig = {
+        apiUrl: this.drilldownApiUrl,
+        xAxis: this.drilldownXAxis,
+        yAxis: this.drilldownYAxis,
+        parameter: this.drilldownParameter
+      };
+    } else {
+      // Multi-layer drilldown level
+      const layerIndex = this.currentDrilldownLevel - 2; // -2 because level 1 is base drilldown
+      if (layerIndex >= 0 && layerIndex < this.drilldownLayers.length) {
+        drilldownConfig = this.drilldownLayers[layerIndex];
+      } else {
+        console.warn('Invalid drilldown layer index:', layerIndex);
+        this.noDataAvailable = true;
+        this.chartLabels = [];
+        this.chartData = [];
+        this.bubbleChartData = [];
+        return;
+      }
+    }
+
+    console.log('Drilldown config for level', this.currentDrilldownLevel, ':', drilldownConfig);
+
+    // Check if we have valid drilldown configuration
+    if (!drilldownConfig || !drilldownConfig.apiUrl || !drilldownConfig.xAxis || !drilldownConfig.yAxis) {
+      console.warn('Missing drilldown configuration for level:', this.currentDrilldownLevel);
+      this.noDataAvailable = true;
+      this.chartLabels = [];
+      this.chartData = [];
+      this.bubbleChartData = [];
+      return;
+    }
+
+    // Get the parameter value from the drilldown stack
+    let parameterValue = '';
+    if (this.drilldownStack.length > 0) {
+      const lastEntry = this.drilldownStack[this.drilldownStack.length - 1];
+      parameterValue = lastEntry.clickedValue || '';
+      console.log('Parameter value from last click:', parameterValue);
+    }
+
+    // Get the parameter field from drilldown config
+    const parameterField = drilldownConfig.parameter || '';
+    console.log('Parameter field:', parameterField);
+
+    console.log('Fetching drilldown data for level:', this.currentDrilldownLevel, {
+      apiUrl: drilldownConfig.apiUrl,
+      xAxis: drilldownConfig.xAxis,
+      yAxis: drilldownConfig.yAxis,
+      parameterField: parameterField,
+      parameterValue: parameterValue,
+      connection: this.connection
+    });
+
+    // Build the actual API URL with parameter replacement
+    let actualApiUrl = drilldownConfig.apiUrl;
+    console.log('Original API URL:', actualApiUrl);
+    console.log('Parameter value to use:', parameterValue);
+    console.log('Parameter field:', parameterField);
+
+    // Check if the URL contains angle brackets for parameter replacement
+    const hasAngleBrackets = /<[^>]+>/.test(actualApiUrl);
+
+    if (hasAngleBrackets && parameterValue) {
+      // Replace angle brackets placeholder with actual value
+      console.log('Replacing angle brackets with parameter value');
+      const encodedValue = encodeURIComponent(parameterValue);
+      actualApiUrl = actualApiUrl.replace(/<[^>]+>/g, encodedValue);
+      console.log('URL after angle bracket replacement:', actualApiUrl);
+    }
+
+    // Convert drilldown layer filters to filter parameters (if applicable)
+    const filterObj = {};
+
+    // Add drilldown layer filters
+    if (drilldownConfig.filters && drilldownConfig.filters.length > 0) {
+      drilldownConfig.filters.forEach((filter: any) => {
+        if (filter.field && filter.value) {
+          filterObj[filter.field] = filter.value;
+        }
+      });
+    }
+
+    // Add drilldownFilters
+    if (this.drilldownFilters && this.drilldownFilters.length > 0) {
+      this.drilldownFilters.forEach(filter => {
+        if (filter.field && filter.value) {
+          filterObj[filter.field] = filter.value;
+        }
+      });
+    }
+
+    // Add common filters
+    const commonFilters = this.filterService.getFilterValues();
+    Object.keys(commonFilters).forEach(filterId => {
+      const filterValue = commonFilters[filterId];
+
+      // Find the filter definition to get the field name
+      const filterDef = this.filterService.getFilters().find(f => f.id === filterId);
+
+      if (filterDef && filterDef.field) {
+        const fieldName = filterDef.field;
+        if (filterValue !== undefined && filterValue !== null && filterValue !== '') {
+          filterObj[fieldName] = filterValue;
+        }
+      }
+    });
+
+    // Convert to JSON string for API call
+    let drilldownFilterParams = '';
+    if (Object.keys(filterObj).length > 0) {
+      drilldownFilterParams = JSON.stringify(filterObj);
+    }
+
+    console.log('Drilldown filter parameters:', drilldownFilterParams);
+
+    // Fetch data from the dashboard service
+    this.dashboardService.getChartData(
+      actualApiUrl,
+      this.chartType,
+      drilldownConfig.xAxis,
+      drilldownConfig.yAxis,
+      this.connection,
+      parameterField,
+      parameterValue,
+      drilldownFilterParams
+    ).subscribe(
+      (data: any) => {
+        console.log('Received drilldown data:', data);
+        if (data === null) {
+          console.warn('Drilldown API returned null data.');
+          this.noDataAvailable = true;
+          this.chartLabels = [];
+          this.chartData = [];
+          this.bubbleChartData = [];
+          return;
+        }
+
+        // Handle the actual data structure returned by the API
+        if (data && data.chartLabels && data.chartData) {
+          // Backend has already filtered the data, just display it
+          this.noDataAvailable = data.chartLabels.length === 0;
+
+          if (this.chartType === 'bubble') {
+            // For bubble charts, transform the data
+            this.bubbleChartData = this.transformToBubbleData(data.chartLabels, data.chartData);
+          } else {
+            this.chartLabels = data.chartLabels;
+            this.chartData = data.chartData;
+          }
+
+          console.log('Updated chart with drilldown data:', {
+            labels: this.chartLabels,
+            data: this.chartData,
+            bubbleData: this.bubbleChartData
+          });
+        } else if (data && data.labels && data.datasets) {
+          // Handle the legacy format
+          this.noDataAvailable = data.labels.length === 0;
+
+          if (this.chartType === 'bubble') {
+            // For bubble charts, use the datasets directly
+            this.bubbleChartData = data.datasets;
+          } else {
+            this.chartLabels = data.labels;
+            this.chartData = data.datasets;
+          }
+
+          console.log('Updated chart with drilldown legacy data format:', {
+            labels: this.chartLabels,
+            data: this.chartData,
+            bubbleData: this.bubbleChartData
+          });
+        } else {
+          console.warn('Drilldown received data does not have expected structure', data);
+          this.noDataAvailable = true;
+          this.chartLabels = [];
+          this.chartData = [];
+          this.bubbleChartData = [];
+        }
+
+        // Set loading state to false
+        this.isLoading = false;
+
+        // Trigger chart update
+        setTimeout(() => {
+          if (this.chart) {
+            this.chart.update();
+          }
+        }, 100);
+      },
+      (error) => {
+        console.error('Error fetching drilldown data:', error);
+        this.noDataAvailable = true;
+        this.chartLabels = [];
+        this.chartData = [];
+        this.bubbleChartData = [];
+        this.isLoading = false;
+      }
+    );
+  }
+
+  // Transform data to bubble chart format
+  private transformToBubbleData(labels: any[], data: any[]): ChartDataset[] {
+    console.log('Transforming data to bubble format:', { labels, data });
+
+    // Handle null/undefined data
+    if (!labels || !data) {
+      console.log('Labels or data is null/undefined, returning empty dataset');
+      return [];
+    }
+
+    // If we have the expected bubble data format, return it as is
+    if (data && data.length > 0 && data[0].data && data[0].data.length > 0 &&
+      typeof data[0].data[0] === 'object' && data[0].data[0].hasOwnProperty('x') &&
+      data[0].data[0].hasOwnProperty('y') && data[0].data[0].hasOwnProperty('r')) {
+      console.log('Data is already in bubble format, returning as is');
+      return data;
+    }
+
+    // Transform the data properly for bubble chart
+    // Assuming labels are x-values and data[0].data are y-values
+    if (labels && data && data.length > 0 && data[0].data) {
+      console.log('Transforming regular data to bubble format');
+      const yValues = data[0].data;
+      const label = data[0].label || 'Dataset 1';
+
+      // Handle case where yValues might not be an array
+      if (!Array.isArray(yValues)) {
+        console.log('yValues is not an array, returning empty dataset');
+        return [];
+      }
+
+      console.log('yValues type:', typeof yValues);
+      console.log('yValues length:', yValues.length);
+      console.log('First few yValues:', yValues.slice(0, 5));
+
+      // Find min and max values for scaling
+      let minValue = Infinity;
+      let maxValue = -Infinity;
+      const validYValues = [];
+
+      // First pass: collect valid values and find min/max
+      for (let i = 0; i < yValues.length; i++) {
+        let y;
+        if (typeof yValues[i] === 'string') {
+          y = parseFloat(yValues[i]);
+        } else {
+          y = yValues[i];
+        }
+
+        if (!isNaN(y)) {
+          validYValues.push(y);
+          minValue = Math.min(minValue, y);
+          maxValue = Math.max(maxValue, y);
+        }
+      }
+
+      console.log('Value range:', { minValue, maxValue });
+
+      // Adjust radius range based on number of data points
+      const dataPointCount = Math.min(labels.length, yValues.length);
+      let minRadius = 3;
+      let maxRadius = 30;
+
+      // Adjust radius range based on data point count
+      if (dataPointCount > 50) {
+        minRadius = 2;
+        maxRadius = 20;
+      } else if (dataPointCount > 20) {
+        minRadius = 3;
+        maxRadius = 25;
+      }
+
+      console.log('Radius range:', { minRadius, maxRadius, dataPointCount });
+
+      // Create bubble points from labels (x) and data (y)
+      const bubblePoints = [];
+      const bubbleColors = [];
+      const minLength = Math.min(labels.length, yValues.length);
+
+      console.log('Processing data points:', { labels, yValues, minLength });
+
+      for (let i = 0; i < minLength; i++) {
+        // Convert y to number if it's a string
+        let y;
+        if (typeof yValues[i] === 'string') {
+          y = parseFloat(yValues[i]);
+          console.log(`Converted string yValue to number: ${yValues[i]} -> ${y}`);
+        } else {
+          y = yValues[i];
+        }
+
+        // Handle NaN values
+        if (isNaN(y)) {
+          console.log(`Skipping point ${i} due to NaN y value: ${yValues[i]}`);
+          continue;
+        }
+
+        // Calculate radius based on the y-value with logarithmic scaling
+        const r = this.logScale(y, minValue, maxValue, minRadius, maxRadius);
+
+        console.log(`Value: ${y}, Radius: ${r}`);
+
+        // For x-value, we'll use the index position since labels are strings
+        const x = i;
+
+        // Generate a unique color for this bubble
+        const backgroundColor = this.generateBubbleColor(i, y, minLength);
+
+        // Store the color for the dataset
+        bubbleColors.push(backgroundColor);
+
+        // Add the point
+        const point = {
+          x,
+          y,
+          r
+        };
+        console.log(`Adding point ${i}:`, point);
+        bubblePoints.push(point);
+      }
+
+      console.log('Generated bubble points:', bubblePoints);
+      console.log('Generated bubble points count:', bubblePoints.length);
+      console.log('Generated bubble colors count:', bubbleColors.length);
+
+      // If we have no valid points, return empty array
+      if (bubblePoints.length === 0) {
+        console.log('No valid bubble points generated, returning empty dataset');
+        return [];
+      }
+
+      // Create a single dataset with all bubble points
+      const bubbleDatasets: ChartDataset[] = [
+        {
+          data: bubblePoints,
+          label: label,
+          backgroundColor: bubbleColors,
+          borderColor: bubbleColors.map(color => this.replaceAlpha(color, 1)),
+          hoverBackgroundColor: bubbleColors.map(color => this.replaceAlpha(color, 0.9)),
+          hoverBorderColor: 'rgba(255, 255, 255, 1)',
+          borderWidth: 2,
+          pointHoverRadius: 10,
+        }
+      ];
+
+      console.log('Transformed bubble data:', bubbleDatasets);
+      return bubbleDatasets;
+    }
+
+    console.log('Could not transform data, returning empty dataset');
+    return [];
+  }
+
+  // Helper function to calculate logarithmic scaling
+  private logScale(value: number, min: number, max: number, minRadius: number, maxRadius: number): number {
+    if (min === max) return (minRadius + maxRadius) / 2;
+
+    // Normalize value to 0-1 range
+    const normalized = (value - min) / (max - min);
+
+    // Apply logarithmic scaling (base 10)
+    // Add 1 to avoid log(0) and scale to 1-10 range
+    const logValue = Math.log10(normalized * 9 + 1);
+
+    // Scale to desired radius range
+    return minRadius + (logValue / Math.log10(10)) * (maxRadius - minRadius);
+  }
+
+  // Helper function to generate different colors for bubbles
+  private generateBubbleColor(index: number, value: number, total: number): string {
+    // Generate colors based on index or value
+    // Using HSL color model for better color distribution
+    const hue = (index * 137.508) % 360; // Golden angle approximation for good distribution
+    const saturation = 80 + (index % 20); // High saturation for vibrant colors
+    const lightness = 40 + (index % 30); // Vary lightness for contrast
+
+    // Convert HSL to RGB
+    const h = hue / 360;
+    const s = saturation / 100;
+    const l = lightness / 100;
+
+    const rgb = this.hslToRgb(h, s, l);
+    return `rgba(${rgb.r}, ${rgb.g}, ${rgb.b}, 0.7)`;
+  }
+
+  // Helper function to convert HSL to RGB
+  private hslToRgb(h: number, s: number, l: number): { r: number, g: number, b: number } {
+    let r, g, b;
+
+    if (s === 0) {
+      r = g = b = l; // achromatic
+    } else {
+      const hue2rgb = (p: number, q: number, t: number) => {
+        if (t < 0) t += 1;
+        if (t > 1) t -= 1;
+        if (t < 1 / 6) return p + (q - p) * 6 * t;
+        if (t < 1 / 2) return q;
+        if (t < 2 / 3) return p + (q - p) * (2 / 3 - t) * 6;
+        return p;
+      };
+
+      const q = l < 0.5 ? l * (1 + s) : l + s - l * s;
+      const p = 2 * l - q;
+      r = hue2rgb(p, q, h + 1 / 3);
+      g = hue2rgb(p, q, h);
+      b = hue2rgb(p, q, h - 1 / 3);
+    }
+
+    return {
+      r: Math.round(r * 255),
+      g: Math.round(g * 255),
+      b: Math.round(b * 255)
+    };
+  }
+
+  // Helper function to replace alpha value in RGBA color string
+  private replaceAlpha(color: string, newAlpha: number): string {
+    // Match rgba(r, g, b, a) format and replace alpha value
+    return color.replace(/rgba\((\d+),\s*(\d+),\s*(\d+),\s*[\d.]+\)/, `rgba($1, $2, $3, ${newAlpha})`);
+  }
+
+  // Reset to original data (go back to base level)
+  resetToOriginalData(): void {
+    console.log('Resetting to original data');
+    console.log('Current stack before reset:', this.drilldownStack);
+    console.log('Current level before reset:', this.currentDrilldownLevel);
+
+    this.currentDrilldownLevel = 0;
+    this.drilldownStack = [];
+
+    if (this.originalChartData.labels && this.originalChartData.data) {
+      this.chartLabels = [...this.originalChartData.labels];
+      this.chartData = [...this.originalChartData.data];
+      console.log('Restored original data');
+    }
+
+    console.log('After reset - data:', { labels: this.chartLabels, data: this.chartData });
+
+    // Re-fetch original data
+    this.fetchChartData();
+  }
+
+  // Navigate back to previous drilldown level
+  navigateBack(): void {
+    console.log('Navigating back, current stack:', this.drilldownStack);
+    console.log('Current level:', this.currentDrilldownLevel);
+
+    if (this.drilldownStack.length > 0) {
+      // Remove the last entry from the stack
+      const removedEntry = this.drilldownStack.pop();
+      console.log('Removed entry from stack:', removedEntry);
+
+      // Update the current drilldown level
+      this.currentDrilldownLevel = this.drilldownStack.length;
+      console.log('New level after pop:', this.currentDrilldownLevel);
+      console.log('Stack after pop:', this.drilldownStack);
+
+      if (this.drilldownStack.length > 0) {
+        // Fetch data for the previous level
+        console.log('Fetching data for previous level');
+        this.fetchDrilldownData();
+      } else {
+        // Back to base level
+        console.log('Back to base level, resetting to original data');
+        this.resetToOriginalData();
+      }
+    } else {
+      // Already at base level, reset to original data
+      console.log('Already at base level, resetting to original data');
+      this.resetToOriginalData();
+    }
+  }
+
+  // Chart click handler
+  public chartClicked(e: any): void {
+    console.log('Chart clicked:', e);
+
+    // If drilldown is enabled and we have a valid click event
+    if (this.drilldownEnabled && e.active && e.active.length > 0) {
+      // Get the index of the clicked element
+      const clickedIndex = e.active[0].index;
+
+      // Get the dataset index
+      const datasetIndex = e.active[0].datasetIndex;
+
+      // Get the data point
+      let dataPoint;
+      if (this.chartType === 'bubble') {
+        dataPoint = this.bubbleChartData[datasetIndex].data[clickedIndex];
+      } else {
+        dataPoint = this.chartData[datasetIndex].data[clickedIndex];
+      }
+
+      console.log('Clicked on chart element:', { datasetIndex, clickedIndex, dataPoint });
+
+      // If we're not at the base level, store original data
+      if (this.currentDrilldownLevel === 0) {
+        // Store original data before entering drilldown mode
+        this.originalChartData = {
+          labels: [...this.chartLabels],
+          data: JSON.parse(JSON.stringify(this.chartData)),
+          bubbleData: JSON.parse(JSON.stringify(this.bubbleChartData))
+        };
+        console.log('Stored original data for drilldown');
+      }
+
+      // Determine the next drilldown level
+      const nextDrilldownLevel = this.currentDrilldownLevel + 1;
+
+      console.log('Next drilldown level will be:', nextDrilldownLevel);
+
+      // Check if there's a drilldown configuration for this level
+      let hasDrilldownConfig = false;
+      let drilldownConfig;
+
+      if (nextDrilldownLevel === 1) {
+        // Base drilldown level
+        drilldownConfig = {
+          apiUrl: this.drilldownApiUrl,
+          xAxis: this.drilldownXAxis,
+          yAxis: this.drilldownYAxis,
+          parameter: this.drilldownParameter
+        };
+        hasDrilldownConfig = !!this.drilldownApiUrl && !!this.drilldownXAxis && !!this.drilldownYAxis;
+      } else {
+        // Multi-layer drilldown level
+        const layerIndex = nextDrilldownLevel - 2; // -2 because level 1 is base drilldown
+        if (layerIndex < this.drilldownLayers.length) {
+          drilldownConfig = this.drilldownLayers[layerIndex];
+          hasDrilldownConfig = drilldownConfig.enabled &&
+            !!drilldownConfig.apiUrl &&
+            !!drilldownConfig.xAxis &&
+            !!drilldownConfig.yAxis;
+        }
+      }
+
+      console.log('Drilldown config for next level:', drilldownConfig);
+      console.log('Has drilldown config:', hasDrilldownConfig);
+
+      // If there's a drilldown configuration for the next level, proceed
+      if (hasDrilldownConfig) {
+        // Add this click to the drilldown stack
+        const stackEntry = {
+          level: nextDrilldownLevel,
+          datasetIndex: datasetIndex,
+          clickedIndex: clickedIndex,
+          dataPoint: dataPoint,
+          clickedValue: dataPoint // Using data point as value for now
+        };
+
+        this.drilldownStack.push(stackEntry);
+
+        console.log('Added to drilldown stack:', stackEntry);
+        console.log('Current drilldown stack:', this.drilldownStack);
+
+        // Update the current drilldown level
+        this.currentDrilldownLevel = nextDrilldownLevel;
+
+        console.log('Entering drilldown level:', this.currentDrilldownLevel);
+
+        // Fetch drilldown data for the new level
+        this.fetchDrilldownData();
+      } else {
+        console.log('No drilldown configuration for level:', nextDrilldownLevel);
+      }
+    } else {
+      console.log('Drilldown not enabled or invalid click event');
+    }
+  }
+
+  public chartHovered(e: any): void {
+    // console.log('Chart hovered:', e);
+  }
+
+  // Method to check if chart data is valid
+  public isChartDataValid(): boolean {
+    if (this.chartType === 'bubble') {
+      console.log('Checking if bubble chart data is valid:', this.bubbleChartData);
+      if (!this.bubbleChartData || this.bubbleChartData.length === 0) {
+        console.log('Bubble chart data is null or empty');
+        return false;
+      }
+
+      // Check if any dataset has data
+      for (const dataset of this.bubbleChartData) {
+        console.log('Checking dataset:', dataset);
+        if (dataset.data && dataset.data.length > 0) {
+          console.log('Dataset has data, length:', dataset.data.length);
+          // For bubble charts, check if data points have x, y, r properties
+          for (const point of dataset.data) {
+            console.log('Checking point:', point);
+            if (typeof point === 'object' && point.hasOwnProperty('x') && point.hasOwnProperty('y') && point.hasOwnProperty('r')) {
+              // Valid bubble point
+              console.log('Found valid bubble point');
+              return true;
+            }
+          }
+        }
+      }
+
+      console.log('No valid bubble chart data found');
+      return false;
+    } else {
+      console.log('Checking if chart data is valid:', { labels: this.chartLabels, data: this.chartData });
+      if (!this.chartLabels || !this.chartData) {
+        console.log('Chart labels or data is null');
+        return false;
+      }
+
+      if (this.chartLabels.length === 0 || this.chartData.length === 0) {
+        console.log('Chart labels or data is empty');
+        return false;
+      }
+
+      // Check if any dataset has data
+      for (const dataset of this.chartData) {
+        if (dataset.data && dataset.data.length > 0) {
+          console.log('Found valid chart data');
+          return true;
+        }
+      }
+
+      console.log('No valid chart data found');
+      return false;
+    }
+  }
+
+  // Check if there are active filters
+  hasActiveFilters(): boolean {
+    return (this.baseFilters && this.baseFilters.length > 0) ||
+      (this.drilldownFilters && this.drilldownFilters.length > 0) ||
+      this.hasActiveLayerFilters();
+  }
+
+  // Check if there are active layer filters for current drilldown level
+  hasActiveLayerFilters(): boolean {
+    if (this.currentDrilldownLevel > 1 && this.drilldownLayers && this.drilldownLayers.length > 0) {
+      const layerIndex = this.currentDrilldownLevel - 2; // -2 because level 1 is base drilldown
+      return layerIndex < this.drilldownLayers.length &&
+        this.drilldownLayers[layerIndex].filters &&
+        this.drilldownLayers[layerIndex].filters.length > 0;
+    }
+    return false;
+  }
+
+  // Get active layer filters for current drilldown level
+  getActiveLayerFilters(): any[] {
+    if (this.currentDrilldownLevel > 1 && this.drilldownLayers && this.drilldownLayers.length > 0) {
+      const layerIndex = this.currentDrilldownLevel - 2; // -2 because level 1 is base drilldown
+      if (layerIndex < this.drilldownLayers.length &&
+        this.drilldownLayers[layerIndex].filters) {
+        return this.drilldownLayers[layerIndex].filters;
+      }
+    }
+    return [];
+  }
+
+  // Get filter options for dropdown/multiselect filters
+  getFilterOptions(filter: any): string[] {
+    if (filter.options) {
+      if (Array.isArray(filter.options)) {
+        return filter.options;
+      } else if (typeof filter.options === 'string') {
+        return filter.options.split(',').map(opt => opt.trim()).filter(opt => opt);
+      }
+    }
+    return [];
+  }
+
+  // Check if an option is selected for multiselect filters
+  isOptionSelected(filter: any, option: string): boolean {
+    if (!filter.value) {
+      return false;
+    }
+
+    if (Array.isArray(filter.value)) {
+      return filter.value.includes(option);
+    }
+
+    return filter.value === option;
+  }
+
+  // Handle base filter changes
+  onBaseFilterChange(filter: any): void {
+    console.log('Base filter changed:', filter);
+    // Refresh data when filter changes
+    this.fetchChartData();
+  }
+
+  // Handle drilldown filter changes
+  onDrilldownFilterChange(filter: any): void {
+    console.log('Drilldown filter changed:', filter);
+    // Refresh data when filter changes
+    this.fetchChartData();
+  }
+
+  // Handle layer filter changes
+  onLayerFilterChange(filter: any): void {
+    console.log('Layer filter changed:', filter);
+    // Refresh data when filter changes
+    this.fetchChartData();
+  }
+
+  // Handle multiselect changes
+  onMultiSelectChange(filter: any, option: string, event: any): void {
+    const checked = event.target.checked;
+
+    // Initialize filter.value as array if it's not already
+    if (!Array.isArray(filter.value)) {
+      filter.value = [];
+    }
+
+    if (checked) {
+      // Add option to array if not already present
+      if (!filter.value.includes(option)) {
+        filter.value.push(option);
+      }
+    } else {
+      // Remove option from array
+      filter.value = filter.value.filter((item: string) => item !== option);
+    }
+
+    // Refresh data when filter changes
+    this.fetchChartData();
+  }
+
+  // Handle date range changes
+  onDateRangeChange(filter: any, event: any): void {
+    // For date range filters, we need to handle the change differently
+    // since we're binding to individual start/end properties
+    if (!filter.value) {
+      filter.value = { start: null, end: null };
+    }
+
+    // Refresh data when filter changes
+    this.fetchChartData();
+  }
+
+  // Handle date range input changes for start/end dates
+  onDateRangeInputChange(filter: any, dateType: string, event: any): void {
+    // Initialize filter.value if it doesn't exist
+    if (!filter.value) {
+      filter.value = { start: null, end: null };
+    }
+
+    // Update the specific date type (start or end)
+    filter.value[dateType] = event.target.value;
+
+    // Refresh data when filter changes
+    this.fetchChartData();
+  }
+
+  // Handle toggle changes
+  onToggleChange(filter: any, checked: boolean): void {
+    filter.value = checked;
+    // Refresh data when filter changes
+    this.fetchChartData();
+  }
+
+  // Toggle multiselect dropdown visibility
+  toggleMultiselect(filter: any, context: string): void {
+    const filterId = `${context}-${filter.field}`;
+    if (this.isMultiselectOpen(filter, context)) {
+      this.openMultiselects.delete(filterId);
+    } else {
+      // Close all other multiselects first
+      this.openMultiselects.clear();
+      this.openMultiselects.set(filterId, context);
+
+      // Add document click handler to close dropdown when clicking outside
+      this.addDocumentClickHandler();
+    }
+  }
+
+  // Add document click handler to close dropdowns when clicking outside
+  private addDocumentClickHandler(): void {
+    if (!this.documentClickHandler) {
+      this.documentClickHandler = (event: MouseEvent) => {
+        const target = event.target as HTMLElement;
+        // Check if click is outside any multiselect dropdown
+        if (!target.closest('.multiselect-container')) {
+          this.openMultiselects.clear();
+          this.removeDocumentClickHandler();
+        }
+      };
+
+      // Use setTimeout to ensure the click event that opened the dropdown doesn't immediately close it
+      setTimeout(() => {
+        document.addEventListener('click', this.documentClickHandler!);
+      }, 0);
+    }
+  }
+
+  // Remove document click handler
+  private removeDocumentClickHandler(): void {
+    if (this.documentClickHandler) {
+      document.removeEventListener('click', this.documentClickHandler);
+      this.documentClickHandler = null;
+    }
+  }
+
+  // Check if multiselect dropdown is open
+  isMultiselectOpen(filter: any, context: string): boolean {
+    const filterId = `${context}-${filter.field}`;
+    return this.openMultiselects.has(filterId);
+  }
+
+  // Get count of selected options for a multiselect filter
+  getSelectedOptionsCount(filter: any): number {
+    if (!filter.value) {
+      return 0;
+    }
+
+    if (Array.isArray(filter.value)) {
+      return filter.value.length;
+    }
+
+    return 0;
+  }
+
+
+
+  // Clear all filters
+  clearAllFilters(): void {
+    // Clear base filters
+    if (this.baseFilters) {
+      this.baseFilters.forEach(filter => {
+        if (filter.type === 'multiselect') {
+          filter.value = [];
+        } else if (filter.type === 'date-range') {
+          filter.value = { start: null, end: null };
+        } else if (filter.type === 'toggle') {
+          filter.value = false;
+        } else {
+          filter.value = '';
+        }
+      });
+    }
+
+    // Clear drilldown filters
+    if (this.drilldownFilters) {
+      this.drilldownFilters.forEach(filter => {
+        if (filter.type === 'multiselect') {
+          filter.value = [];
+        } else if (filter.type === 'date-range') {
+          filter.value = { start: null, end: null };
+        } else if (filter.type === 'toggle') {
+          filter.value = false;
+        } else {
+          filter.value = '';
+        }
+      });
+    }
+
+    // Clear layer filters
+    if (this.drilldownLayers) {
+      this.drilldownLayers.forEach(layer => {
+        if (layer.filters) {
+          layer.filters.forEach((filter: any) => {
+            if (filter.type === 'multiselect') {
+              filter.value = [];
+            } else if (filter.type === 'date-range') {
+              filter.value = { start: null, end: null };
+            } else if (filter.type === 'toggle') {
+              filter.value = false;
+            } else {
+              filter.value = '';
+            }
+          });
+        }
+      });
+    }
+
+    // Close all multiselect dropdowns
+    this.openMultiselects.clear();
+
+    // Refresh data
+    this.fetchChartData();
+  }
+}
\ No newline at end of file
diff --git a/frontend/angular-clarity-master/src/app/modules/main/builder/dashboardrunner/dashrunnerall/dashrunnerall.component.html b/frontend/angular-clarity-master/src/app/modules/main/builder/dashboardrunner/dashrunnerall/dashrunnerall.component.html
index 74d44e3..59fe60d 100644
--- a/frontend/angular-clarity-master/src/app/modules/main/builder/dashboardrunner/dashrunnerall/dashrunnerall.component.html
+++ b/frontend/angular-clarity-master/src/app/modules/main/builder/dashboardrunner/dashrunnerall/dashrunnerall.component.html
@@ -11,6 +11,9 @@
           <h3>{{ 'all_dashboard' | translate }}</h3>
         </div>
         <div class="clr-col-4" style="text-align: right;">
+          <button class="btn btn-success" [routerLink]="['/cns-portal/shield-dashboard']">
+            <clr-icon shape="shield"></clr-icon>Shield Dashboard
+          </button>
           <button id="add" class="btn btn-primary"  (click)="gotoadd()">
             <clr-icon shape="plus"></clr-icon>{{ 'dashboard_builder' | translate }}
           </button>
@@ -111,7 +114,4 @@
           <button type="submit" (click)="delete(rowSelected.id)" class="btn btn-primary" >{{'DELETE' |translate}}</button>
         </div>
       </div>
-    </clr-modal>
-   
-  
-  
\ No newline at end of file
+    </clr-modal>
\ No newline at end of file
diff --git a/frontend/angular-clarity-master/src/app/modules/main/builder/dashboardrunner/dashrunnerall/dashrunnerall.component.ts b/frontend/angular-clarity-master/src/app/modules/main/builder/dashboardrunner/dashrunnerall/dashrunnerall.component.ts
index ba27793..5eb4c27 100644
--- a/frontend/angular-clarity-master/src/app/modules/main/builder/dashboardrunner/dashrunnerall/dashrunnerall.component.ts
+++ b/frontend/angular-clarity-master/src/app/modules/main/builder/dashboardrunner/dashrunnerall/dashrunnerall.component.ts
@@ -12,23 +12,23 @@ import { ModulesetupService } from 'src/app/services/builder/modulesetup.service
   styleUrls: ['./dashrunnerall.component.scss']
 })
 export class DashrunnerallComponent implements OnInit {
-  addModall:boolean = false;
-  selected:any[] = [];
+  addModall: boolean = false;
+  selected: any[] = [];
   loading = false;
-  data:any;
-  id:any;
-  moduleId:any;
+  data: any;
+  id: any;
+  moduleId: any;
   modalDelete = false;
-  rowSelected :any= {};
+  rowSelected: any = {};
   rows: any[];
   projectname;
   projectId;
   error;
   constructor(
-    private router : Router,
-    private route: ActivatedRoute,private dashboardService : Dashboard3Service,
+    private router: Router,
+    private route: ActivatedRoute, private dashboardService: Dashboard3Service,
     // private wireframeservice : WireframeService,
-    private excel: ExcelService,private mainService: ModulesetupService,
+    private excel: ExcelService, private mainService: ModulesetupService,
     private toastr: ToastrService,) { }
 
   ngOnInit(): void {
@@ -42,41 +42,46 @@ export class DashrunnerallComponent implements OnInit {
     // this.getprojectName(this.projectId);
   }
 
-  getprojectName(id){
+  getprojectName(id) {
     this.mainService.getProjectModules(id).subscribe((data) => {
       console.log(data);
-      this.projectname=data.items[0]['projectName'];
+      this.projectname = data.items[0]['projectName'];
       console.log(this.projectname);
     });
   }
 
 
-  getdashboard()
-  {
-    this.dashboardService.getAllDash().subscribe((data) =>{
+  getdashboard() {
+    this.dashboardService.getAllDash().subscribe((data) => {
       this.data = data;
       this.rows = this.data;
       console.log(data);
-      this.error="No data Available";
+      this.error = "No data Available";
       console.log(this.error);
     });
   }
 
-  openModal()
-  {
+  openModal() {
     this.addModall = true;
   }
-  gotoadd()
-  {
-      this.router.navigate(['../../dashboardbuilder'],{relativeTo:this.route});
+  gotoadd() {
+    this.router.navigate(['../../dashboardbuilder'], { relativeTo: this.route });
   }
-  goToEdit(id:number)
-  {
-     this.router.navigate(['../dashrunner/'+id],{relativeTo:this.route});
+  //  for runner line navigation
+  //  goToEditData(id: number){
+  //   this.router.navigate(['../editdata/'+id],{relativeTo:this.route});
+  // }
+  goToEdit(id: number) {
+    // Navigate to editnewdash component instead of dashrunnerline
+    // Pass a query parameter to indicate this is from dashboard runner
+    this.router.navigate(['../../dashboardbuilder/editdashn/' + id], {
+      relativeTo: this.route,
+      queryParams: { fromRunner: true }
+    });
   }
 
-  goToEditData(id: number){
-    this.router.navigate(['../editdata/'+id],{relativeTo:this.route});
+  goToEditData(id: number) {
+    this.router.navigate(['../editdata/' + id], { relativeTo: this.route });
   }
 
   onExport() {
@@ -84,29 +89,28 @@ export class DashrunnerallComponent implements OnInit {
       moment().format('YYYYMMDD_HHmmss'))
   }
 
-  gotoAction(){
-    this.router.navigate(["../../actions"], { relativeTo: this.route, queryParams: { m_id: this.moduleId,pname:this.projectname } });
+  gotoAction() {
+    this.router.navigate(["../../actions"], { relativeTo: this.route, queryParams: { m_id: this.moduleId, pname: this.projectname } });
   }
-  gotoRepo(){
+  gotoRepo() {
     this.router.navigate(["../../modulecard"], { relativeTo: this.route, queryParams: { p_id: this.projectId } });
   }
 
-  onDelete(row){
+  onDelete(row) {
     this.rowSelected = row;
     console.log(this.rowSelected);
     this.modalDelete = true;
   }
-  delete(id)
-  {
-     this.modalDelete = false;
-     console.log("in delete  "+id);
-     this.dashboardService.deleteField(id).subscribe((data)=>{
+  delete(id) {
+    this.modalDelete = false;
+    console.log("in delete  " + id);
+    this.dashboardService.deleteField(id).subscribe((data) => {
       console.log(data);
       this.ngOnInit();
-     });
-     if (id) {
+    });
+    if (id) {
       this.toastr.success('Deleted successfully');
-          }
+    }
   }
   // openModal()
   // {
diff --git a/frontend/angular-clarity-master/src/app/modules/main/builder/dashboardrunner/dashrunnerline/bar-runner/bar-runner.component.ts b/frontend/angular-clarity-master/src/app/modules/main/builder/dashboardrunner/dashrunnerline/bar-runner/bar-runner.component.ts
index 2781144..741b457 100644
--- a/frontend/angular-clarity-master/src/app/modules/main/builder/dashboardrunner/dashrunnerline/bar-runner/bar-runner.component.ts
+++ b/frontend/angular-clarity-master/src/app/modules/main/builder/dashboardrunner/dashrunnerline/bar-runner/bar-runner.component.ts
@@ -3,6 +3,10 @@ import { DashrunnerService } from '../dashrunner.service';
 import { ActivatedRoute, Router } from '@angular/router';
 import { Dashboard3Service } from 'src/app/services/builder/dashboard3.service';
 import { DashboardContentModel } from 'src/app/models/builder/dashboard';
+// Add FilterService import
+import { FilterService } from '../../../dashboardnew/common-filter/filter.service';
+// Add Subscription import
+import { Subscription } from 'rxjs';
 
 @Component({
   selector: 'app-bar-runner',
@@ -24,8 +28,19 @@ export class BarRunnerComponent implements OnInit {
   JsonData;
 
   barData;
-  constructor(private Dashtestservive:DashrunnerService,private route: ActivatedRoute,private dashboardService: Dashboard3Service,
-    private router : Router,) { }
+  ConnectionId: number; // Add ConnectionId property
+  
+  // Add subscriptions to unsubscribe on destroy
+  private subscriptions: Subscription[] = [];
+
+  constructor(
+    private Dashtestservive:DashrunnerService,
+    private route: ActivatedRoute,
+    private dashboardService: Dashboard3Service,
+    private router : Router,
+    // Add FilterService to constructor
+    private filterService: FilterService
+  ) { }
 
   barChartLabels: any[] = [];
   barChartType: string = 'bar';
@@ -47,6 +62,13 @@ export class BarRunnerComponent implements OnInit {
       this.editId = this.route.snapshot.params.id;
       console.log(this.editId);
 
+      // Subscribe to filter changes
+      this.subscriptions.push(
+        this.filterService.filterState$.subscribe(filters => {
+          // When filters change, refresh the chart data
+          this.fetchChartData();
+        })
+      );
 
       this.dashboardService.getById(this.editId).subscribe((data)=>{
         console.log(data);
@@ -74,22 +96,62 @@ export class BarRunnerComponent implements OnInit {
             this.YAxis = ChartObject[i].yAxis;
             this.showlabel = ChartObject[i].showlabel;
             this.barChartLegend = ChartObject[i].chartlegend;
+            this.ConnectionId = ChartObject[i].connection; // Add connection ID
             console.log(this.TableName);
-            this.Dashtestservive.getChartData(this.TableName,"Bar Chart",this.XAxis,this.YAxis).subscribe((Ldata) => {
-              console.log(Ldata);
-              this.JsonData = Ldata;
-              this.barChartData = this.JsonData.barChartData;
-              this.barChartLabels = this.JsonData.barChartLabels;
-              
-             },(error) => {
-              console.log(error);
-             });
+            // Fetch data with filters
+            this.fetchChartData();
             break; // No need to continue the loop once the correct placeholder is found
           }
         }
       });
   }
    
+  // Fetch chart data with filter support
+  fetchChartData(): void {
+    if (this.TableName && this.XAxis && this.YAxis) {
+      // Convert YAxis to string if it's an array
+      const yAxisString = Array.isArray(this.YAxis) ? this.YAxis.join(',') : this.YAxis;
+      
+      // Get filter parameters from common filters
+      const commonFilters = this.filterService.getFilterValues();
+      const filterDefinitions = this.filterService.getFilters();
+      
+      // Build filter object using field names as keys
+      const filterObj = {};
+      Object.keys(commonFilters).forEach(filterId => {
+        const filterValue = commonFilters[filterId];
+        
+        // Find the filter definition to get the field name
+        const filterDef = this.filterService.getFilters().find(f => f.id === filterId);
+        
+        if (filterDef && filterDef.field) {
+          const fieldName = filterDef.field;
+          if (filterValue !== undefined && filterValue !== null && filterValue !== '') {
+            filterObj[fieldName] = filterValue;
+          }
+        }
+      });
+      
+      // Convert to JSON string for API call
+      let filterParams = '';
+      if (Object.keys(filterObj).length > 0) {
+        filterParams = JSON.stringify(filterObj);
+      }
+      
+      console.log('BarRunner: Final filter object to send to API:', filterObj);
+      
+      // Fetch data from the dashboard service with filters
+      this.Dashtestservive.getChartDataWithFilters(this.TableName, "Bar Chart", this.XAxis, this.YAxis, this.ConnectionId, '', '', filterParams).subscribe((Ldata) => {
+        console.log(Ldata);
+        this.JsonData = Ldata;
+        this.barChartData = this.JsonData.barChartData;
+        this.barChartLabels = this.JsonData.barChartLabels;
+      },(error) => {
+        console.log(error);
+      });
+    }
+  }
+
   generatePDFFile(){
     this.buttonClicked.emit();
     const content = this.contentContainerRef.nativeElement;
@@ -97,5 +159,17 @@ export class BarRunnerComponent implements OnInit {
 
     this.Dashtestservive.generatePDF(content, filename);
   }
-
-}
+  
+  ngOnDestroy() {
+    // Unsubscribe from all subscriptions to prevent memory leaks
+    console.log('BarRunnerComponent ngOnDestroy called, unsubscribing from', this.subscriptions.length, 'subscriptions');
+    this.subscriptions.forEach(subscription => {
+      if (subscription && !subscription.closed) {
+        subscription.unsubscribe();
+      }
+    });
+    this.subscriptions = [];
+    
+    console.log('BarRunnerComponent destroyed and cleaned up');
+  }
+}
\ No newline at end of file
diff --git a/frontend/angular-clarity-master/src/app/modules/main/builder/dashboardrunner/dashrunnerline/bubble-runner/bubble-runner.component.ts b/frontend/angular-clarity-master/src/app/modules/main/builder/dashboardrunner/dashrunnerline/bubble-runner/bubble-runner.component.ts
index 5bb9632..f8d2cd0 100644
--- a/frontend/angular-clarity-master/src/app/modules/main/builder/dashboardrunner/dashrunnerline/bubble-runner/bubble-runner.component.ts
+++ b/frontend/angular-clarity-master/src/app/modules/main/builder/dashboardrunner/dashrunnerline/bubble-runner/bubble-runner.component.ts
@@ -5,6 +5,10 @@ import { ChartConfiguration,  ChartDataset,  ChartOptions } from 'chart.js';
 import { DashboardContentModel } from 'src/app/models/builder/dashboard';
 import { DashrunnerService } from '../dashrunner.service';
 import { Dashboard3Service } from 'src/app/services/builder/dashboard3.service';
+// Add FilterService import
+import { FilterService } from '../../../dashboardnew/common-filter/filter.service';
+// Add Subscription import
+import { Subscription } from 'rxjs';
 
 @Component({
   selector: 'app-bubble-runner',
@@ -25,9 +29,15 @@ export class BubbleRunnerComponent implements OnInit {
   JsonData;
   lineChartNoLabels: [] = [];
   ChartLegend = false;
+  ConnectionId: number; // Add ConnectionId property
+  
+  // Add subscriptions to unsubscribe on destroy
+  private subscriptions: Subscription[] = [];
   
   constructor(private Dashtestservive:DashrunnerService,private route: ActivatedRoute,private dashboardService: Dashboard3Service,
-    private router : Router,) { }
+    private router : Router,
+    // Add FilterService to constructor
+    private filterService: FilterService) { }
     
   public bubbleChartOptions: ChartConfiguration['options'] = {
     // scales: {
@@ -87,6 +97,13 @@ export class BubbleRunnerComponent implements OnInit {
     this.editId = this.route.snapshot.params.id;
     console.log(this.editId);
 
+    // Subscribe to filter changes
+    this.subscriptions.push(
+      this.filterService.filterState$.subscribe(filters => {
+        // When filters change, refresh the chart data
+        this.fetchChartData();
+      })
+    );
 
     this.dashboardService.getById(this.editId).subscribe((data)=>{
       console.log(data);
@@ -112,22 +129,62 @@ export class BubbleRunnerComponent implements OnInit {
           this.YAxis = ChartObject[i].yAxis;
           this.showlabel = ChartObject[i].showlabel;
           this.ChartLegend = ChartObject[i].chartlegend;
+          this.ConnectionId = ChartObject[i].connection; // Add connection ID
           console.log(this.TableName);
-          this.Dashtestservive.getChartData(this.TableName,"Bubble Chart",this.XAxis,this.YAxis).subscribe((Ldata) => {
-            console.log(Ldata);
-            this.JsonData = Ldata;
-            this.bubbleChartData = this.JsonData.bubbleChartData;
-            // this.radarChartLabels = this.JsonData.radarChartLabels;
-            
-           },(error) => {
-            console.log(error);
-           });
+          // Fetch data with filters
+          this.fetchChartData();
           break; // No need to continue the loop once the correct placeholder is found
         }
       }
     });
   }
-
+  
+  // Fetch chart data with filter support
+  fetchChartData(): void {
+    if (this.TableName && this.XAxis && this.YAxis) {
+      // Convert YAxis to string if it's an array
+      const yAxisString = Array.isArray(this.YAxis) ? this.YAxis.join(',') : this.YAxis;
+      
+      // Get filter parameters from common filters
+      const commonFilters = this.filterService.getFilterValues();
+      const filterDefinitions = this.filterService.getFilters();
+      
+      // Build filter object using field names as keys
+      const filterObj = {};
+      Object.keys(commonFilters).forEach(filterId => {
+        const filterValue = commonFilters[filterId];
+        
+        // Find the filter definition to get the field name
+        const filterDef = this.filterService.getFilters().find(f => f.id === filterId);
+        
+        if (filterDef && filterDef.field) {
+          const fieldName = filterDef.field;
+          if (filterValue !== undefined && filterValue !== null && filterValue !== '') {
+            filterObj[fieldName] = filterValue;
+          }
+        }
+      });
+      
+      // Convert to JSON string for API call
+      let filterParams = '';
+      if (Object.keys(filterObj).length > 0) {
+        filterParams = JSON.stringify(filterObj);
+      }
+      
+      console.log('BubbleRunner: Final filter object to send to API:', filterObj);
+      
+      // Fetch data from the dashboard service with filters
+      this.Dashtestservive.getChartDataWithFilters(this.TableName, "Bubble Chart", this.XAxis, this.YAxis, this.ConnectionId, '', '', filterParams).subscribe((Ldata) => {
+        console.log(Ldata);
+        this.JsonData = Ldata;
+        this.bubbleChartData = this.JsonData.bubbleChartData;
+        // this.radarChartLabels = this.JsonData.radarChartLabels;
+      },(error) => {
+        console.log(error);
+      });
+    }
+  }
+  
   generatePDFFile(){
     this.buttonClicked.emit();
     const content = this.contentContainerRef.nativeElement;
@@ -135,6 +192,19 @@ export class BubbleRunnerComponent implements OnInit {
 
     this.Dashtestservive.generatePDF(content, filename);
   }
+  
+  ngOnDestroy() {
+    // Unsubscribe from all subscriptions to prevent memory leaks
+    console.log('BubbleRunnerComponent ngOnDestroy called, unsubscribing from', this.subscriptions.length, 'subscriptions');
+    this.subscriptions.forEach(subscription => {
+      if (subscription && !subscription.closed) {
+        subscription.unsubscribe();
+      }
+    });
+    this.subscriptions = [];
+    
+    console.log('BubbleRunnerComponent destroyed and cleaned up');
+  }
 
 
 }
diff --git a/frontend/angular-clarity-master/src/app/modules/main/builder/dashboardrunner/dashrunnerline/compact-filter-runner/compact-filter-runner.component.html b/frontend/angular-clarity-master/src/app/modules/main/builder/dashboardrunner/dashrunnerline/compact-filter-runner/compact-filter-runner.component.html
new file mode 100644
index 0000000..80a9bc5
--- /dev/null
+++ b/frontend/angular-clarity-master/src/app/modules/main/builder/dashboardrunner/dashrunnerline/compact-filter-runner/compact-filter-runner.component.html
@@ -0,0 +1,73 @@
+<div class="compact-filter">
+  <div class="filter-header" (click)="toggleFilter()">
+    <span class="filter-label" *ngIf="filterLabel">{{ filterLabel }}</span>
+    <span class="filter-key" *ngIf="!filterLabel && filterKey">{{ filterKey }}</span>
+    <span class="filter-type">({{ filterType }})</span>
+    <clr-icon shape="caret down" class="expand-icon" *ngIf="!isExpanded"></clr-icon>
+    <clr-icon shape="caret up" class="expand-icon" *ngIf="isExpanded"></clr-icon>
+  </div>
+
+  <div class="filter-content" *ngIf="isExpanded">
+    <!-- Text Filter -->
+    <div class="filter-control" *ngIf="filterType === 'text'">
+      <input type="text" 
+             [(ngModel)]="filterValue" 
+             (ngModelChange)="onFilterValueChange($event)"
+             [placeholder]="filterLabel || filterKey"
+             class="clr-input compact-input">
+    </div>
+
+    <!-- Dropdown Filter -->
+    <div class="filter-control" *ngIf="filterType === 'dropdown'">
+      <select [(ngModel)]="filterValue" 
+              (ngModelChange)="onFilterValueChange($event)"
+              class="clr-select compact-select">
+        <option value="">{{ filterLabel || filterKey }}</option>
+        <option *ngFor="let option of filterOptions; let i = index" [value]="option">{{ option }}</option>
+      </select>
+    </div>
+
+    <!-- Multi-Select Filter -->
+    <div class="filter-control" *ngIf="filterType === 'multiselect'">
+      <div class="multiselect-container">
+        <div class="checkbox-group">
+          <div *ngFor="let option of filterOptions; let i = index" class="checkbox-item">
+            <input type="checkbox" 
+                   [checked]="isOptionSelected(option)" 
+                   (change)="onMultiSelectChange(option, $event)"
+                   [id]="'checkbox-' + filterKey + '-' + i" 
+                   class="clr-checkbox">
+            <label [for]="'checkbox-' + filterKey + '-' + i" class="checkbox-label">{{ option }}</label>
+          </div>
+        </div>
+      </div>
+    </div>
+
+    <!-- Date Range Filter -->
+    <div class="filter-control date-range" *ngIf="filterType === 'date-range'">
+      <div class="date-input-group">
+        <input type="date" 
+               [(ngModel)]="filterValue.start" 
+               (ngModelChange)="onDateRangeChange({ start: $event, end: filterValue.end })"
+               placeholder="Start Date"
+               class="clr-input compact-date">
+        <span class="date-separator">to</span>
+        <input type="date" 
+               [(ngModel)]="filterValue.end" 
+               (ngModelChange)="onDateRangeChange({ start: filterValue.start, end: $event })"
+               placeholder="End Date"
+               class="clr-input compact-date">
+      </div>
+    </div>
+
+    <!-- Toggle Filter -->
+    <div class="filter-control toggle" *ngIf="filterType === 'toggle'">
+      <input type="checkbox" 
+             [(ngModel)]="filterValue" 
+             (ngModelChange)="onToggleChange($event)"
+             clrToggle 
+             class="clr-toggle">
+      <label class="toggle-label">{{ filterLabel || filterKey }}</label>
+    </div>
+  </div>
+</div>
\ No newline at end of file
diff --git a/frontend/angular-clarity-master/src/app/modules/main/builder/dashboardrunner/dashrunnerline/compact-filter-runner/compact-filter-runner.component.scss b/frontend/angular-clarity-master/src/app/modules/main/builder/dashboardrunner/dashrunnerline/compact-filter-runner/compact-filter-runner.component.scss
new file mode 100644
index 0000000..da712b1
--- /dev/null
+++ b/frontend/angular-clarity-master/src/app/modules/main/builder/dashboardrunner/dashrunnerline/compact-filter-runner/compact-filter-runner.component.scss
@@ -0,0 +1,149 @@
+.compact-filter {
+  display: block;
+  min-width: 200px;
+  max-width: 300px;
+  margin: 8px;
+  padding: 0;
+  background: #ffffff;
+  border: 1px solid #d7d7d7;
+  border-radius: 4px;
+  font-size: 14px;
+  box-shadow: 0 1px 2px rgba(0, 0, 0, 0.05);
+  
+  .filter-header {
+    display: flex;
+    justify-content: space-between;
+    align-items: center;
+    padding: 12px 15px;
+    cursor: pointer;
+    background: #f8f8f8;
+    border-bottom: 1px solid #eaeaea;
+    border-radius: 4px 4px 0 0;
+    
+    &:hover {
+      background: #f0f0f0;
+    }
+    
+    .filter-label, .filter-key {
+      font-weight: 500;
+      color: #333333;
+      flex-grow: 1;
+    }
+    
+    .filter-type {
+      font-size: 12px;
+      color: #666666;
+      margin: 0 8px;
+      background: #eaeaea;
+      padding: 2px 8px;
+      border-radius: 12px;
+    }
+    
+    .expand-icon {
+      width: 16px;
+      height: 16px;
+      color: #666666;
+    }
+  }
+  
+  .filter-content {
+    padding: 15px;
+    
+    .filter-control {
+      margin-bottom: 12px;
+      
+      &:last-child {
+        margin-bottom: 0;
+      }
+      
+      &.date-range {
+        .date-input-group {
+          display: flex;
+          align-items: center;
+          gap: 8px;
+          
+          .date-separator {
+            font-size: 14px;
+            color: #666666;
+          }
+        }
+      }
+      
+      &.toggle {
+        display: flex;
+        align-items: center;
+        gap: 8px;
+      }
+    }
+  }
+  
+  .compact-input,
+  .compact-select,
+  .compact-date {
+    width: 100%;
+    padding: 8px 12px;
+    font-size: 14px;
+    border: 1px solid #d7d7d7;
+    border-radius: 4px;
+    background: #ffffff;
+    
+    &:focus {
+      outline: none;
+      border-color: #0072ce;
+      box-shadow: 0 0 0 1px #0072ce;
+    }
+  }
+  
+  .compact-select {
+    height: 36px;
+  }
+  
+  .multiselect-container {
+    max-height: 200px;
+    overflow-y: auto;
+    border: 1px solid #d7d7d7;
+    border-radius: 4px;
+    padding: 10px;
+    background: #ffffff;
+  }
+  
+  .checkbox-group {
+    display: flex;
+    flex-direction: column;
+    gap: 8px;
+  }
+  
+  .checkbox-item {
+    display: flex;
+    align-items: center;
+    gap: 8px;
+    
+    .clr-checkbox {
+      width: 16px;
+      height: 16px;
+      cursor: pointer;
+    }
+    
+    .checkbox-label {
+      font-size: 14px;
+      margin: 0;
+      cursor: pointer;
+      color: #333333;
+    }
+  }
+  
+  .toggle-label {
+    margin: 0;
+    font-size: 14px;
+    color: #333333;
+  }
+  
+  .clr-toggle {
+    margin: 0;
+  }
+}
+
+// Host styling
+:host {
+  display: block;
+}
\ No newline at end of file
diff --git a/frontend/angular-clarity-master/src/app/modules/main/builder/dashboardrunner/dashrunnerline/compact-filter-runner/compact-filter-runner.component.ts b/frontend/angular-clarity-master/src/app/modules/main/builder/dashboardrunner/dashrunnerline/compact-filter-runner/compact-filter-runner.component.ts
new file mode 100644
index 0000000..86978b0
--- /dev/null
+++ b/frontend/angular-clarity-master/src/app/modules/main/builder/dashboardrunner/dashrunnerline/compact-filter-runner/compact-filter-runner.component.ts
@@ -0,0 +1,245 @@
+import { Component, OnInit, Input, Output, EventEmitter, OnChanges, SimpleChanges } from '@angular/core';
+import { FilterService, Filter } from '../../../dashboardnew/common-filter/filter.service';
+
+@Component({
+  selector: 'app-compact-filter-runner',
+  templateUrl: './compact-filter-runner.component.html',
+  styleUrls: ['./compact-filter-runner.component.scss']
+})
+export class CompactFilterRunnerComponent implements OnInit, OnChanges {
+  @Input() filterKey: string = '';
+  @Input() filterType: string = 'text';
+  @Input() filterOptions: string[] = [];
+  @Input() filterLabel: string = '';
+  @Input() apiUrl: string = '';
+  @Input() connection: number | undefined;
+  @Output() filterChange = new EventEmitter<any>();
+  
+  selectedFilter: Filter | null = null;
+  filterValue: any = '';
+  availableFilters: Filter[] = [];
+  availableKeys: string[] = [];
+  availableValues: string[] = [];
+  isExpanded: boolean = false; // Add expansion state
+  
+  constructor(
+    private filterService: FilterService
+  ) {
+    console.log('=== COMPACT FILTER RUNNER CONSTRUCTOR CALLED ===');
+  }
+
+  ngOnInit(): void {
+    console.log('=== COMPACT FILTER RUNNER DEBUG INFO ===');
+    console.log('Component initialized with inputs:');
+    console.log('- filterKey:', this.filterKey);
+    console.log('- filterType:', this.filterType);
+    console.log('- filterOptions:', this.filterOptions);
+    console.log('- filterLabel:', this.filterLabel);
+    console.log('- apiUrl:', this.apiUrl);
+    console.log('- connection:', this.connection);
+    console.log('========================================');
+    
+    // Register this filter with the filter service
+    this.registerFilter();
+    
+    // Subscribe to filter definitions to get available filters
+    this.filterService.filters$.subscribe(filters => {
+      this.availableFilters = filters;
+      console.log('Available filters updated:', filters);
+      this.updateSelectedFilter();
+    });
+    
+    // Subscribe to filter state changes
+    this.filterService.filterState$.subscribe(state => {
+      console.log('Filter state updated:', state);
+      if (this.selectedFilter && state.hasOwnProperty(this.selectedFilter.id)) {
+        this.filterValue = state[this.selectedFilter.id];
+        console.log('Filter value updated for', this.selectedFilter.id, ':', this.filterValue);
+      }
+    });
+  }
+  
+  ngOnChanges(changes: SimpleChanges): void {
+    console.log('=== COMPACT FILTER RUNNER CHANGES DEBUG ===');
+    console.log('Component inputs changed:', changes);
+    
+    // If filterKey or filterType changes, re-register the filter
+    if (changes.filterKey || changes.filterType || changes.filterOptions) {
+      console.log('Re-registering filter due to input changes');
+      this.registerFilter();
+    }
+    console.log('==========================================');
+  }
+  
+  // Toggle filter expansion
+  toggleFilter(): void {
+    this.isExpanded = !this.isExpanded;
+  }
+  
+  // Register this filter with the filter service
+  registerFilter(): void {
+    console.log('Registering filter with key:', this.filterKey, 'type:', this.filterType);
+    
+    if (this.filterKey) {
+      // Get current filter values from the service
+      const currentFilterValues = this.filterService.getFilterValues();
+      console.log('Current filter values from service:', currentFilterValues);
+      
+      // Create a filter definition for this compact filter
+      const filterDef: Filter = {
+        id: `${this.filterKey}`,
+        field: this.filterKey,
+        label: this.filterLabel || this.filterKey,
+        type: this.filterType as any,
+        options: this.filterOptions,
+        value: this.filterValue // Use the current filter value
+      };
+      
+      console.log('Created filter definition:', filterDef);
+      
+      // Get current filters
+      const currentFilters = this.filterService.getFilters();
+      console.log('Current filters from service:', currentFilters);
+      
+      // Check if this filter is already registered
+      const existingFilterIndex = currentFilters.findIndex(f => f.id === filterDef.id);
+      console.log('Existing filter index:', existingFilterIndex);
+      
+      if (existingFilterIndex >= 0) {
+        // Preserve the existing filter configuration
+        const existingFilter = currentFilters[existingFilterIndex];
+        console.log('Found existing filter:', existingFilter);
+        
+        // Preserve the existing filter value if it exists in the service
+        if (currentFilterValues.hasOwnProperty(existingFilter.id)) {
+          filterDef.value = currentFilterValues[existingFilter.id];
+          this.filterValue = filterDef.value; // Update local value
+          console.log('Using value from service:', filterDef.value);
+        } else if (existingFilter.value !== undefined) {
+          // Fallback to existing filter's value if no service value
+          filterDef.value = existingFilter.value;
+          this.filterValue = filterDef.value;
+          console.log('Using value from existing filter:', filterDef.value);
+        }
+        
+        // Preserve other configuration properties
+        filterDef.label = existingFilter.label;
+        filterDef.options = existingFilter.options || this.filterOptions;
+        
+        // Update existing filter
+        currentFilters[existingFilterIndex] = filterDef;
+        console.log('Updated existing filter:', filterDef);
+      } else {
+        // For new filters, check if there's already a value in the service
+        if (currentFilterValues.hasOwnProperty(filterDef.id)) {
+          filterDef.value = currentFilterValues[filterDef.id];
+          this.filterValue = filterDef.value; // Update local value
+          console.log('Using value from service for new filter:', filterDef.value);
+        }
+        
+        // Add new filter
+        currentFilters.push(filterDef);
+        console.log('Added new filter:', filterDef);
+      }
+      
+      // Update the filter service with the new filter list
+      this.filterService.setFilters(currentFilters);
+      
+      // Update the selected filter reference
+      this.selectedFilter = filterDef;
+      console.log('Selected filter set to:', this.selectedFilter);
+    } else {
+      console.log('No filterKey provided, skipping filter registration');
+    }
+  }
+  
+  updateSelectedFilter(): void {
+    console.log('Updating selected filter. Filter key:', this.filterKey, 'Available filters:', this.availableFilters);
+    if (this.filterKey && this.availableFilters.length > 0) {
+      this.selectedFilter = this.availableFilters.find(f => f.field === this.filterKey) || null;
+      console.log('Found selected filter:', this.selectedFilter);
+      if (this.selectedFilter) {
+        // Get current value for this filter from the service
+        const currentState = this.filterService.getFilterValues();
+        console.log('Current state from service:', currentState);
+        const filterValue = currentState[this.selectedFilter.id];
+        if (filterValue !== undefined) {
+          this.filterValue = filterValue;
+        } else if (this.selectedFilter.value !== undefined) {
+          // Use the filter's default value if no service value
+          this.filterValue = this.selectedFilter.value;
+        } else {
+          // Use the current filter value as fallback
+          this.filterValue = this.filterValue || '';
+        }
+        
+        console.log('Updated selected filter value:', this.filterValue);
+      }
+    }
+  }
+  
+  onFilterValueChange(value: any): void {
+    console.log('Filter value changed:', value);
+    
+    if (this.selectedFilter) {
+      this.filterValue = value;
+      this.filterService.updateFilterValue(this.selectedFilter.id, value);
+      this.filterChange.emit({ filterId: this.selectedFilter.id, value: value });
+      
+      // Update the filter definition in the service to reflect the new value
+      const currentFilters = this.filterService.getFilters();
+      const filterIndex = currentFilters.findIndex(f => f.id === this.selectedFilter.id);
+      if (filterIndex >= 0) {
+        currentFilters[filterIndex].value = value;
+        this.filterService.setFilters(currentFilters);
+      }
+    }
+  }
+  
+  onToggleChange(checked: boolean): void {
+    this.onFilterValueChange(checked);
+  }
+  
+  onDateRangeChange(dateRange: { start: string | null, end: string | null }): void {
+    this.onFilterValueChange(dateRange);
+  }
+  
+  // Handle multi-select changes
+  onMultiSelectChange(option: string, event: any): void {
+    const checked = event.target.checked;
+    
+    // Initialize filterValue as array if it's not already
+    if (!Array.isArray(this.filterValue)) {
+      this.filterValue = [];
+    }
+    
+    if (checked) {
+      // Add option to array if not already present
+      if (!this.filterValue.includes(option)) {
+        this.filterValue.push(option);
+      }
+    } else {
+      // Remove option from array
+      this.filterValue = this.filterValue.filter((item: string) => item !== option);
+    }
+    
+    // Emit the change
+    this.onFilterValueChange(this.filterValue);
+  }
+  
+  // Add method to check if an option is selected for checkboxes (needed for proper UI rendering)
+  isOptionSelected(option: string): boolean {
+    console.log('Checking if option is selected:', option, 'Current filter value:', this.filterValue);
+    if (!this.filterValue) {
+      return false;
+    }
+    
+    // Ensure filterValue is an array for multiselect
+    if (!Array.isArray(this.filterValue)) {
+      this.filterValue = [];
+      return false;
+    }
+    
+    return this.filterValue.includes(option);
+  }
+}
\ No newline at end of file
diff --git a/frontend/angular-clarity-master/src/app/modules/main/builder/dashboardrunner/dashrunnerline/dashrunner.service.ts b/frontend/angular-clarity-master/src/app/modules/main/builder/dashboardrunner/dashrunnerline/dashrunner.service.ts
index 5c814f6..cf8bb21 100644
--- a/frontend/angular-clarity-master/src/app/modules/main/builder/dashboardrunner/dashrunnerline/dashrunner.service.ts
+++ b/frontend/angular-clarity-master/src/app/modules/main/builder/dashboardrunner/dashrunnerline/dashrunner.service.ts
@@ -160,7 +160,27 @@ getlinechart(): any[] {
     return this._http.get(url);
   }
 
-
+  // New method to support filters
+  public getChartDataWithFilters(tableName: string, jobType: string, xAxis:any, yAxes:any, sureId: number | undefined, parameterField: string, parameterValue: string, filterParams: string): Observable<any> {
+    let url = `${baseUrl}/chart/getdashjson/${jobType}?tableName=${tableName}&xAxis=${xAxis}&yAxes=${yAxes}`;
+    
+    // Add sureId if provided
+    if (sureId) {
+      url += `&sureId=${sureId}`;
+    }
+    
+    // Add parameter field and value if provided
+    if (parameterField && parameterValue) {
+      url += `&parameter=${encodeURIComponent(parameterField)}&parameterValue=${encodeURIComponent(parameterValue)}`;
+    }
+    
+    // Add filter parameters if provided
+    if (filterParams) {
+      url += `&filters=${encodeURIComponent(filterParams)}`;
+    }
+    
+    return this._http.get(url);
+  }
 
   //////////////////////////////////////////////
   
diff --git a/frontend/angular-clarity-master/src/app/modules/main/builder/dashboardrunner/dashrunnerline/dashrunnerline.component.html b/frontend/angular-clarity-master/src/app/modules/main/builder/dashboardrunner/dashrunnerline/dashrunnerline.component.html
index 4a68f73..f2810c3 100644
--- a/frontend/angular-clarity-master/src/app/modules/main/builder/dashboardrunner/dashrunnerline/dashrunnerline.component.html
+++ b/frontend/angular-clarity-master/src/app/modules/main/builder/dashboardrunner/dashrunnerline/dashrunnerline.component.html
@@ -26,7 +26,14 @@
         <!-- <span><button class="btn btn-primary" (click)="Export(item.name)">Export</button></span> -->
         <!-- <span><app-line-runner (buttonClicked)="generatePDFFile()"></app-line-runner></span> -->
         <!-- <h4 style="margin-top: 10px; margin-left: 10px;">{{ item.charttitle }}</h4> -->
-        <ndc-dynamic class="no-drag" [ndcDynamicComponent]="item.component" (moduleInfo)="display($event)"></ndc-dynamic>
+        
+       
+        
+        <ndc-dynamic class="no-drag" 
+                     [ndcDynamicComponent]="item.component" 
+                     [ndcDynamicInputs]="getComponentInputs(item)"
+                     (moduleInfo)="display($event)">
+        </ndc-dynamic>
       </gridster-item>
     </gridster>
   </div>
diff --git a/frontend/angular-clarity-master/src/app/modules/main/builder/dashboardrunner/dashrunnerline/dashrunnerline.component.ts b/frontend/angular-clarity-master/src/app/modules/main/builder/dashboardrunner/dashrunnerline/dashrunnerline.component.ts
index 61f9a3c..f45303d 100644
--- a/frontend/angular-clarity-master/src/app/modules/main/builder/dashboardrunner/dashrunnerline/dashrunnerline.component.ts
+++ b/frontend/angular-clarity-master/src/app/modules/main/builder/dashboardrunner/dashrunnerline/dashrunnerline.component.ts
@@ -17,6 +17,10 @@ import { BubbleRunnerComponent } from './bubble-runner/bubble-runner.component';
 import { ScatterRunnerComponent } from './scatter-runner/scatter-runner.component';
 import { PolarRunnerComponent } from './polar-runner/polar-runner.component';
 import { RadarRunnerComponent } from './radar-runner/radar-runner.component';
+// Add FilterService import
+import { FilterService } from '../../dashboardnew/common-filter/filter.service';
+// Add CompactFilterRunnerComponent import
+import { CompactFilterRunnerComponent } from './compact-filter-runner/compact-filter-runner.component';
 
 @Component({
   selector: 'app-dashrunnerline',
@@ -44,10 +48,13 @@ export class DashrunnerlineComponent implements OnInit {
   { name: "Radar Chart", componentInstance: RadarRunnerComponent },
   { name: "Grid View", componentInstance: GridRunnerComponent },
   { name: "To Do Chart", componentInstance: TodoRunnerComponent },
+  { name: "Compact Filter", componentInstance: CompactFilterRunnerComponent }, // Add Compact Filter Runner
 ];
 
   constructor(private Dashtestservive:DashrunnerService, private dashboardService: Dashboard3Service,private route: ActivatedRoute,
-    private router : Router,) { }
+    private router : Router,
+    // Add FilterService to constructor
+    private filterService: FilterService) { }
 
   ngOnInit(): void {
 
@@ -288,4 +295,54 @@ dashboard_name = "Dashtest";
     console.log('Button clicked in SomeComponent');
     // Add your custom logic here when the button is clicked in SomeComponent
   }
+  
+  // Method to provide inputs for dynamic components based on their type
+  getComponentInputs(item: any): any {
+    const inputs: any = {};
+    
+    // Common inputs for all components
+    if (item.table !== undefined) inputs.table = item.table;
+    if (item.xAxis !== undefined) inputs.xAxis = item.xAxis;
+    if (item.yAxis !== undefined) inputs.yAxis = item.yAxis;
+    if (item.connection !== undefined) inputs.connection = item.connection;
+    if (item.charttitle !== undefined) inputs.charttitle = item.charttitle;
+    if (item.chartlegend !== undefined) inputs.chartlegend = item.chartlegend;
+    if (item.showlabel !== undefined) inputs.showlabel = item.showlabel;
+    
+    // Compact Filter specific inputs
+    if (item.name === 'Compact Filter') {
+      console.log('=== COMPACT FILTER INPUTS DEBUG ===');
+      console.log('Item data for compact filter:', item);
+      
+      if (item.filterKey !== undefined) inputs.filterKey = item.filterKey;
+      if (item.filterType !== undefined) inputs.filterType = item.filterType;
+      if (item.filterLabel !== undefined) inputs.filterLabel = item.filterLabel;
+      if (item.filterOptions !== undefined) inputs.filterOptions = item.filterOptions;
+      if (item.table !== undefined) inputs.apiUrl = item.table; // Use table as API URL for compact filter
+      if (item.connection !== undefined) inputs.connection = item.connection ? parseInt(item.connection, 10) : undefined;
+      
+      console.log('Final inputs for compact filter:', inputs);
+      console.log('==============================');
+    }
+    
+    // Grid View specific inputs
+    if (item.name === 'Grid View') {
+      if (item.baseFilters !== undefined) inputs.baseFilters = item.baseFilters;
+    }
+    
+    // Chart specific inputs
+    if (item.name.includes('Chart') && item.name !== 'Compact Filter') {
+      if (item.baseFilters !== undefined) inputs.baseFilters = item.baseFilters;
+      if (item.drilldownEnabled !== undefined) inputs.drilldownEnabled = item.drilldownEnabled;
+      if (item.drilldownApiUrl !== undefined) inputs.drilldownApiUrl = item.drilldownApiUrl;
+      if (item.drilldownXAxis !== undefined) inputs.drilldownXAxis = item.drilldownXAxis;
+      if (item.drilldownYAxis !== undefined) inputs.drilldownYAxis = item.drilldownYAxis;
+      if (item.drilldownParameter !== undefined) inputs.drilldownParameter = item.drilldownParameter;
+      if (item.drilldownFilters !== undefined) inputs.drilldownFilters = item.drilldownFilters;
+      if (item.drilldownLayers !== undefined) inputs.drilldownLayers = item.drilldownLayers;
+    }
+    
+    console.log('Component inputs for', item.name, ':', inputs);
+    return inputs;
+  }
 }
diff --git a/frontend/angular-clarity-master/src/app/modules/main/builder/dashboardrunner/dashrunnerline/doughnut-runner/doughnut-runner.component.ts b/frontend/angular-clarity-master/src/app/modules/main/builder/dashboardrunner/dashrunnerline/doughnut-runner/doughnut-runner.component.ts
index f92400c..700d621 100644
--- a/frontend/angular-clarity-master/src/app/modules/main/builder/dashboardrunner/dashrunnerline/doughnut-runner/doughnut-runner.component.ts
+++ b/frontend/angular-clarity-master/src/app/modules/main/builder/dashboardrunner/dashrunnerline/doughnut-runner/doughnut-runner.component.ts
@@ -5,6 +5,10 @@ import { ChartDataset, ChartType,   } from 'chart.js';
 import { ActivatedRoute, Router } from '@angular/router';
 import { Dashboard3Service } from 'src/app/services/builder/dashboard3.service';
 import { DashboardContentModel } from 'src/app/models/builder/dashboard';
+// Add FilterService import
+import { FilterService } from '../../../dashboardnew/common-filter/filter.service';
+// Add Subscription import
+import { Subscription } from 'rxjs';
 
 @Component({
   selector: 'app-doughnut-runner',
@@ -33,10 +37,16 @@ export class DoughnutRunnerComponent implements OnInit {
     "chartLabels": ["Project", "Repository", "Wireframe"]
   }
   doughnutChartType: ChartType = 'doughnut';
+  ConnectionId: number; // Add ConnectionId property
+  
+  // Add subscriptions to unsubscribe on destroy
+  private subscriptions: Subscription[] = [];
   
     
     constructor(private Dashtestservive:DashrunnerService,private route: ActivatedRoute,private dashboardService: Dashboard3Service,
-      private router : Router,) { }
+      private router : Router,
+      // Add FilterService to constructor
+      private filterService: FilterService) { }
   ngOnInit(): void {
     this.doughnutChartData = this.doughnutData.chartData;
     this.doughnutChartLabels = this.doughnutData.chartLabels;
@@ -44,6 +54,14 @@ export class DoughnutRunnerComponent implements OnInit {
     this.editId = this.route.snapshot.params.id;
     console.log(this.editId);
 
+    // Subscribe to filter changes
+    this.subscriptions.push(
+      this.filterService.filterState$.subscribe(filters => {
+        // When filters change, refresh the chart data
+        this.fetchChartData();
+      })
+    );
+
     this.dashboardService.getById(this.editId).subscribe((data)=>{
       console.log(data);
       this.workflowLine = data.dashbord1_Line[0].model;
@@ -70,22 +88,62 @@ export class DoughnutRunnerComponent implements OnInit {
           this.YAxis = ChartObject[i].yAxis;
           this.showlabel = ChartObject[i].showlabel;
           this.doughnutChartLegend = ChartObject[i].chartlegend;
+          this.ConnectionId = ChartObject[i].connection; // Add connection ID
           console.log(this.TableName);
-          this.Dashtestservive.getChartData(this.TableName,"Doughnut Chart",this.XAxis,this.YAxis).subscribe((Ldata) => {
-            console.log(Ldata);
-            this.JsonData = Ldata;
-            this.doughnutChartData = this.JsonData.chartData;
-            this.doughnutChartLabels = this.JsonData.chartLabels;
-            
-           },(error) => {
-            console.log(error);
-           });
+          // Fetch data with filters
+          this.fetchChartData();
           break; // No need to continue the loop once the correct placeholder is found
         }
       }
     });
   }
-
+  
+  // Fetch chart data with filter support
+  fetchChartData(): void {
+    if (this.TableName && this.XAxis && this.YAxis) {
+      // Convert YAxis to string if it's an array
+      const yAxisString = Array.isArray(this.YAxis) ? this.YAxis.join(',') : this.YAxis;
+      
+      // Get filter parameters from common filters
+      const commonFilters = this.filterService.getFilterValues();
+      const filterDefinitions = this.filterService.getFilters();
+      
+      // Build filter object using field names as keys
+      const filterObj = {};
+      Object.keys(commonFilters).forEach(filterId => {
+        const filterValue = commonFilters[filterId];
+        
+        // Find the filter definition to get the field name
+        const filterDef = this.filterService.getFilters().find(f => f.id === filterId);
+        
+        if (filterDef && filterDef.field) {
+          const fieldName = filterDef.field;
+          if (filterValue !== undefined && filterValue !== null && filterValue !== '') {
+            filterObj[fieldName] = filterValue;
+          }
+        }
+      });
+      
+      // Convert to JSON string for API call
+      let filterParams = '';
+      if (Object.keys(filterObj).length > 0) {
+        filterParams = JSON.stringify(filterObj);
+      }
+      
+      console.log('DoughnutRunner: Final filter object to send to API:', filterObj);
+      
+      // Fetch data from the dashboard service with filters
+      this.Dashtestservive.getChartDataWithFilters(this.TableName, "Doughnut Chart", this.XAxis, this.YAxis, this.ConnectionId, '', '', filterParams).subscribe((Ldata) => {
+        console.log(Ldata);
+        this.JsonData = Ldata;
+        this.doughnutChartData = this.JsonData.chartData;
+        this.doughnutChartLabels = this.JsonData.chartLabels;
+      },(error) => {
+        console.log(error);
+      });
+    }
+  }
+  
   generatePDFFile(){
     // this.buttonClicked.emit();
     const content = this.contentContainerRef.nativeElement;
@@ -93,6 +151,19 @@ export class DoughnutRunnerComponent implements OnInit {
 
     this.Dashtestservive.generatePDF(content, filename);
   }
+  
+  ngOnDestroy() {
+    // Unsubscribe from all subscriptions to prevent memory leaks
+    console.log('DoughnutRunnerComponent ngOnDestroy called, unsubscribing from', this.subscriptions.length, 'subscriptions');
+    this.subscriptions.forEach(subscription => {
+      if (subscription && !subscription.closed) {
+        subscription.unsubscribe();
+      }
+    });
+    this.subscriptions = [];
+    
+    console.log('DoughnutRunnerComponent destroyed and cleaned up');
+  }
 
 
 
diff --git a/frontend/angular-clarity-master/src/app/modules/main/builder/dashboardrunner/dashrunnerline/grid-runner/grid-runner.component.html b/frontend/angular-clarity-master/src/app/modules/main/builder/dashboardrunner/dashrunnerline/grid-runner/grid-runner.component.html
index 4761acc..9b55a47 100644
--- a/frontend/angular-clarity-master/src/app/modules/main/builder/dashboardrunner/dashrunnerline/grid-runner/grid-runner.component.html
+++ b/frontend/angular-clarity-master/src/app/modules/main/builder/dashboardrunner/dashrunnerline/grid-runner/grid-runner.component.html
@@ -39,16 +39,35 @@
       </div> -->
       <div><button class="btn btn-primary" (click)="generatePDFFile()">Export</button></div>
       <div style="max-height: 400px; overflow: auto; padding: 10px;">
-      <table class="table">
+      <!-- Debug information -->
+      <div *ngIf="false" style="background-color: #f0f0f0; padding: 10px; margin-bottom: 10px;">
+        <h4>Debug Information</h4>
+        <p><strong>TableName:</strong> {{ TableName }}</p>
+        <p><strong>XAxis:</strong> {{ XAxis }}</p>
+        <p><strong>YAxis:</strong> {{ YAxis }}</p>
+        <p><strong>Rows:</strong> {{ rows?.length }} items</p>
+        <p><strong>Headers:</strong> {{ getHeaders() | json }}</p>
+        <div *ngIf="error"><strong>Error:</strong> {{ error }}</div>
+      </div>
+      
+      <div *ngIf="error" class="error_mess">
+        {{ error }}
+      </div>
+      
+      <table class="table" *ngIf="rows && rows.length > 0; else noData">
         <thead>
           <tr>
             <th *ngFor="let co of getHeaders();let i=index">{{co}}</th>
           </tr>
         </thead>
         <tbody>
-          <tr *ngFor="let item of rows?.slice()?.reverse()">
+          <tr *ngFor="let item of rows">
             <td *ngFor="let key of getHeaders()">{{item[key]}}</td>
           </tr>
         </tbody>
       </table>
+      
+      <ng-template #noData>
+        <p *ngIf="!error">No data available</p>
+      </ng-template>
       </div>
\ No newline at end of file
diff --git a/frontend/angular-clarity-master/src/app/modules/main/builder/dashboardrunner/dashrunnerline/grid-runner/grid-runner.component.ts b/frontend/angular-clarity-master/src/app/modules/main/builder/dashboardrunner/dashrunnerline/grid-runner/grid-runner.component.ts
index 9e1f6ac..c71474d 100644
--- a/frontend/angular-clarity-master/src/app/modules/main/builder/dashboardrunner/dashrunnerline/grid-runner/grid-runner.component.ts
+++ b/frontend/angular-clarity-master/src/app/modules/main/builder/dashboardrunner/dashrunnerline/grid-runner/grid-runner.component.ts
@@ -3,6 +3,10 @@ import { DashrunnerService } from '../dashrunner.service';
 import { DashboardContentModel } from 'src/app/models/builder/dashboard';
 import { ActivatedRoute, Router } from '@angular/router';
 import { Dashboard3Service } from 'src/app/services/builder/dashboard3.service';
+// Add FilterService import
+import { FilterService } from '../../../dashboardnew/common-filter/filter.service';
+// Add Subscription import
+import { Subscription } from 'rxjs';
 
 @Component({
   selector: 'app-grid-runner',
@@ -26,86 +30,191 @@ export class GridRunnerComponent implements OnInit {
   public DashtestboardArray: DashboardContentModel[] = [];
   workflowLine;
   TableName;
+  ConnectionId: number; // Add ConnectionId property
+  
+  // Add subscriptions to unsubscribe on destroy
+  private subscriptions: Subscription[] = [];
 
   constructor(
-    private Dashtestservive:DashrunnerService,private route: ActivatedRoute,private dashboardService: Dashboard3Service,
-    private router : Router
+    private Dashtestservive:DashrunnerService,
+    private route: ActivatedRoute,
+    private dashboardService: Dashboard3Service,
+    private router : Router,
+    // Add FilterService to constructor
+    private filterService: FilterService
   ) { }
 
   ngOnInit(): void {
 
     this.editId = this.route.snapshot.params.id;
-    console.log(this.editId);
+    console.log('GridRunner: Component initialized with editId:', this.editId);
     // this.getbyId();
 
-    this.dashboardService.getById(this.editId).subscribe((data)=>{
-      console.log(data);
+    // Subscribe to filter changes
+    this.subscriptions.push(
+      this.filterService.filterState$.subscribe(filters => {
+        console.log('GridRunner: Filter state changed:', filters);
+        // When filters change, refresh the grid data
+        this.fetchGridData();
+      })
+    );
+
+    this.dashboardService.getById(this.editId).subscribe((data) => {
+      console.log('GridRunner: Received dashboard data:', data);
       this.workflowLine = data.dashbord1_Line[0].model;
-      const dash = JSON.parse(this.workflowLine) ;
+      const dash = JSON.parse(this.workflowLine);
       // this.DashtestboardArray = dash.dashboard;
       // console.log(this.DashtestboardArray);
 
       const ChartObject = dash.dashboard.filter(obj => obj.name === "Grid View");
-      console.log(ChartObject);
+      console.log('GridRunner: ChartObject for Grid View:', ChartObject);
       for (let i = 0; i < ChartObject.length; i++) {
         const ids = this.Dashtestservive.getgridview();
+        console.log('GridRunner: Current gridview ids:', ids);
+        console.log('GridRunner: Checking chartid:', ChartObject[i].chartid);
         // console.log(ids);
         if (ids.includes(ChartObject[i].chartid)) {
           // If the chartid is already in the ids array, continue to the next iteration
+          console.log('GridRunner: Skipping chartid as it already exists:', ChartObject[i].chartid);
           continue;
         }
+        console.log('GridRunner: Adding new chartid:', ChartObject[i].chartid);
         this.Dashtestservive.setgridview(ChartObject[i].chartid);
-        const id = ids[i];
-        console.log(id);
-      
-        if (ChartObject[i].chartid === id) {
-          this.TableName = ChartObject[i].table;
-          this.XAxis = ChartObject[i].xAxis;
-          this.YAxis = ChartObject[i].yAxis;
-          console.log(this.TableName);
-          this.Dashtestservive.getChartData(this.TableName,"Grid View",this.XAxis,this.YAxis).subscribe((Ldata) => {
-            console.log(Ldata);
-            this.rows = Ldata;
-            this.rowdata = this.rows
-            
-           },(error) => {
-            console.log(error);
-           });
-          break; // No need to continue the loop once the correct placeholder is found
-        }
+
+        this.TableName = ChartObject[i].table;
+        this.XAxis = ChartObject[i].xAxis;
+        this.YAxis = ChartObject[i].yAxis;
+        // Add connection ID if available
+        this.ConnectionId = ChartObject[i].connection;
+        console.log('GridRunner: TableName:', this.TableName);
+        console.log('GridRunner: XAxis:', this.XAxis);
+        console.log('GridRunner: YAxis:', this.YAxis);
+        console.log('GridRunner: ConnectionId:', this.ConnectionId);
+        // Fetch data with filters
+        this.fetchGridData();
+        break; // No need to continue the loop once the correct placeholder is found
       }
+    }, (error) => {
+      console.log('GridRunner: Error fetching dashboard data:', error);
     });
   }
 
+  // Fetch grid data with filter support
+  fetchGridData(): void {
+    console.log('fetching grid data ...')
+    if (this.TableName) {
+      console.log('GridRunner: Fetching data for TableName:', this.TableName, 'XAxis:', this.XAxis, 'YAxis:', this.YAxis);
+      // Convert YAxis to string if it's an array
+      const yAxisString = Array.isArray(this.YAxis) ? this.YAxis.join(',') : this.YAxis;
 
-  
-//dynamic table
+      // Get filter parameters from common filters
+      const commonFilters = this.filterService.getFilterValues();
+      const filterDefinitions = this.filterService.getFilters();
 
+      // Build filter object using field names as keys
+      const filterObj = {};
+      Object.keys(commonFilters).forEach(filterId => {
+        const filterValue = commonFilters[filterId];
 
-getTableData(id){
-}
-getHeaders() {
-let headers: string[] = [];
-if(this.rows) {
-  this.rows.forEach((value) => {
-    Object.keys(value).forEach((key) => {
-      if(!headers.find((header) => header == key)){
-        headers.push(key)
+        // Find the filter definition to get the field name
+        const filterDef = this.filterService.getFilters().find(f => f.id === filterId);
+
+        if (filterDef && filterDef.field) {
+          const fieldName = filterDef.field;
+          if (filterValue !== undefined && filterValue !== null && filterValue !== '') {
+            filterObj[fieldName] = filterValue;
+          }
+        }
+      });
+
+      // Convert to JSON string for API call
+      let filterParams = '';
+      if (Object.keys(filterObj).length > 0) {
+        filterParams = JSON.stringify(filterObj);
       }
 
-    })
+      console.log('GridRunner: Final filter object to send to API:', filterObj);
 
-  })
-}
-return headers;
-}
+      // Fetch data from the dashboard service with filters
+      this.Dashtestservive.getChartDataWithFilters(this.TableName, "grid", this.XAxis, this.YAxis, this.ConnectionId, '', '', filterParams).subscribe((Ldata) => {
+        console.log('GridRunner: Received data from API:', Ldata);
 
-generatePDFFile(){
-  this.buttonClicked.emit();
-  const content = this.contentContainerRef.nativeElement;
-  const filename = 'gridview.pdf'; // You can provide any desired filename here
+        // Handle the actual data structure returned by the API
+        if (Ldata && Ldata.chartData) {
+          this.rows = Ldata.chartData;
+          this.rowdata = this.rows;
+        } else if (Ldata && Ldata.data) {
+          // Handle the original expected format as fallback
+          this.rows = Ldata.data;
+          this.rowdata = this.rows;
+        } else if (Array.isArray(Ldata)) {
+          // Handle case where data is directly an array
+          this.rows = Ldata;
+          this.rowdata = this.rows;
+        } else {
+          console.warn('GridRunner: Received data does not have expected structure', Ldata);
+          this.rows = [];
+          this.rowdata = [];
+        }
 
-  this.Dashtestservive.generatePDF(content, filename);
-}
-}
+        // Log the structure of the received data
+        if (this.rows) {
+          console.log('GridRunner: Rows length:', this.rows.length);
+          if (this.rows.length > 0) {
+            console.log('GridRunner: First row structure:', this.rows[0]);
+          }
+        } else {
+          console.log('GridRunner: No data received');
+        }
+      }, (error) => {
+        console.log('GridRunner: Error fetching data:', error);
+        this.error = error;
+      });
+    } else {
+      console.log('GridRunner: Missing TableName or XAxis');
+    }
+  }
 
+
+  //dynamic table
+
+
+  getTableData(id) {
+  }
+  getHeaders() {
+    let headers: string[] = [];
+    if (this.rows) {
+      console.log('GridRunner: Getting headers from rows:', this.rows);
+      this.rows.forEach((value) => {
+        Object.keys(value).forEach((key) => {
+          if (!headers.find((header) => header == key)) {
+            headers.push(key)
+          }
+        })
+      })
+    }
+    console.log('GridRunner: Computed headers:', headers);
+    return headers;
+  }
+
+  generatePDFFile() {
+    this.buttonClicked.emit();
+    const content = this.contentContainerRef.nativeElement;
+    const filename = 'gridview.pdf'; // You can provide any desired filename here
+
+    this.Dashtestservive.generatePDF(content, filename);
+  }
+
+  ngOnDestroy() {
+    // Unsubscribe from all subscriptions to prevent memory leaks
+    console.log('GridRunnerComponent ngOnDestroy called, unsubscribing from', this.subscriptions.length, 'subscriptions');
+    this.subscriptions.forEach(subscription => {
+      if (subscription && !subscription.closed) {
+        subscription.unsubscribe();
+      }
+    });
+    this.subscriptions = [];
+
+    console.log('GridRunnerComponent destroyed and cleaned up');
+  }
+}
\ No newline at end of file
diff --git a/frontend/angular-clarity-master/src/app/modules/main/builder/dashboardrunner/dashrunnerline/line-runner/line-runner.component.ts b/frontend/angular-clarity-master/src/app/modules/main/builder/dashboardrunner/dashrunnerline/line-runner/line-runner.component.ts
index 93d621b..c815f4b 100644
--- a/frontend/angular-clarity-master/src/app/modules/main/builder/dashboardrunner/dashrunnerline/line-runner/line-runner.component.ts
+++ b/frontend/angular-clarity-master/src/app/modules/main/builder/dashboardrunner/dashrunnerline/line-runner/line-runner.component.ts
@@ -7,6 +7,10 @@ import { Dashboard3Service } from 'src/app/services/builder/dashboard3.service';
 import { DashboardContentModel } from 'src/app/models/builder/dashboard';
 import { jsPDF } from 'jspdf';
 import domtoimage from 'dom-to-image';
+// Add FilterService import
+import { FilterService } from '../../../dashboardnew/common-filter/filter.service';
+// Add Subscription import
+import { Subscription } from 'rxjs';
 @Component({
   selector: 'app-line-runner',
   templateUrl: './line-runner.component.html',
@@ -54,8 +58,14 @@ export class LineRunnerComponent implements OnInit {
    lineChartLegend = false;
   lineChartPlugins = [];
   lineChartType = 'line';
+  ConnectionId: number; // Add ConnectionId property
+  
+  // Add subscriptions to unsubscribe on destroy
+  private subscriptions: Subscription[] = [];
   constructor(private Dashtestservive:DashrunnerService,private route: ActivatedRoute,private dashboardService: Dashboard3Service,
-    private router : Router,) { }
+    private router : Router,
+    // Add FilterService to constructor
+    private filterService: FilterService) { }
 
   ngOnInit(): void {
 
@@ -65,6 +75,13 @@ export class LineRunnerComponent implements OnInit {
       this.editId = this.route.snapshot.params.id;
       console.log(this.editId);
 
+      // Subscribe to filter changes
+      this.subscriptions.push(
+        this.filterService.filterState$.subscribe(filters => {
+          // When filters change, refresh the chart data
+          this.fetchChartData();
+        })
+      );
 
       this.dashboardService.getById(this.editId).subscribe((data)=>{
         console.log(data);
@@ -92,16 +109,10 @@ export class LineRunnerComponent implements OnInit {
             this.YAxis = ChartObject[i].yAxis;
             this.showlabel = ChartObject[i].showlabel;
             this.lineChartLegend = ChartObject[i].chartlegend;
+            this.ConnectionId = ChartObject[i].connection; // Add connection ID
             console.log(this.TableName);
-            this.Dashtestservive.getChartData(this.TableName,"Line Chart",this.XAxis,this.YAxis).subscribe((Ldata) => {
-              console.log(Ldata);
-              this.JsonData = Ldata;
-              this.lineChartData = this.JsonData.chartData;
-              this.lineChartLabels = this.JsonData.chartLabels;
-              
-             },(error) => {
-              console.log(error);
-             });
+            // Fetch data with filters
+            this.fetchChartData();
             break; // No need to continue the loop once the correct placeholder is found
           }
         }
@@ -128,6 +139,52 @@ export class LineRunnerComponent implements OnInit {
   //     }
   }
   
+  // Fetch chart data with filter support
+  fetchChartData(): void {
+    if (this.TableName && this.XAxis && this.YAxis) {
+      // Convert YAxis to string if it's an array
+      const yAxisString = Array.isArray(this.YAxis) ? this.YAxis.join(',') : this.YAxis;
+      
+      // Get filter parameters from common filters
+      const commonFilters = this.filterService.getFilterValues();
+      const filterDefinitions = this.filterService.getFilters();
+      
+      // Build filter object using field names as keys
+      const filterObj = {};
+      Object.keys(commonFilters).forEach(filterId => {
+        const filterValue = commonFilters[filterId];
+        
+        // Find the filter definition to get the field name
+        const filterDef = this.filterService.getFilters().find(f => f.id === filterId);
+        
+        if (filterDef && filterDef.field) {
+          const fieldName = filterDef.field;
+          if (filterValue !== undefined && filterValue !== null && filterValue !== '') {
+            filterObj[fieldName] = filterValue;
+          }
+        }
+      });
+      
+      // Convert to JSON string for API call
+      let filterParams = '';
+      if (Object.keys(filterObj).length > 0) {
+        filterParams = JSON.stringify(filterObj);
+      }
+      
+      console.log('LineRunner: Final filter object to send to API:', filterObj);
+      
+      // Fetch data from the dashboard service with filters
+      this.Dashtestservive.getChartDataWithFilters(this.TableName, "Line Chart", this.XAxis, this.YAxis, this.ConnectionId, '', '', filterParams).subscribe((Ldata) => {
+        console.log(Ldata);
+        this.JsonData = Ldata;
+        this.lineChartData = this.JsonData.chartData;
+        this.lineChartLabels = this.JsonData.chartLabels;
+      },(error) => {
+        console.log(error);
+      });
+    }
+  }
+  
   generatePDFFile(){
     this.buttonClicked.emit();
     const content = this.contentContainerRef.nativeElement;
@@ -165,5 +222,18 @@ export class LineRunnerComponent implements OnInit {
   //     console.error('Error generating PDF:', error);
   //   }
   // }
+  
+  ngOnDestroy() {
+    // Unsubscribe from all subscriptions to prevent memory leaks
+    console.log('LineRunnerComponent ngOnDestroy called, unsubscribing from', this.subscriptions.length, 'subscriptions');
+    this.subscriptions.forEach(subscription => {
+      if (subscription && !subscription.closed) {
+        subscription.unsubscribe();
+      }
+    });
+    this.subscriptions = [];
+    
+    console.log('LineRunnerComponent destroyed and cleaned up');
+  }
 
 }
\ No newline at end of file
diff --git a/frontend/angular-clarity-master/src/app/modules/main/builder/dashboardrunner/dashrunnerline/pie-runner/pie-runner.component.ts b/frontend/angular-clarity-master/src/app/modules/main/builder/dashboardrunner/dashrunnerline/pie-runner/pie-runner.component.ts
index c1a64d1..934f618 100644
--- a/frontend/angular-clarity-master/src/app/modules/main/builder/dashboardrunner/dashrunnerline/pie-runner/pie-runner.component.ts
+++ b/frontend/angular-clarity-master/src/app/modules/main/builder/dashboardrunner/dashrunnerline/pie-runner/pie-runner.component.ts
@@ -3,6 +3,10 @@ import { DashrunnerService } from '../dashrunner.service';
 import { ActivatedRoute, Router } from '@angular/router';
 import { Dashboard3Service } from 'src/app/services/builder/dashboard3.service';
 import { DashboardContentModel } from 'src/app/models/builder/dashboard';
+// Add FilterService import
+import { FilterService } from '../../../dashboardnew/common-filter/filter.service';
+// Add Subscription import
+import { Subscription } from 'rxjs';
 
 
 @Component({
@@ -23,9 +27,15 @@ export class PieRunnerComponent implements OnInit {
   showlabel;
   JsonData;
   lineChartNoLabels: any[] = [];
+  ConnectionId: number; // Add ConnectionId property
+  
+  // Add subscriptions to unsubscribe on destroy
+  private subscriptions: Subscription[] = [];
   
   constructor(private Dashtestservive:DashrunnerService,private route: ActivatedRoute,private dashboardService: Dashboard3Service,
-    private router : Router,) { }
+    private router : Router,
+    // Add FilterService to constructor
+    private filterService: FilterService) { }
 
   public pieChartLabels: string[] = ['SciFi', 'Drama', 'Comedy'];
   public pieChartData: number[] = [30, 50, 20];
@@ -39,6 +49,13 @@ export class PieRunnerComponent implements OnInit {
     this.editId = this.route.snapshot.params.id;
     console.log(this.editId);
 
+    // Subscribe to filter changes
+    this.subscriptions.push(
+      this.filterService.filterState$.subscribe(filters => {
+        // When filters change, refresh the chart data
+        this.fetchChartData();
+      })
+    );
 
     this.dashboardService.getById(this.editId).subscribe((data)=>{
       console.log(data);
@@ -66,22 +83,62 @@ export class PieRunnerComponent implements OnInit {
           this.YAxis = ChartObject[i].yAxis;
           this.showlabel = ChartObject[i].showlabel;
           this.ChartLegend = ChartObject[i].chartlegend;
+          this.ConnectionId = ChartObject[i].connection; // Add connection ID
           console.log(this.TableName);
-          this.Dashtestservive.getChartData(this.TableName,"Pie Chart",this.XAxis,this.YAxis).subscribe((Ldata) => {
-            console.log(Ldata);
-            this.JsonData = Ldata;
-            this.pieChartData = this.JsonData.pieChartData;
-            this.pieChartLabels = this.JsonData.pieChartLabels;
-            
-           },(error) => {
-            console.log(error);
-           });
+          // Fetch data with filters
+          this.fetchChartData();
           break; // No need to continue the loop once the correct placeholder is found
         }
       }
     });
   }
-
+  
+  // Fetch chart data with filter support
+  fetchChartData(): void {
+    if (this.TableName && this.XAxis && this.YAxis) {
+      // Convert YAxis to string if it's an array
+      const yAxisString = Array.isArray(this.YAxis) ? this.YAxis.join(',') : this.YAxis;
+      
+      // Get filter parameters from common filters
+      const commonFilters = this.filterService.getFilterValues();
+      const filterDefinitions = this.filterService.getFilters();
+      
+      // Build filter object using field names as keys
+      const filterObj = {};
+      Object.keys(commonFilters).forEach(filterId => {
+        const filterValue = commonFilters[filterId];
+        
+        // Find the filter definition to get the field name
+        const filterDef = this.filterService.getFilters().find(f => f.id === filterId);
+        
+        if (filterDef && filterDef.field) {
+          const fieldName = filterDef.field;
+          if (filterValue !== undefined && filterValue !== null && filterValue !== '') {
+            filterObj[fieldName] = filterValue;
+          }
+        }
+      });
+      
+      // Convert to JSON string for API call
+      let filterParams = '';
+      if (Object.keys(filterObj).length > 0) {
+        filterParams = JSON.stringify(filterObj);
+      }
+      
+      console.log('PieRunner: Final filter object to send to API:', filterObj);
+      
+      // Fetch data from the dashboard service with filters
+      this.Dashtestservive.getChartDataWithFilters(this.TableName, "Pie Chart", this.XAxis, this.YAxis, this.ConnectionId, '', '', filterParams).subscribe((Ldata) => {
+        console.log(Ldata);
+        this.JsonData = Ldata;
+        this.pieChartData = this.JsonData.pieChartData;
+        this.pieChartLabels = this.JsonData.pieChartLabels;
+      },(error) => {
+        console.log(error);
+      });
+    }
+  }
+  
   generatePDFFile(){
     this.buttonClicked.emit();
     const content = this.contentContainerRef.nativeElement;
@@ -89,4 +146,17 @@ export class PieRunnerComponent implements OnInit {
 
     this.Dashtestservive.generatePDF(content, filename);
   }
+  
+  ngOnDestroy() {
+    // Unsubscribe from all subscriptions to prevent memory leaks
+    console.log('PieRunnerComponent ngOnDestroy called, unsubscribing from', this.subscriptions.length, 'subscriptions');
+    this.subscriptions.forEach(subscription => {
+      if (subscription && !subscription.closed) {
+        subscription.unsubscribe();
+      }
+    });
+    this.subscriptions = [];
+    
+    console.log('PieRunnerComponent destroyed and cleaned up');
+  }
 }
diff --git a/frontend/angular-clarity-master/src/app/modules/main/builder/dashboardrunner/dashrunnerline/polar-runner/polar-runner.component.ts b/frontend/angular-clarity-master/src/app/modules/main/builder/dashboardrunner/dashrunnerline/polar-runner/polar-runner.component.ts
index fdbe17a..8610693 100644
--- a/frontend/angular-clarity-master/src/app/modules/main/builder/dashboardrunner/dashrunnerline/polar-runner/polar-runner.component.ts
+++ b/frontend/angular-clarity-master/src/app/modules/main/builder/dashboardrunner/dashrunnerline/polar-runner/polar-runner.component.ts
@@ -4,6 +4,10 @@ import { ActivatedRoute, Router } from '@angular/router';
 import { Dashboard3Service } from 'src/app/services/builder/dashboard3.service';
 import { DashboardContentModel } from 'src/app/models/builder/dashboard';
 // import { Label } from 'ng2-charts';
+// Add FilterService import
+import { FilterService } from '../../../dashboardnew/common-filter/filter.service';
+// Add Subscription import
+import { Subscription } from 'rxjs';
 
 @Component({
   selector: 'app-polar-runner',
@@ -23,9 +27,15 @@ export class PolarRunnerComponent implements OnInit {
   showlabel;
   JsonData;
   lineChartNoLabels: any[] = [];
+  ConnectionId: number; // Add ConnectionId property
+  
+  // Add subscriptions to unsubscribe on destroy
+  private subscriptions: Subscription[] = [];
   
   constructor(private Dashtestservive:DashrunnerService,private route: ActivatedRoute,private dashboardService: Dashboard3Service,
-    private router : Router,) { }
+    private router : Router,
+    // Add FilterService to constructor
+    private filterService: FilterService) { }
 
   public polarAreaChartLabels: string[] = [ 'Download Sales', 'In-Store Sales', 'Mail Sales', 'Telesales', 'Corporate Sales' ];
   public polarAreaChartData: any = [
@@ -41,6 +51,13 @@ export class PolarRunnerComponent implements OnInit {
     this.editId = this.route.snapshot.params.id;
     console.log(this.editId);
 
+    // Subscribe to filter changes
+    this.subscriptions.push(
+      this.filterService.filterState$.subscribe(filters => {
+        // When filters change, refresh the chart data
+        this.fetchChartData();
+      })
+    );
 
     this.dashboardService.getById(this.editId).subscribe((data)=>{
       console.log(data);
@@ -66,22 +83,62 @@ export class PolarRunnerComponent implements OnInit {
           this.YAxis = ChartObject[i].yAxis;
           this.showlabel = ChartObject[i].showlabel;
           this.ChartLegend = ChartObject[i].chartlegend;
+          this.ConnectionId = ChartObject[i].connection; // Add connection ID
           console.log(this.TableName);
-          this.Dashtestservive.getChartData(this.TableName,"PolarArea Chart",this.XAxis,this.YAxis).subscribe((Ldata) => {
-            console.log(Ldata);
-            this.JsonData = Ldata;
-            this.polarAreaChartData = this.JsonData.polarAreaChartData;
-            this.polarAreaChartLabels = this.JsonData.polarAreaChartLabels;
-            
-           },(error) => {
-            console.log(error);
-           });
+          // Fetch data with filters
+          this.fetchChartData();
           break; // No need to continue the loop once the correct placeholder is found
         }
       }
     });
   }
-
+  
+  // Fetch chart data with filter support
+  fetchChartData(): void {
+    if (this.TableName && this.XAxis && this.YAxis) {
+      // Convert YAxis to string if it's an array
+      const yAxisString = Array.isArray(this.YAxis) ? this.YAxis.join(',') : this.YAxis;
+      
+      // Get filter parameters from common filters
+      const commonFilters = this.filterService.getFilterValues();
+      const filterDefinitions = this.filterService.getFilters();
+      
+      // Build filter object using field names as keys
+      const filterObj = {};
+      Object.keys(commonFilters).forEach(filterId => {
+        const filterValue = commonFilters[filterId];
+        
+        // Find the filter definition to get the field name
+        const filterDef = this.filterService.getFilters().find(f => f.id === filterId);
+        
+        if (filterDef && filterDef.field) {
+          const fieldName = filterDef.field;
+          if (filterValue !== undefined && filterValue !== null && filterValue !== '') {
+            filterObj[fieldName] = filterValue;
+          }
+        }
+      });
+      
+      // Convert to JSON string for API call
+      let filterParams = '';
+      if (Object.keys(filterObj).length > 0) {
+        filterParams = JSON.stringify(filterObj);
+      }
+      
+      console.log('PolarRunner: Final filter object to send to API:', filterObj);
+      
+      // Fetch data from the dashboard service with filters
+      this.Dashtestservive.getChartDataWithFilters(this.TableName, "PolarArea Chart", this.XAxis, this.YAxis, this.ConnectionId, '', '', filterParams).subscribe((Ldata) => {
+        console.log(Ldata);
+        this.JsonData = Ldata;
+        this.polarAreaChartData = this.JsonData.polarAreaChartData;
+        this.polarAreaChartLabels = this.JsonData.polarAreaChartLabels;
+      },(error) => {
+        console.log(error);
+      });
+    }
+  }
+  
   generatePDFFile(){
     this.buttonClicked.emit();
     const content = this.contentContainerRef.nativeElement;
@@ -89,5 +146,18 @@ export class PolarRunnerComponent implements OnInit {
 
     this.Dashtestservive.generatePDF(content, filename);
   }
+  
+  ngOnDestroy() {
+    // Unsubscribe from all subscriptions to prevent memory leaks
+    console.log('PolarRunnerComponent ngOnDestroy called, unsubscribing from', this.subscriptions.length, 'subscriptions');
+    this.subscriptions.forEach(subscription => {
+      if (subscription && !subscription.closed) {
+        subscription.unsubscribe();
+      }
+    });
+    this.subscriptions = [];
+    
+    console.log('PolarRunnerComponent destroyed and cleaned up');
+  }
 
 }
diff --git a/frontend/angular-clarity-master/src/app/modules/main/builder/dashboardrunner/dashrunnerline/radar-runner/radar-runner.component.ts b/frontend/angular-clarity-master/src/app/modules/main/builder/dashboardrunner/dashrunnerline/radar-runner/radar-runner.component.ts
index e1a901e..748802e 100644
--- a/frontend/angular-clarity-master/src/app/modules/main/builder/dashboardrunner/dashrunnerline/radar-runner/radar-runner.component.ts
+++ b/frontend/angular-clarity-master/src/app/modules/main/builder/dashboardrunner/dashrunnerline/radar-runner/radar-runner.component.ts
@@ -4,6 +4,10 @@ import { ActivatedRoute, Router } from '@angular/router';
 import { Dashboard3Service } from 'src/app/services/builder/dashboard3.service';
 import { DashboardContentModel } from 'src/app/models/builder/dashboard';
 // import { Label } from 'ng2-charts';
+// Add FilterService import
+import { FilterService } from '../../../dashboardnew/common-filter/filter.service';
+// Add Subscription import
+import { Subscription } from 'rxjs';
 
 @Component({
   selector: 'app-radar-runner',
@@ -24,9 +28,15 @@ export class RadarRunnerComponent implements OnInit {
   JsonData;
   lineChartNoLabels: any[] = [];
   ChartLegend = false;
+  ConnectionId: number; // Add ConnectionId property
+  
+  // Add subscriptions to unsubscribe on destroy
+  private subscriptions: Subscription[] = [];
   
   constructor(private Dashtestservive:DashrunnerService,private route: ActivatedRoute,private dashboardService: Dashboard3Service,
-    private router : Router,) { }
+    private router : Router,
+    // Add FilterService to constructor
+    private filterService: FilterService) { }
 
   public radarChartLabels: string[] = [
     "Eating",
@@ -50,6 +60,13 @@ export class RadarRunnerComponent implements OnInit {
     this.editId = this.route.snapshot.params.id;
     console.log(this.editId);
 
+    // Subscribe to filter changes
+    this.subscriptions.push(
+      this.filterService.filterState$.subscribe(filters => {
+        // When filters change, refresh the chart data
+        this.fetchChartData();
+      })
+    );
 
     this.dashboardService.getById(this.editId).subscribe((data)=>{
       console.log(data);
@@ -75,22 +92,62 @@ export class RadarRunnerComponent implements OnInit {
           this.YAxis = ChartObject[i].yAxis;
           this.showlabel = ChartObject[i].showlabel;
           this.ChartLegend = ChartObject[i].chartlegend;
+          this.ConnectionId = ChartObject[i].connection; // Add connection ID
           console.log(this.TableName);
-          this.Dashtestservive.getChartData(this.TableName,"Radar Chart",this.XAxis,this.YAxis).subscribe((Ldata) => {
-            console.log(Ldata);
-            this.JsonData = Ldata;
-            this.radarChartData = this.JsonData.radarChartData;
-            this.radarChartLabels = this.JsonData.radarChartLabels;
-            
-           },(error) => {
-            console.log(error);
-           });
+          // Fetch data with filters
+          this.fetchChartData();
           break; // No need to continue the loop once the correct placeholder is found
         }
       }
     });
   }
-
+  
+  // Fetch chart data with filter support
+  fetchChartData(): void {
+    if (this.TableName && this.XAxis && this.YAxis) {
+      // Convert YAxis to string if it's an array
+      const yAxisString = Array.isArray(this.YAxis) ? this.YAxis.join(',') : this.YAxis;
+      
+      // Get filter parameters from common filters
+      const commonFilters = this.filterService.getFilterValues();
+      const filterDefinitions = this.filterService.getFilters();
+      
+      // Build filter object using field names as keys
+      const filterObj = {};
+      Object.keys(commonFilters).forEach(filterId => {
+        const filterValue = commonFilters[filterId];
+        
+        // Find the filter definition to get the field name
+        const filterDef = this.filterService.getFilters().find(f => f.id === filterId);
+        
+        if (filterDef && filterDef.field) {
+          const fieldName = filterDef.field;
+          if (filterValue !== undefined && filterValue !== null && filterValue !== '') {
+            filterObj[fieldName] = filterValue;
+          }
+        }
+      });
+      
+      // Convert to JSON string for API call
+      let filterParams = '';
+      if (Object.keys(filterObj).length > 0) {
+        filterParams = JSON.stringify(filterObj);
+      }
+      
+      console.log('RadarRunner: Final filter object to send to API:', filterObj);
+      
+      // Fetch data from the dashboard service with filters
+      this.Dashtestservive.getChartDataWithFilters(this.TableName, "Radar Chart", this.XAxis, this.YAxis, this.ConnectionId, '', '', filterParams).subscribe((Ldata) => {
+        console.log(Ldata);
+        this.JsonData = Ldata;
+        this.radarChartData = this.JsonData.radarChartData;
+        this.radarChartLabels = this.JsonData.radarChartLabels;
+      },(error) => {
+        console.log(error);
+      });
+    }
+  }
+  
   generatePDFFile(){
     this.buttonClicked.emit();
     const content = this.contentContainerRef.nativeElement;
@@ -98,5 +155,18 @@ export class RadarRunnerComponent implements OnInit {
 
     this.Dashtestservive.generatePDF(content, filename);
   }
+  
+  ngOnDestroy() {
+    // Unsubscribe from all subscriptions to prevent memory leaks
+    console.log('RadarRunnerComponent ngOnDestroy called, unsubscribing from', this.subscriptions.length, 'subscriptions');
+    this.subscriptions.forEach(subscription => {
+      if (subscription && !subscription.closed) {
+        subscription.unsubscribe();
+      }
+    });
+    this.subscriptions = [];
+    
+    console.log('RadarRunnerComponent destroyed and cleaned up');
+  }
 
 }
diff --git a/frontend/angular-clarity-master/src/app/modules/main/builder/dashboardrunner/dashrunnerline/scatter-runner/scatter-runner.component.ts b/frontend/angular-clarity-master/src/app/modules/main/builder/dashboardrunner/dashrunnerline/scatter-runner/scatter-runner.component.ts
index 2f36596..a6780d0 100644
--- a/frontend/angular-clarity-master/src/app/modules/main/builder/dashboardrunner/dashrunnerline/scatter-runner/scatter-runner.component.ts
+++ b/frontend/angular-clarity-master/src/app/modules/main/builder/dashboardrunner/dashrunnerline/scatter-runner/scatter-runner.component.ts
@@ -5,6 +5,10 @@ import { Dashboard3Service } from 'src/app/services/builder/dashboard3.service';
 import { DashboardContentModel } from 'src/app/models/builder/dashboard';
 // import { Label } from 'ng2-charts';
 import { ChartDataset } from 'chart.js';
+// Add FilterService import
+import { FilterService } from '../../../dashboardnew/common-filter/filter.service';
+// Add Subscription import
+import { Subscription } from 'rxjs';
 
 @Component({
   selector: 'app-scatter-runner',
@@ -25,9 +29,15 @@ export class ScatterRunnerComponent implements OnInit {
   JsonData;
   lineChartNoLabels: any[] = [];
   ChartLegend = false;
+  ConnectionId: number; // Add ConnectionId property
+  
+  // Add subscriptions to unsubscribe on destroy
+  private subscriptions: Subscription[] = [];
   
   constructor(private Dashtestservive:DashrunnerService,private route: ActivatedRoute,private dashboardService: Dashboard3Service,
-    private router : Router,) { }
+    private router : Router,
+    // Add FilterService to constructor
+    private filterService: FilterService) { }
 
   public scatterChartLabels: string[] = [ 'Eating', 'Drinking', 'Sleeping', 'Designing', 'Coding', 'Cycling', 'Running' ];
 
@@ -69,6 +79,13 @@ export class ScatterRunnerComponent implements OnInit {
     this.editId = this.route.snapshot.params.id;
     console.log(this.editId);
 
+    // Subscribe to filter changes
+    this.subscriptions.push(
+      this.filterService.filterState$.subscribe(filters => {
+        // When filters change, refresh the chart data
+        this.fetchChartData();
+      })
+    );
 
     this.dashboardService.getById(this.editId).subscribe((data)=>{
       console.log(data);
@@ -94,22 +111,62 @@ export class ScatterRunnerComponent implements OnInit {
           this.YAxis = ChartObject[i].yAxis;
           this.showlabel = ChartObject[i].showlabel;
           this.ChartLegend = ChartObject[i].chartlegend;
+          this.ConnectionId = ChartObject[i].connection; // Add connection ID
           console.log(this.TableName);
-          this.Dashtestservive.getChartData(this.TableName,"Scatter Chart",this.XAxis,this.YAxis).subscribe((Ldata) => {
-            console.log(Ldata);
-            this.JsonData = Ldata;
-            this.scatterChartData = this.JsonData.scatterChartData;
-            this.scatterChartLabels = this.JsonData.scatterChartLabels;
-            
-           },(error) => {
-            console.log(error);
-           });
+          // Fetch data with filters
+          this.fetchChartData();
           break; // No need to continue the loop once the correct placeholder is found
         }
       }
     });
   }
-
+  
+  // Fetch chart data with filter support
+  fetchChartData(): void {
+    if (this.TableName && this.XAxis && this.YAxis) {
+      // Convert YAxis to string if it's an array
+      const yAxisString = Array.isArray(this.YAxis) ? this.YAxis.join(',') : this.YAxis;
+      
+      // Get filter parameters from common filters
+      const commonFilters = this.filterService.getFilterValues();
+      const filterDefinitions = this.filterService.getFilters();
+      
+      // Build filter object using field names as keys
+      const filterObj = {};
+      Object.keys(commonFilters).forEach(filterId => {
+        const filterValue = commonFilters[filterId];
+        
+        // Find the filter definition to get the field name
+        const filterDef = this.filterService.getFilters().find(f => f.id === filterId);
+        
+        if (filterDef && filterDef.field) {
+          const fieldName = filterDef.field;
+          if (filterValue !== undefined && filterValue !== null && filterValue !== '') {
+            filterObj[fieldName] = filterValue;
+          }
+        }
+      });
+      
+      // Convert to JSON string for API call
+      let filterParams = '';
+      if (Object.keys(filterObj).length > 0) {
+        filterParams = JSON.stringify(filterObj);
+      }
+      
+      console.log('ScatterRunner: Final filter object to send to API:', filterObj);
+      
+      // Fetch data from the dashboard service with filters
+      this.Dashtestservive.getChartDataWithFilters(this.TableName, "Scatter Chart", this.XAxis, this.YAxis, this.ConnectionId, '', '', filterParams).subscribe((Ldata) => {
+        console.log(Ldata);
+        this.JsonData = Ldata;
+        this.scatterChartData = this.JsonData.scatterChartData;
+        this.scatterChartLabels = this.JsonData.scatterChartLabels;
+      },(error) => {
+        console.log(error);
+      });
+    }
+  }
+  
   generatePDFFile(){
     this.buttonClicked.emit();
     const content = this.contentContainerRef.nativeElement;
@@ -117,5 +174,18 @@ export class ScatterRunnerComponent implements OnInit {
 
     this.Dashtestservive.generatePDF(content, filename);
   }
+  
+  ngOnDestroy() {
+    // Unsubscribe from all subscriptions to prevent memory leaks
+    console.log('ScatterRunnerComponent ngOnDestroy called, unsubscribing from', this.subscriptions.length, 'subscriptions');
+    this.subscriptions.forEach(subscription => {
+      if (subscription && !subscription.closed) {
+        subscription.unsubscribe();
+      }
+    });
+    this.subscriptions = [];
+    
+    console.log('ScatterRunnerComponent destroyed and cleaned up');
+  }
 
 }
diff --git a/frontend/angular-clarity-master/src/app/modules/main/builder/dashboardrunner/dashrunnerline/todo-runner/todo-runner.component.ts b/frontend/angular-clarity-master/src/app/modules/main/builder/dashboardrunner/dashrunnerline/todo-runner/todo-runner.component.ts
index cb264cb..a6ea095 100644
--- a/frontend/angular-clarity-master/src/app/modules/main/builder/dashboardrunner/dashrunnerline/todo-runner/todo-runner.component.ts
+++ b/frontend/angular-clarity-master/src/app/modules/main/builder/dashboardrunner/dashrunnerline/todo-runner/todo-runner.component.ts
@@ -3,6 +3,10 @@ import { DashrunnerService } from '../dashrunner.service';
 import { DashboardContentModel } from 'src/app/models/builder/dashboard';
 import { ActivatedRoute, Router } from '@angular/router';
 import { Dashboard3Service } from 'src/app/services/builder/dashboard3.service';
+// Add FilterService import
+import { FilterService } from '../../../dashboardnew/common-filter/filter.service';
+// Add Subscription import
+import { Subscription } from 'rxjs';
 
 @Component({
   selector: 'app-todo-runner',
@@ -12,19 +16,21 @@ import { Dashboard3Service } from 'src/app/services/builder/dashboard3.service';
 export class TodoRunnerComponent implements OnInit {
   @ViewChild('contentContainer') contentContainerRef!: ElementRef;
   @Output() buttonClicked = new EventEmitter<void>();
-  constructor( private Dashtestservive:DashrunnerService,private route: ActivatedRoute,private dashboardService: Dashboard3Service,
-    private router : Router) { }
-
-    loading = false;
-    givendata;
-    error;
-    XAxis;
-    YAxis;
   
-    editId;
-    public DashtestboardArray: DashboardContentModel[] = [];
-    workflowLine;
-    TableName;
+  // Add subscriptions to unsubscribe on destroy
+  private subscriptions: Subscription[] = [];
+
+  loading = false;
+  givendata;
+  error;
+  XAxis;
+  YAxis;
+
+  editId;
+  public DashtestboardArray: DashboardContentModel[] = [];
+  workflowLine;
+  TableName;
+  ConnectionId: number; // Add ConnectionId property
 
   list;
   data: any;
@@ -34,11 +40,25 @@ export class TodoRunnerComponent implements OnInit {
     listName: "title123",
     List:['todo 1','todo 2'],
   }
+  
+  constructor( private Dashtestservive:DashrunnerService,private route: ActivatedRoute,private dashboardService: Dashboard3Service,
+    private router : Router,
+    // Add FilterService to constructor
+    private filterService: FilterService) { }
+
   ngOnInit(): void {
     this.editId = this.route.snapshot.params.id;
     console.log(this.editId);
     // this.getbyId();
 
+    // Subscribe to filter changes
+    this.subscriptions.push(
+      this.filterService.filterState$.subscribe(filters => {
+        // When filters change, refresh the todo data
+        this.fetchTodoData();
+      })
+    );
+
     this.dashboardService.getById(this.editId).subscribe((data)=>{
       console.log(data);
       this.workflowLine = data.dashbord1_Line[0].model;
@@ -63,15 +83,10 @@ export class TodoRunnerComponent implements OnInit {
           this.TableName = ChartObject[i].table;
           this.XAxis = ChartObject[i].xAxis;
           this.YAxis = ChartObject[i].yAxis;
+          this.ConnectionId = ChartObject[i].connection; // Add connection ID
           console.log(this.TableName);
-          this.Dashtestservive.getChartData(this.TableName,"Todo List",this.XAxis,this.YAxis).subscribe((Ldata) => {
-            console.log(Ldata);
-            this.todoList.listName = Ldata.listName;
-            this.todoList.List = Ldata.List;
-            
-           },(error) => {
-            console.log(error);
-           });
+          // Fetch data with filters
+          this.fetchTodoData();
           break; // No need to continue the loop once the correct placeholder is found
         }
       }
@@ -100,4 +115,58 @@ generatePDFFile(){
 
   this.Dashtestservive.generatePDF(content, filename);
 }
+
+// Fetch todo data with filter support
+fetchTodoData(): void {
+  if (this.TableName && this.XAxis && this.YAxis) {
+    // Get filter parameters from common filters
+    const commonFilters = this.filterService.getFilterValues();
+    
+    // Build filter object using field names as keys
+    const filterObj = {};
+    Object.keys(commonFilters).forEach(filterId => {
+      const filterValue = commonFilters[filterId];
+      
+      // Find the filter definition to get the field name
+      const filterDef = this.filterService.getFilters().find(f => f.id === filterId);
+      
+      if (filterDef && filterDef.field) {
+        const fieldName = filterDef.field;
+        if (filterValue !== undefined && filterValue !== null && filterValue !== '') {
+          filterObj[fieldName] = filterValue;
+        }
+      }
+    });
+    
+    // Convert to JSON string for API call
+    let filterParams = '';
+    if (Object.keys(filterObj).length > 0) {
+      filterParams = JSON.stringify(filterObj);
+    }
+    
+    console.log('TodoRunner: Final filter object to send to API:', filterObj);
+    
+    // Fetch data from the dashboard service with filters
+    this.Dashtestservive.getChartDataWithFilters(this.TableName, "Todo List", this.XAxis, this.YAxis, this.ConnectionId, '', '', filterParams).subscribe((Ldata) => {
+      console.log(Ldata);
+      this.todoList.listName = Ldata.listName;
+      this.todoList.List = Ldata.List;
+    },(error) => {
+      console.log(error);
+    });
+  }
 }
+
+ngOnDestroy() {
+  // Unsubscribe from all subscriptions to prevent memory leaks
+  console.log('TodoRunnerComponent ngOnDestroy called, unsubscribing from', this.subscriptions.length, 'subscriptions');
+  this.subscriptions.forEach(subscription => {
+    if (subscription && !subscription.closed) {
+      subscription.unsubscribe();
+    }
+  });
+  this.subscriptions = [];
+  
+  console.log('TodoRunnerComponent destroyed and cleaned up');
+}
+}
\ No newline at end of file
diff --git a/frontend/angular-clarity-master/src/app/modules/main/builder/report-build/reportbuildquery/reportbuildquery.component.ts b/frontend/angular-clarity-master/src/app/modules/main/builder/report-build/reportbuildquery/reportbuildquery.component.ts
index 3c23b53..c25b688 100644
--- a/frontend/angular-clarity-master/src/app/modules/main/builder/report-build/reportbuildquery/reportbuildquery.component.ts
+++ b/frontend/angular-clarity-master/src/app/modules/main/builder/report-build/reportbuildquery/reportbuildquery.component.ts
@@ -254,7 +254,7 @@ export class ReportbuildqueryComponent implements OnInit {
   name;
   databaseName;
   databasename(val) {
-    console.log(val);
+    console.log('connection  ', val);
     this.databaseName = val.name;
     this.selecteddatabase = val.conn_string;
     console.log(this.selecteddatabase);
diff --git a/frontend/angular-clarity-master/src/app/modules/main/builder/report-build2/report-build2add/report-build2add.component.html b/frontend/angular-clarity-master/src/app/modules/main/builder/report-build2/report-build2add/report-build2add.component.html
index 587e702..502e454 100644
--- a/frontend/angular-clarity-master/src/app/modules/main/builder/report-build2/report-build2add/report-build2add.component.html
+++ b/frontend/angular-clarity-master/src/app/modules/main/builder/report-build2/report-build2add/report-build2add.component.html
@@ -23,6 +23,18 @@
           <label for="workflow_name">{{'ACTIVE'| translate}}</label>
           <input type="checkbox" formControlName="active"  clrToggle value="billable" name="billable" />
         </div>
+        
+        <!-- SureConnect Dropdown -->
+        <div class="clr-col-md-4 clr-col-sm-12">
+          <label for="sureConnectId">SureConnect Connection</label>
+          <select formControlName="sureConnectId" class="clr-select">
+            <option value="">-- Select SureConnect --</option>
+            <option *ngFor="let conn of sureconnectData" [value]="conn.id">
+              {{conn.connection_name || conn.id}}
+            </option>
+          </select>
+        </div>
+
 <!-- 
         <div class="clr-col-md-4 clr-col-sm-12">
             <label for="url">Get URL</label>
@@ -76,4 +88,4 @@
       <button type="submit" class="btn btn-primary" [disabled]="!entryForm.valid" (click)="onSubmit()">{{'SUBMIT' | translate}}</button>
     </div>
   </form>
-</div>
+</div>
\ No newline at end of file
diff --git a/frontend/angular-clarity-master/src/app/modules/main/builder/report-build2/report-build2add/report-build2add.component.ts b/frontend/angular-clarity-master/src/app/modules/main/builder/report-build2/report-build2add/report-build2add.component.ts
index 5007d44..d6faf39 100644
--- a/frontend/angular-clarity-master/src/app/modules/main/builder/report-build2/report-build2add/report-build2add.component.ts
+++ b/frontend/angular-clarity-master/src/app/modules/main/builder/report-build2/report-build2add/report-build2add.component.ts
@@ -4,6 +4,8 @@ import { FormBuilder, FormGroup } from '@angular/forms';
 import { ActivatedRoute, Router } from '@angular/router';
 import { ToastrService } from 'ngx-toastr';
 import { ReportBuilderService } from 'src/app/services/api/report-builder.service';
+import { SureconnectService } from '../../dashboardnew/sureconnect/sureconnect.service';
+
 @Component({
   selector: 'app-report-build2add',
   templateUrl: './report-build2add.component.html',
@@ -11,8 +13,12 @@ import { ReportBuilderService } from 'src/app/services/api/report-builder.servic
 })
 export class ReportBuild2addComponent implements OnInit {
   public entryForm: FormGroup;
+  // Add sureconnect data property
+  sureconnectData: any[] = [];
+
   constructor(private _fb: FormBuilder, private router: Router,private toastr: ToastrService,
-    private route: ActivatedRoute,private reportBuilderService: ReportBuilderService) { }
+    private route: ActivatedRoute,private reportBuilderService: ReportBuilderService,
+    private sureconnectService: SureconnectService) { }
 
   ngOnInit(): void {
     this.entryForm = this._fb.group({
@@ -20,9 +26,23 @@ export class ReportBuild2addComponent implements OnInit {
       description:[null],
       active:[null],
       isSql:[false],
+      // Add sureConnectId field to the form
+      sureConnectId: [null],
       Rpt_builder2_lines: this._fb.array([this.initLinesFormReport()]),
     });
-  
+    
+    // Load sureconnect data
+    this.loadSureconnectData();
+  }
+
+  // Add method to load sureconnect data
+  loadSureconnectData() {
+    this.sureconnectService.getAll().subscribe((data: any[]) => {
+      this.sureconnectData = data;
+      console.log('Sureconnect data loaded:', this.sureconnectData);
+    }, (error) => {
+      console.log('Error loading sureconnect data:', error);
+    });
   }
 
   initLinesFormReport() {
@@ -68,4 +88,4 @@ export class ReportBuild2addComponent implements OnInit {
     this.router.navigate(["../all"], { relativeTo: this.route });
   }
 
-}
+}
\ No newline at end of file
diff --git a/frontend/angular-clarity-master/src/app/modules/main/builder/report-build2/report-build2all/report-build2all.component.html b/frontend/angular-clarity-master/src/app/modules/main/builder/report-build2/report-build2all/report-build2all.component.html
index b9660ed..f7f2cc9 100644
--- a/frontend/angular-clarity-master/src/app/modules/main/builder/report-build2/report-build2all/report-build2all.component.html
+++ b/frontend/angular-clarity-master/src/app/modules/main/builder/report-build2/report-build2all/report-build2all.component.html
@@ -6,70 +6,87 @@
 
 <div class="dg-wrapper">
   <div class="clr-row">
-      <div class="clr-col-4">
-          <h3><b>{{'REPORT_BUILDER_2' | translate}}</b></h3>
-      </div>
-      <div class="clr-col-8" style="text-align: right;">
-        <button id="add" class="btn btn-primary" (click)="gotorunner()">
-            <clr-icon shape="grid-view"></clr-icon>{{'REPORT_RUNNER' | translate}}
-        </button>
-        
-        <button id="add" class="btn btn-primary" (click)="goToAdd()">
-            <clr-icon shape="plus"></clr-icon>{{'ADD' | translate}}
-        </button>
+    <div class="clr-col-4">
+      <h3><b>{{'REPORT_BUILDER_2' | translate}}</b></h3>
     </div>
-</div>
+    <div class="clr-col-8" style="text-align: right;">
+      <button id="add" class="btn btn-primary" (click)="gotorunner()">
+        <clr-icon shape="grid-view"></clr-icon>{{'REPORT_RUNNER' | translate}}
+      </button>
 
-<clr-datagrid [clrDgLoading]="loading">
+      <button id="add" class="btn btn-primary" (click)="goToAdd()">
+        <clr-icon shape="plus"></clr-icon>{{'ADD' | translate}}
+      </button>
+    </div>
+  </div>
+
+  <clr-datagrid [clrDgLoading]="loading">
     <clr-dg-placeholder><ng-template #loadingSpinner><clr-spinner>{{'LOADING' | translate}}</clr-spinner></ng-template>
-    <div *ngIf="error;else loadingSpinner">{{error}}</div></clr-dg-placeholder>
-  
-  
+      <div *ngIf="error;else loadingSpinner">{{error}}</div>
+    </clr-dg-placeholder>
+
+
     <clr-dg-column [clrDgField]="''"><ng-container *clrDgHideableColumn="{hidden: false}">
-      {{'GO_TO' | translate}}
-  </ng-container></clr-dg-column>
-  <clr-dg-column [clrDgField]="'name'"><ng-container *clrDgHideableColumn="{hidden: false}">
-      {{'REPORT_NAME' | translate}}
-  </ng-container></clr-dg-column>
-  <clr-dg-column [clrDgField]="'description'"><ng-container *clrDgHideableColumn="{hidden: false}">
-      {{'REPORT_DESCRIPTION' | translate}}
-  </ng-container></clr-dg-column>
-  <clr-dg-column [clrDgField]="'active'"><ng-container *clrDgHideableColumn="{hidden: false}">
-      {{'ACTIVE' | translate}}
-  </ng-container></clr-dg-column>
-  <clr-dg-column><ng-container *clrDgHideableColumn="{hidden: false}">
-      <clr-icon shape="bars"></clr-icon>{{'ACTION' | translate}}
-  </ng-container></clr-dg-column>
-  
-      <clr-dg-row *clrDgItems="let user of gridData?.slice()?.reverse();" [clrDgItem]="user">
-        <clr-dg-cell><span class="label label-light-blue" style="display: inline;margin-left: 10px; cursor: pointer;"  (click)="goToLines(user)"> {{'SET_UP' | translate}}</span></clr-dg-cell>
-        <clr-dg-cell id="word">{{user.reportName}}</clr-dg-cell>
-        <clr-dg-cell id="word">{{user.description}}</clr-dg-cell>
-        <clr-dg-cell id="word">{{user.active}}</clr-dg-cell>
-        <clr-dg-cell>
-          <a href="javascript:void(0)" style="padding-right: 10px;" role="tooltip" aria-haspopup="true" class="tooltip tooltip-sm tooltip-top-left">
-            <span style="cursor: pointer;"><clr-icon shape="trash" (click)="onDelete(user)" class="red is-error" style="color: red;"></clr-icon></span>
-            <span class="tooltip-content"> {{'DELETE' | translate}}</span>
-            </a>
-          <clr-signpost>
-            <span style="cursor: pointer;" clrSignpostTrigger><clr-icon shape="help" class="success" style="color: rgb(0, 130, 236);"></clr-icon></span>
-                    <clr-signpost-content [clrPosition]="'left-middle'" *clrIfOpen>
-                        <h5 style="margin-top: 0">{{'WHO_COLUMN' | translate}}</h5>
-                        <div>{{'ACCOUNT_ID' | translate}}: <code class="clr-code">{{user.accountId}}</code></div>
-                        <div>{{'CREATED_AT' | translate}}: <code class="clr-code">{{user.createdAt | date}}</code></div>
-                        <div>{{'CREATED_BY' | translate}}: <code class="clr-code">{{user.createdBy}}</code></div>
-                        <div>{{'UPDATED_AT' | translate}}: <code class="clr-code">{{user.updatedAt | date}}</code></div>
-                        <div>{{'UPDATED_BY' | translate}}: <code class="clr-code">{{user.updatedBy}}</code></div>
-                    </clr-signpost-content>
-          </clr-signpost>
-          
-            <!-- <span style="cursor: pointer;"><clr-icon shape="form" (click)="goToLines(user.id)" class="success" style="color: rgb(0, 130, 236);"></clr-icon></span> -->
-          </clr-dg-cell>
-        <clr-dg-action-overflow>
-          <!-- <button class="action-item" (click)="goToEdit(user.id)">Edit <clr-icon shape="edit" class="is-error"></clr-icon></button> -->
-        </clr-dg-action-overflow>
-  
-        <!-- <clr-dg-row-detail *clrIfExpanded >
+        {{'GO_TO' | translate}}
+      </ng-container></clr-dg-column>
+
+    <clr-dg-column [clrDgField]="'name'"><ng-container *clrDgHideableColumn="{hidden: false}">
+        {{'REPORT_NAME' | translate}}
+      </ng-container></clr-dg-column>
+    <clr-dg-column [clrDgField]="'description'"><ng-container *clrDgHideableColumn="{hidden: false}">
+        {{'REPORT_DESCRIPTION' | translate}}
+      </ng-container></clr-dg-column>
+
+    <clr-dg-column [clrDgField]="''"><ng-container *clrDgHideableColumn="{hidden: false}">
+        Sureconnect
+      </ng-container></clr-dg-column>
+
+    <clr-dg-column [clrDgField]="'active'"><ng-container *clrDgHideableColumn="{hidden: false}">
+        {{'ACTIVE' | translate}}
+      </ng-container></clr-dg-column>
+
+
+
+
+    <clr-dg-column><ng-container *clrDgHideableColumn="{hidden: false}">
+        <clr-icon shape="bars"></clr-icon>{{'ACTION' | translate}}
+      </ng-container></clr-dg-column>
+
+    <clr-dg-row *clrDgItems="let user of gridData?.slice()?.reverse();" [clrDgItem]="user">
+      <clr-dg-cell><span class="label label-light-blue" style="display: inline;margin-left: 10px; cursor: pointer;"
+          (click)="goToLines(user)"> {{'SET_UP' | translate}}</span></clr-dg-cell>
+      <clr-dg-cell id="word">{{user.reportName}}</clr-dg-cell>
+      <clr-dg-cell id="word">{{user.description}}</clr-dg-cell>
+
+      <clr-dg-cell id="word">{{user.sureconnect_name}}</clr-dg-cell>
+      <clr-dg-cell id="word">{{user.active}}</clr-dg-cell>
+      <clr-dg-cell>
+        <a href="javascript:void(0)" style="padding-right: 10px;" role="tooltip" aria-haspopup="true"
+          class="tooltip tooltip-sm tooltip-top-left">
+          <span style="cursor: pointer;"><clr-icon shape="trash" (click)="onDelete(user)" class="red is-error"
+              style="color: red;"></clr-icon></span>
+          <span class="tooltip-content"> {{'DELETE' | translate}}</span>
+        </a>
+        <clr-signpost>
+          <span style="cursor: pointer;" clrSignpostTrigger><clr-icon shape="help" class="success"
+              style="color: rgb(0, 130, 236);"></clr-icon></span>
+          <clr-signpost-content [clrPosition]="'left-middle'" *clrIfOpen>
+            <h5 style="margin-top: 0">{{'WHO_COLUMN' | translate}}</h5>
+            <div>{{'ACCOUNT_ID' | translate}}: <code class="clr-code">{{user.accountId}}</code></div>
+            <div>{{'CREATED_AT' | translate}}: <code class="clr-code">{{user.createdAt | date}}</code></div>
+            <div>{{'CREATED_BY' | translate}}: <code class="clr-code">{{user.createdBy}}</code></div>
+            <div>{{'UPDATED_AT' | translate}}: <code class="clr-code">{{user.updatedAt | date}}</code></div>
+            <div>{{'UPDATED_BY' | translate}}: <code class="clr-code">{{user.updatedBy}}</code></div>
+          </clr-signpost-content>
+        </clr-signpost>
+
+        <!-- <span style="cursor: pointer;"><clr-icon shape="form" (click)="goToLines(user.id)" class="success" style="color: rgb(0, 130, 236);"></clr-icon></span> -->
+      </clr-dg-cell>
+      <clr-dg-action-overflow>
+        <!-- <button class="action-item" (click)="goToEdit(user.id)">Edit <clr-icon shape="edit" class="is-error"></clr-icon></button> -->
+      </clr-dg-action-overflow>
+
+      <!-- <clr-dg-row-detail *clrIfExpanded >
           <table class="table">
             <tr>
               <td class="td-title">actionName: </td>
@@ -77,26 +94,26 @@
             </tr>
           </table>
         </clr-dg-row-detail> -->
-      </clr-dg-row>
-  
-      <clr-dg-footer>
-        <clr-dg-pagination #pagination [clrDgPageSize]="10">
-          <clr-dg-page-size [clrPageSizeOptions]="[10,20,50,100]">{{'USERS_PER_PAGE' | translate}}</clr-dg-page-size>
-          {{pagination.firstItem + 1}} - {{pagination.lastItem + 1}}
-          of {{pagination.totalItems}} users
-        </clr-dg-pagination>
-      </clr-dg-footer>
-    </clr-datagrid>
-  </div>
-  
-  <clr-modal [(clrModalOpen)]="modaldelete" [clrModalSize]="'lg'" [clrModalStaticBackdrop]="true">
-  
-    <div class="modal-body" *ngIf="rowSelected.id">
-      <h1 class="delete">{{'DELETE_CONFIRMATION' | translate}}</h1>
-      <h2 class="heading">{{rowSelected.id}}</h2>
-      <div class="modal-footer">
-        <button type="button" class="btn btn-outline" (click)="modaldelete = false">{{'CANCEL' | translate}}</button>
-      <button type="submit" (click)="delete(rowSelected.id)" class="btn btn-primary" >{{'DELETE' | translate}}</button>
-      </div>
+    </clr-dg-row>
+
+    <clr-dg-footer>
+      <clr-dg-pagination #pagination [clrDgPageSize]="10">
+        <clr-dg-page-size [clrPageSizeOptions]="[10,20,50,100]">{{'USERS_PER_PAGE' | translate}}</clr-dg-page-size>
+        {{pagination.firstItem + 1}} - {{pagination.lastItem + 1}}
+        of {{pagination.totalItems}} users
+      </clr-dg-pagination>
+    </clr-dg-footer>
+  </clr-datagrid>
+</div>
+
+<clr-modal [(clrModalOpen)]="modaldelete" [clrModalSize]="'lg'" [clrModalStaticBackdrop]="true">
+
+  <div class="modal-body" *ngIf="rowSelected.id">
+    <h1 class="delete">{{'DELETE_CONFIRMATION' | translate}}</h1>
+    <h2 class="heading">{{rowSelected.id}}</h2>
+    <div class="modal-footer">
+      <button type="button" class="btn btn-outline" (click)="modaldelete = false">{{'CANCEL' | translate}}</button>
+      <button type="submit" (click)="delete(rowSelected.id)" class="btn btn-primary">{{'DELETE' | translate}}</button>
     </div>
-  </clr-modal>
\ No newline at end of file
+  </div>
+</clr-modal>
\ No newline at end of file
diff --git a/frontend/angular-clarity-master/src/app/modules/main/builder/report-build2/report-build2edit/report-build2edit.component.html b/frontend/angular-clarity-master/src/app/modules/main/builder/report-build2/report-build2edit/report-build2edit.component.html
index ea3a267..f52de1e 100644
--- a/frontend/angular-clarity-master/src/app/modules/main/builder/report-build2/report-build2edit/report-build2edit.component.html
+++ b/frontend/angular-clarity-master/src/app/modules/main/builder/report-build2/report-build2edit/report-build2edit.component.html
@@ -1,13 +1,13 @@
 <div class="container">
-    <h3 style="font-weight: 300;display: inline;"><b>REPORT SET UP - Project Details Report ({{ReportData.id}})</b></h3>
-    <span class="label label-light-blue" style="display: inline;margin-left: 10px;">Edit Mode</span>
-    <hr />
-    <form [formGroup]="entryForm">
-        <div class="clr-row">
-            <div class="clr-col-lg-12 clr-col-md-12 clr-col-sm-12">
-                <div>
-                    <div class="clr-row">
-                        <!-- <div class="clr-col-md-4 clr-col-sm-12">
+  <h3 style="font-weight: 300;display: inline;"><b>REPORT SET UP - Project Details Report ({{ReportData.id}})</b></h3>
+  <span class="label label-light-blue" style="display: inline;margin-left: 10px;">Edit Mode</span>
+  <hr />
+  <form [formGroup]="entryForm">
+    <div class="clr-row">
+      <div class="clr-col-lg-12 clr-col-md-12 clr-col-sm-12">
+        <div>
+          <div class="clr-row">
+            <!-- <div class="clr-col-md-4 clr-col-sm-12">
                             <div class="clr-col-sm-12">
                             <label for="projectName">Connection Name</label>
                             <select  formControlName="conn_name" name="conn_name" [(ngModel)]="nodeEditProperties.conn_name" id="service"   class="clr-dropdown">
@@ -24,55 +24,70 @@
                                 </select>
                             </div>
                         </div> -->
-                        <div class="clr-col-md-4 clr-col-sm-12">
-                            <label for="url">Get URL</label>
-                            <div> <input type="text" class="clr-input" formControlName="url" name="url" [(ngModel)]="nodeEditProperties.url"  placeholder="Enter Url"   style="width: 76%">&nbsp;<span><button  class="btn btn-icon btn-primary" (click)="getkeys()">
-                                <clr-icon shape="view-list"></clr-icon>
-                              </button></span></div>
-                        </div>
-                        <div class="clr-col-md-4 clr-col-sm-12">
-                            <label for="workflow_name">Include Date filter</label>
-                            <input type="checkbox" formControlName="date_param_req" name="date_param_req" [(ngModel)]="nodeEditProperties.date_param_req"  clrToggle  />
-                          </div>
-                        <div class="clr-col-md-4 clr-col-sm-12">
-                            <label>Standard Parameters</label>
-                                <clr-combobox-container style="margin-top: 0; padding-top: 0;">
-                                  <!-- <label style="padding-bottom: 5px; padding-top:0px; font-weight: lighter;" class="p1">Select Left Side Filter</label> -->
-                                <clr-combobox  formControlName="std_param_html" name="std_param_html" [(ngModel)]="nodeEditProperties.std_param_html"   clrMulti="true"
-                                   required>
-                                    <ng-container *clrOptionSelected="let selected">
-                                      {{selected}}
-                                    </ng-container>
-                                    <clr-options>
-                                      <clr-option *clrOptionItems="let state of keysfromurl" [clrValue]="state">
-                                        {{state}}
-                                      </clr-option>
-                                    </clr-options>
-                                  </clr-combobox>
-                                  </clr-combobox-container>
-                    
-                        </div>
-                        <div class="clr-col-md-4 clr-col-sm-12">
-                            <label>List</label>
-                              <select>
-                                <option value="">Choose from list</option>
-                                <option></option>
-                              </select>
-                    
-                        </div>
-                        <!-- <div class="clr-col-md-4 clr-col-sm-12">
+            <div class="clr-col-md-4 clr-col-sm-12">
+              <label for="url">Get URL</label>
+              <div> <input type="text" class="clr-input" formControlName="url" name="url"
+                  [(ngModel)]="nodeEditProperties.url" placeholder="Enter Url" style="width: 76%">&nbsp;<span><button
+                    class="btn btn-icon btn-primary" (click)="getkeys()">
+                    <clr-icon shape="view-list"></clr-icon>
+                  </button></span></div>
+            </div>
+            <div class="clr-col-md-4 clr-col-sm-12">
+              <label for="workflow_name">Include Date filter</label>
+              <input type="checkbox" formControlName="date_param_req" name="date_param_req"
+                [(ngModel)]="nodeEditProperties.date_param_req" clrToggle />
+            </div>
+
+            <!-- SureConnect Dropdown -->
+            <div class="clr-col-md-4 clr-col-sm-12">
+              <label for="sureConnectId">SureConnect Connection</label>
+              <select formControlName="sureConnectId" class="clr-select">
+                <option value="">-- Select SureConnect --</option>
+                <option *ngFor="let conn of sureconnectData" [value]="conn.id">
+                  {{conn.name || conn.id}}
+                </option>
+              </select>
+            </div>
+
+            <div class="clr-col-md-4 clr-col-sm-12">
+              <label>Standard Parameters</label>
+              <clr-combobox-container style="margin-top: 0; padding-top: 0;">
+                <!-- <label style="padding-bottom: 5px; padding-top:0px; font-weight: lighter;" class="p1">Select Left Side Filter</label> -->
+                <clr-combobox formControlName="std_param_html" name="std_param_html"
+                  [(ngModel)]="nodeEditProperties.std_param_html" clrMulti="true" required>
+                  <ng-container *clrOptionSelected="let selected">
+                    {{selected}}
+                  </ng-container>
+                  <clr-options>
+                    <clr-option *clrOptionItems="let state of keysfromurl" [clrValue]="state">
+                      {{state}}
+                    </clr-option>
+                  </clr-options>
+                </clr-combobox>
+              </clr-combobox-container>
+
+            </div>
+            <div class="clr-col-md-4 clr-col-sm-12">
+              <label>List</label>
+              <select>
+                <option value="">Choose from list</option>
+                <option></option>
+              </select>
+
+            </div>
+            <!-- <div class="clr-col-md-4 clr-col-sm-12">
                             <div class="clr-col-sm-12">
                                 <label for="description" class="d1">Adhoc Parameter String (html)</label>
                                 <textarea id="t1" cols="10" rows="3" formControlName="adhoc_param_html" placeholder="Enter Description" name="adhoc_param_html" [(ngModel)]="nodeEditProperties.adhoc_param_html" style="width:100%">
                                 </textarea>
                             </div>
                         </div> -->
-                    </div>
-                </div>
-            </div>
+          </div>
         </div>
-        <br>
-        <!-- <div class="clr-row" style="padding-left:10px;">
+      </div>
+    </div>
+    <br>
+    <!-- <div class="clr-row" style="padding-left:10px;">
             <div class="clr-col-md-4 clr-col-sm-12">
                 <label for="description" class="d1">Column String (html)</label>
                 <textarea id="t1" cols="10" rows="3" formControlName="column_str" placeholder="Enter Description" name="column_str" [(ngModel)]="nodeEditProperties.column_str" style="width:100%">
@@ -85,11 +100,10 @@
                 </textarea>
             </div>
         </div> -->
-      <br>
-      <div class="center">
-        <button type="button" class="btn btn-outline" (click)="back()">BACK</button>
-        <button type="submit" form-control class="btn btn-primary" (click)="onSubmit()">UPDATE</button>
-      </div>
-    </form>
-  </div>
-  
\ No newline at end of file
+    <br>
+    <div class="center">
+      <button type="button" class="btn btn-outline" (click)="back()">BACK</button>
+      <button type="submit" form-control class="btn btn-primary" (click)="onSubmit()">UPDATE</button>
+    </div>
+  </form>
+</div>
\ No newline at end of file
diff --git a/frontend/angular-clarity-master/src/app/modules/main/builder/report-build2/report-build2edit/report-build2edit.component.ts b/frontend/angular-clarity-master/src/app/modules/main/builder/report-build2/report-build2edit/report-build2edit.component.ts
index 7fe97f8..56c99ec 100644
--- a/frontend/angular-clarity-master/src/app/modules/main/builder/report-build2/report-build2edit/report-build2edit.component.ts
+++ b/frontend/angular-clarity-master/src/app/modules/main/builder/report-build2/report-build2edit/report-build2edit.component.ts
@@ -3,6 +3,7 @@ import { FormBuilder, FormGroup } from '@angular/forms';
 import { ActivatedRoute, Router } from '@angular/router';
 import { ToastrService } from 'ngx-toastr';
 import { ReportBuilderService } from 'src/app/services/api/report-builder.service';
+import { SureconnectService } from '../../dashboardnew/sureconnect/sureconnect.service';
 
 
 @Component({
@@ -13,67 +14,87 @@ import { ReportBuilderService } from 'src/app/services/api/report-builder.servic
 export class ReportBuild2editComponent implements OnInit {
   public entryForm: FormGroup;
   updated = false;
-  ReportData:any = {};
+  ReportData: any = {};
   id: number;
   nodeEditProperties = {
-    std_param_html:'',
-    adhoc_param_html:'',
+    std_param_html: '',
+    adhoc_param_html: '',
     // column_str:'',
     // conn_name:'',
-    date_param_req:'',
+    date_param_req: '',
     // folderName:'',
-    url:'',
+    url: '',
+    // Add sureConnectId property
+    sureConnectId: null,
+
+  };
+  // Add sureconnect data property
+  sureconnectData: any[] = [];
 
-};
   constructor(private router: Router,
-    private route: ActivatedRoute,private reportBuilderService: ReportBuilderService,
-    private toastr: ToastrService,  private _fb: FormBuilder) { }
+    private route: ActivatedRoute, private reportBuilderService: ReportBuilderService,
+    private toastr: ToastrService, private _fb: FormBuilder,
+    private sureconnectService: SureconnectService) { }
 
   ngOnInit(): void {
     this.id = this.route.snapshot.params["id"];
     console.log("update with id = ", this.id);
 
     this.entryForm = this._fb.group({
-      std_param_html : [null],
-      adhoc_param_html:[null],
+      std_param_html: [null],
+      adhoc_param_html: [null],
       // column_str:[null],
       // conn_name:[null],
-      date_param_req:[null],
+      date_param_req: [null],
       // folderName:[null],
-      url:[null],
-      });
+      url: [null],
+      // Add sureConnectId to form
+      sureConnectId: [null],
+    });
 
+    // Load sureconnect data first, then load report data
+    this.loadSureconnectData();
     this.getById(this.id);
     this.listoddatabase();
   }
-  databaselist;
-  listoddatabase(){
-    this.reportBuilderService.getdatabse().subscribe((data)=>{
-      this.databaselist=data;
-      console.log(this.databaselist)
-    },(error) => {
-      console.log(error);
-      if(error){
-     }
+
+  // Add method to load sureconnect data
+  loadSureconnectData() {
+    this.sureconnectService.getAll().subscribe((data: any[]) => {
+      this.sureconnectData = data;
+      console.log('Sureconnect data loaded:', this.sureconnectData);
+    }, (error) => {
+      console.log('Error loading sureconnect data:', error);
     });
-  
+  }
+
+  databaselist;
+  listoddatabase() {
+    this.reportBuilderService.getdatabse().subscribe((data) => {
+      this.databaselist = data;
+      console.log(this.databaselist)
+    }, (error) => {
+      console.log(error);
+      if (error) {
+      }
+    });
+
   }
   builderLine;
   lineId;
-  builderLineData:any[] = [];
+  builderLineData: any[] = [];
   getById(id: number) {
     this.reportBuilderService.getrbDetailsById(id).subscribe(
       (data) => {
         console.log(data);
         this.ReportData = data;
 
-        
+
         this.builderLine = this.ReportData.rpt_builder2_lines;
         this.lineId = this.builderLine[0].id
-        console.log("line data ",this.lineId, this.builderLine);
-        if(this.builderLine[0].model != '')
-        {
-          this.builderLineData = JSON.parse(this.builderLine[0].model) ;
+        console.log("line data ", this.lineId, this.builderLine);
+        if (this.builderLine[0].model != '') {
+          this.builderLineData = JSON.parse(this.builderLine[0].model);
           console.log(this.builderLineData);
 
           this.nodeEditProperties.std_param_html = this.builderLineData[0].std_param_html;
@@ -82,6 +103,11 @@ export class ReportBuild2editComponent implements OnInit {
           // this.nodeEditProperties.conn_name = this.builderLineData.conn_name;
           this.nodeEditProperties.date_param_req = this.builderLineData[0].date_param_req;
           this.nodeEditProperties.url = this.builderLineData[0].url;
+          // Set sureConnectId if it exists in the data
+          this.nodeEditProperties.sureConnectId = this.builderLineData[0].sureConnectId || null;
+
+          // Update form with loaded data
+          this.entryForm.patchValue(this.nodeEditProperties);
         }
       },
       (err) => {
@@ -92,51 +118,56 @@ export class ReportBuild2editComponent implements OnInit {
 
   stdparams;
   keysfromurl;
-  getkeys(){
-    if(this.nodeEditProperties.url !== null){
-      this.reportBuilderService.getcolumnDetailsByurl(this.nodeEditProperties.url).subscribe(data =>{
-        console.log(data);
+  getkeys() {
+    if (this.nodeEditProperties.url !== null) {
+      this.reportBuilderService.getcolumnDetailsByurl(this.nodeEditProperties.url).subscribe(data => {
+        console.log('coloum list data ', data);
         this.keysfromurl = data;
-        this.nodeEditProperties.adhoc_param_html =  this.keysfromurl;
+        this.nodeEditProperties.adhoc_param_html = this.keysfromurl;
       })
-    }else{
+    } else {
       this.toastr.error("URL is required");
     }
   }
-  
+
 
   listBuilder_Lines = {
-    model:{}
+    model: {}
   }
   update() {
 
-  
+
     this.builderLineData[0] = {
       std_param_html: this.nodeEditProperties.std_param_html,
       adhoc_param_html: this.nodeEditProperties.adhoc_param_html,
       date_param_req: this.nodeEditProperties.date_param_req,
       url: this.nodeEditProperties.url,
+      // Add sureConnectId to the data
+      sureConnectId: this.nodeEditProperties.sureConnectId,
     };
 
     this.builderLineData[0].std_param_html = this.nodeEditProperties.std_param_html;
-     this.builderLineData[0].adhoc_param_html = this.nodeEditProperties.adhoc_param_html;
+    this.builderLineData[0].adhoc_param_html = this.nodeEditProperties.adhoc_param_html;
     //  this.builderLineData.column_str =  this.nodeEditProperties.column_str;
     //  this.builderLineData.conn_name = this.nodeEditProperties.conn_name ;
     this.builderLineData[0].date_param_req = this.nodeEditProperties.date_param_req;
     this.builderLineData[0].url = this.nodeEditProperties.url;
+    // Add sureConnectId to the data
+    this.builderLineData[0].sureConnectId = this.nodeEditProperties.sureConnectId;
+
     console.log(this.builderLineData);
     // this.builderLineData.splice(1);
     console.log(this.builderLineData);
     let tmp = JSON.stringify(this.builderLineData); //.replace(/\\/g, '')
     this.listBuilder_Lines.model = tmp;
-console.log(this.listBuilder_Lines);
+    console.log(this.listBuilder_Lines);
 
     this.reportBuilderService.updaterbLineData(this.listBuilder_Lines, this.lineId).subscribe(
       (data) => {
         console.log(data);
         if (data) {
           this.toastr.success('Update successfully');
-       }
+        }
         this.router.navigate(["../../all"], { relativeTo: this.route });
         //this.router.navigate(["../../all"],{ relativeTo: this.route, queryParams: { p_id: this.projectId } });
       },
@@ -149,6 +180,8 @@ console.log(this.listBuilder_Lines);
 
   onSubmit() {
     this.updated = true;
+    // Update nodeEditProperties with form values including sureConnectId
+    Object.assign(this.nodeEditProperties, this.entryForm.value);
     this.update();
   }
 
@@ -156,4 +189,4 @@ console.log(this.listBuilder_Lines);
     this.router.navigate(["../../all"], { relativeTo: this.route });
   }
 
-}
+}   
\ No newline at end of file
diff --git a/frontend/angular-clarity-master/src/app/modules/main/builder/report-runner/reportrunneredit2/reportrunneredit2.component.ts b/frontend/angular-clarity-master/src/app/modules/main/builder/report-runner/reportrunneredit2/reportrunneredit2.component.ts
index 1f78b64..4f83668 100644
--- a/frontend/angular-clarity-master/src/app/modules/main/builder/report-runner/reportrunneredit2/reportrunneredit2.component.ts
+++ b/frontend/angular-clarity-master/src/app/modules/main/builder/report-runner/reportrunneredit2/reportrunneredit2.component.ts
@@ -104,8 +104,11 @@ todayDate;
   adhocList:any[];
   SQLQuery;
   getUrl;
+  // Add sureConnectId property
+  sureConnectId: number | null = null;
   stdParamfields;
   DateParam;
+
   getById(id: number) {
     this.reportBuilderService.getrbDetailsById(id).subscribe(
       (data) => {
@@ -120,6 +123,8 @@ todayDate;
         // this.adhocList = JSON.parse(adhocList);
         this.DateParam = this.builderLineData.date_param_req;
         this.getUrl = this.builderLineData.url;
+        // Get sureConnectId if it exists
+        this.sureConnectId = this.builderLineData.sureConnectId || null;
         console.log(this.adhocList,this.DateParam,this.getUrl)
         this.getStdParam(this.header_id);
         this.featchData();
@@ -127,22 +132,58 @@ todayDate;
 
   }
 
+  /**
+   * Fetch data using the URL and SureConnect connection if available
+   */
   featchData(){
+    // If sureConnectId is available, we might want to modify the request
+    // For now, we'll use the existing implementation but with better error handling
     this.reportBuilderService.getAllDetailsByurl(this.getUrl).subscribe(data =>{
       console.log(data);
       if(data.body){
-        console.log(JSON.parse(data.body));
-        this.rows = JSON.parse(data.body);
-        this.filterRows = JSON.parse(data.body);
+        // Check if the response is XML (starts with <) or JSON
+        if (typeof data.body === 'string' && data.body.trim().startsWith('<')) {
+          // Handle XML response
+          console.log('Received XML response, parsing to JSON');
+          try {
+            this.rows = this.parseXMLToJSON(data.body);
+            this.filterRows = [...this.rows]; // Create a copy
+            console.log('Parsed XML data:', this.rows);
+          } catch (error) {
+            console.error('Error parsing XML:', error);
+            this.rows = [];
+            this.filterRows = [];
+          }
+        } else {
+          // Handle JSON response
+          try {
+            console.log(JSON.parse(data.body));
+            this.rows = JSON.parse(data.body);
+            this.filterRows = JSON.parse(data.body);
+          } catch (error) {
+            console.error('Error parsing JSON:', error);
+            this.rows = [];
+            this.filterRows = [];
+          }
+        }
+      } else {
+        // If no body, initialize with empty arrays
+        this.rows = [];
+        this.filterRows = [];
       }
+    }, error => {
+      // Handle HTTP errors
+      console.error('Error fetching data:', error);
+      this.rows = [];
+      this.filterRows = [];
     });
   }
 
-  dynamicHtml:any = [];
+  dynamicHtml: any = [];
   dynamicHtmlFlag = false;
   stdParmas;
   stdParamFlag = false;
-  getStdParam(id: any){
+  getStdParam(id: any) {
     console.log(this.builderLineData.std_param_html);
     this.dynamicHtml = this.builderLineData.std_param_html;
     // this.dynamicHtml = ['a.abc','b.abcde']
@@ -154,11 +195,11 @@ todayDate;
       }
       console.log(this.dynamicForm.value);
     }
-     if(this.dynamicHtml == undefined || this.dynamicHtml == ''){
-       this.dynamicHtmlFlag = false;
-     }else{
-       this.dynamicHtmlFlag = true;
-     }
+    if (this.dynamicHtml == undefined || this.dynamicHtml == '') {
+      this.dynamicHtmlFlag = false;
+    } else {
+      this.dynamicHtmlFlag = true;
+    }
 
     // this.reportBuilderService.getStdParamById(id).subscribe(data => {
     //   console.log(data);
@@ -174,37 +215,37 @@ todayDate;
     //   }
     // });
   }
-  modo2(val){
+  modo2(val) {
     console.log(val);
-    this.selectedfrom=val;
+    this.selectedfrom = val;
   }
-  modo3(val){
+  modo3(val) {
     console.log(val);
-this.selectedto=val;
+    this.selectedto = val;
   }
-  duplicateArray=[];
+  duplicateArray = [];
   myDateValue: Date;
-  toDate:Date;
+  toDate: Date;
   reverseAndTimeStamp(dateString) {
     const reverse = new Date(dateString.split("-").reverse().join("-"));
     return reverse.getTime();
-    }
+  }
   filterDate() {
-    let fromdate=moment(this.myDateValue).format('DD-MM-YYYY');
-console.log(fromdate)
-let todate=moment(this.toDate).format('DD-MM-YYYY');
-if(this.myDateValue && this.toDate){
-const selectedMembers = this.array.filter(m => {
+    let fromdate = moment(this.myDateValue).format('DD-MM-YYYY');
+    console.log(fromdate)
+    let todate = moment(this.toDate).format('DD-MM-YYYY');
+    if (this.myDateValue && this.toDate) {
+      const selectedMembers = this.array.filter(m => {
         return this.reverseAndTimeStamp(m.fromDate) >= this.reverseAndTimeStamp(fromdate) && this.reverseAndTimeStamp(m.fromDate) <= this.reverseAndTimeStamp(todate)
+      }
+      );
+      this.duplicateArray = selectedMembers
+    } else {
+      this.duplicateArray = this.array
     }
-    );
-    this.duplicateArray=selectedMembers
-}else{
-this.duplicateArray=this.array
-}
     console.log(this.duplicateArray); // the result objects
-    this.modalselect=false;
-}
+    this.modalselect = false;
+  }
 
   dateParameter: string;
   from_date: Date;
@@ -213,7 +254,7 @@ this.duplicateArray=this.array
   calculateThisWeek(): void {
     // Calculate the current date
     const currentDate = new Date();
-  console.log(currentDate)
+    console.log(currentDate)
     // Get the day of the week (0-6, where 0 is Sunday)
     const currentDayOfWeek = currentDate.getDay();
 
@@ -228,10 +269,10 @@ this.duplicateArray=this.array
     this.to_date = new Date(this.from_date);
     this.to_date.setDate(this.from_date.getDate() + 6);
     console.log(this.from_date);
-    this.myDateValue=this.from_date;
+    this.myDateValue = this.from_date;
     console.log(this.to_date);
     console.log(this.myDateValue);
-    this.toDate=this.to_date;
+    this.toDate = this.to_date;
 
     this.FromDatequery = this.from_date.toISOString().substring(0, 10);
     this.ToDatequery = this.to_date.toISOString().substring(0, 10);
@@ -254,10 +295,10 @@ this.duplicateArray=this.array
     // Calculate the date of Sunday of the previous week
     this.to_date = new Date(this.from_date);
     this.to_date.setDate(this.from_date.getDate() + 6);
-    this.myDateValue=this.from_date;
+    this.myDateValue = this.from_date;
     console.log(this.to_date);
     console.log(this.myDateValue);
-    this.toDate=this.to_date;
+    this.toDate = this.to_date;
 
 
     this.FromDatequery = this.from_date.toISOString().substring(0, 10);
@@ -267,22 +308,22 @@ this.duplicateArray=this.array
   calculateThisMonth(): void {
     // Calculate the current date
     const currentDate = new Date();
-  
+
     // Calculate the date of the first day of the current month
     this.from_date = new Date(currentDate.getFullYear(), currentDate.getMonth(), 1);
-  
+
     // Calculate the date of the last day of the current month
     this.to_date = new Date(currentDate.getFullYear(), currentDate.getMonth() + 1, 0);
-  
+
     // Set the 'to_date' to the last day of the current month at the end of the day
     this.to_date.setHours(23, 59, 59, 999);
-  
+
     // Optionally, you can set 'myDateValue' to 'from_date' if needed
     this.myDateValue = this.from_date;
-  
+
     // Optionally, you can set 'toDate' to 'to_date' if needed
     this.toDate = this.to_date;
-  
+
     console.log(this.from_date);
     console.log(this.to_date);
 
@@ -290,34 +331,34 @@ this.duplicateArray=this.array
     this.FromDatequery = this.from_date.toISOString().substring(0, 10);
     this.ToDatequery = this.to_date.toISOString().substring(0, 10);
   }
-  
+
 
   calculateLastMonth(): void {
     // Calculate the current date
     const currentDate = new Date();
-  
+
     // Calculate the date of the first day of the previous month
     this.from_date = new Date(currentDate.getFullYear(), currentDate.getMonth() - 1, 1);
-  
+
     // Calculate the date of the last day of the previous month
     this.to_date = new Date(currentDate.getFullYear(), currentDate.getMonth(), 0);
-  
+
     // Set the 'to_date' to the last day of the previous month at the end of the day
     this.to_date.setHours(23, 59, 59, 999);
-  
+
     // Optionally, you can set 'myDateValue' to 'from_date' if needed
     this.myDateValue = this.from_date;
-  
+
     // Optionally, you can set 'toDate' to 'to_date' if needed
     this.toDate = this.to_date;
-  
+
     console.log(this.from_date);
     console.log(this.to_date);
 
     this.FromDatequery = this.from_date.toISOString().substring(0, 10);
     this.ToDatequery = this.to_date.toISOString().substring(0, 10);
   }
-  
+
   calculateThisYear(): void {
     // Calculate the current date
     const currentDate = new Date();
@@ -328,10 +369,10 @@ this.duplicateArray=this.array
     // Calculate the date of the last day of the current year
     this.to_date = new Date(currentDate.getFullYear(), 11, 31);
 
-    this.myDateValue=this.from_date;
+    this.myDateValue = this.from_date;
     console.log(this.to_date);
     console.log(this.myDateValue);
-    this.toDate=this.to_date;
+    this.toDate = this.to_date;
 
 
     this.FromDatequery = this.from_date.toISOString().substring(0, 10);
@@ -349,92 +390,92 @@ this.duplicateArray=this.array
     // Calculate the date of the last day of the previous year
     this.to_date = new Date(currentDate.getFullYear() - 1, 11, 31);
 
-    this.myDateValue=this.from_date;
+    this.myDateValue = this.from_date;
     console.log(this.to_date);
     console.log(this.myDateValue);
-    this.toDate=this.to_date;
+    this.toDate = this.to_date;
 
     this.FromDatequery = this.from_date.toISOString().substring(0, 10);
     this.ToDatequery = this.to_date.toISOString().substring(0, 10);
     // this.filterDate();
   }
   SelectdateType;
-  select(val:any){
-  console.log(val);
-  this.SelectdateType = val;
-      if(val === 'This Week'){
+  select(val: any) {
+    console.log(val);
+    this.SelectdateType = val;
+    if (val === 'This Week') {
       this.FromDatequery = null;
       this.ToDatequery = null;
       this.calculateThisWeek()
-      }else if(val === 'Last Week'){
-        this.FromDatequery = null;
-        this.ToDatequery = null;
-       this.calculateLastWeek()
-      }else if(val === 'This Month'){
-        this.FromDatequery = null;
-        this.ToDatequery = null;
-          this.calculateThisMonth()
-       }else if(val === 'Last Month'){
-        this.FromDatequery = null;
-        this.ToDatequery = null;
-            this.calculateLastMonth()
+    } else if (val === 'Last Week') {
+      this.FromDatequery = null;
+      this.ToDatequery = null;
+      this.calculateLastWeek()
+    } else if (val === 'This Month') {
+      this.FromDatequery = null;
+      this.ToDatequery = null;
+      this.calculateThisMonth()
+    } else if (val === 'Last Month') {
+      this.FromDatequery = null;
+      this.ToDatequery = null;
+      this.calculateLastMonth()
       //  }else if(val === 'To Specific FromDate To To Date'){
       //         this.openmodel()
-       }
-       else if(val === 'This Year'){
-        this.FromDatequery = null;
-        this.ToDatequery = null;
-        this.calculateThisYear()
-       }else if(val === 'Last Year'){
-        this.FromDatequery = null;
-        this.ToDatequery = null;
-        this.calculateLastYear()
-      }
-      else if(val === 'Today'){
-        this.FromDatequery = null;
-        this.ToDatequery = null;
-        this.myDateValue = this.todayDate;
-        this.toDate = this.todayDate;
+    }
+    else if (val === 'This Year') {
+      this.FromDatequery = null;
+      this.ToDatequery = null;
+      this.calculateThisYear()
+    } else if (val === 'Last Year') {
+      this.FromDatequery = null;
+      this.ToDatequery = null;
+      this.calculateLastYear()
+    }
+    else if (val === 'Today') {
+      this.FromDatequery = null;
+      this.ToDatequery = null;
+      this.myDateValue = this.todayDate;
+      this.toDate = this.todayDate;
 
-        this.FromDatequery = this.myDateValue;
-        this.ToDatequery = this.toDate;
-      }
-      else if(val === '--Select Particular--'){
-        this.FromDatequery = null;
-        this.ToDatequery = null;
-        this.newfrom = null;
-        this.newto = null;
-        this.myDateValue = null;
-        this.toDate = null;
-      }
+      this.FromDatequery = this.myDateValue;
+      this.ToDatequery = this.toDate;
+    }
+    else if (val === '--Select Particular--') {
+      this.FromDatequery = null;
+      this.ToDatequery = null;
+      this.newfrom = null;
+      this.newto = null;
+      this.myDateValue = null;
+      this.toDate = null;
+    }
 
 
   }
-  openmodel(){
-    this.modalselect=true;
-            }
+  openmodel() {
+    this.modalselect = true;
+  }
 
- onExport() {
-  const reportNameWithUnderscore = this.reportName + '_';
-   this.excel.exportAsExcelFile(this.rows, reportNameWithUnderscore,
-  moment().format('YYYYMMDD_HHmmss'))
-  } 
+  onExport() {
+    const reportNameWithUnderscore = this.reportName + '_';
+    this.excel.exportAsExcelFile(this.rows, reportNameWithUnderscore,
+      moment().format('YYYYMMDD_HHmmss'))
+  }
 
   downloadFile(format: string) {
     const date = moment().format('YYYYMMDD_HHmmss')
     const reportNameWithUnderscore = this.reportName + '_' + date;
-    this.reportBuilderService.downloadFile(format, this.filterRows,reportNameWithUnderscore)
+    this.reportBuilderService.downloadFile(format, this.filterRows, reportNameWithUnderscore)
   }
-  back(){
+  back() {
     this.router.navigate(["../../all"], { relativeTo: this.route });
   }
-FormattedAdhocparameters;
-adocdata;
-// showPlusIconRow: number | null = 0;
-    onAddLines(){
-      console.log(this.serverData);
-      const lastRow = this.serverData[this.serverData.length - 1];
-      if (lastRow && lastRow.fields_name !== '') {
+  FormattedAdhocparameters;
+  adocdata;
+  // showPlusIconRow: number | null = 0;
+  onAddLines() {
+    console.log(this.serverData);
+    const lastRow = this.serverData[this.serverData.length - 1];
+    if (lastRow && lastRow.fields_name !== '') {
       let formattedString = '';
       for (const condition of this.serverData) {
         const { andor, fields_name, condition: cond, value } = condition;
@@ -443,13 +484,13 @@ adocdata;
         this.FormattedAdhocparameters = formattedString
         // this.selectcolumn(this.serverData);
       }
-    this.serverData.push({
-      andor: "AND",
-      fields_name: "",
-      condition: "=",
-      value: ""
-    });
-  }
+      this.serverData.push({
+        andor: "AND",
+        fields_name: "",
+        condition: "=",
+        value: ""
+      });
+    }
     // this.showPlusIconRow = this.serverData.length - 1;
 
   }
@@ -461,10 +502,10 @@ adocdata;
     if (this.serverData.length > 1) {
       // Get the item to be deleted
       const deletedItem = this.serverData[index];
-  
+
       // Remove the item from the serverData array
       this.serverData.splice(index, 1);
-  
+
       // Remove the corresponding entries from selectedValues
       if (Array.isArray(deletedItem)) {
         for (const item of deletedItem) {
@@ -488,14 +529,14 @@ adocdata;
         }
       }
     }
-  
+
     console.log(this.selectedValues);
-    this.filterRowsBySelectedValues();  
-  }       
+    this.filterRowsBySelectedValues();
+  }
 
 
-  rows:any[];
-  filterRows:any[];
+  rows: any[];
+  filterRows: any[];
   columns: any[];
   rowdata;
   FromDatequery;
@@ -505,327 +546,409 @@ adocdata;
   newto;
 
   dateKey;
-runtheQuery(){
-  console.log(this.myDateValue , this.toDate);
- let query = this.SQLQuery;
-// let query
- if(this.dynamicForm.value){
-  // for(let i = 0; i < this.dynamicForm.value.length; i++){
-  //   // const query = this.SQLQuery + " AND " + this.dynamicForm.controls[i] + " = " + this.dynamicForm.value[i]
-    
-  // }
+  runtheQuery() {
+    console.log(this.myDateValue, this.toDate);
+    let query = this.SQLQuery;
+    // let query
+    if (this.dynamicForm.value) {
+      // for(let i = 0; i < this.dynamicForm.value.length; i++){
+      //   // const query = this.SQLQuery + " AND " + this.dynamicForm.controls[i] + " = " + this.dynamicForm.value[i]
+
+      // }
 
 
-  // Iterate over the keys in dynamicForm.value
-  Object.keys(this.dynamicForm.value).forEach((key) => {
-    // Append the condition for each key to the query
-    if (this.dynamicForm.value[key] !== null ) {
-      this.selectcolumn(this.dynamicForm.value);
-    // query += ` AND ${key} = '${this.dynamicForm.value[key]}'`;
-    }
-    // const regex = /FROM/i;
-    // const match = query.match(regex);
-    //    if (this.dynamicForm.value[key] !== null && this.dynamicForm.value[key] !== '') {
-    // // query += ` AND ${key} = '${this.dynamicForm.value[key]}'`;
-    // const columnName = key.split('.').pop();
-    // let coalesceExpression = `, COALESCE(${key}, '${this.dynamicForm.value[key]}') as  ${columnName}`;
-    // if (match) {
-    //   // Insert the COALESCE expression before the FROM keyword
-    //   query = query.slice(0, match.index) + coalesceExpression +' '+ query.slice(match.index);
-    // }
-    // }
-  });
-  // if(this.FromDatequery && this.ToDatequery){
-  //   query += ` AND cretaedat BETWEEN '${this.FromDatequery}' AND '${this.ToDatequery}'`;
+      // Iterate over the keys in dynamicForm.value
+      Object.keys(this.dynamicForm.value).forEach((key) => {
+        // Append the condition for each key to the query
+        if (this.dynamicForm.value[key] !== null) {
+          this.selectcolumn(this.dynamicForm.value);
+          // query += ` AND ${key} = '${this.dynamicForm.value[key]}'`;
+        }
+        // const regex = /FROM/i;
+        // const match = query.match(regex);
+        //    if (this.dynamicForm.value[key] !== null && this.dynamicForm.value[key] !== '') {
+        // // query += ` AND ${key} = '${this.dynamicForm.value[key]}'`;
+        // const columnName = key.split('.').pop();
+        // let coalesceExpression = `, COALESCE(${key}, '${this.dynamicForm.value[key]}') as  ${columnName}`;
+        // if (match) {
+        //   // Insert the COALESCE expression before the FROM keyword
+        //   query = query.slice(0, match.index) + coalesceExpression +' '+ query.slice(match.index);
+        // }
+        // }
+      });
+      // if(this.FromDatequery && this.ToDatequery){
+      //   query += ` AND cretaedat BETWEEN '${this.FromDatequery}' AND '${this.ToDatequery}'`;
 
-  // }else
-  if(this.DateParam == true){
-    this.dateKey = 'createdat';
-    this.adhocList.forEach(key => {
-      if (key.includes("created_at")) {
-        this.dateKey ="created_at" ;
+      // }else
+      if (this.DateParam == true) {
+        this.dateKey = 'createdat';
+        this.adhocList.forEach(key => {
+          if (key.includes("created_at")) {
+            this.dateKey = "created_at";
+          }
+        });
+        this.adhocList.forEach(key => {
+          if (key.includes("createdAt")) {
+            this.dateKey = "createdAt";
+          }
+        });
+        if (this.myDateValue && this.toDate) {
+          if (this.myDateValue) {
+            this.newfrom = new Date(this.myDateValue);
+            // const year = inputDate.getFullYear();
+            // const month = String(inputDate.getMonth() + 1).padStart(2, "0"); // Months are zero-based, so add 1
+            // const day = String(inputDate.getDate()).padStart(2, "0");
+            // this.newfrom = `${year}-${month}-${day}`;
+          }
+          if (this.toDate) {
+            this.newto = new Date(this.toDate);
+            // const year = inputDate.getFullYear();
+            // const month = String(inputDate.getMonth() + 1).padStart(2, "0"); // Months are zero-based, so add 1
+            // const day = String(inputDate.getDate()).padStart(2, "0");
+            // this.newto = `${year}-${month}-${day}`;
+
+          }
+          query += ` AND ${this.dateKey} BETWEEN '${this.newfrom}' AND '${this.newto}'`;
+
+        }
       }
-  });
-  this.adhocList.forEach(key => {
-    if (key.includes("createdAt")) {
-      this.dateKey ="createdAt" ;
+      // if(this.myDateValue && this.toDate){
+      //   query += ` AND from_date = NVL(${this.myDateValue}from_date, 'from_date') AND to_date = NVL(${this.toDate}to_date, 'to_date')`;
+      // }
+      console.log(query);
     }
-});
-   if(this.myDateValue && this.toDate){
-    if(this.myDateValue){
-      this.newfrom = new Date(this.myDateValue);
-    // const year = inputDate.getFullYear();
-    // const month = String(inputDate.getMonth() + 1).padStart(2, "0"); // Months are zero-based, so add 1
-    // const day = String(inputDate.getDate()).padStart(2, "0");
-    // this.newfrom = `${year}-${month}-${day}`;
-    }
-    if(this.toDate){
-      this.newto = new Date(this.toDate);
-      // const year = inputDate.getFullYear();
-      // const month = String(inputDate.getMonth() + 1).padStart(2, "0"); // Months are zero-based, so add 1
-      // const day = String(inputDate.getDate()).padStart(2, "0");
-      // this.newto = `${year}-${month}-${day}`;
-      
-    }
-  query += ` AND ${this.dateKey} BETWEEN '${this.newfrom}' AND '${this.newto}'`;
+    //  if(this.FormattedAdhocparameters){
+    //   query += this.FormattedAdhocparameters
+    //  }
 
-}
+    this.selectcolumn(this.serverData);
+    //  query = `SELECT a.name AS name, b.dob AS dob FROM abc a, abcde b WHERE a.name = 'gaurav' AND a.abc = NVL(b.abc, 'name') AND a.abcde = NVL(b.abcde, 'test');`
+    console.log(query);
+    this.reportBuilderService.getMasterData(query).subscribe((data) => {
+      // this.rows = data;
+
+      console.log(this.rows);
+      this.rowdata = [this.rows];
+      console.log(typeof this.rows);
+      if (data) {
+        this.toastr.success("Run Successfully")
+      }
+      var j;
+      var cart = [];
+
+      for (var i = 0; i < data.length; i++) {
+        var columnsIn = data[i];
+        if (i == 1) {
+          for (var key in columnsIn) {
+            j = { prop: key, name: key };
+            cart.push(j)
+
+          }
+        }
+      }
+      this.columns = cart;
+
+    });
   }
-  // if(this.myDateValue && this.toDate){
-  //   query += ` AND from_date = NVL(${this.myDateValue}from_date, 'from_date') AND to_date = NVL(${this.toDate}to_date, 'to_date')`;
-  // }
-  console.log(query);
- }
-//  if(this.FormattedAdhocparameters){
-//   query += this.FormattedAdhocparameters
-//  }
+  getHeaders() {
+    let headers: string[] = [];
+    if (this.rows) {
+      this.rows.forEach((value) => {
+        Object.keys(value).forEach((key) => {
+          if (!headers.find((header) => header == key)) {
+            headers.push(key)
+          }
 
-      this.selectcolumn(this.serverData);
-//  query = `SELECT a.name AS name, b.dob AS dob FROM abc a, abcde b WHERE a.name = 'gaurav' AND a.abc = NVL(b.abc, 'name') AND a.abcde = NVL(b.abcde, 'test');`
- console.log(query);
-  this.reportBuilderService.getMasterData(query).subscribe((data) => {
-    // this.rows = data;
-   
-    console.log(this.rows);
-this.rowdata= [this.rows];
-    console.log(typeof this.rows);
-    if(data){
-      this.toastr.success("Run Successfully")
-    }
-     var j;
-     var cart = [];
+        })
 
-   for(var i = 0; i < data.length; i++)
-   {
-     var columnsIn = data[i];
-     if(i==1)
-     {
-         for(var key in columnsIn)
-        {
-         j={prop:key , name: key};
-         cart.push(j)
-
-        }
-     }
-   }
-   this.columns = cart;
-
-});
-}
-getHeaders() {
-let headers: string[] = [];
-if(this.rows) {
-  this.rows.forEach((value) => {
-    Object.keys(value).forEach((key) => {
-      if(!headers.find((header) => header == key)){
-        headers.push(key)
-      }
-
-    })
-
-  })
-}
-return headers;
-}
-
-getFilterHeaders() {
-  let headers: string[] = [];
-  if(this.filterRows) {
-    this.filterRows.forEach((value) => {
-      Object.keys(value).forEach((key) => {
-        if(!headers.find((header) => header == key)){
-          headers.push(key)
-        }
       })
-    })
-  }
-  return headers;
-  }
-
-
-
-selectedValues: { [key: string]: any[] } = {};
-selectcolumn(data: any) {
-  if (Array.isArray(data)) {
-    for (const item of data) {
-      const columnName = item.fields_name;
-      const value = item.value;
-
-      // Check if fields_name is not empty and value is not null or empty string
-      if (columnName.trim() !== '') {
-        if (!this.selectedValues[columnName]) {
-          this.selectedValues[columnName] = [];
-        }
-
-        if (value !== null && value.trim() !== '') {
-          // Only add the value if it's not null and not an empty string
-          if (!this.selectedValues[columnName].includes(value)) {
-            this.selectedValues[columnName].push(value);
-          }
-        } else {
-          // Remove the property if the value is null or empty string
-          delete this.selectedValues[columnName];
-        }
-      }
-    }
-  } else if (typeof data === 'object') {
-    // Handle the first JSON structure (object)
-    console.log(data);
-    for (const key in data) {
-      if (data.hasOwnProperty(key)) {
-        const columnName = key;
-        const value = data[key];
-
-        if (!this.selectedValues[columnName]) {
-          this.selectedValues[columnName] = [];
-        }
-
-        if (value !== null && value.trim() !== '') {
-          // Only add the value if it's not null and not an empty string
-          if (!this.selectedValues[columnName].includes(value)) {
-            this.selectedValues[columnName].push(value);
-          }
-        } else {
-          // Remove the property if the value is null or empty string
-          delete this.selectedValues[columnName];
-        }
-      }
     }
+    return headers;
   }
 
-  console.log(this.selectedValues);
-  this.filterRowsBySelectedValues();
-}
+  getFilterHeaders() {
+    let headers: string[] = [];
+    if (this.filterRows) {
+      this.filterRows.forEach((value) => {
+        Object.keys(value).forEach((key) => {
+          if (!headers.find((header) => header == key)) {
+            headers.push(key)
+          }
+        })
+      })
+    }
+    return headers;
+  }
 
 
 
+  selectedValues: { [key: string]: any[] } = {};
+  selectcolumn(data: any) {
+    if (Array.isArray(data)) {
+      for (const item of data) {
+        const columnName = item.fields_name;
+        const value = item.value;
 
-filtered = false;
-filterRowsBySelectedValues() {
-  // Create a filteredRows array to store the filtered data
-  const filteredRows = [];
-
-  // Iterate through each row in the rows array
-  for (const row of this.rows) {
-    let isMatch = true;
-
-    // Iterate through each column in the selectedValues object
-    for (const columnName in this.selectedValues) {
-      if (this.selectedValues.hasOwnProperty(columnName) && row.hasOwnProperty(columnName)) {
-        // Get the selected values for the current column
-        const selectedValuesForColumn = this.selectedValues[columnName];
-
-        // Get the type of the row's value for the current column
-        const rowValue = row[columnName];
-        const rowValueType = typeof rowValue;
-
-        if (rowValueType === 'boolean') {
-          // Handle boolean values
-          if (selectedValuesForColumn.length === 0) {
-            // If no specific value selected for boolean, include the row
-            continue;
+        // Check if fields_name is not empty and value is not null or empty string
+        if (columnName.trim() !== '') {
+          if (!this.selectedValues[columnName]) {
+            this.selectedValues[columnName] = [];
           }
 
-          const selectedBooleanValue = selectedValuesForColumn[0] === 'true'; // Convert to boolean
-          if (selectedBooleanValue !== rowValue) {
-            isMatch = false;
-            break; // No need to check other columns if it's not a match
-          }
-        } else {
-          // Handle other data types, including numbers and strings
-          // Convert selected values to the appropriate type
-          const convertedValues = selectedValuesForColumn.map((value) => {
-            if (rowValueType === 'number') {
-              return parseFloat(value); // Convert to number
-            } else {
-              return value; // Keep the original value (string, etc.)
+          if (value !== null && value.trim() !== '') {
+            // Only add the value if it's not null and not an empty string
+            if (!this.selectedValues[columnName].includes(value)) {
+              this.selectedValues[columnName].push(value);
             }
-          });
+          } else {
+            // Remove the property if the value is null or empty string
+            delete this.selectedValues[columnName];
+          }
+        }
+      }
+    } else if (typeof data === 'object') {
+      // Handle the first JSON structure (object)
+      console.log(data);
+      for (const key in data) {
+        if (data.hasOwnProperty(key)) {
+          const columnName = key;
+          const value = data[key];
 
-          // Check if the row's value for the current column matches any selected value
-          if (!convertedValues.includes(rowValue)) {
-            isMatch = false;
-            break; // No need to check other columns if it's not a match
+          if (!this.selectedValues[columnName]) {
+            this.selectedValues[columnName] = [];
+          }
+
+          if (value !== null && value.trim() !== '') {
+            // Only add the value if it's not null and not an empty string
+            if (!this.selectedValues[columnName].includes(value)) {
+              this.selectedValues[columnName].push(value);
+            }
+          } else {
+            // Remove the property if the value is null or empty string
+            delete this.selectedValues[columnName];
           }
         }
       }
     }
-      if(this.FromDatequery !== null && this.ToDatequery !== null){
+
+    console.log(this.selectedValues);
+    this.filterRowsBySelectedValues();
+  }
+
+
+
+
+  filtered = false;
+  filterRowsBySelectedValues() {
+    // Check if rows is defined and iterable
+    if (!this.rows || !Array.isArray(this.rows)) {
+      console.warn('Rows is not defined or not an array');
+      this.filterRows = [];
+      this.filtered = false;
+      return;
+    }
+
+    // Create a filteredRows array to store the filtered data
+    const filteredRows = [];
+
+    // Iterate through each row in the rows array
+    for (const row of this.rows) {
+      let isMatch = true;
+
+      // Iterate through each column in the selectedValues object
+      for (const columnName in this.selectedValues) {
+        if (this.selectedValues.hasOwnProperty(columnName) && row.hasOwnProperty(columnName)) {
+          // Get the selected values for the current column
+          const selectedValuesForColumn = this.selectedValues[columnName];
+
+          // Get the type of the row's value for the current column
+          const rowValue = row[columnName];
+          const rowValueType = typeof rowValue;
+
+          if (rowValueType === 'boolean') {
+            // Handle boolean values
+            if (selectedValuesForColumn.length === 0) {
+              // If no specific value selected for boolean, include the row
+              continue;
+            }
+
+            const selectedBooleanValue = selectedValuesForColumn[0] === 'true'; // Convert to boolean
+            if (selectedBooleanValue !== rowValue) {
+              isMatch = false;
+              break; // No need to check other columns if it's not a match
+            }
+          } else {
+            // Handle other data types, including numbers and strings
+            // Convert selected values to the appropriate type
+            const convertedValues = selectedValuesForColumn.map((value) => {
+              if (rowValueType === 'number') {
+                return parseFloat(value); // Convert to number
+              } else {
+                return value; // Keep the original value (string, etc.)
+              }
+            });
+
+            // Check if the row's value for the current column matches any selected value
+            if (!convertedValues.includes(rowValue)) {
+              isMatch = false;
+              break; // No need to check other columns if it's not a match
+            }
+          }
+        }
+      }
+      if (this.FromDatequery !== null && this.ToDatequery !== null) {
         this.newfrom = this.FromDatequery
         this.newto = this.ToDatequery
+      }
+
+      if (this.newfrom !== null && this.newto !== null) {
+        // Extract the year, month, and day from newfrom and newto
+        const from = new Date(this.newfrom);
+        const to = new Date(this.newto);
+        const newfromYear = from.getFullYear();
+        const newfromMonth = from.getMonth();
+        const newfromDay = from.getDate();
+        const newtoYear = to.getFullYear();
+        const newtoMonth = to.getMonth();
+        const newtoDay = to.getDate();
+
+        // Extract the year, month, and day from createdAtDate
+        const dateKey = this.dateKey;
+        const createdAtDate = new Date(row[dateKey]);
+        const createdAtYear = createdAtDate.getFullYear();
+        const createdAtMonth = createdAtDate.getMonth();
+        const createdAtDay = createdAtDate.getDate();
+
+        // Create new Date objects using the extracted year, month, and day
+        const newfromDate = new Date(newfromYear, newfromMonth, newfromDay);
+        const newtoDate = new Date(newtoYear, newtoMonth, newtoDay);
+        const createdAtDateOnly = new Date(createdAtYear, createdAtMonth, createdAtDay);
+
+        // Check if the createdAtDateOnly is within the specified date range
+        if (createdAtDateOnly < newfromDate || createdAtDateOnly > newtoDate) {
+          isMatch = false;
+        }
+      }
+
+
+      // If the row matches all selected values, add it to the filteredRows array
+      if (isMatch) {
+        filteredRows.push(row);
+      }
+    }
+
+    // Assign the filtered data to the rows
+    console.log(filteredRows);
+    this.filterRows = filteredRows;
+
+    // Check if all arrays in selectedValues are empty
+    const allArraysEmpty = Object.values(this.selectedValues).every(arr => arr.length === 0);
+
+    // Check if the date range is not selected
+    const dateRangeNotSelected = !this.newfrom || !this.newto;
+
+    // Set this.filtered based on allArraysEmpty and dateRangeNotSelected
+    this.filtered = !allArraysEmpty || !dateRangeNotSelected;
   }
 
-    if (this.newfrom !== null && this.newto !== null) {
-      // Extract the year, month, and day from newfrom and newto
-      const from = new Date(this.newfrom);
-      const to = new Date(this.newto);
-      const newfromYear = from.getFullYear();
-      const newfromMonth = from.getMonth();
-      const newfromDay = from.getDate();
-      const newtoYear = to.getFullYear();
-      const newtoMonth = to.getMonth();
-      const newtoDay = to.getDate();
+
+
+  formatDate(dateObj: any): string {
+    // Extract individual date properties
+    const { year, monthValue, dayOfMonth, hour, minute, second } = dateObj;
+
+    // Create a JavaScript Date object using the extracted properties
+    const formattedDate = new Date(year, monthValue - 1, dayOfMonth, hour, minute, second);
+
+    // Format the date as needed (e.g., using built-in JavaScript date formatting)
+    return formattedDate.toLocaleString(); // Or any other desired formatting
+  }
+
+  isDate(value: any): boolean {
+    return (
+      value instanceof Date ||
+      (value &&
+        value.year !== undefined &&
+        value.monthValue !== undefined &&
+        value.dayOfMonth !== undefined)
+    );
+  }
+
+  /**
+   * Simple XML parser to convert XML to JSON array
+   * Handles the specific format: <User><id>101</id><name>John Doe</name><email>john.doe@example.com</email></User>
+   * @param xmlString The XML string to parse
+   * @returns Array of objects representing the XML data
+   */
+  private parseXMLToJSON(xmlString: string): any[] {
+    // Remove any XML declaration
+    xmlString = xmlString.replace(/<\?xml[^>]*\?>/g, '');
     
-      // Extract the year, month, and day from createdAtDate
-      const dateKey = this.dateKey;
-      const createdAtDate = new Date(row[dateKey]);
-      const createdAtYear = createdAtDate.getFullYear();
-      const createdAtMonth = createdAtDate.getMonth();
-      const createdAtDay = createdAtDate.getDate();
+    // Extract the root element name (e.g., "User" from <User>...</User>)
+    const rootMatch = xmlString.match(/<(\w+)(?:\s[^>]*)?>/);
+    if (!rootMatch) {
+      console.warn('Could not identify root element in XML');
+      return [];
+    }
     
-      // Create new Date objects using the extracted year, month, and day
-      const newfromDate = new Date(newfromYear, newfromMonth, newfromDay);
-      const newtoDate = new Date(newtoYear, newtoMonth, newtoDay);
-      const createdAtDateOnly = new Date(createdAtYear, createdAtMonth, createdAtDay);
+    const rootElement = rootMatch[1];
+    const results: any[] = [];
     
-      // Check if the createdAtDateOnly is within the specified date range
-      if (createdAtDateOnly < newfromDate || createdAtDateOnly > newtoDate) {
-        isMatch = false;
+    // Create a regex to match all instances of the root element
+    const regex = new RegExp(`<${rootElement}(?:\\s[^>]*)?>([\\s\\S]*?)<\\/${rootElement}>`, 'g');
+    let match;
+    
+    while ((match = regex.exec(xmlString)) !== null) {
+      const elementContent = match[1];
+      const item: any = {};
+      
+      // Extract all tags and their values
+      const tagRegex = /<(\w+)>(.*?)<\/\1>/g;
+      let tagMatch;
+      
+      while ((tagMatch = tagRegex.exec(elementContent)) !== null) {
+        const tagName = tagMatch[1];
+        const tagValue = tagMatch[2];
+        // Try to convert to appropriate type
+        item[tagName] = this.convertValueType(tagValue);
+      }
+      
+      results.push(item);
+    }
+    
+    return results;
+  }
+  
+  /**
+   * Convert string values to appropriate types (number, boolean, etc.)
+   * @param value The string value to convert
+   * @returns The value converted to the appropriate type
+   */
+  private convertValueType(value: string): any {
+    // Check for empty value
+    if (value === '') {
+      return value;
+    }
+    
+    // Check for boolean values
+    if (value.toLowerCase() === 'true') {
+      return true;
+    }
+    if (value.toLowerCase() === 'false') {
+      return false;
+    }
+    
+    // Check for numeric values
+    if (!isNaN(Number(value)) && !isNaN(parseFloat(value))) {
+      // Check if it's an integer or float
+      if (Number.isInteger(parseFloat(value))) {
+        return parseInt(value, 10);
+      } else {
+        return parseFloat(value);
       }
     }
     
-
-    // If the row matches all selected values, add it to the filteredRows array
-    if (isMatch) {
-      filteredRows.push(row);
-    }
+    // Return as string if no other type matches
+    return value;
   }
-
-  // Assign the filtered data to the rows
-  console.log(filteredRows);
-  this.filterRows = filteredRows;
-
-  // Check if all arrays in selectedValues are empty
-  const allArraysEmpty = Object.values(this.selectedValues).every(arr => arr.length === 0);
-
-  // Check if the date range is not selected
-  const dateRangeNotSelected = !this.newfrom || !this.newto;
-
-  // Set this.filtered based on allArraysEmpty and dateRangeNotSelected
-  this.filtered = !allArraysEmpty || !dateRangeNotSelected;
-}
-
-
-
-formatDate(dateObj: any): string {
-  // Extract individual date properties
-  const { year, monthValue, dayOfMonth, hour, minute, second } = dateObj;
-
-  // Create a JavaScript Date object using the extracted properties
-  const formattedDate = new Date(year, monthValue - 1, dayOfMonth, hour, minute, second);
-
-  // Format the date as needed (e.g., using built-in JavaScript date formatting)
-  return formattedDate.toLocaleString(); // Or any other desired formatting
-}
-
-isDate(value: any): boolean {
-  return (
-    value instanceof Date ||
-    (value &&
-      value.year !== undefined &&
-      value.monthValue !== undefined &&
-      value.dayOfMonth !== undefined)
-  );
-}
-
-}
+}
\ No newline at end of file