diff --git a/app-app-b-b/authsec_springboot/backend/src/main/java/com/realnet/Builders/Services/BuilderService.java b/app-app-b-b/authsec_springboot/backend/src/main/java/com/realnet/Builders/Services/BuilderService.java index 191a756..28ab6c3 100644 --- a/app-app-b-b/authsec_springboot/backend/src/main/java/com/realnet/Builders/Services/BuilderService.java +++ b/app-app-b-b/authsec_springboot/backend/src/main/java/com/realnet/Builders/Services/BuilderService.java @@ -81,6 +81,9 @@ addCustomMenu( "Note","Note", "Transcations"); addCustomMenu( "Note","Note", "Transcations"); +addCustomMenu( "Note","Note", "Transcations"); + + addCustomMenu( "Calculator","Calculator", "Transcations"); diff --git a/app-app-b-b/authsec_springboot/backend/src/main/java/com/realnet/app-b/Controllers/NoteController.java b/app-app-b-b/authsec_springboot/backend/src/main/java/com/realnet/app-b/Controllers/NoteController.java index 8b5f19d..678a34c 100644 --- a/app-app-b-b/authsec_springboot/backend/src/main/java/com/realnet/app-b/Controllers/NoteController.java +++ b/app-app-b-b/authsec_springboot/backend/src/main/java/com/realnet/app-b/Controllers/NoteController.java @@ -20,6 +20,8 @@ import com.realnet.app-b.Services.NoteService ; + + @RequestMapping(value = "/Note") @CrossOrigin("*") @RestController @@ -34,12 +36,16 @@ public class NoteController { + + @PostMapping("/Note") public Note Savedata(@RequestBody Note data) { Note save = Service.Savedata(data) ; + + System.out.println("data saved..." + save); return save; @@ -88,4 +94,6 @@ public class NoteController { + + } \ No newline at end of file diff --git a/app-app-b-b/authsec_springboot/backend/src/main/java/com/realnet/app-b/Controllers/tokenFree_NoteController.java b/app-app-b-b/authsec_springboot/backend/src/main/java/com/realnet/app-b/Controllers/tokenFree_NoteController.java index 09d972e..14f93f2 100644 --- a/app-app-b-b/authsec_springboot/backend/src/main/java/com/realnet/app-b/Controllers/tokenFree_NoteController.java +++ b/app-app-b-b/authsec_springboot/backend/src/main/java/com/realnet/app-b/Controllers/tokenFree_NoteController.java @@ -20,6 +20,8 @@ import com.realnet.app-b.Services.NoteService ; + + @RequestMapping(value = "/token/Note") @CrossOrigin("*") @RestController @@ -34,12 +36,16 @@ public class tokenFree_NoteController { + + @PostMapping("/Note") public Note Savedata(@RequestBody Note data) { Note save = Service.Savedata(data) ; + + System.out.println("data saved..." + save); return save; @@ -88,4 +94,6 @@ public class tokenFree_NoteController { + + } \ No newline at end of file diff --git a/app-app-b-b/authsec_springboot/backend/src/main/java/com/realnet/app-b/Entity/Note.java b/app-app-b-b/authsec_springboot/backend/src/main/java/com/realnet/app-b/Entity/Note.java index 294882e..885c2b2 100644 --- a/app-app-b-b/authsec_springboot/backend/src/main/java/com/realnet/app-b/Entity/Note.java +++ b/app-app-b-b/authsec_springboot/backend/src/main/java/com/realnet/app-b/Entity/Note.java @@ -8,6 +8,8 @@ import com.realnet.WhoColumn.Entity.Extension; + + @Entity @Data public class Note extends Extension { @@ -24,5 +26,7 @@ private String title; private String content; +private String createddate; + } diff --git a/app-app-b-b/authsec_springboot/backend/src/main/java/com/realnet/app-b/Repository/NoteRepository.java b/app-app-b-b/authsec_springboot/backend/src/main/java/com/realnet/app-b/Repository/NoteRepository.java index 8394eb2..035f4dc 100644 --- a/app-app-b-b/authsec_springboot/backend/src/main/java/com/realnet/app-b/Repository/NoteRepository.java +++ b/app-app-b-b/authsec_springboot/backend/src/main/java/com/realnet/app-b/Repository/NoteRepository.java @@ -12,6 +12,8 @@ import java.util.*; + + diff --git a/app-app-b-b/authsec_springboot/backend/src/main/java/com/realnet/app-b/Services/NoteService.java b/app-app-b-b/authsec_springboot/backend/src/main/java/com/realnet/app-b/Services/NoteService.java index c42a6df..88309f6 100644 --- a/app-app-b-b/authsec_springboot/backend/src/main/java/com/realnet/app-b/Services/NoteService.java +++ b/app-app-b-b/authsec_springboot/backend/src/main/java/com/realnet/app-b/Services/NoteService.java @@ -16,6 +16,8 @@ import com.realnet.users.entity1.AppUser; + + import org.springframework.stereotype.Service; @Service @@ -29,11 +31,15 @@ private NoteRepository Repository; + + public Note Savedata(Note data) { + + data.setUpdatedBy(getUser().getUserId()); data.setCreatedBy(getUser().getUserId()); data.setAccountId(getUser().getAccount().getAccount_id()); @@ -69,6 +75,8 @@ old.setTitle(data.getTitle()); old.setContent(data.getContent()); +old.setCreateddate(data.getCreateddate()); + final Note test = Repository.save(old); data.setUpdatedBy(getUser().getUserId()); return test;} @@ -76,6 +84,8 @@ final Note test = Repository.save(old); + + public AppUser getUser() { AppUser user = userService.getLoggedInUser(); return user; diff --git a/app-app-d-d/authsec_mysql/mysql/wf_table/wf_table.sql b/app-app-d-d/authsec_mysql/mysql/wf_table/wf_table.sql index 4d0424d..7aa786d 100755 --- a/app-app-d-d/authsec_mysql/mysql/wf_table/wf_table.sql +++ b/app-app-d-d/authsec_mysql/mysql/wf_table/wf_table.sql @@ -1,4 +1,2 @@ -CREATE TABLE app-d.Note(id BIGINT NOT NULL AUTO_INCREMENT, lastmodifieddate Date, content VARCHAR(400), createddate Date, title VARCHAR(400), PRIMARY KEY (id)); - -CREATE TABLE app-d.Note(id BIGINT NOT NULL AUTO_INCREMENT, content VARCHAR(400), title VARCHAR(400), PRIMARY KEY (id)); +CREATE TABLE app-d.Note(id BIGINT NOT NULL AUTO_INCREMENT, content VARCHAR(400), createddate Date, title VARCHAR(400), PRIMARY KEY (id)); diff --git a/app-app-f-f/authsec_angular/frontend/angular-clarity-master/src/app/modules/main/BuilderComponents/app-b/Note/Note.component.html b/app-app-f-f/authsec_angular/frontend/angular-clarity-master/src/app/modules/main/BuilderComponents/app-b/Note/Note.component.html index e3b575d..de341a6 100644 --- a/app-app-f-f/authsec_angular/frontend/angular-clarity-master/src/app/modules/main/BuilderComponents/app-b/Note/Note.component.html +++ b/app-app-f-f/authsec_angular/frontend/angular-clarity-master/src/app/modules/main/BuilderComponents/app-b/Note/Note.component.html @@ -30,6 +30,10 @@ Content + + CreatedDate + + @@ -44,6 +48,9 @@ {{user.content }} + +{{user.createddate }} + @@ -200,6 +207,8 @@ + +

Update Note @@ -207,6 +216,8 @@ + +

{{rowSelected.id}}

@@ -223,11 +234,18 @@
+
+ + +
+ + +

Extension

@@ -276,6 +294,8 @@ + +        
+
+ + +
+ + + @@ -341,4 +368,6 @@ + + diff --git a/app-app-f-f/authsec_angular/frontend/angular-clarity-master/src/app/modules/main/BuilderComponents/app-b/Note/Note.component.ts b/app-app-f-f/authsec_angular/frontend/angular-clarity-master/src/app/modules/main/BuilderComponents/app-b/Note/Note.component.ts index c90cb4e..0d0eaee 100644 --- a/app-app-f-f/authsec_angular/frontend/angular-clarity-master/src/app/modules/main/BuilderComponents/app-b/Note/Note.component.ts +++ b/app-app-f-f/authsec_angular/frontend/angular-clarity-master/src/app/modules/main/BuilderComponents/app-b/Note/Note.component.ts @@ -68,11 +68,15 @@ title : [null], content : [null], +createddate : [null], + + + }); // component_button200 // form code start this.extensionService.getJsonObjectsByFormCodeList(this.formcode).subscribe(data => { @@ -99,6 +103,8 @@ content : [null], + + } ngOnDestroy(): void { @@ -109,6 +115,8 @@ content : [null], + + error; getData() { this.mainService.getAll().subscribe((data) => { @@ -130,6 +138,8 @@ this.product = [...this.product].reverse(); if(this.product.length==0){ + + this.modalEdit = true; } @@ -154,6 +164,8 @@ this.product = [...this.product].reverse(); if(this.product.length==0){ + + //console.log("in update"); console.log("id " + id); console.log(this.rowSelected); @@ -171,6 +183,8 @@ setTimeout(() => { + + }, (error) => { console.log(error); if (error.status >= 200 && error.status <= 299) { @@ -193,6 +207,8 @@ onCreate() { + + this.mainService.create(this.entryForm.value).subscribe( (data) => { console.log(data); @@ -205,6 +221,8 @@ setTimeout(() => { + + }, (error) => { console.log(error); @@ -227,6 +245,8 @@ this.modalAdd = true; this.submitted = false; + + } submitted = false; @@ -242,8 +262,12 @@ onSubmit() { + + // updateaction } + + diff --git a/app-app-f-f/authsec_angular/frontend/angular-clarity-master/src/app/modules/main/BuilderComponents/app-b/Note/Note.service.ts b/app-app-f-f/authsec_angular/frontend/angular-clarity-master/src/app/modules/main/BuilderComponents/app-b/Note/Note.service.ts index 8fba4e2..d28cced 100644 --- a/app-app-f-f/authsec_angular/frontend/angular-clarity-master/src/app/modules/main/BuilderComponents/app-b/Note/Note.service.ts +++ b/app-app-f-f/authsec_angular/frontend/angular-clarity-master/src/app/modules/main/BuilderComponents/app-b/Note/Note.service.ts @@ -33,5 +33,7 @@ export class Noteservice{ + + // updateaction } \ No newline at end of file diff --git a/app-app-f-f/authsec_angular/frontend/angular-clarity-master/src/app/modules/main/main-routing.module.ts b/app-app-f-f/authsec_angular/frontend/angular-clarity-master/src/app/modules/main/main-routing.module.ts index 5538d2c..ca14e6c 100644 --- a/app-app-f-f/authsec_angular/frontend/angular-clarity-master/src/app/modules/main/main-routing.module.ts +++ b/app-app-f-f/authsec_angular/frontend/angular-clarity-master/src/app/modules/main/main-routing.module.ts @@ -1,6 +1,7 @@ + import { NoteComponent } from './BuilderComponents/app-b/Note/Note.component'; import { CalculatorComponent } from './BuilderComponents/app-b/Calculator/Calculator.component'; @@ -272,6 +273,8 @@ const routes: Routes = [ + + {path:'Note',component:NoteComponent}, diff --git a/app-app-f-f/authsec_angular/frontend/angular-clarity-master/src/app/modules/main/main.module.ts b/app-app-f-f/authsec_angular/frontend/angular-clarity-master/src/app/modules/main/main.module.ts index 7cb7c64..f2e1e3a 100644 --- a/app-app-f-f/authsec_angular/frontend/angular-clarity-master/src/app/modules/main/main.module.ts +++ b/app-app-f-f/authsec_angular/frontend/angular-clarity-master/src/app/modules/main/main.module.ts @@ -1,6 +1,7 @@ + import { NoteComponent } from './BuilderComponents/app-b/Note/Note.component'; import { CalculatorComponent } from './BuilderComponents/app-b/Calculator/Calculator.component'; @@ -145,6 +146,8 @@ import { MyworkspaceComponent } from './admin/myworkspace/myworkspace.component' + + NoteComponent, diff --git a/app-app-f-f/authsec_angular/frontend/angular-clarity-master/src/assets/i18n/en.json b/app-app-f-f/authsec_angular/frontend/angular-clarity-master/src/assets/i18n/en.json index 077d6a2..1437755 100644 --- a/app-app-f-f/authsec_angular/frontend/angular-clarity-master/src/assets/i18n/en.json +++ b/app-app-f-f/authsec_angular/frontend/angular-clarity-master/src/assets/i18n/en.json @@ -226,7 +226,6 @@ "MENU_ACTION_LINK": "Menu Action Link", "STATUS": "Status", "SUB_MENU": "Sub Menu", - "LastModifiedDate": "LastModifiedDate", "Content": "Content", "Note": "Note", "CreatedDate": "CreatedDate",