diff --git a/testing15aprilnew-back-b/authsec_springboot/backend/src/main/java/com/realnet/Builders/Services/BuilderService.java b/testing15aprilnew-back-b/authsec_springboot/backend/src/main/java/com/realnet/Builders/Services/BuilderService.java
index 11edc5f..a10acc9 100644
--- a/testing15aprilnew-back-b/authsec_springboot/backend/src/main/java/com/realnet/Builders/Services/BuilderService.java
+++ b/testing15aprilnew-back-b/authsec_springboot/backend/src/main/java/com/realnet/Builders/Services/BuilderService.java
@@ -69,6 +69,15 @@ public class BuilderService {
 		executeDump(true);
 
 		// ADD OTHER SERVICE
+addCustomMenu( "Formb",  "Transcations"); 
+
+
+addCustomMenu( "Child",  "Transcations"); 
+
+
+addCustomMenu( "Forma",  "Transcations"); 
+
+
 
 		System.out.println("dashboard and menu inserted...");
 
diff --git a/testing15aprilnew-back-b/authsec_springboot/backend/src/main/java/com/realnet/basicp1/Controllers/ChildController.java b/testing15aprilnew-back-b/authsec_springboot/backend/src/main/java/com/realnet/basicp1/Controllers/ChildController.java
new file mode 100644
index 0000000..e298f98
--- /dev/null
+++ b/testing15aprilnew-back-b/authsec_springboot/backend/src/main/java/com/realnet/basicp1/Controllers/ChildController.java
@@ -0,0 +1,99 @@
+package com.realnet.basicp1.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.basicp1.Entity.Child;
+import com.realnet.basicp1.Services.ChildService ;
+
+
+
+
+
+
+@RequestMapping(value = "/Child")
+ @CrossOrigin("*") 
+@RestController
+public class ChildController {
+	@Autowired
+	private ChildService Service;
+
+@Value("${projectPath}")
+	private String projectPath;
+ 
+
+
+
+
+
+
+	@PostMapping("/Child")
+		  public Child Savedata(@RequestBody Child data) {
+		Child save = Service.Savedata(data)	;
+
+
+
+
+
+		System.out.println("data saved..." + save);
+
+ return save;
+	  }
+@PutMapping("/Child/{id}")
+	public  Child update(@RequestBody Child data,@PathVariable Integer id ) {
+		Child update = Service.update(data,id);
+		System.out.println("data update..." + update);
+		return update;
+	}	 
+//	get all with pagination
+	@GetMapping("/Child/getall/page")
+	public Page<Child> getall(@RequestParam(value = "page", required = false) Integer page,
+			@RequestParam(value = "size", required = false) Integer size) {
+		Pageable paging = PageRequest.of(page, size);
+		Page<Child> get = Service.getAllWithPagination(paging);
+
+		return get;
+
+	}	
+	@GetMapping("/Child")
+	public List<Child> getdetails() {
+		 List<Child> get = Service.getdetails();		
+		return get;
+}
+// get all without authentication 
+
+	@GetMapping("/token/Child")
+	public List<Child> getallwioutsec() {
+		 List<Child> get = Service.getdetails();		
+		return get;
+}
+@GetMapping("/Child/{id}")
+	public  Child  getdetailsbyId(@PathVariable Integer id ) {
+		Child  get = Service.getdetailsbyId(id);
+		return get;
+	}
+@DeleteMapping("/Child/{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/testing15aprilnew-back-b/authsec_springboot/backend/src/main/java/com/realnet/basicp1/Controllers/FormaController.java b/testing15aprilnew-back-b/authsec_springboot/backend/src/main/java/com/realnet/basicp1/Controllers/FormaController.java
new file mode 100644
index 0000000..94bd92c
--- /dev/null
+++ b/testing15aprilnew-back-b/authsec_springboot/backend/src/main/java/com/realnet/basicp1/Controllers/FormaController.java
@@ -0,0 +1,259 @@
+package com.realnet.basicp1.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.basicp1.Entity.Forma;
+import com.realnet.basicp1.Services.FormaService ;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+@RequestMapping(value = "/Forma")
+ @CrossOrigin("*") 
+@RestController
+public class FormaController {
+	@Autowired
+	private FormaService Service;
+
+@Value("${projectPath}")
+	private String projectPath;
+ 
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+	@PostMapping("/Forma")
+		  public Forma Savedata(@RequestBody Forma data) {
+		Forma save = Service.Savedata(data)	;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+		System.out.println("data saved..." + save);
+
+ return save;
+	  }
+@PutMapping("/Forma/{id}")
+	public  Forma update(@RequestBody Forma data,@PathVariable Integer id ) {
+		Forma update = Service.update(data,id);
+		System.out.println("data update..." + update);
+		return update;
+	}	 
+//	get all with pagination
+	@GetMapping("/Forma/getall/page")
+	public Page<Forma> getall(@RequestParam(value = "page", required = false) Integer page,
+			@RequestParam(value = "size", required = false) Integer size) {
+		Pageable paging = PageRequest.of(page, size);
+		Page<Forma> get = Service.getAllWithPagination(paging);
+
+		return get;
+
+	}	
+	@GetMapping("/Forma")
+	public List<Forma> getdetails() {
+		 List<Forma> get = Service.getdetails();		
+		return get;
+}
+// get all without authentication 
+
+	@GetMapping("/token/Forma")
+	public List<Forma> getallwioutsec() {
+		 List<Forma> get = Service.getdetails();		
+		return get;
+}
+@GetMapping("/Forma/{id}")
+	public  Forma  getdetailsbyId(@PathVariable Integer id ) {
+		Forma  get = Service.getdetailsbyId(id);
+		return get;
+	}
+@DeleteMapping("/Forma/{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/testing15aprilnew-back-b/authsec_springboot/backend/src/main/java/com/realnet/basicp1/Controllers/Forma_ListFilter1Controller.java b/testing15aprilnew-back-b/authsec_springboot/backend/src/main/java/com/realnet/basicp1/Controllers/Forma_ListFilter1Controller.java
new file mode 100644
index 0000000..4f6c9fe
--- /dev/null
+++ b/testing15aprilnew-back-b/authsec_springboot/backend/src/main/java/com/realnet/basicp1/Controllers/Forma_ListFilter1Controller.java
@@ -0,0 +1,24 @@
+package com.realnet.basicp1.Controllers;
+import java.util.List;
+import org.springframework.beans.factory.annotation.Autowired;
+ import org.springframework.web.bind.annotation.*;
+import com.realnet.basicp1.Entity.Forma_ListFilter1;
+import com.realnet.basicp1.Services.Forma_ListFilter1Service ;
+@RequestMapping(value = "/Forma_ListFilter1")
+@RestController
+public class Forma_ListFilter1Controller {
+	
+	@Autowired
+	private Forma_ListFilter1Service Service;
+
+		@GetMapping("/Forma_ListFilter1")
+	public List<Forma_ListFilter1> getlist() {
+		 List<Forma_ListFilter1> get = Service.getlistbuilder();		
+		return get;
+}
+		@GetMapping("/Forma_ListFilter11")
+	public List<Forma_ListFilter1> getlistwithparam( ) {
+		 List<Forma_ListFilter1> get = Service.getlistbuilderparam( );		
+		return get;
+}
+}
\ No newline at end of file
diff --git a/testing15aprilnew-back-b/authsec_springboot/backend/src/main/java/com/realnet/basicp1/Controllers/FormbController.java b/testing15aprilnew-back-b/authsec_springboot/backend/src/main/java/com/realnet/basicp1/Controllers/FormbController.java
new file mode 100644
index 0000000..e4b64c3
--- /dev/null
+++ b/testing15aprilnew-back-b/authsec_springboot/backend/src/main/java/com/realnet/basicp1/Controllers/FormbController.java
@@ -0,0 +1,171 @@
+package com.realnet.basicp1.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.basicp1.Entity.Formb;
+import com.realnet.basicp1.Services.FormbService ;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+@RequestMapping(value = "/Formb")
+ @CrossOrigin("*") 
+@RestController
+public class FormbController {
+	@Autowired
+	private FormbService Service;
+
+@Value("${projectPath}")
+	private String projectPath;
+ 
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+	@PostMapping("/Formb")
+		  public Formb Savedata(@RequestBody Formb data) {
+		Formb save = Service.Savedata(data)	;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+		System.out.println("data saved..." + save);
+
+ return save;
+	  }
+@PutMapping("/Formb/{id}")
+	public  Formb update(@RequestBody Formb data,@PathVariable Integer id ) {
+		Formb update = Service.update(data,id);
+		System.out.println("data update..." + update);
+		return update;
+	}	 
+//	get all with pagination
+	@GetMapping("/Formb/getall/page")
+	public Page<Formb> getall(@RequestParam(value = "page", required = false) Integer page,
+			@RequestParam(value = "size", required = false) Integer size) {
+		Pageable paging = PageRequest.of(page, size);
+		Page<Formb> get = Service.getAllWithPagination(paging);
+
+		return get;
+
+	}	
+	@GetMapping("/Formb")
+	public List<Formb> getdetails() {
+		 List<Formb> get = Service.getdetails();		
+		return get;
+}
+// get all without authentication 
+
+	@GetMapping("/token/Formb")
+	public List<Formb> getallwioutsec() {
+		 List<Formb> get = Service.getdetails();		
+		return get;
+}
+@GetMapping("/Formb/{id}")
+	public  Formb  getdetailsbyId(@PathVariable Integer id ) {
+		Formb  get = Service.getdetailsbyId(id);
+		return get;
+	}
+@DeleteMapping("/Formb/{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/testing15aprilnew-back-b/authsec_springboot/backend/src/main/java/com/realnet/basicp1/Entity/Child.java b/testing15aprilnew-back-b/authsec_springboot/backend/src/main/java/com/realnet/basicp1/Entity/Child.java
new file mode 100644
index 0000000..60f297e
--- /dev/null
+++ b/testing15aprilnew-back-b/authsec_springboot/backend/src/main/java/com/realnet/basicp1/Entity/Child.java
@@ -0,0 +1,33 @@
+package com.realnet.basicp1.Entity;
+ import lombok.*;
+import com.realnet.WhoColumn.Entity.Extension; 
+ import javax.persistence.*;
+ import java.time.LocalDateTime;
+ import java.util.*;
+
+
+
+
+
+
+ @Entity 
+ @Data
+ public class    Child extends Extension { 
+ /**
+	 * 
+	 */
+	private static final long serialVersionUID = 1L;
+
+ @Id
+ @GeneratedValue(strategy = GenerationType.IDENTITY)
+ private Integer id;
+
+private String  name;
+
+@Column(length = 2000)
+private String description;
+
+private boolean active;
+
+
+}
diff --git a/testing15aprilnew-back-b/authsec_springboot/backend/src/main/java/com/realnet/basicp1/Entity/Forma.java b/testing15aprilnew-back-b/authsec_springboot/backend/src/main/java/com/realnet/basicp1/Entity/Forma.java
new file mode 100644
index 0000000..c8be57e
--- /dev/null
+++ b/testing15aprilnew-back-b/authsec_springboot/backend/src/main/java/com/realnet/basicp1/Entity/Forma.java
@@ -0,0 +1,130 @@
+package com.realnet.basicp1.Entity;
+ import lombok.*;
+import com.realnet.WhoColumn.Entity.Extension; 
+ import javax.persistence.*;
+ import java.time.LocalDateTime;
+ import java.util.*;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ @Entity 
+ @Data
+ public class    Forma extends Extension { 
+ /**
+	 * 
+	 */
+	private static final long serialVersionUID = 1L;
+
+ @Id
+ @GeneratedValue(strategy = GenerationType.IDENTITY)
+ private Integer id;
+
+private String  names;
+
+private int numbertest;
+
+ private String phonetest;
+
+
+@Column(length = 2000)
+private String paragraphtest;
+
+private String passwordss;
+@Transient
+private String confirmpasswordss;
+
+@Column(length = 2000)
+private String textareatest;
+
+private String datetest;
+
+private String datetimetest;
+
+private String emailtest;
+
+private boolean toggletest;
+
+private String urltest;
+
+ private double decimaltest;
+
+private int percentagess;
+
+private String recaptchass;
+
+private String documentss;
+
+private String selectstat;
+
+ private String radiotest;
+
+
+  
+ 
+private boolean test1;
+   
+
+ 
+private boolean test2;
+   
+
+
+private String  fileuploadtestname;
+private String  fileuploadtestpath ;
+
+private String  imageuploadtestname;
+private String  imageuploadtestpath ;
+
+private String  audiotestname;
+private String  audiotestpath ;
+
+private String  videotestname;
+private String  videotestpath ;
+
+private String currencyss;
+
+
+}
diff --git a/testing15aprilnew-back-b/authsec_springboot/backend/src/main/java/com/realnet/basicp1/Entity/Forma_ListFilter1.java b/testing15aprilnew-back-b/authsec_springboot/backend/src/main/java/com/realnet/basicp1/Entity/Forma_ListFilter1.java
new file mode 100644
index 0000000..7fd6a3e
--- /dev/null
+++ b/testing15aprilnew-back-b/authsec_springboot/backend/src/main/java/com/realnet/basicp1/Entity/Forma_ListFilter1.java
@@ -0,0 +1,14 @@
+package com.realnet.basicp1.Entity;
+ import lombok.*;
+ import javax.persistence.*;
+ import java.time.LocalDateTime;
+ import java.util.*;
+
+ @Data
+ public class    Forma_ListFilter1 { 
+
+ private Integer id;
+
+
+ private String names;
+}
diff --git a/testing15aprilnew-back-b/authsec_springboot/backend/src/main/java/com/realnet/basicp1/Entity/Formb.java b/testing15aprilnew-back-b/authsec_springboot/backend/src/main/java/com/realnet/basicp1/Entity/Formb.java
new file mode 100644
index 0000000..d39d167
--- /dev/null
+++ b/testing15aprilnew-back-b/authsec_springboot/backend/src/main/java/com/realnet/basicp1/Entity/Formb.java
@@ -0,0 +1,80 @@
+package com.realnet.basicp1.Entity;
+ import lombok.*;
+import com.realnet.WhoColumn.Entity.Extension; 
+ import javax.persistence.*;
+ import java.time.LocalDateTime;
+ import java.util.*;
+
+
+
+
+
+
+import com.realnet.basicp1.Entity.Child;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ @Entity 
+ @Data
+ public class    Formb extends Extension { 
+ /**
+	 * 
+	 */
+	private static final long serialVersionUID = 1L;
+
+ @Id
+ @GeneratedValue(strategy = GenerationType.IDENTITY)
+ private Integer id;
+
+private String  name;
+
+private String surveyff;
+
+
+ 
+ 
+
+private String aa;
+ 
+
+ 
+
+private String bb;
+ 
+
+
+@OneToMany(  cascade=CascadeType.ALL)
+ private List<Child> child = new ArrayList<>();
+
+
+
+private String qrcode;
+
+private String barcode;
+
+
+
+private String  texts;
+
+private String concatination;
+
+
+
+private String approved_field_status;
+
+
+}
diff --git a/testing15aprilnew-back-b/authsec_springboot/backend/src/main/java/com/realnet/basicp1/Repository/ChildRepository.java b/testing15aprilnew-back-b/authsec_springboot/backend/src/main/java/com/realnet/basicp1/Repository/ChildRepository.java
new file mode 100644
index 0000000..ec930ad
--- /dev/null
+++ b/testing15aprilnew-back-b/authsec_springboot/backend/src/main/java/com/realnet/basicp1/Repository/ChildRepository.java
@@ -0,0 +1,30 @@
+package com.realnet.basicp1.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.basicp1.Entity.Child;
+
+@Repository
+public interface  ChildRepository  extends  JpaRepository<Child, Integer>  { 
+
+@Query(value = "select * from child where  created_by=?1", nativeQuery = true)
+	List<Child> findAll(Long creayedBy);
+
+@Query(value = "select * from child where  created_by=?1", nativeQuery = true)
+	Page<Child> findAll(Pageable page, Long creayedBy);
+}
\ No newline at end of file
diff --git a/testing15aprilnew-back-b/authsec_springboot/backend/src/main/java/com/realnet/basicp1/Repository/FormaRepository.java b/testing15aprilnew-back-b/authsec_springboot/backend/src/main/java/com/realnet/basicp1/Repository/FormaRepository.java
new file mode 100644
index 0000000..7c12d0f
--- /dev/null
+++ b/testing15aprilnew-back-b/authsec_springboot/backend/src/main/java/com/realnet/basicp1/Repository/FormaRepository.java
@@ -0,0 +1,70 @@
+package com.realnet.basicp1.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.basicp1.Entity.Forma;
+
+@Repository
+public interface  FormaRepository  extends  JpaRepository<Forma, Integer>  { 
+
+@Query(value = "select * from forma where  created_by=?1", nativeQuery = true)
+	List<Forma> findAll(Long creayedBy);
+
+@Query(value = "select * from forma where  created_by=?1", nativeQuery = true)
+	Page<Forma> findAll(Pageable page, Long creayedBy);
+}
\ No newline at end of file
diff --git a/testing15aprilnew-back-b/authsec_springboot/backend/src/main/java/com/realnet/basicp1/Repository/FormbRepository.java b/testing15aprilnew-back-b/authsec_springboot/backend/src/main/java/com/realnet/basicp1/Repository/FormbRepository.java
new file mode 100644
index 0000000..15fe022
--- /dev/null
+++ b/testing15aprilnew-back-b/authsec_springboot/backend/src/main/java/com/realnet/basicp1/Repository/FormbRepository.java
@@ -0,0 +1,48 @@
+package com.realnet.basicp1.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.basicp1.Entity.Formb;
+
+@Repository
+public interface  FormbRepository  extends  JpaRepository<Formb, Integer>  { 
+
+@Query(value = "select * from formb where  created_by=?1", nativeQuery = true)
+	List<Formb> findAll(Long creayedBy);
+
+@Query(value = "select * from formb where  created_by=?1", nativeQuery = true)
+	Page<Formb> findAll(Pageable page, Long creayedBy);
+}
\ No newline at end of file
diff --git a/testing15aprilnew-back-b/authsec_springboot/backend/src/main/java/com/realnet/basicp1/Services/ChildService.java b/testing15aprilnew-back-b/authsec_springboot/backend/src/main/java/com/realnet/basicp1/Services/ChildService.java
new file mode 100644
index 0000000..1d058fb
--- /dev/null
+++ b/testing15aprilnew-back-b/authsec_springboot/backend/src/main/java/com/realnet/basicp1/Services/ChildService.java
@@ -0,0 +1,93 @@
+package com.realnet.basicp1.Services;
+import com.realnet.basicp1.Repository.ChildRepository;
+import com.realnet.basicp1.Entity.Child
+;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 ChildService {
+@Autowired
+private ChildRepository Repository;
+	@Autowired
+	private AppUserServiceImpl userService; 
+@Autowired
+	private RealmService realmService;
+
+
+
+
+
+public Child Savedata(Child data) {
+
+
+
+
+
+
+	data.setUpdatedBy(getUser().getUserId());
+		data.setCreatedBy(getUser().getUserId());
+		data.setAccountId(getUser().getAccount().getAccount_id());
+Child save = Repository.save(data);
+				return save;	
+			}
+
+
+//	get all with pagination
+	public Page<Child> getAllWithPagination(Pageable page) {
+		return Repository.findAll(page, getUser().getUserId());
+	}			
+public List<Child> getdetails() {  
+		List<Realm> realm = realmService.findByUserId(getUser().getUserId());
+List<Child> all = Repository.findAll(getUser().getUserId());
+		
+		return all ;		}
+
+
+public Child getdetailsbyId(Integer id) {
+	return Repository.findById(id).get();
+			}
+
+
+	public void delete_by_id(Integer id) {
+ Repository.deleteById(id);
+}
+
+
+public Child update(Child data,Integer id) {
+	Child old = Repository.findById(id).get();
+old.setName(data.getName());
+
+old.setDescription(data.getDescription());
+
+old.setActive (data.isActive());
+
+final Child test = Repository.save(old);
+		data.setUpdatedBy(getUser().getUserId());
+  return test;} 
+
+
+
+
+
+
+ public AppUser getUser() {
+		AppUser user = userService.getLoggedInUser();
+		return user;
+
+	}}
diff --git a/testing15aprilnew-back-b/authsec_springboot/backend/src/main/java/com/realnet/basicp1/Services/FormaService.java b/testing15aprilnew-back-b/authsec_springboot/backend/src/main/java/com/realnet/basicp1/Services/FormaService.java
new file mode 100644
index 0000000..979becb
--- /dev/null
+++ b/testing15aprilnew-back-b/authsec_springboot/backend/src/main/java/com/realnet/basicp1/Services/FormaService.java
@@ -0,0 +1,304 @@
+package com.realnet.basicp1.Services;
+import com.realnet.basicp1.Repository.FormaRepository;
+import com.realnet.basicp1.Entity.Forma
+;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 FormaService {
+@Autowired
+private FormaRepository Repository;
+	@Autowired
+	private AppUserServiceImpl userService; 
+@Autowired
+	private RealmService realmService;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+@Autowired
+ private SequenceService documentsssequenceService;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+public Forma Savedata(Forma data) {
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+data.setDocumentss (documentsssequenceService.GenerateSequence("kk"));
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+	data.setUpdatedBy(getUser().getUserId());
+		data.setCreatedBy(getUser().getUserId());
+		data.setAccountId(getUser().getAccount().getAccount_id());
+Forma save = Repository.save(data);
+				return save;	
+			}
+
+
+//	get all with pagination
+	public Page<Forma> getAllWithPagination(Pageable page) {
+		return Repository.findAll(page, getUser().getUserId());
+	}			
+public List<Forma> getdetails() {  
+		List<Realm> realm = realmService.findByUserId(getUser().getUserId());
+List<Forma> all = Repository.findAll(getUser().getUserId());
+		
+		return all ;		}
+
+
+public Forma getdetailsbyId(Integer id) {
+	return Repository.findById(id).get();
+			}
+
+
+	public void delete_by_id(Integer id) {
+ Repository.deleteById(id);
+}
+
+
+public Forma update(Forma data,Integer id) {
+	Forma old = Repository.findById(id).get();
+old.setNames(data.getNames());
+
+old.setNumbertest(data.getNumbertest());
+
+old.setPhonetest(data.getPhonetest());
+
+old.setParagraphtest(data.getParagraphtest());
+
+old.setPasswordss(data.getPasswordss());
+
+old.setTextareatest(data.getTextareatest());
+
+old.setDatetest(data.getDatetest());
+
+old.setDatetimetest(data.getDatetimetest());
+
+old.setEmailtest(data.getEmailtest());
+
+old.setToggletest (data.isToggletest());
+
+old.setUrltest(data.getUrltest());
+
+old.setDecimaltest(data.getDecimaltest());
+
+old.setPercentagess(data.getPercentagess());
+
+old.setRecaptchass(data.getRecaptchass());
+
+old.setDocumentss(data.getDocumentss());
+
+old.setSelectstat(data.getSelectstat());
+
+old.setRadiotest(data.getRadiotest());
+
+  
+ 
+old.setTest1(data.isTest1());
+   
+
+ 
+old.setTest2(data.isTest2());
+   
+
+
+  
+
+ 
+
+ 
+
+ 
+
+ 
+
+old.setCurrencyss(data.getCurrencyss());
+
+final Forma test = Repository.save(old);
+		data.setUpdatedBy(getUser().getUserId());
+  return test;} 
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ public AppUser getUser() {
+		AppUser user = userService.getLoggedInUser();
+		return user;
+
+	}}
diff --git a/testing15aprilnew-back-b/authsec_springboot/backend/src/main/java/com/realnet/basicp1/Services/Forma_ListFilter1Service.java b/testing15aprilnew-back-b/authsec_springboot/backend/src/main/java/com/realnet/basicp1/Services/Forma_ListFilter1Service.java
new file mode 100644
index 0000000..daa4d6c
--- /dev/null
+++ b/testing15aprilnew-back-b/authsec_springboot/backend/src/main/java/com/realnet/basicp1/Services/Forma_ListFilter1Service.java
@@ -0,0 +1,51 @@
+package com.realnet.basicp1.Services;
+import java.util.*;
+import com.realnet.basicp1.Repository.FormaRepository;
+import com.realnet.basicp1.Entity.Forma;
+
+import com.realnet.basicp1.Entity.Forma_ListFilter1;
+import java.util.List;
+
+import org.springframework.beans.factory.annotation.Autowired;
+	import org.springframework.stereotype.Service;
+
+@Service
+ public class Forma_ListFilter1Service {
+@Autowired
+private FormaRepository Repository;
+
+
+
+
+ public   List<Forma_ListFilter1>   getlistbuilder() {
+	List<Forma> list= Repository.findAll();
+		ArrayList<Forma_ListFilter1> l = new ArrayList<>();
+		for (Forma data : list) {
+boolean isactive = data.isToggletest();
+
+				if (isactive) {{	
+Forma_ListFilter1 dummy = new Forma_ListFilter1();
+			dummy.setId(data.getId());
+  dummy.setNames(data.getNames());
+	l.add(dummy);
+}} 
+} 		
+return l;}
+
+
+
+ public   List<Forma_ListFilter1>   getlistbuilderparam( ) {
+	List<Forma> list= Repository.findAll();
+		ArrayList<Forma_ListFilter1> l = new ArrayList<>();
+		for (Forma data : list) {
+boolean isactive = data.isToggletest();
+
+				if (isactive) {{	
+Forma_ListFilter1 dummy = new Forma_ListFilter1();
+			dummy.setId(data.getId());
+  dummy.setNames(data.getNames());
+	l.add(dummy);
+}} 
+} 		
+return l;}
+}
\ No newline at end of file
diff --git a/testing15aprilnew-back-b/authsec_springboot/backend/src/main/java/com/realnet/basicp1/Services/FormbService.java b/testing15aprilnew-back-b/authsec_springboot/backend/src/main/java/com/realnet/basicp1/Services/FormbService.java
new file mode 100644
index 0000000..9ef79f6
--- /dev/null
+++ b/testing15aprilnew-back-b/authsec_springboot/backend/src/main/java/com/realnet/basicp1/Services/FormbService.java
@@ -0,0 +1,192 @@
+package com.realnet.basicp1.Services;
+import com.realnet.basicp1.Repository.FormbRepository;
+import com.realnet.basicp1.Entity.Formb
+;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 FormbService {
+@Autowired
+private FormbRepository Repository;
+	@Autowired
+	private AppUserServiceImpl userService; 
+@Autowired
+	private RealmService realmService;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+public Formb Savedata(Formb data) {
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+	data.setUpdatedBy(getUser().getUserId());
+		data.setCreatedBy(getUser().getUserId());
+		data.setAccountId(getUser().getAccount().getAccount_id());
+Formb save = Repository.save(data);
+				return save;	
+			}
+
+
+//	get all with pagination
+	public Page<Formb> getAllWithPagination(Pageable page) {
+		return Repository.findAll(page, getUser().getUserId());
+	}			
+public List<Formb> getdetails() {  
+		List<Realm> realm = realmService.findByUserId(getUser().getUserId());
+List<Formb> all = Repository.findAll(getUser().getUserId());
+		
+		return all ;		}
+
+
+public Formb getdetailsbyId(Integer id) {
+	return Repository.findById(id).get();
+			}
+
+
+	public void delete_by_id(Integer id) {
+ Repository.deleteById(id);
+}
+
+
+public Formb update(Formb data,Integer id) {
+	Formb old = Repository.findById(id).get();
+old.setName(data.getName());
+
+old.setSurveyff(data.getSurveyff());
+
+
+ 
+old.setAa(data.getAa());
+ 
+
+ 
+old.setBb(data.getBb());
+ 
+
+  
+
+old.setChild(data.getChild());
+
+
+
+old.setQrcode(data.getQrcode());
+
+old.setBarcode(data.getBarcode());
+
+
+
+old.setTexts(data.getTexts());
+
+old.setConcatination(data.getConcatination());
+
+
+
+old.setApproved_field_status(data.getApproved_field_status());
+
+final Formb test = Repository.save(old);
+		data.setUpdatedBy(getUser().getUserId());
+  return test;} 
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ public AppUser getUser() {
+		AppUser user = userService.getLoggedInUser();
+		return user;
+
+	}}
diff --git a/testing15aprilnew-db-d/authsec_mysql/mysql/wf_table/wf_table.sql b/testing15aprilnew-db-d/authsec_mysql/mysql/wf_table/wf_table.sql
new file mode 100755
index 0000000..1cfa65c
--- /dev/null
+++ b/testing15aprilnew-db-d/authsec_mysql/mysql/wf_table/wf_table.sql
@@ -0,0 +1,6 @@
+CREATE TABLE db.Forma(id BIGINT NOT NULL AUTO_INCREMENT, radiotest VARCHAR(400), urltest VARCHAR(400), decimaltest double, datetest Date, imageuploadtest VARCHAR(400), paragraphtest VARCHAR(400), selectstat VARCHAR(400), phonetest VARCHAR(400), passwordss VARCHAR(400), videotest VARCHAR(400), emailtest VARCHAR(400), recaptchass VARCHAR(400), test1 bit(1), audiotest VARCHAR(400), fileuploadtest VARCHAR(400), names VARCHAR(400), test2 bit(1), currencyss VARCHAR(400), datetimetest VARCHAR(400), documentss VARCHAR(400), toggletest VARCHAR(400), numbertest int, percentagess int, textareatest VARCHAR(400),  PRIMARY KEY (id));
+
+CREATE TABLE db.Child(id BIGINT NOT NULL AUTO_INCREMENT, active VARCHAR(400), description VARCHAR(400), name VARCHAR(400),  PRIMARY KEY (id));
+
+CREATE TABLE db.Formb(id BIGINT NOT NULL AUTO_INCREMENT, aa VARCHAR(400), bb VARCHAR(400), qrcode VARCHAR(400), onetomanyextension VARCHAR(400), texts VARCHAR(400), surveyff VARCHAR(400), value_list_field VARCHAR(400), name VARCHAR(400), checkout_field VARCHAR(400), barcode VARCHAR(400), approved_field VARCHAR(400), concatination VARCHAR(400), datagggs VARCHAR(400),  PRIMARY KEY (id));
+
diff --git a/testing15aprilnew-front-f/authsec_angular/frontend/angular-clarity-master/src/app/modules/login/login-page/login_environment.ts b/testing15aprilnew-front-f/authsec_angular/frontend/angular-clarity-master/src/app/modules/login/login-page/login_environment.ts
index 231b3a1..fdff417 100644
--- a/testing15aprilnew-front-f/authsec_angular/frontend/angular-clarity-master/src/app/modules/login/login-page/login_environment.ts
+++ b/testing15aprilnew-front-f/authsec_angular/frontend/angular-clarity-master/src/app/modules/login/login-page/login_environment.ts
@@ -2,14 +2,14 @@
 
 export const LoginEnvironment = {
 
-        "templateNo": "<templateNo>",
-        "loginHeading": "<loginHeading>",
-        "loginHeading2": "<loginHeading2>",
-        "isSignup": "<isSignup>",
-        "loginSignup": "<loginSignup> ",
-        "loginSignup2": "<loginSignup2>",
-        "loginForgotpass": "<loginForgotpass>",
-        "loginImage": "<loginImage>",
-        "loginImageURL": "<loginImageURL>"
+        "templateNo": "Template 1",
+        "loginHeading": "Welcome to",
+        "loginHeading2": "io8.dev",
+        "isSignup": "true",
+        "loginSignup": "Use your ID to sign in OR  ",
+        "loginSignup2": "create one now",
+        "loginForgotpass": "FORGOT PASSWORD?",
+        "loginImage": "[]",
+        "loginImageURL": "null"
     
 }
diff --git a/testing15aprilnew-front-f/authsec_angular/frontend/angular-clarity-master/src/app/modules/main/BuilderComponents/basicp1/Child/Child.component.html b/testing15aprilnew-front-f/authsec_angular/frontend/angular-clarity-master/src/app/modules/main/BuilderComponents/basicp1/Child/Child.component.html
new file mode 100644
index 0000000..35c4862
--- /dev/null
+++ b/testing15aprilnew-front-f/authsec_angular/frontend/angular-clarity-master/src/app/modules/main/BuilderComponents/basicp1/Child/Child.component.html
@@ -0,0 +1,376 @@
+<ol class="breadcrumb breadcrumb-arrow font-trirong">
+  <li><a href="javascript://"> Child</a></li>
+</ol>
+<div class="dg-wrapper">
+  <div class="clr-row">
+    <div class="clr-col-8">
+      <h3>Child </h3>
+    </div>
+    <div class="clr-col-4" style="text-align: right;">
+ <button *ngIf="cardButton" id="add" class="btn btn-primary btn-icon" (click)="changeView()" >
+        <clr-icon *ngIf="!isCardview" shape="grid-view"></clr-icon>    <clr-icon *ngIf="isCardview" shape="bars"></clr-icon>
+      </button>
+        <!-- button -->
+     <button id="add" class="btn btn-primary" (click)="goToAdd(product)" >
+        <clr-icon shape="plus"></clr-icon>ADD
+      </button>
+    </div></div>
+  <ng-container *ngIf="!isCardview">   <!-- GET ALL -->     <clr-datagrid [clrDgLoading]="loading" [(clrDgSelected)]="selected">
+    <clr-dg-placeholder>
+        <ng-template #loadingSpinner>
+            <clr-spinner>Loading ... </clr-spinner>
+        </ng-template>
+        <div *ngIf="error;else loadingSpinner">{{error}}</div>
+    </clr-dg-placeholder>
+
+<clr-dg-column [clrDgField]="' name'"> <ng-container *clrDgHideableColumn="{hidden: false}"> Name
+						    </ng-container></clr-dg-column>
+
+
+<clr-dg-column [clrDgField]="' description'"> <ng-container *clrDgHideableColumn="{hidden: false}"> Description
+						    </ng-container></clr-dg-column>
+
+
+<clr-dg-column [clrDgField]="' active'"> <ng-container *clrDgHideableColumn="{hidden: false}"> Active
+						    </ng-container></clr-dg-column>
+
+ 
+ <!-- who column -->
+      <clr-dg-column> <ng-container *clrDgHideableColumn="{hidden: false}">
+        <clr-icon shape="bars"></clr-icon> Action
+      </ng-container></clr-dg-column>
+      <!-- end --> 
+
+ <clr-dg-row *clrDgItems="let user of product" [clrDgItem]="user">
+
+<clr-dg-cell>{{user. name }}</clr-dg-cell>
+
+
+<clr-dg-cell (click)="goToReplaceStringdescription (user.description)" style="cursor: pointer; align-items: center;"><clr-icon shape="details"></clr-icon>
+</clr-dg-cell>
+
+
+<clr-dg-cell>{{user. active }}</clr-dg-cell>
+
+ 
+  <!-- who column -->
+<clr-dg-cell>
+  <clr-signpost>
+   <span style="cursor: pointer;" clrSignpostTrigger><clr-icon shape="help" class="success" style="color: rgb(0, 130, 236);"></clr-icon></span>
+   <clr-signpost-content [clrPosition]="'left-middle'" *clrIfOpen>
+     <h5 style="margin-top: 0">Who Column</h5>
+           <div>Account ID: <code class="clr-code">{{user.accountId}}</code></div>
+           <div>Created At: <code class="clr-code">{{user.createdAt| date}}</code></div>
+           <div>Created By: <code class="clr-code">{{user.createdBy}}</code></div>
+           <div>Updated At: <code class="clr-code">{{user.updatedAt | date}}</code></div>
+           <div>Updated By: <code class="clr-code">{{user.updatedBy}}</code></div>
+   </clr-signpost-content>
+ </clr-signpost>
+ </clr-dg-cell>
+ 
+ <!-- who colmn --> 
+ 
+ <clr-dg-action-overflow>
+        <button class="action-item" (click)="onEdit(user)">Edit</button>
+        <button class="action-item" (click)="onDelete(user)">Delete</button>
+      </clr-dg-action-overflow>
+         </clr-dg-row>
+    <clr-dg-footer>
+      <clr-dg-pagination #pagination [clrDgPageSize]="10">
+        <clr-dg-page-size [clrPageSizeOptions]="[10,20,50,100]">Users per page</clr-dg-page-size>
+        {{pagination.firstItem + 1}} - {{pagination.lastItem + 1}}
+        of {{pagination.totalItems}} users
+      </clr-dg-pagination>
+    </clr-dg-footer>
+  </clr-datagrid> </ng-container>
+<ng-template #showInfo>
+  <div class="alert alert-info" role="alert">
+      <div class="alert-items">
+          <div class="alert-item static">
+              <span class="alert-text">
+                <clr-icon class="alert-icon" shape="info-circle"></clr-icon>
+                    Data could be found. Loading..
+                  <clr-spinner [clrMedium]="true">Loading ...</clr-spinner>
+              </span>
+          </div>
+      </div>
+  </div>
+</ng-template><ng-container *ngIf="isCardview">
+  <div *ngIf="product; else showInfo" class="clr-row clr-align-items-start clr-justify-content-start">
+    <div *ngFor="let app of product| filter:search; let index = i" class="clr-col-auto" >
+      <div class="clr-row">
+        <div class="clr-col-lg-12 clr-col-md-4 clr-col-sm-4 clr-col-12" style="width: 410px;">
+  <div class="card" style="padding: 10px; "[style.background-color]="cardmodal.cardColor !== '' ? cardmodal.cardColor : 'white'">
+    <div class="card-body" style="display: grid; grid-template-columns: repeat(13, 1fr); grid-template-rows: repeat(7, 1fr); gap: 5px;">
+      <ng-container *ngFor="let item of dashboardArray">
+        <div [style.gridColumn]="item.x + 1" [style.gridRow]="item.y + 1" [style.gridColumnEnd]="item.x + item.cols + 1"
+          [style.gridRowEnd]="item.y + item.rows + 1">
+          <div *ngIf="item.name === 'textField'" class="title-card card-title"
+          [style.text-align]="item.alignment !== '' ? item.alignment : 'left'"
+          [style.line-height]="item.textlineheight !== '' ? item.textlineheight : '1'"
+          [style.font-family]="item.fontName !== '' ? item.fontName : 'Metropolis'"
+          [style.font-size]="item.fontSize !== '' ? item.fontSize : '100%'"
+          [style.font-style]="item.italic == true ? 'Italic' : 'normal'"
+          [style.font-weight]="item.bold == true ? 'bold' : 'normal'" [style.text-decoration]="(item.underline && item.strikethough) ? 'underline line-through' : 
+          (item.underline ? 'underline' : (item.strikethough ? 'line-through' : 'none'))"
+          [style.background-color]="item.backgroundcolor !== '' ? item.backgroundcolor : 'white'"
+          [style.color]="item.textcolor !== '' ? item.textcolor : 'black'"     	 [style.background-color]="item.conditionValue ==  app[transform(item.fieldtext) ] ? item.conditionbackgroundcolor : item.backgroundcolor"
+          [style.color]="item.conditionValue ==  app[transform(item.fieldtext) ] ? item.conditiontextcolor : item.textcolor">
+           {{beforeText(item.fieldtext)}}
+          {{ app[transform(item.fieldtext) ] }}
+          {{afterText(item.fieldtext)}}
+          </div>
+
+          <div *ngIf="item.name === 'dateField'" class="title-card card-title"
+          [style.text-align]="item.alignment !== '' ? item.alignment : 'left'"
+          [style.line-height]="item.textlineheight !== '' ? item.textlineheight : '1'"
+          [style.font-family]="item.fontName !== '' ? item.fontName : 'Metropolis'"
+          [style.font-size]="item.fontSize !== '' ? item.fontSize : '100%'"
+          [style.font-style]="item.italic == true ? 'Italic' : 'normal'"
+          [style.font-weight]="item.bold == true ? 'bold' : 'normal'" [style.text-decoration]="(item.underline && item.strikethough) ? 'underline line-through' : 
+          (item.underline ? 'underline' : (item.strikethough ? 'line-through' : 'none'))"
+          [style.background-color]="item.backgroundcolor !== '' ? item.backgroundcolor : 'white'"
+          [style.color]="item.textcolor !== '' ? item.textcolor : 'black'"			 [style.background-color]="item.conditionValue ==  app[transform(item.fieldtext) ] ? item.conditionbackgroundcolor : item.backgroundcolor"
+          [style.color]="item.conditionValue ==  app[transform(item.fieldtext) ] ? item.conditiontextcolor : item.textcolor">
+          {{beforeText(item.fieldtext)}}
+          {{ app[transform(item.fieldtext) ] | date}}
+          {{afterText(item.fieldtext)}}
+          </div>
+          <div *ngIf="item.name === 'numberField'" class="title-card card-title"
+          [style.text-align]="item.alignment !== '' ? item.alignment : 'left'"
+          [style.line-height]="item.textlineheight !== '' ? item.textlineheight : '1'"
+          [style.font-family]="item.fontName !== '' ? item.fontName : 'Metropolis'"
+          [style.font-size]="item.fontSize !== '' ? item.fontSize : '100%'"
+          [style.font-style]="item.italic == true ? 'Italic' : 'normal'"
+          [style.font-weight]="item.bold == true ? 'bold' : 'normal'" [style.text-decoration]="(item.underline && item.strikethough) ? 'underline line-through' : 
+          (item.underline ? 'underline' : (item.strikethough ? 'line-through' : 'none'))"
+          [style.background-color]="item.backgroundcolor !== '' ? item.backgroundcolor : 'white'"
+          [style.color]="item.textcolor !== '' ? item.textcolor : 'black'"			 [style.background-color]="item.conditionValue ==  app[transform(item.fieldtext) ] ? item.conditionbackgroundcolor : item.backgroundcolor"
+          [style.color]="item.conditionValue ==  app[transform(item.fieldtext) ] ? item.conditiontextcolor : item.textcolor">
+          {{beforeText(item.fieldtext)}}
+          {{ app[transform(item.fieldtext) ]}}
+          {{afterText(item.fieldtext)}}
+          </div>
+
+          <div *ngIf="item.name === 'Line'" class="title-card card-title"
+          [style.text-align]="item.alignment !== '' ? item.alignment : 'left'"
+          [style.line-height]="item.textlineheight !== '' ? item.textlineheight : '1'"
+          [style.font-family]="item.fontName !== '' ? item.fontName : 'Metropolis'"
+          [style.font-size]="item.fontSize !== '' ? item.fontSize : '100%'"
+          [style.font-style]="item.italic == true ? 'Italic' : 'normal'"
+          [style.font-weight]="item.bold == true ? 'bold' : 'normal'" [style.text-decoration]="(item.underline && item.strikethough) ? 'underline line-through' : 
+          (item.underline ? 'underline' : (item.strikethough ? 'line-through' : 'none'))"
+          [style.background-color]="item.backgroundcolor !== '' ? item.backgroundcolor : 'white'"
+          [style.color]="item.textcolor !== '' ? item.textcolor : 'black'">
+          <hr>
+          </div>
+
+          
+          <div *ngIf="item.name === 'Icon'" class="icon-card"
+          [style.text-align]="item.alignment !== '' ? item.alignment : 'left'"
+          [style.line-height]="item.textlineheight !== '' ? item.textlineheight : '1'"
+          [style.font-family]="item.fontName !== '' ? item.fontName : 'Metropolis'"
+          [style.font-size]="item.fontSize !== '' ? item.fontSize : '100%'"
+          [style.font-style]="item.italic == true ? 'Italic' : 'normal'"
+          [style.font-weight]="item.bold == true ? 'bold' : 'normal'" [style.text-decoration]="(item.underline && item.strikethough) ? 'underline line-through' : 
+          (item.underline ? 'underline' : (item.strikethough ? 'line-through' : 'none'))"
+          [style.background-color]="item.backgroundcolor !== '' ? item.backgroundcolor : 'white'"
+          [style.color]="item.textcolor !== '' ? item.textcolor : 'black'"
+          >
+            <clr-icon [attr.shape]="item.iconName"></clr-icon>
+          </div>
+
+          <div *ngIf="item.name == 'Image'"
+          [style.text-align]="item.alignment !== '' ? item.alignment : 'left'"
+          [style.line-height]="item.textlineheight !== '' ? item.textlineheight : '1'"
+          [style.font-family]="item.fontName !== '' ? item.fontName : 'Metropolis'"
+          [style.font-size]="item.fontSize !== '' ? item.fontSize : '100%'"
+          [style.font-style]="item.italic == true ? 'Italic' : 'normal'"
+          [style.font-weight]="item.bold == true ? 'bold' : 'normal'" [style.text-decoration]="(item.underline && item.strikethough) ? 'underline line-through' : 
+          (item.underline ? 'underline' : (item.strikethough ? 'line-through' : 'none'))"
+          [style.background-color]="item.backgroundcolor !== '' ? item.backgroundcolor : 'white'"
+          [style.color]="item.textcolor !== '' ? item.textcolor : 'black'"
+          [style.background-color]="item.conditionValue ==  app[transform(item.fieldtext) ] ? item.conditionbackgroundcolor : item.backgroundcolor"
+          [style.color]="item.conditionValue ==  app[transform(item.fieldtext) ] ? item.conditiontextcolor : item.textcolor">			 <img id="filePreview" [src]="item.imageURL" alt="File Preview"
+            [style.width]="item.imagewidth !== '' ? item.imagewidth + 'px' : '100px'"
+            [style.height]="item.imagewidth !== '' ? item.imagewidth + 'px' : '100px'"></div>
+        </div>
+      </ng-container>
+    </div>
+  </div>
+  </div>
+  </div>
+  </div>
+  </div>
+  </ng-container>
+</div>
+
+
+
+<clr-modal [(clrModalOpen)]="rsModaldescription" [clrModalSize]="'xl'" [clrModalStaticBackdrop]="true">
+						  <div class="modal-body">
+						    <textarea class="form-control" style="width:100%; height: 400px;" readonly>{{rowSelected}}</textarea>
+						  </div></clr-modal>
+
+
+
+<!-- //		EDIT DATA......... -->
+<clr-modal [(clrModalOpen)]="modalEdit" [clrModalSize]="'lg'" [clrModalStaticBackdrop]="true">
+  <h3 class="modal-title">Update Child
+ <!--update button -->
+
+
+
+
+
+</h3>
+  <div class="modal-body" *ngIf="rowSelected.id">
+    <h2 class="heading">{{rowSelected.id}}</h2>
+<!-- button -->
+    <form >
+<div class="clr-row"> 
+<div class="clr-col-sm-12">       
+<label>Name</label>
+	        <input class="clr-input"  type="text" [(ngModel)]="rowSelected.name" name="name" />
+	      </div>
+
+<div class="clr-col-sm-12">               
+<label> Description</label>
+	              <textarea cols="10" rows="2"[(ngModel)]="rowSelected.description" name="description " placeholder="Textarea">  </textarea>
+	           </div> 
+
+<div class="clr-col-sm-12"> 
+<label> Active</label> 
+<input type="checkbox" name="active" clrToggle [(ngModel)]="rowSelected.active" /> </div>
+
+  </div> 
+
+
+
+
+
+
+<!-- form code start -->
+  <div *ngIf="checkFormCode">
+    <h4 style="font-weight: 300;display: inline;">Extension</h4>
+    <br>
+    <hr>
+    <div class="clr-row">
+      <div class="clr-col-4" *ngFor="let field of additionalFieldsFromBackend">
+        <ng-container *ngIf="field.formCode === formcode" [ngSwitch]="field.fieldType">
+          <!-- Text Input -->    <label  *ngSwitchCase="'text'">{{ field.fieldName }}</label>
+          <input *ngSwitchCase="'text'" [type]="field.fieldType"  name="{{ field.extValue }}" [(ngModel)]="rowSelected[field.extValue]" class="clr-input" />
+  
+          <!-- Date Input -->    <label  *ngSwitchCase="'date'">{{ field.fieldName }}</label>
+          <input *ngSwitchCase="'date'" [type]="field.fieldType"  name="{{ field.extValue }}" [(ngModel)]="rowSelected[field.extValue]"  class="clr-input" />
+  
+          <!-- Textarea -->    <label  *ngSwitchCase="'textarea'">{{ field.fieldName }}</label>
+          <textarea *ngSwitchCase="'textarea'"  name="{{ field.extValue }}" [(ngModel)]="rowSelected[field.extValue]"  col="10" row="2"></textarea>
+  
+          <!-- Checkbox -->    <label  *ngSwitchCase="'checkbox'">{{ field.fieldName }}</label><br>
+          <input *ngSwitchCase="'checkbox'" [type]="field.fieldType" name="{{ field.extValue }}" [(ngModel)]="rowSelected[field.extValue]"  class="clr-checkbox" />
+        </ng-container>
+  </div>
+  </div>
+</div>
+
+  <!-- form code end -->  <div class="modal-footer">
+      <button type="button" class="btn btn-outline" (click)="modalEdit = false">Cancel</button>
+      <button type="submit" class="btn btn-primary"  (click)="onUpdate(rowSelected.id)">Update</button>
+      </div>
+    </form>
+  </div>
+</clr-modal>
+<clr-modal [(clrModalOpen)]="modaldelete" [clrModalSize]="'lg'" [clrModalStaticBackdrop]="true">
+  <div class="modal-body" *ngIf="rowSelected.id">
+    <h1 class="delete">Are You Sure Want to delete?</h1>
+    <h2 class="heading">{{rowSelected.id}}</h2>
+    <div class="modal-footer">
+      <button type="button" class="btn btn-outline" (click)="modaldelete = false">Cancel</button>
+    <button type="button" (click)="delete(rowSelected.id)" class="btn btn-primary" >Delete</button>
+    </div>
+  </div>
+</clr-modal>
+<!-- ADD FORM ..... -->
+<clr-modal [(clrModalOpen)]="modalAdd" [clrModalSize]="'lg'" [clrModalStaticBackdrop]="true">
+  <h3 class="modal-title">Add Child 
+
+
+
+
+
+
+  <!-- aeroplane icon -->
+    &nbsp; &nbsp; &nbsp; &nbsp;
+    <a *ngIf="userrole.includes('ROLE_ADMIN')" style="float: right;" href="javascript:void(0)" role="tooltip" aria-haspopup="true"
+      class="tooltip tooltip-sm tooltip-bottom-left">
+      <a id="build_extension" [routerLink]="['../extension/all']" [queryParams]="{ formCode: 'Child_formCode' }">
+        <clr-icon shape="airplane" size="32"></clr-icon>
+      </a>
+      <span class="tooltip-content">Form Extension</span>
+    </a> </h3>
+  <div class="modal-body">
+     <form [formGroup]="entryForm" >
+   <div class="clr-row" style="height: fit-content;">
+
+<div class="clr-col-sm-12">
+ <label>  Name</label>
+ <input class="clr-input"  type="text"  formControlName="name" />       
+ </div>
+
+<div class="clr-col-sm-12">             
+ <label>  Description</label>             
+ <textarea cols="10" rows="2" formControlName="description" placeholder="Textarea">  </textarea>
+	            </div>
+
+<div class="clr-col-sm-12">            
+ <label> Active</label>            
+  <input type="checkbox" formControlName="active" clrToggle/>            </div>
+
+ 
+ </div> 
+
+
+
+
+
+
+
+
+      <!-- form code start -->
+      <div *ngIf="checkFormCode">
+        <h4 style="font-weight: 300;display: inline;">Extension</h4>
+        <br>
+        <hr>
+        <div class="clr-row">
+          <div class="clr-col-4" *ngFor="let field of additionalFieldsFromBackend">
+            <ng-container *ngIf="field.formCode === formcode" [ngSwitch]="field.fieldType">
+              <!-- Text Input --> <label *ngSwitchCase="'text'">{{ field.fieldName }}</label>
+              <input *ngSwitchCase="'text'" [type]="field.fieldType" [formControlName]="field.extValue"
+                class="clr-input" />
+              <!-- Date Input --> <label *ngSwitchCase="'date'">{{ field.fieldName }}</label>
+              <input *ngSwitchCase="'date'" [type]="field.fieldType" [formControlName]="field.extValue"
+                class="clr-input" />
+              <!-- Textarea --> <label *ngSwitchCase="'textarea'">{{ field.fieldName }}</label>
+              <textarea *ngSwitchCase="'textarea'" [formControlName]="field.extValue" col="10" row="2"></textarea>
+              <!-- Checkbox --> <label *ngSwitchCase="'checkbox'">{{ field.fieldName }}</label><br>
+              <input *ngSwitchCase="'checkbox'" [type]="field.fieldType" [formControlName]="field.extValue"
+                class="clr-checkbox" />
+            </ng-container>
+          </div>
+        </div>
+      </div>
+      <!-- form code end --> <div class="modal-footer">
+<button type="button" class="btn btn-outline" (click)="modalAdd = false">Cancel</button>
+        <button type="submit" class="btn btn-primary" (click)="onSubmit()">ADD</button>
+        </div>
+</form>
+  </div>
+</clr-modal>
+
+
+
+
+
+
+  <!-- htmlpopup -->
diff --git a/testing15aprilnew-front-f/authsec_angular/frontend/angular-clarity-master/src/app/modules/main/BuilderComponents/basicp1/Child/Child.component.scss b/testing15aprilnew-front-f/authsec_angular/frontend/angular-clarity-master/src/app/modules/main/BuilderComponents/basicp1/Child/Child.component.scss
new file mode 100644
index 0000000..c47b921
--- /dev/null
+++ b/testing15aprilnew-front-f/authsec_angular/frontend/angular-clarity-master/src/app/modules/main/BuilderComponents/basicp1/Child/Child.component.scss
@@ -0,0 +1,78 @@
+//@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;
+}
diff --git a/testing15aprilnew-front-f/authsec_angular/frontend/angular-clarity-master/src/app/modules/main/BuilderComponents/basicp1/Child/Child.component.ts b/testing15aprilnew-front-f/authsec_angular/frontend/angular-clarity-master/src/app/modules/main/BuilderComponents/basicp1/Child/Child.component.ts
new file mode 100644
index 0000000..0bbad4e
--- /dev/null
+++ b/testing15aprilnew-front-f/authsec_angular/frontend/angular-clarity-master/src/app/modules/main/BuilderComponents/basicp1/Child/Child.component.ts
@@ -0,0 +1,270 @@
+import { Component, OnInit } from '@angular/core';
+import { ToastrService } from 'ngx-toastr';
+import { AlertService } from 'src/app/services/alert.service';
+import { Childservice} from './Child.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 { Childcardvariable } from './Child_cardvariable';
+import { UserInfoService } from 'src/app/services/user-info.service';
+declare var JsBarcode: any; 
+@Component({
+  selector: 'app-Child',
+  templateUrl: './Child.component.html',
+  styleUrls: ['./Child.component.scss']
+})
+export class ChildComponent implements OnInit {
+  cardButton = Childcardvariable.cardButton;
+  cardmodeldata = Childcardvariable.cardmodeldata;
+  public dashboardArray: DashboardContentModel2[];
+  isCardview = Childcardvariable.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 = 'Child_formCode'
+tableName = 'Child';  checkFormCode; selected: any[] = []; constructor(
+    private extensionService: ExtensionService,
+private userInfoService:UserInfoService,
+    private mainService:Childservice,
+    private alertService: AlertService,
+    private toastr: ToastrService,
+    private _fb: FormBuilder,
+  ) { }
+// 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({
+name : [null],
+
+description : [null],
+
+active : [false],
+
+
+ 
+
+
+
+
+
+  }); // 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 === "Child_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 
+
+
+
+
+
+
+
+  }
+
+
+
+
+
+
+ error; 
+  getData() {
+    this.mainService.getAll().subscribe((data) => {
+      console.log(data);
+      this.product = data;
+ 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();
+
+} 
+
+
+rsModaldescription = false;   
+goToReplaceStringdescription(row){
+this.rowSelected = row;     this.rsModaldescription  =true;   }
+
+
+
+// updateaction
+}
+
+
+
+
+
diff --git a/testing15aprilnew-front-f/authsec_angular/frontend/angular-clarity-master/src/app/modules/main/BuilderComponents/basicp1/Child/Child.service.ts b/testing15aprilnew-front-f/authsec_angular/frontend/angular-clarity-master/src/app/modules/main/BuilderComponents/basicp1/Child/Child.service.ts
new file mode 100644
index 0000000..51d5bff
--- /dev/null
+++ b/testing15aprilnew-front-f/authsec_angular/frontend/angular-clarity-master/src/app/modules/main/BuilderComponents/basicp1/Child/Child.service.ts
@@ -0,0 +1,39 @@
+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 Childservice{
+  private baseURL = "Child/Child" ;  constructor(
+    private http: HttpClient,
+    private apiRequest: ApiRequestService,
+  ) { }
+  getAll(page?: number, size?: number): Observable<any> {
+    return this.apiRequest.get(this.baseURL);
+  }
+  getById(id: number): Observable<any> {
+    const _http = this.baseURL + "/" + id;
+    return this.apiRequest.get(_http);
+  }
+  create(data: any): Observable<any> {
+    return this.apiRequest.post(this.baseURL, data);
+  }
+  update(id: number, data: any): Observable<any> {
+    const _http = this.baseURL + "/" + id;
+    return this.apiRequest.put(_http, data);
+  }
+  delete(id: number): Observable<any> {
+    const _http = this.baseURL + "/" + id;
+    return this.apiRequest.delete(_http);
+  }
+
+
+
+
+
+
+// updateaction
+}
\ No newline at end of file
diff --git a/testing15aprilnew-front-f/authsec_angular/frontend/angular-clarity-master/src/app/modules/main/BuilderComponents/basicp1/Child/Child_cardvariable.ts b/testing15aprilnew-front-f/authsec_angular/frontend/angular-clarity-master/src/app/modules/main/BuilderComponents/basicp1/Child/Child_cardvariable.ts
new file mode 100644
index 0000000..587aaf8
--- /dev/null
+++ b/testing15aprilnew-front-f/authsec_angular/frontend/angular-clarity-master/src/app/modules/main/BuilderComponents/basicp1/Child/Child_cardvariable.ts
@@ -0,0 +1,4 @@
+export const Childcardvariable = {
+    "cardButton": false,
+    "cardmodeldata": ``
+}
\ No newline at end of file
diff --git a/testing15aprilnew-front-f/authsec_angular/frontend/angular-clarity-master/src/app/modules/main/BuilderComponents/basicp1/Forma/Forma.component.html b/testing15aprilnew-front-f/authsec_angular/frontend/angular-clarity-master/src/app/modules/main/BuilderComponents/basicp1/Forma/Forma.component.html
new file mode 100644
index 0000000..969fe9c
--- /dev/null
+++ b/testing15aprilnew-front-f/authsec_angular/frontend/angular-clarity-master/src/app/modules/main/BuilderComponents/basicp1/Forma/Forma.component.html
@@ -0,0 +1,1379 @@
+<ol class="breadcrumb breadcrumb-arrow font-trirong">
+  <li><a href="javascript://"> Forma</a></li>
+</ol>
+<div class="dg-wrapper">
+  <div class="clr-row">
+    <div class="clr-col-8">
+      <h3>Forma </h3>
+    </div>
+    <div class="clr-col-4" style="text-align: right;">
+ <button *ngIf="cardButton" id="add" class="btn btn-primary btn-icon" (click)="changeView()" >
+        <clr-icon *ngIf="!isCardview" shape="grid-view"></clr-icon>    <clr-icon *ngIf="isCardview" shape="bars"></clr-icon>
+      </button>
+        <!-- button -->
+     <button id="add" class="btn btn-primary" (click)="goToAdd(product)" >
+        <clr-icon shape="plus"></clr-icon>ADD
+      </button>
+    </div></div>
+  <ng-container *ngIf="!isCardview">   <!-- GET ALL -->     <clr-datagrid [clrDgLoading]="loading" [(clrDgSelected)]="selected">
+    <clr-dg-placeholder>
+        <ng-template #loadingSpinner>
+            <clr-spinner>Loading ... </clr-spinner>
+        </ng-template>
+        <div *ngIf="error;else loadingSpinner">{{error}}</div>
+    </clr-dg-placeholder>
+
+<clr-dg-column [clrDgField]="' names'"> <ng-container *clrDgHideableColumn="{hidden: false}"> Names
+						    </ng-container></clr-dg-column>
+
+
+<clr-dg-column [clrDgField]="' numbertest'"> <ng-container *clrDgHideableColumn="{hidden: false}"> Numbertest
+						    </ng-container></clr-dg-column>
+
+
+<clr-dg-column [clrDgField]="' phonetest'"> <ng-container *clrDgHideableColumn="{hidden: false}"> Phonetest
+						    </ng-container></clr-dg-column>
+
+
+<clr-dg-column [clrDgField]="' paragraphtest'"> <ng-container *clrDgHideableColumn="{hidden: false}"> Paragraphtest
+						    </ng-container></clr-dg-column>
+
+
+ <clr-dg-column [clrDgField]="'passwordss'"> <ng-container *clrDgHideableColumn="{hidden: false}">Passwordss
+						 </ng-container></clr-dg-column>
+
+
+<clr-dg-column [clrDgField]="' textareatest'"> <ng-container *clrDgHideableColumn="{hidden: false}"> Textareatest
+						    </ng-container></clr-dg-column>
+
+
+<clr-dg-column [clrDgField]="' datetest'"> <ng-container *clrDgHideableColumn="{hidden: false}"> Datetest
+						    </ng-container></clr-dg-column>
+
+
+<clr-dg-column [clrDgField]="' datetimetest'"> <ng-container *clrDgHideableColumn="{hidden: false}"> Datetimetest
+						    </ng-container></clr-dg-column>
+
+
+<clr-dg-column [clrDgField]="' emailtest'"> <ng-container *clrDgHideableColumn="{hidden: false}"> Emailtest
+						    </ng-container></clr-dg-column>
+
+
+<clr-dg-column [clrDgField]="' toggletest'"> <ng-container *clrDgHideableColumn="{hidden: false}"> Toggletest
+						    </ng-container></clr-dg-column>
+
+
+ <clr-dg-column [clrDgField]="'urltest'"> <ng-container *clrDgHideableColumn="{hidden: false}"> Urltest
+						 </ng-container></clr-dg-column>
+
+
+<clr-dg-column [clrDgField]="' decimaltest'"> <ng-container *clrDgHideableColumn="{hidden: false}"> Decimaltest
+						    </ng-container></clr-dg-column>
+
+
+<clr-dg-column [clrDgField]="' percentagess'"> <ng-container *clrDgHideableColumn="{hidden: false}"> Percentagess
+						    </ng-container></clr-dg-column>
+
+
+<clr-dg-column [clrDgField]="' recaptchass'"> <ng-container *clrDgHideableColumn="{hidden: false}"> recaptchass
+						    </ng-container></clr-dg-column>
+
+
+<clr-dg-column [clrDgField]="' documentss'"> <ng-container *clrDgHideableColumn="{hidden: false}"> documentss
+						    </ng-container></clr-dg-column>
+
+
+<clr-dg-column [clrDgField]="' selectstat'"> <ng-container *clrDgHideableColumn="{hidden: false}"> selectstat
+						    </ng-container></clr-dg-column>
+
+
+<clr-dg-column [clrDgField]="' radiotest'"> <ng-container *clrDgHideableColumn="{hidden: false}"> Radiotest
+						    </ng-container></clr-dg-column>
+
+ 
+ 
+ 
+<clr-dg-column [clrDgField]="' test1'"> <ng-container *clrDgHideableColumn="{hidden: false}"> test1
+						    </ng-container></clr-dg-column>
+   
+
+ 
+<clr-dg-column [clrDgField]="' test2'"> <ng-container *clrDgHideableColumn="{hidden: false}"> test2
+						    </ng-container></clr-dg-column>
+   
+
+
+
+
+
+
+
+
+
+
+
+
+<clr-dg-column [clrDgField]="' currencyss'"> <ng-container *clrDgHideableColumn="{hidden: false}"> Currencyss
+						    </ng-container></clr-dg-column>
+
+ 
+ <!-- who column -->
+      <clr-dg-column> <ng-container *clrDgHideableColumn="{hidden: false}">
+        <clr-icon shape="bars"></clr-icon> Action
+      </ng-container></clr-dg-column>
+      <!-- end --> 
+
+ <clr-dg-row *clrDgItems="let user of product" [clrDgItem]="user">
+
+<clr-dg-cell>{{user. names }}</clr-dg-cell>
+
+
+<clr-dg-cell>{{user. numbertest }}</clr-dg-cell>
+
+
+<clr-dg-cell>{{user. phonetest }}</clr-dg-cell>
+
+
+<clr-dg-cell (click)="goToReplaceStringparagraphtest(user.paragraphtest)" style="cursor: pointer; align-items: center;"><clr-icon shape="details"></clr-icon></clr-dg-cell>
+
+
+<clr-dg-cell>{{user. passwordss }}</clr-dg-cell>
+
+
+<clr-dg-cell (click)="goToReplaceStringtextareatest (user.textareatest)" style="cursor: pointer; align-items: center;"><clr-icon shape="details"></clr-icon>
+</clr-dg-cell>
+
+
+<clr-dg-cell>{{user. datetest }}</clr-dg-cell>
+
+
+<clr-dg-cell>{{user. datetimetest }}</clr-dg-cell>
+
+
+<clr-dg-cell>{{user. emailtest }}</clr-dg-cell>
+
+
+<clr-dg-cell>{{user. toggletest }}</clr-dg-cell>
+
+
+<clr-dg-cell (click)="goTourltestUrl(user.urltest)" style="cursor: pointer; color: rgb(108, 108, 194);">{{user.urltest}}</clr-dg-cell>
+
+
+<clr-dg-cell>{{user. decimaltest }}</clr-dg-cell>
+
+
+<clr-dg-cell>{{user. percentagess }}</clr-dg-cell>
+
+
+<clr-dg-cell>{{user. recaptchass }}</clr-dg-cell>
+
+
+<clr-dg-cell>{{user. documentss }}</clr-dg-cell>
+
+
+<clr-dg-cell>{{user. selectstat }}</clr-dg-cell>
+
+
+<clr-dg-cell>{{user. radiotest }}</clr-dg-cell>
+
+
+
+ 
+<clr-dg-cell>{{user. test1}}</clr-dg-cell>
+   
+
+ 
+<clr-dg-cell>{{user. test2}}</clr-dg-cell>
+   
+
+
+
+
+
+
+
+
+
+
+
+
+<clr-dg-cell>{{user. currencyss }}</clr-dg-cell>
+
+ 
+  <!-- who column -->
+<clr-dg-cell>
+  <clr-signpost>
+   <span style="cursor: pointer;" clrSignpostTrigger><clr-icon shape="help" class="success" style="color: rgb(0, 130, 236);"></clr-icon></span>
+   <clr-signpost-content [clrPosition]="'left-middle'" *clrIfOpen>
+     <h5 style="margin-top: 0">Who Column</h5>
+           <div>Account ID: <code class="clr-code">{{user.accountId}}</code></div>
+           <div>Created At: <code class="clr-code">{{user.createdAt| date}}</code></div>
+           <div>Created By: <code class="clr-code">{{user.createdBy}}</code></div>
+           <div>Updated At: <code class="clr-code">{{user.updatedAt | date}}</code></div>
+           <div>Updated By: <code class="clr-code">{{user.updatedBy}}</code></div>
+   </clr-signpost-content>
+ </clr-signpost>
+ </clr-dg-cell>
+ 
+ <!-- who colmn --> 
+ 
+ <clr-dg-action-overflow>
+        <button class="action-item" (click)="onEdit(user)">Edit</button>
+        <button class="action-item" (click)="onDelete(user)">Delete</button>
+      </clr-dg-action-overflow>
+         </clr-dg-row>
+    <clr-dg-footer>
+      <clr-dg-pagination #pagination [clrDgPageSize]="10">
+        <clr-dg-page-size [clrPageSizeOptions]="[10,20,50,100]">Users per page</clr-dg-page-size>
+        {{pagination.firstItem + 1}} - {{pagination.lastItem + 1}}
+        of {{pagination.totalItems}} users
+      </clr-dg-pagination>
+    </clr-dg-footer>
+  </clr-datagrid> </ng-container>
+<ng-template #showInfo>
+  <div class="alert alert-info" role="alert">
+      <div class="alert-items">
+          <div class="alert-item static">
+              <span class="alert-text">
+                <clr-icon class="alert-icon" shape="info-circle"></clr-icon>
+                    Data could be found. Loading..
+                  <clr-spinner [clrMedium]="true">Loading ...</clr-spinner>
+              </span>
+          </div>
+      </div>
+  </div>
+</ng-template><ng-container *ngIf="isCardview">
+  <div *ngIf="product; else showInfo" class="clr-row clr-align-items-start clr-justify-content-start">
+    <div *ngFor="let app of product| filter:search; let index = i" class="clr-col-auto" >
+      <div class="clr-row">
+        <div class="clr-col-lg-12 clr-col-md-4 clr-col-sm-4 clr-col-12" style="width: 410px;">
+  <div class="card" style="padding: 10px; "[style.background-color]="cardmodal.cardColor !== '' ? cardmodal.cardColor : 'white'">
+    <div class="card-body" style="display: grid; grid-template-columns: repeat(13, 1fr); grid-template-rows: repeat(7, 1fr); gap: 5px;">
+      <ng-container *ngFor="let item of dashboardArray">
+        <div [style.gridColumn]="item.x + 1" [style.gridRow]="item.y + 1" [style.gridColumnEnd]="item.x + item.cols + 1"
+          [style.gridRowEnd]="item.y + item.rows + 1">
+          <div *ngIf="item.name === 'textField'" class="title-card card-title"
+          [style.text-align]="item.alignment !== '' ? item.alignment : 'left'"
+          [style.line-height]="item.textlineheight !== '' ? item.textlineheight : '1'"
+          [style.font-family]="item.fontName !== '' ? item.fontName : 'Metropolis'"
+          [style.font-size]="item.fontSize !== '' ? item.fontSize : '100%'"
+          [style.font-style]="item.italic == true ? 'Italic' : 'normal'"
+          [style.font-weight]="item.bold == true ? 'bold' : 'normal'" [style.text-decoration]="(item.underline && item.strikethough) ? 'underline line-through' : 
+          (item.underline ? 'underline' : (item.strikethough ? 'line-through' : 'none'))"
+          [style.background-color]="item.backgroundcolor !== '' ? item.backgroundcolor : 'white'"
+          [style.color]="item.textcolor !== '' ? item.textcolor : 'black'"     	 [style.background-color]="item.conditionValue ==  app[transform(item.fieldtext) ] ? item.conditionbackgroundcolor : item.backgroundcolor"
+          [style.color]="item.conditionValue ==  app[transform(item.fieldtext) ] ? item.conditiontextcolor : item.textcolor">
+           {{beforeText(item.fieldtext)}}
+          {{ app[transform(item.fieldtext) ] }}
+          {{afterText(item.fieldtext)}}
+          </div>
+
+          <div *ngIf="item.name === 'dateField'" class="title-card card-title"
+          [style.text-align]="item.alignment !== '' ? item.alignment : 'left'"
+          [style.line-height]="item.textlineheight !== '' ? item.textlineheight : '1'"
+          [style.font-family]="item.fontName !== '' ? item.fontName : 'Metropolis'"
+          [style.font-size]="item.fontSize !== '' ? item.fontSize : '100%'"
+          [style.font-style]="item.italic == true ? 'Italic' : 'normal'"
+          [style.font-weight]="item.bold == true ? 'bold' : 'normal'" [style.text-decoration]="(item.underline && item.strikethough) ? 'underline line-through' : 
+          (item.underline ? 'underline' : (item.strikethough ? 'line-through' : 'none'))"
+          [style.background-color]="item.backgroundcolor !== '' ? item.backgroundcolor : 'white'"
+          [style.color]="item.textcolor !== '' ? item.textcolor : 'black'"			 [style.background-color]="item.conditionValue ==  app[transform(item.fieldtext) ] ? item.conditionbackgroundcolor : item.backgroundcolor"
+          [style.color]="item.conditionValue ==  app[transform(item.fieldtext) ] ? item.conditiontextcolor : item.textcolor">
+          {{beforeText(item.fieldtext)}}
+          {{ app[transform(item.fieldtext) ] | date}}
+          {{afterText(item.fieldtext)}}
+          </div>
+          <div *ngIf="item.name === 'numberField'" class="title-card card-title"
+          [style.text-align]="item.alignment !== '' ? item.alignment : 'left'"
+          [style.line-height]="item.textlineheight !== '' ? item.textlineheight : '1'"
+          [style.font-family]="item.fontName !== '' ? item.fontName : 'Metropolis'"
+          [style.font-size]="item.fontSize !== '' ? item.fontSize : '100%'"
+          [style.font-style]="item.italic == true ? 'Italic' : 'normal'"
+          [style.font-weight]="item.bold == true ? 'bold' : 'normal'" [style.text-decoration]="(item.underline && item.strikethough) ? 'underline line-through' : 
+          (item.underline ? 'underline' : (item.strikethough ? 'line-through' : 'none'))"
+          [style.background-color]="item.backgroundcolor !== '' ? item.backgroundcolor : 'white'"
+          [style.color]="item.textcolor !== '' ? item.textcolor : 'black'"			 [style.background-color]="item.conditionValue ==  app[transform(item.fieldtext) ] ? item.conditionbackgroundcolor : item.backgroundcolor"
+          [style.color]="item.conditionValue ==  app[transform(item.fieldtext) ] ? item.conditiontextcolor : item.textcolor">
+          {{beforeText(item.fieldtext)}}
+          {{ app[transform(item.fieldtext) ]}}
+          {{afterText(item.fieldtext)}}
+          </div>
+
+          <div *ngIf="item.name === 'Line'" class="title-card card-title"
+          [style.text-align]="item.alignment !== '' ? item.alignment : 'left'"
+          [style.line-height]="item.textlineheight !== '' ? item.textlineheight : '1'"
+          [style.font-family]="item.fontName !== '' ? item.fontName : 'Metropolis'"
+          [style.font-size]="item.fontSize !== '' ? item.fontSize : '100%'"
+          [style.font-style]="item.italic == true ? 'Italic' : 'normal'"
+          [style.font-weight]="item.bold == true ? 'bold' : 'normal'" [style.text-decoration]="(item.underline && item.strikethough) ? 'underline line-through' : 
+          (item.underline ? 'underline' : (item.strikethough ? 'line-through' : 'none'))"
+          [style.background-color]="item.backgroundcolor !== '' ? item.backgroundcolor : 'white'"
+          [style.color]="item.textcolor !== '' ? item.textcolor : 'black'">
+          <hr>
+          </div>
+
+          
+          <div *ngIf="item.name === 'Icon'" class="icon-card"
+          [style.text-align]="item.alignment !== '' ? item.alignment : 'left'"
+          [style.line-height]="item.textlineheight !== '' ? item.textlineheight : '1'"
+          [style.font-family]="item.fontName !== '' ? item.fontName : 'Metropolis'"
+          [style.font-size]="item.fontSize !== '' ? item.fontSize : '100%'"
+          [style.font-style]="item.italic == true ? 'Italic' : 'normal'"
+          [style.font-weight]="item.bold == true ? 'bold' : 'normal'" [style.text-decoration]="(item.underline && item.strikethough) ? 'underline line-through' : 
+          (item.underline ? 'underline' : (item.strikethough ? 'line-through' : 'none'))"
+          [style.background-color]="item.backgroundcolor !== '' ? item.backgroundcolor : 'white'"
+          [style.color]="item.textcolor !== '' ? item.textcolor : 'black'"
+          >
+            <clr-icon [attr.shape]="item.iconName"></clr-icon>
+          </div>
+
+          <div *ngIf="item.name == 'Image'"
+          [style.text-align]="item.alignment !== '' ? item.alignment : 'left'"
+          [style.line-height]="item.textlineheight !== '' ? item.textlineheight : '1'"
+          [style.font-family]="item.fontName !== '' ? item.fontName : 'Metropolis'"
+          [style.font-size]="item.fontSize !== '' ? item.fontSize : '100%'"
+          [style.font-style]="item.italic == true ? 'Italic' : 'normal'"
+          [style.font-weight]="item.bold == true ? 'bold' : 'normal'" [style.text-decoration]="(item.underline && item.strikethough) ? 'underline line-through' : 
+          (item.underline ? 'underline' : (item.strikethough ? 'line-through' : 'none'))"
+          [style.background-color]="item.backgroundcolor !== '' ? item.backgroundcolor : 'white'"
+          [style.color]="item.textcolor !== '' ? item.textcolor : 'black'"
+          [style.background-color]="item.conditionValue ==  app[transform(item.fieldtext) ] ? item.conditionbackgroundcolor : item.backgroundcolor"
+          [style.color]="item.conditionValue ==  app[transform(item.fieldtext) ] ? item.conditiontextcolor : item.textcolor">			 <img id="filePreview" [src]="item.imageURL" alt="File Preview"
+            [style.width]="item.imagewidth !== '' ? item.imagewidth + 'px' : '100px'"
+            [style.height]="item.imagewidth !== '' ? item.imagewidth + 'px' : '100px'"></div>
+        </div>
+      </ng-container>
+    </div>
+  </div>
+  </div>
+  </div>
+  </div>
+  </div>
+  </ng-container>
+</div>
+
+
+
+
+
+
+
+<clr-modal [(clrModalOpen)]="rsModalparagraphtest" [clrModalSize]="'xl'" [clrModalStaticBackdrop]="true">
+						  <div class="modal-body">
+						    <textarea class="form-control" style="width:100%; height: 400px;" readonly>{{rowSelected}}</textarea>
+						  </div></clr-modal>
+
+
+
+
+<clr-modal [(clrModalOpen)]="rsModaltextareatest" [clrModalSize]="'xl'" [clrModalStaticBackdrop]="true">
+						  <div class="modal-body">
+						    <textarea class="form-control" style="width:100%; height: 400px;" readonly>{{rowSelected}}</textarea>
+						  </div></clr-modal>
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+<!-- //		EDIT DATA......... -->
+<clr-modal [(clrModalOpen)]="modalEdit" [clrModalSize]="'lg'" [clrModalStaticBackdrop]="true">
+  <h3 class="modal-title">Update Forma
+ <!--update button -->
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+</h3>
+  <div class="modal-body" *ngIf="rowSelected.id">
+    <h2 class="heading">{{rowSelected.id}}</h2>
+<!-- button -->
+    <form >
+<div class="clr-row"> 
+<div class="clr-col-sm-12">       
+<label>Names</label>
+	        <input class="clr-input"  type="text" [(ngModel)]="rowSelected.names" name="names" />
+	      </div>
+
+<div class="clr-col-sm-12">       
+<label>Numbertest</label>
+	        <input id="name" class="clr-input"  type="number" [(ngModel)]="rowSelected.numbertest" name="numbertest" />
+	      </div>
+
+<div class="clr-col-sm-12">         
+<label> Phonetest</label>
+	        <input id="name" class="clr-input" type="Text" [(ngModel)]="rowSelected.phonetest " name="phonetest" pattern="((\\+)?([1-9]{2}))?[1-9]{1}[0-9]{9}$" />
+	        <div *ngIf="rowSelected.phonetest  && !isValidPhonetest(rowSelected.phonetest)" class="error_mess">
+	          * Please Follow your pattern,+91 Enter 10 digit Mobile Number.
+	        </div>       </div> 
+
+<div class="clr-col-sm-12">         
+<label> Paragraphtest</label>
+	        <input id="name"  type="Text" class="form-control" style="border: none; outline: none; height:33px !important;" [(ngModel)]="rowSelected.paragraphtest" name=" paragraphtest " />       </div>
+
+<div class="clr-col-sm-12">       
+<label> Passwordss</label><br>      
+ <div><input [type]="newpHidepasswordss ? 'password': 'text'" class="clr-input" style="width: 93% !important;" [(ngModel)]="rowSelected.passwordss" name="passwordss">&nbsp;
+	      <clr-icon [attr.shape]="newIconpasswordss" (click)="newShapeChangerpasswordss()"></clr-icon></div>
+	    </div>
+
+<div class="clr-col-sm-12">               
+<label> Textareatest</label>
+	              <textarea cols="10" rows="2"[(ngModel)]="rowSelected.textareatest" name="textareatest " placeholder="Textarea">  </textarea>
+	           </div> 
+
+<div class="clr-col-sm-12">       
+<label>Datetest</label>
+	        <input id="name" class="clr-input"  type="date" [(ngModel)]="rowSelected.datetest" name="datetest" />
+	      </div>
+
+<div class="clr-col-sm-12">       
+<label>Datetimetest</label>
+	        <input  class="clr-input"  type="datetime-local" [(ngModel)]="rowSelected.datetimetest" name="datetimetest" />
+	      </div>
+
+<div class="clr-col-sm-12">     
+<label> Emailtest</label>
+								  <input id="name" class="clr-input" type="email" 
+						 [(ngModel)]="rowSelected.emailtest " name="emailtest" pattern="[a-zA-Z0-9._%+-]+@[a-zA-Z0-9.-]+\.[a-zA-Z]{2,}$">
+								  <div *ngIf="rowSelected.emailtest && !isValidemailtest(rowSelected.emailtest )" class="error_mess">
+	            * Email must be a valid email address.         
+  </div> </div>
+
+<div class="clr-col-sm-12"> 
+<label> Toggletest</label> 
+<input type="checkbox" name="toggletest" clrToggle [(ngModel)]="rowSelected.toggletest" /> </div>
+
+<div class="clr-col-sm-12">         
+<label> Urltest</label>
+	        <input type="url" name="urltest" [(ngModel)]="rowSelected.urltest" placeholder="Enter URL" class="clr-input" pattern="https?://.+">
+	        <div *ngIf="!isValidurltest(rowSelected.urltest )" class="error_mess">  * Please enter a valid URL.         </div>     </div>
+
+<div class="clr-col-sm-12">        
+<label> Decimaltest</label>
+          <input  class="clr-input" type="number" step ="0.01" [(ngModel)]="rowSelected.decimaltest" name="decimaltest" /> </div>
+
+<div class="clr-col-sm-12">       
+<label>Percentagess</label>
+	        <input id="name" class="clr-input"  type="number" [(ngModel)]="rowSelected.percentagess" name="percentagess" />
+	      </div>
+
+<div class="clr-col-sm-12">            
+ <label> recaptchass</label>   <div><b>{{ recaptchassCode }}</b> &nbsp; <button  class="btn btn-icon btn-primary btn-sm" (click)="generaterecaptchass()">
+<clr-icon shape="refresh"></clr-icon>   </button></div>
+	            <input type="text" name="recaptchass" [(ngModel)]="rowSelected.recaptchass" (ngModelChange)="checkrecaptchassEdit()" class="clr-input">
+	            <div *ngIf=" recaptchassMismatch" class="error_mess">
+	              <div class="error_mess"> recaptchass  not valid.</div>
+	            </div>         
+</div> 
+
+
+
+<div class="clr-col-sm-12">
+ <label> selectstat</label> 
+<select name="selectstat" [(ngModel)]="rowSelected.selectstat">
+    <option [value]="null">Selectselectstat
+    </option>
+
+
+    
+ 
+
+    <option> a </option>
+     
+
+ 
+
+    <option> b </option>
+     
+
+ 
+
+    <option> c </option>
+     
+
+
+  </select> </div>
+
+ <div class="clr-col-sm-12">            
+            <label> Radiotest</label>             
+           <clr-radio-container clrInline style="margin-top: 0;">
+               
+ 
+               <clr-radio-wrapper>
+                                 <input type="radio" clrRadio  (change)="updateradiotestEdit('female')" [checked]="rowSelected.radiotest  === 'female'" />
+                                 <label>female</label>
+                               </clr-radio-wrapper>
+                
+
+ 
+               <clr-radio-wrapper>
+                                 <input type="radio" clrRadio  (change)="updateradiotestEdit('male')" [checked]="rowSelected.radiotest  === 'male'" />
+                                 <label>male</label>
+                               </clr-radio-wrapper>
+                
+
+               </clr-radio-container>           </div>
+
+<!-- multiselect checkbox field start -->
+<div class="clr-col-sm-12">
+ <label> checkboxtest</label>
+  <div class="clr-form-control" style="margin-top: 5px;margin-bottom: 10px;">
+    <div class="clr-control-container">
+      
+ 
+
+      <div class="clr-checkbox-wrapper"> <input type="checkbox" id="test1" name="test1" [(ngModel)]="rowSelected.test1" class="clr-checkbox" /> 
+<label for="test1" class="clr-control-label"> test1</label> </div>
+
+       
+
+ 
+
+      <div class="clr-checkbox-wrapper"> <input type="checkbox" id="test2" name="test2" [(ngModel)]="rowSelected.test2" class="clr-checkbox" /> 
+<label for="test2" class="clr-control-label"> test2</label> </div>
+
+       
+
+
+    </div>
+  </div>
+</div>
+<!-- multiselect checkbox field end -->
+
+
+
+
+
+
+
+
+
+<!-- currency field start -->
+<div class="clr-col-sm-12">
+  <label> Currencyss</label>
+  <input type="number" class="clr-input" [(ngModel)]="rowSelected.currencyss" name="currencyss" (blur)="formatCurrencycurrencyss()" [value]="rowSelected.currencyss  | removeCommas">
+</div>
+<!-- currency field end -->
+
+  </div> 
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+<h6> List of fileuploadtest</h6>
+
+  <div  class="clr-row" style="margin-top: 10px;">
+    <table class="table">
+        <thead>
+         <tr>
+         <th>No</th>
+          <th> File</th>
+         <th>File Name</th>
+           <th>Preview</th>
+           <th>Cancel</th>
+            </tr>
+          </thead>
+          <tbody >
+            <tr *ngFor="let attach of FileDatafileuploadtest; let i=index">
+              <td style="width: 70px;"><input type="text" class="clr-input"  value={{i+1}} [readonly]="true">  </td>
+              <td><input type="file" (change)="onFileChangedfileuploadtest($event, i)"  accept = "application/pdf,.csv, application/vnd.openxmlformats-officedocument.spreadsheetml.sheet, application/vnd.ms-excel"/>
+               </td>
+             <td>{{attach.uploadedfile_name}}</td>
+              <td >  <img [src]="attach.filePreview" alt="File Preview"  [ngModelOptions]="{standalone: true}" name="filePreview" width="100px" height="100px"></td>
+              <td>
+                  <clr-signpost style="padding-right: 10px;">
+                      <clr-icon shape="trash" class="is-error" aria-label="Icon Button Trigger" clrSignpostTrigger></clr-icon>
+                 
+                    <clr-signpost-content [clrPosition]="'bottom-middle'" *clrIfOpen>
+  <div style="text-align: center;"><b >Are you sure?</b></div>
+                      <button class="btn btn-outline" [clrSignpostTrigger]="false">cancel</button>&nbsp;
+                      <button class="btn btn-primary"  (click)="deleteRowfileuploadtest(i,attach.id)" >Delete</button>
+                    </clr-signpost-content>
+                  </clr-signpost>
+                
+              </td>
+            </tr>
+ 
+ 
+        </tbody>
+          <button type="button" class="btn btn-primary button1" style="margin-left: 20px;" (click)="onAddLinesfileuploadtest()">
+            <clr-icon shape="plus"></clr-icon>
+          </button>
+ 
+        </table> </div>
+
+<h6> List of imageuploadtest</h6>
+
+  <div  class="clr-row" style="margin-top: 10px;">
+    <table class="table">
+        <thead>
+         <tr>
+         <th>No</th>
+          <th> File</th>
+         <th>File Name</th>
+           <th>Preview</th>
+           <th>Cancel</th>
+            </tr>
+          </thead>
+          <tbody >
+            <tr *ngFor="let attach of FileDataimageuploadtest; let i=index">
+              <td style="width: 70px;"><input type="text" class="clr-input"  value={{i+1}} [readonly]="true">  </td>
+              <td><input type="file" (change)="onFileChangedimageuploadtest($event, i)"  accept="image/*" />
+               </td>
+             <td>{{attach.uploadedfile_name}}</td>
+              <td >  <img [src]="attach.filePreview" alt="File Preview"  [ngModelOptions]="{standalone: true}" name="filePreview" width="100px" height="100px"></td>
+              <td>
+                  <clr-signpost style="padding-right: 10px;">
+                      <clr-icon shape="trash" class="is-error" aria-label="Icon Button Trigger" clrSignpostTrigger></clr-icon>
+                 
+                    <clr-signpost-content [clrPosition]="'bottom-middle'" *clrIfOpen>
+                  <div style="text-align: center;"><b >Are you sure?</b></div>
+                      <button class="btn btn-outline" [clrSignpostTrigger]="false">cancel</button>&nbsp;
+                      <button class="btn btn-primary"  (click)="deleteRowimageuploadtest(i,attach.id)" >Delete</button>
+                    </clr-signpost-content>
+                  </clr-signpost>
+                
+              </td>
+            </tr>
+ 
+ 
+        </tbody>
+          <button type="button" class="btn btn-primary button1" style="margin-left: 20px;" (click)="onAddLinesimageuploadtest()">
+            <clr-icon shape="plus"></clr-icon>
+          </button>
+ 
+        </table> </div>
+
+<h6> List of audiotest</h6>
+
+  <div  class="clr-row" style="margin-top: 10px;">
+    <table class="table">
+        <thead>
+         <tr>
+         <th>No</th>
+          <th> File</th>
+         <th>File Name</th>
+           <th>Preview</th>
+           <th>Cancel</th>
+            </tr>
+          </thead>
+          <tbody >
+            <tr *ngFor="let attach of FileDataaudiotest; let i=index">
+              <td style="width: 70px;"><input type="text" class="clr-input"  value={{i+1}} [readonly]="true">  </td>
+              <td><input type="file" (change)="onFileChangedaudiotest($event, i)"  accept="audio/*" />
+               </td>
+             <td>{{attach.uploadedfile_name}}</td>
+              <td >  <audio *ngIf="attach.filePreview" [src]="attach.filePreview" controls></audio></td>
+              <td>
+                  <clr-signpost style="padding-right: 10px;">
+                      <clr-icon shape="trash" class="is-error" aria-label="Icon Button Trigger" clrSignpostTrigger></clr-icon>
+                 
+                    <clr-signpost-content [clrPosition]="'bottom-middle'" *clrIfOpen>
+                  <div style="text-align: center;"><b >Are you sure?</b></div>
+                      <button class="btn btn-outline" [clrSignpostTrigger]="false">cancel</button>&nbsp;
+                      <button class="btn btn-primary"  (click)="deleteRowaudiotest(i,attach.id)" >Delete</button>
+                    </clr-signpost-content>
+                  </clr-signpost>
+                
+              </td>
+            </tr>
+ 
+ 
+        </tbody>
+          <button type="button" class="btn btn-primary button1" style="margin-left: 20px;" (click)="onAddLinesaudiotest()">
+            <clr-icon shape="plus"></clr-icon>
+          </button>
+ 
+        </table> </div>
+
+<h6> List of videotest</h6>
+
+  <div  class="clr-row" style="margin-top: 10px;">
+    <table class="table">
+        <thead>
+         <tr>
+         <th>No</th>
+          <th> File</th>
+         <th>File Name</th>
+           <th>Preview</th>
+           <th>Cancel</th>
+            </tr>
+          </thead>
+          <tbody >
+            <tr *ngFor="let attach of FileDatavideotest; let i=index">
+              <td style="width: 70px;"><input type="text" class="clr-input"  value={{i+1}} [readonly]="true">  </td>
+              <td><input type="file" (change)="onFileChangedvideotest($event, i)"  accept="video/*" />
+               </td>
+             <td>{{attach.uploadedfile_name}}</td>
+              <td >            <video *ngIf="attach.filePreview" [src]="attach.filePreview" width="100px" height="100px" controls></video></td>
+              <td>
+                  <clr-signpost style="padding-right: 10px;">
+                      <clr-icon shape="trash" class="is-error" aria-label="Icon Button Trigger" clrSignpostTrigger></clr-icon>
+                 
+                    <clr-signpost-content [clrPosition]="'bottom-middle'" *clrIfOpen>
+                  <div style="text-align: center;"><b >Are you sure?</b></div>
+                      <button class="btn btn-outline" [clrSignpostTrigger]="false">cancel</button>&nbsp;
+                      <button class="btn btn-primary"  (click)="deleteRowvideotest(i,attach.id)" >Delete</button>
+                    </clr-signpost-content>
+                  </clr-signpost>
+                
+              </td>
+            </tr>
+ 
+ 
+        </tbody>
+          <button type="button" class="btn btn-primary button1" style="margin-left: 20px;" (click)="onAddLinesvideotest()">
+            <clr-icon shape="plus"></clr-icon>
+          </button>
+ 
+        </table> </div>
+
+
+
+<!-- form code start -->
+  <div *ngIf="checkFormCode">
+    <h4 style="font-weight: 300;display: inline;">Extension</h4>
+    <br>
+    <hr>
+    <div class="clr-row">
+      <div class="clr-col-4" *ngFor="let field of additionalFieldsFromBackend">
+        <ng-container *ngIf="field.formCode === formcode" [ngSwitch]="field.fieldType">
+          <!-- Text Input -->    <label  *ngSwitchCase="'text'">{{ field.fieldName }}</label>
+          <input *ngSwitchCase="'text'" [type]="field.fieldType"  name="{{ field.extValue }}" [(ngModel)]="rowSelected[field.extValue]" class="clr-input" />
+  
+          <!-- Date Input -->    <label  *ngSwitchCase="'date'">{{ field.fieldName }}</label>
+          <input *ngSwitchCase="'date'" [type]="field.fieldType"  name="{{ field.extValue }}" [(ngModel)]="rowSelected[field.extValue]"  class="clr-input" />
+  
+          <!-- Textarea -->    <label  *ngSwitchCase="'textarea'">{{ field.fieldName }}</label>
+          <textarea *ngSwitchCase="'textarea'"  name="{{ field.extValue }}" [(ngModel)]="rowSelected[field.extValue]"  col="10" row="2"></textarea>
+  
+          <!-- Checkbox -->    <label  *ngSwitchCase="'checkbox'">{{ field.fieldName }}</label><br>
+          <input *ngSwitchCase="'checkbox'" [type]="field.fieldType" name="{{ field.extValue }}" [(ngModel)]="rowSelected[field.extValue]"  class="clr-checkbox" />
+        </ng-container>
+  </div>
+  </div>
+</div>
+
+  <!-- form code end -->  <div class="modal-footer">
+      <button type="button" class="btn btn-outline" (click)="modalEdit = false">Cancel</button>
+      <button type="submit" class="btn btn-primary"  (click)="onUpdate(rowSelected.id)">Update</button>
+      </div>
+    </form>
+  </div>
+</clr-modal>
+<clr-modal [(clrModalOpen)]="modaldelete" [clrModalSize]="'lg'" [clrModalStaticBackdrop]="true">
+  <div class="modal-body" *ngIf="rowSelected.id">
+    <h1 class="delete">Are You Sure Want to delete?</h1>
+    <h2 class="heading">{{rowSelected.id}}</h2>
+    <div class="modal-footer">
+      <button type="button" class="btn btn-outline" (click)="modaldelete = false">Cancel</button>
+    <button type="button" (click)="delete(rowSelected.id)" class="btn btn-primary" >Delete</button>
+    </div>
+  </div>
+</clr-modal>
+<!-- ADD FORM ..... -->
+<clr-modal [(clrModalOpen)]="modalAdd" [clrModalSize]="'lg'" [clrModalStaticBackdrop]="true">
+  <h3 class="modal-title">Add Forma 
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+  <!-- aeroplane icon -->
+    &nbsp; &nbsp; &nbsp; &nbsp;
+    <a *ngIf="userrole.includes('ROLE_ADMIN')" style="float: right;" href="javascript:void(0)" role="tooltip" aria-haspopup="true"
+      class="tooltip tooltip-sm tooltip-bottom-left">
+      <a id="build_extension" [routerLink]="['../extension/all']" [queryParams]="{ formCode: 'Forma_formCode' }">
+        <clr-icon shape="airplane" size="32"></clr-icon>
+      </a>
+      <span class="tooltip-content">Form Extension</span>
+    </a> </h3>
+  <div class="modal-body">
+     <form [formGroup]="entryForm" >
+   <div class="clr-row" style="height: fit-content;">
+
+<div class="clr-col-sm-12">
+ <label>  Names</label>
+ <input class="clr-input"  type="text"  formControlName="names" />       
+ </div>
+
+<div class="clr-col-sm-12">
+ <label>  Numbertest</label>
+ <input class="clr-input"  type="number"  formControlName="numbertest" />      
+ <div *ngIf="submitted && entryForm.controls.numbertest.errors" class="error_mess">
+  <div *ngIf="submitted && entryForm.controls.numbertest.errors.required" class="error_mess">*This field is Required</div>
+</div>  
+ </div>
+
+<div class="clr-col-sm-12">        
+<label>  Phonetest</label>        
+<input class="clr-input" type="text" formControlName="phonetest" pattern="((\+)?([1-9]{2}))?[1-9]{1}[0-9]{9}$" />
+	        <div *ngIf="submitted && entryForm.controls['phonetest'].errors" class="error_mess">
+	          <div *ngIf="submitted && entryForm.controls['phonetest'].hasError('pattern')" class="error_mess">* Please Follow your pattern,+91 Enter 10 digit Mobile Number.
+	          </div>      </div>      </div>
+
+<div class="clr-col-sm-12">        
+ <label>Paragraphtest</label>      
+   <input class="form-control" type="Text" formControlName="paragraphtest" style="border: none; outline: none; height:33px !important;" />
+	      </div>
+
+<div class="clr-col-sm-12">       
+	<label>Passwordss</label><br>
+	<div><input class="clr-input" style="width: 93% !important;" [type]="newaddpHidepasswordss ? 'password': 'text'" formControlName="passwordss" autocomplete >&nbsp;
+		<clr-icon [attr.shape]="newaddIconpasswordss" (click)="newaddChangerpasswordss()"></clr-icon></div>
+	</div>
+
+          <div class="clr-col-sm-12">
+<label>Confirm Passwordss</label><br>
+           <input type="password" class="clr-input" formControlName="confirmpasswordss" autocomplete >
+           <div *ngIf="entryForm.controls.confirmpasswordss.errors" class="error_mess">
+            <div *ngIf="entryForm.controls.confirmpasswordss.errors.confirmedpasswordssValidator" class="error_mess">* Password and Confirm Password must be match.</div>
+        </div>
+          </div>
+
+<div class="clr-col-sm-12">             
+ <label>  Textareatest</label>             
+ <textarea cols="10" rows="2" formControlName="textareatest" placeholder="Textarea">  </textarea>
+	            </div>
+
+<div class="clr-col-sm-12">
+ <label>  Datetest</label>
+ <input class="clr-input"  type="date"  formControlName="datetest" />       
+ </div>
+
+<div class="clr-col-sm-12">
+ <label>  Datetimetest</label>
+ <input class="clr-input"  type="datetime-local"  formControlName="datetimetest" />       
+ </div>
+
+<div class="clr-col-sm-12">
+						<label> Emailtest</label>
+<input class="clr-input" type="email" formControlName="emailtest" pattern="[a-zA-Z0-9._%+-]+@[a-zA-Z0-9.-]+\.[a-zA-Z]{2,}$">
+<div *ngIf="entryForm.controls['emailtest'].errors" class="error_mess">
+						          <div *ngIf="entryForm.controls['emailtest'].hasError('pattern')" class="error_mess">* Email must be a valid email address
+						            </div>  </div>
+</div>
+
+<div class="clr-col-sm-12">            
+ <label> Toggletest</label>            
+  <input type="checkbox" formControlName="toggletest" clrToggle/>            </div>
+
+<div class="clr-col-sm-12">        
+	 <label> Urltest </label>
+		<input type="url" formControlName="urltest" class="clr-input" pattern="https?://.+">
+		<div *ngIf="entryForm.controls['urltest'].errors" class="error_mess">          
+			 <div *ngIf="entryForm.controls['urltest'].hasError('pattern')" class="error_mess">    * Please enter a valid URL.</div>
+						      </div>     </div>
+
+<div class="clr-col-sm-12">           
+<label> Decimaltest</label>          
+ <input type="number" step ="0.01"  formControlName="decimaltest" /> 
+ <div *ngIf="submitted && entryForm.controls.decimaltest.errors" class="error_mess">
+  <div *ngIf="submitted && entryForm.controls.decimaltest.errors.required" class="error_mess">*This field is Required</div>
+</div> 
+        </div>
+
+
+<div class="clr-col-sm-12">
+ <label>  Percentagess</label>
+ <input class="clr-input"  type="number"  formControlName="percentagess" />      
+ <div *ngIf="submitted && entryForm.controls.percentagess.errors" class="error_mess">
+  <div *ngIf="submitted && entryForm.controls.percentagess.errors.required" class="error_mess">*This field is Required</div>
+</div>  
+ </div>
+
+<div class="clr-col-sm-12">            
+<label> recaptchass</label><div><b>{{ recaptchassCode }}</b> &nbsp; <button  class="btn btn-icon btn-primary btn-sm" (click)="generaterecaptchass()"><clr-icon shape="refresh"></clr-icon></button></div>
+	            <input type="text" formControlName="recaptchass" class="clr-input">       
+<div *ngIf="submitted && entryForm.controls.recaptchass?.errors.required" class="error_mess">*This field is Required</div>          
+<div *ngIf="submitted && entryForm.get('recaptchass')?.errors && entryForm.get('recaptchass')?.dirty" class="error_mess">
+	              <div *ngIf="submitted && entryForm.controls['recaptchass']?.hasError('recaptchassMismatch')" class="error_mess"> recaptchass  not valid.</div>
+	            </div>        
+</div>
+
+
+
+<div class="clr-col-sm-12">             
+	 <label>selectstat</label>
+							 <select formControlName="selectstat">
+							    <option [value]="null">Select  selectstat </option> 
+								
+ 
+								<option> a </option>
+								 
+
+ 
+								<option> b </option>
+								 
+
+ 
+								<option> c </option>
+								 
+
+						</select></div>
+
+<div class="clr-col-sm-12">
+            <label>Radiotest</label>
+            <clr-radio-container clrInline style="margin-top: 0;"> 
+
+ 
+   <clr-radio-wrapper>
+                <input type="radio" clrRadio formControlName="radiotest" (change)="updateradiotest('female')" [checked]="entryForm.get('radiotest').value === 'female'" />
+                <label> female </label>
+              </clr-radio-wrapper>     
+ 
+
+ 
+   <clr-radio-wrapper>
+                <input type="radio" clrRadio formControlName="radiotest" (change)="updateradiotest('male')" [checked]="entryForm.get('radiotest').value === 'male'" />
+                <label> male </label>
+              </clr-radio-wrapper>     
+ 
+
+    
+ </clr-radio-container>
+          </div> 
+
+
+
+
+<!-- multiselect checkbox field start -->
+     <div class="clr-col-sm-12">       
+		<label> checkboxtest</label>
+	    <div class="clr-form-control" style="margin-top: 5px;margin-bottom: 10px;">
+	      <div class="clr-control-container">
+
+                       
+ 
+			<div class="clr-checkbox-wrapper">           
+				<input type="checkbox" id="test1" formControlName="test1"  class="clr-checkbox" />       
+				    <label for="test1" class="clr-control-label">test1</label>  </div>
+	                            
+
+ 
+			<div class="clr-checkbox-wrapper">           
+				<input type="checkbox" id="test2" formControlName="test2"  class="clr-checkbox" />       
+				    <label for="test2" class="clr-control-label">test2</label>  </div>
+	                            
+
+ </div>       </div>     </div>
+	              <!-- multiselect checkbox field end -->
+
+
+
+
+
+
+
+
+
+<!-- currency field start -->
+      <div class="clr-col-sm-12">        
+ <label> Currencyss</label>         
+<input type="number"  class="clr-input"   formControlName="currencyss"  [value]="entryForm.value.currencyss | number:'1.2-2' | removeCommas">   
+    </div> 
+	      <!-- currency field end -->
+
+ 
+ </div> 
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+<h6> List of fileuploadtest</h6>
+
+ <div  class="clr-row" style="margin-top: 10px;">
+   <table class="table">
+       <thead>
+        <tr>
+        <th>No</th>
+         <th> File</th>
+         <th>File Name</th>
+          <th>Preview</th>
+          <th>Cancel</th>
+           </tr>
+         </thead>
+         <tbody >
+           <tr *ngFor="let attach of FileDatafileuploadtest; let i=index">
+             <td style="width: 70px;"><input type="text" class="clr-input"  value={{i+1}} [readonly]="true">  </td>
+             <td><input type="file" (change)="onFileChangedfileuploadtest($event, i)"  accept = "application/pdf,.csv, application/vnd.openxmlformats-officedocument.spreadsheetml.sheet, application/vnd.ms-excel" /><!--accept=".pdf,.doc,.docx,.jpg,.msg"-->
+              </td>
+         <td>{{attach.uploadedfile_name}}</td>
+             <td >  <img [src]="attach.filePreview" alt="File Preview"  [ngModelOptions]="{standalone: true}" name="filePreview" width="100px" height="100px"></td>
+             <td>
+               <a  (click)="deleteRowfileuploadtest(i)">
+                 <clr-icon shape="trash" class="is-error"></clr-icon>
+               </a>
+             </td>
+           </tr>
+
+
+       </tbody>
+         <button type="button" class="btn btn-primary button1" style="margin-left: 20px;" (click)="onAddLinesfileuploadtest()">
+           <clr-icon shape="plus"></clr-icon>
+         </button>
+
+       </table> </div>
+
+<h6> List of imageuploadtest</h6>
+
+ <div  class="clr-row" style="margin-top: 10px;">
+   <table class="table">
+       <thead>
+        <tr>
+        <th>No</th>
+         <th> File</th>
+         <th>File Name</th>
+          <th>Preview</th>
+          <th>Cancel</th>
+           </tr>
+         </thead>
+         <tbody >
+           <tr *ngFor="let attach of FileDataimageuploadtest; let i=index">
+             <td style="width: 70px;"><input type="text" class="clr-input"  value={{i+1}} [readonly]="true">  </td>
+             <td><input type="file" (change)="onFileChangedimageuploadtest($event, i)"  accept="image/*" /><!--accept=".pdf,.doc,.docx,.jpg,.msg"-->
+              </td>
+         <td>{{attach.uploadedfile_name}}</td>
+             <td >  <img [src]="attach.filePreview" alt="File Preview"  [ngModelOptions]="{standalone: true}" name="filePreview" width="100px" height="100px"></td>
+             <td>
+               <a  (click)="deleteRowimageuploadtest(i)">
+                 <clr-icon shape="trash" class="is-error"></clr-icon>
+               </a>
+             </td>
+           </tr>
+
+
+       </tbody>
+         <button type="button" class="btn btn-primary button1" style="margin-left: 20px;" (click)="onAddLinesimageuploadtest()">
+           <clr-icon shape="plus"></clr-icon>
+         </button>
+
+       </table> </div>
+
+<h6> List of audiotest</h6>
+
+ <div  class="clr-row" style="margin-top: 10px;">
+   <table class="table">
+       <thead>
+        <tr>
+        <th>No</th>
+         <th> File</th>
+         <th>File Name</th>
+          <th>Preview</th>
+          <th>Cancel</th>
+           </tr>
+         </thead>
+         <tbody >
+           <tr *ngFor="let attach of FileDataaudiotest; let i=index">
+             <td style="width: 70px;"><input type="text" class="clr-input"  value={{i+1}} [readonly]="true">  </td>
+             <td><input type="file" (change)="onFileChangedaudiotest($event, i)"  accept="audio/*" /><!--accept=".pdf,.doc,.docx,.jpg,.msg"-->
+              </td>
+         <td>{{attach.uploadedfile_name}}</td>
+             <td >  <audio *ngIf="attach.filePreview" [src]="attach.filePreview" controls></audio></td>
+             <td>
+               <a  (click)="deleteRowaudiotest(i)">
+                 <clr-icon shape="trash" class="is-error"></clr-icon>
+               </a>
+             </td>
+           </tr>
+
+
+       </tbody>
+         <button type="button" class="btn btn-primary button1" style="margin-left: 20px;" (click)="onAddLinesaudiotest()">
+           <clr-icon shape="plus"></clr-icon>
+         </button>
+
+       </table> </div>
+
+<h6> List of videotest</h6>
+
+ <div  class="clr-row" style="margin-top: 10px;">
+   <table class="table">
+       <thead>
+        <tr>
+        <th>No</th>
+         <th> File</th>
+         <th>File Name</th>
+          <th>Preview</th>
+          <th>Cancel</th>
+           </tr>
+         </thead>
+         <tbody >
+           <tr *ngFor="let attach of FileDatavideotest; let i=index">
+             <td style="width: 70px;"><input type="text" class="clr-input"  value={{i+1}} [readonly]="true">  </td>
+             <td><input type="file" (change)="onFileChangedvideotest($event, i)"  accept="video/*" /><!--accept=".mp4,.mpeg4"-->
+              </td>
+         <td>{{attach.uploadedfile_name}}</td>
+             <td >            <video *ngIf="attach.filePreview" [src]="attach.filePreview" width="100px" height="100px" controls></video></td>
+             <td>
+               <a  (click)="deleteRowvideotest(i)">
+                 <clr-icon shape="trash" class="is-error"></clr-icon>
+               </a>
+             </td>
+           </tr>
+
+
+       </tbody>
+         <button type="button" class="btn btn-primary button1" style="margin-left: 20px;" (click)="onAddLinesvideotest()">
+           <clr-icon shape="plus"></clr-icon>
+         </button>
+
+       </table> </div>
+
+
+
+
+
+      <!-- form code start -->
+      <div *ngIf="checkFormCode">
+        <h4 style="font-weight: 300;display: inline;">Extension</h4>
+        <br>
+        <hr>
+        <div class="clr-row">
+          <div class="clr-col-4" *ngFor="let field of additionalFieldsFromBackend">
+            <ng-container *ngIf="field.formCode === formcode" [ngSwitch]="field.fieldType">
+              <!-- Text Input --> <label *ngSwitchCase="'text'">{{ field.fieldName }}</label>
+              <input *ngSwitchCase="'text'" [type]="field.fieldType" [formControlName]="field.extValue"
+                class="clr-input" />
+              <!-- Date Input --> <label *ngSwitchCase="'date'">{{ field.fieldName }}</label>
+              <input *ngSwitchCase="'date'" [type]="field.fieldType" [formControlName]="field.extValue"
+                class="clr-input" />
+              <!-- Textarea --> <label *ngSwitchCase="'textarea'">{{ field.fieldName }}</label>
+              <textarea *ngSwitchCase="'textarea'" [formControlName]="field.extValue" col="10" row="2"></textarea>
+              <!-- Checkbox --> <label *ngSwitchCase="'checkbox'">{{ field.fieldName }}</label><br>
+              <input *ngSwitchCase="'checkbox'" [type]="field.fieldType" [formControlName]="field.extValue"
+                class="clr-checkbox" />
+            </ng-container>
+          </div>
+        </div>
+      </div>
+      <!-- form code end --> <div class="modal-footer">
+<button type="button" class="btn btn-outline" (click)="modalAdd = false">Cancel</button>
+        <button type="submit" class="btn btn-primary" (click)="onSubmit()">ADD</button>
+        </div>
+</form>
+  </div>
+</clr-modal>
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+  <!-- htmlpopup -->
diff --git a/testing15aprilnew-front-f/authsec_angular/frontend/angular-clarity-master/src/app/modules/main/BuilderComponents/basicp1/Forma/Forma.component.scss b/testing15aprilnew-front-f/authsec_angular/frontend/angular-clarity-master/src/app/modules/main/BuilderComponents/basicp1/Forma/Forma.component.scss
new file mode 100644
index 0000000..c47b921
--- /dev/null
+++ b/testing15aprilnew-front-f/authsec_angular/frontend/angular-clarity-master/src/app/modules/main/BuilderComponents/basicp1/Forma/Forma.component.scss
@@ -0,0 +1,78 @@
+//@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;
+}
diff --git a/testing15aprilnew-front-f/authsec_angular/frontend/angular-clarity-master/src/app/modules/main/BuilderComponents/basicp1/Forma/Forma.component.ts b/testing15aprilnew-front-f/authsec_angular/frontend/angular-clarity-master/src/app/modules/main/BuilderComponents/basicp1/Forma/Forma.component.ts
new file mode 100644
index 0000000..b3cca68
--- /dev/null
+++ b/testing15aprilnew-front-f/authsec_angular/frontend/angular-clarity-master/src/app/modules/main/BuilderComponents/basicp1/Forma/Forma.component.ts
@@ -0,0 +1,1049 @@
+import { Component, OnInit } from '@angular/core';
+import { ToastrService } from 'ngx-toastr';
+import { AlertService } from 'src/app/services/alert.service';
+import { Formaservice} from './Forma.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 { Formacardvariable } from './Forma_cardvariable';
+import { UserInfoService } from 'src/app/services/user-info.service';
+declare var JsBarcode: any; 
+@Component({
+  selector: 'app-Forma',
+  templateUrl: './Forma.component.html',
+  styleUrls: ['./Forma.component.scss']
+})
+export class FormaComponent implements OnInit {
+  cardButton = Formacardvariable.cardButton;
+  cardmodeldata = Formacardvariable.cardmodeldata;
+  public dashboardArray: DashboardContentModel2[];
+  isCardview = Formacardvariable.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 = 'Forma_formCode'
+tableName = 'Forma';  checkFormCode; selected: any[] = []; constructor(
+    private extensionService: ExtensionService,
+private userInfoService:UserInfoService,
+    private mainService:Formaservice,
+    private alertService: AlertService,
+    private toastr: ToastrService,
+    private _fb: FormBuilder,
+  ) { }
+// 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({
+names : [null],
+
+numbertest : [null,[Validators.required]],
+
+phonetest: ['+91'],
+
+paragraphtest : [null],
+
+passwordss : [null],
+confirmpasswordss : [null],
+
+textareatest : [null],
+
+datetest : [null],
+
+datetimetest : [null],
+
+emailtest : [null],
+
+toggletest : [false],
+
+urltest : [null],
+
+decimaltest : [null,[Validators.required]],
+
+percentagess : [null,[Validators.required]],
+
+recaptchass : ['', [Validators.required,this.checkrecaptchass.bind(this)]],
+
+documentss : [null],
+
+selectstat : [null],
+
+radiotest : [null],
+
+  
+ 
+test1:[false],
+   
+
+ 
+test2:[false],
+   
+
+
+
+
+
+
+
+
+
+
+currencyss : [null, { updateOn: 'blur' }],
+
+
+ 
+
+
+
+
+
+
+
+    }, {
+        validator: ConfirmedpasswordssValidator('passwordss', 'confirmpasswordss')
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+  }); // 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 === "Forma_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 
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+this.generaterecaptchass()
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+  }
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+FileDataImageuploadtest: any[];
+  selectedImageuploadtest: any[];
+
+FileDataAudiotest: any[];
+  selectedAudiotest: any[];
+
+FileDataVideotest: any[];
+  selectedVideotest: any[];
+
+
+
+
+ error; 
+  getData() {
+    this.mainService.getAll().subscribe((data) => {
+      console.log(data);
+      this.product = data;
+ 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.selectedfileuploadtest = [];
+    this.mainService.uploadfilegetByIdfileuploadtest(row.id,this.tableName).subscribe(uploaddata =>{
+      console.log(uploaddata);
+      this.FileDatafileuploadtest = uploaddata;
+    
+    })
+
+    this.selectedimageuploadtest = [];
+    this.mainService.uploadImageuploadtestgetById(row.id,this.tableName).subscribe(uploaddata =>{
+      console.log(uploaddata);
+      this.FileDataimageuploadtest = uploaddata;
+    
+    })
+
+    this.selectedaudiotest = [];
+    this.mainService.uploadAudiotestgetById(row.id,this.tableName).subscribe(uploaddata =>{
+      console.log(uploaddata);
+      this.FileDataaudiotest = uploaddata;
+    
+    })
+
+    this.selectedvideotest = [];
+    this.mainService.uploadVideotestgetById(row.id,this.tableName).subscribe(uploaddata =>{
+      console.log(uploaddata);
+      this.FileDatavideotest = uploaddata;
+    
+    })
+
+
+
+
+    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);
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+for (let i = 0; i < this.selectedfileuploadtest.length; i++){
+
+  this.mainService.uploadfilefileuploadtest(data.id,this.tableName,this.selectedfileuploadtest[i]).subscribe(uploaddata =>{
+    console.log(uploaddata);
+  })
+}
+
+for (let i = 0; i < this.selectedimageuploadtest.length; i++){
+
+  this.mainService.uploadImageuploadtest(data.id,this.tableName,this.selectedimageuploadtest[i]).subscribe(uploaddata =>{
+    console.log(uploaddata);
+  })
+}
+
+for (let i = 0; i < this.selectedaudiotest.length; i++){
+
+  this.mainService.uploadAudiotest(data.id,this.tableName,this.selectedaudiotest[i]).subscribe(uploaddata =>{
+    console.log(uploaddata);
+  })
+}
+
+for (let i = 0; i < this.selectedvideotest.length; i++){
+
+  this.mainService.uploadVideotest(data.id,this.tableName,this.selectedvideotest[i]).subscribe(uploaddata =>{
+    console.log(uploaddata);
+  })
+}
+
+
+
+      }, (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);
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+for (let i = 0; i < this.selectedfileuploadtest.length; i++){
+
+  this.mainService.uploadfilefileuploadtest(data.id,this.tableName,this.selectedfileuploadtest[i]).subscribe(uploaddata =>{
+    console.log(uploaddata);
+  })
+}
+
+for (let i = 0; i < this.selectedimageuploadtest.length; i++){
+
+  this.mainService.uploadImageuploadtest(data.id,this.tableName,this.selectedimageuploadtest[i]).subscribe(uploaddata =>{
+    console.log(uploaddata);
+  })
+}
+
+for (let i = 0; i < this.selectedaudiotest.length; i++){
+
+  this.mainService.uploadAudiotest(data.id,this.tableName,this.selectedaudiotest[i]).subscribe(uploaddata =>{
+    console.log(uploaddata);
+  })
+}
+
+for (let i = 0; i < this.selectedvideotest.length; i++){
+
+  this.mainService.uploadVideotest(data.id,this.tableName,this.selectedvideotest[i]).subscribe(uploaddata =>{
+    console.log(uploaddata);
+  })
+}
+
+
+
+
+      }, (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;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+this.FileDatafileuploadtest = [];
+this.selectedfileuploadtest =[];
+
+this.FileDataImageuploadtest = [];
+this.selectedImageuploadtest =[];
+
+this.FileDataAudiotest = [];
+this.selectedAudiotest =[];
+
+this.FileDataVideotest = [];
+this.selectedVideotest =[];
+
+
+
+
+  }
+ submitted = false;
+onSubmit() {
+  console.log(this.entryForm.value);
+ this.submitted = true;
+  if (this.entryForm.invalid) {
+    return;
+  }this.onCreate();
+
+} 
+
+
+
+
+isValidPhonetest(phone: string): boolean {
+  const phonePattern = /^(\+[1-9][0-9]{0,2})?[1-9][0-9]{9}$/;
+  return phonePattern.test(phone);
+}
+
+rsModalparagraphtest = false;  
+ goToReplaceStringparagraphtest (row){
+						    this.rowSelected = row;     this.rsModalparagraphtest  =true;   }
+
+newpHidepasswordss: boolean = true;
+ newIconpasswordss: string = "eye"; 
+newShapeChangerpasswordss() {
+this.newpHidepasswordss = !this.newpHidepasswordss;  
+ if(this.newpHidepasswordss){
+this.newIconpasswordss = 'eye'   } else {     this.newIconpasswordss = 'eye-hide'   }
+} 
+
+ newaddpHidepasswordss: boolean = true;
+ newaddIconpasswordss: string = "eye";
+newaddChangerpasswordss() {   this.newaddpHidepasswordss = !this.newaddpHidepasswordss;
+ if(this.newaddpHidepasswordss){     this.newaddIconpasswordss = 'eye'   } else {
+  this.newaddIconpasswordss = 'eye-hide'   } }
+
+rsModaltextareatest = false;   
+goToReplaceStringtextareatest(row){
+this.rowSelected = row;     this.rsModaltextareatest  =true;   }
+
+
+
+
+
+isValidemailtest(email: string): boolean {
+						 const emailPattern = /^[a-zA-Z0-9._%+-]+@[a-zA-Z0-9.-]+\.[a-zA-Z]{2,}$/;
+						    return emailPattern.test(email);   }
+
+
+
+isValidurltest(url: string): boolean {
+						    return  /^(https?|ftp):\/\/[^\s/$.?#].[^\s]*$/.test(url);   } 
+						goTourltestUrl(val){     window.open(val)   }
+
+
+
+
+
+recaptchassCode = '';  
+generaterecaptchass (): void {
+  const possibleCharacters = 'ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789';
+  const codeLength = 6; // Change to desired length
+
+  let recaptchass= '';
+  for (let i = 0; i < codeLength; i++) {
+    const randomIndex = Math.floor(Math.random() * possibleCharacters.length);
+    recaptchass += possibleCharacters.charAt(randomIndex);
+  }
+  this.recaptchassCode = recaptchass;
+}
+
+checkrecaptchass(control: AbstractControl): ValidationErrors | null {
+  if (control.value !== this.recaptchassCode) {
+    return { recaptchassMismatch: true };
+  }
+  return null;
+}  
+
+recaptchassMismatch = false;  
+
+checkrecaptchassEdit(): void {
+	  if (this.rowSelected.recaptchass  !== this. recaptchassCode) {
+	  this. recaptchassMismatch = true;    } else {      this.recaptchassMismatch = false;    }  } 
+
+
+
+
+
+updateradiotest (radiotest : string): void {    
+ this.entryForm.get('radiotest').setValue(radiotest);   }
+
+updateradiotestEdit(radiotest : string): void {    this.rowSelected.radiotest  =  radiotest }
+						 ;
+
+
+
+filePreviewfileuploadtest: string | ArrayBuffer | null = null;
+FileDatafileuploadtest: {uploadedfile_name?:any, filePreview: string | ArrayBuffer | null }[] = []; // Initialize the array
+selectedfileuploadtest: File[]=[]; 
+public onFileChangedfileuploadtest(event, index) {
+  const files = event.target.files;
+  for (let i = 0; i < files.length; i++) {
+    const file = files[i];
+    this.FileDatafileuploadtest[index].uploadedfile_name = files[i].name;
+    this.selectedfileuploadtest.push(files[i]);
+    if (file.type.startsWith('file/')) {
+      const reader = new FileReader();
+      reader.onload = (e) => {
+        // Set the file preview source
+        const filePreview = e.target?.result as string;
+        this.FileDatafileuploadtest[index] = {
+          ...this.FileDatafileuploadtest[index], // Preserve existing properties
+          filePreview: filePreview // Update only the filePreview property
+        };
+      };
+      reader.readAsDataURL(file);
+    }
+  }
+}
+    onAddLinesfileuploadtest(){
+      this.FileDatafileuploadtest.push({
+        uploadedfile_name: "",
+        filePreview: "",
+        // f3: "",
+      });
+    }
+    deleteRowfileuploadtest(index,id) {
+      this.FileDatafileuploadtest.splice(index, 1);
+
+      if(id){
+      this.mainService.uploadfiledeletefileuploadtest(id).subscribe(data =>{
+        console.log(data);
+      })
+      }
+    }
+
+filePreviewimageuploadtest: string | ArrayBuffer | null = null;
+FileDataimageuploadtest: {uploadedfile_name?:any, filePreview: string | ArrayBuffer | null }[] = []; // Initialize the array
+selectedimageuploadtest: File[]=[]; 
+public onFileChangedimageuploadtest(event, index) {
+  const files = event.target.files;
+  for (let i = 0; i < files.length; i++) {
+    const file = files[i];
+    this.FileDataimageuploadtest[index].uploadedfile_name = files[i].name;
+    this.selectedimageuploadtest.push(files[i]);
+    if (file.type.startsWith('image/')) {
+      const reader = new FileReader();
+      reader.onload = (e) => {
+        // Set the file preview source
+        const filePreview = e.target?.result as string;
+        this.FileDataimageuploadtest[index] = {
+          ...this.FileDataimageuploadtest[index], // Preserve existing properties
+          filePreview: filePreview // Update only the filePreview property
+        };
+      };
+      reader.readAsDataURL(file);
+    }
+  }
+}
+    onAddLinesimageuploadtest(){
+      this.FileDataimageuploadtest.push({
+        uploadedfile_name: "",
+        filePreview: "",
+        // f3: "",
+      });
+    }
+    deleteRowimageuploadtest(index,id) {
+      this.FileDataimageuploadtest.splice(index, 1);
+
+      if(id){
+      this.mainService.uploadImageuploadtestdelete(id).subscribe(data =>{
+        console.log(data);
+      })
+      }
+    }
+
+filePreviewaudiotest: string | ArrayBuffer | null = null;
+FileDataaudiotest: {uploadedfile_name?:any, filePreview: string | ArrayBuffer | null }[] = []; // Initialize the array
+selectedaudiotest: File[]=[]; 
+public onFileChangedaudiotest(event, index) {
+  const files = event.target.files;
+  for (let i = 0; i < files.length; i++) {
+    const file = files[i];
+    this.FileDataaudiotest[index].uploadedfile_name = files[i].name;
+    this.selectedaudiotest.push(files[i]);
+    if (file.type.startsWith('audio/')) {
+      const reader = new FileReader();
+      reader.onload = (e) => {
+        // Set the file preview source
+        const filePreview = e.target?.result as string;
+        this.FileDataaudiotest[index] = {
+          ...this.FileDataaudiotest[index], // Preserve existing properties
+          filePreview: filePreview // Update only the filePreview property
+        };
+      };
+      reader.readAsDataURL(file);
+    }
+  }
+}
+    onAddLinesaudiotest(){
+      this.FileDataaudiotest.push({
+        uploadedfile_name: "",
+        filePreview: "",
+        // f3: "",
+      });
+    }
+    deleteRowaudiotest(index,id) {
+      this.FileDataaudiotest.splice(index, 1);
+
+      if(id){
+      this.mainService.uploadAudiotestdelete(id).subscribe(data =>{
+        console.log(data);
+      })
+      }
+    }
+
+filePreviewvideotest: string | ArrayBuffer | null = null;
+FileDatavideotest: {uploadedfile_name?:any, filePreview: string | ArrayBuffer | null }[] = []; // Initialize the array
+selectedvideotest: File[]=[]; 
+public onFileChangedvideotest(event, index) {
+  const files = event.target.files;
+  for (let i = 0; i < files.length; i++) {
+    const file = files[i];
+    this.FileDatavideotest[index].uploadedfile_name = files[i].name;
+    this.selectedvideotest.push(files[i]);
+    if (file.type.startsWith('video/')) {
+      const reader = new FileReader();
+      reader.onload = (e) => {
+        // Set the file preview source
+        const filePreview = e.target?.result as string;
+        this.FileDatavideotest[index] = {
+          ...this.FileDatavideotest[index], // Preserve existing properties
+          filePreview: filePreview // Update only the filePreview property
+        };
+      };
+      reader.readAsDataURL(file);
+    }
+  }
+}
+    onAddLinesvideotest(){
+      this.FileDatavideotest.push({
+        uploadedfile_name: "",
+        filePreview: "",
+        // f3: "",
+      });
+    }
+    deleteRowvideotest(index,id) {
+      this.FileDatavideotest.splice(index, 1);
+
+      if(id){
+      this.mainService.uploadVideotestdelete(id).subscribe(data =>{
+        console.log(data);
+      })
+      }
+    }
+
+//currency  field start
+   formatCurrencycurrencyss () {
+    // Format the currency with two decimal places    
+	this.rowSelected.currencyss = Number(this.rowSelected.currencyss ).toFixed(2);
+    // Remove commas from the formatted currency   
+	 this.rowSelected.currencyss = this.rowSelected.currencyss?.replace(/,/g, '');  }
+  //currency  field end
+
+// updateaction
+}
+
+
+
+
+
+
+
+export function ConfirmedpasswordssValidator(controlName: string, matchingControlName: string){
+  return (formGroup: FormGroup) => {
+      const control = formGroup.controls[controlName];
+      const matchingControl = formGroup.controls[matchingControlName];
+      if (matchingControl.errors && !matchingControl.errors.confirmedpasswordssValidator) {
+          return;
+      }
+      if (control.value !== matchingControl.value) {
+          matchingControl.setErrors({ confirmedpasswordssValidator: true });
+      } else {
+          matchingControl.setErrors(null);
+      }
+  }
+}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/testing15aprilnew-front-f/authsec_angular/frontend/angular-clarity-master/src/app/modules/main/BuilderComponents/basicp1/Forma/Forma.service.ts b/testing15aprilnew-front-f/authsec_angular/frontend/angular-clarity-master/src/app/modules/main/BuilderComponents/basicp1/Forma/Forma.service.ts
new file mode 100644
index 0000000..9a9df0d
--- /dev/null
+++ b/testing15aprilnew-front-f/authsec_angular/frontend/angular-clarity-master/src/app/modules/main/BuilderComponents/basicp1/Forma/Forma.service.ts
@@ -0,0 +1,131 @@
+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 Formaservice{
+  private baseURL = "Forma/Forma" ;  constructor(
+    private http: HttpClient,
+    private apiRequest: ApiRequestService,
+  ) { }
+  getAll(page?: number, size?: number): Observable<any> {
+    return this.apiRequest.get(this.baseURL);
+  }
+  getById(id: number): Observable<any> {
+    const _http = this.baseURL + "/" + id;
+    return this.apiRequest.get(_http);
+  }
+  create(data: any): Observable<any> {
+    return this.apiRequest.post(this.baseURL, data);
+  }
+  update(id: number, data: any): Observable<any> {
+    const _http = this.baseURL + "/" + id;
+    return this.apiRequest.put(_http, data);
+  }
+  delete(id: number): Observable<any> {
+    const _http = this.baseURL + "/" + id;
+    return this.apiRequest.delete(_http);
+  }
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+  uploadfilefileuploadtest(ref:any, Forma:any, file:any): Observable<any>{
+    const formData = new FormData();
+    formData.append('file', file);
+    return this.apiRequest.postFormData(`FileUpload/Uploadeddocs/${ref}/${Forma}`, formData);
+  }
+
+  uploadfilegetByIdfileuploadtest(ref:any, Forma:any,): Observable<any> {
+    return this.apiRequest.get(`FileUpload/Uploadeddocs/${ref}/${Forma}`);
+  }
+
+
+  uploadfiledeletefileuploadtest(id: number): Observable<any> {
+    return this.apiRequest.delete(`FileUpload/Uploadeddocs/${id}`);
+  }
+
+  uploadImageuploadtest(ref:any, Forma:any, file:any): Observable<any>{
+    const formData = new FormData();
+    formData.append('file', file);
+    return this.apiRequest.postFormData(`FileUpload/Uploadeddocs/${ref}/${Forma}`, formData);
+  }
+
+  uploadImageuploadtestgetById(ref:any, Forma:any,): Observable<any> {
+    return this.apiRequest.get(`FileUpload/Uploadeddocs/${ref}/${Forma}`);
+  }
+
+
+  uploadImageuploadtestdelete(id: number): Observable<any> {
+    return this.apiRequest.delete(`FileUpload/Uploadeddocs/${id}`);
+  }
+
+  uploadAudiotest(ref:any, Forma:any, file:any): Observable<any>{
+    const formData = new FormData();
+    formData.append('file', file);
+    return this.apiRequest.postFormData(`FileUpload/Uploadeddocs/${ref}/${Forma}`, formData);
+  }
+
+  uploadAudiotestgetById(ref:any, Forma:any,): Observable<any> {
+    return this.apiRequest.get(`FileUpload/Uploadeddocs/${ref}/${Forma}`);
+  }
+
+
+  uploadAudiotestdelete(id: number): Observable<any> {
+    return this.apiRequest.delete(`FileUpload/Uploadeddocs/${id}`);
+  }
+
+  uploadVideotest(ref:any, Forma:any, file:any): Observable<any>{
+    const formData = new FormData();
+    formData.append('file', file);
+    return this.apiRequest.postFormData(`FileUpload/Uploadeddocs/${ref}/${Forma}`, formData);
+  }
+
+  uploadVideotestgetById(ref:any, Forma:any,): Observable<any> {
+    return this.apiRequest.get(`FileUpload/Uploadeddocs/${ref}/${Forma}`);
+  }
+
+
+  uploadVideotestdelete(id: number): Observable<any> {
+    return this.apiRequest.delete(`FileUpload/Uploadeddocs/${id}`);
+  }
+
+
+
+// updateaction
+}
\ No newline at end of file
diff --git a/testing15aprilnew-front-f/authsec_angular/frontend/angular-clarity-master/src/app/modules/main/BuilderComponents/basicp1/Forma/Forma_cardvariable.ts b/testing15aprilnew-front-f/authsec_angular/frontend/angular-clarity-master/src/app/modules/main/BuilderComponents/basicp1/Forma/Forma_cardvariable.ts
new file mode 100644
index 0000000..03f6526
--- /dev/null
+++ b/testing15aprilnew-front-f/authsec_angular/frontend/angular-clarity-master/src/app/modules/main/BuilderComponents/basicp1/Forma/Forma_cardvariable.ts
@@ -0,0 +1,4 @@
+export const Formacardvariable = {
+    "cardButton": false,
+    "cardmodeldata": ``
+}
\ No newline at end of file
diff --git a/testing15aprilnew-front-f/authsec_angular/frontend/angular-clarity-master/src/app/modules/main/BuilderComponents/basicp1/Formb/Formb.component.html b/testing15aprilnew-front-f/authsec_angular/frontend/angular-clarity-master/src/app/modules/main/BuilderComponents/basicp1/Formb/Formb.component.html
new file mode 100644
index 0000000..783b654
--- /dev/null
+++ b/testing15aprilnew-front-f/authsec_angular/frontend/angular-clarity-master/src/app/modules/main/BuilderComponents/basicp1/Formb/Formb.component.html
@@ -0,0 +1,1001 @@
+<ol class="breadcrumb breadcrumb-arrow font-trirong">
+  <li><a href="javascript://"> Formb</a></li>
+</ol>
+<div class="dg-wrapper">
+  <div class="clr-row">
+    <div class="clr-col-8">
+      <h3>Formb </h3>
+    </div>
+    <div class="clr-col-4" style="text-align: right;">
+ <button *ngIf="cardButton" id="add" class="btn btn-primary btn-icon" (click)="changeView()" >
+        <clr-icon *ngIf="!isCardview" shape="grid-view"></clr-icon>    <clr-icon *ngIf="isCardview" shape="bars"></clr-icon>
+      </button>
+        <!-- button -->
+     <button id="add" class="btn btn-primary" (click)="goToAdd(product)" >
+        <clr-icon shape="plus"></clr-icon>ADD
+      </button>
+    </div></div>
+  <ng-container *ngIf="!isCardview">   <!-- GET ALL -->     <clr-datagrid [clrDgLoading]="loading" [(clrDgSelected)]="selected">
+    <clr-dg-placeholder>
+        <ng-template #loadingSpinner>
+            <clr-spinner>Loading ... </clr-spinner>
+        </ng-template>
+        <div *ngIf="error;else loadingSpinner">{{error}}</div>
+    </clr-dg-placeholder>
+
+<clr-dg-column [clrDgField]="' name'"> <ng-container *clrDgHideableColumn="{hidden: false}"> Name
+						    </ng-container></clr-dg-column>
+
+
+<clr-dg-column [clrDgField]="' surveyff'"> <ng-container *clrDgHideableColumn="{hidden: false}"> Surveyff
+						    </ng-container></clr-dg-column>
+
+ 
+
+ 
+<clr-dg-column [clrDgField]="' aa'"> <ng-container *clrDgHideableColumn="{hidden: false}"> aa
+						    </ng-container></clr-dg-column>
+  
+
+ 
+<clr-dg-column [clrDgField]="' bb'"> <ng-container *clrDgHideableColumn="{hidden: false}"> bb
+						    </ng-container></clr-dg-column>
+  
+
+
+
+
+
+ 
+
+
+<clr-dg-column [clrDgField]="' qrcode'"> <ng-container *clrDgHideableColumn="{hidden: false}"> Qrcode
+						    </ng-container></clr-dg-column>
+
+
+<clr-dg-column [clrDgField]="' barcode'"> <ng-container *clrDgHideableColumn="{hidden: false}"> Barcode
+						    </ng-container></clr-dg-column>
+
+
+
+
+<clr-dg-column [clrDgField]="' texts'"> <ng-container *clrDgHideableColumn="{hidden: false}"> Texts
+						    </ng-container></clr-dg-column>
+
+
+
+
+
+
+
+ 
+ <!-- who column -->
+      <clr-dg-column> <ng-container *clrDgHideableColumn="{hidden: false}">
+        <clr-icon shape="bars"></clr-icon> Action
+      </ng-container></clr-dg-column>
+      <!-- end --> 
+
+ <clr-dg-row *clrDgItems="let user of product" [clrDgItem]="user">
+
+<clr-dg-cell>{{user. name }}</clr-dg-cell>
+
+
+<clr-dg-cell>{{user. surveyff }}</clr-dg-cell>
+
+
+
+ 
+<clr-dg-cell>{{user. aa}}</clr-dg-cell>
+ 
+
+ 
+<clr-dg-cell>{{user. bb}}</clr-dg-cell>
+ 
+
+
+
+
+
+
+
+
+<clr-dg-cell>{{user. qrcode }}</clr-dg-cell>
+
+
+<clr-dg-cell>{{user. barcode }}</clr-dg-cell>
+
+
+
+
+<clr-dg-cell>{{user. texts }}</clr-dg-cell>
+
+
+
+
+
+
+
+ 
+  <!-- who column -->
+<clr-dg-cell>
+  <clr-signpost>
+   <span style="cursor: pointer;" clrSignpostTrigger><clr-icon shape="help" class="success" style="color: rgb(0, 130, 236);"></clr-icon></span>
+   <clr-signpost-content [clrPosition]="'left-middle'" *clrIfOpen>
+     <h5 style="margin-top: 0">Who Column</h5>
+           <div>Account ID: <code class="clr-code">{{user.accountId}}</code></div>
+           <div>Created At: <code class="clr-code">{{user.createdAt| date}}</code></div>
+           <div>Created By: <code class="clr-code">{{user.createdBy}}</code></div>
+           <div>Updated At: <code class="clr-code">{{user.updatedAt | date}}</code></div>
+           <div>Updated By: <code class="clr-code">{{user.updatedBy}}</code></div>
+   </clr-signpost-content>
+ </clr-signpost>
+ </clr-dg-cell>
+ 
+ <!-- who colmn --> 
+ 
+ <clr-dg-action-overflow>
+        <button class="action-item" (click)="onEdit(user)">Edit</button>
+        <button class="action-item" (click)="onDelete(user)">Delete</button>
+      </clr-dg-action-overflow>
+         </clr-dg-row>
+    <clr-dg-footer>
+      <clr-dg-pagination #pagination [clrDgPageSize]="10">
+        <clr-dg-page-size [clrPageSizeOptions]="[10,20,50,100]">Users per page</clr-dg-page-size>
+        {{pagination.firstItem + 1}} - {{pagination.lastItem + 1}}
+        of {{pagination.totalItems}} users
+      </clr-dg-pagination>
+    </clr-dg-footer>
+  </clr-datagrid> </ng-container>
+<ng-template #showInfo>
+  <div class="alert alert-info" role="alert">
+      <div class="alert-items">
+          <div class="alert-item static">
+              <span class="alert-text">
+                <clr-icon class="alert-icon" shape="info-circle"></clr-icon>
+                    Data could be found. Loading..
+                  <clr-spinner [clrMedium]="true">Loading ...</clr-spinner>
+              </span>
+          </div>
+      </div>
+  </div>
+</ng-template><ng-container *ngIf="isCardview">
+  <div *ngIf="product; else showInfo" class="clr-row clr-align-items-start clr-justify-content-start">
+    <div *ngFor="let app of product| filter:search; let index = i" class="clr-col-auto" >
+      <div class="clr-row">
+        <div class="clr-col-lg-12 clr-col-md-4 clr-col-sm-4 clr-col-12" style="width: 410px;">
+  <div class="card" style="padding: 10px; "[style.background-color]="cardmodal.cardColor !== '' ? cardmodal.cardColor : 'white'">
+    <div class="card-body" style="display: grid; grid-template-columns: repeat(13, 1fr); grid-template-rows: repeat(7, 1fr); gap: 5px;">
+      <ng-container *ngFor="let item of dashboardArray">
+        <div [style.gridColumn]="item.x + 1" [style.gridRow]="item.y + 1" [style.gridColumnEnd]="item.x + item.cols + 1"
+          [style.gridRowEnd]="item.y + item.rows + 1">
+          <div *ngIf="item.name === 'textField'" class="title-card card-title"
+          [style.text-align]="item.alignment !== '' ? item.alignment : 'left'"
+          [style.line-height]="item.textlineheight !== '' ? item.textlineheight : '1'"
+          [style.font-family]="item.fontName !== '' ? item.fontName : 'Metropolis'"
+          [style.font-size]="item.fontSize !== '' ? item.fontSize : '100%'"
+          [style.font-style]="item.italic == true ? 'Italic' : 'normal'"
+          [style.font-weight]="item.bold == true ? 'bold' : 'normal'" [style.text-decoration]="(item.underline && item.strikethough) ? 'underline line-through' : 
+          (item.underline ? 'underline' : (item.strikethough ? 'line-through' : 'none'))"
+          [style.background-color]="item.backgroundcolor !== '' ? item.backgroundcolor : 'white'"
+          [style.color]="item.textcolor !== '' ? item.textcolor : 'black'"     	 [style.background-color]="item.conditionValue ==  app[transform(item.fieldtext) ] ? item.conditionbackgroundcolor : item.backgroundcolor"
+          [style.color]="item.conditionValue ==  app[transform(item.fieldtext) ] ? item.conditiontextcolor : item.textcolor">
+           {{beforeText(item.fieldtext)}}
+          {{ app[transform(item.fieldtext) ] }}
+          {{afterText(item.fieldtext)}}
+          </div>
+
+          <div *ngIf="item.name === 'dateField'" class="title-card card-title"
+          [style.text-align]="item.alignment !== '' ? item.alignment : 'left'"
+          [style.line-height]="item.textlineheight !== '' ? item.textlineheight : '1'"
+          [style.font-family]="item.fontName !== '' ? item.fontName : 'Metropolis'"
+          [style.font-size]="item.fontSize !== '' ? item.fontSize : '100%'"
+          [style.font-style]="item.italic == true ? 'Italic' : 'normal'"
+          [style.font-weight]="item.bold == true ? 'bold' : 'normal'" [style.text-decoration]="(item.underline && item.strikethough) ? 'underline line-through' : 
+          (item.underline ? 'underline' : (item.strikethough ? 'line-through' : 'none'))"
+          [style.background-color]="item.backgroundcolor !== '' ? item.backgroundcolor : 'white'"
+          [style.color]="item.textcolor !== '' ? item.textcolor : 'black'"			 [style.background-color]="item.conditionValue ==  app[transform(item.fieldtext) ] ? item.conditionbackgroundcolor : item.backgroundcolor"
+          [style.color]="item.conditionValue ==  app[transform(item.fieldtext) ] ? item.conditiontextcolor : item.textcolor">
+          {{beforeText(item.fieldtext)}}
+          {{ app[transform(item.fieldtext) ] | date}}
+          {{afterText(item.fieldtext)}}
+          </div>
+          <div *ngIf="item.name === 'numberField'" class="title-card card-title"
+          [style.text-align]="item.alignment !== '' ? item.alignment : 'left'"
+          [style.line-height]="item.textlineheight !== '' ? item.textlineheight : '1'"
+          [style.font-family]="item.fontName !== '' ? item.fontName : 'Metropolis'"
+          [style.font-size]="item.fontSize !== '' ? item.fontSize : '100%'"
+          [style.font-style]="item.italic == true ? 'Italic' : 'normal'"
+          [style.font-weight]="item.bold == true ? 'bold' : 'normal'" [style.text-decoration]="(item.underline && item.strikethough) ? 'underline line-through' : 
+          (item.underline ? 'underline' : (item.strikethough ? 'line-through' : 'none'))"
+          [style.background-color]="item.backgroundcolor !== '' ? item.backgroundcolor : 'white'"
+          [style.color]="item.textcolor !== '' ? item.textcolor : 'black'"			 [style.background-color]="item.conditionValue ==  app[transform(item.fieldtext) ] ? item.conditionbackgroundcolor : item.backgroundcolor"
+          [style.color]="item.conditionValue ==  app[transform(item.fieldtext) ] ? item.conditiontextcolor : item.textcolor">
+          {{beforeText(item.fieldtext)}}
+          {{ app[transform(item.fieldtext) ]}}
+          {{afterText(item.fieldtext)}}
+          </div>
+
+          <div *ngIf="item.name === 'Line'" class="title-card card-title"
+          [style.text-align]="item.alignment !== '' ? item.alignment : 'left'"
+          [style.line-height]="item.textlineheight !== '' ? item.textlineheight : '1'"
+          [style.font-family]="item.fontName !== '' ? item.fontName : 'Metropolis'"
+          [style.font-size]="item.fontSize !== '' ? item.fontSize : '100%'"
+          [style.font-style]="item.italic == true ? 'Italic' : 'normal'"
+          [style.font-weight]="item.bold == true ? 'bold' : 'normal'" [style.text-decoration]="(item.underline && item.strikethough) ? 'underline line-through' : 
+          (item.underline ? 'underline' : (item.strikethough ? 'line-through' : 'none'))"
+          [style.background-color]="item.backgroundcolor !== '' ? item.backgroundcolor : 'white'"
+          [style.color]="item.textcolor !== '' ? item.textcolor : 'black'">
+          <hr>
+          </div>
+
+          
+          <div *ngIf="item.name === 'Icon'" class="icon-card"
+          [style.text-align]="item.alignment !== '' ? item.alignment : 'left'"
+          [style.line-height]="item.textlineheight !== '' ? item.textlineheight : '1'"
+          [style.font-family]="item.fontName !== '' ? item.fontName : 'Metropolis'"
+          [style.font-size]="item.fontSize !== '' ? item.fontSize : '100%'"
+          [style.font-style]="item.italic == true ? 'Italic' : 'normal'"
+          [style.font-weight]="item.bold == true ? 'bold' : 'normal'" [style.text-decoration]="(item.underline && item.strikethough) ? 'underline line-through' : 
+          (item.underline ? 'underline' : (item.strikethough ? 'line-through' : 'none'))"
+          [style.background-color]="item.backgroundcolor !== '' ? item.backgroundcolor : 'white'"
+          [style.color]="item.textcolor !== '' ? item.textcolor : 'black'"
+          >
+            <clr-icon [attr.shape]="item.iconName"></clr-icon>
+          </div>
+
+          <div *ngIf="item.name == 'Image'"
+          [style.text-align]="item.alignment !== '' ? item.alignment : 'left'"
+          [style.line-height]="item.textlineheight !== '' ? item.textlineheight : '1'"
+          [style.font-family]="item.fontName !== '' ? item.fontName : 'Metropolis'"
+          [style.font-size]="item.fontSize !== '' ? item.fontSize : '100%'"
+          [style.font-style]="item.italic == true ? 'Italic' : 'normal'"
+          [style.font-weight]="item.bold == true ? 'bold' : 'normal'" [style.text-decoration]="(item.underline && item.strikethough) ? 'underline line-through' : 
+          (item.underline ? 'underline' : (item.strikethough ? 'line-through' : 'none'))"
+          [style.background-color]="item.backgroundcolor !== '' ? item.backgroundcolor : 'white'"
+          [style.color]="item.textcolor !== '' ? item.textcolor : 'black'"
+          [style.background-color]="item.conditionValue ==  app[transform(item.fieldtext) ] ? item.conditionbackgroundcolor : item.backgroundcolor"
+          [style.color]="item.conditionValue ==  app[transform(item.fieldtext) ] ? item.conditiontextcolor : item.textcolor">			 <img id="filePreview" [src]="item.imageURL" alt="File Preview"
+            [style.width]="item.imagewidth !== '' ? item.imagewidth + 'px' : '100px'"
+            [style.height]="item.imagewidth !== '' ? item.imagewidth + 'px' : '100px'"></div>
+        </div>
+      </ng-container>
+    </div>
+  </div>
+  </div>
+  </div>
+  </div>
+  </div>
+  </ng-container>
+</div>
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+<!-- //		EDIT DATA......... -->
+<clr-modal [(clrModalOpen)]="modalEdit" [clrModalSize]="'lg'" [clrModalStaticBackdrop]="true">
+  <h3 class="modal-title">Update Formb
+ <!--update button -->
+
+
+
+
+
+
+
+<button  class="btn btn-icon btn-primary" (click)="openvalueListvalue_list_field('EDIT')">V</button>
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+</h3>
+  <div class="modal-body" *ngIf="rowSelected.id">
+    <h2 class="heading">{{rowSelected.id}}</h2>
+<!-- button -->
+    <form >
+<div class="clr-row"> 
+<div class="clr-col-sm-12">       
+<label>Name</label>
+	        <input class="clr-input"  type="text" [(ngModel)]="rowSelected.name" name="name" />
+	      </div>
+
+<div class="clr-col-sm-12">       
+<label>Surveyff</label>
+	        <input class="clr-input"  type="text" [(ngModel)]="rowSelected.surveyff" name="surveyff" />
+	      </div>
+
+<!-- multiselect field start -->
+<div class="clr-col-sm-12">
+ <label> Fieldgg</label>
+  <div class="clr-form-control" style="margin-top: 5px;margin-bottom: 10px;">
+    <div class="clr-control-container">
+     
+ 
+
+    <div class="clr-col-sm-12">       
+<label>aa</label>
+	        <input class="clr-input"  type="text" [(ngModel)]="rowSelected.aa" name="aa" />
+	      </div>
+
+      
+
+ 
+
+    <div class="clr-col-sm-12">       
+<label>bb</label>
+	        <input class="clr-input"  type="text" [(ngModel)]="rowSelected.bb" name="bb" />
+	      </div>
+
+      
+
+
+    </div>
+  </div>
+</div>
+<!-- multiselect field end -->
+
+
+
+
+
+<!-- qrCode field start -->
+<div class="clr-col-sm-12">
+  <label> Qrcode</label>
+  <input class="clr-input" type="text" name="qrcode" [(ngModel)]="rowSelected.qrcode" />
+  <qrcode [qrdata]="rowSelected.qrcode  ? rowSelected.qrcode : '' " [width]="135" [errorCorrectionLevel]="'M'"></qrcode>
+</div>
+<!-- qrCode field end -->
+
+<!-- bar code field start -->
+<div class="clr-col-sm-12">
+  <label> Barcode</label>
+  <input type="text" class="clr-input" name="barcode" [(ngModel)]="rowSelected.barcode"  (input)="generateBarcodebarcode($event.target.value)" /> <svg  id="barcodebarcode"></svg>
+     </div> <!-- bar code field end -->
+
+
+
+<div class="clr-col-sm-12">       
+<label>Texts</label>
+	        <input class="clr-input"  type="text" [(ngModel)]="rowSelected.texts" name="texts" />
+	      </div>
+
+ <!-- calculated field start -->
+
+              <div class="clr-col-12 fieldWrapper">
+				<table class="table table-noborder">
+			   <thead>
+			  <tr> 
+				
+ 
+				 <th> name</th> 
+				  
+
+ 
+				 <th> texts</th> 
+				  
+
+
+		<th>Total</th>      
+	      </tr>      
+		</thead>
+		 <tbody>
+			 <tr> 
+
+				
+ 
+				 <td>        
+			 <input type="text" [(ngModel)]="concatinationname"  [ngModelOptions]="{standalone: true}" name="name" (input)="onInputChangeconcatination()" class="clr-input"/>
+					</td>
+				 
+
+ 
+				 <td>        
+			 <input type="text" [(ngModel)]="concatinationtexts"  [ngModelOptions]="{standalone: true}" name="texts" (input)="onInputChangeconcatination()" class="clr-input"/>
+					</td>
+				 
+
+				
+			  <td>
+		  <input type="text" [(ngModel)]="concatinationtotal"  [ngModelOptions]="{standalone: true}" name="total" class="clr-input" />
+		  </td>                
+		 </tr>
+ </tbody>   </table>         
+  </div>
+         <!-- calculated field end --> 
+
+
+
+<div class="clr-col-sm-12">
+ <label> Approved Field Status</label>
+  <input id="name" class="clr-input" type="text" [(ngModel)]="rowSelected.approved_field_status" name="approved_field_status" />
+</div>
+
+  </div> 
+
+
+
+
+
+
+<!-- one to many code start here -->
+<div class="clr-row">
+  <div class="clr-col-lg-12">
+    <table class="table" style="width:100%;">
+      <thead>
+        <tr>
+
+          
+ 
+          <th class="left" style="width:200px;">active</th>
+           
+
+ 
+          <th class="left" style="width:200px;">description</th>
+           
+
+ 
+          <th class="left" style="width:200px;">name</th>
+           
+
+       <th class="right" style="width:200px;">{{ components?.length >= 1 ? 'Actions' : '' }}</th>
+        </tr>
+      </thead>
+      <tbody>
+        <tr *ngFor="let component of components; let i = index">
+
+          
+ 
+          <td class="left"> <input type="text" name="active" [(ngModel)]="component.active" [ngModelOptions]=" {standalone: true}" placeholder="Enter  active" class="clr-input">
+          </td>
+           
+
+ 
+          <td class="left"> <input type="text" name="description" [(ngModel)]="component.description" [ngModelOptions]=" {standalone: true}" placeholder="Enter  description" class="clr-input">
+          </td>
+           
+
+ 
+          <td class="left"> <input type="text" name="name" [(ngModel)]="component.name" [ngModelOptions]=" {standalone: true}" placeholder="Enter  name" class="clr-input">
+          </td>
+           
+
+          <td> <a>
+              <clr-icon shape="trash" class="is-error" (click)="deleteRow(i)"></clr-icon>
+            </a> </td>
+        </tr>
+      </tbody>
+      <button type="button" class="btn btn-primary button1" (click)="oneditLines()" style="margin-left: 20px;">
+        <clr-icon shape="plus"></clr-icon> </button>
+    </table>
+  </div>
+</div>
+<!-- one to many code end here -->
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+<!-- approval code start-->
+<div>
+  <div class="section">
+    <h6>Approval Hierarchy</h6>
+  </div>
+  <table class="table">
+    <thead>
+      <tr>
+        <th>No</th>
+        <th>Form Code</th>
+        <th>Document Seq</th>
+        <th>Approver</th>
+        <th>Action Type</th>
+        <th>Action Taken</th>
+        <th>Comments</th>
+        <th>Actioned At</th>
+        <th>Cancel</th>
+      </tr>
+    </thead>
+    <tbody>
+      <tr *ngFor="let data of serverData; let i=index">
+        <td style="width: 70px;"><input type="text" class="clr-input" value={{i+1}} name="id" readonly></td>
+        <td> <input type="text" class="clr-input" [(ngModel)]="data.formCode" [ngModelOptions]="{standalone:
+            true}" name="formCode"></td>
+        <td> <input type="text" class="clr-input" [(ngModel)]="data.documentSeq" [ngModelOptions]="{standalone:
+            true}" name="documentSeq"></td>
+        <td> <input type="text" class="clr-input" [(ngModel)]="data.approver" [ngModelOptions]="{standalone:
+            true}" name="approver"></td>
+        <td> <select name="actionType" [(ngModel)]="data.actionType" [ngModelOptions]="{standalone: true}">
+            <option>ApprovedBy</option>
+            <option>RecommendedBy</option>
+            <option>ActionBy</option>
+          </select></td>
+        <td> <input type="text" class="clr-input" name="actionTaken" [(ngModel)]="data.actionTaken"
+            [ngModelOptions]="{standalone: true}"></td>
+        <td> <input type="text" class="clr-input" [(ngModel)]="data.comments" [ngModelOptions]="{standalone:
+            true}" name="comments"></td>
+        <td> <input type="date" class="clr-input" [(ngModel)]="data.actionedAt" [ngModelOptions]="{standalone:
+            true}" name="actionedAt"></td>
+        <td> <a (click)="oneditRemoveLines(i)">
+            <clr-icon shape="trash" class="is-error"></clr-icon>
+          </a> </td>
+      </tr>
+    </tbody>
+    <button type="button" class="btn btn-primary button1" style="margin-left: 20px;" (click)="oneditAddLines()">
+      <clr-icon shape="plus"></clr-icon> </button>
+  </table>
+</div>
+<!-- approval end -->
+
+<!-- form code start -->
+  <div *ngIf="checkFormCode">
+    <h4 style="font-weight: 300;display: inline;">Extension</h4>
+    <br>
+    <hr>
+    <div class="clr-row">
+      <div class="clr-col-4" *ngFor="let field of additionalFieldsFromBackend">
+        <ng-container *ngIf="field.formCode === formcode" [ngSwitch]="field.fieldType">
+          <!-- Text Input -->    <label  *ngSwitchCase="'text'">{{ field.fieldName }}</label>
+          <input *ngSwitchCase="'text'" [type]="field.fieldType"  name="{{ field.extValue }}" [(ngModel)]="rowSelected[field.extValue]" class="clr-input" />
+  
+          <!-- Date Input -->    <label  *ngSwitchCase="'date'">{{ field.fieldName }}</label>
+          <input *ngSwitchCase="'date'" [type]="field.fieldType"  name="{{ field.extValue }}" [(ngModel)]="rowSelected[field.extValue]"  class="clr-input" />
+  
+          <!-- Textarea -->    <label  *ngSwitchCase="'textarea'">{{ field.fieldName }}</label>
+          <textarea *ngSwitchCase="'textarea'"  name="{{ field.extValue }}" [(ngModel)]="rowSelected[field.extValue]"  col="10" row="2"></textarea>
+  
+          <!-- Checkbox -->    <label  *ngSwitchCase="'checkbox'">{{ field.fieldName }}</label><br>
+          <input *ngSwitchCase="'checkbox'" [type]="field.fieldType" name="{{ field.extValue }}" [(ngModel)]="rowSelected[field.extValue]"  class="clr-checkbox" />
+        </ng-container>
+  </div>
+  </div>
+</div>
+
+  <!-- form code end -->  <div class="modal-footer">
+      <button type="button" class="btn btn-outline" (click)="modalEdit = false">Cancel</button>
+      <button type="submit" class="btn btn-primary"  (click)="onUpdate(rowSelected.id)">Update</button>
+      </div>
+    </form>
+  </div>
+</clr-modal>
+<clr-modal [(clrModalOpen)]="modaldelete" [clrModalSize]="'lg'" [clrModalStaticBackdrop]="true">
+  <div class="modal-body" *ngIf="rowSelected.id">
+    <h1 class="delete">Are You Sure Want to delete?</h1>
+    <h2 class="heading">{{rowSelected.id}}</h2>
+    <div class="modal-footer">
+      <button type="button" class="btn btn-outline" (click)="modaldelete = false">Cancel</button>
+    <button type="button" (click)="delete(rowSelected.id)" class="btn btn-primary" >Delete</button>
+    </div>
+  </div>
+</clr-modal>
+<!-- ADD FORM ..... -->
+<clr-modal [(clrModalOpen)]="modalAdd" [clrModalSize]="'lg'" [clrModalStaticBackdrop]="true">
+  <h3 class="modal-title">Add Formb 
+
+
+
+
+
+
+
+<button  class="btn btn-icon btn-primary" (click)="openvalueListvalue_list_field('ADD')">V</button>
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+  <!-- aeroplane icon -->
+    &nbsp; &nbsp; &nbsp; &nbsp;
+    <a *ngIf="userrole.includes('ROLE_ADMIN')" style="float: right;" href="javascript:void(0)" role="tooltip" aria-haspopup="true"
+      class="tooltip tooltip-sm tooltip-bottom-left">
+      <a id="build_extension" [routerLink]="['../extension/all']" [queryParams]="{ formCode: 'Formb_formCode' }">
+        <clr-icon shape="airplane" size="32"></clr-icon>
+      </a>
+      <span class="tooltip-content">Form Extension</span>
+    </a> </h3>
+  <div class="modal-body">
+     <form [formGroup]="entryForm" >
+   <div class="clr-row" style="height: fit-content;">
+
+<div class="clr-col-sm-12">
+ <label>  Name</label>
+ <input class="clr-input"  type="text"  formControlName="name" />       
+ </div>
+
+<div class="clr-col-sm-12">
+ <label>  Surveyff</label>
+ <input class="clr-input"  type="text"  formControlName="surveyff" />       
+ </div>
+
+<!-- multiselect  field start -->
+     <div class="clr-col-sm-12">       
+		<label> Fieldgg</label>
+	    <div class="clr-form-control" style="margin-top: 5px;margin-bottom: 10px;">
+	      <div class="clr-control-container">
+
+                      
+ 
+			<div class="clr-col-sm-12">
+ <label>  aa</label>
+ <input class="clr-input"  type="text"  formControlName="aa" />       
+ </div>
+	                           
+
+ 
+			<div class="clr-col-sm-12">
+ <label>  bb</label>
+ <input class="clr-input"  type="text"  formControlName="bb" />       
+ </div>
+	                           
+
+ </div>       </div>     </div>
+	              <!-- multiselect  field end -->
+
+
+
+
+
+<!-- qrCode field start -->   
+<div class="clr-col-sm-12">
+	    <label>Qrcode</label>
+	    <input class="clr-input" type="text" formControlName="qrcode" />
+	    <qrcode [qrdata]="entryForm.value.qrcode  ? entryForm.value.qrcode : '' " [width]="135" [errorCorrectionLevel]="'M'"  ></qrcode>   </div>
+	<!-- qrCode field end -->
+
+<!-- bar code field start -->    
+<div class="clr-col-sm-12">
+	    <label> Barcode</label>
+	    <input  type="text" class="clr-input" formControlName="barcode" (input)="generateBarcodebarcode($event.target.value)" />
+	    <svg id="barcodebarcode"></svg>   </div>
+	<!-- bar code field end -->
+
+
+
+<div class="clr-col-sm-12">
+ <label>  Texts</label>
+ <input class="clr-input"  type="text"  formControlName="texts" />       
+ </div>
+
+
+						  <!-- calculated field start -->
+			
+			             <div class="clr-col-12 fieldWrapper">
+						<table class="table table-noborder">
+							 <thead>               
+							<tr> 
+								
+ 
+								 <th> name </th> 
+								  
+
+ 
+								 <th> texts </th> 
+								  
+
+				 <th>Total</th>                  
+				 </tr>              
+				</thead>
+			 	<tbody> 
+					<tr> 
+
+						
+ 
+						<td>                 
+					 <input type="text"  [(ngModel)]="concatinationname"  [ngModelOptions]="{standalone: true}" name="name" (input)="onInputChangeconcatination()" class="clr-input" />
+				 </td> 
+				   
+
+ 
+						<td>                 
+					 <input type="text"  [(ngModel)]="concatinationtexts"  [ngModelOptions]="{standalone: true}" name="texts" (input)="onInputChangeconcatination()" class="clr-input" />
+				 </td> 
+				   
+
+
+				 <td>
+			 <input type="text" [(ngModel)]="concatinationtotal"  [ngModelOptions]="{standalone: true}" name="total" class="clr-input" />"
+			 </td>   
+			</tr>
+		  </tbody> 
+		 </table>     
+		</div>
+		 <!-- calculated field end -->  
+
+
+
+<div class="clr-col-sm-12">
+	          <label>  Approved Field status:</label>
+	          <input class="clr-input"  type="text"  formControlName="approved_field_status" />         </div>
+
+ 
+ </div> 
+
+
+
+
+
+
+<!-- one to many code start here -->
+<div style="margin-top: 30px;"><h4 style="display: inline;">child </h4>
+</div>
+<hr>
+<div class="clr-row">
+  <div class="clr-col-lg-12">
+    <table class="table" style="width:100%;" formArrayName="child">
+      <thead>
+        <tr>
+
+          
+ 
+          <th class="left" style="width:125px;">active</th>
+           
+
+ 
+          <th class="left" style="width:125px;">description</th>
+           
+
+ 
+          <th class="left" style="width:125px;">name</th>
+           
+
+
+          <th class="right" style="width:125px;">{{ controls.length > 1 ? 'Actions' : '' }}</th>
+        </tr>
+      </thead>
+      <tbody>
+        <tr *ngFor="let item of controls; let i=index" [formGroupName]="i">
+          
+ 
+          <td class="left"> <input type="text" formControlName="active" placeholder="Enter active" style="width:180px"
+                            class="clr-input"> </td> 
+           
+
+ 
+          <td class="left"> <input type="text" formControlName="description" placeholder="Enter description" style="width:180px"
+                            class="clr-input"> </td> 
+           
+
+ 
+          <td class="left"> <input type="text" formControlName="name" placeholder="Enter name" style="width:180px"
+                            class="clr-input"> </td> 
+           
+
+
+          <td style="width:40px;">
+            <a *ngIf="controls.length > 1" (click)="onRemoveLines(i)"><clr-icon shape="trash" class="is-error"></clr-icon>
+            </a>
+          </td>
+        </tr>
+      </tbody>
+      <button type="button" class="btn btn-primary button1" (click)="onAddLines()" >
+        <clr-icon shape="plus"></clr-icon> </button>
+    </table>
+  </div>
+</div>
+<!-- one to many code end here -->
+
+
+
+
+
+
+
+<!--Data grid field start-->
+<div class="clr-row">
+  <div class="clr-col-6">
+    <h3> datagggs</h3>
+    <div style="max-width:fit-content; overflow-x:auto; max-height: 500px; overflow-y: auto;">
+      <table class="table">
+        <thead>
+          <tr>
+            <th *ngFor="let co of getHeadersdatagggs() let i=index">{{co}}</th>
+          </tr>
+        </thead>
+        <tbody>
+          <tr *ngFor="let item of rowsdatagggs?.slice()?.reverse()">
+            <td *ngFor="let key of getHeadersdatagggs()">{{item[key]}}</td>
+          </tr>
+        </tbody>
+      </table>
+    </div>
+  </div>
+</div>
+<!--Data grid field end-->
+
+
+
+
+
+
+
+<!-- approval code start-->
+<div>
+  <div class="section">
+    <h6>Approval Hierarchy</h6>
+  </div>
+  <table class="table">
+    <thead><tr> <th>No</th> <th>Form Code</th>
+        <th>Document Seq</th> <th>Approver</th>
+        <th>Comments</th> <th>Actioned At</th>
+        <th>Cancel</th>
+      </tr> </thead>
+    <tbody>
+      <tr *ngFor="let data of serverData; let i = index">
+        <td style="width: 70px;"><input type="text" class="clr-input" value={{i+1}} name="id" readonly></td>
+        <td> <input type="text" class="clr-input" [(ngModel)]="data.formCode" [ngModelOptions]="{standalone: true}"
+            name="formCode"></td>
+        <td> <input type="text" class="clr-input" [(ngModel)]="data.documentSeq" [ngModelOptions]="{standalone: true}"
+            name="documentSeq"></td>
+        <td> <input type="text" class="clr-input" [(ngModel)]="data.approver" [ngModelOptions]="{standalone: true}"
+            name="approver"></td>
+        <td> <input type="text" class="clr-input" [(ngModel)]="data.comments" [ngModelOptions]="{standalone: true}"
+            name="comments"></td>
+        <td> <input type="date" class="clr-input" [(ngModel)]="data.actionedAt" [ngModelOptions]="{standalone: true}"
+            name="actionedAt"></td>
+        <td><a (click)="onRemoveLines(i)">
+            <clr-icon shape="trash" class="is-error"></clr-icon>
+          </a></td>
+      </tr>
+    </tbody>
+    <button type="button" class="btn btn-primary button1" style="margin-left: 20px;" (click)="onAddLines()">
+      <clr-icon shape="plus"></clr-icon></button>
+  </table>
+</div><!-- approval end -->
+
+
+
+      <!-- form code start -->
+      <div *ngIf="checkFormCode">
+        <h4 style="font-weight: 300;display: inline;">Extension</h4>
+        <br>
+        <hr>
+        <div class="clr-row">
+          <div class="clr-col-4" *ngFor="let field of additionalFieldsFromBackend">
+            <ng-container *ngIf="field.formCode === formcode" [ngSwitch]="field.fieldType">
+              <!-- Text Input --> <label *ngSwitchCase="'text'">{{ field.fieldName }}</label>
+              <input *ngSwitchCase="'text'" [type]="field.fieldType" [formControlName]="field.extValue"
+                class="clr-input" />
+              <!-- Date Input --> <label *ngSwitchCase="'date'">{{ field.fieldName }}</label>
+              <input *ngSwitchCase="'date'" [type]="field.fieldType" [formControlName]="field.extValue"
+                class="clr-input" />
+              <!-- Textarea --> <label *ngSwitchCase="'textarea'">{{ field.fieldName }}</label>
+              <textarea *ngSwitchCase="'textarea'" [formControlName]="field.extValue" col="10" row="2"></textarea>
+              <!-- Checkbox --> <label *ngSwitchCase="'checkbox'">{{ field.fieldName }}</label><br>
+              <input *ngSwitchCase="'checkbox'" [type]="field.fieldType" [formControlName]="field.extValue"
+                class="clr-checkbox" />
+            </ng-container>
+          </div>
+        </div>
+      </div>
+      <!-- form code end --> <div class="modal-footer">
+<button type="button" class="btn btn-outline" (click)="modalAdd = false">Cancel</button>
+  
+ <!-- payment -->
+        <button type="submit" class="btn btn-primary" (click)="checkout()">Checkout</button>
+
+        <!-- payment -->      
+        </div>
+</form>
+  </div>
+</clr-modal>
+
+
+
+
+
+
+
+
+ <!--   value List field start-->
+ <clr-modal [(clrModalOpen)]="valueListModalvalue_list_field" [clrModalSize]="'md'">
+	  <h3 class="modal-title"><b>Select From  value_list_field  List:</b></h3>
+	  <div class="modal-body">   
+		 <div class="clr-row">
+	      <div class="clr-col-md-12 clr-col-sm-12" style="margin-top: 8px;">
+	          <input id="data" type="text" placeholder="Enter search Criteria" class="clr-input" name="searchcusttextvalue_list_field" [(ngModel)]="searchcusttextvalue_list_field">       </div>
+	      </div>     <clr-datagrid [clrDgLoading]="loading">
+	      <clr-dg-placeholder><clr-spinner [clrMedium]="true">Loading ...</clr-spinner></clr-dg-placeholder>
+	
+
+		   
+ 
+		   <clr-dg-column [clrDgField]="'name'"> <ng-container *clrDgHideableColumn="{hidden: false}">name</ng-container></clr-dg-column> 
+		  
+
+<clr-dg-row *clrDgItems="let user of product?.slice()?.reverse() | filter:searchcusttextvalue_list_field;  let i = index " [clrDgItem]="user">
+
+	
+ 
+	<clr-dg-cell (click)="getcustvalue_list_fieldID(user.id)" style="color: rgb(108, 108, 194); cursor:pointer;">{{user.name}}</clr-dg-cell>
+ 
+
+
+ </clr-dg-row>     <clr-dg-footer>
+	        <clr-dg-pagination #pagination [clrDgPageSize]="10">
+	          <clr-dg-page-size [clrPageSizeOptions]="[10,20,50,100]">Record per page</clr-dg-page-size>
+	          {{pagination.firstItem + 1}} - {{pagination.lastItem + 1}}
+	          of {{pagination.totalItems}} Records        </clr-dg-pagination>
+	      </clr-dg-footer>    </clr-datagrid>  </div></clr-modal>
+	   <!--   value List field end-->
+
+
+
+
+
+
+
+
+
+
+
+<!-- payment code start-->
+<clr-modal [(clrModalOpen)]="checkoutModal" [clrModalSize]="'sm'" [clrModalStaticBackdrop]="true" style="height:200px;">
+  <h3 class="modal-title">Choose Payment Method</h3>
+  <div class="modal-body"><div class="clr-row">
+      <div class="clr-col-12">
+        <a (click)="paytmPay()" class="card clickable card-img" style="width:100px">
+          <img width="100" alt="Image" src="../../../../../../assets/images/icon/paytm1.png">
+        </a>
+      </div>
+      <div class="clr-col-12">
+        <a (click)="razorPay()" class="card clickable card-img" style="width:140px">
+
+          <img width="100" alt="Image" src="../../../../../../assets/images/icon/razorpay.png">
+        </a>
+      </div>
+    </div>
+  </div>
+</clr-modal><!-- payment code end-->
+
+
+
+  <!-- htmlpopup -->
diff --git a/testing15aprilnew-front-f/authsec_angular/frontend/angular-clarity-master/src/app/modules/main/BuilderComponents/basicp1/Formb/Formb.component.scss b/testing15aprilnew-front-f/authsec_angular/frontend/angular-clarity-master/src/app/modules/main/BuilderComponents/basicp1/Formb/Formb.component.scss
new file mode 100644
index 0000000..c47b921
--- /dev/null
+++ b/testing15aprilnew-front-f/authsec_angular/frontend/angular-clarity-master/src/app/modules/main/BuilderComponents/basicp1/Formb/Formb.component.scss
@@ -0,0 +1,78 @@
+//@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;
+}
diff --git a/testing15aprilnew-front-f/authsec_angular/frontend/angular-clarity-master/src/app/modules/main/BuilderComponents/basicp1/Formb/Formb.component.ts b/testing15aprilnew-front-f/authsec_angular/frontend/angular-clarity-master/src/app/modules/main/BuilderComponents/basicp1/Formb/Formb.component.ts
new file mode 100644
index 0000000..9e612ac
--- /dev/null
+++ b/testing15aprilnew-front-f/authsec_angular/frontend/angular-clarity-master/src/app/modules/main/BuilderComponents/basicp1/Formb/Formb.component.ts
@@ -0,0 +1,796 @@
+import { Component, OnInit } from '@angular/core';
+import { ToastrService } from 'ngx-toastr';
+import { AlertService } from 'src/app/services/alert.service';
+import { Formbservice} from './Formb.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 { Formbcardvariable } from './Formb_cardvariable';
+import { UserInfoService } from 'src/app/services/user-info.service';
+declare var JsBarcode: any; 
+@Component({
+  selector: 'app-Formb',
+  templateUrl: './Formb.component.html',
+  styleUrls: ['./Formb.component.scss']
+})
+export class FormbComponent implements OnInit {
+  cardButton = Formbcardvariable.cardButton;
+  cardmodeldata = Formbcardvariable.cardmodeldata;
+  public dashboardArray: DashboardContentModel2[];
+  isCardview = Formbcardvariable.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 = 'Formb_formCode'
+tableName = 'Formb';  checkFormCode; selected: any[] = []; constructor(
+    private extensionService: ExtensionService,
+private userInfoService:UserInfoService,
+    private mainService:Formbservice,
+    private alertService: AlertService,
+    private toastr: ToastrService,
+    private _fb: FormBuilder,
+  ) { }
+// 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({
+name : [null],
+
+surveyff : [null],
+
+ 
+ 
+aa:[null],
+ 
+
+ 
+bb:[null],
+ 
+
+
+child: this._fb.array([this.initLinesForm()]),
+
+
+
+qrcode : [null],
+
+barcode : [null],
+
+ 
+
+texts : [null],
+
+
+
+
+
+approved_field_status : [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 === "Formb_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 
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+  }
+
+
+
+
+
+
+// one to many start
+ initLinesForm() {    return this._fb.group({ 
+
+
+ 	
+ active: [null],
+ 
+
+ 	
+ description: [null],
+ 
+
+ 	
+ name: [null],
+ 
+
+
+});  }  
+get controls() {return (this.entryForm.get("child") as FormArray).controls;  }
+onAddLines() {
+(<FormArray>this.entryForm.get("child")).push(this.initLinesForm());  }
+onRemoveLines(index: number) {
+(<FormArray>this.entryForm.get("child")).removeAt(index);  }
+ oneditLines() {    this.components.push({ 
+
+ 
+active: "",
+ 
+
+ 
+description: "",
+ 
+
+ 
+name: "",
+ 
+
+
+	  });  }  
+ deleteRow(index) {
+ this.components.splice(index, 1); 
+ }  
+		 components;
+ // one to many end 
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+approved_field_tablename = 'Formb' 
+
+ error; 
+  getData() {
+    this.mainService.getAll().subscribe((data) => {
+      console.log(data);
+      this.product = data;
+ 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.components = row.child;
+
+
+
+
+
+  //    bar code field start 
+   setTimeout(function(){ 
+		JsBarcode("#barcodebarcode", row?.barcode);
+	     }, 500);
+	   //    bar code field start
+
+
+
+
+
+//calculated field start
+	
+ 
+	   this.concatinationname= row.name;
+	  
+
+ 
+	   this.concatinationtexts= row.texts;
+	  
+
+//calculated field end
+
+
+
+  this.serverData = [];
+
+
+    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;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+//calculated field start
+	
+ 
+this.rowSelected.name= this.concatinationname;
+	 
+
+ 
+this.rowSelected.texts= this.concatinationtexts;
+	 
+
+this.onInputChangeconcatination ();
+ //calculated field end
+
+
+
+
+
+    //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;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+//calculated field start
+	
+ 
+this.entryForm.value.name  = this.concatinationname ;
+	  
+
+ 
+this.entryForm.value.texts  = this.concatinationtexts ;
+	  
+
+//calculated field end
+
+
+
+
+
+  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);
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+// approve code
+        this.serverData = this.serverData.map((item) => {
+          item.tablename = this.approved_field_tablename;          
+         return item;
+        });         this.serverData = this.serverData.map((item) => {
+          item.service_order_id = data.id;          
+          return item;         });
+        console.log(this.serverData);      
+  this.serverData.forEach((item) => {
+           this.mainService.create_approved(item).subscribe(
+            (data) => {               console.log(data);             })
+          })          // approved code end 
+
+
+      }, (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;
+
+
+
+
+
+
+
+
+
+
+
+
+
+ this.getdatagggsData();
+
+
+
+  //calculated field start
+
+  
+ 
+  this.concatinationname  = '';
+ 
+
+ 
+  this.concatinationtexts  = '';
+ 
+
+
+
+  this.concatinationtotal = '';
+
+  //calculated field end
+
+
+
+
+
+
+  }
+ submitted = false;
+onSubmit() {
+  console.log(this.entryForm.value);
+ this.submitted = true;
+  if (this.entryForm.invalid) {
+    return;
+  }this.onCreate();
+
+} 
+
+
+
+
+
+
+
+
+//Value List field start    
+valuelistMode;
+searchcusttextvalue_list_field :any;    
+ valueListModalvalue_list_field :boolean=false;
+    openvalueListvalue_list_field(mode){
+ this.valueListModalvalue_list_field=!this.valueListModalvalue_list_field ; 
+      this.valuelistMode = mode;     }
+     customerdatavalue_list_field ;     
+cutomererror;
+   clickedID:number;
+
+getcustvalue_list_fieldID(id:number){    
+ this.clickedID=id;
+						    console.log("clicked by id"+ id);
+						    this.mainService.getById(id).subscribe((data) => {       console.log(data);
+						         if(this.valuelistMode == "ADD"){ 
+
+							
+ 
+							this.entryForm.get('name').setValue(data.name);
+							 
+
+
+						}else if(this.valuelistMode == "EDIT"){
+
+							
+ 
+							this.rowSelected.name= data. name
+							 
+
+
+						}       });       this.valueListModalvalue_list_field =false;
+						    }    //value List field end 
+
+
+
+//bar code field start 
+     generateBarcodebarcode(value) {
+      const barcodeValue = value;
+      const barcodeElement = document.getElementById("barcodebarcode"); 
+      if (barcodeElement) {         if (barcodeValue) {
+          JsBarcode(barcodeElement, barcodeValue, {             format: "CODE128"
+          });         } else {
+          // Clear the barcode if the input is empty
+          barcodeElement.innerHTML = '';         }       }     }
+         //    bar code field end 
+
+//datagrid datagggs  filed start    
+productdatagggs;     
+ rowsdatagggs :any[];
+         getHeadersdatagggs () {          
+			 this.rowsdatagggs = this.productdatagggs;         
+  let headers: string[] = [];
+          if(this.rowsdatagggs ) {             
+this.rowsdatagggs.forEach((value) => {         
+      Object.keys(value).forEach((key) => {
+                if(!headers.find((header) => header == key)){
+                  headers.push(key)             
+    }         
+              })                 
+     })         
+}
+         
+ return headers;      
+   } 
+ //datagrid datagggs filed end 
+					    
+getdatagggsData() {
+    this.mainService.getdatagggsAll().subscribe((data) => {
+      console.log(data);      this.productdatagggs  = data; 
+    });
+}
+
+
+
+ // calculated field code start 
+
+ 
+ concatinationname; 
+  
+
+ 
+ concatinationtexts; 
+  
+
+  concatinationtotal ; 
+ concatinationcalculateOperators = "Forma_ListFilter1/Forma_ListFilter1"
+onInputChangeconcatination() {
+const lastObj = 0
+const lastObjstring = ''
+	
+ 
+
+    const name= this.concatinationname|| '';
+
+	const nameValue = parseFloat(this.concatinationname) || 0;
+
+	  
+
+ 
+
+    const texts= this.concatinationtexts|| '';
+
+	const textsValue = parseFloat(this.concatinationtexts) || 0;
+
+	  
+
+if (this.concatinationcalculateOperators =="Addition") {
+ this.concatinationtotal = (   
+	
+ 
+		 nameValue +
+	 
+
+ 
+		 textsValue +
+	 
+ lastObj).toString();
+}
+if (this.concatinationcalculateOperators == "Subtraction") {
+	 this.concatinationtotal = (   
+
+ 
+ nameValue   -
+	 
+
+ 
+ textsValue   -
+	 
+
+	lastObj).toString();
+}
+if (this.concatinationcalculateOperators =="Multiplication") {
+  this.concatinationtotal = (
+
+	
+ 
+	nameValue *
+		 
+
+ 
+	textsValue *
+		 
+
+lastObj).toString();
+}
+if (this.concatinationcalculateOperators =="Division") {
+ 
+	this.concatinationtotal = ( 
+
+ 
+nameValue   /
+	 
+
+ 
+textsValue   /
+	 
+
+lastObj).toString();
+
+}
+if (this.concatinationcalculateOperators =="Concatination") {
+ this.concatinationtotal =  
+
+ 
+name+ ' '+
+	 
+
+ 
+texts+ ' '+
+	 
+ lastObjstring 
+}
+}
+
+// payment code start
+  checkoutModal = false;
+  checkout(){     this.checkoutModal = true;   } 
+paytmPay(){
+    this.checkoutModal = false;     console.log('Paytm Payment started');
+    this.mainService.paytmPay(this.entryForm.value).subscribe(data=>{
+      console.log(data);    this.onSubmit();     },(error)=>{
+      console.log(error);     });   }      orderData = {
+    amount: '',    };     
+ razorPay(){
+    this.checkoutModal = false;
+    this.orderData.amount = this.entryForm.value.amount;
+    console.log('Razorpay Payment started');
+    this.mainService.razorPay(this.orderData).subscribe(data=>{
+      console.log(data);       this.onSubmit();     },(error)=>{
+      console.log(error);     });   }  // payment code end 
+
+ // approval code 
+   serverData:any = [];    
+  onAddLines() {
+     this.serverData.push({   formCode:"",      
+  documentSeq:"",
+ approver:"",      
+  actionType:"",        
+actionTaken:"",
+   comments:"",       
+ actionedAt:"",     
+   tablename:"",
+       service_order_id:"",        });      }
+      onRemoveLines(index: number){      
+  this.serverData.splice(index, 1);
+      }   
+    oneditAddLines() {    
+   this.serverData.push({
+     formCode:"",          documentSeq:"",          approver:"",
+          actionType:"",          actionTaken:"",          comments:"",
+          actionedAt:"",          tablename:"",
+          service_order_id:"",          });        }
+        oneditRemoveLines(index: number){          this.serverData.splice(index, 1);
+        }   // approval code end 
+
+// updateaction
+}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/testing15aprilnew-front-f/authsec_angular/frontend/angular-clarity-master/src/app/modules/main/BuilderComponents/basicp1/Formb/Formb.service.ts b/testing15aprilnew-front-f/authsec_angular/frontend/angular-clarity-master/src/app/modules/main/BuilderComponents/basicp1/Formb/Formb.service.ts
new file mode 100644
index 0000000..a406386
--- /dev/null
+++ b/testing15aprilnew-front-f/authsec_angular/frontend/angular-clarity-master/src/app/modules/main/BuilderComponents/basicp1/Formb/Formb.service.ts
@@ -0,0 +1,69 @@
+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 Formbservice{
+  private baseURL = "Formb/Formb" ;  constructor(
+    private http: HttpClient,
+    private apiRequest: ApiRequestService,
+  ) { }
+  getAll(page?: number, size?: number): Observable<any> {
+    return this.apiRequest.get(this.baseURL);
+  }
+  getById(id: number): Observable<any> {
+    const _http = this.baseURL + "/" + id;
+    return this.apiRequest.get(_http);
+  }
+  create(data: any): Observable<any> {
+    return this.apiRequest.post(this.baseURL, data);
+  }
+  update(id: number, data: any): Observable<any> {
+    const _http = this.baseURL + "/" + id;
+    return this.apiRequest.put(_http, data);
+  }
+  delete(id: number): Observable<any> {
+    const _http = this.baseURL + "/" + id;
+    return this.apiRequest.delete(_http);
+  }
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+getdatagggsAll(page?: number, size?: number): Observable<any> {
+    return this.apiRequest.get("Forma_ListFilter1/Forma_ListFilter1");
+
+						    }
+
+
+
+
+
+// payment code start
+  paytmPay(data: any): Observable<any> {
+   const url = `payment/start`;    return this.apiRequest.post(url, data);
+ }  
+razorPay(orderData: any): Observable<any> {
+   const url = `payment/razorpay/create-order`;
+   return this.apiRequest.post(url, orderData);  }  // payment code end
+
+// approve code
+       create_approved(data: any): Observable<any> {
+    const _http = "billing/approval" + "/" + "add"; 
+    return this.apiRequest.post(_http, data);   }  // approved code end 
+
+// updateaction
+}
\ No newline at end of file
diff --git a/testing15aprilnew-front-f/authsec_angular/frontend/angular-clarity-master/src/app/modules/main/BuilderComponents/basicp1/Formb/Formb_cardvariable.ts b/testing15aprilnew-front-f/authsec_angular/frontend/angular-clarity-master/src/app/modules/main/BuilderComponents/basicp1/Formb/Formb_cardvariable.ts
new file mode 100644
index 0000000..07a4ca7
--- /dev/null
+++ b/testing15aprilnew-front-f/authsec_angular/frontend/angular-clarity-master/src/app/modules/main/BuilderComponents/basicp1/Formb/Formb_cardvariable.ts
@@ -0,0 +1,4 @@
+export const Formbcardvariable = {
+    "cardButton": false,
+    "cardmodeldata": ``
+}
\ No newline at end of file
diff --git a/testing15aprilnew-front-f/authsec_angular/frontend/angular-clarity-master/src/app/modules/main/main-routing.module.ts b/testing15aprilnew-front-f/authsec_angular/frontend/angular-clarity-master/src/app/modules/main/main-routing.module.ts
index c7450e8..74174aa 100644
--- a/testing15aprilnew-front-f/authsec_angular/frontend/angular-clarity-master/src/app/modules/main/main-routing.module.ts
+++ b/testing15aprilnew-front-f/authsec_angular/frontend/angular-clarity-master/src/app/modules/main/main-routing.module.ts
@@ -1,3 +1,6 @@
+import { FormbComponent } from './BuilderComponents/basicp1/Formb/Formb.component';
+import { ChildComponent } from './BuilderComponents/basicp1/Child/Child.component';
+import { FormaComponent } from './BuilderComponents/basicp1/Forma/Forma.component';
 
 
 
@@ -258,6 +261,15 @@ const routes: Routes = [
 
 
       // buildercomponents
+{path:'Formb',component:FormbComponent},
+
+
+{path:'Child',component:ChildComponent},
+
+
+{path:'Forma',component:FormaComponent},
+
+
 
       { path: '**', component: PageNotFoundComponent },
 
diff --git a/testing15aprilnew-front-f/authsec_angular/frontend/angular-clarity-master/src/app/modules/main/main.module.ts b/testing15aprilnew-front-f/authsec_angular/frontend/angular-clarity-master/src/app/modules/main/main.module.ts
index dacaf40..4db2533 100644
--- a/testing15aprilnew-front-f/authsec_angular/frontend/angular-clarity-master/src/app/modules/main/main.module.ts
+++ b/testing15aprilnew-front-f/authsec_angular/frontend/angular-clarity-master/src/app/modules/main/main.module.ts
@@ -1,3 +1,6 @@
+import { FormbComponent } from './BuilderComponents/basicp1/Formb/Formb.component';
+import { ChildComponent } from './BuilderComponents/basicp1/Child/Child.component';
+import { FormaComponent } from './BuilderComponents/basicp1/Forma/Forma.component';
 
 import { CommonModule } from '@angular/common';
 import { CUSTOM_ELEMENTS_SCHEMA, NgModule } from '@angular/core';
@@ -126,6 +129,15 @@ import { QueryeditComponent } from './superadmin/queryedit/queryedit.component';
 
 
     // buildercomponents
+FormbComponent,
+
+
+ChildComponent,
+
+
+FormaComponent,
+
+
 
 
 
diff --git a/testing15aprilnew-front-f/authsec_angular/frontend/angular-clarity-master/src/assets/i18n/en.json b/testing15aprilnew-front-f/authsec_angular/frontend/angular-clarity-master/src/assets/i18n/en.json
index 3d60440..b4ff206 100644
--- a/testing15aprilnew-front-f/authsec_angular/frontend/angular-clarity-master/src/assets/i18n/en.json
+++ b/testing15aprilnew-front-f/authsec_angular/frontend/angular-clarity-master/src/assets/i18n/en.json
@@ -1,4 +1,4 @@
-{
+ {
   "BREADCRUMB_HOME": "Home",
   "USER_GROUP_MAINTENANCE": "User Group Maintenance",
   "BREADCRUMB_ABOUT_US": "About Us",
@@ -17,23 +17,25 @@
   "IMPORT": "Import",
   "EXPORT_XLSX": "Export as XLSX",
   "ADD": "Add",
-  "MENU_ACCESS_CONTROL": "Menu Access Control",
-  "EDIT_MODE": "Edit Mode",
-  "FOR": "For",
-  "RELOAD": "Reload",
-  "SHOW_ALL": "Show All",
-  "ONLY_MAIN_MENU": "Only Main Menu",
-  "NO_DATA_AVAILABLE": "No data available",
-  "NO": "No",
-  "MENU_ITEM_NAME": "Menu Item Name",
-  "VIEW": "View",
-  "CREATE": "Create",
-  "EDIT": "Edit",
-  "DELETE": "Delete",
-  "QUERY": "Query",
-  "EXPORT": "Export",
-  "SYNC": "Sync",
-  "editMode": "Edit Mode",
+  
+    "MENU_ACCESS_CONTROL": "Menu Access Control",
+    "EDIT_MODE": "Edit Mode",
+    "FOR": "For",
+    "RELOAD": "Reload",
+    "SHOW_ALL": "Show All",
+    "ONLY_MAIN_MENU": "Only Main Menu",
+   
+    "NO_DATA_AVAILABLE": "No data available",
+    "NO": "No",
+    "MENU_ITEM_NAME": "Menu Item Name",
+    "VIEW": "View",
+    "CREATE": "Create",
+    "EDIT": "Edit",
+    "DELETE": "Delete",
+    "QUERY": "Query",
+    "EXPORT": "Export",
+    "SYNC": "Sync",
+    "editMode": "Edit Mode",
   "setupCode": "Setup Code",
   "value": "Value",
   "schedulerTimer": "Scheduler Timer",
@@ -60,9 +62,11 @@
   "oidAdminUserTooltip": "Admin user for OID access",
   "oidServerPort": "OID Server Port",
   "oidServerPortTooltip": "Port number for the OID server",
-  "companyDisplayName": "Company Display Name",
+  
+  
+    "companyDisplayName": "Company Display Name",
   "systemParameter": "System Parameter",
-  "userDefaultGroup": "User Default Group",
+   "userDefaultGroup": "User Default Group",
   "defaultDepartment": "Default Department",
   "defaultPosition": "Default Position",
   "singleCharge": "Single Charge",
@@ -93,45 +97,49 @@
   "areYouSureDelete": "Are You Sure Want to delete?",
   "updateAccessType": "Update Access Type",
   "update": "Update",
-  "SEQ_GENERATOR": "Sequence Generator",
-  "CURRENT_NO": "Current No",
-  "NAME": "Name",
-  "PREFIX": "Prefix",
-  "SEPARATOR": "Separator",
-  "SEQUENCE_SIZE": "Sequence Size",
-  "REPORT": "Report",
-  "REPORT_RUNNER": "Report Runner",
-  "REPORT_NAME": "Report Name",
-  "REPORT_DESCRIPTION": "Report Description",
-  "API_REGISTERY": "Api Registery",
-  "API_REGISTERY_DESCRIPTION": "Api Registery Description",
-  "ACTIVE": "Active",
-  "FOLDER_NAME": "Folder Name",
-  "ACTION": "Action",
-  "SET_UP": "Set Up",
-  "USERS_PER_PAGE": "Users per page",
-  "OF": "of",
-  "USERS": "users",
-  "ARE_YOU_SURE": "Are you sure you want to delete?",
-  "CANCEL": "Cancel",
-  "GO_TO": "Go To",
-  "ALL_REPORTS": "All Reports",
-  "ALL_REPORT": "All Report",
-  "REPORT_BUILDER_SQL": "Report Builder (SQL)",
-  "REPORT_BUILDER_URL": "Report Builder (URL)",
-  "LOADING_MESSAGE": "Dashboard could be found. Loading..",
-  "START_FROM_SCRATCH": "Start from scratch",
-  "IMPORT_TEMPLATE": "Import from a template",
-  "IMPORT_PUBLIC_PROJECT": "Import from public project",
-  "DELETE_CONFIRMATION": "Are You Sure Want to delete?",
-  "LAST_UPDATED_ON": "Last Updated On:",
-  "CREATE_NEW_REPORT": "Create New Report",
-  "ADD_MODE": "Add Mode",
-  "ENTER_NAME": "Enter name",
-  "DESCRIPTION": "Description",
-  "ENTER_DESCRIPTION": "Enter Description",
-  "SUBMIT": "Submit",
-  "home": "Home",
+  
+    "SEQ_GENERATOR": "Sequence Generator",
+    "CURRENT_NO": "Current No",
+    "NAME": "Name",
+    "PREFIX": "Prefix",
+    "SEPARATOR": "Separator",
+    "SEQUENCE_SIZE": "Sequence Size",
+    "REPORT": "Report",
+    "REPORT_RUNNER": "Report Runner",
+ 
+    "REPORT_NAME": "Report Name",
+    "REPORT_DESCRIPTION": "Report Description",
+    "ACTIVE": "Active",
+    "FOLDER_NAME": "Folder Name",
+    "ACTION": "Action",
+    "SET_UP": "Set Up",
+   
+    "USERS_PER_PAGE": "Users per page",
+    "OF": "of",
+    "USERS": "users",
+    "ARE_YOU_SURE": "Are you sure you want to delete?",
+    "CANCEL": "Cancel",
+    "GO_TO": "Go To",
+    "ALL_REPORTS": "All Reports",
+    "ALL_REPORT": "All Report",
+    "REPORT_BUILDER_SQL": "Report Builder (SQL)",
+    "REPORT_BUILDER_URL": "Report Builder (URL)",
+    "LOADING_MESSAGE": "Dashboard could be found. Loading..",
+    "START_FROM_SCRATCH": "Start from scratch",
+    "IMPORT_TEMPLATE": "Import from a template",
+    "IMPORT_PUBLIC_PROJECT": "Import from public project",
+    "DELETE_CONFIRMATION": "Are You Sure Want to delete?",
+    
+    "LAST_UPDATED_ON": "Last Updated On:",
+    "CREATE_NEW_REPORT": "Create New Report",
+    "ADD_MODE": "Add Mode",
+    
+    "ENTER_NAME": "Enter name",
+    "DESCRIPTION": "Description",
+    "ENTER_DESCRIPTION": "Enter Description",
+   
+    "SUBMIT": "Submit",
+    "home": "Home",
   "dashboard": "Dashboard",
   "all_dashboard": "All Dashboard",
   "dashboard_builder": "Dashboard Builder",
@@ -203,8 +211,10 @@
   "GROUP_LEVEL": "Group Level",
   "STATUS": "Status",
   "UPDATED_DATE": "Updated Date",
+
   "RECORDS_PER_PAGE": "Record per page",
   "IMPORT_FILE": "Import File",
+  
   "UPDATE": "Update",
   "ARE_YOU_SURE_DELETE": "Are You Sure Want to delete?",
   "THIS_FIELD_REQUIRED": "*This field is Required",
@@ -216,10 +226,46 @@
   "MENU_ACTION_LINK": "Menu Action Link",
   "STATUS": "Status",
   "SUB_MENU": "Sub Menu",
-  "Stt": "Stt",
+  "bb": "bb",
+  "Radiotest": "Radiotest",
+  "Urltest": "Urltest",
+  "Decimaltest": "Decimaltest",
+  "Description": "Description",
+  "Qrcode": "Qrcode",
+  "Texts": "Texts",
+  "selectstat": "selectstat",
+  "Phonetest": "Phonetest",
+  "Surveyff": "Surveyff",
+  "Value_List_Field": "Value_List_Field",
+  "Passwordss": "Passwordss",
+  "videotest": "videotest",
+  "test1": "test1",
+  "Fileuploadtest": "Fileuploadtest",
+  "Name": "Name",
+  "Names": "Names",
+  "Checkout_Field": "Checkout_Field",
+  "documentss": "documentss",
+  "Toggletest": "Toggletest",
+  "concatination": "concatination",
+  "Child": "Child",
+  "datagggs": "datagggs",
+  "Textareatest": "Textareatest",
+  "aa": "aa",
+  "Datetest": "Datetest",
   "OneToManyExtension": "OneToManyExtension",
-  "studentname": "studentname",
-  "description": "description",
-  "Studenthigh": "Studenthigh",
-  "Name": "Name"
+  "Imageuploadtest": "Imageuploadtest",
+  "Paragraphtest": "Paragraphtest",
+  "Emailtest": "Emailtest",
+  "recaptchass": "recaptchass",
+  "audiotest": "audiotest",
+  "Formb": "Formb",
+  "test2": "test2",
+  "Active": "Active",
+  "Forma": "Forma",
+  "Currencyss": "Currencyss",
+  "Datetimetest": "Datetimetest",
+  "Barcode": "Barcode",
+  "Approved_Field": "Approved_Field",
+  "Numbertest": "Numbertest",
+  "Percentagess": "Percentagess"
 }
\ No newline at end of file