diff --git a/stepper055-back-b/authsec_springboot/backend/src/main/java/com/realnet/Builders/Services/BuilderService.java b/stepper055-back-b/authsec_springboot/backend/src/main/java/com/realnet/Builders/Services/BuilderService.java index cf5a4ab..a560504 100644 --- a/stepper055-back-b/authsec_springboot/backend/src/main/java/com/realnet/Builders/Services/BuilderService.java +++ b/stepper055-back-b/authsec_springboot/backend/src/main/java/com/realnet/Builders/Services/BuilderService.java @@ -78,6 +78,18 @@ addCustomMenu( "Testlist","Testlist", "Transcations"); addCustomMenu( "Child","Child", "Transcations"); +addCustomMenu( "Adv3","Adv3", "Transcations"); + + +addCustomMenu( "Stepss","Stepper_workflow", "Transcations"); + + +addCustomMenu( "Testlist","Testlist", "Transcations"); + + +addCustomMenu( "Child","Child", "Transcations"); + + addCustomMenu( "Adv3","Adv3", "Transcations"); diff --git a/stepper055-back-b/authsec_springboot/backend/src/main/java/com/realnet/basicp1/Controllers/Adv3Controller.java b/stepper055-back-b/authsec_springboot/backend/src/main/java/com/realnet/basicp1/Controllers/Adv3Controller.java index ee17ffc..11f50f1 100644 --- a/stepper055-back-b/authsec_springboot/backend/src/main/java/com/realnet/basicp1/Controllers/Adv3Controller.java +++ b/stepper055-back-b/authsec_springboot/backend/src/main/java/com/realnet/basicp1/Controllers/Adv3Controller.java @@ -18,11 +18,6 @@ import com.realnet.basicp1.Entity.Adv3; import com.realnet.basicp1.Services.Adv3Service ; -import com.realnet.basicp1.Entity.Child; - - - - @@ -43,10 +38,6 @@ public class Adv3Controller { - - - - @PostMapping("/Adv3") public Adv3 Savedata(@RequestBody Adv3 data) { Adv3 save = Service.Savedata(data) ; @@ -55,10 +46,6 @@ public class Adv3Controller { - - - - System.out.println("data saved..." + save); return save; @@ -107,16 +94,6 @@ public class Adv3Controller { - @PostMapping("/Adv3/Child_insert") - public Child insertChild(@RequestBody Child data) { - Child insertaction = Service.insertChild(data); - return insertaction; - } - - - - - } \ No newline at end of file diff --git a/stepper055-back-b/authsec_springboot/backend/src/main/java/com/realnet/basicp1/Controllers/tokenFree_Adv3Controller.java b/stepper055-back-b/authsec_springboot/backend/src/main/java/com/realnet/basicp1/Controllers/tokenFree_Adv3Controller.java index 02e302e..f937ba6 100644 --- a/stepper055-back-b/authsec_springboot/backend/src/main/java/com/realnet/basicp1/Controllers/tokenFree_Adv3Controller.java +++ b/stepper055-back-b/authsec_springboot/backend/src/main/java/com/realnet/basicp1/Controllers/tokenFree_Adv3Controller.java @@ -18,11 +18,6 @@ import com.realnet.basicp1.Entity.Adv3; import com.realnet.basicp1.Services.Adv3Service ; -import com.realnet.basicp1.Entity.Child; - - - - @@ -43,10 +38,6 @@ public class tokenFree_Adv3Controller { - - - - @PostMapping("/Adv3") public Adv3 Savedata(@RequestBody Adv3 data) { Adv3 save = Service.Savedata(data) ; @@ -55,10 +46,6 @@ public class tokenFree_Adv3Controller { - - - - System.out.println("data saved..." + save); return save; @@ -107,16 +94,6 @@ public class tokenFree_Adv3Controller { - @PostMapping("/Adv3/Child_insert") - public Child insertChild(@RequestBody Child data) { - Child insertaction = Service.insertChild(data); - return insertaction; - } - - - - - } \ No newline at end of file diff --git a/stepper055-back-b/authsec_springboot/backend/src/main/java/com/realnet/basicp1/Entity/Adv3.java b/stepper055-back-b/authsec_springboot/backend/src/main/java/com/realnet/basicp1/Entity/Adv3.java index 6c55f04..8f0e266 100644 --- a/stepper055-back-b/authsec_springboot/backend/src/main/java/com/realnet/basicp1/Entity/Adv3.java +++ b/stepper055-back-b/authsec_springboot/backend/src/main/java/com/realnet/basicp1/Entity/Adv3.java @@ -10,10 +10,6 @@ import com.realnet.WhoColumn.Entity.Extension; -import com.realnet.basicp1.Entity.Child; - - - @Entity @Data public class Adv3 extends Extension { @@ -29,8 +25,6 @@ import com.realnet.basicp1.Entity.Child; private String name; - - @@ -43,9 +37,6 @@ private String m; -@OneToOne( cascade=CascadeType.ALL) - private Child child; - diff --git a/stepper055-back-b/authsec_springboot/backend/src/main/java/com/realnet/basicp1/Repository/Adv3Repository.java b/stepper055-back-b/authsec_springboot/backend/src/main/java/com/realnet/basicp1/Repository/Adv3Repository.java index 1a0d51d..3c6459a 100644 --- a/stepper055-back-b/authsec_springboot/backend/src/main/java/com/realnet/basicp1/Repository/Adv3Repository.java +++ b/stepper055-back-b/authsec_springboot/backend/src/main/java/com/realnet/basicp1/Repository/Adv3Repository.java @@ -14,10 +14,6 @@ import java.util.*; - - - - diff --git a/stepper055-back-b/authsec_springboot/backend/src/main/java/com/realnet/basicp1/Services/Adv3Service.java b/stepper055-back-b/authsec_springboot/backend/src/main/java/com/realnet/basicp1/Services/Adv3Service.java index 1ccf21a..2d9a8fb 100644 --- a/stepper055-back-b/authsec_springboot/backend/src/main/java/com/realnet/basicp1/Services/Adv3Service.java +++ b/stepper055-back-b/authsec_springboot/backend/src/main/java/com/realnet/basicp1/Services/Adv3Service.java @@ -14,13 +14,6 @@ import com.realnet.users.service1.AppUserServiceImpl; import com.realnet.users.entity1.AppUser; -import com.realnet.basicp1.Entity.Child; - -import com.realnet.basicp1.Repository.ChildRepository; - - - - @@ -40,10 +33,6 @@ private Adv3Repository Repository; - - - - public Adv3 Savedata(Adv3 data) { @@ -51,10 +40,6 @@ public Adv3 Savedata(Adv3 data) { - - - - data.setUpdatedBy(getUser().getUserId()); data.setCreatedBy(getUser().getUserId()); data.setAccountId(getUser().getAccount().getAccount_id()); @@ -89,8 +74,6 @@ public Adv3 update(Adv3 data,Integer id) { old.setName(data.getName()); - - old.setL(data.getL()); @@ -101,8 +84,6 @@ old.setM(data.getM()); -old.setChild(data.getChild()); - final Adv3 test = Repository.save(old); @@ -111,25 +92,6 @@ final Adv3 test = Repository.save(old); -// Insert Action - - @Autowired - private ChildRepository childinsertrepository; - -public Child insertChild(Child data) { - -data.setUpdatedBy(getUser().getUserId()); - data.setCreatedBy(getUser().getUserId()); - data.setAccountId(getUser().getAccount().getAccount_id()); - - - final Child save = childinsertrepository.save(data); - return save; - } - - - - diff --git a/stepper055-dsb-d/authsec_mysql/mysql/wf_table/wf_table.sql b/stepper055-dsb-d/authsec_mysql/mysql/wf_table/wf_table.sql index e6b7900..81f6e5d 100755 --- a/stepper055-dsb-d/authsec_mysql/mysql/wf_table/wf_table.sql +++ b/stepper055-dsb-d/authsec_mysql/mysql/wf_table/wf_table.sql @@ -1,4 +1,4 @@ -CREATE TABLE dsb.Adv3(id BIGINT NOT NULL AUTO_INCREMENT, onetoone VARCHAR(400), value_list_field VARCHAR(400), l VARCHAR(400), m VARCHAR(400), button_field VARCHAR(400), name VARCHAR(400), PRIMARY KEY (id)); +CREATE TABLE dsb.Adv3(id BIGINT NOT NULL AUTO_INCREMENT, value_list_field VARCHAR(400), l VARCHAR(400), m VARCHAR(400), name VARCHAR(400), PRIMARY KEY (id)); CREATE TABLE dsb.Child(id BIGINT NOT NULL AUTO_INCREMENT, name VARCHAR(400), PRIMARY KEY (id)); diff --git a/stepper055-front-f/authsec_angular/frontend/angular-clarity-master/src/app/modules/main/BuilderComponents/basicp1/Adv3/Adv3.component.html b/stepper055-front-f/authsec_angular/frontend/angular-clarity-master/src/app/modules/main/BuilderComponents/basicp1/Adv3/Adv3.component.html index 51aae77..610e2eb 100644 --- a/stepper055-front-f/authsec_angular/frontend/angular-clarity-master/src/app/modules/main/BuilderComponents/basicp1/Adv3/Adv3.component.html +++ b/stepper055-front-f/authsec_angular/frontend/angular-clarity-master/src/app/modules/main/BuilderComponents/basicp1/Adv3/Adv3.component.html @@ -1,39 +1,31 @@ -
    -
  1. Adv3
    2. -
-
-
-
-

Adv3

-
-
- - - - - - - -
- - - - Loading ... - -
{{error}}
- + + +
+ + + + Loading ... + +
{{error}}
+ Name - - @@ -48,30 +40,21 @@ - - - - name - - - - - - Action - + + + Action + - + {{user.name }} - - {{user. l}} @@ -85,200 +68,183 @@ -{{user.child.name}} - - - - - - - - - - - -
Who Column
-
Account ID: {{user.accountId}}
-
Created At: {{user.createdAt| date}}
-
Created By: {{user.createdBy}}
-
Updated At: {{user.updatedAt | date}}
-
Updated By: {{user.updatedBy}}
- - - - + + + + + +
Who Column
+
Account ID: {{user.accountId}}
+
Created At: {{user.createdAt| date}}
+
Created By: {{user.createdBy}}
+
Updated At: {{user.updatedAt | date}}
+
Updated By: {{user.updatedBy}}
+ + + + - - - - - - - - Users per page - {{pagination.firstItem + 1}} - {{pagination.lastItem + 1}} - of {{pagination.totalItems}} users - - - - - - -
-
-
-
-
-
- -
-
- {{beforeText(item.fieldtext)}} - {{ app[transform(item.fieldtext) ] }} - {{afterText(item.fieldtext)}} -
- -
- {{beforeText(item.fieldtext)}} - {{ app[transform(item.fieldtext) ] | date}} - {{afterText(item.fieldtext)}} -
-
- {{beforeText(item.fieldtext)}} - {{ app[transform(item.fieldtext) ]}} - {{afterText(item.fieldtext)}} -
- -
-
-
- - -
- -
- -
File Preview
-
- -
-
-
-
-
-
- - + + + + + + + + Users per page + {{pagination.firstItem + 1}} - {{pagination.lastItem + 1}} + of {{pagination.totalItems}} users + + + + + + +
+
+
+
+
+
+ +
+
+ {{beforeText(item.fieldtext)}} + {{ app[transform(item.fieldtext) ] }} + {{afterText(item.fieldtext)}} +
+ +
+ {{beforeText(item.fieldtext)}} + {{ app[transform(item.fieldtext) ] | date}} + {{afterText(item.fieldtext)}} +
+
+ {{beforeText(item.fieldtext)}} + {{ app[transform(item.fieldtext) ]}} + {{afterText(item.fieldtext)}} +
+ +
+
+
+ + +
+ +
+ +
File Preview
+
+ +
+
+
+
+
+
+ + - - - - - - + +

Update Adv3 - - - - -

-
-

{{rowSelected.id}}

+ +
+

{{rowSelected.id}}

-
+
- -
@@ -311,8 +277,6 @@ - -
@@ -320,91 +284,74 @@ - - - -
- -
- - - - - - -
-

Extension

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

Are You Sure Want to delete?

-

{{rowSelected.id}}

-
- - -
-
- - - + +
+

Extension

+
+
+
+
+ + + + + + + + + + +
+ + +
+
+
+ +
+ + +
+ +
+ + +
+

Are You Sure Want to delete?

+

{{rowSelected.id}}

+
+ + +
+
+ + +

Add Adv3 - - - - - -         - - - - - Form Extension -

-
-
-
+ +         + + + + + Form Extension + +
+ +
- -
@@ -431,8 +378,6 @@ - -
@@ -441,61 +386,42 @@ -
-

child

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

Extension

-
-
-
-
- - - - - - - -
- - -
-
-
-
- - -
- -
+ + + +
+

Extension

+
+
+
+
+ + + + + + + +
+ + +
+
+
+
+ + +
+ +
- - - -

Select From value_list_field List:

@@ -528,25 +454,4 @@
- - - -

Insert Button_Field

-
-
-
-
- - -
-
-
-
- - -
-
-
- - - + diff --git a/stepper055-front-f/authsec_angular/frontend/angular-clarity-master/src/app/modules/main/BuilderComponents/basicp1/Adv3/Adv3.component.ts b/stepper055-front-f/authsec_angular/frontend/angular-clarity-master/src/app/modules/main/BuilderComponents/basicp1/Adv3/Adv3.component.ts index ad11d17..9b9ce4c 100644 --- a/stepper055-front-f/authsec_angular/frontend/angular-clarity-master/src/app/modules/main/BuilderComponents/basicp1/Adv3/Adv3.component.ts +++ b/stepper055-front-f/authsec_angular/frontend/angular-clarity-master/src/app/modules/main/BuilderComponents/basicp1/Adv3/Adv3.component.ts @@ -1,75 +1,70 @@ -import { Component, OnInit } from '@angular/core'; -import { ToastrService } from 'ngx-toastr'; -import { AlertService } from 'src/app/services/alert.service'; -import { Adv3service} from './Adv3.service'; -import { AbstractControl, FormArray, FormBuilder, FormGroup, Validators, ValidationErrors } from '@angular/forms'; -import { ExtensionService } from 'src/app/services/fnd/extension.service'; +import { Component, OnInit } from '@angular/core'; +import { ToastrService } from 'ngx-toastr'; +import { AlertService } from 'src/app/services/alert.service'; +import { Adv3service} from './Adv3.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 { Adv3cardvariable } from './Adv3_cardvariable'; import { UserInfoService } from 'src/app/services/user-info.service'; declare var JsBarcode: any; -@Component({ - selector: 'app-Adv3', - templateUrl: './Adv3.component.html', - styleUrls: ['./Adv3.component.scss'] -}) -export class Adv3Component implements OnInit { - cardButton = Adv3cardvariable.cardButton; - cardmodeldata = Adv3cardvariable.cardmodeldata; - public dashboardArray: DashboardContentModel2[]; - isCardview = Adv3cardvariable.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 = 'Adv3_formCode' -tableName = 'Adv3'; checkFormCode; selected: any[] = []; constructor( - private extensionService: ExtensionService, -private userInfoService:UserInfoService, - private mainService:Adv3service, - private alertService: AlertService, - private toastr: ToastrService, - private _fb: FormBuilder, - ) { } -// component button - public insertFormButton_Field: FormGroup; - - - 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({ +@Component({ + selector: 'app-Adv3', + templateUrl: './Adv3.component.html', + styleUrls: ['./Adv3.component.scss'] +}) +export class Adv3Component implements OnInit { + cardButton = Adv3cardvariable.cardButton; + cardmodeldata = Adv3cardvariable.cardmodeldata; + public dashboardArray: DashboardContentModel2[]; + isCardview = Adv3cardvariable.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 = 'Adv3_formCode' +tableName = 'Adv3'; checkFormCode; selected: any[] = []; constructor( + private extensionService: ExtensionService, +private userInfoService:UserInfoService, + private mainService:Adv3service, + private alertService: AlertService, + private toastr: ToastrService, + private _fb: FormBuilder, + ) { } +// 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], - - l:[null], @@ -80,8 +75,6 @@ m:[null], -child: this.initLinesForm(), - @@ -91,38 +84,27 @@ child: this.initLinesForm(), - - - - }); // component_button200 -// inser code start - this.insertFormButton_Field = this._fb.group({ - name: '', - }); - - // insert code end - - // 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 === "Adv3_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 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 === "Adv3_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 @@ -130,47 +112,30 @@ child: this.initLinesForm(), + + } - } - - - - - - - -initLinesForm() { return this._fb.group({ - - - name: [null], - - - -}); } - - - 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) { + 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; @@ -178,156 +143,128 @@ initLinesForm() { return this._fb.group({ - - - - - - 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; + + 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); + //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); + }, (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; +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(); + 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) { + + }, (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(); - + + } + submitted = false; +onSubmit() { + console.log(this.entryForm.value); + this.submitted = true; + if (this.entryForm.invalid) { + return; + }this.onCreate(); + } - - - - //Value List field start valuelistMode; searchcusttextvalue_list_field :any; @@ -363,54 +300,9 @@ getcustvalue_list_fieldID(id:number){ } //value List field end // updateaction - -// insert button - - -modalInsertButton_Field = false; -goToInsertButton_Field() { - this.modalInsertButton_Field=true; - } -onSubmitInsertButton_Field() { - console.log(this.insertFormButton_Field.value); - this.submitted=true; - if (this.insertFormButton_Field.invalid) { - return; - } - this.onInsertButton_Field(); -} -onInsertButton_Field() { - this.modalInsertButton_Field=false; - this.mainService.insertButton_FieldChild(this.insertFormButton_Field.value).subscribe(data => { - console.log('After add',data) - if (data.status >=200 && data.status <=209) { - this.toastr.success('Added successfully'); - } -if (data && data.id != null) { - this.toastr.success('Added successfully'); - } this.ngOnInit(); - },(error) => { - console.error(error); - if ( error.status >= 200 && error.status <= 299) { - this.toastr.success("Update Successfully"); - } - if ( error.status >= 400 && error.status <= 499) { - this.toastr.error("Update Failed"); - } - if ( error.status >= 500 && error.status <= 599) { - this.toastr.error("Server Error"); - } - this.ngOnInit(); - }); - this.insertFormButton_Field.reset(); - } -// insert buuton code end - - } - diff --git a/stepper055-front-f/authsec_angular/frontend/angular-clarity-master/src/app/modules/main/BuilderComponents/basicp1/Adv3/Adv3.service.ts b/stepper055-front-f/authsec_angular/frontend/angular-clarity-master/src/app/modules/main/BuilderComponents/basicp1/Adv3/Adv3.service.ts index 16a278a..c75d9f7 100644 --- a/stepper055-front-f/authsec_angular/frontend/angular-clarity-master/src/app/modules/main/BuilderComponents/basicp1/Adv3/Adv3.service.ts +++ b/stepper055-front-f/authsec_angular/frontend/angular-clarity-master/src/app/modules/main/BuilderComponents/basicp1/Adv3/Adv3.service.ts @@ -1,38 +1,34 @@ -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 { 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 Adv3service{ - private baseURL = "Adv3/Adv3" ; constructor( - private http: HttpClient, - private apiRequest: ApiRequestService, - ) { } - getAll(page?: number, size?: number): Observable { - return this.apiRequest.get(this.baseURL); - } - getById(id: number): Observable { - const _http = this.baseURL + "/" + id; - return this.apiRequest.get(_http); - } - create(data: any): Observable { - return this.apiRequest.post(this.baseURL, data); - } - update(id: number, data: any): Observable { - const _http = this.baseURL + "/" + id; - return this.apiRequest.put(_http, data); - } - delete(id: number): Observable { - const _http = this.baseURL + "/" + id; - return this.apiRequest.delete(_http); - } - - - - +@Injectable({ + providedIn: 'root' +}) +export class Adv3service{ + private baseURL = "Adv3/Adv3" ; constructor( + private http: HttpClient, + private apiRequest: ApiRequestService, + ) { } + getAll(page?: number, size?: number): Observable { + return this.apiRequest.get(this.baseURL); + } + getById(id: number): Observable { + const _http = this.baseURL + "/" + id; + return this.apiRequest.get(_http); + } + create(data: any): Observable { + return this.apiRequest.post(this.baseURL, data); + } + update(id: number, data: any): Observable { + const _http = this.baseURL + "/" + id; + return this.apiRequest.put(_http, data); + } + delete(id: number): Observable { + const _http = this.baseURL + "/" + id; + return this.apiRequest.delete(_http); + } @@ -40,9 +36,4 @@ export class Adv3service{ // updateaction -// insert button code start -insertButton_FieldChild(Child: any): Observable { - return this.apiRequest.post(`adv3/adv3/Child_insert`, Child); -} - } \ No newline at end of file diff --git a/stepper055-front-f/authsec_angular/frontend/angular-clarity-master/src/app/modules/main/BuilderComponents/stepperworkflow/Stepper_workflow/Stepper_workflow.component.ts b/stepper055-front-f/authsec_angular/frontend/angular-clarity-master/src/app/modules/main/BuilderComponents/stepperworkflow/Stepper_workflow/Stepper_workflow.component.ts index 0840bf3..dbac851 100644 --- a/stepper055-front-f/authsec_angular/frontend/angular-clarity-master/src/app/modules/main/BuilderComponents/stepperworkflow/Stepper_workflow/Stepper_workflow.component.ts +++ b/stepper055-front-f/authsec_angular/frontend/angular-clarity-master/src/app/modules/main/BuilderComponents/stepperworkflow/Stepper_workflow/Stepper_workflow.component.ts @@ -20,6 +20,7 @@ + import { Component, OnInit } from '@angular/core'; @@ -250,6 +251,8 @@ export class Stepper_workflowComponent implements OnInit { console.log('id is ', id) // stepper route + + this.router.navigate(["../stepss/", id], { relativeTo: this.route }); diff --git a/stepper055-front-f/authsec_angular/frontend/angular-clarity-master/src/app/modules/main/BuilderComponents/stepperworkflow/stepss/stepss.component.html b/stepper055-front-f/authsec_angular/frontend/angular-clarity-master/src/app/modules/main/BuilderComponents/stepperworkflow/stepss/stepss.component.html index 5687395..bccc78e 100644 --- a/stepper055-front-f/authsec_angular/frontend/angular-clarity-master/src/app/modules/main/BuilderComponents/stepperworkflow/stepss/stepss.component.html +++ b/stepper055-front-f/authsec_angular/frontend/angular-clarity-master/src/app/modules/main/BuilderComponents/stepperworkflow/stepss/stepss.component.html @@ -63,8 +63,6 @@
- -
@@ -92,8 +90,6 @@ - -
@@ -102,21 +98,6 @@ -
-

child

-
- - -
- -
- - -
- - - -
@@ -147,8 +128,6 @@
Bbb Summary:

Name : {{ Adv3entryForm.get('name')?.value | json}}

-

Child : {{ Adv3entryForm.get('child')?.value | json}}

-

l : {{ Adv3entryForm.get('l')?.value | json}}

@@ -164,8 +143,6 @@ -

child : {{ Adv3entryForm.get('child')?.value | json}}

-

Value List Field : {{ Adv3entryForm.get('value_list_field')?.value | json}}

diff --git a/stepper055-front-f/authsec_angular/frontend/angular-clarity-master/src/app/modules/main/BuilderComponents/stepperworkflow/stepss/stepss.component.ts b/stepper055-front-f/authsec_angular/frontend/angular-clarity-master/src/app/modules/main/BuilderComponents/stepperworkflow/stepss/stepss.component.ts index f870341..7532022 100644 --- a/stepper055-front-f/authsec_angular/frontend/angular-clarity-master/src/app/modules/main/BuilderComponents/stepperworkflow/stepss/stepss.component.ts +++ b/stepper055-front-f/authsec_angular/frontend/angular-clarity-master/src/app/modules/main/BuilderComponents/stepperworkflow/stepss/stepss.component.ts @@ -71,8 +71,6 @@ private router: Router, this.Adv3entryForm = this.Adv3_fb.group({ name : [null], - - l:[null], @@ -83,8 +81,6 @@ m:[null], -child: this.initLinesForm(), - @@ -95,10 +91,6 @@ child: this.initLinesForm(), - - - - const stepId = this.id; // or from route/query/etc this.getResolvedDataFromStepper(stepId).subscribe(res => { @@ -127,8 +119,6 @@ showEmptyForm(): void { id: data.id || '', name: data.name || '', -child: data.child || '', - @@ -141,8 +131,6 @@ m: data.m || '', -child: data.child || '', - value_list_field: data.value_list_field || '', }); @@ -249,10 +237,6 @@ value_list_field: data.value_list_field || '', - - - - this.mainService.createAdv3(this.Adv3entryForm.value).subscribe( (data) => { console.log('adding data ', data); @@ -281,10 +265,6 @@ value_list_field: data.value_list_field || '', - - - - }, (error) => { console.log(error); if (error.status >= 200 && error.status <= 299) { @@ -336,10 +316,6 @@ value_list_field: data.value_list_field || '', - - - - //Value List field start valuelistMode; searchcusttextvalue_list_field :any; @@ -380,19 +356,6 @@ getcustvalue_list_fieldID(id:number){ - -initLinesForm() { return this.Adv3_fb.group({ - - - name: [null], - - - -}); } - - - - // updateaction } @@ -400,7 +363,3 @@ initLinesForm() { return this.Adv3_fb.group({ - - - - diff --git a/stepper055-front-f/authsec_angular/frontend/angular-clarity-master/src/app/modules/main/BuilderComponents/stepperworkflow/stepss/stepss.service.ts b/stepper055-front-f/authsec_angular/frontend/angular-clarity-master/src/app/modules/main/BuilderComponents/stepperworkflow/stepss/stepss.service.ts index f8e4534..1288750 100644 --- a/stepper055-front-f/authsec_angular/frontend/angular-clarity-master/src/app/modules/main/BuilderComponents/stepperworkflow/stepss/stepss.service.ts +++ b/stepper055-front-f/authsec_angular/frontend/angular-clarity-master/src/app/modules/main/BuilderComponents/stepperworkflow/stepss/stepss.service.ts @@ -48,9 +48,5 @@ gettabledata(id: number): Observable { - - - - // updateaction } \ No newline at end of file diff --git a/stepper055-front-f/authsec_angular/frontend/angular-clarity-master/src/app/modules/main/main-routing.module.ts b/stepper055-front-f/authsec_angular/frontend/angular-clarity-master/src/app/modules/main/main-routing.module.ts index c215ee0..9738522 100644 --- a/stepper055-front-f/authsec_angular/frontend/angular-clarity-master/src/app/modules/main/main-routing.module.ts +++ b/stepper055-front-f/authsec_angular/frontend/angular-clarity-master/src/app/modules/main/main-routing.module.ts @@ -1,3 +1,7 @@ + + + + import { stepssComponent } from './BuilderComponents/stepperworkflow/stepss/stepss.component'; import { TestlistComponent } from './BuilderComponents/basicp1/Testlist/Testlist.component'; import { ChildComponent } from './BuilderComponents/basicp1/Child/Child.component'; @@ -260,6 +264,14 @@ const routes: Routes = [ // buildercomponents + + + + + + + + {path:'stepss/:id',component:stepssComponent}, diff --git a/stepper055-front-f/authsec_angular/frontend/angular-clarity-master/src/app/modules/main/main.module.ts b/stepper055-front-f/authsec_angular/frontend/angular-clarity-master/src/app/modules/main/main.module.ts index 9680fe4..59305e7 100644 --- a/stepper055-front-f/authsec_angular/frontend/angular-clarity-master/src/app/modules/main/main.module.ts +++ b/stepper055-front-f/authsec_angular/frontend/angular-clarity-master/src/app/modules/main/main.module.ts @@ -1,3 +1,7 @@ + + + + import { stepssComponent } from './BuilderComponents/stepperworkflow/stepss/stepss.component'; import { TestlistComponent } from './BuilderComponents/basicp1/Testlist/Testlist.component'; import { ChildComponent } from './BuilderComponents/basicp1/Child/Child.component'; @@ -133,6 +137,14 @@ import { Stepper_workflowComponent } from './BuilderComponents/stepperworkflow/S // buildercomponents + + + + + + + + stepssComponent, diff --git a/stepper055-front-f/authsec_angular/frontend/angular-clarity-master/src/assets/i18n/en.json b/stepper055-front-f/authsec_angular/frontend/angular-clarity-master/src/assets/i18n/en.json index 33eea00..acf571a 100644 --- a/stepper055-front-f/authsec_angular/frontend/angular-clarity-master/src/assets/i18n/en.json +++ b/stepper055-front-f/authsec_angular/frontend/angular-clarity-master/src/assets/i18n/en.json @@ -226,13 +226,11 @@ "MENU_ACTION_LINK": "Menu Action Link", "STATUS": "Status", "SUB_MENU": "Sub Menu", - "OneToOne": "OneToOne", "Testlist": "Testlist", "Value_List_Field": "Value_List_Field", "l": "l", "m": "m", "Child": "Child", - "Button_Field": "Button_Field", "Adv3": "Adv3", "Name": "Name" } \ No newline at end of file