@@ -122,27 +130,27 @@
English
- ðºð¸
+ 🇺🇸
- हिनà¥à¤¦à¥
- ð®ð³
+ हिन्दी
+ 🇮🇳
- தமிழà¯
- ð®ð³
+ தமிழ்
+ 🇮🇳
- ਪੰà¨à¨¾à¨¬à©
- ð®ð³
+ ਪੰਜਾਬੀ
+ 🇮🇳
- മലയാളà´
- ð®ð³
+ മലയാളം
+ 🇮🇳
diff --git a/frontend/angular-clarity-master/src/app/modules/main/main.module.ts.tmp b/frontend/angular-clarity-master/src/app/modules/main/main.module.ts.tmp
new file mode 100644
index 0000000..820ad8c
--- /dev/null
+++ b/frontend/angular-clarity-master/src/app/modules/main/main.module.ts.tmp
@@ -0,0 +1,252 @@
+import { Ad10Component } from './BuilderComponents/angulardatatype/Ad10/Ad10.component';
+
+import { DefatestComponent } from './BuilderComponents/defu/Defatest/Defatest.component';
+
+import { ChildformComponent } from './BuilderComponents/stpkg/Childform/Childform.component';
+import { DistrictComponent } from './BuilderComponents/testdata/District/District.component';
+import { StateComponent } from './BuilderComponents/testdata/State/State.component';
+import { CountryComponent } from './BuilderComponents/testdata/Country/Country.component';
+import { Ad9Component } from './BuilderComponents/angulardatatype/Ad9/Ad9.component';
+import { Ad8Component } from './BuilderComponents/angulardatatype/Ad8/Ad8.component';
+import { Ad7Component } from './BuilderComponents/angulardatatype/Ad7/Ad7.component';
+import { Ad6Component } from './BuilderComponents/angulardatatype/Ad6/Ad6.component';
+import { Adv5Component } from './BuilderComponents/angulardatatype/Adv5/Adv5.component';
+import { Adv4Component } from './BuilderComponents/angulardatatype/Adv4/Adv4.component';
+import { SupportComponent } from './BuilderComponents/angulardatatype/Support/Support.component';
+import { Adv3Component } from './BuilderComponents/angulardatatype/Adv3/Adv3.component';
+import { Dv2Component } from './BuilderComponents/angulardatatype/Dv2/Dv2.component';
+import { Adv1Component } from './BuilderComponents/angulardatatype/Adv1/Adv1.component';
+import { Basicp3Component } from './BuilderComponents/angulardatatype/Basicp3/Basicp3.component';
+import { Basicp2Component } from './BuilderComponents/angulardatatype/Basicp2/Basicp2.component';
+import { Basicp1Component } from './BuilderComponents/angulardatatype/Basicp1/Basicp1.component';
+
+
+
+import { CommonModule } from '@angular/common';
+import { CUSTOM_ELEMENTS_SCHEMA, NgModule } from '@angular/core';
+import { FormsModule, ReactiveFormsModule } from '@angular/forms';
+import { ClarityModule } from '@clr/angular';
+
+import { MainPageComponent } from '../main/fnd/main-page/main-page.component';
+import { MainRoutingModule } from './main-routing.module';
+import { PageNotFoundComponent } from './page-not-found/page-not-found.component';
+// import { AboutComponent } from '../main/admin/about/about.component';
+// import { LayoutComponent } from './layout/layout.component';
+import { HelperModule } from 'src/app/pipes/helpers.module';
+import { PasswordResetComponent } from '../main/admin/password-reset/password-reset.component';
+import { UserComponent } from '../main/admin/user/user.component';
+
+
+import { AllMenuGroupComponent } from '../main/admin/menu-group/all/all-menu-group.component';
+import { EditMenuGroupComponent } from '../main/admin/menu-group/edit/edit-menu-group.component';
+import { MenuGroupComponent } from '../main/admin/menu-group/menu-group.component';
+import { ReadOnlyMenuGroupComponent } from '../main/admin/menu-group/read-only/readonly-menu-group.component';
+import { AddMenurComponent } from '../main/admin/menu-register/add-menur/add-menur.component';
+import { AllMenurComponent } from '../main/admin/menu-register/all-menur/all-menur.component';
+import { EditMenurComponent } from '../main/admin/menu-register/edit-menur/edit-menur.component';
+import { MenuRegisterComponent } from '../main/admin/menu-register/menu-register.component';
+import { ReadonlyMenurComponent } from '../main/admin/menu-register/readonly-menur/readonly-menur.component';
+import { ProfileSettingComponent } from '../main/admin/profile-setting/profile-setting.component';
+import { UsermaintanceaddComponent } from '../main/admin/usermaintanceadd/usermaintanceadd.component';
+import { UsermaintanceeditComponent } from '../main/admin/usermaintanceedit/usermaintanceedit.component';
+
+import { DragDropModule } from '@angular/cdk/drag-drop';
+import { HttpClientModule } from '@angular/common/http';
+import { CodemirrorModule } from "@ctrl/ngx-codemirror";
+import { NgxChartsModule } from '@swimlane/ngx-charts';
+import { GridsterModule } from 'angular-gridster2';
+import { DynamicModule } from 'ng-dynamic-component';
+import { NgChartsModule } from 'ng2-charts';
+import { CKEditorModule } from 'ng2-ckeditor';
+
+import { UserRegistrationComponent } from '../main/admin/user-registration/user-registration.component';
+
+import { QRCodeModule } from 'angularx-qrcode';
+import { TagInputModule } from 'ngx-chips';
+import { CookieService } from 'ngx-cookie-service';
+import { ImageCropperModule } from 'ngx-image-cropper';
+import { ModulesComponent } from './admin/modules/modules.component';
+import { SessionloggerComponent } from './admin/sessionlogger/sessionlogger.component';
+import { SubmenuComponent } from './admin/submenu/submenu.component';
+
+import { WireframeService } from 'src/app/services/builder/wireframe.service';
+import { ReportBuildComponent } from './builder/report-build/report-build.component';
+import { ReportbuildeditComponent } from './builder/report-build/reportbuildedit/reportbuildedit.component';
+import { ReportbuildqueryComponent } from './builder/report-build/reportbuildquery/reportbuildquery.component';
+import { ReportBuild2Component } from './builder/report-build2/report-build2.component';
+import { ReportBuild2editComponent } from './builder/report-build2/report-build2edit/report-build2edit.component';
+import { ReportRunnerComponent } from './builder/report-runner/report-runner.component';
+import { ReportrunnereditComponent } from './builder/report-runner/reportrunneredit/reportrunneredit.component';
+import { Reportrunneredit2Component } from './builder/report-runner/reportrunneredit2/reportrunneredit2.component';
+
+
+import { DashboardnewComponent } from './builder/dashboardnew/dashboardnew.component';
+import { EditformnewdashComponent } from './builder/dashboardnew/editformnewdash/editformnewdash.component';
+import { EditnewdashComponent } from './builder/dashboardnew/editnewdash/editnewdash.component';
+import { BarChartComponent } from './builder/dashboardnew/gadgets/bar-chart/bar-chart.component';
+import { BubbleChartComponent } from './builder/dashboardnew/gadgets/bubble-chart/bubble-chart.component';
+import { DoughnutChartComponent } from './builder/dashboardnew/gadgets/doughnut-chart/doughnut-chart.component';
+import { DynamicChartComponent } from './builder/dashboardnew/gadgets/dynamic-chart/dynamic-chart.component';
+import { FinancialChartComponent } from './builder/dashboardnew/gadgets/financial-chart/financial-chart.component';
+import { GridViewComponent } from './builder/dashboardnew/gadgets/grid-view/grid-view.component';
+import { LineChartComponent } from './builder/dashboardnew/gadgets/line-chart/line-chart.component';
+import { PieChartComponent } from './builder/dashboardnew/gadgets/pie-chart/pie-chart.component';
+import { PolarChartComponent } from './builder/dashboardnew/gadgets/polar-chart/polar-chart.component';
+import { RadarChartComponent } from './builder/dashboardnew/gadgets/radar-chart/radar-chart.component';
+import { ScatterChartComponent } from './builder/dashboardnew/gadgets/scatter-chart/scatter-chart.component';
+import { ToDoChartComponent } from './builder/dashboardnew/gadgets/to-do-chart/to-do-chart.component';
+import { ScheduleComponent } from './builder/dashboardnew/schedule/schedule.component';
+import { CommonFilterComponent } from './builder/dashboardnew/common-filter/common-filter.component';
+import { ChartWrapperComponent } from './builder/dashboardnew/common-filter/chart-wrapper.component';
+import { AddextensionComponent } from './fnd/extension/addextension/addextension.component';
+import { AllextensionComponent } from './fnd/extension/allextension/allextension.component';
+import { EditextensionComponent } from './fnd/extension/editextension/editextension.component';
+import { ExtensionComponent } from './fnd/extension/extension.component';
+
+import { BarRunnerComponent } from './builder/dashboardrunner/dashrunnerline/bar-runner/bar-runner.component';
+import { BubbleRunnerComponent } from './builder/dashboardrunner/dashrunnerline/bubble-runner/bubble-runner.component';
+import { DashrunnerlineComponent } from './builder/dashboardrunner/dashrunnerline/dashrunnerline.component';
+import { DoughnutRunnerComponent } from './builder/dashboardrunner/dashrunnerline/doughnut-runner/doughnut-runner.component';
+import { GridRunnerComponent } from './builder/dashboardrunner/dashrunnerline/grid-runner/grid-runner.component';
+import { LineRunnerComponent } from './builder/dashboardrunner/dashrunnerline/line-runner/line-runner.component';
+import { PieRunnerComponent } from './builder/dashboardrunner/dashrunnerline/pie-runner/pie-runner.component';
+import { PolarRunnerComponent } from './builder/dashboardrunner/dashrunnerline/polar-runner/polar-runner.component';
+import { RadarRunnerComponent } from './builder/dashboardrunner/dashrunnerline/radar-runner/radar-runner.component';
+import { ScatterRunnerComponent } from './builder/dashboardrunner/dashrunnerline/scatter-runner/scatter-runner.component';
+import { TodoRunnerComponent } from './builder/dashboardrunner/dashrunnerline/todo-runner/todo-runner.component';
+
+import { ApiregisteryComponent } from './fnd/apiregistery/apiregistery.component';
+
+import { BulkimportComponent } from './datamanagement/bulkimport/bulkimport.component';
+import { BulkimportaddComponent } from './datamanagement/bulkimport/bulkimportadd/bulkimportadd.component';
+import { BulkimportallComponent } from './datamanagement/bulkimport/bulkimportall/bulkimportall.component';
+import { BulkimporteditComponent } from './datamanagement/bulkimport/bulkimportedit/bulkimportedit.component';
+import { BulkimporteditlineComponent } from './datamanagement/bulkimport/bulkimporteditline/bulkimporteditline.component';
+import { BulkimportlineComponent } from './datamanagement/bulkimport/bulkimportline/bulkimportline.component';
+import { DatamanagementComponent } from './datamanagement/datamanagement/datamanagement.component';
+import { DatamananementworkflowComponent } from './datamanagement/datamananementworkflow/datamananementworkflow.component';
+import { MappingruleComponent } from './datamanagement/mappingrule/mappingrule.component';
+import { MappingruleaddComponent } from './datamanagement/mappingrule/mappingruleadd/mappingruleadd.component';
+import { MappingruleallComponent } from './datamanagement/mappingrule/mappingruleall/mappingruleall.component';
+import { MappingruleeditComponent } from './datamanagement/mappingrule/mappingruleedit/mappingruleedit.component';
+import { Stepper_workflowComponent } from './BuilderComponents/stepperworkflow/Stepper_workflow/Stepper_workflow.component';
+import { AllapiregisteryComponent } from './fnd/apiregistery/allapiregistery/allapiregistery.component';
+import { AddapiregisteryComponent } from './fnd/apiregistery/addapiregistery/addapiregistery.component';
+import { EditapiregisteryComponent } from './fnd/apiregistery/editapiregistery/editapiregistery.component';
+import { ApiregisterylineComponent } from './fnd/apiregistery/Apiregisteryline/Apiregisteryline.component';
+import { Customer_informationComponent } from './BuilderComponents/angulardatatype/Customer_information/Customer_information.component';
+import { Deployment_typeComponent } from './BuilderComponents/angulardatatype/Deployment_type/Deployment_type.component';
+import { ManufacturerComponent } from './BuilderComponents/angulardatatype/Manufacturer/Manufacturer.component';
+import { Order_summaryComponent } from './BuilderComponents/angulardatatype/Order_summary/Order_summary.component';
+import { ProductComponent } from './BuilderComponents/angulardatatype/Product/Product.component';
+import { TypesComponent } from './BuilderComponents/angulardatatype/Types/Types.component';
+import { Test2Component } from './BuilderComponents/testdata/Test2/Test2.component';
+import { Token_registeryComponent } from './fnd/Token_registery/Token_registery.component';
+import { MyworkspaceComponent } from './admin/myworkspace/myworkspace.component';
+import { ThemeCustomizationComponent } from './theme-customization/theme-customization.component';
+// import { QueryComponent } from './superadmin/query/query.component';
+// import { QueryaddComponent } from './superadmin/queryadd/queryadd.component';
+// import { QueryeditComponent } from './superadmin/queryedit/queryedit.component';
+
+import { FieldTypesModule } from '../../shared/components/field-types/field-types.module';
+import { SharedModule } from '../../shared/shared.module';
+import { Data_lakeComponent } from './builder/dashboardnew/Data_lake/Data_lake.component';
+import { CronJobBuilderComponent } from './builder/dashboardnew/Data_lake/cron-job-builder/cron-job-builder.component';
+import { SureconnectComponent } from './builder/dashboardnew/sureconnect/sureconnect.component';
+import { EditsureconnectComponent } from './builder/dashboardnew/sureconnect/editsureconnect/editsureconnect.component';
+import { OauthComponent } from './builder/dashboardnew/sureconnect/oauth/oauth.component';
+
+// Import Shield Dashboard Module
+import { ShieldDashboardModule } from './builder/dashboardnew/gadgets/shield-dashboard/shield-dashboard.module';
+
+@NgModule({
+ declarations: [
+ MainPageComponent, PageNotFoundComponent, UserComponent, PasswordResetComponent,
+ MyworkspaceComponent,
+ ReportRunnerComponent, ReportrunnereditComponent, Reportrunneredit2Component, MenuGroupComponent, AllMenuGroupComponent, EditMenuGroupComponent, ReadOnlyMenuGroupComponent, UserRegistrationComponent,
+ MenuRegisterComponent, AddMenurComponent, EditMenurComponent, AllMenurComponent, ReadonlyMenurComponent, ProfileSettingComponent,
+ UsermaintanceaddComponent, UsermaintanceeditComponent,
+ SubmenuComponent, ModulesComponent, SessionloggerComponent,
+ DashboardnewComponent, EditformnewdashComponent, EditnewdashComponent, ScheduleComponent,
+ CommonFilterComponent, ChartWrapperComponent, DoughnutChartComponent, LineChartComponent, RadarChartComponent, BarChartComponent, BubbleChartComponent, DynamicChartComponent, ScatterChartComponent, PolarChartComponent, PieChartComponent, FinancialChartComponent, ToDoChartComponent, GridViewComponent,
+ DashrunnerlineComponent, BarRunnerComponent, LineRunnerComponent, DoughnutRunnerComponent, GridRunnerComponent, PieRunnerComponent, PolarRunnerComponent, RadarRunnerComponent, ScatterRunnerComponent, TodoRunnerComponent, BubbleRunnerComponent,
+ ReportBuildComponent, ReportbuildeditComponent, ReportbuildqueryComponent, ReportBuild2Component, ReportBuild2editComponent,
+ // QueryComponent, QueryaddComponent, QueryeditComponent,
+ ExtensionComponent,
+ AllextensionComponent,
+ AddextensionComponent, EditextensionComponent, ApiregisteryComponent, AllapiregisteryComponent, AddapiregisteryComponent, EditapiregisteryComponent,
+
+ ApiregisterylineComponent,
+ DatamanagementComponent, DatamananementworkflowComponent, BulkimportComponent, BulkimportallComponent, BulkimportaddComponent, BulkimporteditComponent, BulkimportlineComponent, BulkimporteditlineComponent, MappingruleComponent, MappingruleallComponent,
+ MappingruleaddComponent,
+ MappingruleeditComponent, Stepper_workflowComponent, Customer_informationComponent,
+ Data_lakeComponent,
+ SureconnectComponent,
+ EditsureconnectComponent,
+ OauthComponent,
+ CronJobBuilderComponent,
+ // FileUploadListComponent,
+
+
+ // buildercomponents
+
+
+ ThemeCustomizationComponent,
+ Ad10Component,
+ Token_registeryComponent,
+ DefatestComponent,
+ Test2Component,
+ Order_summaryComponent,
+ TypesComponent,
+ ProductComponent,
+ ManufacturerComponent,
+ Deployment_typeComponent,
+ ChildformComponent,
+ DistrictComponent,
+ StateComponent,
+ CountryComponent,
+ Ad9Component,
+ Ad8Component,
+ Ad7Component,
+ Ad6Component,
+ Adv5Component,
+ Adv4Component,
+ SupportComponent,
+ Adv3Component,
+ Dv2Component,
+ Adv1Component,
+ Basicp3Component,
+ Basicp2Component,
+ Basicp1Component,
+ ],
+ imports: [
+ QRCodeModule,
+ CommonModule,
+ FormsModule,
+ ReactiveFormsModule,
+ ClarityModule,
+ HelperModule,
+ MainRoutingModule,
+ DragDropModule,
+ HttpClientModule,
+ ImageCropperModule,
+ TagInputModule,
+ CodemirrorModule,
+ CKEditorModule,
+ GridsterModule,
+ NgChartsModule,
+ NgxChartsModule,
+ DynamicModule,
+ FieldTypesModule,
+ SharedModule,
+ ShieldDashboardModule,
+ ],
+ providers: [
+ CookieService,
+ WireframeService,
+
+
+ ],
+ schemas: [CUSTOM_ELEMENTS_SCHEMA]
+})
+export class MainModule { }
\ No newline at end of file
diff --git a/frontend/angular-clarity-master/src/app/services/builder/dashboard3.service.ts b/frontend/angular-clarity-master/src/app/services/builder/dashboard3.service.ts
index 2f1057e..3013c04 100644
--- a/frontend/angular-clarity-master/src/app/services/builder/dashboard3.service.ts
+++ b/frontend/angular-clarity-master/src/app/services/builder/dashboard3.service.ts
@@ -281,7 +281,7 @@ export class Dashboard3Service {
return this.apiRequest.get(`Dashboard/Dashboard`);
}
- public getChartData(tableName: string, jobType: string, xAxis?: any, yAxes?: any, sureId?: number, parameter?: string, parameterValue?: string): Observable
{
+ public getChartData(tableName: string, jobType: string, xAxis?: any, yAxes?: any, sureId?: number, parameter?: string, parameterValue?: string, filters?: string): Observable {
let url = `${baseUrl}/chart/getdashjson/${jobType}?tableName=${tableName}&xAxis=${xAxis}&yAxes=${yAxes}`;
if (sureId) {
url += `&sureId=${sureId}`;
@@ -292,8 +292,27 @@ export class Dashboard3Service {
if (parameterValue) {
url += `¶meterValue=${encodeURIComponent(parameterValue)}`;
}
+
+ console.log('=== DASHBOARD SERVICE DEBUG INFO ===');
+ console.log('Base URL:', url);
+ console.log('Filters parameter:', filters);
+ // Parse filters JSON and add as a single "filters" parameter
+ if (filters) {
+ try {
+ const filterObj = JSON.parse(filters);
+ console.log('Parsed filter object:', filterObj);
+
+ // Add all filters as a single "filters" parameter with JSON object
+ url += `&filters=${encodeURIComponent(JSON.stringify(filterObj))}`;
+ console.log('Added filters parameter:', JSON.stringify(filterObj));
+ } catch (e) {
+ console.warn('Failed to parse filter parameters:', e);
+ }
+ }
+ console.log('Final constructed URL:', url);
+ console.log('=== END DASHBOARD SERVICE DEBUG ===');
return this._http.get(url);
}
diff --git a/frontend/angular-clarity-master/src/app/services/fnd/alerts.service.ts b/frontend/angular-clarity-master/src/app/services/fnd/alerts.service.ts
index c2d1510..83f3c14 100644
--- a/frontend/angular-clarity-master/src/app/services/fnd/alerts.service.ts
+++ b/frontend/angular-clarity-master/src/app/services/fnd/alerts.service.ts
@@ -69,4 +69,13 @@ export class AlertsService {
}
return this.apiRequest.get(apiUrl);
}
+
+ // Get values for a specific key from API
+ public getValuesFromUrl(url: string, sureId: number | undefined, key: string): Observable {
+ let apiUrl = `chart/getValue?apiUrl=${url}&key=${key}`;
+ if (sureId) {
+ apiUrl += `&sureId=${sureId}`;
+ }
+ return this.apiRequest.get(apiUrl);
+ }
}
\ No newline at end of file
diff --git a/frontend/angular-clarity-master/src/app/services/scheduler.service.ts b/frontend/angular-clarity-master/src/app/services/scheduler.service.ts
new file mode 100644
index 0000000..85e5e44
--- /dev/null
+++ b/frontend/angular-clarity-master/src/app/services/scheduler.service.ts
@@ -0,0 +1,46 @@
+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 SchedulerService {
+ private baseURL = "scheduler";
+
+ constructor(
+ private http: HttpClient,
+ private apiRequest: ApiRequestService,
+ ) { }
+
+ // Get job by lake ID
+ getJobByLakeId(lakeId: number): Observable {
+ const _http = `${this.baseURL}/lake/${lakeId}`;
+ return this.apiRequest.get(_http);
+ }
+
+ // Create a new job
+ createJob(jobData: any): Observable {
+ const _http = `${this.baseURL}/create`;
+ return this.apiRequest.post(_http, jobData);
+ }
+
+ // Pause a job
+ pauseJob(jobId: number): Observable {
+ const _http = `${this.baseURL}/pause/${jobId}`;
+ return this.apiRequest.post(_http, {});
+ }
+
+ // Resume a job
+ resumeJob(jobId: number): Observable {
+ const _http = `${this.baseURL}/resume/${jobId}`;
+ return this.apiRequest.post(_http, {});
+ }
+
+ // Stop a job
+ stopJob(jobId: number): Observable {
+ 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/assets/i18n/en.json b/frontend/angular-clarity-master/src/assets/i18n/en.json
index ba3c90f..21e94ba 100644
--- a/frontend/angular-clarity-master/src/assets/i18n/en.json
+++ b/frontend/angular-clarity-master/src/assets/i18n/en.json
@@ -372,5 +372,9 @@
"select_Field2": "select_Field2",
"Password_Field": "Password_Field",
"age": "age",
- "Button_Field": "Button_Field"
+ "Button_Field": "Button_Field",
+ "API_REGISTERY": "API Registry",
+ "API_REGISTERY_DESCRIPTION": "API Registry Description",
+ "TOKEN_REGISTERY": "Token Registry",
+ "TOKEN_REGISTERY_DESCRIPTION": "Token Registry Description"
}
\ No newline at end of file
diff --git a/frontend/angular-clarity-master/src/assets/i18n/hi.json b/frontend/angular-clarity-master/src/assets/i18n/hi.json
index 8f6d890..eecc5d3 100644
--- a/frontend/angular-clarity-master/src/assets/i18n/hi.json
+++ b/frontend/angular-clarity-master/src/assets/i18n/hi.json
@@ -105,6 +105,8 @@
"REPORT_DESCRIPTION": "रिपोर्ट विवरण",
"API_REGISTERY": "एपीआई रजिस्ट्री",
"API_REGISTERY_DESCRIPTION": "एपीआई रजिस्ट्री विवरण",
+ "TOKEN_REGISTERY": "टोकन रजिस्ट्री",
+ "TOKEN_REGISTERY_DESCRIPTION": "टोकन रजिस्ट्री विवरण",
"ACTIVE": "सक्रिय",
"FOLDER_NAME": "फ़ोल्डर नाम",
"ACTION": "क्रिया",