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 07965a8..191a756 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 @@ -75,6 +75,12 @@ addCustomMenu( "Note","Note", "Transcations"); 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/Entity/Note.java b/app-app-b-b/authsec_springboot/backend/src/main/java/com/realnet/app-b/Entity/Note.java index 46b5039..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 @@ -20,9 +20,9 @@ import com.realnet.WhoColumn.Entity.Extension; @GeneratedValue(strategy = GenerationType.IDENTITY) private Integer id; -private String notetitle; +private String title; -private String notecontent; +private String content; } 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 2926aca..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 @@ -65,9 +65,9 @@ public Note getdetailsbyId(Integer id) { public Note update(Note data,Integer id) { Note old = Repository.findById(id).get(); -old.setNotetitle(data.getNotetitle()); +old.setTitle(data.getTitle()); -old.setNotecontent(data.getNotecontent()); +old.setContent(data.getContent()); final Note test = Repository.save(old); data.setUpdatedBy(getUser().getUserId()); 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 083d065..4d0424d 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,4 @@ -CREATE TABLE app-d.Note(id BIGINT NOT NULL AUTO_INCREMENT, lastmodifieddate Date, isimportant bit(1), content VARCHAR(400), createddate Date, title VARCHAR(400), PRIMARY KEY (id)); +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, notecontent VARCHAR(400), notetitle 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 6c96916..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 @@ -23,11 +23,11 @@
{{error}}
- NoteTitle + Title - NoteContent + Content @@ -39,10 +39,10 @@ -{{user.notetitle }} +{{user.title }} -{{user.notecontent }} +{{user.content }} @@ -214,13 +214,13 @@
- - + +
- - + +
@@ -290,13 +290,13 @@
- - + +
- - + +
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 4afd887..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 @@ -64,9 +64,9 @@ private userInfoService:UserInfoService, this.userrole=this.userInfoService.getRoles(); this.getData(); this.entryForm = this._fb.group({ -notetitle : [null], +title : [null], -notecontent : [null], +content : [null], 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 5392dfc..5538d2c 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,4 +1,6 @@ + + import { NoteComponent } from './BuilderComponents/app-b/Note/Note.component'; import { CalculatorComponent } from './BuilderComponents/app-b/Calculator/Calculator.component'; @@ -266,6 +268,10 @@ const routes: Routes = [ // buildercomponents + + + + {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 5001563..7cb7c64 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,4 +1,6 @@ + + import { NoteComponent } from './BuilderComponents/app-b/Note/Note.component'; import { CalculatorComponent } from './BuilderComponents/app-b/Calculator/Calculator.component'; @@ -139,6 +141,10 @@ import { MyworkspaceComponent } from './admin/myworkspace/myworkspace.component' // buildercomponents + + + + 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 d9ffd31..077d6a2 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,9 @@ "MENU_ACTION_LINK": "Menu Action Link", "STATUS": "Status", "SUB_MENU": "Sub Menu", + "LastModifiedDate": "LastModifiedDate", + "Content": "Content", + "Note": "Note", + "CreatedDate": "CreatedDate", + "Title": "Title" } \ No newline at end of file