diff --git a/steper022-back-b/authsec_springboot/backend/src/main/java/com/realnet/Builders/Services/BuilderService.java b/steper022-back-b/authsec_springboot/backend/src/main/java/com/realnet/Builders/Services/BuilderService.java index a40f39b..1122fc5 100644 --- a/steper022-back-b/authsec_springboot/backend/src/main/java/com/realnet/Builders/Services/BuilderService.java +++ b/steper022-back-b/authsec_springboot/backend/src/main/java/com/realnet/Builders/Services/BuilderService.java @@ -72,6 +72,12 @@ public class BuilderService { addCustomMenu( "Steps","Stepper_workflow", "Transcations"); +addCustomMenu( "Forma","Forma", "Transcations"); + + +addCustomMenu( "Steps","Stepper_workflow", "Transcations"); + + addCustomMenu( "Forma","Forma", "Transcations"); diff --git a/steper022-back-b/authsec_springboot/backend/src/main/java/com/realnet/basicp1/Controllers/FormaController.java b/steper022-back-b/authsec_springboot/backend/src/main/java/com/realnet/basicp1/Controllers/FormaController.java index 8611e28..9368165 100644 --- a/steper022-back-b/authsec_springboot/backend/src/main/java/com/realnet/basicp1/Controllers/FormaController.java +++ b/steper022-back-b/authsec_springboot/backend/src/main/java/com/realnet/basicp1/Controllers/FormaController.java @@ -20,8 +20,6 @@ import com.realnet.basicp1.Services.FormaService ; - - @RequestMapping(value = "/Forma") @CrossOrigin("*") @RestController @@ -36,16 +34,12 @@ public class FormaController { - - @PostMapping("/Forma") public Forma Savedata(@RequestBody Forma data) { Forma save = Service.Savedata(data) ; - - System.out.println("data saved..." + save); return save; @@ -94,6 +88,4 @@ public class FormaController { - - } \ No newline at end of file diff --git a/steper022-back-b/authsec_springboot/backend/src/main/java/com/realnet/basicp1/Controllers/tokenFree_FormaController.java b/steper022-back-b/authsec_springboot/backend/src/main/java/com/realnet/basicp1/Controllers/tokenFree_FormaController.java index 9055171..002a998 100644 --- a/steper022-back-b/authsec_springboot/backend/src/main/java/com/realnet/basicp1/Controllers/tokenFree_FormaController.java +++ b/steper022-back-b/authsec_springboot/backend/src/main/java/com/realnet/basicp1/Controllers/tokenFree_FormaController.java @@ -20,8 +20,6 @@ import com.realnet.basicp1.Services.FormaService ; - - @RequestMapping(value = "/token/Forma") @CrossOrigin("*") @RestController @@ -36,16 +34,12 @@ public class tokenFree_FormaController { - - @PostMapping("/Forma") public Forma Savedata(@RequestBody Forma data) { Forma save = Service.Savedata(data) ; - - System.out.println("data saved..." + save); return save; @@ -94,6 +88,4 @@ public class tokenFree_FormaController { - - } \ No newline at end of file diff --git a/steper022-back-b/authsec_springboot/backend/src/main/java/com/realnet/basicp1/Entity/Forma.java b/steper022-back-b/authsec_springboot/backend/src/main/java/com/realnet/basicp1/Entity/Forma.java index 3018687..8191809 100644 --- a/steper022-back-b/authsec_springboot/backend/src/main/java/com/realnet/basicp1/Entity/Forma.java +++ b/steper022-back-b/authsec_springboot/backend/src/main/java/com/realnet/basicp1/Entity/Forma.java @@ -8,8 +8,6 @@ import com.realnet.WhoColumn.Entity.Extension; - - @Entity @Data public class Forma extends Extension { @@ -27,7 +25,5 @@ private String name; private String fileupload_fieldname; private String fileupload_fieldpath ; -private String qrcode_field; - } diff --git a/steper022-back-b/authsec_springboot/backend/src/main/java/com/realnet/basicp1/Repository/FormaRepository.java b/steper022-back-b/authsec_springboot/backend/src/main/java/com/realnet/basicp1/Repository/FormaRepository.java index 98933ee..c472b34 100644 --- a/steper022-back-b/authsec_springboot/backend/src/main/java/com/realnet/basicp1/Repository/FormaRepository.java +++ b/steper022-back-b/authsec_springboot/backend/src/main/java/com/realnet/basicp1/Repository/FormaRepository.java @@ -12,8 +12,6 @@ import java.util.*; - - diff --git a/steper022-back-b/authsec_springboot/backend/src/main/java/com/realnet/basicp1/Services/FormaService.java b/steper022-back-b/authsec_springboot/backend/src/main/java/com/realnet/basicp1/Services/FormaService.java index b922787..e0c4de7 100644 --- a/steper022-back-b/authsec_springboot/backend/src/main/java/com/realnet/basicp1/Services/FormaService.java +++ b/steper022-back-b/authsec_springboot/backend/src/main/java/com/realnet/basicp1/Services/FormaService.java @@ -16,8 +16,6 @@ import com.realnet.users.entity1.AppUser; - - import org.springframework.stereotype.Service; @Service @@ -31,15 +29,11 @@ private FormaRepository Repository; - - public Forma Savedata(Forma data) { - - data.setUpdatedBy(getUser().getUserId()); data.setCreatedBy(getUser().getUserId()); data.setAccountId(getUser().getAccount().getAccount_id()); @@ -75,8 +69,6 @@ old.setName(data.getName()); -old.setQrcode_field(data.getQrcode_field()); - final Forma test = Repository.save(old); data.setUpdatedBy(getUser().getUserId()); return test;} @@ -84,8 +76,6 @@ final Forma test = Repository.save(old); - - public AppUser getUser() { AppUser user = userService.getLoggedInUser(); return user; diff --git a/steper022-db-d/authsec_mysql/mysql/wf_table/wf_table.sql b/steper022-db-d/authsec_mysql/mysql/wf_table/wf_table.sql index e45ead5..7ad41e7 100755 --- a/steper022-db-d/authsec_mysql/mysql/wf_table/wf_table.sql +++ b/steper022-db-d/authsec_mysql/mysql/wf_table/wf_table.sql @@ -1,2 +1,2 @@ -CREATE TABLE db.Forma(id BIGINT NOT NULL AUTO_INCREMENT, qrcode_field VARCHAR(400), fileupload_field VARCHAR(400), name VARCHAR(400), PRIMARY KEY (id)); +CREATE TABLE db.Forma(id BIGINT NOT NULL AUTO_INCREMENT, fileupload_field VARCHAR(400), name VARCHAR(400), PRIMARY KEY (id)); diff --git a/steper022-front-f/authsec_angular/frontend/angular-clarity-master/src/app/modules/main/BuilderComponents/basicp1/Forma/Forma.component.html b/steper022-front-f/authsec_angular/frontend/angular-clarity-master/src/app/modules/main/BuilderComponents/basicp1/Forma/Forma.component.html index 8cfb933..90884ed 100644 --- a/steper022-front-f/authsec_angular/frontend/angular-clarity-master/src/app/modules/main/BuilderComponents/basicp1/Forma/Forma.component.html +++ b/steper022-front-f/authsec_angular/frontend/angular-clarity-master/src/app/modules/main/BuilderComponents/basicp1/Forma/Forma.component.html @@ -28,10 +28,6 @@ - - QRCode Field - - @@ -45,9 +41,6 @@ - -{{user.qrcode_field }} - @@ -204,8 +197,6 @@ - - @@ -281,8 +262,6 @@ - -

Extension

@@ -331,8 +310,6 @@ - -         -
- - -
- -
@@ -399,8 +369,6 @@ - - @@ -437,6 +405,4 @@ - - diff --git a/steper022-front-f/authsec_angular/frontend/angular-clarity-master/src/app/modules/main/BuilderComponents/basicp1/Forma/Forma.component.ts b/steper022-front-f/authsec_angular/frontend/angular-clarity-master/src/app/modules/main/BuilderComponents/basicp1/Forma/Forma.component.ts index cf213bc..cba77bf 100644 --- a/steper022-front-f/authsec_angular/frontend/angular-clarity-master/src/app/modules/main/BuilderComponents/basicp1/Forma/Forma.component.ts +++ b/steper022-front-f/authsec_angular/frontend/angular-clarity-master/src/app/modules/main/BuilderComponents/basicp1/Forma/Forma.component.ts @@ -67,15 +67,11 @@ name : [null], -qrcode_field : [null], - - - }); // component_button200 // form code start this.extensionService.getJsonObjectsByFormCodeList(this.formcode).subscribe(data => { @@ -102,16 +98,12 @@ qrcode_field : [null], - - } - - error; getData() { this.mainService.getAll().subscribe((data) => { @@ -138,8 +130,6 @@ qrcode_field : [null], }) - - this.modalEdit = true; } @@ -164,8 +154,6 @@ qrcode_field : [null], - - //console.log("in update"); console.log("id " + id); console.log(this.rowSelected); @@ -188,8 +176,6 @@ for (let i = 0; i < this.selectedfileupload_field.length; i++){ }) } - - }, (error) => { console.log(error); if (error.status >= 200 && error.status <= 299) { @@ -212,8 +198,6 @@ onCreate() { - - this.mainService.create(this.entryForm.value).subscribe( (data) => { console.log(data); @@ -231,8 +215,6 @@ for (let i = 0; i < this.selectedfileupload_field.length; i++){ }) } - - }, (error) => { console.log(error); @@ -256,8 +238,6 @@ this.modalAdd = true; this.submitted = false; this.FileDatafileupload_field = []; this.selectedfileupload_field =[]; - - } submitted = false; @@ -311,12 +291,8 @@ public onFileChangedfileupload_field(event, index) { } } - - // updateaction } - - diff --git a/steper022-front-f/authsec_angular/frontend/angular-clarity-master/src/app/modules/main/BuilderComponents/basicp1/Forma/Forma.service.ts b/steper022-front-f/authsec_angular/frontend/angular-clarity-master/src/app/modules/main/BuilderComponents/basicp1/Forma/Forma.service.ts index 3e04c98..6920a42 100644 --- a/steper022-front-f/authsec_angular/frontend/angular-clarity-master/src/app/modules/main/BuilderComponents/basicp1/Forma/Forma.service.ts +++ b/steper022-front-f/authsec_angular/frontend/angular-clarity-master/src/app/modules/main/BuilderComponents/basicp1/Forma/Forma.service.ts @@ -46,7 +46,5 @@ export class Formaservice{ return this.apiRequest.delete(`FileUpload/Uploadeddocs/${id}`); } - - // updateaction } \ No newline at end of file diff --git a/steper022-front-f/authsec_angular/frontend/angular-clarity-master/src/app/modules/main/BuilderComponents/stepperworkflow/Stepper_workflow/Stepper_workflow.component.ts b/steper022-front-f/authsec_angular/frontend/angular-clarity-master/src/app/modules/main/BuilderComponents/stepperworkflow/Stepper_workflow/Stepper_workflow.component.ts index 477aabb..bdf2d87 100644 --- a/steper022-front-f/authsec_angular/frontend/angular-clarity-master/src/app/modules/main/BuilderComponents/stepperworkflow/Stepper_workflow/Stepper_workflow.component.ts +++ b/steper022-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(["../steps/", id], { relativeTo: this.route }); diff --git a/steper022-front-f/authsec_angular/frontend/angular-clarity-master/src/app/modules/main/BuilderComponents/stepperworkflow/steps/steps.component.html b/steper022-front-f/authsec_angular/frontend/angular-clarity-master/src/app/modules/main/BuilderComponents/stepperworkflow/steps/steps.component.html index 0efbca3..a1b2614 100644 --- a/steper022-front-f/authsec_angular/frontend/angular-clarity-master/src/app/modules/main/BuilderComponents/stepperworkflow/steps/steps.component.html +++ b/steper022-front-f/authsec_angular/frontend/angular-clarity-master/src/app/modules/main/BuilderComponents/stepperworkflow/steps/steps.component.html @@ -65,13 +65,6 @@ - -
- - -
- - @@ -112,8 +105,6 @@ - -
@@ -146,8 +137,6 @@

Fileupload Field : {{ FormaentryForm.get('fileupload_field')?.value }}

-

QRCode Field : {{ FormaentryForm.get('qrcode_field')?.value }}

-
diff --git a/steper022-front-f/authsec_angular/frontend/angular-clarity-master/src/app/modules/main/BuilderComponents/stepperworkflow/steps/steps.component.ts b/steper022-front-f/authsec_angular/frontend/angular-clarity-master/src/app/modules/main/BuilderComponents/stepperworkflow/steps/steps.component.ts index d70795a..08d7af5 100644 --- a/steper022-front-f/authsec_angular/frontend/angular-clarity-master/src/app/modules/main/BuilderComponents/stepperworkflow/steps/steps.component.ts +++ b/steper022-front-f/authsec_angular/frontend/angular-clarity-master/src/app/modules/main/BuilderComponents/stepperworkflow/steps/steps.component.ts @@ -73,16 +73,12 @@ name : [null], -qrcode_field : [null], - }); - - const stepId = this.id; // or from route/query/etc this.getResolvedDataFromStepper(stepId).subscribe(res => { @@ -113,8 +109,6 @@ name: data.name || '', fileupload_field: data.fileupload_field || '', -qrcode_field: data.qrcode_field || '', - }); } getResolvedDataFromStepper(id: number): Observable { @@ -217,8 +211,6 @@ qrcode_field: data.qrcode_field || '', - - this.mainService.createForma(this.FormaentryForm.value).subscribe( (data) => { console.log('adding data ', data); @@ -250,8 +242,6 @@ for (let i = 0; i < this.selectedfileupload_field.length; i++){ } - - }, (error) => { console.log(error); if (error.status >= 200 && error.status <= 299) { @@ -345,14 +335,8 @@ public onFileChangedfileupload_field(event, index) { - - - - // updateaction } - - diff --git a/steper022-front-f/authsec_angular/frontend/angular-clarity-master/src/app/modules/main/BuilderComponents/stepperworkflow/steps/steps.service.ts b/steper022-front-f/authsec_angular/frontend/angular-clarity-master/src/app/modules/main/BuilderComponents/stepperworkflow/steps/steps.service.ts index f09b1c1..928d051 100644 --- a/steper022-front-f/authsec_angular/frontend/angular-clarity-master/src/app/modules/main/BuilderComponents/stepperworkflow/steps/steps.service.ts +++ b/steper022-front-f/authsec_angular/frontend/angular-clarity-master/src/app/modules/main/BuilderComponents/stepperworkflow/steps/steps.service.ts @@ -59,7 +59,5 @@ gettabledata(id: number): Observable { return this.apiRequest.delete(`FileUpload/Uploadeddocs/${id}`); } - - // updateaction } \ No newline at end of file diff --git a/steper022-front-f/authsec_angular/frontend/angular-clarity-master/src/app/modules/main/main-routing.module.ts b/steper022-front-f/authsec_angular/frontend/angular-clarity-master/src/app/modules/main/main-routing.module.ts index f530fee..28a926c 100644 --- a/steper022-front-f/authsec_angular/frontend/angular-clarity-master/src/app/modules/main/main-routing.module.ts +++ b/steper022-front-f/authsec_angular/frontend/angular-clarity-master/src/app/modules/main/main-routing.module.ts @@ -1,3 +1,5 @@ + + import { stepsComponent } from './BuilderComponents/stepperworkflow/steps/steps.component'; import { FormaComponent } from './BuilderComponents/basicp1/Forma/Forma.component'; @@ -258,6 +260,10 @@ const routes: Routes = [ // buildercomponents + + + + {path:'steps/:id',component:stepsComponent}, diff --git a/steper022-front-f/authsec_angular/frontend/angular-clarity-master/src/app/modules/main/main.module.ts b/steper022-front-f/authsec_angular/frontend/angular-clarity-master/src/app/modules/main/main.module.ts index 9569201..b8fd023 100644 --- a/steper022-front-f/authsec_angular/frontend/angular-clarity-master/src/app/modules/main/main.module.ts +++ b/steper022-front-f/authsec_angular/frontend/angular-clarity-master/src/app/modules/main/main.module.ts @@ -1,3 +1,5 @@ + + import { stepsComponent } from './BuilderComponents/stepperworkflow/steps/steps.component'; import { FormaComponent } from './BuilderComponents/basicp1/Forma/Forma.component'; @@ -131,6 +133,10 @@ import { Stepper_workflowComponent } from './BuilderComponents/stepperworkflow/S // buildercomponents + + + + stepsComponent, diff --git a/steper022-front-f/authsec_angular/frontend/angular-clarity-master/src/assets/i18n/en.json b/steper022-front-f/authsec_angular/frontend/angular-clarity-master/src/assets/i18n/en.json index aafba06..01bf9a1 100644 --- a/steper022-front-f/authsec_angular/frontend/angular-clarity-master/src/assets/i18n/en.json +++ b/steper022-front-f/authsec_angular/frontend/angular-clarity-master/src/assets/i18n/en.json @@ -227,7 +227,6 @@ "STATUS": "Status", "SUB_MENU": "Sub Menu", "Forma": "Forma", - "QRCode_Field": "QRCode_Field", "Fileupload_Field": "Fileupload_Field", "Name": "Name" } \ No newline at end of file