From 01a0a2f959301e52e7175748bbdecac29976960b Mon Sep 17 00:00:00 2001 From: Gaurav Kumar Date: Fri, 13 Jun 2025 23:47:02 +0530 Subject: [PATCH] stepp --- .../Stepper_workflow.component.html | 2 +- .../Stepper_workflow.component.ts | 502 +++++++++--------- .../test1/test1.component.css.map | 1 - .../test1/test1.component.html | 157 ------ .../test1/test1.component.scss | 46 -- .../test1/test1.component.spec.ts | 25 - .../stepperworkflow/test1/test1.component.ts | 387 -------------- .../stepperworkflow/test1/test1.service.ts | 83 --- .../menumaintance/menumaintance.component.ts | 221 ++++---- .../main/admin/submenu/submenu.component.ts | 162 +++--- .../app/modules/main/main-routing.module.ts | 19 +- .../src/app/modules/main/main.module.ts | 42 +- .../src/assets/i18n/en.json | 138 ++--- 13 files changed, 589 insertions(+), 1196 deletions(-) delete mode 100644 frontend/angular-clarity-master/src/app/modules/main/BuilderComponents/stepperworkflow/test1/test1.component.css.map delete mode 100644 frontend/angular-clarity-master/src/app/modules/main/BuilderComponents/stepperworkflow/test1/test1.component.html delete mode 100644 frontend/angular-clarity-master/src/app/modules/main/BuilderComponents/stepperworkflow/test1/test1.component.scss delete mode 100644 frontend/angular-clarity-master/src/app/modules/main/BuilderComponents/stepperworkflow/test1/test1.component.spec.ts delete mode 100644 frontend/angular-clarity-master/src/app/modules/main/BuilderComponents/stepperworkflow/test1/test1.component.ts delete mode 100644 frontend/angular-clarity-master/src/app/modules/main/BuilderComponents/stepperworkflow/test1/test1.service.ts diff --git a/frontend/angular-clarity-master/src/app/modules/main/BuilderComponents/stepperworkflow/Stepper_workflow/Stepper_workflow.component.html b/frontend/angular-clarity-master/src/app/modules/main/BuilderComponents/stepperworkflow/Stepper_workflow/Stepper_workflow.component.html index 5318bd5..483d3de 100644 --- a/frontend/angular-clarity-master/src/app/modules/main/BuilderComponents/stepperworkflow/Stepper_workflow/Stepper_workflow.component.html +++ b/frontend/angular-clarity-master/src/app/modules/main/BuilderComponents/stepperworkflow/Stepper_workflow/Stepper_workflow.component.html @@ -44,7 +44,7 @@ - + {{user. name }} diff --git a/frontend/angular-clarity-master/src/app/modules/main/BuilderComponents/stepperworkflow/Stepper_workflow/Stepper_workflow.component.ts b/frontend/angular-clarity-master/src/app/modules/main/BuilderComponents/stepperworkflow/Stepper_workflow/Stepper_workflow.component.ts index 0edb0c9..8052672 100644 --- a/frontend/angular-clarity-master/src/app/modules/main/BuilderComponents/stepperworkflow/Stepper_workflow/Stepper_workflow.component.ts +++ b/frontend/angular-clarity-master/src/app/modules/main/BuilderComponents/stepperworkflow/Stepper_workflow/Stepper_workflow.component.ts @@ -1,243 +1,259 @@ -import { Component, OnInit } from '@angular/core'; -import { ToastrService } from 'ngx-toastr'; -import { AlertService } from 'src/app/services/alert.service'; -import { Stepper_workflowservice } from './Stepper_workflow.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'; -import { Stepper_workflowcardvariable } from './Stepper_workflow_cardvariable'; -import { UserInfoService } from 'src/app/services/user-info.service'; -import { ActivatedRoute, Router } from '@angular/router'; - -declare var JsBarcode: any; -@Component({ - selector: 'app-Stepper_workflow', - templateUrl: './Stepper_workflow.component.html', - styleUrls: ['./Stepper_workflow.component.scss'] -}) -export class Stepper_workflowComponent implements OnInit { - cardButton = Stepper_workflowcardvariable.cardButton; - cardmodeldata = Stepper_workflowcardvariable.cardmodeldata; - public dashboardArray: DashboardContentModel2[]; - isCardview = Stepper_workflowcardvariable.cardButton; - cardmodal; changeView() { - this.isCardview = !this.isCardview; - } - beforeText(fieldtext: string): string { // Extract the text before the first '<' - const index = fieldtext.indexOf('<'); - return index !== -1 ? fieldtext.substring(0, index) : fieldtext; - } - afterText(fieldtext: string): string { // Extract the text after the last '>' - const index = fieldtext.lastIndexOf('>'); - return index !== -1 ? fieldtext.substring(index + 1) : ''; - } - transform(fieldtext: string): string { - const match = fieldtext.match(/<([^>]*)>/); - return match ? match[1] : ''; // Extract the text between '<' and '>' - } - userrole; - rowSelected: any = {}; - modaldelete = false; - modalEdit = false; - modalAdd = false; - public entryForm: FormGroup; - loading = false; - product; - modalOpenedforNewLine = false; - newLine: any; - additionalFieldsFromBackend: any[] = []; - formcode = 'Stepper_workflow_formCode' - tableName = 'Stepper_workflow'; checkFormCode; selected: any[] = []; constructor( - private extensionService: ExtensionService, - private userInfoService: UserInfoService, - private mainService: Stepper_workflowservice, - private alertService: AlertService, - private toastr: ToastrService, - private _fb: FormBuilder, - private router: Router, - private route: ActivatedRoute, - ) { } - // component button - ngOnInit(): void { - if (this.cardmodeldata !== '') { - this.cardmodal = JSON.parse(this.cardmodeldata); - this.dashboardArray = this.cardmodal.dashboard.slice(); - console.log(this.dashboardArray) - } - this.userrole = this.userInfoService.getRoles(); - this.getData(); - this.entryForm = this._fb.group({ - name: [null], - - description: [null], - - active: [false], - - - - - - - - - }); // component_button200 - // form code start - this.extensionService.getJsonObjectsByFormCodeList(this.formcode).subscribe(data => { - console.log(data); - const jsonArray = data.map((str) => JSON.parse(str)); - this.additionalFieldsFromBackend = jsonArray; - this.checkFormCode = this.additionalFieldsFromBackend.some(field => field.formCode === "Stepper_workflow_formCode"); - console.log(this.checkFormCode); - console.log(this.additionalFieldsFromBackend); - if (this.additionalFieldsFromBackend && this.additionalFieldsFromBackend.length > 0) { - this.additionalFieldsFromBackend.forEach(field => { - if (field.formCode === this.formcode) { - if (!this.entryForm.contains(field.extValue)) { - // Add the control only if it doesn't exist in the form - this.entryForm.addControl(field.extValue, this._fb.control(field.fieldValue)); - } - } - }); - } - }); - console.log(this.entryForm.value); - // form code end - - - } - - - error; - getData() { - this.mainService.getAll().subscribe((data) => { - console.log(data); - this.product = data; - if (this.product.length == 0) { - this.error = "No Data Available" - } - }, (error) => { - console.log(error); - if (error) { - this.error = "Server Error"; - } - }); - } - onEdit(row) { - this.rowSelected = row; - - this.modalEdit = true; - } - onDelete(row) { - this.rowSelected = row; - this.modaldelete = true; - } - delete(id) { - this.modaldelete = false; - console.log("in delete " + id); - this.mainService.delete(id).subscribe( - (data) => { - console.log(data); - this.ngOnInit(); - if (data) { this.toastr.success('Deleted successfully'); } - }); - } - onUpdate(id) { - this.modalEdit = false; - - - //console.log("in update"); - console.log("id " + id); - console.log(this.rowSelected); - //console.log("out update"); - this.mainService.update(id, this.rowSelected).subscribe( - (data) => { - console.log(data); - if (data || data.status >= 200 && data.status <= 299) { - this.toastr.success("Update Successfully"); - } - setTimeout(() => { - this.ngOnInit(); - }, 500); - - }, (error) => { - console.log(error); - if (error.status >= 200 && error.status <= 299) { - // this.toastr.success("update Succesfully"); - } - if (error.status >= 400 && error.status <= 499) { - this.toastr.error("Not Updated"); - } - if (error.status >= 500 && error.status <= 599) { - this.toastr.error("Not Updated"); - } - }); - setTimeout(() => { - this.ngOnInit(); - }, 500); - } - onCreate() { - this.modalAdd = false; - - this.mainService.create(this.entryForm.value).subscribe( - (data) => { - console.log(data); - if (data || data.status >= 200 && data.status <= 299) { - this.toastr.success("Added Successfully"); - } - setTimeout(() => { - this.ngOnInit(); - }, 500); - - }, (error) => { - console.log(error); - if (error.status >= 200 && error.status <= 299) { - // this.toastr.success("Added Succesfully"); - } - if (error.status >= 400 && error.status <= 499) { - this.toastr.error("Not Added"); - } - if (error.status >= 500 && error.status <= 599) { - this.toastr.error("Not Added"); - } - }); - setTimeout(() => { - this.ngOnInit(); - }, 500); - } - goToAdd(row) { - this.modalAdd = true; this.submitted = false; - - } - submitted = false; - onSubmit() { - console.log(this.entryForm.value); - this.submitted = true; - if (this.entryForm.invalid) { - return; - } this.onCreate(); - - } - - - rsModaldescription = false; - goToReplaceStringdescription(row) { - this.rowSelected = row; this.rsModaldescription = true; - } - - - gotoStepper(id) { - - console.log('id is ', id) - // this.router.navigate(["/cns-portal/SiteBuilder"]); - - this.router.navigate(["../Test1/", id], { relativeTo: this.route }); - - } - - // updateaction -} - - - - - + + + + + + + + + + + + + + + + + + + + + + + +import { Component, OnInit } from '@angular/core'; +import { ToastrService } from 'ngx-toastr'; +import { AlertService } from 'src/app/services/alert.service'; +import { Stepper_workflowservice } from './Stepper_workflow.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'; +import { Stepper_workflowcardvariable } from './Stepper_workflow_cardvariable'; +import { UserInfoService } from 'src/app/services/user-info.service'; +import { ActivatedRoute, Router } from '@angular/router'; + +declare var JsBarcode: any; +@Component({ + selector: 'app-Stepper_workflow', + templateUrl: './Stepper_workflow.component.html', + styleUrls: ['./Stepper_workflow.component.scss'] +}) +export class Stepper_workflowComponent implements OnInit { + cardButton = Stepper_workflowcardvariable.cardButton; + cardmodeldata = Stepper_workflowcardvariable.cardmodeldata; + public dashboardArray: DashboardContentModel2[]; + isCardview = Stepper_workflowcardvariable.cardButton; + cardmodal; changeView() { + this.isCardview = !this.isCardview; + } + beforeText(fieldtext: string): string { // Extract the text before the first '<' + const index = fieldtext.indexOf('<'); + return index !== -1 ? fieldtext.substring(0, index) : fieldtext; + } + afterText(fieldtext: string): string { // Extract the text after the last '>' + const index = fieldtext.lastIndexOf('>'); + return index !== -1 ? fieldtext.substring(index + 1) : ''; + } + transform(fieldtext: string): string { + const match = fieldtext.match(/<([^>]*)>/); + return match ? match[1] : ''; // Extract the text between '<' and '>' + } + userrole; + rowSelected: any = {}; + modaldelete = false; + modalEdit = false; + modalAdd = false; + public entryForm: FormGroup; + loading = false; + product; + modalOpenedforNewLine = false; + newLine: any; + additionalFieldsFromBackend: any[] = []; + formcode = 'Stepper_workflow_formCode' + tableName = 'Stepper_workflow'; checkFormCode; selected: any[] = []; constructor( + private extensionService: ExtensionService, + private userInfoService: UserInfoService, + private mainService: Stepper_workflowservice, + private alertService: AlertService, + private toastr: ToastrService, + private _fb: FormBuilder, + private router: Router, + private route: ActivatedRoute, + ) { } + // component button + ngOnInit(): void { + if (this.cardmodeldata !== '') { + this.cardmodal = JSON.parse(this.cardmodeldata); + this.dashboardArray = this.cardmodal.dashboard.slice(); + console.log(this.dashboardArray) + } + this.userrole = this.userInfoService.getRoles(); + this.getData(); + this.entryForm = this._fb.group({ + name: [null], + + description: [null], + + active: [true], + + + + }); // component_button200 + // form code start + this.extensionService.getJsonObjectsByFormCodeList(this.formcode).subscribe(data => { + console.log(data); + const jsonArray = data.map((str) => JSON.parse(str)); + this.additionalFieldsFromBackend = jsonArray; + this.checkFormCode = this.additionalFieldsFromBackend.some(field => field.formCode === "Stepper_workflow_formCode"); + console.log(this.checkFormCode); + console.log(this.additionalFieldsFromBackend); + if (this.additionalFieldsFromBackend && this.additionalFieldsFromBackend.length > 0) { + this.additionalFieldsFromBackend.forEach(field => { + if (field.formCode === this.formcode) { + if (!this.entryForm.contains(field.extValue)) { + // Add the control only if it doesn't exist in the form + this.entryForm.addControl(field.extValue, this._fb.control(field.fieldValue)); + } + } + }); + } + }); + console.log(this.entryForm.value); + // form code end + + + } + + + error; + getData() { + this.mainService.getAll().subscribe((data) => { + console.log(data); + this.product = data; + if (this.product.length == 0) { + this.error = "No Data Available" + } + }, (error) => { + console.log(error); + if (error) { + this.error = "Server Error"; + } + }); + } + onEdit(row) { + this.rowSelected = row; + + this.modalEdit = true; + } + onDelete(row) { + this.rowSelected = row; + this.modaldelete = true; + } + delete(id) { + this.modaldelete = false; + console.log("in delete " + id); + this.mainService.delete(id).subscribe( + (data) => { + console.log(data); + this.ngOnInit(); + if (data) { this.toastr.success('Deleted successfully'); } + }); + } + onUpdate(id) { + this.modalEdit = false; + + + //console.log("in update"); + console.log("id " + id); + console.log(this.rowSelected); + //console.log("out update"); + this.mainService.update(id, this.rowSelected).subscribe( + (data) => { + console.log(data); + if (data || data.status >= 200 && data.status <= 299) { + this.toastr.success("Update Successfully"); + } + setTimeout(() => { + this.ngOnInit(); + }, 500); + + }, (error) => { + console.log(error); + if (error.status >= 200 && error.status <= 299) { + // this.toastr.success("update Succesfully"); + } + if (error.status >= 400 && error.status <= 499) { + this.toastr.error("Not Updated"); + } + if (error.status >= 500 && error.status <= 599) { + this.toastr.error("Not Updated"); + } + }); + setTimeout(() => { + this.ngOnInit(); + }, 500); + } + onCreate() { + this.modalAdd = false; + + this.mainService.create(this.entryForm.value).subscribe( + (data) => { + console.log(data); + if (data || data.status >= 200 && data.status <= 299) { + this.toastr.success("Added Successfully"); + } + setTimeout(() => { + this.ngOnInit(); + }, 500); + + }, (error) => { + console.log(error); + if (error.status >= 200 && error.status <= 299) { + // this.toastr.success("Added Succesfully"); + } + if (error.status >= 400 && error.status <= 499) { + this.toastr.error("Not Added"); + } + if (error.status >= 500 && error.status <= 599) { + this.toastr.error("Not Added"); + } + }); + setTimeout(() => { + this.ngOnInit(); + }, 500); + } + goToAdd(row) { + this.modalAdd = true; + this.submitted = false; + + } + submitted = false; + onSubmit() { + console.log(this.entryForm.value); + this.submitted = true; + if (this.entryForm.invalid) { + return; + } this.onCreate(); + + } + + + rsModaldescription = false; + goToReplaceStringdescription(row) { + this.rowSelected = row; this.rsModaldescription = true; + } + + + gotoStepper(id) { + + console.log('id is ', id) + + // stepper route + + + + + } + + // updateaction +} \ No newline at end of file diff --git a/frontend/angular-clarity-master/src/app/modules/main/BuilderComponents/stepperworkflow/test1/test1.component.css.map b/frontend/angular-clarity-master/src/app/modules/main/BuilderComponents/stepperworkflow/test1/test1.component.css.map deleted file mode 100644 index 810a211..0000000 --- a/frontend/angular-clarity-master/src/app/modules/main/BuilderComponents/stepperworkflow/test1/test1.component.css.map +++ /dev/null @@ -1 +0,0 @@ -{"version":3,"sources":["test1.component.scss","test1.component.css"],"names":[],"mappings":"AAAA;EACE,UAAA;EACA,YAAA;ACCF;;ADCA;EACE,UAAA;EACA,aAAA;ACEF;;ADAA;EACE,UAAA;EACA,aAAA;ACGF;;ADDA;EACE,UAAA;EACA,aAAA;ACIF;;ADDA;EACE,WAAA;EACA,aAAA;ACIF;;ADDA;EACE,WAAA;EACA,kBAAA;EACA,aAAA;EACA,qBAAA;EACA,sBAAA;EACA,kBAAA;EACA,sBAAA;ACIF;;ADFA;EACE,UAAA;ACKF;;ADHA;EACE,kBAAA;ACMF;;ADHA;EACE,WAAA;ACMF;;ADJA;EACA;IACA,WAAA;ECOE;AACF","file":"test1.component.css"} \ No newline at end of file diff --git a/frontend/angular-clarity-master/src/app/modules/main/BuilderComponents/stepperworkflow/test1/test1.component.html b/frontend/angular-clarity-master/src/app/modules/main/BuilderComponents/stepperworkflow/test1/test1.component.html deleted file mode 100644 index e28cf67..0000000 --- a/frontend/angular-clarity-master/src/app/modules/main/BuilderComponents/stepperworkflow/test1/test1.component.html +++ /dev/null @@ -1,157 +0,0 @@ - - -
- - - - - - - -
- -
-
-
-
-

Customer Information

-
- -
- - - - - step 0 - Application Update - Datagrid - Create/test1
Information Of - Customer
-
- step 1 - Application Update - Datagrid - Create/test2
Information Of - Customer
- -
- Step 2 - Review And
Confirmation
- - Finish . - -
-
-
-
-
- -
-
-

test1

-

Update {{test1entryForm.name}}

-
- -
- - -
- -
- -
-
- - -
- -
- - -
- -
- - -
- - -
- -
- -
- -
-
- - - - - -
-
-
- -
- -
-
- -
-
-

test2

-

Update {{test2entryForm.name}}

-
- -
- - -
- -
- -
-
- - -
- -
- - -
- - -
- -
- -
- -
-
- - - - - -
-
-
- -
- -
-
-
-
\ No newline at end of file diff --git a/frontend/angular-clarity-master/src/app/modules/main/BuilderComponents/stepperworkflow/test1/test1.component.scss b/frontend/angular-clarity-master/src/app/modules/main/BuilderComponents/stepperworkflow/test1/test1.component.scss deleted file mode 100644 index 35a9e5a..0000000 --- a/frontend/angular-clarity-master/src/app/modules/main/BuilderComponents/stepperworkflow/test1/test1.component.scss +++ /dev/null @@ -1,46 +0,0 @@ -.horizontal{ - width: 25%; - padding: 5px; -} -.horizontal1{ - width: 50%; - padding: 10px; -} -.middle{ - width: 33%; - padding: 10px; -} -.middle1{ - width: 75%; - padding: 10px; -} - -.full{ - width: 100%; - padding: 10px; -} - -input[type=text],[type=date], select { - width: 100%; - padding: 12px 20px; - margin: 8px 0; - display: inline-block; - border: 1px solid #ccc; - border-radius: 4px; - box-sizing: border-box; -} -.required-field{ - color: red; -} -.center { - text-align: center; - -} -.center{ - color: blue; -} -@media (max-width: 600px){ -.horizontal,.middle,.horizontal1,.middle1 { -width: 100%; -}} - diff --git a/frontend/angular-clarity-master/src/app/modules/main/BuilderComponents/stepperworkflow/test1/test1.component.spec.ts b/frontend/angular-clarity-master/src/app/modules/main/BuilderComponents/stepperworkflow/test1/test1.component.spec.ts deleted file mode 100644 index bc24b18..0000000 --- a/frontend/angular-clarity-master/src/app/modules/main/BuilderComponents/stepperworkflow/test1/test1.component.spec.ts +++ /dev/null @@ -1,25 +0,0 @@ -import { ComponentFixture, TestBed } from '@angular/core/testing'; - -import { test1Component } from './test1.component'; - -describe('test1Component', () => { - let component: test1Component; - let fixture: ComponentFixture; - - beforeEach(async () => { - await TestBed.configureTestingModule({ - declarations: [ test1Component ] - }) - .compileComponents(); - }); - - beforeEach(() => { - fixture = TestBed.createComponent(test1Component); - component = fixture.componentInstance; - fixture.detectChanges(); - }); - - it('should create', () => { - expect(component).toBeTruthy(); - }); -}); diff --git a/frontend/angular-clarity-master/src/app/modules/main/BuilderComponents/stepperworkflow/test1/test1.component.ts b/frontend/angular-clarity-master/src/app/modules/main/BuilderComponents/stepperworkflow/test1/test1.component.ts deleted file mode 100644 index 9e9d7db..0000000 --- a/frontend/angular-clarity-master/src/app/modules/main/BuilderComponents/stepperworkflow/test1/test1.component.ts +++ /dev/null @@ -1,387 +0,0 @@ -import { Component, OnInit } from '@angular/core'; - - -import { ToastrService } from 'ngx-toastr'; -import { ActivatedRoute, Router } from '@angular/router'; -import { College } from 'src/app/models/fnd/play'; -import { student } from 'src/app/models/fnd/Studentadd'; -import { FormBuilder, FormGroup, Validators } from '@angular/forms'; -import { ValidationError } from 'src/app/models/fnd/ValidationError'; -import { test1service } from './test1.service'; -import { Observable } from 'rxjs'; -@Component({ - selector: 'app-editstepper', - templateUrl: './test1.component.html', - styleUrls: ['./test1.component.scss'] -}) -export class test1Component implements OnInit { - updated = false; - // college: College; - stringJson: any; - customerId: string = ''; - selectedFile!: File; - fileName = ''; - - id: number; - errorFields: ValidationError[] = []; - appToUpdate: College = null; - trained = false; - - json: string = ""; - luisApp = - { - name: '', - created: 1, - trained: 1, - tested: 1, - updated: 1, - published: 1, - - }; - // Layout direction changing - layout = { - direction: "vertical", - block1: "clr-col-lg-3 clr-col-12 ", - block2: "clr-col-lg-9 clr-col-12 ", - }; - - timelineStyle = { - step0: { state: "current", open: true, failed: false }, - step1: { state: "not-started", open: false, failed: false }, - step2: { state: "not-started", open: false, failed: false }, - - }; - public test1entryForm: FormGroup; - public test2entryForm: FormGroup; - submitted = false; - rowSelected: any = {}; - modalcomplete = false; - - constructor(private mainService: test1service, - - private test1_fb: FormBuilder, - private test2_fb: FormBuilder, - private router: Router, - private route: ActivatedRoute, - private toastr: ToastrService, - ) { } - - ngOnInit(): void { - // this.college = new College(); - this.id = this.route.snapshot.params["id"]; - console.log("update with id = ", this.id); - - this.test1entryForm = this.test1_fb.group({ - name: [null], - - description: [null], - - active: [false], - - }); - - this.test2entryForm = this.test2_fb.group({ - name: [null], - - description: [null], - - }); - const stepId = this.id; // or from route/query/etc - this.getResolvedDataFromStepper(stepId).subscribe(res => { - console.log('response get ', res); - - if (res === null) { - this.showEmptyForm(); - } else { - if (res['Test2']) { - this.prefillTest1Form(res['Test2']); - } - - if (res['Basicp']) { - this.prefillTest2Form(res['Basicp']); - } - - } - }); - - - } - - showEmptyForm(): void { - console.log('No config found. Showing empty form.'); - // You can choose to show one or both based on some logic - this.test1entryForm.reset(); - this.test2entryForm.reset(); - } - - prefillTest1Form(data: any): void { - - console.log(' test1 data ', data) - this.test1entryForm.patchValue({ - id: data.id || '', - name: data.name || '', - description: data.description || '', - active: data.active || false - }); - } - - prefillTest2Form(data: any): void { - console.log(' test2 data ', data) - - this.test2entryForm.patchValue({ - id: data.id || '', - name: data.name || '', - description: data.description || '' - }); - } - - - getResolvedDataFromStepper(id: number): Observable { - console.log('get step config'); - - return new Observable(observer => { - this.mainService.gettabledata(id).subscribe(configList => { - if (!configList || configList.length === 0) { - console.log('empty config'); - observer.next(null); - observer.complete(); - return; - } - - const results: { [key: string]: any } = {}; - let processed = 0; - - configList.forEach(config => { - const { table_name, table_id } = config; - - this.getByTableNameAndId(table_name, table_id).subscribe(data => { - - console.log('data is ', data); - results[table_name] = data; - - processed++; - if (processed === configList.length) { - observer.next(results); // emit combined data - observer.complete(); - } - - }, error => { - console.error(`Error loading data for table ${table_name}`, error); - processed++; - if (processed === configList.length) { - observer.next(results); // continue with what we have - observer.complete(); - } - }); - }); - - }, error => { - console.error("Error loading stepper config", error); - observer.error(error); - }); - }); - } - - - - getByTableNameAndId(tableName: string, id: number): Observable { - - switch (tableName) { - case 'Test2': - return this.mainService.getTest2ById(id); - case 'Basicp': - return this.mainService.getBasicpById(id); - // aur bhi cases agar naye table add ho to - default: - throw new Error(`Unknown table name: ${tableName}`); - } - } - - // Change to Horizontal Layout - changeToHorizonTal() { - this.layout = { - direction: "horizontal", - block1: "clr-col-lg-12 clr-col-12 height container", - block2: "clr-col-lg-12 clr-col-12 container", - } - } - // Change to Vertical Layout - changeToVertical() { - this.layout = { - direction: "vertical", - block1: "clr-col-lg-3 clr-col-12 ", - block2: "clr-col-lg-9 clr-col-12 ", - } - } - - - - ontest1Save() { - console.log('Form Submitted:', this.test1entryForm.value); - this.submitted = true; - if (this.test1entryForm.invalid) { - - console.log('invalid form ..'); - // Log all form errors - Object.keys(this.test1entryForm.controls).forEach(field => { - const control = this.test1entryForm.get(field); - if (control && control.invalid) { - console.log(`Error in field: ${field}`, control.errors); - } - } - ); - return; - } - this.ontest1Create(); - } - - ontest1Create() { - this.mainService.createTest2(this.test1entryForm.value).subscribe( - (data) => { - console.log('adding data ', data); - this.customerId = data.id; - - console.log('id is ', this.customerId); - const tableId = data.id; - const tableName = 'Test2'; - const stepperId = this.id; - - // Save stepper config - this.mainService.saveStepperConfig(stepperId, tableId, tableName).subscribe(() => { - this.toastr.success("Stepper Config Saved"); - }); - - if (data || data.status >= 200 && data.status <= 299) { - this.toastr.success("Added Successfully"); - } - setTimeout(() => { - this.ngOnInit(); - }, 500); - - }, (error) => { - console.log(error); - if (error.status >= 200 && error.status <= 299) { - // this.toastr.success("Added Succesfully"); - } - if (error.status >= 400 && error.status <= 499) { - this.toastr.error("Not Added"); - } - if (error.status >= 500 && error.status <= 599) { - this.toastr.error("Not Added"); - } - }); - this.rowSelected = this.test1entryForm.value; - - setTimeout(() => { - this.ngOnInit(); - }, 500); - } - - - ontest2Save() { - console.log('Form Submitted:', this.test2entryForm.value); - this.submitted = true; - if (this.test2entryForm.invalid) { - - console.log('invalid form ..'); - // Log all form errors - Object.keys(this.test2entryForm.controls).forEach(field => { - const control = this.test2entryForm.get(field); - if (control && control.invalid) { - console.log(`Error in field: ${field}`, control.errors); - } - } - ); - return; - } - this.ontest2Create(); - } - - ontest2Create() { - this.mainService.createBasicp(this.test2entryForm.value).subscribe( - (data) => { - console.log('adding data ', data); - this.customerId = data.id; - - console.log('id is ', this.customerId); - - const tableId = data.id; - const tableName = 'Basicp'; - const stepperId = this.id; - - // Save stepper config - this.mainService.saveStepperConfig(stepperId, tableId, tableName).subscribe(() => { - this.toastr.success("Stepper Config Saved"); - }); - - if (data || data.status >= 200 && data.status <= 299) { - this.toastr.success("Added Successfully"); - } - setTimeout(() => { - this.ngOnInit(); - }, 500); - - }, (error) => { - console.log(error); - if (error.status >= 200 && error.status <= 299) { - // this.toastr.success("Added Succesfully"); - } - if (error.status >= 400 && error.status <= 499) { - this.toastr.error("Not Added"); - } - if (error.status >= 500 && error.status <= 599) { - this.toastr.error("Not Added"); - } - }); - this.rowSelected = this.test2entryForm.value; - - setTimeout(() => { - this.ngOnInit(); - }, 500); - } - - - onnext() { - this.router.navigate(["../../main/workflow"], { relativeTo: this.route }); - } - reset() { - this.json = ""; - this.luisApp = - { - name: '', - trained: 1, - tested: 1, - updated: 1, - published: 1, - created: 1, - - }; - - this.timelineStyle = { - step0: { state: "current", open: true, failed: false }, - step1: { state: "not-started", open: false, failed: false }, - step2: { state: "not-started", open: false, failed: false }, - - }; - } - current() { - console.log(this.timelineStyle) - this.stringJson = JSON.stringify(this.timelineStyle); - console.log("String json object :", this.stringJson); - - // this.mainService.update(this.id, this.college, this.stringJson).subscribe( - // (data) => { - // console.log(data); - // }, - - // ); - } - - - rsModaldescription = false; - goToReplaceStringdescription(row) { - this.rowSelected = row; this.rsModaldescription = true; - } - - // updateaction -} \ No newline at end of file diff --git a/frontend/angular-clarity-master/src/app/modules/main/BuilderComponents/stepperworkflow/test1/test1.service.ts b/frontend/angular-clarity-master/src/app/modules/main/BuilderComponents/stepperworkflow/test1/test1.service.ts deleted file mode 100644 index 3791929..0000000 --- a/frontend/angular-clarity-master/src/app/modules/main/BuilderComponents/stepperworkflow/test1/test1.service.ts +++ /dev/null @@ -1,83 +0,0 @@ -import { Injectable } from '@angular/core'; -import { Observable } from "rxjs"; -import { HttpClient, HttpHeaders, HttpParams, } from "@angular/common/http"; -import { ApiRequestService } from "src/app/services/api/api-request.service"; -import { environment } from 'src/environments/environment'; -@Injectable({ - providedIn: 'root' -}) -export class test1service { - - private StepperURL = "Stepper_table_config/Stepper_table_config"; - - private Test2URL = "Test2/Test2"; - private BasicpURL = "Basicp/Basicp"; - - constructor( - private http: HttpClient, - private apiRequest: ApiRequestService, - ) { } - - gettabledata(id: number): Observable { - const _http = this.StepperURL + "/stepId/" + id; - return this.apiRequest.get(_http); - } - - saveStepperConfig(stepperId: number, tableId: number, tableName: string): Observable { - const params = new HttpParams() - .set('stepperId', stepperId.toString()) - .set('tableId', tableId.toString()) - .set('tableName', tableName); - - return this.apiRequest.post(this.StepperURL, null, params); // null body, params used - } - - - getAllTest2(page?: number, size?: number): Observable { - return this.apiRequest.get(this.Test2URL); - } - getTest2ById(id: number): Observable { - const _http = this.Test2URL + "/" + id; - return this.apiRequest.get(_http); - } - createTest2(data: any): Observable { - return this.apiRequest.post(this.Test2URL, data); - } - updateTest2(id: number, data: any): Observable { - const _http = this.Test2URL + "/" + id; - return this.apiRequest.put(_http, data); - } - deleteTest2(id: number): Observable { - const _http = this.Test2URL + "/" + id; - return this.apiRequest.delete(_http); - } - - - - - - - getAllBasicp(page?: number, size?: number): Observable { - return this.apiRequest.get(this.BasicpURL); - } - getBasicpById(id: number): Observable { - const _http = this.BasicpURL + "/" + id; - return this.apiRequest.get(_http); - } - createBasicp(data: any): Observable { - return this.apiRequest.post(this.BasicpURL, data); - } - updateBasicp(id: number, data: any): Observable { - const _http = this.BasicpURL + "/" + id; - return this.apiRequest.put(_http, data); - } - deleteBasicp(id: number): Observable { - const _http = this.BasicpURL + "/" + id; - return this.apiRequest.delete(_http); - } - - - - - // updateaction -} \ No newline at end of file diff --git a/frontend/angular-clarity-master/src/app/modules/main/admin/menumaintance/menumaintance.component.ts b/frontend/angular-clarity-master/src/app/modules/main/admin/menumaintance/menumaintance.component.ts index 777b5ed..af0657f 100644 --- a/frontend/angular-clarity-master/src/app/modules/main/admin/menumaintance/menumaintance.component.ts +++ b/frontend/angular-clarity-master/src/app/modules/main/admin/menumaintance/menumaintance.component.ts @@ -1,7 +1,7 @@ import { Component, OnInit } from '@angular/core'; import { FormBuilder, FormGroup, Validators } from '@angular/forms'; import { ToastrService } from 'ngx-toastr'; -import {MenumaintanceService} from '../../../../services/admin/menumaintance.service'; +import { MenumaintanceService } from '../../../../services/admin/menumaintance.service'; import { Rn_Main_Menu } from '../../../../models/builder/Rn_Main_Menu'; import { ActivatedRoute, Router } from '@angular/router'; import { MenuGroupService } from 'src/app/services/admin/menu-group.service'; @@ -17,25 +17,25 @@ import { TranslateService } from '@ngx-translate/core'; export class MenumaintanceComponent implements OnInit { loading = false; selected: any[] = []; - rowSelected :any= {}; - modaldelete=false; - modalAdd= false; - modaledit=false; + rowSelected: any = {}; + modaldelete = false; + modalAdd = false; + modaledit = false; givendata; menus: Rn_Main_Menu[]; - mainid=0; + mainid = 0; public entryForm: FormGroup; mcreate; mdelete; medit; showdata; error; - submitted=false; - constructor(private menuservice:MenumaintanceService, - private toastr:ToastrService, + submitted = false; + constructor(private menuservice: MenumaintanceService, + private toastr: ToastrService, private excel: ExcelService, private _fb: FormBuilder, - private route:ActivatedRoute, + private route: ActivatedRoute, private menuGroupService: MenuGroupService, private csvService: CsvService, private translate: TranslateService, @@ -44,12 +44,12 @@ export class MenumaintanceComponent implements OnInit { ngOnInit(): void { this.showdata = this.menuGroupService.getdata(); console.log(this.showdata); - this.mcreate=this.showdata.mcreate; - console.log(this.mcreate); - this.mdelete=this.showdata.mdelete - console.log(this.mdelete); - this.medit=this.showdata.medit - console.log(this.medit); + this.mcreate = this.showdata.mcreate; + console.log(this.mcreate); + this.mdelete = this.showdata.mdelete + console.log(this.mdelete); + this.medit = this.showdata.medit + console.log(this.medit); // this.menuservice.getAll().subscribe((data) => { // console.log(data); @@ -57,124 +57,127 @@ export class MenumaintanceComponent implements OnInit { // }); this.entryForm = this._fb.group({ - // menuItemId:[null], - menuId:[null], - menuItemDesc:['',[Validators.required]] , - itemSeq:['',[Validators.required, Validators.pattern(/^-?(0|[1-9]\d*)?$/)]] , - moduleName:['',[Validators.required]] , - status:['',[Validators.required]] , - main_menu_action_name:['',[Validators.required]], - main_menu_icon_name:['',[Validators.required]] - }); - this.getdata(); + // menuItemId:[null], + menuId: [null], + menuItemDesc: ['', [Validators.required]], + itemSeq: ['', [Validators.required, Validators.pattern(/^-?(0|[1-9]\d*)?$/)]], + moduleName: ['', [Validators.required]], + status: ['', [Validators.required]], + main_menu_action_name: ['', [Validators.required]], + main_menu_icon_name: ['', [Validators.required]] + }); + this.getdata(); } - + switchLanguage(language: string) { this.translate.use(language); } - getdata(){ + getdata() { this.menuservice.getByCurrentUserMenuGroupId1().subscribe(resp => { this.menus = resp; console.log('menus: ', this.menus); - if(this.menus.length==0){ - this.error="No data Available"; + if (this.menus.length == 0) { + this.error = "No data Available"; console.log(this.error) } - },(error) => { - console.log(error); - if(error){ - this.error="Server Error"; - } - }) + }, (error) => { + console.log(error); + if (error) { + this.error = "Server Error"; + } + }) } - onSubmit(){ - this.submitted=true; + onSubmit() { + this.submitted = true; if (this.entryForm.invalid) { return; } -this.menuservice.create1(this.entryForm.value).subscribe((data)=>{ - console.log(data); - if (data) { - this.toastr.success('Added successfully'); + this.menuservice.create1(this.entryForm.value).subscribe((data) => { + console.log(data); + if (data) { + this.toastr.success('Added successfully'); + } + this.ngOnInit(); + }, + (error) => { + console.log('Error in adding data...', error); + if (error) { + this.toastr.error('Not added Data Getting Some Error'); } - this.ngOnInit(); -}, -(error) => { -console.log('Error in adding data...',+error); -if(error){ - this.toastr.error('Not added Data Getting Some Error'); -} -this.getdata(); -}); -this.modalAdd=false; + this.getdata(); + }); + this.modalAdd = false; } goToAdd() { - this.modalAdd=true; - } - submenu(id:any){ - this.router.navigate(["../submenu/" +id], { relativeTo: this.route }) - } - data:{}; - shrink(id:any,row){ - this.rowSelected = row; - console.log(this.rowSelected); -if(this.rowSelected.subMenus!=0){ - this.rowSelected.subMenus=[] -}console.log(this.rowSelected); -this.menuservice.sink(id,this.rowSelected).subscribe((data)=>{ - console.log(data); -}) - } - goToEdit(row) { - this.rowSelected = row; - console.log(row) - this.modaledit=true; - //this.router.navigate(["../edit/" + id], { relativeTo: this.route }); - } - onDelete(row) { - this.rowSelected = row; - this.modaldelete=true; - } + this.modalAdd = true; + } + submenu(id: any) { + this.router.navigate(["../submenu/" + id], { relativeTo: this.route }) + } + data: {}; + shrink(id: any, row) { + this.rowSelected = row; + console.log(this.rowSelected); + if (this.rowSelected.subMenus != 0) { + this.rowSelected.subMenus = [] + } console.log(this.rowSelected); + this.menuservice.sink(id, this.rowSelected).subscribe((data) => { + console.log(data); + }) + } + goToEdit(row) { + this.rowSelected = row; + console.log(row) + this.modaledit = true; + //this.router.navigate(["../edit/" + id], { relativeTo: this.route }); + } + onDelete(row) { + this.rowSelected = row; + this.modaldelete = true; + } - delete(id) - { - this.modaldelete = false; - console.log("in delete "+id); - this.menuservice.delete1(id).subscribe((data)=>{ - console.log(data); - this.toastr.success('Deleted successfully'); - this.ngOnInit(); - }, + delete(id) { + this.modaldelete = false; + console.log("in delete " + id); + this.menuservice.delete1(id).subscribe((data) => { + console.log(data); + this.toastr.success('Deleted successfully'); + this.ngOnInit(); + }, (error) => { - console.log('Error in adding data...',+error); - if(error){ + console.log('Error in adding data...', +error); + if (error) { this.toastr.error('Not Deleted Data Getting Some Error'); } }); - } - onUpdate(id){ - this.modaledit=false; -this.menuservice.update1(id,this.rowSelected).subscribe((data)=>{ - console.log(data); - if (data) { - this.toastr.success('Updated successfully'); - } -}, -(error) => { - console.log('Error in adding data...',+error); - if(error){ - this.toastr.error('Not updated Data Getting Some Error'); } -}); - } + onUpdate(id) { + this.modaledit = false; + this.menuservice.update1(id, this.rowSelected).subscribe((data) => { + console.log(data); + if (data) { + this.toastr.success('Updated successfully'); + } + this.ngOnInit(); - onExport() { - this.excel.exportAsExcelFile(this.givendata, 'menumaintanance_', - moment().format('YYYYMMDD_HHmmss')) - } + }, + (error) => { + console.log('Error in adding data...', error); + if (error) { + this.toastr.error('Not updated Data Getting Some Error'); + } + this.ngOnInit(); - // csv + }); + } + + onExport() { + this.excel.exportAsExcelFile(this.givendata, 'menumaintanance_', + moment().format('YYYYMMDD_HHmmss')) + } + + // csv modalCsv = false; selectedFiles: File; diff --git a/frontend/angular-clarity-master/src/app/modules/main/admin/submenu/submenu.component.ts b/frontend/angular-clarity-master/src/app/modules/main/admin/submenu/submenu.component.ts index ae45378..5489d80 100644 --- a/frontend/angular-clarity-master/src/app/modules/main/admin/submenu/submenu.component.ts +++ b/frontend/angular-clarity-master/src/app/modules/main/admin/submenu/submenu.component.ts @@ -1,5 +1,5 @@ import { Component, OnInit } from '@angular/core'; -import {MenumaintanceService} from '../../../../services/admin/menumaintance.service'; +import { MenumaintanceService } from '../../../../services/admin/menumaintance.service'; import { Rn_Main_Menu } from '../../../../models/builder/Rn_Main_Menu'; import { ActivatedRoute, Router } from '@angular/router'; import { AbstractControl, FormBuilder, FormGroup, Validators } from '@angular/forms'; @@ -18,121 +18,131 @@ function numberValidator(control: AbstractControl): { [key: string]: any } | nul }) export class SubmenuComponent implements OnInit { loading = false; - modalAdd= false; - modaledit=false; - modaldelete=false; + modalAdd = false; + modaledit = false; + modaldelete = false; selected: any[] = []; - rowSelected :any= {}; + rowSelected: any = {}; givendata; menus: Rn_Main_Menu[]; sub; id; mainid; - submitted=false; + submitted = false; public entryForm: FormGroup; - constructor(private menuservice:MenumaintanceService, - private toastr:ToastrService, + constructor(private menuservice: MenumaintanceService, + private toastr: ToastrService, private _fb: FormBuilder, - private route:ActivatedRoute, + private route: ActivatedRoute, private router: Router,) { } ngOnInit(): void { this.id = this.route.snapshot.params["id"]; console.log("project mainmenu with id = ", this.id); this.getById(this.id); -this.mainid=this.id + this.mainid = this.id this.entryForm = this._fb.group({ // menuItemId:[null], - menuId:[this.mainid], - menuItemDesc:['',[Validators.required]] , + menuId: [this.mainid], + menuItemDesc: ['', [Validators.required]], // itemSeq:['',[Validators.required]] , // itemSeq: ['', [Validators.required, numberValidator]], itemSeq: ['', [Validators.required, Validators.pattern('^[0-9]*$')]], - moduleName:['',[Validators.required]] , - status:['',[Validators.required]] , - main_menu_action_name:['',[Validators.required]] - }); + moduleName: ['', [Validators.required]], + status: ['', [Validators.required]], + main_menu_action_name: ['', [Validators.required]] + }); - // this.getdata(); + // this.getdata(); } - getById(id:any){ - this.menuservice.getbyid(id).subscribe((data)=>{ - this.sub=data; + getById(id: any) { + this.menuservice.getbyid(id).subscribe((data) => { + this.sub = data; console.log(this.sub) }) } - getdata(){ + getdata() { this.menuservice.getByCurrentUserMenuGroupId1().subscribe(resp => { this.menus = resp; - console.log('menus: ', this.menus); - }) + console.log('menus: ', this.menus); + }) } goToAdd() { - this.modalAdd=true; + this.modalAdd = true; + } + onSubmit() { + this.submitted = true; + if (this.entryForm.invalid) { + return; } - onSubmit(){ - this.submitted=true; - if (this.entryForm.invalid) { - return; + this.menuservice.create1(this.entryForm.value).subscribe((data) => { + console.log(data); + if (data) { + this.toastr.success('Added successfully'); + this.ngOnInit(); } - this.menuservice.create1(this.entryForm.value).subscribe((data)=>{ - console.log(data); - if (data) { - this.toastr.success('Added successfully'); - } - }, + }, (error) => { - console.log('Error in adding data...',+error); - if(error){ - this.toastr.error('Not added Data Getting Some Error'); - } + console.log('Error in adding data...', error); + if (error) { + this.toastr.error('Not added Data Getting Some Error'); + } + this.ngOnInit(); + }); - this.modalAdd=false; - } + this.modalAdd = false; + } - goToEdit(row) { - this.rowSelected = row; - console.log(row) - this.modaledit=true; - //this.router.navigate(["../edit/" + id], { relativeTo: this.route }); - } - onDelete(row) { - this.rowSelected = row; - this.modaldelete=true; - } + goToEdit(row) { + this.rowSelected = row; + console.log(row) + this.modaledit = true; + //this.router.navigate(["../edit/" + id], { relativeTo: this.route }); + } + onDelete(row) { + this.rowSelected = row; + this.modaldelete = true; + } - delete(id) - { - this.modaldelete = false; - console.log("in delete "+id); - this.menuservice.delete1(id).subscribe((data)=>{ - console.log(data); - if (data) { - this.toastr.success('Deleted successfully'); - } - }, - (error) => { - console.log('Error in adding data...',+error); - if(error){ - this.toastr.error('Not Deleted Data Getting Some Error'); - } - }); + delete(id) { + this.modaldelete = false; + console.log("in delete " + id); + this.menuservice.delete1(id).subscribe((data) => { + console.log(data); + if (data) { + this.toastr.success('Deleted successfully'); + } + this.ngOnInit(); + }, + (error) => { + console.log('Error in adding data...', error); + if (error) { + this.toastr.error('Not Deleted Data Getting Some Error'); } - onUpdate(id){ - this.modaledit=false; - this.menuservice.update1(id,this.rowSelected).subscribe((data)=>{ + this.ngOnInit(); + + }); + + } + onUpdate(id) { + this.modaledit = false; + this.menuservice.update1(id, this.rowSelected).subscribe((data) => { console.log(data); if (data) { this.toastr.success('Updated successfully'); - } - }, - (error) => { - console.log('Error in adding data...',+error); - if(error){ - this.toastr.error('Not updated Data Getting Some Error'); + this.ngOnInit(); + } - }); + }, + (error) => { + console.log('Error in adding data...', error); + if (error) { + this.toastr.error('Not updated Data Getting Some Error'); } + this.ngOnInit(); + + }); + } } diff --git a/frontend/angular-clarity-master/src/app/modules/main/main-routing.module.ts b/frontend/angular-clarity-master/src/app/modules/main/main-routing.module.ts index 4e04639..7377c69 100644 --- a/frontend/angular-clarity-master/src/app/modules/main/main-routing.module.ts +++ b/frontend/angular-clarity-master/src/app/modules/main/main-routing.module.ts @@ -81,7 +81,6 @@ import { MappingruleComponent } from './datamanagement/mappingrule/mappingrule.c import { MappingruleallComponent } from './datamanagement/mappingrule/mappingruleall/mappingruleall.component'; import { MappingruleaddComponent } from './datamanagement/mappingrule/mappingruleadd/mappingruleadd.component'; import { MappingruleeditComponent } from './datamanagement/mappingrule/mappingruleedit/mappingruleedit.component'; -import { test1Component } from './BuilderComponents/stepperworkflow/test1/test1.component'; import { Stepper_workflowComponent } from './BuilderComponents/stepperworkflow/Stepper_workflow/Stepper_workflow.component'; // import { QueryComponent } from './superadmin/query/query.component'; // import { QueryaddComponent } from './superadmin/queryadd/queryadd.component'; @@ -257,13 +256,29 @@ const routes: Routes = [ // buildercomponents + + + + + + + + + + + + + + + + + { path: 'Stepper_workflow', component: Stepper_workflowComponent }, - { path: 'Test1/:id', component: test1Component }, diff --git a/frontend/angular-clarity-master/src/app/modules/main/main.module.ts b/frontend/angular-clarity-master/src/app/modules/main/main.module.ts index ae29aea..ecbab3d 100644 --- a/frontend/angular-clarity-master/src/app/modules/main/main.module.ts +++ b/frontend/angular-clarity-master/src/app/modules/main/main.module.ts @@ -1,4 +1,5 @@ + import { CommonModule } from '@angular/common'; import { CUSTOM_ELEMENTS_SCHEMA, NgModule } from '@angular/core'; import { FormsModule, ReactiveFormsModule } from '@angular/forms'; @@ -104,7 +105,6 @@ import { MappingruleComponent } from './datamanagement/mappingrule/mappingrule.c 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 { test1Component } from './BuilderComponents/stepperworkflow/test1/test1.component'; import { Stepper_workflowComponent } from './BuilderComponents/stepperworkflow/Stepper_workflow/Stepper_workflow.component'; // import { QueryComponent } from './superadmin/query/query.component'; // import { QueryaddComponent } from './superadmin/queryadd/queryadd.component'; @@ -131,8 +131,46 @@ import { Stepper_workflowComponent } from './BuilderComponents/stepperworkflow/S // buildercomponents + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + Stepper_workflowComponent, - test1Component, + diff --git a/frontend/angular-clarity-master/src/assets/i18n/en.json b/frontend/angular-clarity-master/src/assets/i18n/en.json index 3d60440..ee15955 100644 --- a/frontend/angular-clarity-master/src/assets/i18n/en.json +++ b/frontend/angular-clarity-master/src/assets/i18n/en.json @@ -1,4 +1,4 @@ -{ + { "BREADCRUMB_HOME": "Home", "USER_GROUP_MAINTENANCE": "User Group Maintenance", "BREADCRUMB_ABOUT_US": "About Us", @@ -17,23 +17,25 @@ "IMPORT": "Import", "EXPORT_XLSX": "Export as XLSX", "ADD": "Add", - "MENU_ACCESS_CONTROL": "Menu Access Control", - "EDIT_MODE": "Edit Mode", - "FOR": "For", - "RELOAD": "Reload", - "SHOW_ALL": "Show All", - "ONLY_MAIN_MENU": "Only Main Menu", - "NO_DATA_AVAILABLE": "No data available", - "NO": "No", - "MENU_ITEM_NAME": "Menu Item Name", - "VIEW": "View", - "CREATE": "Create", - "EDIT": "Edit", - "DELETE": "Delete", - "QUERY": "Query", - "EXPORT": "Export", - "SYNC": "Sync", - "editMode": "Edit Mode", + + "MENU_ACCESS_CONTROL": "Menu Access Control", + "EDIT_MODE": "Edit Mode", + "FOR": "For", + "RELOAD": "Reload", + "SHOW_ALL": "Show All", + "ONLY_MAIN_MENU": "Only Main Menu", + + "NO_DATA_AVAILABLE": "No data available", + "NO": "No", + "MENU_ITEM_NAME": "Menu Item Name", + "VIEW": "View", + "CREATE": "Create", + "EDIT": "Edit", + "DELETE": "Delete", + "QUERY": "Query", + "EXPORT": "Export", + "SYNC": "Sync", + "editMode": "Edit Mode", "setupCode": "Setup Code", "value": "Value", "schedulerTimer": "Scheduler Timer", @@ -60,9 +62,11 @@ "oidAdminUserTooltip": "Admin user for OID access", "oidServerPort": "OID Server Port", "oidServerPortTooltip": "Port number for the OID server", - "companyDisplayName": "Company Display Name", + + + "companyDisplayName": "Company Display Name", "systemParameter": "System Parameter", - "userDefaultGroup": "User Default Group", + "userDefaultGroup": "User Default Group", "defaultDepartment": "Default Department", "defaultPosition": "Default Position", "singleCharge": "Single Charge", @@ -93,45 +97,49 @@ "areYouSureDelete": "Are You Sure Want to delete?", "updateAccessType": "Update Access Type", "update": "Update", - "SEQ_GENERATOR": "Sequence Generator", - "CURRENT_NO": "Current No", - "NAME": "Name", - "PREFIX": "Prefix", - "SEPARATOR": "Separator", - "SEQUENCE_SIZE": "Sequence Size", - "REPORT": "Report", - "REPORT_RUNNER": "Report Runner", - "REPORT_NAME": "Report Name", - "REPORT_DESCRIPTION": "Report Description", - "API_REGISTERY": "Api Registery", - "API_REGISTERY_DESCRIPTION": "Api Registery Description", - "ACTIVE": "Active", - "FOLDER_NAME": "Folder Name", - "ACTION": "Action", - "SET_UP": "Set Up", - "USERS_PER_PAGE": "Users per page", - "OF": "of", - "USERS": "users", - "ARE_YOU_SURE": "Are you sure you want to delete?", - "CANCEL": "Cancel", - "GO_TO": "Go To", - "ALL_REPORTS": "All Reports", - "ALL_REPORT": "All Report", - "REPORT_BUILDER_SQL": "Report Builder (SQL)", - "REPORT_BUILDER_URL": "Report Builder (URL)", - "LOADING_MESSAGE": "Dashboard could be found. Loading..", - "START_FROM_SCRATCH": "Start from scratch", - "IMPORT_TEMPLATE": "Import from a template", - "IMPORT_PUBLIC_PROJECT": "Import from public project", - "DELETE_CONFIRMATION": "Are You Sure Want to delete?", - "LAST_UPDATED_ON": "Last Updated On:", - "CREATE_NEW_REPORT": "Create New Report", - "ADD_MODE": "Add Mode", - "ENTER_NAME": "Enter name", - "DESCRIPTION": "Description", - "ENTER_DESCRIPTION": "Enter Description", - "SUBMIT": "Submit", - "home": "Home", + + "SEQ_GENERATOR": "Sequence Generator", + "CURRENT_NO": "Current No", + "NAME": "Name", + "PREFIX": "Prefix", + "SEPARATOR": "Separator", + "SEQUENCE_SIZE": "Sequence Size", + "REPORT": "Report", + "REPORT_RUNNER": "Report Runner", + + "REPORT_NAME": "Report Name", + "REPORT_DESCRIPTION": "Report Description", + "ACTIVE": "Active", + "FOLDER_NAME": "Folder Name", + "ACTION": "Action", + "SET_UP": "Set Up", + + "USERS_PER_PAGE": "Users per page", + "OF": "of", + "USERS": "users", + "ARE_YOU_SURE": "Are you sure you want to delete?", + "CANCEL": "Cancel", + "GO_TO": "Go To", + "ALL_REPORTS": "All Reports", + "ALL_REPORT": "All Report", + "REPORT_BUILDER_SQL": "Report Builder (SQL)", + "REPORT_BUILDER_URL": "Report Builder (URL)", + "LOADING_MESSAGE": "Dashboard could be found. Loading..", + "START_FROM_SCRATCH": "Start from scratch", + "IMPORT_TEMPLATE": "Import from a template", + "IMPORT_PUBLIC_PROJECT": "Import from public project", + "DELETE_CONFIRMATION": "Are You Sure Want to delete?", + + "LAST_UPDATED_ON": "Last Updated On:", + "CREATE_NEW_REPORT": "Create New Report", + "ADD_MODE": "Add Mode", + + "ENTER_NAME": "Enter name", + "DESCRIPTION": "Description", + "ENTER_DESCRIPTION": "Enter Description", + + "SUBMIT": "Submit", + "home": "Home", "dashboard": "Dashboard", "all_dashboard": "All Dashboard", "dashboard_builder": "Dashboard Builder", @@ -203,8 +211,10 @@ "GROUP_LEVEL": "Group Level", "STATUS": "Status", "UPDATED_DATE": "Updated Date", + "RECORDS_PER_PAGE": "Record per page", "IMPORT_FILE": "Import File", + "UPDATE": "Update", "ARE_YOU_SURE_DELETE": "Are You Sure Want to delete?", "THIS_FIELD_REQUIRED": "*This field is Required", @@ -216,10 +226,10 @@ "MENU_ACTION_LINK": "Menu Action Link", "STATUS": "Status", "SUB_MENU": "Sub Menu", - "Stt": "Stt", - "OneToManyExtension": "OneToManyExtension", - "studentname": "studentname", - "description": "description", - "Studenthigh": "Studenthigh", + "Active": "Active", + "Description": "Description", + "Fileupload_Field": "Fileupload_Field", + "Test22": "Test22", + "Test11": "Test11", "Name": "Name" } \ No newline at end of file