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 79007b1..260acae 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 @@ -69,6 +69,9 @@ public class BuilderService { executeDump(true); // ADD OTHER SERVICE +addCustomMenu( "Note","Note", "Transcations"); + + addCustomMenu( "Stopwatch","Stopwatch", "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 678a34c..8b5f19d 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,8 +20,6 @@ import com.realnet.app-b.Services.NoteService ; - - @RequestMapping(value = "/Note") @CrossOrigin("*") @RestController @@ -36,16 +34,12 @@ public class NoteController { - - @PostMapping("/Note") public Note Savedata(@RequestBody Note data) { Note save = Service.Savedata(data) ; - - System.out.println("data saved..." + save); return save; @@ -94,6 +88,4 @@ 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 14f93f2..09d972e 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,8 +20,6 @@ import com.realnet.app-b.Services.NoteService ; - - @RequestMapping(value = "/token/Note") @CrossOrigin("*") @RestController @@ -36,16 +34,12 @@ 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; @@ -94,6 +88,4 @@ 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 2ae5864..294882e 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,8 +8,6 @@ import com.realnet.WhoColumn.Entity.Extension; - - @Entity @Data public class Note extends Extension { @@ -26,7 +24,5 @@ private String title; private String content; -private String createdat; - } 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 035f4dc..8394eb2 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,8 +12,6 @@ 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 263d7ed..c42a6df 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,8 +16,6 @@ import com.realnet.users.entity1.AppUser; - - import org.springframework.stereotype.Service; @Service @@ -31,15 +29,11 @@ private NoteRepository Repository; - - public Note Savedata(Note data) { - - data.setUpdatedBy(getUser().getUserId()); data.setCreatedBy(getUser().getUserId()); data.setAccountId(getUser().getAccount().getAccount_id()); @@ -75,8 +69,6 @@ old.setTitle(data.getTitle()); old.setContent(data.getContent()); -old.setCreatedat(data.getCreatedat()); - final Note test = Repository.save(old); data.setUpdatedBy(getUser().getUserId()); return test;} @@ -84,8 +76,6 @@ 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 8c143db..6b52a9d 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,2 +1,2 @@ -CREATE TABLE app-d.Stopwatch(id BIGINT NOT NULL AUTO_INCREMENT, time 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)); 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 a530af4..e3b575d 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,10 +30,6 @@ Content - - CreatedAt - - @@ -48,9 +44,6 @@ {{user.content }} - -{{user.createdat }} - @@ -207,8 +200,6 @@ - -

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

{{rowSelected.id}}

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

Extension

@@ -294,8 +276,6 @@ - -        
-
- - -
- - - @@ -368,6 +341,4 @@ - - 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 e77f3e9..c90cb4e 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,15 +68,11 @@ title : [null], content : [null], -createdat : [null], - - - }); // component_button200 // form code start this.extensionService.getJsonObjectsByFormCodeList(this.formcode).subscribe(data => { @@ -103,8 +99,6 @@ createdat : [null], - - } ngOnDestroy(): void { @@ -115,8 +109,6 @@ createdat : [null], - - error; getData() { this.mainService.getAll().subscribe((data) => { @@ -138,8 +130,6 @@ this.product = [...this.product].reverse(); if(this.product.length==0){ - - this.modalEdit = true; } @@ -164,8 +154,6 @@ this.product = [...this.product].reverse(); if(this.product.length==0){ - - //console.log("in update"); console.log("id " + id); console.log(this.rowSelected); @@ -183,8 +171,6 @@ setTimeout(() => { - - }, (error) => { console.log(error); if (error.status >= 200 && error.status <= 299) { @@ -207,8 +193,6 @@ onCreate() { - - this.mainService.create(this.entryForm.value).subscribe( (data) => { console.log(data); @@ -221,8 +205,6 @@ setTimeout(() => { - - }, (error) => { console.log(error); @@ -245,8 +227,6 @@ this.modalAdd = true; this.submitted = false; - - } submitted = false; @@ -262,12 +242,8 @@ 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 d28cced..8fba4e2 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,7 +33,5 @@ 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 d95eea3..af757b4 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 @@ -2,6 +2,7 @@ + import { NotesappwireframeComponent } from './BuilderComponents/app-b/Notesappwireframe/Notesappwireframe.component'; @@ -308,6 +309,8 @@ const routes: Routes = [ + + {path:'Notesappwireframe',component:NotesappwireframeComponent}, 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 9a48862..c599318 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 @@ -2,6 +2,7 @@ + import { NotesappwireframeComponent } from './BuilderComponents/app-b/Notesappwireframe/Notesappwireframe.component'; @@ -181,6 +182,8 @@ import { MyworkspaceComponent } from './admin/myworkspace/myworkspace.component' + + NotesappwireframeComponent, 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 d9ffd31..d466904 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,4 +226,7 @@ "MENU_ACTION_LINK": "Menu Action Link", "STATUS": "Status", "SUB_MENU": "Sub Menu", + "Content": "Content", + "Note": "Note", + "Title": "Title" } \ No newline at end of file