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 194446b..b9c4450 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( "Todoitem","Todoitem", "Transcations"); addCustomMenu( "Todoitem","Todoitem", "Transcations"); +addCustomMenu( "Todoitem","Todoitem", "Transcations"); + + addCustomMenu( "Note","Note", "Transcations"); diff --git a/app-app-b-b/authsec_springboot/backend/src/main/java/com/realnet/app-b/Entity/Todoitem.java b/app-app-b-b/authsec_springboot/backend/src/main/java/com/realnet/app-b/Entity/Todoitem.java index f3c4f87..a82d98a 100644 --- a/app-app-b-b/authsec_springboot/backend/src/main/java/com/realnet/app-b/Entity/Todoitem.java +++ b/app-app-b-b/authsec_springboot/backend/src/main/java/com/realnet/app-b/Entity/Todoitem.java @@ -30,7 +30,7 @@ private String description; private String duedate; -private String iscompleted; +private String completed; } diff --git a/app-app-b-b/authsec_springboot/backend/src/main/java/com/realnet/app-b/Services/TodoitemService.java b/app-app-b-b/authsec_springboot/backend/src/main/java/com/realnet/app-b/Services/TodoitemService.java index 7517166..2d4c2db 100644 --- a/app-app-b-b/authsec_springboot/backend/src/main/java/com/realnet/app-b/Services/TodoitemService.java +++ b/app-app-b-b/authsec_springboot/backend/src/main/java/com/realnet/app-b/Services/TodoitemService.java @@ -83,7 +83,7 @@ old.setDescription(data.getDescription()); old.setDuedate(data.getDuedate()); -old.setIscompleted(data.getIscompleted()); +old.setCompleted(data.getCompleted()); final Todoitem 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 af5ec91..12c12bf 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.Todoitem(id BIGINT NOT NULL AUTO_INCREMENT, description VARCHAR(400), taskname VARCHAR(400), iscompleted bit(1), duedate Date, PRIMARY KEY (id)); +CREATE TABLE app-d.Todoitem(id BIGINT NOT NULL AUTO_INCREMENT, description VARCHAR(400), taskname VARCHAR(400), completed bit(1), duedate Date, PRIMARY KEY (id)); diff --git a/app-app-f-f/authsec_angular/frontend/angular-clarity-master/src/app/modules/main/BuilderComponents/app-b/Todoitem/Todoitem.component.html b/app-app-f-f/authsec_angular/frontend/angular-clarity-master/src/app/modules/main/BuilderComponents/app-b/Todoitem/Todoitem.component.html index 47e1af0..f89685d 100644 --- a/app-app-f-f/authsec_angular/frontend/angular-clarity-master/src/app/modules/main/BuilderComponents/app-b/Todoitem/Todoitem.component.html +++ b/app-app-f-f/authsec_angular/frontend/angular-clarity-master/src/app/modules/main/BuilderComponents/app-b/Todoitem/Todoitem.component.html @@ -35,7 +35,7 @@ - IsCompleted + Completed @@ -56,7 +56,7 @@ {{user.duedate }} -{{user.iscompleted }} +{{user.completed }} @@ -251,8 +251,8 @@
- - + +
@@ -345,8 +345,8 @@
- - + +
diff --git a/app-app-f-f/authsec_angular/frontend/angular-clarity-master/src/app/modules/main/BuilderComponents/app-b/Todoitem/Todoitem.component.ts b/app-app-f-f/authsec_angular/frontend/angular-clarity-master/src/app/modules/main/BuilderComponents/app-b/Todoitem/Todoitem.component.ts index 68e113b..8f42558 100644 --- a/app-app-f-f/authsec_angular/frontend/angular-clarity-master/src/app/modules/main/BuilderComponents/app-b/Todoitem/Todoitem.component.ts +++ b/app-app-f-f/authsec_angular/frontend/angular-clarity-master/src/app/modules/main/BuilderComponents/app-b/Todoitem/Todoitem.component.ts @@ -70,7 +70,7 @@ description : [null], duedate : [null], -iscompleted : [null], +completed : [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 ed2c7e5..e4e85e0 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 { TodoitemComponent } from './BuilderComponents/app-b/Todoitem/Todoitem.component'; @@ -277,6 +278,8 @@ const routes: Routes = [ + + {path:'Todoitem',component:TodoitemComponent}, 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 fa05e3d..4d322b0 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 { TodoitemComponent } from './BuilderComponents/app-b/Todoitem/Todoitem.component'; @@ -150,6 +151,8 @@ import { MyworkspaceComponent } from './admin/myworkspace/myworkspace.component' + + TodoitemComponent, 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 654e2b0..cf3f406 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 @@ -229,6 +229,6 @@ "Todoitem": "Todoitem", "Description": "Description", "TaskName": "TaskName", - "IsCompleted": "IsCompleted", + "Completed": "Completed", "DueDate": "DueDate" } \ No newline at end of file