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 4bf5401..bcffb7b 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,12 @@ public class BuilderService { executeDump(true); // ADD OTHER SERVICE +addCustomMenu( "Todo","Todo", "Transcations"); + + +addCustomMenu( "Todoitem","Todoitem", "Transcations"); + + addCustomMenu( "Todoapp","Todoapp", "Transcations"); diff --git a/app-app-b-b/authsec_springboot/backend/src/main/java/com/realnet/app-b/Controllers/TodoController.java b/app-app-b-b/authsec_springboot/backend/src/main/java/com/realnet/app-b/Controllers/TodoController.java new file mode 100644 index 0000000..688f65b --- /dev/null +++ b/app-app-b-b/authsec_springboot/backend/src/main/java/com/realnet/app-b/Controllers/TodoController.java @@ -0,0 +1,107 @@ +package com.realnet.app-b.Controllers; +import java.util.List; +import org.springframework.beans.factory.annotation.Autowired; + import org.springframework.web.bind.annotation.*; +import org.springframework.web.multipart.MultipartFile; +import com.fasterxml.jackson.core.JsonProcessingException; +import org.springframework.web.bind.annotation.CrossOrigin; +import com.fasterxml.jackson.databind.JsonMappingException; +import com.realnet.config.EmailService; +import com.realnet.users.entity1.AppUser; +import com.realnet.users.service1.AppUserServiceImpl; +import com.fasterxml.jackson.databind.ObjectMapper; +import org.springframework.data.domain.*; +import com.realnet.fnd.response.EntityResponse; +import org.springframework.http.*; +import org.springframework.beans.factory.annotation.*; +import com.realnet.app-b.Entity.Todo; +import com.realnet.app-b.Services.TodoService ; + + + + + + + + +@RequestMapping(value = "/Todo") + @CrossOrigin("*") +@RestController +public class TodoController { + @Autowired + private TodoService Service; + +@Value("${projectPath}") + private String projectPath; + + + + + + + + + + @PostMapping("/Todo") + public Todo Savedata(@RequestBody Todo data) { + Todo save = Service.Savedata(data) ; + + + + + + + + System.out.println("data saved..." + save); + + return save; + } +@PutMapping("/Todo/{id}") + public Todo update(@RequestBody Todo data,@PathVariable Integer id ) { + Todo update = Service.update(data,id); + System.out.println("data update..." + update); + return update; + } +// get all with pagination + @GetMapping("/Todo/getall/page") + public Page getall(@RequestParam(value = "page", required = false) Integer page, + @RequestParam(value = "size", required = false) Integer size) { + Pageable paging = PageRequest.of(page, size); + Page get = Service.getAllWithPagination(paging); + + return get; + + } + @GetMapping("/Todo") + public List getdetails() { + List get = Service.getdetails(); + return get; +} +// get all without authentication + + @GetMapping("/token/Todo") + public List getallwioutsec() { + List get = Service.getdetails(); + return get; +} +@GetMapping("/Todo/{id}") + public Todo getdetailsbyId(@PathVariable Integer id ) { + Todo get = Service.getdetailsbyId(id); + return get; + } +@DeleteMapping("/Todo/{id}") + public ResponseEntity delete_by_id(@PathVariable Integer id ) { + Service.delete_by_id(id); + return new ResponseEntity<>(new EntityResponse("Deleted"), HttpStatus.OK); + + } + + + + + + + + + +} \ No newline at end of file diff --git a/app-app-b-b/authsec_springboot/backend/src/main/java/com/realnet/app-b/Controllers/TodoitemController.java b/app-app-b-b/authsec_springboot/backend/src/main/java/com/realnet/app-b/Controllers/TodoitemController.java index 60562c1..3904ee0 100644 --- a/app-app-b-b/authsec_springboot/backend/src/main/java/com/realnet/app-b/Controllers/TodoitemController.java +++ b/app-app-b-b/authsec_springboot/backend/src/main/java/com/realnet/app-b/Controllers/TodoitemController.java @@ -22,8 +22,6 @@ import com.realnet.app-b.Services.TodoitemService ; - - @RequestMapping(value = "/Todoitem") @CrossOrigin("*") @RestController @@ -40,8 +38,6 @@ public class TodoitemController { - - @PostMapping("/Todoitem") public Todoitem Savedata(@RequestBody Todoitem data) { Todoitem save = Service.Savedata(data) ; @@ -50,8 +46,6 @@ public class TodoitemController { - - System.out.println("data saved..." + save); return save; @@ -102,6 +96,4 @@ public class TodoitemController { - - } \ 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_TodoController.java b/app-app-b-b/authsec_springboot/backend/src/main/java/com/realnet/app-b/Controllers/tokenFree_TodoController.java new file mode 100644 index 0000000..84f4cb4 --- /dev/null +++ b/app-app-b-b/authsec_springboot/backend/src/main/java/com/realnet/app-b/Controllers/tokenFree_TodoController.java @@ -0,0 +1,107 @@ +package com.realnet.app-b.Controllers; +import java.util.List; +import org.springframework.beans.factory.annotation.Autowired; + import org.springframework.web.bind.annotation.*; +import org.springframework.web.multipart.MultipartFile; +import com.fasterxml.jackson.core.JsonProcessingException; +import org.springframework.web.bind.annotation.CrossOrigin; +import com.fasterxml.jackson.databind.JsonMappingException; +import com.realnet.config.EmailService; +import com.realnet.users.entity1.AppUser; +import com.realnet.users.service1.AppUserServiceImpl; +import com.fasterxml.jackson.databind.ObjectMapper; +import org.springframework.data.domain.*; +import com.realnet.fnd.response.EntityResponse; +import org.springframework.http.*; +import org.springframework.beans.factory.annotation.*; +import com.realnet.app-b.Entity.Todo; +import com.realnet.app-b.Services.TodoService ; + + + + + + + + +@RequestMapping(value = "/token/Todo") + @CrossOrigin("*") +@RestController +public class tokenFree_TodoController { + @Autowired + private TodoService Service; + +@Value("${projectPath}") + private String projectPath; + + + + + + + + + + @PostMapping("/Todo") + public Todo Savedata(@RequestBody Todo data) { + Todo save = Service.Savedata(data) ; + + + + + + + + System.out.println("data saved..." + save); + + return save; + } +@PutMapping("/Todo/{id}") + public Todo update(@RequestBody Todo data,@PathVariable Integer id ) { + Todo update = Service.update(data,id); + System.out.println("data update..." + update); + return update; + } +// get all with pagination + @GetMapping("/Todo/getall/page") + public Page getall(@RequestParam(value = "page", required = false) Integer page, + @RequestParam(value = "size", required = false) Integer size) { + Pageable paging = PageRequest.of(page, size); + Page get = Service.getAllWithPagination(paging); + + return get; + + } + @GetMapping("/Todo") + public List getdetails() { + List get = Service.getdetails(); + return get; +} +// get all without authentication + + @GetMapping("/token/Todo") + public List getallwioutsec() { + List get = Service.getdetails(); + return get; +} +@GetMapping("/Todo/{id}") + public Todo getdetailsbyId(@PathVariable Integer id ) { + Todo get = Service.getdetailsbyId(id); + return get; + } +@DeleteMapping("/Todo/{id}") + public ResponseEntity delete_by_id(@PathVariable Integer id ) { + Service.delete_by_id(id); + return new ResponseEntity<>(new EntityResponse("Deleted"), HttpStatus.OK); + + } + + + + + + + + + +} \ 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_TodoitemController.java b/app-app-b-b/authsec_springboot/backend/src/main/java/com/realnet/app-b/Controllers/tokenFree_TodoitemController.java index 9f644b4..1ad5416 100644 --- a/app-app-b-b/authsec_springboot/backend/src/main/java/com/realnet/app-b/Controllers/tokenFree_TodoitemController.java +++ b/app-app-b-b/authsec_springboot/backend/src/main/java/com/realnet/app-b/Controllers/tokenFree_TodoitemController.java @@ -22,8 +22,6 @@ import com.realnet.app-b.Services.TodoitemService ; - - @RequestMapping(value = "/token/Todoitem") @CrossOrigin("*") @RestController @@ -40,8 +38,6 @@ public class tokenFree_TodoitemController { - - @PostMapping("/Todoitem") public Todoitem Savedata(@RequestBody Todoitem data) { Todoitem save = Service.Savedata(data) ; @@ -50,8 +46,6 @@ public class tokenFree_TodoitemController { - - System.out.println("data saved..." + save); return save; @@ -102,6 +96,4 @@ public class tokenFree_TodoitemController { - - } \ No newline at end of file diff --git a/app-app-b-b/authsec_springboot/backend/src/main/java/com/realnet/app-b/Entity/Todo.java b/app-app-b-b/authsec_springboot/backend/src/main/java/com/realnet/app-b/Entity/Todo.java new file mode 100644 index 0000000..a243da0 --- /dev/null +++ b/app-app-b-b/authsec_springboot/backend/src/main/java/com/realnet/app-b/Entity/Todo.java @@ -0,0 +1,36 @@ +package com.realnet.app-b.Entity; + import lombok.*; +import com.realnet.WhoColumn.Entity.Extension; + import javax.persistence.*; + import java.time.LocalDateTime; + import java.util.*; + + + + + + + + + @Entity + @Data + public class Todo extends Extension { + /** + * + */ + private static final long serialVersionUID = 1L; + + @Id + @GeneratedValue(strategy = GenerationType.IDENTITY) + private Integer id; + +private String taskname; + +private String description; + +private String duedate; + +private String iscompleted; + + +} 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..40e8973 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 @@ -10,8 +10,6 @@ import com.realnet.WhoColumn.Entity.Extension; - - @Entity @Data public class Todoitem extends Extension { @@ -24,9 +22,7 @@ import com.realnet.WhoColumn.Entity.Extension; @GeneratedValue(strategy = GenerationType.IDENTITY) private Integer id; -private String taskname; - -private String description; +private String taskdescription; private String duedate; diff --git a/app-app-b-b/authsec_springboot/backend/src/main/java/com/realnet/app-b/Repository/TodoRepository.java b/app-app-b-b/authsec_springboot/backend/src/main/java/com/realnet/app-b/Repository/TodoRepository.java new file mode 100644 index 0000000..7f7acdb --- /dev/null +++ b/app-app-b-b/authsec_springboot/backend/src/main/java/com/realnet/app-b/Repository/TodoRepository.java @@ -0,0 +1,32 @@ +package com.realnet.app-b.Repository; + + +import org.springframework.data.domain.Page; +import org.springframework.data.domain.Pageable; +import org.springframework.data.jpa.repository.JpaRepository; +import org.springframework.data.jpa.repository.Query; + +import org.springframework.stereotype.Repository; +import java.util.*; + + + + + + + + + + + +import com.realnet.app-b.Entity.Todo; + +@Repository +public interface TodoRepository extends JpaRepository { + +@Query(value = "select * from todo where created_by=?1", nativeQuery = true) + List findAll(Long creayedBy); + +@Query(value = "select * from todo where created_by=?1", nativeQuery = true) + Page findAll( Long creayedBy,Pageable page); +} \ No newline at end of file diff --git a/app-app-b-b/authsec_springboot/backend/src/main/java/com/realnet/app-b/Repository/TodoitemRepository.java b/app-app-b-b/authsec_springboot/backend/src/main/java/com/realnet/app-b/Repository/TodoitemRepository.java index d7b83ae..9d5f334 100644 --- a/app-app-b-b/authsec_springboot/backend/src/main/java/com/realnet/app-b/Repository/TodoitemRepository.java +++ b/app-app-b-b/authsec_springboot/backend/src/main/java/com/realnet/app-b/Repository/TodoitemRepository.java @@ -14,8 +14,6 @@ import java.util.*; - - diff --git a/app-app-b-b/authsec_springboot/backend/src/main/java/com/realnet/app-b/Services/TodoService.java b/app-app-b-b/authsec_springboot/backend/src/main/java/com/realnet/app-b/Services/TodoService.java new file mode 100644 index 0000000..fe9e347 --- /dev/null +++ b/app-app-b-b/authsec_springboot/backend/src/main/java/com/realnet/app-b/Services/TodoService.java @@ -0,0 +1,103 @@ +package com.realnet.app-b.Services; +import com.realnet.app-b.Repository.TodoRepository; +import com.realnet.app-b.Entity.Todo +;import java.util.*; + +import org.springframework.beans.factory.annotation.Autowired; +import com.realnet.SequenceGenerator.Service.SequenceService; +import org.springframework.data.domain.Page; +import com.realnet.realm.Entity.Realm; +import com.realnet.realm.Services.RealmService; +import org.springframework.data.domain.Pageable; +import org.springframework.http.*; +import com.realnet.users.service1.AppUserServiceImpl; +import com.realnet.users.entity1.AppUser; + + + + + + + + + import org.springframework.stereotype.Service; + +@Service + public class TodoService { +@Autowired +private TodoRepository Repository; + @Autowired + private AppUserServiceImpl userService; +@Autowired + private RealmService realmService; + + + + + + + +public Todo Savedata(Todo data) { + + + + + + + + + data.setUpdatedBy(getUser().getUserId()); + data.setCreatedBy(getUser().getUserId()); + data.setAccountId(getUser().getAccount().getAccount_id()); +Todo save = Repository.save(data); + return save; + } + + +// get all with pagination + public Page getAllWithPagination(Pageable page) { + return Repository.findAll( getUser().getUserId(),page); + } +public List getdetails() { + List realm = realmService.findByUserId(getUser().getUserId()); +List all = Repository.findAll(getUser().getUserId()); + + return all ; } + + +public Todo getdetailsbyId(Integer id) { + return Repository.findById(id).get(); + } + + + public void delete_by_id(Integer id) { + Repository.deleteById(id); +} + + +public Todo update(Todo data,Integer id) { + Todo old = Repository.findById(id).get(); +old.setTaskname(data.getTaskname()); + +old.setDescription(data.getDescription()); + +old.setDuedate(data.getDuedate()); + +old.setIscompleted(data.getIscompleted()); + +final Todo test = Repository.save(old); + data.setUpdatedBy(getUser().getUserId()); + return test;} + + + + + + + + + public AppUser getUser() { + AppUser user = userService.getLoggedInUser(); + return user; + + }} 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..ea5b6d1 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 @@ -18,8 +18,6 @@ import com.realnet.users.entity1.AppUser; - - import org.springframework.stereotype.Service; @Service @@ -35,8 +33,6 @@ private TodoitemRepository Repository; - - public Todoitem Savedata(Todoitem data) { @@ -44,8 +40,6 @@ public Todoitem Savedata(Todoitem data) { - - data.setUpdatedBy(getUser().getUserId()); data.setCreatedBy(getUser().getUserId()); data.setAccountId(getUser().getAccount().getAccount_id()); @@ -77,9 +71,7 @@ public Todoitem getdetailsbyId(Integer id) { public Todoitem update(Todoitem data,Integer id) { Todoitem old = Repository.findById(id).get(); -old.setTaskname(data.getTaskname()); - -old.setDescription(data.getDescription()); +old.setTaskdescription(data.getTaskdescription()); old.setDuedate(data.getDuedate()); @@ -94,8 +86,6 @@ final Todoitem 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 84d576e..0ba7102 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,4 @@ -CREATE TABLE app-d.Todoapp(id BIGINT NOT NULL AUTO_INCREMENT, description VARCHAR(400), taskname VARCHAR(400), completed bit(1), duedate Date, PRIMARY KEY (id)); +CREATE TABLE app-d.Todoitem(id BIGINT NOT NULL AUTO_INCREMENT, taskdescription VARCHAR(400), iscompleted bit(1), duedate Date, PRIMARY KEY (id)); + +CREATE TABLE app-d.Todo(id BIGINT NOT NULL AUTO_INCREMENT, description VARCHAR(400), taskname VARCHAR(400), iscompleted 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/Todo/Todo.component.html b/app-app-f-f/authsec_angular/frontend/angular-clarity-master/src/app/modules/main/BuilderComponents/app-b/Todo/Todo.component.html new file mode 100644 index 0000000..2caa44c --- /dev/null +++ b/app-app-f-f/authsec_angular/frontend/angular-clarity-master/src/app/modules/main/BuilderComponents/app-b/Todo/Todo.component.html @@ -0,0 +1,402 @@ +
    +
  1. ToDo
    2. +
+
+
+
+

ToDo

+
+
+ + + +
+ + + + Loading ... + +
{{error}}
+ + + TaskName + + + + Description + + + + DueDate + + + + IsCompleted + + + + + + Action + + + + + +{{user.taskname }} + + +{{user.description }} + + +{{user.duedate }} + + +{{user.iscompleted }} + + + + + + + +
Who Column
+
Account ID: {{user.accountId}}
+
Created At: {{user.createdAt| date}}
+
Created By: {{user.createdBy}}
+
Updated At: {{user.updatedAt | date}}
+
Updated By: {{user.updatedBy}}
+ + + + + + + + + + + + + + Users per page + {{pagination.firstItem + 1}} - {{pagination.lastItem + 1}} + of {{pagination.totalItems}} users + + + + + + +
+
+
+
+
+
+ +
+
+ {{beforeText(item.fieldtext)}} + {{ app[transform(item.fieldtext) ] }} + {{afterText(item.fieldtext)}} +
+ +
+ {{beforeText(item.fieldtext)}} + {{ app[transform(item.fieldtext) ] | date}} + {{afterText(item.fieldtext)}} +
+
+ {{beforeText(item.fieldtext)}} + {{ app[transform(item.fieldtext) ]}} + {{afterText(item.fieldtext)}} +
+ +
+
+
+ + +
+ +
+ +
File Preview
+
+ +
+
+
+
+
+
+ +
+ + + + + + + + + + +

Update ToDo + + + + + + + + +

+
+

{{rowSelected.id}}

+ +
+
+
+ + +
+ +
+ + +
+ +
+ + +
+ +
+ + +
+ +
+ + + + + + + + + +
+

Extension

+
+
+
+
+ + + + + + + + + + +
+ + +
+
+
+ +
+ + +
+
+
+ + +
+

Are You Sure Want to delete?

+

{{rowSelected.id}}

+
+ + +
+
+ + + +

Add ToDo + + + + + + + + + +         + + + + + Form Extension +

+
+
+
+ +
+ + +
+ +
+ + +
+ +
+ + +
+ +
+ + +
+ + +
+ + + + + + + + + + + +
+

Extension

+
+
+
+
+ + + + + + + +
+ + +
+
+
+
+ + +
+
+
+ + + + + + + + + + diff --git a/app-app-f-f/authsec_angular/frontend/angular-clarity-master/src/app/modules/main/BuilderComponents/app-b/Todo/Todo.component.scss b/app-app-f-f/authsec_angular/frontend/angular-clarity-master/src/app/modules/main/BuilderComponents/app-b/Todo/Todo.component.scss new file mode 100644 index 0000000..12f7fc8 --- /dev/null +++ b/app-app-f-f/authsec_angular/frontend/angular-clarity-master/src/app/modules/main/BuilderComponents/app-b/Todo/Todo.component.scss @@ -0,0 +1,85 @@ +//@import "../../../../assets/scss/var"; +.s-info-bar { + display: flex; + flex-direction: row; + justify-content: space-between; + button { + outline: none; + } +} +.delete,.heading{ + text-align: center; + color: red; +} +.entry-pg { + width: 750px; +} + +.button1::after { + content: none; +} +.button1:hover::after { + content: "ADD ROWS"; +} + +.section { + background-color: #dddddd; + height: 40px; +} + +.section p { + //color: white; + padding: 10px; + font-size: 18px; +} + +.clr-input { + color: #212529; + border: 1px solid #ced4da; + border-radius: 0.25rem; + padding: 0.75rem 0.75rem; + margin-top: 3px; + width: 100%; + margin-bottom: 10px; +} + +.clr-file { + color: #212529; + border: 1px solid #ced4da; + border-radius: 0.25rem; + //padding: 0.6rem 0.75rem; + margin-top: 3px; + width: 100%; + margin-bottom: 10px; +} + +.center { + text-align: center; +} +select{ + width: 100%; + margin-top: 3px; + padding: 5px 5px; + border: 1px solid #ccc; + border-radius: 4px; +} +input[type=text],[type=date],[type=number],textarea { + width: 100%; + padding: 15px 15px; + background-color:rgb(255, 255, 255); + // margin: 8px 0; + display: inline-block; + border: 1px solid #ccc; + border-radius: 4px; + box-sizing: border-box; +} +.error_mess { + color: red; +} +.universal-section-header { + margin: 24px 0 10px 0; + font-weight: 600; + color: #1a237e; + letter-spacing: 0.5px; + font-size: 1.25rem; +} \ No newline at end of file diff --git a/app-app-f-f/authsec_angular/frontend/angular-clarity-master/src/app/modules/main/BuilderComponents/app-b/Todo/Todo.component.ts b/app-app-f-f/authsec_angular/frontend/angular-clarity-master/src/app/modules/main/BuilderComponents/app-b/Todo/Todo.component.ts new file mode 100644 index 0000000..78afc94 --- /dev/null +++ b/app-app-f-f/authsec_angular/frontend/angular-clarity-master/src/app/modules/main/BuilderComponents/app-b/Todo/Todo.component.ts @@ -0,0 +1,297 @@ +import { Component, OnInit } from '@angular/core'; +import { ToastrService } from 'ngx-toastr'; +import { AlertService } from 'src/app/services/alert.service'; +import { Todoservice} from './Todo.service'; +import { AbstractControl, FormArray, FormBuilder, FormGroup, Validators, ValidationErrors } from '@angular/forms'; +import { ExtensionService } from 'src/app/services/fnd/extension.service'; +import { DashboardContentModel2 } from 'src/app/models/builder/dashboard'; +import { Todocardvariable } from './Todo_cardvariable'; +import { UserInfoService } from 'src/app/services/user-info.service'; +declare var JsBarcode: any; +@Component({ + selector: 'app-Todo', + templateUrl: './Todo.component.html', + styleUrls: ['./Todo.component.scss'] +}) +export class TodoComponent implements OnInit { + cardButton = Todocardvariable.cardButton; + cardmodeldata = Todocardvariable.cardmodeldata; + public dashboardArray: DashboardContentModel2[]; + isCardview = Todocardvariable.cardButton; + cardmodal; changeView(){ + this.isCardview = !this.isCardview; + } + beforeText(fieldtext: string): string { // Extract the text before the first '<' + const index = fieldtext.indexOf('<'); + return index !== -1 ? fieldtext.substring(0, index) : fieldtext; + } + afterText(fieldtext: string): string { // Extract the text after the last '>' + const index = fieldtext.lastIndexOf('>'); + return index !== -1 ? fieldtext.substring(index + 1) : ''; + } + transform(fieldtext: string): string { + const match = fieldtext.match(/<([^>]*)>/); + return match ? match[1] : ''; // Extract the text between '<' and '>' + } + userrole; + rowSelected :any= {}; + modaldelete=false; + modalEdit=false; + modalAdd= false; + public entryForm: FormGroup; + loading = false; + product; + modalOpenedforNewLine = false; + newLine:any; + additionalFieldsFromBackend: any[] = []; + formcode = 'Todo_formCode' +tableName = 'Todo'; checkFormCode; selected: any[] = []; constructor( + private extensionService: ExtensionService, +private userInfoService:UserInfoService, + private mainService:Todoservice, + private alertService: AlertService, + private toastr: ToastrService, + private _fb: FormBuilder, + ) { } + private editInterval: any; +// component button + ngOnInit(): void { + if(this.cardmodeldata !== ''){ + this.cardmodal = JSON.parse(this.cardmodeldata); + this.dashboardArray = this.cardmodal.dashboard.slice(); + console.log(this.dashboardArray) + } + this.userrole=this.userInfoService.getRoles(); + this.getData(); + this.entryForm = this._fb.group({ +taskname : [null], + +description : [null], + +duedate : [null], + +iscompleted : [null], + + + + + + + + + + + }); // component_button200 + // form code start + this.extensionService.getJsonObjectsByFormCodeList(this.formcode).subscribe(data => { + console.log(data); + const jsonArray = data.map((str) => JSON.parse(str)); + this.additionalFieldsFromBackend = jsonArray; + this.checkFormCode = this.additionalFieldsFromBackend.some(field => field.formCode === "Todo_formCode"); + console.log(this.checkFormCode); + console.log(this.additionalFieldsFromBackend); + if (this.additionalFieldsFromBackend && this.additionalFieldsFromBackend.length > 0) { + this.additionalFieldsFromBackend.forEach(field => { + if (field.formCode === this.formcode) { + if (!this.entryForm.contains(field.extValue)) { + // Add the control only if it doesn't exist in the form + this.entryForm.addControl(field.extValue, this._fb.control(field.fieldValue)); + } + } + }); + } + }); + console.log(this.entryForm.value); + // form code end + + + + + + + + + + } + ngOnDestroy(): void { + if (this.editInterval) { + clearInterval(this.editInterval); + } + } + + + + + + + + error; + getData() { + this.mainService.getAll().subscribe((data) => { + console.log(data); + this.product = data; +this.product = [...this.product].reverse(); if(this.product.length==0){ + this.error="No Data Available" + } + },(error) => { + console.log(error); + if(error){ + this.error="Server Error"; + } + }); + } + onEdit(row) { + this.rowSelected = row; + + + + + + + + + + this.modalEdit = true; + } + onDelete(row) { + this.rowSelected = row; + this.modaldelete=true; + } + delete(id) + { + this.modaldelete = false; + console.log("in delete "+id); + this.mainService.delete(id).subscribe( + (data) => { + console.log(data); + this.ngOnInit(); + if (data) { this.toastr.success('Deleted successfully'); } + }); + } + onUpdate(id) { + this.modalEdit = false; + + + + + + + + + //console.log("in update"); + console.log("id " + id); + console.log(this.rowSelected); + //console.log("out update"); + this.mainService.update(id, this.rowSelected).subscribe( + (data) => { + console.log(data); + if (data || data.status >= 200 && data.status <= 299) { + this.toastr.success("Update Successfully"); + } +setTimeout(() => { + this.ngOnInit(); + }, 500); + + + + + + + + + }, (error) => { + console.log(error); + if (error.status >= 200 && error.status <= 299) { + // this.toastr.success("update Succesfully"); + } + if (error.status >= 400 && error.status <= 499) { + this.toastr.error("Not Updated"); + } + if (error.status >= 500 && error.status <= 599) { + this.toastr.error("Not Updated"); + } + }); + setTimeout(() => { + this.ngOnInit(); + }, 500); + } +onCreate() { + this.modalAdd=false; + + + + + + + + + this.mainService.create(this.entryForm.value).subscribe( + (data) => { + console.log(data); + if (data || data.status >= 200 && data.status <= 299) { + this.toastr.success("Added Successfully"); + } +setTimeout(() => { + this.ngOnInit(); + }, 500); + + + + + + + + + }, (error) => { + console.log(error); + if (error.status >= 200 && error.status <= 299) { + // this.toastr.success("Added Succesfully"); + } + if (error.status >= 400 && error.status <= 499) { + this.toastr.error("Not Added"); + } + if (error.status >= 500 && error.status <= 599) { + this.toastr.error("Not Added"); + } + }); + setTimeout(() => { + this.ngOnInit(); + }, 500); + } + goToAdd(row) { +this.modalAdd = true; this.submitted = false; + + + + + + + + + } + submitted = false; +onSubmit() { + console.log(this.entryForm.value); + this.submitted = true; + if (this.entryForm.invalid) { + return; + }this.onCreate(); + +} + + + + + + + + +// updateaction +} + + + + + + + diff --git a/app-app-f-f/authsec_angular/frontend/angular-clarity-master/src/app/modules/main/BuilderComponents/app-b/Todo/Todo.service.ts b/app-app-f-f/authsec_angular/frontend/angular-clarity-master/src/app/modules/main/BuilderComponents/app-b/Todo/Todo.service.ts new file mode 100644 index 0000000..678a63f --- /dev/null +++ b/app-app-f-f/authsec_angular/frontend/angular-clarity-master/src/app/modules/main/BuilderComponents/app-b/Todo/Todo.service.ts @@ -0,0 +1,41 @@ +import { Injectable } from '@angular/core'; +import { Observable } from "rxjs"; +import { HttpClient, HttpHeaders, HttpParams, } from "@angular/common/http"; +import { ApiRequestService } from "src/app/services/api/api-request.service"; +import { environment } from 'src/environments/environment'; +@Injectable({ + providedIn: 'root' +}) +export class Todoservice{ + private baseURL = "Todo/Todo" ; constructor( + private http: HttpClient, + private apiRequest: ApiRequestService, + ) { } + getAll(page?: number, size?: number): Observable { + return this.apiRequest.get(this.baseURL); + } + getById(id: number): Observable { + const _http = this.baseURL + "/" + id; + return this.apiRequest.get(_http); + } + create(data: any): Observable { + return this.apiRequest.post(this.baseURL, data); + } + update(id: number, data: any): Observable { + const _http = this.baseURL + "/" + id; + return this.apiRequest.put(_http, data); + } + delete(id: number): Observable { + const _http = this.baseURL + "/" + id; + return this.apiRequest.delete(_http); + } + + + + + + + + +// updateaction +} \ No newline at end of file diff --git a/app-app-f-f/authsec_angular/frontend/angular-clarity-master/src/app/modules/main/BuilderComponents/app-b/Todo/Todo_cardvariable.ts b/app-app-f-f/authsec_angular/frontend/angular-clarity-master/src/app/modules/main/BuilderComponents/app-b/Todo/Todo_cardvariable.ts new file mode 100644 index 0000000..bccdea1 --- /dev/null +++ b/app-app-f-f/authsec_angular/frontend/angular-clarity-master/src/app/modules/main/BuilderComponents/app-b/Todo/Todo_cardvariable.ts @@ -0,0 +1,4 @@ +export const Todocardvariable = { + "cardButton": false, + "cardmodeldata": `` +} \ No newline at end of file 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..57d3739 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 @@ -23,11 +23,7 @@
{{error}}
- TaskName - - - - Description + TaskDescription @@ -47,10 +43,7 @@ -{{user.taskname }} - - -{{user.description }} +{{user.taskdescription }} {{user.duedate }} @@ -216,8 +209,6 @@ - -

Update ToDoItem @@ -227,8 +218,6 @@ - -

{{rowSelected.id}}

@@ -236,13 +225,8 @@
- - -
- -
- - + +
@@ -262,8 +246,6 @@ - -

Extension

@@ -314,8 +296,6 @@ - -        
- - -
- -
- - + +
@@ -357,8 +332,6 @@ - - @@ -397,6 +370,4 @@ - - 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..7ae59d8 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 @@ -64,9 +64,7 @@ private userInfoService:UserInfoService, this.userrole=this.userInfoService.getRoles(); this.getData(); this.entryForm = this._fb.group({ -taskname : [null], - -description : [null], +taskdescription : [null], duedate : [null], @@ -79,8 +77,6 @@ iscompleted : [null], - - }); // component_button200 // form code start this.extensionService.getJsonObjectsByFormCodeList(this.formcode).subscribe(data => { @@ -109,8 +105,6 @@ iscompleted : [null], - - } ngOnDestroy(): void { @@ -123,8 +117,6 @@ iscompleted : [null], - - error; getData() { this.mainService.getAll().subscribe((data) => { @@ -148,8 +140,6 @@ this.product = [...this.product].reverse(); if(this.product.length==0){ - - this.modalEdit = true; } @@ -176,8 +166,6 @@ this.product = [...this.product].reverse(); if(this.product.length==0){ - - //console.log("in update"); console.log("id " + id); console.log(this.rowSelected); @@ -197,8 +185,6 @@ setTimeout(() => { - - }, (error) => { console.log(error); if (error.status >= 200 && error.status <= 299) { @@ -223,8 +209,6 @@ onCreate() { - - this.mainService.create(this.entryForm.value).subscribe( (data) => { console.log(data); @@ -239,8 +223,6 @@ setTimeout(() => { - - }, (error) => { console.log(error); @@ -265,8 +247,6 @@ this.modalAdd = true; this.submitted = false; - - } submitted = false; @@ -284,8 +264,6 @@ onSubmit() { - - // updateaction } @@ -293,5 +271,3 @@ onSubmit() { - - diff --git a/app-app-f-f/authsec_angular/frontend/angular-clarity-master/src/app/modules/main/BuilderComponents/app-b/Todoitem/Todoitem.service.ts b/app-app-f-f/authsec_angular/frontend/angular-clarity-master/src/app/modules/main/BuilderComponents/app-b/Todoitem/Todoitem.service.ts index b705bb3..adeccdd 100644 --- a/app-app-f-f/authsec_angular/frontend/angular-clarity-master/src/app/modules/main/BuilderComponents/app-b/Todoitem/Todoitem.service.ts +++ b/app-app-f-f/authsec_angular/frontend/angular-clarity-master/src/app/modules/main/BuilderComponents/app-b/Todoitem/Todoitem.service.ts @@ -35,7 +35,5 @@ export class Todoitemservice{ - - // 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 b7a5e11..c1e9903 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,3 +1,5 @@ +import { TodoComponent } from './BuilderComponents/app-b/Todo/Todo.component'; + import { TodoappComponent } from './BuilderComponents/app-b/Todoapp/Todoapp.component'; @@ -277,6 +279,11 @@ const routes: Routes = [ // buildercomponents +{path:'Todo',component:TodoComponent}, + + + + {path:'Todoapp',component:TodoappComponent}, 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 8a281a2..02a844c 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,3 +1,5 @@ +import { TodoComponent } from './BuilderComponents/app-b/Todo/Todo.component'; + import { TodoappComponent } from './BuilderComponents/app-b/Todoapp/Todoapp.component'; @@ -150,6 +152,11 @@ import { MyworkspaceComponent } from './admin/myworkspace/myworkspace.component' // buildercomponents +TodoComponent, + + + + TodoappComponent, 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 08ef64d..8f58f67 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,9 +226,11 @@ "MENU_ACTION_LINK": "Menu Action Link", "STATUS": "Status", "SUB_MENU": "Sub Menu", - "Todoapp": "Todoapp", + "Todoitem": "Todoitem", + "Todo": "Todo", "Description": "Description", + "TaskDescription": "TaskDescription", "TaskName": "TaskName", - "Completed": "Completed", + "IsCompleted": "IsCompleted", "DueDate": "DueDate" } \ No newline at end of file