diff --git a/teststeper004-back-b/authsec_springboot/backend/src/main/java/com/realnet/Builders/Services/BuilderService.java b/teststeper004-back-b/authsec_springboot/backend/src/main/java/com/realnet/Builders/Services/BuilderService.java index ec03172..3db23e9 100644 --- a/teststeper004-back-b/authsec_springboot/backend/src/main/java/com/realnet/Builders/Services/BuilderService.java +++ b/teststeper004-back-b/authsec_springboot/backend/src/main/java/com/realnet/Builders/Services/BuilderService.java @@ -72,6 +72,12 @@ public class BuilderService { addCustomMenu( "steper01","Stepper_workflow", "Transcations"); +addCustomMenu( "Forma","Forma", "Transcations"); + + +addCustomMenu( "steper01","Stepper_workflow", "Transcations"); + + addCustomMenu( "Forma","Forma", "Transcations"); diff --git a/teststeper004-back-b/authsec_springboot/backend/src/main/java/com/realnet/basicp1/Controllers/FormaController.java b/teststeper004-back-b/authsec_springboot/backend/src/main/java/com/realnet/basicp1/Controllers/FormaController.java index 2436450..8611e28 100644 --- a/teststeper004-back-b/authsec_springboot/backend/src/main/java/com/realnet/basicp1/Controllers/FormaController.java +++ b/teststeper004-back-b/authsec_springboot/backend/src/main/java/com/realnet/basicp1/Controllers/FormaController.java @@ -22,10 +22,6 @@ import com.realnet.basicp1.Services.FormaService ; - - - - @RequestMapping(value = "/Forma") @CrossOrigin("*") @RestController @@ -42,10 +38,6 @@ public class FormaController { - - - - @PostMapping("/Forma") public Forma Savedata(@RequestBody Forma data) { Forma save = Service.Savedata(data) ; @@ -54,10 +46,6 @@ public class FormaController { - - - - System.out.println("data saved..." + save); return save; @@ -108,8 +96,4 @@ public class FormaController { - - - - } \ No newline at end of file diff --git a/teststeper004-back-b/authsec_springboot/backend/src/main/java/com/realnet/basicp1/Controllers/tokenFree_FormaController.java b/teststeper004-back-b/authsec_springboot/backend/src/main/java/com/realnet/basicp1/Controllers/tokenFree_FormaController.java index c367636..9055171 100644 --- a/teststeper004-back-b/authsec_springboot/backend/src/main/java/com/realnet/basicp1/Controllers/tokenFree_FormaController.java +++ b/teststeper004-back-b/authsec_springboot/backend/src/main/java/com/realnet/basicp1/Controllers/tokenFree_FormaController.java @@ -22,10 +22,6 @@ import com.realnet.basicp1.Services.FormaService ; - - - - @RequestMapping(value = "/token/Forma") @CrossOrigin("*") @RestController @@ -42,10 +38,6 @@ public class tokenFree_FormaController { - - - - @PostMapping("/Forma") public Forma Savedata(@RequestBody Forma data) { Forma save = Service.Savedata(data) ; @@ -54,10 +46,6 @@ public class tokenFree_FormaController { - - - - System.out.println("data saved..." + save); return save; @@ -108,8 +96,4 @@ public class tokenFree_FormaController { - - - - } \ No newline at end of file diff --git a/teststeper004-back-b/authsec_springboot/backend/src/main/java/com/realnet/basicp1/Entity/Forma.java b/teststeper004-back-b/authsec_springboot/backend/src/main/java/com/realnet/basicp1/Entity/Forma.java index e585ac9..165a433 100644 --- a/teststeper004-back-b/authsec_springboot/backend/src/main/java/com/realnet/basicp1/Entity/Forma.java +++ b/teststeper004-back-b/authsec_springboot/backend/src/main/java/com/realnet/basicp1/Entity/Forma.java @@ -10,10 +10,6 @@ import com.realnet.WhoColumn.Entity.Extension; - - - - @Entity @Data public class Forma extends Extension { @@ -32,9 +28,5 @@ private String url_field; private double decimal_field; -private int percentage_field; - -private String recaptcha; - } diff --git a/teststeper004-back-b/authsec_springboot/backend/src/main/java/com/realnet/basicp1/Repository/FormaRepository.java b/teststeper004-back-b/authsec_springboot/backend/src/main/java/com/realnet/basicp1/Repository/FormaRepository.java index 31f11d4..98933ee 100644 --- a/teststeper004-back-b/authsec_springboot/backend/src/main/java/com/realnet/basicp1/Repository/FormaRepository.java +++ b/teststeper004-back-b/authsec_springboot/backend/src/main/java/com/realnet/basicp1/Repository/FormaRepository.java @@ -14,10 +14,6 @@ import java.util.*; - - - - diff --git a/teststeper004-back-b/authsec_springboot/backend/src/main/java/com/realnet/basicp1/Services/FormaService.java b/teststeper004-back-b/authsec_springboot/backend/src/main/java/com/realnet/basicp1/Services/FormaService.java index a9aa9e2..dfc68e4 100644 --- a/teststeper004-back-b/authsec_springboot/backend/src/main/java/com/realnet/basicp1/Services/FormaService.java +++ b/teststeper004-back-b/authsec_springboot/backend/src/main/java/com/realnet/basicp1/Services/FormaService.java @@ -18,10 +18,6 @@ import com.realnet.users.entity1.AppUser; - - - - import org.springframework.stereotype.Service; @Service @@ -37,10 +33,6 @@ private FormaRepository Repository; - - - - public Forma Savedata(Forma data) { @@ -48,10 +40,6 @@ public Forma Savedata(Forma data) { - - - - data.setUpdatedBy(getUser().getUserId()); data.setCreatedBy(getUser().getUserId()); data.setAccountId(getUser().getAccount().getAccount_id()); @@ -89,10 +77,6 @@ old.setUrl_field(data.getUrl_field()); old.setDecimal_field(data.getDecimal_field()); -old.setPercentage_field(data.getPercentage_field()); - -old.setRecaptcha(data.getRecaptcha()); - final Forma test = Repository.save(old); data.setUpdatedBy(getUser().getUserId()); return test;} @@ -102,10 +86,6 @@ final Forma test = Repository.save(old); - - - - public AppUser getUser() { AppUser user = userService.getLoggedInUser(); return user; diff --git a/teststeper004-db-d/authsec_mysql/mysql/wf_table/wf_table.sql b/teststeper004-db-d/authsec_mysql/mysql/wf_table/wf_table.sql index c079543..58d97d3 100755 --- a/teststeper004-db-d/authsec_mysql/mysql/wf_table/wf_table.sql +++ b/teststeper004-db-d/authsec_mysql/mysql/wf_table/wf_table.sql @@ -1,2 +1,2 @@ -CREATE TABLE db.Forma(id BIGINT NOT NULL AUTO_INCREMENT, recaptcha VARCHAR(400), percentage_field int, url_field VARCHAR(400), decimal_field double, name VARCHAR(400), PRIMARY KEY (id)); +CREATE TABLE db.Forma(id BIGINT NOT NULL AUTO_INCREMENT, url_field VARCHAR(400), decimal_field double, name VARCHAR(400), PRIMARY KEY (id)); diff --git a/teststeper004-front-f/authsec_angular/frontend/angular-clarity-master/src/app/modules/main/BuilderComponents/basicp1/Forma/Forma.component.html b/teststeper004-front-f/authsec_angular/frontend/angular-clarity-master/src/app/modules/main/BuilderComponents/basicp1/Forma/Forma.component.html index 397d4b6..ccf2fe3 100644 --- a/teststeper004-front-f/authsec_angular/frontend/angular-clarity-master/src/app/modules/main/BuilderComponents/basicp1/Forma/Forma.component.html +++ b/teststeper004-front-f/authsec_angular/frontend/angular-clarity-master/src/app/modules/main/BuilderComponents/basicp1/Forma/Forma.component.html @@ -34,14 +34,6 @@ Decimal Field - - Percentage Field - - - - recaptcha - - @@ -59,12 +51,6 @@ {{user. decimal_field }} - -{{user. percentage_field }} - - -{{user. recaptcha }} - @@ -223,10 +209,6 @@ - - - -

Update Forma @@ -236,10 +218,6 @@ - - - -

{{rowSelected.id}}

@@ -260,20 +238,6 @@
-
- - -
- -
-
{{ recaptchaCode }}  
- -
-
recaptcha not valid.
-
-
- @@ -281,10 +245,6 @@ - - - -

Extension

@@ -335,10 +295,6 @@ - - - -         -
- - -
-
*This field is Required
-
-
- -
-
{{ recaptchaCode }}  
- -
*This field is Required
-
-
recaptcha not valid.
-
-
-
@@ -398,10 +337,6 @@ - - - - @@ -440,8 +375,4 @@ - - - - diff --git a/teststeper004-front-f/authsec_angular/frontend/angular-clarity-master/src/app/modules/main/BuilderComponents/basicp1/Forma/Forma.component.ts b/teststeper004-front-f/authsec_angular/frontend/angular-clarity-master/src/app/modules/main/BuilderComponents/basicp1/Forma/Forma.component.ts index fa52bb1..43ab235 100644 --- a/teststeper004-front-f/authsec_angular/frontend/angular-clarity-master/src/app/modules/main/BuilderComponents/basicp1/Forma/Forma.component.ts +++ b/teststeper004-front-f/authsec_angular/frontend/angular-clarity-master/src/app/modules/main/BuilderComponents/basicp1/Forma/Forma.component.ts @@ -69,10 +69,6 @@ url_field : [null], decimal_field : [null,[Validators.required]], -percentage_field : [null,[Validators.required]], - -recaptcha : ['', [Validators.required,this.checkrecaptcha.bind(this)]], - @@ -80,10 +76,6 @@ recaptcha : ['', [Validators.required,this.checkrecaptcha.bind(this)]], - - - - }); // component_button200 // form code start this.extensionService.getJsonObjectsByFormCodeList(this.formcode).subscribe(data => { @@ -112,10 +104,6 @@ recaptcha : ['', [Validators.required,this.checkrecaptcha.bind(this)]], - - -this.generaterecaptcha() - } @@ -124,10 +112,6 @@ this.generaterecaptcha() - - - - error; getData() { this.mainService.getAll().subscribe((data) => { @@ -151,10 +135,6 @@ this.generaterecaptcha() - - - - this.modalEdit = true; } @@ -181,10 +161,6 @@ this.generaterecaptcha() - - - - //console.log("in update"); console.log("id " + id); console.log(this.rowSelected); @@ -204,10 +180,6 @@ setTimeout(() => { - - - - }, (error) => { console.log(error); if (error.status >= 200 && error.status <= 299) { @@ -232,10 +204,6 @@ onCreate() { - - - - this.mainService.create(this.entryForm.value).subscribe( (data) => { console.log(data); @@ -250,10 +218,6 @@ setTimeout(() => { - - - - }, (error) => { console.log(error); @@ -278,10 +242,6 @@ this.modalAdd = true; this.submitted = false; - - - - } submitted = false; @@ -301,34 +261,6 @@ isValidurl_field(url: string): boolean { - - -recaptchaCode = ''; -generaterecaptcha (): void { - const possibleCharacters = 'ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789'; - const codeLength = 6; // Change to desired length - - let recaptcha= ''; - for (let i = 0; i < codeLength; i++) { - const randomIndex = Math.floor(Math.random() * possibleCharacters.length); - recaptcha += possibleCharacters.charAt(randomIndex); - } - this.recaptchaCode = recaptcha; -} - -checkrecaptcha(control: AbstractControl): ValidationErrors | null { - if (control.value !== this.recaptchaCode) { - return { recaptchaMismatch: true }; - } - return null; -} - -recaptchaMismatch = false; - -checkrecaptchaEdit(): void { - if (this.rowSelected.recaptcha !== this. recaptchaCode) { - this. recaptchaMismatch = true; } else { this.recaptchaMismatch = false; } } - // updateaction } @@ -336,7 +268,3 @@ checkrecaptchaEdit(): void { - - - - diff --git a/teststeper004-front-f/authsec_angular/frontend/angular-clarity-master/src/app/modules/main/BuilderComponents/basicp1/Forma/Forma.service.ts b/teststeper004-front-f/authsec_angular/frontend/angular-clarity-master/src/app/modules/main/BuilderComponents/basicp1/Forma/Forma.service.ts index dea5586..31015de 100644 --- a/teststeper004-front-f/authsec_angular/frontend/angular-clarity-master/src/app/modules/main/BuilderComponents/basicp1/Forma/Forma.service.ts +++ b/teststeper004-front-f/authsec_angular/frontend/angular-clarity-master/src/app/modules/main/BuilderComponents/basicp1/Forma/Forma.service.ts @@ -35,9 +35,5 @@ export class Formaservice{ - - - - // updateaction } \ No newline at end of file diff --git a/teststeper004-front-f/authsec_angular/frontend/angular-clarity-master/src/app/modules/main/BuilderComponents/stepperworkflow/Stepper_workflow/Stepper_workflow.component.ts b/teststeper004-front-f/authsec_angular/frontend/angular-clarity-master/src/app/modules/main/BuilderComponents/stepperworkflow/Stepper_workflow/Stepper_workflow.component.ts index 31d0763..5f7b2bc 100644 --- a/teststeper004-front-f/authsec_angular/frontend/angular-clarity-master/src/app/modules/main/BuilderComponents/stepperworkflow/Stepper_workflow/Stepper_workflow.component.ts +++ b/teststeper004-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(["../steper01/", id], { relativeTo: this.route }); diff --git a/teststeper004-front-f/authsec_angular/frontend/angular-clarity-master/src/app/modules/main/BuilderComponents/stepperworkflow/steper01/steper01.component.html b/teststeper004-front-f/authsec_angular/frontend/angular-clarity-master/src/app/modules/main/BuilderComponents/stepperworkflow/steper01/steper01.component.html index 314fb8e..26efc06 100644 --- a/teststeper004-front-f/authsec_angular/frontend/angular-clarity-master/src/app/modules/main/BuilderComponents/stepperworkflow/steper01/steper01.component.html +++ b/teststeper004-front-f/authsec_angular/frontend/angular-clarity-master/src/app/modules/main/BuilderComponents/stepperworkflow/steper01/steper01.component.html @@ -79,23 +79,6 @@ -
- - -
-
*This field is Required
-
-
- -
-
{{ recaptchaCode }}  
- -
*This field is Required
-
-
recaptcha not valid.
-
-
- @@ -105,10 +88,6 @@ - - - -
@@ -143,10 +122,6 @@

Decimal Field : {{ FormaentryForm.get('decimal_field')?.value }}

-

Percentage Field : {{ FormaentryForm.get('percentage_field')?.value }}

- -

recaptcha : {{ FormaentryForm.get('recaptcha')?.value }}

-
diff --git a/teststeper004-front-f/authsec_angular/frontend/angular-clarity-master/src/app/modules/main/BuilderComponents/stepperworkflow/steper01/steper01.component.ts b/teststeper004-front-f/authsec_angular/frontend/angular-clarity-master/src/app/modules/main/BuilderComponents/stepperworkflow/steper01/steper01.component.ts index c5b2d1f..7725909 100644 --- a/teststeper004-front-f/authsec_angular/frontend/angular-clarity-master/src/app/modules/main/BuilderComponents/stepperworkflow/steper01/steper01.component.ts +++ b/teststeper004-front-f/authsec_angular/frontend/angular-clarity-master/src/app/modules/main/BuilderComponents/stepperworkflow/steper01/steper01.component.ts @@ -74,10 +74,6 @@ url_field : [null], decimal_field : [null,[Validators.required]], -percentage_field : [null,[Validators.required]], - -recaptcha : ['', [Validators.required,this.checkrecaptcha.bind(this)]], - }); @@ -87,19 +83,11 @@ recaptcha : ['', [Validators.required,this.checkrecaptcha.bind(this)]], -this.generaterecaptcha() - - - - -this.generaterecaptcha() - - const stepId = this.id; // or from route/query/etc this.getResolvedDataFromStepper(stepId).subscribe(res => { @@ -132,10 +120,6 @@ url_field: data.url_field || '', decimal_field: data.decimal_field || '', -percentage_field: data.percentage_field || '', - -recaptcha: data.recaptcha || '', - }); } getResolvedDataFromStepper(id: number): Observable { @@ -240,10 +224,6 @@ recaptcha: data.recaptcha || '', - - - - this.mainService.createForma(this.FormaentryForm.value).subscribe( (data) => { console.log('adding data ', data); @@ -272,10 +252,6 @@ recaptcha: data.recaptcha || '', - - - - }, (error) => { console.log(error); if (error.status >= 200 && error.status <= 299) { @@ -329,10 +305,6 @@ recaptcha: data.recaptcha || '', - - - - // updateaction } @@ -340,7 +312,3 @@ recaptcha: data.recaptcha || '', - - - - diff --git a/teststeper004-front-f/authsec_angular/frontend/angular-clarity-master/src/app/modules/main/BuilderComponents/stepperworkflow/steper01/steper01.service.ts b/teststeper004-front-f/authsec_angular/frontend/angular-clarity-master/src/app/modules/main/BuilderComponents/stepperworkflow/steper01/steper01.service.ts index a79bdc2..4c5d259 100644 --- a/teststeper004-front-f/authsec_angular/frontend/angular-clarity-master/src/app/modules/main/BuilderComponents/stepperworkflow/steper01/steper01.service.ts +++ b/teststeper004-front-f/authsec_angular/frontend/angular-clarity-master/src/app/modules/main/BuilderComponents/stepperworkflow/steper01/steper01.service.ts @@ -48,9 +48,5 @@ gettabledata(id: number): Observable { - - - - // updateaction } \ No newline at end of file diff --git a/teststeper004-front-f/authsec_angular/frontend/angular-clarity-master/src/app/modules/main/main-routing.module.ts b/teststeper004-front-f/authsec_angular/frontend/angular-clarity-master/src/app/modules/main/main-routing.module.ts index e8d1647..b009ff7 100644 --- a/teststeper004-front-f/authsec_angular/frontend/angular-clarity-master/src/app/modules/main/main-routing.module.ts +++ b/teststeper004-front-f/authsec_angular/frontend/angular-clarity-master/src/app/modules/main/main-routing.module.ts @@ -1,3 +1,5 @@ + + import { steper01Component } from './BuilderComponents/stepperworkflow/steper01/steper01.component'; import { FormaComponent } from './BuilderComponents/basicp1/Forma/Forma.component'; @@ -258,6 +260,10 @@ const routes: Routes = [ // buildercomponents + + + + {path:'steper01/:id',component:steper01Component}, diff --git a/teststeper004-front-f/authsec_angular/frontend/angular-clarity-master/src/app/modules/main/main.module.ts b/teststeper004-front-f/authsec_angular/frontend/angular-clarity-master/src/app/modules/main/main.module.ts index 551b9e6..e32392a 100644 --- a/teststeper004-front-f/authsec_angular/frontend/angular-clarity-master/src/app/modules/main/main.module.ts +++ b/teststeper004-front-f/authsec_angular/frontend/angular-clarity-master/src/app/modules/main/main.module.ts @@ -1,3 +1,5 @@ + + import { steper01Component } from './BuilderComponents/stepperworkflow/steper01/steper01.component'; import { FormaComponent } from './BuilderComponents/basicp1/Forma/Forma.component'; @@ -131,6 +133,10 @@ import { Stepper_workflowComponent } from './BuilderComponents/stepperworkflow/S // buildercomponents + + + + steper01Component,