diff --git a/testadvdatatype3-back-b/authsec_springboot/backend/src/main/java/com/realnet/Builders/Services/BuilderService.java b/testadvdatatype3-back-b/authsec_springboot/backend/src/main/java/com/realnet/Builders/Services/BuilderService.java index d0a2071..885db21 100644 --- a/testadvdatatype3-back-b/authsec_springboot/backend/src/main/java/com/realnet/Builders/Services/BuilderService.java +++ b/testadvdatatype3-back-b/authsec_springboot/backend/src/main/java/com/realnet/Builders/Services/BuilderService.java @@ -75,6 +75,15 @@ addCustomMenu( "Adv3","Adv3", "Transcations"); addCustomMenu( "Testlist","Testlist", "Transcations"); +addCustomMenu( "Child","Child", "Transcations"); + + +addCustomMenu( "Adv3","Adv3", "Transcations"); + + +addCustomMenu( "Testlist","Testlist", "Transcations"); + + addCustomMenu( "Child","Child", "Transcations"); diff --git a/testadvdatatype3-back-b/authsec_springboot/backend/src/main/java/com/realnet/basicp1/Controllers/Adv3Controller.java b/testadvdatatype3-back-b/authsec_springboot/backend/src/main/java/com/realnet/basicp1/Controllers/Adv3Controller.java index da6258c..74adfd7 100644 --- a/testadvdatatype3-back-b/authsec_springboot/backend/src/main/java/com/realnet/basicp1/Controllers/Adv3Controller.java +++ b/testadvdatatype3-back-b/authsec_springboot/backend/src/main/java/com/realnet/basicp1/Controllers/Adv3Controller.java @@ -21,10 +21,6 @@ import com.realnet.basicp1.Services.Adv3Service ; import com.realnet.Testlist_ListFilter1/Testlist_ListFilter1.Entity.Testlist; - - - - @RequestMapping(value = "/Adv3") @CrossOrigin("*") @RestController @@ -39,20 +35,12 @@ public class Adv3Controller { - - - - @PostMapping("/Adv3") public Adv3 Savedata(@RequestBody Adv3 data) { Adv3 save = Service.Savedata(data) ; - - - - System.out.println("data saved..." + save); return save; @@ -107,8 +95,4 @@ public class Adv3Controller { return insertaction; } - - - - } \ No newline at end of file diff --git a/testadvdatatype3-back-b/authsec_springboot/backend/src/main/java/com/realnet/basicp1/Controllers/tokenFree_Adv3Controller.java b/testadvdatatype3-back-b/authsec_springboot/backend/src/main/java/com/realnet/basicp1/Controllers/tokenFree_Adv3Controller.java index 699d60b..4d936dd 100644 --- a/testadvdatatype3-back-b/authsec_springboot/backend/src/main/java/com/realnet/basicp1/Controllers/tokenFree_Adv3Controller.java +++ b/testadvdatatype3-back-b/authsec_springboot/backend/src/main/java/com/realnet/basicp1/Controllers/tokenFree_Adv3Controller.java @@ -21,10 +21,6 @@ import com.realnet.basicp1.Services.Adv3Service ; import com.realnet.Testlist_ListFilter1/Testlist_ListFilter1.Entity.Testlist; - - - - @RequestMapping(value = "/token/Adv3") @CrossOrigin("*") @RestController @@ -39,20 +35,12 @@ public class tokenFree_Adv3Controller { - - - - @PostMapping("/Adv3") public Adv3 Savedata(@RequestBody Adv3 data) { Adv3 save = Service.Savedata(data) ; - - - - System.out.println("data saved..." + save); return save; @@ -107,8 +95,4 @@ public class tokenFree_Adv3Controller { return insertaction; } - - - - } \ No newline at end of file diff --git a/testadvdatatype3-back-b/authsec_springboot/backend/src/main/java/com/realnet/basicp1/Entity/Adv3.java b/testadvdatatype3-back-b/authsec_springboot/backend/src/main/java/com/realnet/basicp1/Entity/Adv3.java index 6bd4051..dac9d2b 100644 --- a/testadvdatatype3-back-b/authsec_springboot/backend/src/main/java/com/realnet/basicp1/Entity/Adv3.java +++ b/testadvdatatype3-back-b/authsec_springboot/backend/src/main/java/com/realnet/basicp1/Entity/Adv3.java @@ -8,10 +8,6 @@ import com.realnet.WhoColumn.Entity.Extension; - - -import com.realnet.basicp1.Entity.Child; - @Entity @Data public class Adv3 extends Extension { @@ -29,9 +25,4 @@ private String name; - -@OneToOne( cascade=CascadeType.ALL) - private Child child; - - } diff --git a/testadvdatatype3-back-b/authsec_springboot/backend/src/main/java/com/realnet/basicp1/Repository/Adv3Repository.java b/testadvdatatype3-back-b/authsec_springboot/backend/src/main/java/com/realnet/basicp1/Repository/Adv3Repository.java index be597ca..1d91034 100644 --- a/testadvdatatype3-back-b/authsec_springboot/backend/src/main/java/com/realnet/basicp1/Repository/Adv3Repository.java +++ b/testadvdatatype3-back-b/authsec_springboot/backend/src/main/java/com/realnet/basicp1/Repository/Adv3Repository.java @@ -12,10 +12,6 @@ import java.util.*; - - - - diff --git a/testadvdatatype3-back-b/authsec_springboot/backend/src/main/java/com/realnet/basicp1/Services/Adv3Service.java b/testadvdatatype3-back-b/authsec_springboot/backend/src/main/java/com/realnet/basicp1/Services/Adv3Service.java index 180a1d3..81883a4 100644 --- a/testadvdatatype3-back-b/authsec_springboot/backend/src/main/java/com/realnet/basicp1/Services/Adv3Service.java +++ b/testadvdatatype3-back-b/authsec_springboot/backend/src/main/java/com/realnet/basicp1/Services/Adv3Service.java @@ -19,10 +19,6 @@ import com.realnet.Testlist_ListFilter1/Testlist_ListFilter1.Entity.Testlist; import com.realnet.Testlist_ListFilter1/Testlist_ListFilter1.Repository.TestlistRepository; - - - - import org.springframework.stereotype.Service; @Service @@ -36,19 +32,11 @@ private Adv3Repository Repository; - - - - public Adv3 Savedata(Adv3 data) { - - - - data.setUpdatedBy(getUser().getUserId()); data.setCreatedBy(getUser().getUserId()); data.setAccountId(getUser().getAccount().getAccount_id()); @@ -84,10 +72,6 @@ old.setName(data.getName()); - - -old.setChild(data.getChild()); - final Adv3 test = Repository.save(old); data.setUpdatedBy(getUser().getUserId()); return test;} @@ -110,10 +94,6 @@ data.setUpdatedBy(getUser().getUserId()); return save; } - - - - public AppUser getUser() { AppUser user = userService.getLoggedInUser(); return user; diff --git a/testadvdatatype3-db-d/authsec_mysql/mysql/wf_table/wf_table.sql b/testadvdatatype3-db-d/authsec_mysql/mysql/wf_table/wf_table.sql index 0439cb2..8be41bd 100755 --- a/testadvdatatype3-db-d/authsec_mysql/mysql/wf_table/wf_table.sql +++ b/testadvdatatype3-db-d/authsec_mysql/mysql/wf_table/wf_table.sql @@ -2,5 +2,5 @@ CREATE TABLE db.Child(id BIGINT NOT NULL AUTO_INCREMENT, description VARCHAR(400 CREATE TABLE db.Testlist(id BIGINT NOT NULL AUTO_INCREMENT, description VARCHAR(400), name VARCHAR(400), PRIMARY KEY (id)); -CREATE TABLE db.Adv3(id BIGINT NOT NULL AUTO_INCREMENT, onetoone VARCHAR(400), value_list_field VARCHAR(400), button_field VARCHAR(400), name VARCHAR(400), PRIMARY KEY (id)); +CREATE TABLE db.Adv3(id BIGINT NOT NULL AUTO_INCREMENT, button_field VARCHAR(400), name VARCHAR(400), PRIMARY KEY (id)); diff --git a/testadvdatatype3-front-f/authsec_angular/frontend/angular-clarity-master/src/app/modules/main/BuilderComponents/basicp1/Adv3/Adv3.component.html b/testadvdatatype3-front-f/authsec_angular/frontend/angular-clarity-master/src/app/modules/main/BuilderComponents/basicp1/Adv3/Adv3.component.html index f7d4358..e9c15cb 100644 --- a/testadvdatatype3-front-f/authsec_angular/frontend/angular-clarity-master/src/app/modules/main/BuilderComponents/basicp1/Adv3/Adv3.component.html +++ b/testadvdatatype3-front-f/authsec_angular/frontend/angular-clarity-master/src/app/modules/main/BuilderComponents/basicp1/Adv3/Adv3.component.html @@ -35,19 +35,6 @@ - - - - - Description - - - - Name - - - - Action @@ -60,19 +47,6 @@ - - - - - -{{user.child.Description}} - - - -{{user.child.Name}} - - - @@ -229,10 +203,6 @@ - - - -

Update Adv3 @@ -240,10 +210,6 @@ - - - -

{{rowSelected.id}}

@@ -257,33 +223,11 @@ - - - -
- - - - - -
- -
- - - - -
- -
- - -

Extension

@@ -331,10 +275,6 @@ - - - -         @@ -356,10 +296,6 @@ - - - -
@@ -368,27 +304,6 @@ -
-

child

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

Extension

@@ -423,40 +338,6 @@ - - -

Select From value_list_field List:

-
-
-
-
-
- Loading ... - - - - - name - - - - - - - {{user.name}} - - - - - - Record per page - {{pagination.firstItem + 1}} - {{pagination.lastItem + 1}} - of {{pagination.totalItems}} Records -
- - - - diff --git a/testadvdatatype3-front-f/authsec_angular/frontend/angular-clarity-master/src/app/modules/main/BuilderComponents/basicp1/Adv3/Adv3.component.ts b/testadvdatatype3-front-f/authsec_angular/frontend/angular-clarity-master/src/app/modules/main/BuilderComponents/basicp1/Adv3/Adv3.component.ts index 15742b3..082f90b 100644 --- a/testadvdatatype3-front-f/authsec_angular/frontend/angular-clarity-master/src/app/modules/main/BuilderComponents/basicp1/Adv3/Adv3.component.ts +++ b/testadvdatatype3-front-f/authsec_angular/frontend/angular-clarity-master/src/app/modules/main/BuilderComponents/basicp1/Adv3/Adv3.component.ts @@ -71,18 +71,10 @@ name : [null], - -child: this.initLinesForm(), - - - - - - }); // component_button200 // inser code start this.insertFormButton_Field = this._fb.group({ @@ -118,32 +110,11 @@ child: this.initLinesForm(), - - - - } - - - -initLinesForm() { return this._fb.group({ - - - Description: [null], - - - - Name: [null], - - - -}); } - - error; getData() { this.mainService.getAll().subscribe((data) => { @@ -166,10 +137,6 @@ initLinesForm() { return this._fb.group({ - - - - this.modalEdit = true; } onDelete(row) { @@ -193,10 +160,6 @@ initLinesForm() { return this._fb.group({ - - - - //console.log("in update"); console.log("id " + id); console.log(this.rowSelected); @@ -214,10 +177,6 @@ setTimeout(() => { - - - - }, (error) => { console.log(error); if (error.status >= 200 && error.status <= 299) { @@ -240,10 +199,6 @@ onCreate() { - - - - this.mainService.create(this.entryForm.value).subscribe( (data) => { console.log(data); @@ -257,10 +212,6 @@ setTimeout(() => { - - - - }, (error) => { console.log(error); if (error.status >= 200 && error.status <= 299) { @@ -283,10 +234,6 @@ this.modalAdd = true; this.submitted = false; - - - - } submitted = false; onSubmit() { @@ -301,42 +248,6 @@ onSubmit() { -//Value List field start -valuelistMode; -searchcusttextvalue_list_field :any; - valueListModalvalue_list_field :boolean=false; - openvalueListvalue_list_field(mode){ - this.valueListModalvalue_list_field=!this.valueListModalvalue_list_field ; - this.valuelistMode = mode; } - customerdatavalue_list_field ; -cutomererror; - clickedID:number; - -getcustvalue_list_fieldID(id:number){ - this.clickedID=id; - console.log("clicked by id"+ id); - this.mainService.getById(id).subscribe((data) => { console.log(data); - if(this.valuelistMode == "ADD"){ - - - - this.entryForm.get('name').setValue(data.name); - - - - }else if(this.valuelistMode == "EDIT"){ - - - - this.rowSelected.name= data. name - - - - } }); this.valueListModalvalue_list_field =false; - } //value List field end - - - // updateaction // insert button @@ -383,7 +294,3 @@ if (data && data.id != null) { } - - - - diff --git a/testadvdatatype3-front-f/authsec_angular/frontend/angular-clarity-master/src/app/modules/main/BuilderComponents/basicp1/Adv3/Adv3.service.ts b/testadvdatatype3-front-f/authsec_angular/frontend/angular-clarity-master/src/app/modules/main/BuilderComponents/basicp1/Adv3/Adv3.service.ts index 84838b6..90d8539 100644 --- a/testadvdatatype3-front-f/authsec_angular/frontend/angular-clarity-master/src/app/modules/main/BuilderComponents/basicp1/Adv3/Adv3.service.ts +++ b/testadvdatatype3-front-f/authsec_angular/frontend/angular-clarity-master/src/app/modules/main/BuilderComponents/basicp1/Adv3/Adv3.service.ts @@ -33,10 +33,6 @@ export class Adv3service{ - - - - // updateaction // insert button code start insertButton_FieldTestlist(Testlist: any): Observable { diff --git a/testadvdatatype3-front-f/authsec_angular/frontend/angular-clarity-master/src/app/modules/main/main-routing.module.ts b/testadvdatatype3-front-f/authsec_angular/frontend/angular-clarity-master/src/app/modules/main/main-routing.module.ts index be19407..490661b 100644 --- a/testadvdatatype3-front-f/authsec_angular/frontend/angular-clarity-master/src/app/modules/main/main-routing.module.ts +++ b/testadvdatatype3-front-f/authsec_angular/frontend/angular-clarity-master/src/app/modules/main/main-routing.module.ts @@ -1,3 +1,6 @@ + + + import { Adv3Component } from './BuilderComponents/basicp1/Adv3/Adv3.component'; import { TestlistComponent } from './BuilderComponents/basicp1/Testlist/Testlist.component'; import { ChildComponent } from './BuilderComponents/basicp1/Child/Child.component'; @@ -260,6 +263,12 @@ const routes: Routes = [ // buildercomponents + + + + + + {path:'Adv3',component:Adv3Component}, diff --git a/testadvdatatype3-front-f/authsec_angular/frontend/angular-clarity-master/src/app/modules/main/main.module.ts b/testadvdatatype3-front-f/authsec_angular/frontend/angular-clarity-master/src/app/modules/main/main.module.ts index 9410b2a..a6f7da8 100644 --- a/testadvdatatype3-front-f/authsec_angular/frontend/angular-clarity-master/src/app/modules/main/main.module.ts +++ b/testadvdatatype3-front-f/authsec_angular/frontend/angular-clarity-master/src/app/modules/main/main.module.ts @@ -1,3 +1,6 @@ + + + import { Adv3Component } from './BuilderComponents/basicp1/Adv3/Adv3.component'; import { TestlistComponent } from './BuilderComponents/basicp1/Testlist/Testlist.component'; import { ChildComponent } from './BuilderComponents/basicp1/Child/Child.component'; @@ -132,6 +135,12 @@ import { Stepper_workflowComponent } from './BuilderComponents/stepperworkflow/S // buildercomponents + + + + + + Adv3Component,