diff --git a/steper005-back-b/authsec_springboot/backend/src/main/java/com/realnet/Builders/Services/BuilderService.java b/steper005-back-b/authsec_springboot/backend/src/main/java/com/realnet/Builders/Services/BuilderService.java index 55b4bad..88b43c0 100644 --- a/steper005-back-b/authsec_springboot/backend/src/main/java/com/realnet/Builders/Services/BuilderService.java +++ b/steper005-back-b/authsec_springboot/backend/src/main/java/com/realnet/Builders/Services/BuilderService.java @@ -72,6 +72,9 @@ public class BuilderService { addCustomMenu( "Forma","Forma", "Transcations"); +addCustomMenu( "Forma","Forma", "Transcations"); + + System.out.println("dashboard and menu inserted..."); diff --git a/steper005-back-b/authsec_springboot/backend/src/main/java/com/realnet/basicp1/Controllers/FormaController.java b/steper005-back-b/authsec_springboot/backend/src/main/java/com/realnet/basicp1/Controllers/FormaController.java index 8611e28..9368165 100644 --- a/steper005-back-b/authsec_springboot/backend/src/main/java/com/realnet/basicp1/Controllers/FormaController.java +++ b/steper005-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/steper005-back-b/authsec_springboot/backend/src/main/java/com/realnet/basicp1/Controllers/tokenFree_FormaController.java b/steper005-back-b/authsec_springboot/backend/src/main/java/com/realnet/basicp1/Controllers/tokenFree_FormaController.java index 9055171..002a998 100644 --- a/steper005-back-b/authsec_springboot/backend/src/main/java/com/realnet/basicp1/Controllers/tokenFree_FormaController.java +++ b/steper005-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/steper005-back-b/authsec_springboot/backend/src/main/java/com/realnet/basicp1/Entity/Forma.java b/steper005-back-b/authsec_springboot/backend/src/main/java/com/realnet/basicp1/Entity/Forma.java index d48b71f..6e43674 100644 --- a/steper005-back-b/authsec_springboot/backend/src/main/java/com/realnet/basicp1/Entity/Forma.java +++ b/steper005-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 { @@ -26,8 +24,5 @@ private String name; private String documentsequence; - private Long user_id; - private String user_name; - } diff --git a/steper005-back-b/authsec_springboot/backend/src/main/java/com/realnet/basicp1/Repository/FormaRepository.java b/steper005-back-b/authsec_springboot/backend/src/main/java/com/realnet/basicp1/Repository/FormaRepository.java index 98933ee..c472b34 100644 --- a/steper005-back-b/authsec_springboot/backend/src/main/java/com/realnet/basicp1/Repository/FormaRepository.java +++ b/steper005-back-b/authsec_springboot/backend/src/main/java/com/realnet/basicp1/Repository/FormaRepository.java @@ -12,8 +12,6 @@ import java.util.*; - - diff --git a/steper005-back-b/authsec_springboot/backend/src/main/java/com/realnet/basicp1/Services/FormaService.java b/steper005-back-b/authsec_springboot/backend/src/main/java/com/realnet/basicp1/Services/FormaService.java index abf4b33..63e0214 100644 --- a/steper005-back-b/authsec_springboot/backend/src/main/java/com/realnet/basicp1/Services/FormaService.java +++ b/steper005-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 @@ -32,16 +30,11 @@ private FormaRepository Repository; @Autowired private SequenceService documentsequencesequenceService; - - public Forma Savedata(Forma data) { data.setDocumentsequence (documentsequencesequenceService.GenerateSequence("kk")); -data.setUser_id(getUser().getUserId()); - data.setUser_name(getUser().getFullName()); - data.setUpdatedBy(getUser().getUserId()); data.setCreatedBy(getUser().getUserId()); data.setAccountId(getUser().getAccount().getAccount_id()); @@ -77,8 +70,6 @@ old.setName(data.getName()); old.setDocumentsequence(data.getDocumentsequence()); - - final Forma test = Repository.save(old); data.setUpdatedBy(getUser().getUserId()); return test;} @@ -86,8 +77,6 @@ final Forma test = Repository.save(old); - - public AppUser getUser() { AppUser user = userService.getLoggedInUser(); return user; diff --git a/steper005-db-d/authsec_mysql/mysql/wf_table/wf_table.sql b/steper005-db-d/authsec_mysql/mysql/wf_table/wf_table.sql index 598d9eb..4a91583 100755 --- a/steper005-db-d/authsec_mysql/mysql/wf_table/wf_table.sql +++ b/steper005-db-d/authsec_mysql/mysql/wf_table/wf_table.sql @@ -1,2 +1,2 @@ -CREATE TABLE db.Forma(id BIGINT NOT NULL AUTO_INCREMENT, userid_field VARCHAR(400), name VARCHAR(400), documentsequence VARCHAR(400), PRIMARY KEY (id)); +CREATE TABLE db.Forma(id BIGINT NOT NULL AUTO_INCREMENT, name VARCHAR(400), documentsequence VARCHAR(400), PRIMARY KEY (id)); diff --git a/steper005-front-f/authsec_angular/frontend/angular-clarity-master/src/app/modules/main/BuilderComponents/basicp1/Forma/Forma.component.html b/steper005-front-f/authsec_angular/frontend/angular-clarity-master/src/app/modules/main/BuilderComponents/basicp1/Forma/Forma.component.html index 0ee9501..1c6f17e 100644 --- a/steper005-front-f/authsec_angular/frontend/angular-clarity-master/src/app/modules/main/BuilderComponents/basicp1/Forma/Forma.component.html +++ b/steper005-front-f/authsec_angular/frontend/angular-clarity-master/src/app/modules/main/BuilderComponents/basicp1/Forma/Forma.component.html @@ -30,8 +30,6 @@ documentsequence - - @@ -46,8 +44,6 @@ {{user. documentsequence }} - - @@ -204,8 +200,6 @@ - -

Update Forma @@ -213,8 +207,6 @@ - -

{{rowSelected.id}}

@@ -228,15 +220,11 @@ - -
- -

Extension

@@ -285,8 +273,6 @@ - -         - - @@ -353,6 +335,4 @@ - - diff --git a/steper005-front-f/authsec_angular/frontend/angular-clarity-master/src/app/modules/main/BuilderComponents/basicp1/Forma/Forma.component.ts b/steper005-front-f/authsec_angular/frontend/angular-clarity-master/src/app/modules/main/BuilderComponents/basicp1/Forma/Forma.component.ts index a2533e5..ba3d28d 100644 --- a/steper005-front-f/authsec_angular/frontend/angular-clarity-master/src/app/modules/main/BuilderComponents/basicp1/Forma/Forma.component.ts +++ b/steper005-front-f/authsec_angular/frontend/angular-clarity-master/src/app/modules/main/BuilderComponents/basicp1/Forma/Forma.component.ts @@ -68,14 +68,10 @@ name : [null], documentsequence : [null], - - - - }); // component_button200 // form code start this.extensionService.getJsonObjectsByFormCodeList(this.formcode).subscribe(data => { @@ -102,16 +98,12 @@ documentsequence : [null], - - } - - error; getData() { this.mainService.getAll().subscribe((data) => { @@ -133,8 +125,6 @@ documentsequence : [null], - - this.modalEdit = true; } @@ -159,8 +149,6 @@ documentsequence : [null], - - //console.log("in update"); console.log("id " + id); console.log(this.rowSelected); @@ -178,8 +166,6 @@ setTimeout(() => { - - }, (error) => { console.log(error); if (error.status >= 200 && error.status <= 299) { @@ -202,8 +188,6 @@ onCreate() { - - this.mainService.create(this.entryForm.value).subscribe( (data) => { console.log(data); @@ -216,8 +200,6 @@ setTimeout(() => { - - }, (error) => { console.log(error); @@ -240,8 +222,6 @@ this.modalAdd = true; this.submitted = false; - - } submitted = false; @@ -257,12 +237,8 @@ onSubmit() { - - // updateaction } - - diff --git a/steper005-front-f/authsec_angular/frontend/angular-clarity-master/src/app/modules/main/BuilderComponents/basicp1/Forma/Forma.service.ts b/steper005-front-f/authsec_angular/frontend/angular-clarity-master/src/app/modules/main/BuilderComponents/basicp1/Forma/Forma.service.ts index 31015de..da02b28 100644 --- a/steper005-front-f/authsec_angular/frontend/angular-clarity-master/src/app/modules/main/BuilderComponents/basicp1/Forma/Forma.service.ts +++ b/steper005-front-f/authsec_angular/frontend/angular-clarity-master/src/app/modules/main/BuilderComponents/basicp1/Forma/Forma.service.ts @@ -33,7 +33,5 @@ export class Formaservice{ - - // updateaction } \ No newline at end of file diff --git a/steper005-front-f/authsec_angular/frontend/angular-clarity-master/src/app/modules/main/main-routing.module.ts b/steper005-front-f/authsec_angular/frontend/angular-clarity-master/src/app/modules/main/main-routing.module.ts index c27e63d..90dcc47 100644 --- a/steper005-front-f/authsec_angular/frontend/angular-clarity-master/src/app/modules/main/main-routing.module.ts +++ b/steper005-front-f/authsec_angular/frontend/angular-clarity-master/src/app/modules/main/main-routing.module.ts @@ -1,3 +1,4 @@ + import { FormaComponent } from './BuilderComponents/basicp1/Forma/Forma.component'; import { SequencegenaratorComponent } from './fnd/sequencegenarator/sequencegenarator.component'; @@ -257,6 +258,8 @@ const routes: Routes = [ // buildercomponents + + {path:'Forma',component:FormaComponent}, diff --git a/steper005-front-f/authsec_angular/frontend/angular-clarity-master/src/app/modules/main/main.module.ts b/steper005-front-f/authsec_angular/frontend/angular-clarity-master/src/app/modules/main/main.module.ts index 33bdb2e..fd58b22 100644 --- a/steper005-front-f/authsec_angular/frontend/angular-clarity-master/src/app/modules/main/main.module.ts +++ b/steper005-front-f/authsec_angular/frontend/angular-clarity-master/src/app/modules/main/main.module.ts @@ -1,3 +1,4 @@ + import { FormaComponent } from './BuilderComponents/basicp1/Forma/Forma.component'; @@ -130,6 +131,8 @@ import { Stepper_workflowComponent } from './BuilderComponents/stepperworkflow/S // buildercomponents + + FormaComponent, diff --git a/steper005-front-f/authsec_angular/frontend/angular-clarity-master/src/assets/i18n/en.json b/steper005-front-f/authsec_angular/frontend/angular-clarity-master/src/assets/i18n/en.json index 73fc146..2f3ff7a 100644 --- a/steper005-front-f/authsec_angular/frontend/angular-clarity-master/src/assets/i18n/en.json +++ b/steper005-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", - "UserId_Field": "UserId_Field", "Name": "Name", "documentsequence": "documentsequence" } \ No newline at end of file