From a0cb3689ec8752e2c42624e1b1a0c80dab23c6a4 Mon Sep 17 00:00:00 2001
From: risadmin_prod <ganeshk@dekatc.com>
Date: Tue, 7 Oct 2025 03:10:56 +0000
Subject: [PATCH] build_app

---
 .../authsec_mysql/mysql/wf_table/wf_table.sql |   34 +
 .../angulardatatype/Ad6/Ad6.component.html    |  543 +++++++
 .../angulardatatype/Ad6/Ad6.component.scss    |   85 +
 .../angulardatatype/Ad6/Ad6.component.ts      |  492 ++++++
 .../angulardatatype/Ad6/Ad6.service.ts        |   56 +
 .../angulardatatype/Ad6/Ad6_cardvariable.ts   |    4 +
 .../angulardatatype/Ad7/Ad7.component.html    |  453 ++++++
 .../angulardatatype/Ad7/Ad7.component.scss    |   85 +
 .../angulardatatype/Ad7/Ad7.component.ts      |  387 +++++
 .../angulardatatype/Ad7/Ad7.service.ts        |   49 +
 .../angulardatatype/Ad7/Ad7_cardvariable.ts   |    4 +
 .../angulardatatype/Ad8/Ad8.component.html    |  619 ++++++++
 .../angulardatatype/Ad8/Ad8.component.scss    |   85 +
 .../angulardatatype/Ad8/Ad8.component.ts      |  478 ++++++
 .../angulardatatype/Ad8/Ad8.service.ts        |   53 +
 .../angulardatatype/Ad8/Ad8_cardvariable.ts   |    4 +
 .../angulardatatype/Ad9/Ad9.component.html    |  420 +++++
 .../angulardatatype/Ad9/Ad9.component.scss    |   85 +
 .../angulardatatype/Ad9/Ad9.component.ts      |  282 ++++
 .../angulardatatype/Ad9/Ad9.service.ts        |   40 +
 .../angulardatatype/Ad9/Ad9_cardvariable.ts   |    4 +
 .../angulardatatype/Adv1/Adv1.component.html  | 1380 +++++++++++++++++
 .../angulardatatype/Adv1/Adv1.component.scss  |   85 +
 .../angulardatatype/Adv1/Adv1.component.ts    |  957 ++++++++++++
 .../angulardatatype/Adv1/Adv1.service.ts      |  161 ++
 .../angulardatatype/Adv1/Adv1_cardvariable.ts |    4 +
 .../angulardatatype/Adv3/Adv3.component.html  |  898 +++++++++++
 .../angulardatatype/Adv3/Adv3.component.scss  |   85 +
 .../angulardatatype/Adv3/Adv3.component.ts    |  777 ++++++++++
 .../angulardatatype/Adv3/Adv3.service.ts      |   63 +
 .../angulardatatype/Adv3/Adv3_cardvariable.ts |    4 +
 .../angulardatatype/Adv4/Adv4.component.html  |  623 ++++++++
 .../angulardatatype/Adv4/Adv4.component.scss  |   85 +
 .../angulardatatype/Adv4/Adv4.component.ts    |  395 +++++
 .../angulardatatype/Adv4/Adv4.service.ts      |   45 +
 .../angulardatatype/Adv4/Adv4_cardvariable.ts |    4 +
 .../angulardatatype/Adv5/Adv5.component.html  |  787 ++++++++++
 .../angulardatatype/Adv5/Adv5.component.scss  |   85 +
 .../angulardatatype/Adv5/Adv5.component.ts    |  851 ++++++++++
 .../angulardatatype/Adv5/Adv5.service.ts      |   51 +
 .../angulardatatype/Adv5/Adv5_cardvariable.ts |    4 +
 .../Basicp1/Basicp1.component.html            |  679 ++++++++
 .../Basicp1/Basicp1.component.scss            |   85 +
 .../Basicp1/Basicp1.component.ts              |  533 +++++++
 .../Basicp1/Basicp1.service.ts                |   57 +
 .../Basicp1/Basicp1_cardvariable.ts           |    4 +
 .../Basicp2/Basicp2.component.html            |  560 +++++++
 .../Basicp2/Basicp2.component.scss            |   85 +
 .../Basicp2/Basicp2.component.ts              |  425 +++++
 .../Basicp2/Basicp2.service.ts                |   51 +
 .../Basicp2/Basicp2_cardvariable.ts           |    4 +
 .../Basicp3/Basicp3.component.html            |  627 ++++++++
 .../Basicp3/Basicp3.component.scss            |   85 +
 .../Basicp3/Basicp3.component.ts              |  517 ++++++
 .../Basicp3/Basicp3.service.ts                |   55 +
 .../Basicp3/Basicp3_cardvariable.ts           |    4 +
 .../angulardatatype/Dv2/Dv2.component.html    |  688 ++++++++
 .../angulardatatype/Dv2/Dv2.component.scss    |   85 +
 .../angulardatatype/Dv2/Dv2.component.ts      |  471 ++++++
 .../angulardatatype/Dv2/Dv2.service.ts        |   51 +
 .../angulardatatype/Dv2/Dv2_cardvariable.ts   |    4 +
 .../Support/Support.component.html            |  349 +++++
 .../Support/Support.component.scss            |   85 +
 .../Support/Support.component.ts              |  251 +++
 .../Support/Support.service.ts                |   37 +
 .../Support/Support_cardvariable.ts           |    4 +
 .../stpkg/Childform/Childform.component.html  |  376 +++++
 .../stpkg/Childform/Childform.component.scss  |   85 +
 .../stpkg/Childform/Childform.component.ts    |  275 ++++
 .../stpkg/Childform/Childform.service.ts      |   39 +
 .../stpkg/Childform/Childform_cardvariable.ts |    4 +
 .../testdata/Country/Country.component.html   |  376 +++++
 .../testdata/Country/Country.component.scss   |   85 +
 .../testdata/Country/Country.component.ts     |  275 ++++
 .../testdata/Country/Country.service.ts       |   39 +
 .../testdata/Country/Country_cardvariable.ts  |    4 +
 .../testdata/District/District.component.html |  405 +++++
 .../testdata/District/District.component.scss |   85 +
 .../testdata/District/District.component.ts   |  299 ++++
 .../testdata/District/District.service.ts     |   41 +
 .../District/District_cardvariable.ts         |    4 +
 .../testdata/State/State.component.html       |  405 +++++
 .../testdata/State/State.component.scss       |   85 +
 .../testdata/State/State.component.ts         |  299 ++++
 .../testdata/State/State.service.ts           |   41 +
 .../testdata/State/State_cardvariable.ts      |    4 +
 .../app/modules/main/main-routing.module.ts   |   68 +
 .../src/app/modules/main/main.module.ts       |   68 +
 .../src/assets/i18n/en.json                   |   52 +-
 .../Builders/Services/BuilderService.java     |   51 +
 .../Controllers/Ad6Controller.java            |  115 ++
 .../Controllers/Ad7Controller.java            |  113 ++
 .../Controllers/Ad8Controller.java            |  131 ++
 .../Controllers/Ad9Controller.java            |   91 ++
 .../Controllers/Adv1Controller.java           |  171 ++
 .../Controllers/Adv3Controller.java           |  163 ++
 .../Controllers/Adv4Controller.java           |  123 ++
 .../Controllers/Adv5Controller.java           |  147 ++
 .../Controllers/Basicp1Controller.java        |  171 ++
 .../Controllers/Basicp2Controller.java        |  147 ++
 .../Controllers/Basicp3Controller.java        |  163 ++
 .../Controllers/Basicp3InsertController2.java |   21 +
 .../ChildformUpdateController3.java           |   23 +
 .../District_ListFilter1Controller.java       |   24 +
 .../Controllers/Dv2Controller.java            |  147 ++
 .../State_ListFilter1Controller.java          |   24 +
 .../Controllers/SupportController.java        |   91 ++
 .../Controllers/SupportInsertController3.java |   21 +
 .../Controllers/SupportUpdateController2.java |   23 +
 .../Controllers/tokenFree_Ad6Controller.java  |  115 ++
 .../Controllers/tokenFree_Ad7Controller.java  |  113 ++
 .../Controllers/tokenFree_Ad8Controller.java  |  131 ++
 .../Controllers/tokenFree_Ad9Controller.java  |   91 ++
 .../Controllers/tokenFree_Adv1Controller.java |  171 ++
 .../Controllers/tokenFree_Adv3Controller.java |  163 ++
 .../Controllers/tokenFree_Adv4Controller.java |  123 ++
 .../Controllers/tokenFree_Adv5Controller.java |  147 ++
 .../tokenFree_Basicp1Controller.java          |  171 ++
 .../tokenFree_Basicp2Controller.java          |  147 ++
 .../tokenFree_Basicp3Controller.java          |  163 ++
 ...enFree_District_ListFilter1Controller.java |   24 +
 .../Controllers/tokenFree_Dv2Controller.java  |  147 ++
 ...tokenFree_State_ListFilter1Controller.java |   24 +
 .../tokenFree_SupportController.java          |   91 ++
 .../realnet/angulardatatype/Entity/Ad6.java   |   49 +
 .../realnet/angulardatatype/Entity/Ad7.java   |   32 +
 .../realnet/angulardatatype/Entity/Ad8.java   |   42 +
 .../realnet/angulardatatype/Entity/Ad9.java   |   28 +
 .../realnet/angulardatatype/Entity/Adv1.java  |   98 ++
 .../realnet/angulardatatype/Entity/Adv3.java  |   66 +
 .../realnet/angulardatatype/Entity/Adv4.java  |   48 +
 .../realnet/angulardatatype/Entity/Adv5.java  |   58 +
 .../angulardatatype/Entity/Basicp1.java       |   77 +
 .../angulardatatype/Entity/Basicp2.java       |   59 +
 .../angulardatatype/Entity/Basicp3.java       |   64 +
 .../Entity/District_ListFilter1.java          |   14 +
 .../realnet/angulardatatype/Entity/Dv2.java   |   78 +
 .../Entity/State_ListFilter1.java             |   14 +
 .../angulardatatype/Entity/Support.java       |   29 +
 .../Repository/Ad6Repository.java             |   34 +
 .../Repository/Ad7Repository.java             |   30 +
 .../Repository/Ad8Repository.java             |   34 +
 .../Repository/Ad9Repository.java             |   28 +
 .../Repository/Adv1Repository.java            |   48 +
 .../Repository/Adv3Repository.java            |   46 +
 .../Repository/Adv4Repository.java            |   36 +
 .../Repository/Adv5Repository.java            |   42 +
 .../Repository/Basicp1Repository.java         |   48 +
 .../Repository/Basicp2Repository.java         |   42 +
 .../Repository/Basicp3Repository.java         |   46 +
 .../Repository/Dv2Repository.java             |   42 +
 .../Repository/SupportRepository.java         |   28 +
 .../angulardatatype/Services/Ad6Service.java  |  142 ++
 .../angulardatatype/Services/Ad7Service.java  |  129 ++
 .../angulardatatype/Services/Ad8Service.java  |  185 +++
 .../angulardatatype/Services/Ad9Service.java  |   83 +
 .../angulardatatype/Services/Adv1Service.java |  207 +++
 .../angulardatatype/Services/Adv3Service.java |  236 +++
 .../angulardatatype/Services/Adv4Service.java |  171 ++
 .../angulardatatype/Services/Adv5Service.java |  153 ++
 .../Services/Basicp1Service.java              |  183 +++
 .../Services/Basicp2Service.java              |  154 ++
 .../Services/Basicp3InsertService2.java       |   31 +
 .../Services/Basicp3Service.java              |  174 +++
 .../Services/ChildformUpdateService3.java     |   42 +
 .../Services/District_ListFilter1Service.java |   57 +
 .../angulardatatype/Services/Dv2Service.java  |  188 +++
 .../Services/State_ListFilter1Service.java    |   57 +
 .../Services/SupportInsertService3.java       |   31 +
 .../Services/SupportService.java              |   83 +
 .../Services/SupportUpdateService2.java       |   41 +
 .../Controllers/ChildformController.java      |   99 ++
 .../tokenFree_ChildformController.java        |   99 ++
 .../com/realnet/stpkg/Entity/Childform.java   |   33 +
 .../stpkg/Repository/ChildformRepository.java |   30 +
 .../stpkg/Services/ChildformService.java      |   93 ++
 .../Controllers/CountryController.java        |   99 ++
 .../Country_ListFilter1Controller.java        |   24 +
 .../Controllers/DistrictController.java       |  107 ++
 .../testdata/Controllers/StateController.java |  107 ++
 .../tokenFree_CountryController.java          |   99 ++
 ...kenFree_Country_ListFilter1Controller.java |   24 +
 .../tokenFree_DistrictController.java         |  107 ++
 .../tokenFree_StateController.java            |  107 ++
 .../com/realnet/testdata/Entity/Country.java  |   33 +
 .../testdata/Entity/Country_ListFilter1.java  |   15 +
 .../com/realnet/testdata/Entity/District.java |   37 +
 .../com/realnet/testdata/Entity/State.java    |   37 +
 .../Repository/CountryRepository.java         |   30 +
 .../Repository/DistrictRepository.java        |   32 +
 .../testdata/Repository/StateRepository.java  |   32 +
 .../testdata/Services/CountryService.java     |   93 ++
 .../Services/Country_ListFilter1Service.java  |   53 +
 .../testdata/Services/DistrictService.java    |  103 ++
 .../testdata/Services/StateService.java       |  103 ++
 195 files changed, 29756 insertions(+), 44 deletions(-)
 create mode 100755 test7oct-dbtdt-d/authsec_mysql/mysql/wf_table/wf_table.sql
 create mode 100644 test7oct-demot1-f/authsec_angular/frontend/angular-clarity-master/src/app/modules/main/BuilderComponents/angulardatatype/Ad6/Ad6.component.html
 create mode 100644 test7oct-demot1-f/authsec_angular/frontend/angular-clarity-master/src/app/modules/main/BuilderComponents/angulardatatype/Ad6/Ad6.component.scss
 create mode 100644 test7oct-demot1-f/authsec_angular/frontend/angular-clarity-master/src/app/modules/main/BuilderComponents/angulardatatype/Ad6/Ad6.component.ts
 create mode 100644 test7oct-demot1-f/authsec_angular/frontend/angular-clarity-master/src/app/modules/main/BuilderComponents/angulardatatype/Ad6/Ad6.service.ts
 create mode 100644 test7oct-demot1-f/authsec_angular/frontend/angular-clarity-master/src/app/modules/main/BuilderComponents/angulardatatype/Ad6/Ad6_cardvariable.ts
 create mode 100644 test7oct-demot1-f/authsec_angular/frontend/angular-clarity-master/src/app/modules/main/BuilderComponents/angulardatatype/Ad7/Ad7.component.html
 create mode 100644 test7oct-demot1-f/authsec_angular/frontend/angular-clarity-master/src/app/modules/main/BuilderComponents/angulardatatype/Ad7/Ad7.component.scss
 create mode 100644 test7oct-demot1-f/authsec_angular/frontend/angular-clarity-master/src/app/modules/main/BuilderComponents/angulardatatype/Ad7/Ad7.component.ts
 create mode 100644 test7oct-demot1-f/authsec_angular/frontend/angular-clarity-master/src/app/modules/main/BuilderComponents/angulardatatype/Ad7/Ad7.service.ts
 create mode 100644 test7oct-demot1-f/authsec_angular/frontend/angular-clarity-master/src/app/modules/main/BuilderComponents/angulardatatype/Ad7/Ad7_cardvariable.ts
 create mode 100644 test7oct-demot1-f/authsec_angular/frontend/angular-clarity-master/src/app/modules/main/BuilderComponents/angulardatatype/Ad8/Ad8.component.html
 create mode 100644 test7oct-demot1-f/authsec_angular/frontend/angular-clarity-master/src/app/modules/main/BuilderComponents/angulardatatype/Ad8/Ad8.component.scss
 create mode 100644 test7oct-demot1-f/authsec_angular/frontend/angular-clarity-master/src/app/modules/main/BuilderComponents/angulardatatype/Ad8/Ad8.component.ts
 create mode 100644 test7oct-demot1-f/authsec_angular/frontend/angular-clarity-master/src/app/modules/main/BuilderComponents/angulardatatype/Ad8/Ad8.service.ts
 create mode 100644 test7oct-demot1-f/authsec_angular/frontend/angular-clarity-master/src/app/modules/main/BuilderComponents/angulardatatype/Ad8/Ad8_cardvariable.ts
 create mode 100644 test7oct-demot1-f/authsec_angular/frontend/angular-clarity-master/src/app/modules/main/BuilderComponents/angulardatatype/Ad9/Ad9.component.html
 create mode 100644 test7oct-demot1-f/authsec_angular/frontend/angular-clarity-master/src/app/modules/main/BuilderComponents/angulardatatype/Ad9/Ad9.component.scss
 create mode 100644 test7oct-demot1-f/authsec_angular/frontend/angular-clarity-master/src/app/modules/main/BuilderComponents/angulardatatype/Ad9/Ad9.component.ts
 create mode 100644 test7oct-demot1-f/authsec_angular/frontend/angular-clarity-master/src/app/modules/main/BuilderComponents/angulardatatype/Ad9/Ad9.service.ts
 create mode 100644 test7oct-demot1-f/authsec_angular/frontend/angular-clarity-master/src/app/modules/main/BuilderComponents/angulardatatype/Ad9/Ad9_cardvariable.ts
 create mode 100644 test7oct-demot1-f/authsec_angular/frontend/angular-clarity-master/src/app/modules/main/BuilderComponents/angulardatatype/Adv1/Adv1.component.html
 create mode 100644 test7oct-demot1-f/authsec_angular/frontend/angular-clarity-master/src/app/modules/main/BuilderComponents/angulardatatype/Adv1/Adv1.component.scss
 create mode 100644 test7oct-demot1-f/authsec_angular/frontend/angular-clarity-master/src/app/modules/main/BuilderComponents/angulardatatype/Adv1/Adv1.component.ts
 create mode 100644 test7oct-demot1-f/authsec_angular/frontend/angular-clarity-master/src/app/modules/main/BuilderComponents/angulardatatype/Adv1/Adv1.service.ts
 create mode 100644 test7oct-demot1-f/authsec_angular/frontend/angular-clarity-master/src/app/modules/main/BuilderComponents/angulardatatype/Adv1/Adv1_cardvariable.ts
 create mode 100644 test7oct-demot1-f/authsec_angular/frontend/angular-clarity-master/src/app/modules/main/BuilderComponents/angulardatatype/Adv3/Adv3.component.html
 create mode 100644 test7oct-demot1-f/authsec_angular/frontend/angular-clarity-master/src/app/modules/main/BuilderComponents/angulardatatype/Adv3/Adv3.component.scss
 create mode 100644 test7oct-demot1-f/authsec_angular/frontend/angular-clarity-master/src/app/modules/main/BuilderComponents/angulardatatype/Adv3/Adv3.component.ts
 create mode 100644 test7oct-demot1-f/authsec_angular/frontend/angular-clarity-master/src/app/modules/main/BuilderComponents/angulardatatype/Adv3/Adv3.service.ts
 create mode 100644 test7oct-demot1-f/authsec_angular/frontend/angular-clarity-master/src/app/modules/main/BuilderComponents/angulardatatype/Adv3/Adv3_cardvariable.ts
 create mode 100644 test7oct-demot1-f/authsec_angular/frontend/angular-clarity-master/src/app/modules/main/BuilderComponents/angulardatatype/Adv4/Adv4.component.html
 create mode 100644 test7oct-demot1-f/authsec_angular/frontend/angular-clarity-master/src/app/modules/main/BuilderComponents/angulardatatype/Adv4/Adv4.component.scss
 create mode 100644 test7oct-demot1-f/authsec_angular/frontend/angular-clarity-master/src/app/modules/main/BuilderComponents/angulardatatype/Adv4/Adv4.component.ts
 create mode 100644 test7oct-demot1-f/authsec_angular/frontend/angular-clarity-master/src/app/modules/main/BuilderComponents/angulardatatype/Adv4/Adv4.service.ts
 create mode 100644 test7oct-demot1-f/authsec_angular/frontend/angular-clarity-master/src/app/modules/main/BuilderComponents/angulardatatype/Adv4/Adv4_cardvariable.ts
 create mode 100644 test7oct-demot1-f/authsec_angular/frontend/angular-clarity-master/src/app/modules/main/BuilderComponents/angulardatatype/Adv5/Adv5.component.html
 create mode 100644 test7oct-demot1-f/authsec_angular/frontend/angular-clarity-master/src/app/modules/main/BuilderComponents/angulardatatype/Adv5/Adv5.component.scss
 create mode 100644 test7oct-demot1-f/authsec_angular/frontend/angular-clarity-master/src/app/modules/main/BuilderComponents/angulardatatype/Adv5/Adv5.component.ts
 create mode 100644 test7oct-demot1-f/authsec_angular/frontend/angular-clarity-master/src/app/modules/main/BuilderComponents/angulardatatype/Adv5/Adv5.service.ts
 create mode 100644 test7oct-demot1-f/authsec_angular/frontend/angular-clarity-master/src/app/modules/main/BuilderComponents/angulardatatype/Adv5/Adv5_cardvariable.ts
 create mode 100644 test7oct-demot1-f/authsec_angular/frontend/angular-clarity-master/src/app/modules/main/BuilderComponents/angulardatatype/Basicp1/Basicp1.component.html
 create mode 100644 test7oct-demot1-f/authsec_angular/frontend/angular-clarity-master/src/app/modules/main/BuilderComponents/angulardatatype/Basicp1/Basicp1.component.scss
 create mode 100644 test7oct-demot1-f/authsec_angular/frontend/angular-clarity-master/src/app/modules/main/BuilderComponents/angulardatatype/Basicp1/Basicp1.component.ts
 create mode 100644 test7oct-demot1-f/authsec_angular/frontend/angular-clarity-master/src/app/modules/main/BuilderComponents/angulardatatype/Basicp1/Basicp1.service.ts
 create mode 100644 test7oct-demot1-f/authsec_angular/frontend/angular-clarity-master/src/app/modules/main/BuilderComponents/angulardatatype/Basicp1/Basicp1_cardvariable.ts
 create mode 100644 test7oct-demot1-f/authsec_angular/frontend/angular-clarity-master/src/app/modules/main/BuilderComponents/angulardatatype/Basicp2/Basicp2.component.html
 create mode 100644 test7oct-demot1-f/authsec_angular/frontend/angular-clarity-master/src/app/modules/main/BuilderComponents/angulardatatype/Basicp2/Basicp2.component.scss
 create mode 100644 test7oct-demot1-f/authsec_angular/frontend/angular-clarity-master/src/app/modules/main/BuilderComponents/angulardatatype/Basicp2/Basicp2.component.ts
 create mode 100644 test7oct-demot1-f/authsec_angular/frontend/angular-clarity-master/src/app/modules/main/BuilderComponents/angulardatatype/Basicp2/Basicp2.service.ts
 create mode 100644 test7oct-demot1-f/authsec_angular/frontend/angular-clarity-master/src/app/modules/main/BuilderComponents/angulardatatype/Basicp2/Basicp2_cardvariable.ts
 create mode 100644 test7oct-demot1-f/authsec_angular/frontend/angular-clarity-master/src/app/modules/main/BuilderComponents/angulardatatype/Basicp3/Basicp3.component.html
 create mode 100644 test7oct-demot1-f/authsec_angular/frontend/angular-clarity-master/src/app/modules/main/BuilderComponents/angulardatatype/Basicp3/Basicp3.component.scss
 create mode 100644 test7oct-demot1-f/authsec_angular/frontend/angular-clarity-master/src/app/modules/main/BuilderComponents/angulardatatype/Basicp3/Basicp3.component.ts
 create mode 100644 test7oct-demot1-f/authsec_angular/frontend/angular-clarity-master/src/app/modules/main/BuilderComponents/angulardatatype/Basicp3/Basicp3.service.ts
 create mode 100644 test7oct-demot1-f/authsec_angular/frontend/angular-clarity-master/src/app/modules/main/BuilderComponents/angulardatatype/Basicp3/Basicp3_cardvariable.ts
 create mode 100644 test7oct-demot1-f/authsec_angular/frontend/angular-clarity-master/src/app/modules/main/BuilderComponents/angulardatatype/Dv2/Dv2.component.html
 create mode 100644 test7oct-demot1-f/authsec_angular/frontend/angular-clarity-master/src/app/modules/main/BuilderComponents/angulardatatype/Dv2/Dv2.component.scss
 create mode 100644 test7oct-demot1-f/authsec_angular/frontend/angular-clarity-master/src/app/modules/main/BuilderComponents/angulardatatype/Dv2/Dv2.component.ts
 create mode 100644 test7oct-demot1-f/authsec_angular/frontend/angular-clarity-master/src/app/modules/main/BuilderComponents/angulardatatype/Dv2/Dv2.service.ts
 create mode 100644 test7oct-demot1-f/authsec_angular/frontend/angular-clarity-master/src/app/modules/main/BuilderComponents/angulardatatype/Dv2/Dv2_cardvariable.ts
 create mode 100644 test7oct-demot1-f/authsec_angular/frontend/angular-clarity-master/src/app/modules/main/BuilderComponents/angulardatatype/Support/Support.component.html
 create mode 100644 test7oct-demot1-f/authsec_angular/frontend/angular-clarity-master/src/app/modules/main/BuilderComponents/angulardatatype/Support/Support.component.scss
 create mode 100644 test7oct-demot1-f/authsec_angular/frontend/angular-clarity-master/src/app/modules/main/BuilderComponents/angulardatatype/Support/Support.component.ts
 create mode 100644 test7oct-demot1-f/authsec_angular/frontend/angular-clarity-master/src/app/modules/main/BuilderComponents/angulardatatype/Support/Support.service.ts
 create mode 100644 test7oct-demot1-f/authsec_angular/frontend/angular-clarity-master/src/app/modules/main/BuilderComponents/angulardatatype/Support/Support_cardvariable.ts
 create mode 100644 test7oct-demot1-f/authsec_angular/frontend/angular-clarity-master/src/app/modules/main/BuilderComponents/stpkg/Childform/Childform.component.html
 create mode 100644 test7oct-demot1-f/authsec_angular/frontend/angular-clarity-master/src/app/modules/main/BuilderComponents/stpkg/Childform/Childform.component.scss
 create mode 100644 test7oct-demot1-f/authsec_angular/frontend/angular-clarity-master/src/app/modules/main/BuilderComponents/stpkg/Childform/Childform.component.ts
 create mode 100644 test7oct-demot1-f/authsec_angular/frontend/angular-clarity-master/src/app/modules/main/BuilderComponents/stpkg/Childform/Childform.service.ts
 create mode 100644 test7oct-demot1-f/authsec_angular/frontend/angular-clarity-master/src/app/modules/main/BuilderComponents/stpkg/Childform/Childform_cardvariable.ts
 create mode 100644 test7oct-demot1-f/authsec_angular/frontend/angular-clarity-master/src/app/modules/main/BuilderComponents/testdata/Country/Country.component.html
 create mode 100644 test7oct-demot1-f/authsec_angular/frontend/angular-clarity-master/src/app/modules/main/BuilderComponents/testdata/Country/Country.component.scss
 create mode 100644 test7oct-demot1-f/authsec_angular/frontend/angular-clarity-master/src/app/modules/main/BuilderComponents/testdata/Country/Country.component.ts
 create mode 100644 test7oct-demot1-f/authsec_angular/frontend/angular-clarity-master/src/app/modules/main/BuilderComponents/testdata/Country/Country.service.ts
 create mode 100644 test7oct-demot1-f/authsec_angular/frontend/angular-clarity-master/src/app/modules/main/BuilderComponents/testdata/Country/Country_cardvariable.ts
 create mode 100644 test7oct-demot1-f/authsec_angular/frontend/angular-clarity-master/src/app/modules/main/BuilderComponents/testdata/District/District.component.html
 create mode 100644 test7oct-demot1-f/authsec_angular/frontend/angular-clarity-master/src/app/modules/main/BuilderComponents/testdata/District/District.component.scss
 create mode 100644 test7oct-demot1-f/authsec_angular/frontend/angular-clarity-master/src/app/modules/main/BuilderComponents/testdata/District/District.component.ts
 create mode 100644 test7oct-demot1-f/authsec_angular/frontend/angular-clarity-master/src/app/modules/main/BuilderComponents/testdata/District/District.service.ts
 create mode 100644 test7oct-demot1-f/authsec_angular/frontend/angular-clarity-master/src/app/modules/main/BuilderComponents/testdata/District/District_cardvariable.ts
 create mode 100644 test7oct-demot1-f/authsec_angular/frontend/angular-clarity-master/src/app/modules/main/BuilderComponents/testdata/State/State.component.html
 create mode 100644 test7oct-demot1-f/authsec_angular/frontend/angular-clarity-master/src/app/modules/main/BuilderComponents/testdata/State/State.component.scss
 create mode 100644 test7oct-demot1-f/authsec_angular/frontend/angular-clarity-master/src/app/modules/main/BuilderComponents/testdata/State/State.component.ts
 create mode 100644 test7oct-demot1-f/authsec_angular/frontend/angular-clarity-master/src/app/modules/main/BuilderComponents/testdata/State/State.service.ts
 create mode 100644 test7oct-demot1-f/authsec_angular/frontend/angular-clarity-master/src/app/modules/main/BuilderComponents/testdata/State/State_cardvariable.ts
 create mode 100644 test7oct-test2-b/authsec_springboot/backend/src/main/java/com/realnet/angulardatatype/Controllers/Ad6Controller.java
 create mode 100644 test7oct-test2-b/authsec_springboot/backend/src/main/java/com/realnet/angulardatatype/Controllers/Ad7Controller.java
 create mode 100644 test7oct-test2-b/authsec_springboot/backend/src/main/java/com/realnet/angulardatatype/Controllers/Ad8Controller.java
 create mode 100644 test7oct-test2-b/authsec_springboot/backend/src/main/java/com/realnet/angulardatatype/Controllers/Ad9Controller.java
 create mode 100644 test7oct-test2-b/authsec_springboot/backend/src/main/java/com/realnet/angulardatatype/Controllers/Adv1Controller.java
 create mode 100644 test7oct-test2-b/authsec_springboot/backend/src/main/java/com/realnet/angulardatatype/Controllers/Adv3Controller.java
 create mode 100644 test7oct-test2-b/authsec_springboot/backend/src/main/java/com/realnet/angulardatatype/Controllers/Adv4Controller.java
 create mode 100644 test7oct-test2-b/authsec_springboot/backend/src/main/java/com/realnet/angulardatatype/Controllers/Adv5Controller.java
 create mode 100644 test7oct-test2-b/authsec_springboot/backend/src/main/java/com/realnet/angulardatatype/Controllers/Basicp1Controller.java
 create mode 100644 test7oct-test2-b/authsec_springboot/backend/src/main/java/com/realnet/angulardatatype/Controllers/Basicp2Controller.java
 create mode 100644 test7oct-test2-b/authsec_springboot/backend/src/main/java/com/realnet/angulardatatype/Controllers/Basicp3Controller.java
 create mode 100644 test7oct-test2-b/authsec_springboot/backend/src/main/java/com/realnet/angulardatatype/Controllers/Basicp3InsertController2.java
 create mode 100644 test7oct-test2-b/authsec_springboot/backend/src/main/java/com/realnet/angulardatatype/Controllers/ChildformUpdateController3.java
 create mode 100644 test7oct-test2-b/authsec_springboot/backend/src/main/java/com/realnet/angulardatatype/Controllers/District_ListFilter1Controller.java
 create mode 100644 test7oct-test2-b/authsec_springboot/backend/src/main/java/com/realnet/angulardatatype/Controllers/Dv2Controller.java
 create mode 100644 test7oct-test2-b/authsec_springboot/backend/src/main/java/com/realnet/angulardatatype/Controllers/State_ListFilter1Controller.java
 create mode 100644 test7oct-test2-b/authsec_springboot/backend/src/main/java/com/realnet/angulardatatype/Controllers/SupportController.java
 create mode 100644 test7oct-test2-b/authsec_springboot/backend/src/main/java/com/realnet/angulardatatype/Controllers/SupportInsertController3.java
 create mode 100644 test7oct-test2-b/authsec_springboot/backend/src/main/java/com/realnet/angulardatatype/Controllers/SupportUpdateController2.java
 create mode 100644 test7oct-test2-b/authsec_springboot/backend/src/main/java/com/realnet/angulardatatype/Controllers/tokenFree_Ad6Controller.java
 create mode 100644 test7oct-test2-b/authsec_springboot/backend/src/main/java/com/realnet/angulardatatype/Controllers/tokenFree_Ad7Controller.java
 create mode 100644 test7oct-test2-b/authsec_springboot/backend/src/main/java/com/realnet/angulardatatype/Controllers/tokenFree_Ad8Controller.java
 create mode 100644 test7oct-test2-b/authsec_springboot/backend/src/main/java/com/realnet/angulardatatype/Controllers/tokenFree_Ad9Controller.java
 create mode 100644 test7oct-test2-b/authsec_springboot/backend/src/main/java/com/realnet/angulardatatype/Controllers/tokenFree_Adv1Controller.java
 create mode 100644 test7oct-test2-b/authsec_springboot/backend/src/main/java/com/realnet/angulardatatype/Controllers/tokenFree_Adv3Controller.java
 create mode 100644 test7oct-test2-b/authsec_springboot/backend/src/main/java/com/realnet/angulardatatype/Controllers/tokenFree_Adv4Controller.java
 create mode 100644 test7oct-test2-b/authsec_springboot/backend/src/main/java/com/realnet/angulardatatype/Controllers/tokenFree_Adv5Controller.java
 create mode 100644 test7oct-test2-b/authsec_springboot/backend/src/main/java/com/realnet/angulardatatype/Controllers/tokenFree_Basicp1Controller.java
 create mode 100644 test7oct-test2-b/authsec_springboot/backend/src/main/java/com/realnet/angulardatatype/Controllers/tokenFree_Basicp2Controller.java
 create mode 100644 test7oct-test2-b/authsec_springboot/backend/src/main/java/com/realnet/angulardatatype/Controllers/tokenFree_Basicp3Controller.java
 create mode 100644 test7oct-test2-b/authsec_springboot/backend/src/main/java/com/realnet/angulardatatype/Controllers/tokenFree_District_ListFilter1Controller.java
 create mode 100644 test7oct-test2-b/authsec_springboot/backend/src/main/java/com/realnet/angulardatatype/Controllers/tokenFree_Dv2Controller.java
 create mode 100644 test7oct-test2-b/authsec_springboot/backend/src/main/java/com/realnet/angulardatatype/Controllers/tokenFree_State_ListFilter1Controller.java
 create mode 100644 test7oct-test2-b/authsec_springboot/backend/src/main/java/com/realnet/angulardatatype/Controllers/tokenFree_SupportController.java
 create mode 100644 test7oct-test2-b/authsec_springboot/backend/src/main/java/com/realnet/angulardatatype/Entity/Ad6.java
 create mode 100644 test7oct-test2-b/authsec_springboot/backend/src/main/java/com/realnet/angulardatatype/Entity/Ad7.java
 create mode 100644 test7oct-test2-b/authsec_springboot/backend/src/main/java/com/realnet/angulardatatype/Entity/Ad8.java
 create mode 100644 test7oct-test2-b/authsec_springboot/backend/src/main/java/com/realnet/angulardatatype/Entity/Ad9.java
 create mode 100644 test7oct-test2-b/authsec_springboot/backend/src/main/java/com/realnet/angulardatatype/Entity/Adv1.java
 create mode 100644 test7oct-test2-b/authsec_springboot/backend/src/main/java/com/realnet/angulardatatype/Entity/Adv3.java
 create mode 100644 test7oct-test2-b/authsec_springboot/backend/src/main/java/com/realnet/angulardatatype/Entity/Adv4.java
 create mode 100644 test7oct-test2-b/authsec_springboot/backend/src/main/java/com/realnet/angulardatatype/Entity/Adv5.java
 create mode 100644 test7oct-test2-b/authsec_springboot/backend/src/main/java/com/realnet/angulardatatype/Entity/Basicp1.java
 create mode 100644 test7oct-test2-b/authsec_springboot/backend/src/main/java/com/realnet/angulardatatype/Entity/Basicp2.java
 create mode 100644 test7oct-test2-b/authsec_springboot/backend/src/main/java/com/realnet/angulardatatype/Entity/Basicp3.java
 create mode 100644 test7oct-test2-b/authsec_springboot/backend/src/main/java/com/realnet/angulardatatype/Entity/District_ListFilter1.java
 create mode 100644 test7oct-test2-b/authsec_springboot/backend/src/main/java/com/realnet/angulardatatype/Entity/Dv2.java
 create mode 100644 test7oct-test2-b/authsec_springboot/backend/src/main/java/com/realnet/angulardatatype/Entity/State_ListFilter1.java
 create mode 100644 test7oct-test2-b/authsec_springboot/backend/src/main/java/com/realnet/angulardatatype/Entity/Support.java
 create mode 100644 test7oct-test2-b/authsec_springboot/backend/src/main/java/com/realnet/angulardatatype/Repository/Ad6Repository.java
 create mode 100644 test7oct-test2-b/authsec_springboot/backend/src/main/java/com/realnet/angulardatatype/Repository/Ad7Repository.java
 create mode 100644 test7oct-test2-b/authsec_springboot/backend/src/main/java/com/realnet/angulardatatype/Repository/Ad8Repository.java
 create mode 100644 test7oct-test2-b/authsec_springboot/backend/src/main/java/com/realnet/angulardatatype/Repository/Ad9Repository.java
 create mode 100644 test7oct-test2-b/authsec_springboot/backend/src/main/java/com/realnet/angulardatatype/Repository/Adv1Repository.java
 create mode 100644 test7oct-test2-b/authsec_springboot/backend/src/main/java/com/realnet/angulardatatype/Repository/Adv3Repository.java
 create mode 100644 test7oct-test2-b/authsec_springboot/backend/src/main/java/com/realnet/angulardatatype/Repository/Adv4Repository.java
 create mode 100644 test7oct-test2-b/authsec_springboot/backend/src/main/java/com/realnet/angulardatatype/Repository/Adv5Repository.java
 create mode 100644 test7oct-test2-b/authsec_springboot/backend/src/main/java/com/realnet/angulardatatype/Repository/Basicp1Repository.java
 create mode 100644 test7oct-test2-b/authsec_springboot/backend/src/main/java/com/realnet/angulardatatype/Repository/Basicp2Repository.java
 create mode 100644 test7oct-test2-b/authsec_springboot/backend/src/main/java/com/realnet/angulardatatype/Repository/Basicp3Repository.java
 create mode 100644 test7oct-test2-b/authsec_springboot/backend/src/main/java/com/realnet/angulardatatype/Repository/Dv2Repository.java
 create mode 100644 test7oct-test2-b/authsec_springboot/backend/src/main/java/com/realnet/angulardatatype/Repository/SupportRepository.java
 create mode 100644 test7oct-test2-b/authsec_springboot/backend/src/main/java/com/realnet/angulardatatype/Services/Ad6Service.java
 create mode 100644 test7oct-test2-b/authsec_springboot/backend/src/main/java/com/realnet/angulardatatype/Services/Ad7Service.java
 create mode 100644 test7oct-test2-b/authsec_springboot/backend/src/main/java/com/realnet/angulardatatype/Services/Ad8Service.java
 create mode 100644 test7oct-test2-b/authsec_springboot/backend/src/main/java/com/realnet/angulardatatype/Services/Ad9Service.java
 create mode 100644 test7oct-test2-b/authsec_springboot/backend/src/main/java/com/realnet/angulardatatype/Services/Adv1Service.java
 create mode 100644 test7oct-test2-b/authsec_springboot/backend/src/main/java/com/realnet/angulardatatype/Services/Adv3Service.java
 create mode 100644 test7oct-test2-b/authsec_springboot/backend/src/main/java/com/realnet/angulardatatype/Services/Adv4Service.java
 create mode 100644 test7oct-test2-b/authsec_springboot/backend/src/main/java/com/realnet/angulardatatype/Services/Adv5Service.java
 create mode 100644 test7oct-test2-b/authsec_springboot/backend/src/main/java/com/realnet/angulardatatype/Services/Basicp1Service.java
 create mode 100644 test7oct-test2-b/authsec_springboot/backend/src/main/java/com/realnet/angulardatatype/Services/Basicp2Service.java
 create mode 100644 test7oct-test2-b/authsec_springboot/backend/src/main/java/com/realnet/angulardatatype/Services/Basicp3InsertService2.java
 create mode 100644 test7oct-test2-b/authsec_springboot/backend/src/main/java/com/realnet/angulardatatype/Services/Basicp3Service.java
 create mode 100644 test7oct-test2-b/authsec_springboot/backend/src/main/java/com/realnet/angulardatatype/Services/ChildformUpdateService3.java
 create mode 100644 test7oct-test2-b/authsec_springboot/backend/src/main/java/com/realnet/angulardatatype/Services/District_ListFilter1Service.java
 create mode 100644 test7oct-test2-b/authsec_springboot/backend/src/main/java/com/realnet/angulardatatype/Services/Dv2Service.java
 create mode 100644 test7oct-test2-b/authsec_springboot/backend/src/main/java/com/realnet/angulardatatype/Services/State_ListFilter1Service.java
 create mode 100644 test7oct-test2-b/authsec_springboot/backend/src/main/java/com/realnet/angulardatatype/Services/SupportInsertService3.java
 create mode 100644 test7oct-test2-b/authsec_springboot/backend/src/main/java/com/realnet/angulardatatype/Services/SupportService.java
 create mode 100644 test7oct-test2-b/authsec_springboot/backend/src/main/java/com/realnet/angulardatatype/Services/SupportUpdateService2.java
 create mode 100644 test7oct-test2-b/authsec_springboot/backend/src/main/java/com/realnet/stpkg/Controllers/ChildformController.java
 create mode 100644 test7oct-test2-b/authsec_springboot/backend/src/main/java/com/realnet/stpkg/Controllers/tokenFree_ChildformController.java
 create mode 100644 test7oct-test2-b/authsec_springboot/backend/src/main/java/com/realnet/stpkg/Entity/Childform.java
 create mode 100644 test7oct-test2-b/authsec_springboot/backend/src/main/java/com/realnet/stpkg/Repository/ChildformRepository.java
 create mode 100644 test7oct-test2-b/authsec_springboot/backend/src/main/java/com/realnet/stpkg/Services/ChildformService.java
 create mode 100644 test7oct-test2-b/authsec_springboot/backend/src/main/java/com/realnet/testdata/Controllers/CountryController.java
 create mode 100644 test7oct-test2-b/authsec_springboot/backend/src/main/java/com/realnet/testdata/Controllers/Country_ListFilter1Controller.java
 create mode 100644 test7oct-test2-b/authsec_springboot/backend/src/main/java/com/realnet/testdata/Controllers/DistrictController.java
 create mode 100644 test7oct-test2-b/authsec_springboot/backend/src/main/java/com/realnet/testdata/Controllers/StateController.java
 create mode 100644 test7oct-test2-b/authsec_springboot/backend/src/main/java/com/realnet/testdata/Controllers/tokenFree_CountryController.java
 create mode 100644 test7oct-test2-b/authsec_springboot/backend/src/main/java/com/realnet/testdata/Controllers/tokenFree_Country_ListFilter1Controller.java
 create mode 100644 test7oct-test2-b/authsec_springboot/backend/src/main/java/com/realnet/testdata/Controllers/tokenFree_DistrictController.java
 create mode 100644 test7oct-test2-b/authsec_springboot/backend/src/main/java/com/realnet/testdata/Controllers/tokenFree_StateController.java
 create mode 100644 test7oct-test2-b/authsec_springboot/backend/src/main/java/com/realnet/testdata/Entity/Country.java
 create mode 100644 test7oct-test2-b/authsec_springboot/backend/src/main/java/com/realnet/testdata/Entity/Country_ListFilter1.java
 create mode 100644 test7oct-test2-b/authsec_springboot/backend/src/main/java/com/realnet/testdata/Entity/District.java
 create mode 100644 test7oct-test2-b/authsec_springboot/backend/src/main/java/com/realnet/testdata/Entity/State.java
 create mode 100644 test7oct-test2-b/authsec_springboot/backend/src/main/java/com/realnet/testdata/Repository/CountryRepository.java
 create mode 100644 test7oct-test2-b/authsec_springboot/backend/src/main/java/com/realnet/testdata/Repository/DistrictRepository.java
 create mode 100644 test7oct-test2-b/authsec_springboot/backend/src/main/java/com/realnet/testdata/Repository/StateRepository.java
 create mode 100644 test7oct-test2-b/authsec_springboot/backend/src/main/java/com/realnet/testdata/Services/CountryService.java
 create mode 100644 test7oct-test2-b/authsec_springboot/backend/src/main/java/com/realnet/testdata/Services/Country_ListFilter1Service.java
 create mode 100644 test7oct-test2-b/authsec_springboot/backend/src/main/java/com/realnet/testdata/Services/DistrictService.java
 create mode 100644 test7oct-test2-b/authsec_springboot/backend/src/main/java/com/realnet/testdata/Services/StateService.java

diff --git a/test7oct-dbtdt-d/authsec_mysql/mysql/wf_table/wf_table.sql b/test7oct-dbtdt-d/authsec_mysql/mysql/wf_table/wf_table.sql
new file mode 100755
index 0000000..fc5665d
--- /dev/null
+++ b/test7oct-dbtdt-d/authsec_mysql/mysql/wf_table/wf_table.sql
@@ -0,0 +1,34 @@
+CREATE TABLE dbtdt.Basicp1(id BIGINT NOT NULL AUTO_INCREMENT, textarea_field VARCHAR(400), paragraph_field VARCHAR(400), textarea VARCHAR(400), paragraph_field2 VARCHAR(400), phone_number2 VARCHAR(400), name VARCHAR(400), number1 int, phone_number VARCHAR(400), number2 int, name2 VARCHAR(400), password_field VARCHAR(400), textarea_field2 VARCHAR(400),  PRIMARY KEY (id));
+
+CREATE TABLE dbtdt.Basicp2(id BIGINT NOT NULL AUTO_INCREMENT, datetime_field2 VARCHAR(400), about VARCHAR(400), datetime_field VARCHAR(400), userid_field VARCHAR(400), email_field2 VARCHAR(400), date_field Date, email_field VARCHAR(400), textarea2 VARCHAR(400), date_field2 Date,  PRIMARY KEY (id));
+
+CREATE TABLE dbtdt.Basicp3(id BIGINT NOT NULL AUTO_INCREMENT, toggle_switch2 VARCHAR(400), decimal_field2 double, documentsequenc VARCHAR(400), toggle_switch VARCHAR(400), recaptcha VARCHAR(400), percentage_field int, percentage_field2 int, url_field VARCHAR(400), url_field2 VARCHAR(400), decimal_field double, recaptcha2 VARCHAR(400),  PRIMARY KEY (id));
+
+CREATE TABLE dbtdt.Adv1(id BIGINT NOT NULL AUTO_INCREMENT, t4 bit(1), video_field2 VARCHAR(400), video_field VARCHAR(400), ismale VARCHAR(400), fileupload_field VARCHAR(400), test1 bit(1), test2 bit(1), audio_field2 VARCHAR(400), fileupload_field2 VARCHAR(400), imageupload_field VARCHAR(400), audio_field VARCHAR(400), idfemale VARCHAR(400), t1 bit(1), imageupload_field2 VARCHAR(400), t2 bit(1),  PRIMARY KEY (id));
+
+CREATE TABLE dbtdt.Dv2(id BIGINT NOT NULL AUTO_INCREMENT, qrcode_field2 VARCHAR(400), test3 VARCHAR(400), test VARCHAR(400), currency2 VARCHAR(400), currency VARCHAR(400), qrcode_field VARCHAR(400), name VARCHAR(400), last_name VARCHAR(400), barcode_field2 VARCHAR(400), static VARCHAR(400), barcode_field VARCHAR(400),  PRIMARY KEY (id));
+
+CREATE TABLE dbtdt.Adv3(id BIGINT NOT NULL AUTO_INCREMENT, datagrid_field2 VARCHAR(400), country VARCHAR(400), dynamic VARCHAR(400), dymlt2 VARCHAR(400), dymlti1 VARCHAR(400), stmlit VARCHAR(400), stmmlt2 VARCHAR(400), state VARCHAR(400), datagrid_field VARCHAR(400), dy2 int, dy1 int,  PRIMARY KEY (id));
+
+CREATE TABLE dbtdt.Support(id BIGINT NOT NULL AUTO_INCREMENT, description VARCHAR(400), name VARCHAR(400),  PRIMARY KEY (id));
+
+CREATE TABLE dbtdt.Adv4(id BIGINT NOT NULL AUTO_INCREMENT, onetoone VARCHAR(400), atdy1 VARCHAR(400), atdy2 VARCHAR(400), atoc int, atc2 int,  PRIMARY KEY (id));
+
+CREATE TABLE dbtdt.Adv5(id BIGINT NOT NULL AUTO_INCREMENT, onetomanyextension VARCHAR(400), multiplication VARCHAR(400), value_list_field VARCHAR(400), value_list_field2 VARCHAR(400), age int, age2 int, name VARCHAR(400), addition VARCHAR(400),  PRIMARY KEY (id));
+
+CREATE TABLE dbtdt.Ad6(id BIGINT NOT NULL AUTO_INCREMENT, country int, district VARCHAR(400), description VARCHAR(400), state VARCHAR(400), name VARCHAR(400),  PRIMARY KEY (id));
+
+CREATE TABLE dbtdt.Ad7(id BIGINT NOT NULL AUTO_INCREMENT, button_field2 VARCHAR(400), button_field VARCHAR(400), name VARCHAR(400),  PRIMARY KEY (id));
+
+CREATE TABLE dbtdt.Ad8(id BIGINT NOT NULL AUTO_INCREMENT, onetoone VARCHAR(400), buttonupdate2 VARCHAR(400), onetomanyextension VARCHAR(400), buttonupdate VARCHAR(400), name VARCHAR(400),  PRIMARY KEY (id));
+
+CREATE TABLE dbtdt.Ad9(id BIGINT NOT NULL AUTO_INCREMENT, approved_field VARCHAR(400), name VARCHAR(400),  PRIMARY KEY (id));
+
+CREATE TABLE dbtdt.Country(id BIGINT NOT NULL AUTO_INCREMENT, active VARCHAR(400), description VARCHAR(400), name VARCHAR(400),  PRIMARY KEY (id));
+
+CREATE TABLE dbtdt.State(id BIGINT NOT NULL AUTO_INCREMENT, active VARCHAR(400), description VARCHAR(400), state_name VARCHAR(400), country_name VARCHAR(400),  PRIMARY KEY (id));
+
+CREATE TABLE dbtdt.District(id BIGINT NOT NULL AUTO_INCREMENT, district_name VARCHAR(400), active VARCHAR(400), description VARCHAR(400), state_name VARCHAR(400),  PRIMARY KEY (id));
+
+CREATE TABLE dbtdt.Childform(id BIGINT NOT NULL AUTO_INCREMENT, active VARCHAR(400), description VARCHAR(400), name VARCHAR(400),  PRIMARY KEY (id));
+
diff --git a/test7oct-demot1-f/authsec_angular/frontend/angular-clarity-master/src/app/modules/main/BuilderComponents/angulardatatype/Ad6/Ad6.component.html b/test7oct-demot1-f/authsec_angular/frontend/angular-clarity-master/src/app/modules/main/BuilderComponents/angulardatatype/Ad6/Ad6.component.html
new file mode 100644
index 0000000..14c0d1a
--- /dev/null
+++ b/test7oct-demot1-f/authsec_angular/frontend/angular-clarity-master/src/app/modules/main/BuilderComponents/angulardatatype/Ad6/Ad6.component.html
@@ -0,0 +1,543 @@
+<ol class="breadcrumb breadcrumb-arrow font-trirong">
+  <li><a href="javascript://"> Ad6</a></li>
+</ol>
+<div class="dg-wrapper">
+  <div class="clr-row">
+    <div class="clr-col-8">
+      <h3>Ad6 </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]="'country'"> <ng-container *clrDgHideableColumn="{hidden: false}"> country
+						    </ng-container></clr-dg-column>
+
+
+<clr-dg-column [clrDgField]="'state'"> <ng-container *clrDgHideableColumn="{hidden: false}"> state
+						    </ng-container></clr-dg-column>
+
+
+<clr-dg-column [clrDgField]="'district'"> <ng-container *clrDgHideableColumn="{hidden: false}"> district
+						    </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.description }}</clr-dg-cell>
+
+
+<clr-dg-cell>{{user.countryidentifier}}</clr-dg-cell>
+
+
+<clr-dg-cell>{{user.state }}</clr-dg-cell>
+
+
+<clr-dg-cell>{{user.district }}</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 Ad6
+ <!--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>
+	        <input class="clr-input"  type="text" [(ngModel)]="rowSelected.description" name="description" />
+	      </div>
+
+
+ 
+<div class="clr-col-sm-12"> 
+<label>country</label>
+<select name="country" [(ngModel)]="rowSelected.country"> 
+  <option [value]="null">Choose country</option>
+<option *ngFor=" let item of selectcountry" [value]="item.name">{{item.name }}</option> </select> </div>
+ 
+
+
+<!-- dependent dropdown field start -->
+
+
+
+ 
+<div class="clr-col-sm-12">
+  <label> state Dependent</label> 
+<select name=" state" [(ngModel)]="rowSelected.state" class="clr-dropdown">
+    <option [ngValue]="null">Select Option</option>
+    <option *ngFor="let entity of statedependentData" [value]="entity.state_name">{{entity.state_name}}</option>
+  </select>
+</div>
+
+ 
+
+ <!-- dependent dropdown field end -->
+
+<!-- dependent dropdown field start -->
+
+
+
+ 
+<div class="clr-col-sm-12">
+  <label> district Dependent</label> 
+<select name=" district" [(ngModel)]="rowSelected.district" class="clr-dropdown">
+    <option [ngValue]="null">Select Option</option>
+    <option *ngFor="let entity of districtdependentData" [value]="entity.district_name">{{entity.district_name}}</option>
+  </select>
+</div>
+
+ 
+
+ <!-- dependent dropdown field end -->
+
+  </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 Ad6 
+
+
+
+
+
+
+
+
+
+
+  <!-- aeroplane icon -->
+    &nbsp; &nbsp; &nbsp; &nbsp;
+    <a *ngIf="userrole?.includes('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: 'Ad6_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>
+ <input class="clr-input"  type="text"  formControlName="description" />       
+ </div>
+
+
+ 
+<div class="clr-col-sm-12">
+	          <label>  country</label> 
+<select  formControlName="country">  
+  <option [value]="null">Choose country</option>
+				<option *ngFor="let item of selectcountry" [value]="item.name">{{item.name}}</option>
+	      </select>          </div>
+ 
+
+
+
+  <!--  order form start -->
+ <div *ngIf="iscountryorder" class="clr-col-sm-12" style="margin-bottom: 10px;">
+          <button type="button" class="btn btn-primary" (click)="addcountryOrder()">
+            + Add to Order
+          </button>
+        </div>
+
+        <!-- Order Summary Table -->
+        <div class="clr-col-sm-12" *ngIf="countrySummary.length > 0">
+          <h4>Order Summary</h4>
+          <table class="table table-bordered">
+            <thead>
+              <tr>
+                <th>Line</th>
+
+
+                <th>Action</th>
+              </tr>
+            </thead>
+            <tbody>
+              <tr *ngFor="let item of countrySummary; let i = index">
+
+                <td>{{ item.line }}</td>
+
+                <td>
+                  <button type="button" class="btn btn-danger btn-sm" (click)="removecountryOrder(i)">
+                    🗑
+                  </button>
+                </td>
+              </tr>
+            </tbody>
+          </table>
+          <div style="max-width: 350px; float: right; margin-top: 18px;">
+            <table style="width: 100%; font-size: 16px;">
+              <tr>
+                <td style="text-align: right; font-weight: 500; color: #333;">Subtotal:</td>
+                <td style="text-align: right; font-weight: 600; color: #222; width: 120px;">₹ {{ getcountrySubtotal() | number:'1.4-4' }}</td>
+              </tr>
+              <tr>
+                <td style="text-align: right; font-weight: 500; color: #333;">GST (18%):</td>
+                <td style="text-align: right; font-weight: 600; color: #007bff;">₹ {{ getcountryGST() | number:'1.4-4' }}</td>
+              </tr>
+              <tr>
+                <td colspan="2"><hr style="margin: 8px 0;"></td>
+              </tr>
+              <tr>
+                <td style="text-align: right; font-size: 18px; font-weight: 700; color: #1a237e;">Total:</td>
+                <td style="text-align: right; font-size: 20px; font-weight: 700; color: #1a237e;">₹ {{ getcountryGrandTotal() | number:'1.4-4' }}</td>
+              </tr>
+            </table>
+          </div>
+        </div>
+
+ <!--  order form end -->
+
+
+<!-- dependent dropdown field start -->
+						   
+
+ 
+
+<div class="clr-col-sm-12">
+						    <label> state</label>  <select formControlName="state" class="clr-dropdown">    
+ <option [ngValue]="null">Select Option</option>
+						     <option *ngFor="let entity of statedependentData" [value]="entity.state_name">{{ entity.state_name}}</option>
+						     </select>
+  </div> 
+ 
+
+<!-- dependent dropdown field end -->
+
+<!-- dependent dropdown field start -->
+						   
+
+ 
+
+<div class="clr-col-sm-12">
+						    <label> district</label>  <select formControlName="district" class="clr-dropdown">    
+ <option [ngValue]="null">Select Option</option>
+						     <option *ngFor="let entity of districtdependentData" [value]="entity.district_name">{{ entity.district_name}}</option>
+						     </select>
+  </div> 
+ 
+
+<!-- dependent dropdown field end -->
+
+ 
+ </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/test7oct-demot1-f/authsec_angular/frontend/angular-clarity-master/src/app/modules/main/BuilderComponents/angulardatatype/Ad6/Ad6.component.scss b/test7oct-demot1-f/authsec_angular/frontend/angular-clarity-master/src/app/modules/main/BuilderComponents/angulardatatype/Ad6/Ad6.component.scss
new file mode 100644
index 0000000..12f7fc8
--- /dev/null
+++ b/test7oct-demot1-f/authsec_angular/frontend/angular-clarity-master/src/app/modules/main/BuilderComponents/angulardatatype/Ad6/Ad6.component.scss
@@ -0,0 +1,85 @@
+//@import "../../../../assets/scss/var";
+.s-info-bar {
+  display: flex;
+  flex-direction: row;
+  justify-content: space-between;
+  button {
+    outline: none;
+  }
+}
+.delete,.heading{
+  text-align: center;
+  color: red;
+}
+.entry-pg {
+  width: 750px;
+}
+
+.button1::after {
+  content: none;
+}
+.button1:hover::after {
+  content: "ADD ROWS";
+}
+
+.section {
+  background-color: #dddddd;
+  height: 40px;
+}
+
+.section p {
+  //color: white;
+  padding: 10px;
+  font-size: 18px;
+}
+
+.clr-input {
+  color: #212529;
+  border: 1px solid #ced4da;
+  border-radius: 0.25rem;
+  padding: 0.75rem 0.75rem;
+  margin-top: 3px;
+  width: 100%;
+  margin-bottom: 10px;
+}
+
+.clr-file {
+  color: #212529;
+  border: 1px solid #ced4da;
+  border-radius: 0.25rem;
+  //padding: 0.6rem 0.75rem;
+  margin-top: 3px;
+  width: 100%;
+  margin-bottom: 10px;
+}
+
+.center {
+  text-align: center;
+}
+select{
+  width: 100%;
+  margin-top: 3px;
+  padding: 5px 5px;
+  border: 1px solid #ccc;
+  border-radius: 4px;
+}
+input[type=text],[type=date],[type=number],textarea {
+  width: 100%;
+  padding: 15px 15px;
+  background-color:rgb(255, 255, 255);
+ // margin: 8px 0;
+  display: inline-block;
+  border: 1px solid #ccc;
+  border-radius: 4px;
+  box-sizing: border-box;
+}
+.error_mess {
+  color: red;
+}
+.universal-section-header {
+  margin: 24px 0 10px 0;
+  font-weight: 600;
+  color: #1a237e;
+  letter-spacing: 0.5px;
+  font-size: 1.25rem;
+}
\ No newline at end of file
diff --git a/test7oct-demot1-f/authsec_angular/frontend/angular-clarity-master/src/app/modules/main/BuilderComponents/angulardatatype/Ad6/Ad6.component.ts b/test7oct-demot1-f/authsec_angular/frontend/angular-clarity-master/src/app/modules/main/BuilderComponents/angulardatatype/Ad6/Ad6.component.ts
new file mode 100644
index 0000000..1943884
--- /dev/null
+++ b/test7oct-demot1-f/authsec_angular/frontend/angular-clarity-master/src/app/modules/main/BuilderComponents/angulardatatype/Ad6/Ad6.component.ts
@@ -0,0 +1,492 @@
+import { Component, OnInit } from '@angular/core';
+import { ToastrService } from 'ngx-toastr';
+import { AlertService } from 'src/app/services/alert.service';
+import { Ad6service} from './Ad6.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 { Ad6cardvariable } from './Ad6_cardvariable';
+import { UserInfoService } from 'src/app/services/user-info.service';
+declare var JsBarcode: any; 
+@Component({
+  selector: 'app-Ad6',
+  templateUrl: './Ad6.component.html',
+  styleUrls: ['./Ad6.component.scss']
+})
+export class Ad6Component implements OnInit {
+  cardButton = Ad6cardvariable.cardButton;
+  cardmodeldata = Ad6cardvariable.cardmodeldata;
+  public dashboardArray: DashboardContentModel2[];
+  isCardview = Ad6cardvariable.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 = 'Ad6_formCode'
+tableName = 'Ad6';  checkFormCode; selected: any[] = []; constructor(
+    private extensionService: ExtensionService,
+private userInfoService:UserInfoService,
+    private mainService:Ad6service,
+    private alertService: AlertService,
+    private toastr: ToastrService,
+    private _fb: FormBuilder,
+  ) { }
+  private editInterval: any;
+// component button 
+  ngOnInit(): void {
+    if(this.cardmodeldata !== ''){
+     this.cardmodal = JSON.parse(this.cardmodeldata);
+    this.dashboardArray = this.cardmodal.dashboard.slice();
+    console.log(this.dashboardArray)
+    }
+    this.userrole=this.userInfoService.getRoles();
+    this.getData();
+    this.entryForm = this._fb.group({
+name : [null],
+
+description : [null],
+
+country : [null],
+
+state : [null],
+
+
+district : [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 === "Ad6_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.getallcountry();
+
+
+
+    if (this.countrydefault) {
+    // Listen for product changes to auto-fill description
+
+
+ 
+    this.entryForm.get('country')?.valueChanges.subscribe(name => {
+      if (name && this.selectcountry) {
+
+        const found = this.selectcountry.find(p => p.name === name);
+ 
+
+
+        console.log('found is ', found);
+
+        // Auto-fill price when product is selected
+        if (found && found.default_field) {
+          this.entryForm.patchValue({ default_field: found.default_field_link });
+        } else {
+          this.entryForm.patchValue({ default_field: null });
+        }
+
+      }
+    });
+}
+
+
+    // Listen for country changes
+
+ 
+    this.entryForm.get('country')?.valueChanges.subscribe((item) => {
+ 
+
+      if (item) {
+        this.dependet2state(item);
+      } else {
+        this.statedependentData = [];
+        this.entryForm.get('state')?.setValue(null); // clear state
+      }
+    });
+
+
+
+    // Listen for country changes
+
+ 
+    this.entryForm.get('state')?.valueChanges.subscribe((item) => {
+ 
+
+      if (item) {
+        this.dependet2district(item);
+      } else {
+        this.districtdependentData = [];
+        this.entryForm.get('district')?.setValue(null); // clear state
+      }
+    });
+
+
+
+  }
+ ngOnDestroy(): void {
+    if (this.editInterval) {
+      clearInterval(this.editInterval);
+    }
+  }
+
+
+
+
+
+
+
+
+
+ error; 
+  getData() {
+    this.mainService.getAll().subscribe((data) => {
+      console.log(data);
+      this.product = data;
+this.product = [...this.product].reverse(); if(this.product.length==0){
+        this.error="No Data Available"
+     }   
+    },(error) => {
+      console.log(error);
+      if(error){
+       this.error="Server Error";
+     }
+    });
+  }
+  onEdit(row) {
+    this.rowSelected = row;
+
+
+
+
+
+
+//  Dependemt Dropdown field start
+this.dependet2state(row.dependentDD);
+  //  Dependemt Dropdown field end
+
+//  Dependemt Dropdown field start
+this.dependet2district(row.dependentDD);
+  //  Dependemt Dropdown field end
+
+
+    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();
+
+} 
+
+
+
+
+countrydefault=false
+selectcountry ;     
+getallcountry() {
+ this.mainService.getAllcountry().subscribe(data=>{
+this.selectcountry = data;       
+console.log(data);
+},(error) => {       console.log(error);     });   }		
+
+
+
+  // ================== ORDER SUMMARY LOGIC START ==================
+  /**
+   * Order Summary Array and Methods for Add to Order functionality
+   */
+  countrySummary: any[] = [];
+  countrytotal;
+iscountryorder =false;
+  /**
+   * Add selected product to order summary
+   */
+  addcountryOrder() {
+    const formValue = this.entryForm.value;
+    if (!formValue.country ) {
+      this.toastr.error('Please select country');
+      return;
+    }
+    // Get description from master (selectcountry)
+
+
+   
+
+    if (this.selectcountry && Array.isArray(this.selectcountry)) {
+
+ 
+      const found = this.selectcountry.find(p => p.name === formValue.country);
+ 
+
+    
+
+    }
+    const line = this.countrySummary.length + 1;
+    const orderItem = {
+      line: line,
+
+      // unitPrice: Number(formValue.price),
+      // quantity: Number(formValue.quantity),
+      // total: Number(formValue.price) * Number(formValue.quantity)
+    };
+    this.countrySummary.push(orderItem);
+    
+    this.countrytotal = '';
+  }
+
+  /**
+   * Remove item from order summary by index
+   */
+  removecountryOrder(index: number) {
+    this.countrySummary.splice(index, 1);
+    // Recalculate line numbers
+    this.countrySummary.forEach((item, i) => {
+      item.line = i + 1;
+    });
+  }
+
+  /**
+   * Calculate subtotal of all order items
+   */
+  getcountrySubtotal(): number {
+    return this.countrySummary.reduce((sum, item) => sum + item.total, 0);
+  }
+
+  /**
+   * Calculate GST (18%)
+   */
+  getcountryGST(): number {
+    return this.getcountrySubtotal() * 0.18;
+  }
+
+  /**
+   * Calculate grand total (subtotal + GST)
+   */
+  getcountryGrandTotal(): number {
+    return this.getcountrySubtotal() + this.getcountryGST();
+
+  }
+  // ================== ORDER SUMMARY LOGIC END ==================
+
+
+//  Dependemt Dropdown field start   
+
+ 
+  statedependentData: any;    
+dependet2state (item){
+    this.mainService.getstateDependent(item).subscribe( (data) => {
+        console.log(data);     
+    this.statedependentData = data;
+  },(error) => {     console.log(error);   });
+ }
+
+
+   //  DependemtDropdown field end
+
+//  Dependemt Dropdown field start   
+
+ 
+  districtdependentData: any;    
+dependet2district (item){
+    this.mainService.getdistrictDependent(item).subscribe( (data) => {
+        console.log(data);     
+    this.districtdependentData = data;
+  },(error) => {     console.log(error);   });
+ }
+
+
+   //  DependemtDropdown field end
+
+// updateaction
+}
+
+
+
+
+
+
+
+
+
diff --git a/test7oct-demot1-f/authsec_angular/frontend/angular-clarity-master/src/app/modules/main/BuilderComponents/angulardatatype/Ad6/Ad6.service.ts b/test7oct-demot1-f/authsec_angular/frontend/angular-clarity-master/src/app/modules/main/BuilderComponents/angulardatatype/Ad6/Ad6.service.ts
new file mode 100644
index 0000000..fb34d50
--- /dev/null
+++ b/test7oct-demot1-f/authsec_angular/frontend/angular-clarity-master/src/app/modules/main/BuilderComponents/angulardatatype/Ad6/Ad6.service.ts
@@ -0,0 +1,56 @@
+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 Ad6service{
+  private baseURL = "Ad6/Ad6" ;  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);
+  }
+
+
+
+
+getAllcountry(): Observable<any> {   
+return this.apiRequest.get("Country_ListFilter1/Country_ListFilter1");  }
+
+
+
+  getstateDependent(field: string): Observable<any> {
+    return this.apiRequest.get("State_ListFilter1/State_ListFilter11/" + field);
+  }
+
+
+
+
+
+  getdistrictDependent(field: string): Observable<any> {
+    return this.apiRequest.get("District_ListFilter1/District_ListFilter11/" + field);
+  }
+
+
+
+// updateaction
+}
\ No newline at end of file
diff --git a/test7oct-demot1-f/authsec_angular/frontend/angular-clarity-master/src/app/modules/main/BuilderComponents/angulardatatype/Ad6/Ad6_cardvariable.ts b/test7oct-demot1-f/authsec_angular/frontend/angular-clarity-master/src/app/modules/main/BuilderComponents/angulardatatype/Ad6/Ad6_cardvariable.ts
new file mode 100644
index 0000000..a7602db
--- /dev/null
+++ b/test7oct-demot1-f/authsec_angular/frontend/angular-clarity-master/src/app/modules/main/BuilderComponents/angulardatatype/Ad6/Ad6_cardvariable.ts
@@ -0,0 +1,4 @@
+export const Ad6cardvariable = {
+    "cardButton": false,
+    "cardmodeldata": ``
+}
\ No newline at end of file
diff --git a/test7oct-demot1-f/authsec_angular/frontend/angular-clarity-master/src/app/modules/main/BuilderComponents/angulardatatype/Ad7/Ad7.component.html b/test7oct-demot1-f/authsec_angular/frontend/angular-clarity-master/src/app/modules/main/BuilderComponents/angulardatatype/Ad7/Ad7.component.html
new file mode 100644
index 0000000..40acabb
--- /dev/null
+++ b/test7oct-demot1-f/authsec_angular/frontend/angular-clarity-master/src/app/modules/main/BuilderComponents/angulardatatype/Ad7/Ad7.component.html
@@ -0,0 +1,453 @@
+<ol class="breadcrumb breadcrumb-arrow font-trirong">
+  <li><a href="javascript://"> Ad7</a></li>
+</ol>
+<div class="dg-wrapper">
+  <div class="clr-row">
+    <div class="clr-col-8">
+      <h3>Ad7 </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 -->
+<!-- insert button -->
+      <button id="insert"  class="btn btn-primary" (click)="goToInsertButton_Field2()">
+        <clr-icon shape="plus"></clr-icon>Insert Button_Field2
+      </button>
+      <!-- insert end -->
+
+<!-- insert button -->
+      <button id="insert"  class="btn btn-primary" (click)="goToInsertButton_Field()">
+        <clr-icon shape="plus"></clr-icon>Insert Button_Field
+      </button>
+      <!-- insert end -->
+
+     <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>
+
+
+
+
+
+ 
+ <!-- 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>
+
+
+
+
+
+ 
+  <!-- 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 Ad7
+ <!--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> 
+
+
+
+
+
+
+<!-- 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 Ad7 
+
+
+
+
+
+
+  <!-- aeroplane icon -->
+    &nbsp; &nbsp; &nbsp; &nbsp;
+    <a *ngIf="userrole?.includes('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: 'Ad7_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> 
+
+
+
+
+
+
+
+
+      <!-- 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 -->
+
+  <clr-modal [(clrModalOpen)]="modalInsertButton_Field2" [clrModalSize]="'xl'" [clrModalStaticBackdrop]="true">
+    <h3 class="modal-title">Insert Button_Field2</h3>
+    <div class="modal-body">
+          <form [formGroup]="insertFormButton_Field2" (ngSubmit)="onSubmitInsertButton_Field2()">
+        <div class="clr-row">
+          <div class="clr-col-md-4 clr-col-sm-12">
+            <label for="description">Description:</label>
+            <input type="text" id="description" formControlName="description" name="description" placeholder="Enter Description" class="clr-input">
+          </div>
+          <div class="clr-col-md-4 clr-col-sm-12">
+            <label for="name">Name:</label>
+            <input type="text" id="name" formControlName="name" name="name" placeholder="Enter Name" class="clr-input">
+          </div>
+        </div>
+        <br>
+        <div class="modal-footer">
+          <button type="button" class="btn btn-outline" (click)="modalInsertButton_Field2 = false">Cancel</button>
+          <button type="submit" class="btn btn-primary" >Insert</button>
+        </div>
+  </form>
+    </div>
+  
+  </clr-modal>
+
+
+
+  <clr-modal [(clrModalOpen)]="modalInsertButton_Field" [clrModalSize]="'xl'" [clrModalStaticBackdrop]="true">
+    <h3 class="modal-title">Insert Button_Field</h3>
+    <div class="modal-body">
+          <form [formGroup]="insertFormButton_Field" (ngSubmit)="onSubmitInsertButton_Field()">
+        <div class="clr-row">
+          <div class="clr-col-md-4 clr-col-sm-12">
+            <label for="toggle_switch2">Toggle_Switch2:</label>
+            <input type="text" id="toggle_switch2" formControlName="toggle_switch2" name="toggle_switch2" placeholder="Enter Toggle_Switch2" class="clr-input">
+          </div>
+          <div class="clr-col-md-4 clr-col-sm-12">
+            <label for="decimal_field2">Decimal_Field2:</label>
+            <input type="text" id="decimal_field2" formControlName="decimal_field2" name="decimal_field2" placeholder="Enter Decimal_Field2" class="clr-input">
+          </div>
+          <div class="clr-col-md-4 clr-col-sm-12">
+            <label for="documentsequenc">Documentsequenc:</label>
+            <input type="text" id="documentsequenc" formControlName="documentsequenc" name="documentsequenc" placeholder="Enter Documentsequenc" class="clr-input">
+          </div>
+          <div class="clr-col-md-4 clr-col-sm-12">
+            <label for="toggle_switch">Toggle_Switch:</label>
+            <input type="text" id="toggle_switch" formControlName="toggle_switch" name="toggle_switch" placeholder="Enter Toggle_Switch" class="clr-input">
+          </div>
+          <div class="clr-col-md-4 clr-col-sm-12">
+            <label for="recaptcha">Recaptcha:</label>
+            <input type="text" id="recaptcha" formControlName="recaptcha" name="recaptcha" placeholder="Enter Recaptcha" class="clr-input">
+          </div>
+          <div class="clr-col-md-4 clr-col-sm-12">
+            <label for="percentage_field">Percentage_Field:</label>
+            <input type="text" id="percentage_field" formControlName="percentage_field" name="percentage_field" placeholder="Enter Percentage_Field" class="clr-input">
+          </div>
+          <div class="clr-col-md-4 clr-col-sm-12">
+            <label for="percentage_field2">Percentage_Field2:</label>
+            <input type="text" id="percentage_field2" formControlName="percentage_field2" name="percentage_field2" placeholder="Enter Percentage_Field2" class="clr-input">
+          </div>
+          <div class="clr-col-md-4 clr-col-sm-12">
+            <label for="url_field">Url_Field:</label>
+            <input type="text" id="url_field" formControlName="url_field" name="url_field" placeholder="Enter Url_Field" class="clr-input">
+          </div>
+          <div class="clr-col-md-4 clr-col-sm-12">
+            <label for="url_field2">Url_Field2:</label>
+            <input type="text" id="url_field2" formControlName="url_field2" name="url_field2" placeholder="Enter Url_Field2" class="clr-input">
+          </div>
+          <div class="clr-col-md-4 clr-col-sm-12">
+            <label for="decimal_field">Decimal_Field:</label>
+            <input type="text" id="decimal_field" formControlName="decimal_field" name="decimal_field" placeholder="Enter Decimal_Field" class="clr-input">
+          </div>
+          <div class="clr-col-md-4 clr-col-sm-12">
+            <label for="recaptcha2">Recaptcha2:</label>
+            <input type="text" id="recaptcha2" formControlName="recaptcha2" name="recaptcha2" placeholder="Enter Recaptcha2" class="clr-input">
+          </div>
+        </div>
+        <br>
+        <div class="modal-footer">
+          <button type="button" class="btn btn-outline" (click)="modalInsertButton_Field = false">Cancel</button>
+          <button type="submit" class="btn btn-primary" >Insert</button>
+        </div>
+  </form>
+    </div>
+  
+  </clr-modal>
\ No newline at end of file
diff --git a/test7oct-demot1-f/authsec_angular/frontend/angular-clarity-master/src/app/modules/main/BuilderComponents/angulardatatype/Ad7/Ad7.component.scss b/test7oct-demot1-f/authsec_angular/frontend/angular-clarity-master/src/app/modules/main/BuilderComponents/angulardatatype/Ad7/Ad7.component.scss
new file mode 100644
index 0000000..12f7fc8
--- /dev/null
+++ b/test7oct-demot1-f/authsec_angular/frontend/angular-clarity-master/src/app/modules/main/BuilderComponents/angulardatatype/Ad7/Ad7.component.scss
@@ -0,0 +1,85 @@
+//@import "../../../../assets/scss/var";
+.s-info-bar {
+  display: flex;
+  flex-direction: row;
+  justify-content: space-between;
+  button {
+    outline: none;
+  }
+}
+.delete,.heading{
+  text-align: center;
+  color: red;
+}
+.entry-pg {
+  width: 750px;
+}
+
+.button1::after {
+  content: none;
+}
+.button1:hover::after {
+  content: "ADD ROWS";
+}
+
+.section {
+  background-color: #dddddd;
+  height: 40px;
+}
+
+.section p {
+  //color: white;
+  padding: 10px;
+  font-size: 18px;
+}
+
+.clr-input {
+  color: #212529;
+  border: 1px solid #ced4da;
+  border-radius: 0.25rem;
+  padding: 0.75rem 0.75rem;
+  margin-top: 3px;
+  width: 100%;
+  margin-bottom: 10px;
+}
+
+.clr-file {
+  color: #212529;
+  border: 1px solid #ced4da;
+  border-radius: 0.25rem;
+  //padding: 0.6rem 0.75rem;
+  margin-top: 3px;
+  width: 100%;
+  margin-bottom: 10px;
+}
+
+.center {
+  text-align: center;
+}
+select{
+  width: 100%;
+  margin-top: 3px;
+  padding: 5px 5px;
+  border: 1px solid #ccc;
+  border-radius: 4px;
+}
+input[type=text],[type=date],[type=number],textarea {
+  width: 100%;
+  padding: 15px 15px;
+  background-color:rgb(255, 255, 255);
+ // margin: 8px 0;
+  display: inline-block;
+  border: 1px solid #ccc;
+  border-radius: 4px;
+  box-sizing: border-box;
+}
+.error_mess {
+  color: red;
+}
+.universal-section-header {
+  margin: 24px 0 10px 0;
+  font-weight: 600;
+  color: #1a237e;
+  letter-spacing: 0.5px;
+  font-size: 1.25rem;
+}
\ No newline at end of file
diff --git a/test7oct-demot1-f/authsec_angular/frontend/angular-clarity-master/src/app/modules/main/BuilderComponents/angulardatatype/Ad7/Ad7.component.ts b/test7oct-demot1-f/authsec_angular/frontend/angular-clarity-master/src/app/modules/main/BuilderComponents/angulardatatype/Ad7/Ad7.component.ts
new file mode 100644
index 0000000..c262408
--- /dev/null
+++ b/test7oct-demot1-f/authsec_angular/frontend/angular-clarity-master/src/app/modules/main/BuilderComponents/angulardatatype/Ad7/Ad7.component.ts
@@ -0,0 +1,387 @@
+import { Component, OnInit } from '@angular/core';
+import { ToastrService } from 'ngx-toastr';
+import { AlertService } from 'src/app/services/alert.service';
+import { Ad7service} from './Ad7.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 { Ad7cardvariable } from './Ad7_cardvariable';
+import { UserInfoService } from 'src/app/services/user-info.service';
+declare var JsBarcode: any; 
+@Component({
+  selector: 'app-Ad7',
+  templateUrl: './Ad7.component.html',
+  styleUrls: ['./Ad7.component.scss']
+})
+export class Ad7Component implements OnInit {
+  cardButton = Ad7cardvariable.cardButton;
+  cardmodeldata = Ad7cardvariable.cardmodeldata;
+  public dashboardArray: DashboardContentModel2[];
+  isCardview = Ad7cardvariable.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 = 'Ad7_formCode'
+tableName = 'Ad7';  checkFormCode; selected: any[] = []; constructor(
+    private extensionService: ExtensionService,
+private userInfoService:UserInfoService,
+    private mainService:Ad7service,
+    private alertService: AlertService,
+    private toastr: ToastrService,
+    private _fb: FormBuilder,
+  ) { }
+  private editInterval: any;
+// component button
+  public insertFormButton_Field2: FormGroup;
+
+
+  public insertFormButton_Field: FormGroup;
+
+ 
+  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],
+
+
+
+
+
+
+ 
+
+
+
+
+
+  }); // component_button200
+// inser code start
+  this.insertFormButton_Field2 = this._fb.group({
+    description: 'textarea',
+    name: '',
+  });
+
+  // insert code end
+
+// inser code start
+  this.insertFormButton_Field = this._fb.group({
+    toggle_switch2: 'toggle_switch',
+    decimal_field2: 'decimal',
+    documentsequenc: 'document_sequence',
+    toggle_switch: 'toggle_switch',
+    recaptcha: 'recaptcha',
+    percentage_field: 'number',
+    percentage_field2: 'number',
+    url_field: 'url',
+    url_field2: 'url',
+    decimal_field: 'decimal',
+    recaptcha2: 'recaptcha',
+  });
+
+  // insert code end
+
+ // 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 === "Ad7_formCode");
+      console.log(this.checkFormCode);
+      console.log(this.additionalFieldsFromBackend);
+      if (this.additionalFieldsFromBackend && this.additionalFieldsFromBackend.length > 0) {
+        this.additionalFieldsFromBackend.forEach(field => {
+          if (field.formCode === this.formcode) {
+            if (!this.entryForm.contains(field.extValue)) {
+              // Add the control only if it doesn't exist in the form
+              this.entryForm.addControl(field.extValue, this._fb.control(field.fieldValue));
+            }
+          }
+        });
+      }
+    });
+    console.log(this.entryForm.value);
+    // form code end 
+
+
+
+
+
+
+
+  }
+ ngOnDestroy(): void {
+    if (this.editInterval) {
+      clearInterval(this.editInterval);
+    }
+  }
+
+
+
+
+
+ error; 
+  getData() {
+    this.mainService.getAll().subscribe((data) => {
+      console.log(data);
+      this.product = data;
+this.product = [...this.product].reverse(); if(this.product.length==0){
+        this.error="No Data Available"
+     }   
+    },(error) => {
+      console.log(error);
+      if(error){
+       this.error="Server Error";
+     }
+    });
+  }
+  onEdit(row) {
+    this.rowSelected = row;
+
+
+
+
+
+
+
+    this.modalEdit = true;
+  }
+   onDelete(row) {
+    this.rowSelected = row;
+     this.modaldelete=true;
+  }
+  delete(id)
+  {
+    this.modaldelete = false;
+    console.log("in delete  "+id);
+    this.mainService.delete(id).subscribe(
+      (data) => {
+        console.log(data);
+        this.ngOnInit();
+  if (data) {				      this.toastr.success('Deleted successfully');      }
+    });
+  }
+    onUpdate(id) {
+    this.modalEdit = false;
+
+
+
+
+
+
+    //console.log("in update");
+    console.log("id  " + id);
+    console.log(this.rowSelected);
+    //console.log("out update");
+    this.mainService.update(id, this.rowSelected).subscribe(
+      (data) => {
+        console.log(data);
+        if (data || data.status >= 200 && data.status <= 299) {
+          this.toastr.success("Update Successfully");
+        }
+setTimeout(() => {
+      this.ngOnInit();
+    }, 500);
+
+
+
+
+
+
+      }, (error) => {
+        console.log(error);
+        if (error.status >= 200 && error.status <= 299) {
+          // this.toastr.success("update Succesfully");
+        }
+        if (error.status >= 400 && error.status <= 499) {
+          this.toastr.error("Not Updated");
+        }
+        if (error.status >= 500 && error.status <= 599) {
+          this.toastr.error("Not Updated");
+        }
+      });
+    setTimeout(() => {
+      this.ngOnInit();
+    }, 500);
+  } 
+onCreate() {
+     this.modalAdd=false;
+
+
+
+
+
+
+  this.mainService.create(this.entryForm.value).subscribe(
+    (data) => {
+      console.log(data);
+  if (data || data.status >= 200 && data.status <= 299) {
+          this.toastr.success("Added Successfully");
+        }
+setTimeout(() => {
+      this.ngOnInit();
+    }, 500);
+
+
+
+
+
+
+      }, (error) => {
+        console.log(error);
+        if (error.status >= 200 && error.status <= 299) {
+          // this.toastr.success("Added Succesfully");
+        }
+        if (error.status >= 400 && error.status <= 499) {
+          this.toastr.error("Not Added");
+        }
+        if (error.status >= 500 && error.status <= 599) {
+          this.toastr.error("Not Added");
+        }
+      });
+    setTimeout(() => {
+      this.ngOnInit();
+    }, 500);
+  }
+  goToAdd(row) {
+this.modalAdd = true; this.submitted = false;
+
+
+
+
+
+
+  }
+ submitted = false;
+onSubmit() {
+  console.log(this.entryForm.value);
+ this.submitted = true;
+  if (this.entryForm.invalid) {
+    return;
+  }this.onCreate();
+
+} 
+
+
+
+
+
+
+// updateaction
+
+// insert button
+
+
+modalInsertButton_Field2 = false; 
+goToInsertButton_Field2() {
+  this.modalInsertButton_Field2=true;
+  }
+onSubmitInsertButton_Field2() {
+  console.log(this.insertFormButton_Field2.value);
+  this.submitted=true;
+  if (this.insertFormButton_Field2.invalid) {
+    return;
+  }
+  this.onInsertButton_Field2();
+}
+onInsertButton_Field2() {
+    this.modalInsertButton_Field2=false;
+   this.mainService.insertButton_Field2Support(this.insertFormButton_Field2.value).subscribe(data => {
+     console.log('After add',data)
+     if (data.status >=200 && data.status <=209) {
+      this.toastr.success('Added successfully');
+  }
+if (data && data.id != null) {
+        this.toastr.success('Added successfully');
+      }  this.ngOnInit();
+   },(error) => {
+     console.error(error);
+     if ( error.status >= 200 && error.status <= 299) {
+       this.toastr.success("Update Successfully");
+     } 
+     if ( error.status >= 400 && error.status <= 499) {
+       this.toastr.error("Update Failed");
+     } 
+     if ( error.status >= 500 && error.status <= 599) {
+       this.toastr.error("Server Error");
+     } 
+     this.ngOnInit();
+   });
+     this.insertFormButton_Field2.reset();
+ }
+//  insert buuton code end
+
+
+
+// insert button
+
+
+modalInsertButton_Field = false; 
+goToInsertButton_Field() {
+  this.modalInsertButton_Field=true;
+  }
+onSubmitInsertButton_Field() {
+  console.log(this.insertFormButton_Field.value);
+  this.submitted=true;
+  if (this.insertFormButton_Field.invalid) {
+    return;
+  }
+  this.onInsertButton_Field();
+}
+onInsertButton_Field() {
+    this.modalInsertButton_Field=false;
+   this.mainService.insertButton_FieldBasicp3(this.insertFormButton_Field.value).subscribe(data => {
+     console.log('After add',data)
+     if (data.status >=200 && data.status <=209) {
+      this.toastr.success('Added successfully');
+  }
+if (data && data.id != null) {
+        this.toastr.success('Added successfully');
+      }  this.ngOnInit();
+   },(error) => {
+     console.error(error);
+     if ( error.status >= 200 && error.status <= 299) {
+       this.toastr.success("Update Successfully");
+     } 
+     if ( error.status >= 400 && error.status <= 499) {
+       this.toastr.error("Update Failed");
+     } 
+     if ( error.status >= 500 && error.status <= 599) {
+       this.toastr.error("Server Error");
+     } 
+     this.ngOnInit();
+   });
+     this.insertFormButton_Field.reset();
+ }
+//  insert buuton code end
+
+
+}
\ No newline at end of file
diff --git a/test7oct-demot1-f/authsec_angular/frontend/angular-clarity-master/src/app/modules/main/BuilderComponents/angulardatatype/Ad7/Ad7.service.ts b/test7oct-demot1-f/authsec_angular/frontend/angular-clarity-master/src/app/modules/main/BuilderComponents/angulardatatype/Ad7/Ad7.service.ts
new file mode 100644
index 0000000..fd0ec8c
--- /dev/null
+++ b/test7oct-demot1-f/authsec_angular/frontend/angular-clarity-master/src/app/modules/main/BuilderComponents/angulardatatype/Ad7/Ad7.service.ts
@@ -0,0 +1,49 @@
+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 Ad7service{
+  private baseURL = "Ad7/Ad7" ;  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
+// insert button code start
+insertButton_Field2Support(Support: any): Observable<any> {
+  return this.apiRequest.post(`Ad7/Ad7/Support_insert`, Support);
+}
+
+// insert button code start
+insertButton_FieldBasicp3(Basicp3: any): Observable<any> {
+  return this.apiRequest.post(`Ad7/Ad7/Basicp3_insert`, Basicp3);
+}
+
+}
\ No newline at end of file
diff --git a/test7oct-demot1-f/authsec_angular/frontend/angular-clarity-master/src/app/modules/main/BuilderComponents/angulardatatype/Ad7/Ad7_cardvariable.ts b/test7oct-demot1-f/authsec_angular/frontend/angular-clarity-master/src/app/modules/main/BuilderComponents/angulardatatype/Ad7/Ad7_cardvariable.ts
new file mode 100644
index 0000000..e211fcd
--- /dev/null
+++ b/test7oct-demot1-f/authsec_angular/frontend/angular-clarity-master/src/app/modules/main/BuilderComponents/angulardatatype/Ad7/Ad7_cardvariable.ts
@@ -0,0 +1,4 @@
+export const Ad7cardvariable = {
+    "cardButton": false,
+    "cardmodeldata": ``
+}
\ No newline at end of file
diff --git a/test7oct-demot1-f/authsec_angular/frontend/angular-clarity-master/src/app/modules/main/BuilderComponents/angulardatatype/Ad8/Ad8.component.html b/test7oct-demot1-f/authsec_angular/frontend/angular-clarity-master/src/app/modules/main/BuilderComponents/angulardatatype/Ad8/Ad8.component.html
new file mode 100644
index 0000000..1615499
--- /dev/null
+++ b/test7oct-demot1-f/authsec_angular/frontend/angular-clarity-master/src/app/modules/main/BuilderComponents/angulardatatype/Ad8/Ad8.component.html
@@ -0,0 +1,619 @@
+<ol class="breadcrumb breadcrumb-arrow font-trirong">
+  <li><a href="javascript://"> Ad8</a></li>
+</ol>
+<div class="dg-wrapper">
+  <div class="clr-row">
+    <div class="clr-col-8">
+      <h3>Ad8 </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]="'support.description'"> <ng-container *clrDgHideableColumn="{hidden: false}">description</ng-container></clr-dg-column>
+ 
+
+ 
+<clr-dg-column [clrDgField]="'support.name'"> <ng-container *clrDgHideableColumn="{hidden: false}">name</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.support?.description}}</clr-dg-cell>
+ 
+
+ 
+<clr-dg-cell>{{user.support?.name}}</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 Ad8
+ <!--update button -->
+<!-- update button -->
+      <button id="Update"  class="btn btn-primary" (click)="goToUpdateButtonupdate2()">
+        <clr-icon shape="plus"></clr-icon>Update Buttonupdate2
+      </button>
+      <!-- update end -->
+
+<!-- update button -->
+      <button id="Update"  class="btn btn-primary" (click)="goToUpdateButtonUpdate()">
+        <clr-icon shape="plus"></clr-icon>Update ButtonUpdate
+      </button>
+      <!-- update end -->
+
+
+
+
+
+
+
+
+
+
+</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> 
+
+
+
+
+
+
+
+ 
+
+<div class="clr-col-md-4 clr-col-sm-12"> <label>description</label>
+  <input class="clr-input" id="name" type="text" [(ngModel)]="rowSelected.support.description" name="description" />
+</div>
+ 
+
+ 
+
+<div class="clr-col-md-4 clr-col-sm-12"> <label>name</label>
+  <input class="clr-input" id="name" type="text" [(ngModel)]="rowSelected.support.name" name="name" />
+</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;">{{ childformcomponents?.length >= 1 ? 'Actions' : '' }}</th>
+        </tr>
+      </thead>
+      <tbody>
+        <tr *ngFor="let component of childformcomponents; 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)="oneditchildform()" style="margin-left: 20px;">
+        <clr-icon shape="plus"></clr-icon> </button>
+    </table>
+  </div>
+</div>
+<!-- one to many code end here -->
+
+<!-- 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 Ad8 
+
+
+
+
+
+
+
+
+
+
+  <!-- aeroplane icon -->
+    &nbsp; &nbsp; &nbsp; &nbsp;
+    <a *ngIf="userrole?.includes('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: 'Ad8_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> 
+
+
+
+
+
+
+<div style="margin-top: 30px;">       
+<h4 style="display: inline;">support </h4>   </div> <hr>
+						  <div class="clr-row" formArrayName="support">
+				
+ 
+					<div class="clr-col-md-4 clr-col-sm-12">          
+<label> description</label>
+	 <input class="clr-input" type="text" formControlName="description" />     </div> 
+ 
+
+ 
+					<div class="clr-col-md-4 clr-col-sm-12">          
+<label> name</label>
+	 <input class="clr-input" type="text" formControlName="name" />     </div> 
+ 
+				
+</div>
+
+
+<!-- one to many code start here -->
+<div style="margin-top: 30px;"><h4 style="display: inline;">childform </h4>
+</div>
+<hr>
+<div class="clr-row">
+  <div class="clr-col-lg-12">
+    <table class="table" style="width:100%;" formArrayName="childform">
+      <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;">{{ childformcontrols.length > 1 ? 'Actions' : '' }}</th>
+        </tr>
+      </thead>
+      <tbody>
+        <tr *ngFor="let item of childformcontrols; 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="childformcontrols.length > 1" (click)="onRemovechildform(i)"><clr-icon shape="trash" class="is-error"></clr-icon>
+            </a>
+          </td>
+        </tr>
+      </tbody>
+      <button type="button" class="btn btn-primary button1" (click)="onAddchildform()" >
+        <clr-icon shape="plus"></clr-icon> </button>
+    </table>
+  </div>
+</div>
+<!-- one to many code end here -->
+
+
+
+      <!-- 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 -->
+
+  <clr-modal [(clrModalOpen)]="modalUpdateButtonupdate2" [clrModalSize]="'xl'" [clrModalStaticBackdrop]="true">
+    <h3 class="modal-title">Update Buttonupdate2</h3>
+    <div class="modal-body">
+          <form [formGroup]="UpdateFormButtonupdate2" (ngSubmit)="onSubmitUpdateButtonupdate2(rowSelected.id)">
+        <div class="clr-row">
+          <div class="clr-col-md-4 clr-col-sm-12">
+            <label for="active">Active:</label>
+            <input type="text" id="active" formControlName="active" name="active" placeholder="Enter Active" class="clr-input">
+          </div>
+          <div class="clr-col-md-4 clr-col-sm-12">
+            <label for="description">Description:</label>
+            <input type="text" id="description" formControlName="description" name="description" placeholder="Enter Description" class="clr-input">
+          </div>
+          <div class="clr-col-md-4 clr-col-sm-12">
+            <label for="name">Name:</label>
+            <input type="text" id="name" formControlName="name" name="name" placeholder="Enter Name" class="clr-input">
+          </div>
+        </div>
+        <br>
+        <div class="modal-footer">
+          <button type="button" class="btn btn-outline" (click)="modalUpdateButtonupdate2 = false">Cancel</button>
+          <button type="submit" class="btn btn-primary" >Update</button>
+        </div>
+  </form>
+    </div>
+  
+  </clr-modal>
+
+
+
+  <clr-modal [(clrModalOpen)]="modalUpdateButtonUpdate" [clrModalSize]="'xl'" [clrModalStaticBackdrop]="true">
+    <h3 class="modal-title">Update ButtonUpdate</h3>
+    <div class="modal-body">
+          <form [formGroup]="UpdateFormButtonUpdate" (ngSubmit)="onSubmitUpdateButtonUpdate(rowSelected.id)">
+        <div class="clr-row">
+          <div class="clr-col-md-4 clr-col-sm-12">
+            <label for="description">Description:</label>
+            <input type="text" id="description" formControlName="description" name="description" placeholder="Enter Description" class="clr-input">
+          </div>
+          <div class="clr-col-md-4 clr-col-sm-12">
+            <label for="name">Name:</label>
+            <input type="text" id="name" formControlName="name" name="name" placeholder="Enter Name" class="clr-input">
+          </div>
+        </div>
+        <br>
+        <div class="modal-footer">
+          <button type="button" class="btn btn-outline" (click)="modalUpdateButtonUpdate = false">Cancel</button>
+          <button type="submit" class="btn btn-primary" >Update</button>
+        </div>
+  </form>
+    </div>
+  
+  </clr-modal>
\ No newline at end of file
diff --git a/test7oct-demot1-f/authsec_angular/frontend/angular-clarity-master/src/app/modules/main/BuilderComponents/angulardatatype/Ad8/Ad8.component.scss b/test7oct-demot1-f/authsec_angular/frontend/angular-clarity-master/src/app/modules/main/BuilderComponents/angulardatatype/Ad8/Ad8.component.scss
new file mode 100644
index 0000000..12f7fc8
--- /dev/null
+++ b/test7oct-demot1-f/authsec_angular/frontend/angular-clarity-master/src/app/modules/main/BuilderComponents/angulardatatype/Ad8/Ad8.component.scss
@@ -0,0 +1,85 @@
+//@import "../../../../assets/scss/var";
+.s-info-bar {
+  display: flex;
+  flex-direction: row;
+  justify-content: space-between;
+  button {
+    outline: none;
+  }
+}
+.delete,.heading{
+  text-align: center;
+  color: red;
+}
+.entry-pg {
+  width: 750px;
+}
+
+.button1::after {
+  content: none;
+}
+.button1:hover::after {
+  content: "ADD ROWS";
+}
+
+.section {
+  background-color: #dddddd;
+  height: 40px;
+}
+
+.section p {
+  //color: white;
+  padding: 10px;
+  font-size: 18px;
+}
+
+.clr-input {
+  color: #212529;
+  border: 1px solid #ced4da;
+  border-radius: 0.25rem;
+  padding: 0.75rem 0.75rem;
+  margin-top: 3px;
+  width: 100%;
+  margin-bottom: 10px;
+}
+
+.clr-file {
+  color: #212529;
+  border: 1px solid #ced4da;
+  border-radius: 0.25rem;
+  //padding: 0.6rem 0.75rem;
+  margin-top: 3px;
+  width: 100%;
+  margin-bottom: 10px;
+}
+
+.center {
+  text-align: center;
+}
+select{
+  width: 100%;
+  margin-top: 3px;
+  padding: 5px 5px;
+  border: 1px solid #ccc;
+  border-radius: 4px;
+}
+input[type=text],[type=date],[type=number],textarea {
+  width: 100%;
+  padding: 15px 15px;
+  background-color:rgb(255, 255, 255);
+ // margin: 8px 0;
+  display: inline-block;
+  border: 1px solid #ccc;
+  border-radius: 4px;
+  box-sizing: border-box;
+}
+.error_mess {
+  color: red;
+}
+.universal-section-header {
+  margin: 24px 0 10px 0;
+  font-weight: 600;
+  color: #1a237e;
+  letter-spacing: 0.5px;
+  font-size: 1.25rem;
+}
\ No newline at end of file
diff --git a/test7oct-demot1-f/authsec_angular/frontend/angular-clarity-master/src/app/modules/main/BuilderComponents/angulardatatype/Ad8/Ad8.component.ts b/test7oct-demot1-f/authsec_angular/frontend/angular-clarity-master/src/app/modules/main/BuilderComponents/angulardatatype/Ad8/Ad8.component.ts
new file mode 100644
index 0000000..6445dbe
--- /dev/null
+++ b/test7oct-demot1-f/authsec_angular/frontend/angular-clarity-master/src/app/modules/main/BuilderComponents/angulardatatype/Ad8/Ad8.component.ts
@@ -0,0 +1,478 @@
+import { Component, OnInit } from '@angular/core';
+import { ToastrService } from 'ngx-toastr';
+import { AlertService } from 'src/app/services/alert.service';
+import { Ad8service} from './Ad8.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 { Ad8cardvariable } from './Ad8_cardvariable';
+import { UserInfoService } from 'src/app/services/user-info.service';
+declare var JsBarcode: any; 
+@Component({
+  selector: 'app-Ad8',
+  templateUrl: './Ad8.component.html',
+  styleUrls: ['./Ad8.component.scss']
+})
+export class Ad8Component implements OnInit {
+  cardButton = Ad8cardvariable.cardButton;
+  cardmodeldata = Ad8cardvariable.cardmodeldata;
+  public dashboardArray: DashboardContentModel2[];
+  isCardview = Ad8cardvariable.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 = 'Ad8_formCode'
+tableName = 'Ad8';  checkFormCode; selected: any[] = []; constructor(
+    private extensionService: ExtensionService,
+private userInfoService:UserInfoService,
+    private mainService:Ad8service,
+    private alertService: AlertService,
+    private toastr: ToastrService,
+    private _fb: FormBuilder,
+  ) { }
+  private editInterval: any;
+// component button
+  public UpdateFormButtonupdate2: FormGroup;
+
+
+  public UpdateFormButtonUpdate: FormGroup;
+
+ 
+  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],
+
+
+
+
+
+support: this.supportinitLinesForm(),
+
+childform: this._fb.array([this.initchildformForm()]),
+
+
+ 
+
+
+
+
+
+
+
+
+
+  }); // component_button200
+// inser code start
+  this.UpdateFormButtonupdate2 = this._fb.group({
+    active: '',
+    description: '',
+    name: '',
+  });
+
+  // Update code end
+
+// inser code start
+  this.UpdateFormButtonUpdate = this._fb.group({
+    description: '',
+    name: '',
+  });
+
+  // Update code end
+
+ // 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 === "Ad8_formCode");
+      console.log(this.checkFormCode);
+      console.log(this.additionalFieldsFromBackend);
+      if (this.additionalFieldsFromBackend && this.additionalFieldsFromBackend.length > 0) {
+        this.additionalFieldsFromBackend.forEach(field => {
+          if (field.formCode === this.formcode) {
+            if (!this.entryForm.contains(field.extValue)) {
+              // Add the control only if it doesn't exist in the form
+              this.entryForm.addControl(field.extValue, this._fb.control(field.fieldValue));
+            }
+          }
+        });
+      }
+    });
+    console.log(this.entryForm.value);
+    // form code end 
+
+
+
+
+
+
+
+
+
+
+
+  }
+ ngOnDestroy(): void {
+    if (this.editInterval) {
+      clearInterval(this.editInterval);
+    }
+  }
+
+
+
+
+
+
+supportinitLinesForm() {   return this._fb.group({
+
+ 
+  description: [null],
+ 
+
+ 
+  name: [null],
+ 
+		
+
+});   } 
+		
+
+// one to many start
+ initchildformForm() {    return this._fb.group({ 
+
+
+ 	
+ active: [null],
+ 
+
+ 	
+ description: [null],
+ 
+
+ 	
+ name: [null],
+ 
+
+
+});  }  
+get childformcontrols() {return (this.entryForm.get("childform") as FormArray).controls;  }
+onAddchildform() {
+(<FormArray>this.entryForm.get("childform")).push(this.initchildformForm());  }
+onRemovechildform(index: number) {
+(<FormArray>this.entryForm.get("childform")).removeAt(index);  }
+ oneditchildform() {    this.childformcomponents.push({ 
+
+ 
+active: "",
+ 
+
+ 
+description: "",
+ 
+
+ 
+name: "",
+ 
+
+
+	  });  }  
+ deletechildformRow(index) {
+ this.childformcomponents.splice(index, 1); 
+ }  
+childformcomponents;
+ // one to many end 
+
+ error; 
+  getData() {
+    this.mainService.getAll().subscribe((data) => {
+      console.log(data);
+      this.product = data;
+this.product = [...this.product].reverse(); if(this.product.length==0){
+        this.error="No Data Available"
+     }   
+    },(error) => {
+      console.log(error);
+      if(error){
+       this.error="Server Error";
+     }
+    });
+  }
+  onEdit(row) {
+    this.rowSelected = row;
+
+
+
+
+
+
+
+
+this.childformcomponents = row.childform;
+
+
+    this.modalEdit = true;
+  }
+   onDelete(row) {
+    this.rowSelected = row;
+     this.modaldelete=true;
+  }
+  delete(id)
+  {
+    this.modaldelete = false;
+    console.log("in delete  "+id);
+    this.mainService.delete(id).subscribe(
+      (data) => {
+        console.log(data);
+        this.ngOnInit();
+  if (data) {				      this.toastr.success('Deleted successfully');      }
+    });
+  }
+    onUpdate(id) {
+    this.modalEdit = false;
+
+
+
+
+
+
+
+
+
+
+    //console.log("in update");
+    console.log("id  " + id);
+    console.log(this.rowSelected);
+    //console.log("out update");
+    this.mainService.update(id, this.rowSelected).subscribe(
+      (data) => {
+        console.log(data);
+        if (data || data.status >= 200 && data.status <= 299) {
+          this.toastr.success("Update Successfully");
+        }
+setTimeout(() => {
+      this.ngOnInit();
+    }, 500);
+
+
+
+
+
+
+
+
+
+
+      }, (error) => {
+        console.log(error);
+        if (error.status >= 200 && error.status <= 299) {
+          // this.toastr.success("update Succesfully");
+        }
+        if (error.status >= 400 && error.status <= 499) {
+          this.toastr.error("Not Updated");
+        }
+        if (error.status >= 500 && error.status <= 599) {
+          this.toastr.error("Not Updated");
+        }
+      });
+    setTimeout(() => {
+      this.ngOnInit();
+    }, 500);
+  } 
+onCreate() {
+     this.modalAdd=false;
+
+
+
+
+
+
+
+
+
+
+  this.mainService.create(this.entryForm.value).subscribe(
+    (data) => {
+      console.log(data);
+  if (data || data.status >= 200 && data.status <= 299) {
+          this.toastr.success("Added Successfully");
+        }
+setTimeout(() => {
+      this.ngOnInit();
+    }, 500);
+
+
+
+
+
+
+
+
+
+
+      }, (error) => {
+        console.log(error);
+        if (error.status >= 200 && error.status <= 299) {
+          // this.toastr.success("Added Succesfully");
+        }
+        if (error.status >= 400 && error.status <= 499) {
+          this.toastr.error("Not Added");
+        }
+        if (error.status >= 500 && error.status <= 599) {
+          this.toastr.error("Not Added");
+        }
+      });
+    setTimeout(() => {
+      this.ngOnInit();
+    }, 500);
+  }
+  goToAdd(row) {
+this.modalAdd = true; this.submitted = false;
+
+
+
+
+
+
+
+
+
+
+  }
+ submitted = false;
+onSubmit() {
+  console.log(this.entryForm.value);
+ this.submitted = true;
+  if (this.entryForm.invalid) {
+    return;
+  }this.onCreate();
+
+} 
+
+
+
+
+
+
+
+
+
+
+// updateaction
+
+// update button
+
+
+modalUpdateButtonupdate2 = false; 
+goToUpdateButtonupdate2() {
+  this.modalUpdateButtonupdate2=true;
+  }
+onSubmitUpdateButtonupdate2(id) {
+  console.log(this.UpdateFormButtonupdate2.value);
+  this.submitted=true;
+  if (this.UpdateFormButtonupdate2.invalid) {
+    return;
+  }
+  this.onUpdateButtonupdate2(id);
+}
+onUpdateButtonupdate2(id) {
+    this.modalUpdateButtonupdate2=false;
+   this.mainService.updateChildform(id,this.UpdateFormButtonupdate2.value).subscribe(data => {
+     console.log(data)
+     if (data.status >=200 && data.status <=209) {
+      this.toastr.success('Added successfully');
+  }
+  this.ngOnInit();
+   },(error) => {
+     console.error(error);
+     if ( error.status >= 200 && error.status <= 299) {
+       this.toastr.success("Update Successfully");
+     } 
+     if ( error.status >= 400 && error.status <= 499) {
+       this.toastr.error("Update Failed");
+     } 
+     if ( error.status >= 500 && error.status <= 599) {
+       this.toastr.error("Server Error");
+     } 
+     this.ngOnInit();
+   });
+     this.UpdateFormButtonupdate2.reset();
+ }
+//  update buuton code end
+
+
+
+// update button
+
+
+modalUpdateButtonUpdate = false; 
+goToUpdateButtonUpdate() {
+  this.modalUpdateButtonUpdate=true;
+  }
+onSubmitUpdateButtonUpdate(id) {
+  console.log(this.UpdateFormButtonUpdate.value);
+  this.submitted=true;
+  if (this.UpdateFormButtonUpdate.invalid) {
+    return;
+  }
+  this.onUpdateButtonUpdate(id);
+}
+onUpdateButtonUpdate(id) {
+    this.modalUpdateButtonUpdate=false;
+   this.mainService.updateSupport(id,this.UpdateFormButtonUpdate.value).subscribe(data => {
+     console.log(data)
+     if (data.status >=200 && data.status <=209) {
+      this.toastr.success('Added successfully');
+  }
+  this.ngOnInit();
+   },(error) => {
+     console.error(error);
+     if ( error.status >= 200 && error.status <= 299) {
+       this.toastr.success("Update Successfully");
+     } 
+     if ( error.status >= 400 && error.status <= 499) {
+       this.toastr.error("Update Failed");
+     } 
+     if ( error.status >= 500 && error.status <= 599) {
+       this.toastr.error("Server Error");
+     } 
+     this.ngOnInit();
+   });
+     this.UpdateFormButtonUpdate.reset();
+ }
+//  update buuton code end
+
+
+}
+
+
+
diff --git a/test7oct-demot1-f/authsec_angular/frontend/angular-clarity-master/src/app/modules/main/BuilderComponents/angulardatatype/Ad8/Ad8.service.ts b/test7oct-demot1-f/authsec_angular/frontend/angular-clarity-master/src/app/modules/main/BuilderComponents/angulardatatype/Ad8/Ad8.service.ts
new file mode 100644
index 0000000..30e6ea9
--- /dev/null
+++ b/test7oct-demot1-f/authsec_angular/frontend/angular-clarity-master/src/app/modules/main/BuilderComponents/angulardatatype/Ad8/Ad8.service.ts
@@ -0,0 +1,53 @@
+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 Ad8service{
+  private baseURL = "Ad8/Ad8" ;  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
+// update button code start
+updateChildform(id: number,Childform: any): Observable<any> {
+  return this.apiRequest.put(`Childform/Childform_update/`+ id, Childform);
+}
+
+// update button code start
+updateSupport(id: number,Support: any): Observable<any> {
+  return this.apiRequest.put(`Support/Support_update/`+ id, Support);
+}
+
+}
\ No newline at end of file
diff --git a/test7oct-demot1-f/authsec_angular/frontend/angular-clarity-master/src/app/modules/main/BuilderComponents/angulardatatype/Ad8/Ad8_cardvariable.ts b/test7oct-demot1-f/authsec_angular/frontend/angular-clarity-master/src/app/modules/main/BuilderComponents/angulardatatype/Ad8/Ad8_cardvariable.ts
new file mode 100644
index 0000000..b377f58
--- /dev/null
+++ b/test7oct-demot1-f/authsec_angular/frontend/angular-clarity-master/src/app/modules/main/BuilderComponents/angulardatatype/Ad8/Ad8_cardvariable.ts
@@ -0,0 +1,4 @@
+export const Ad8cardvariable = {
+    "cardButton": false,
+    "cardmodeldata": ``
+}
\ No newline at end of file
diff --git a/test7oct-demot1-f/authsec_angular/frontend/angular-clarity-master/src/app/modules/main/BuilderComponents/angulardatatype/Ad9/Ad9.component.html b/test7oct-demot1-f/authsec_angular/frontend/angular-clarity-master/src/app/modules/main/BuilderComponents/angulardatatype/Ad9/Ad9.component.html
new file mode 100644
index 0000000..77ced78
--- /dev/null
+++ b/test7oct-demot1-f/authsec_angular/frontend/angular-clarity-master/src/app/modules/main/BuilderComponents/angulardatatype/Ad9/Ad9.component.html
@@ -0,0 +1,420 @@
+<ol class="breadcrumb breadcrumb-arrow font-trirong">
+  <li><a href="javascript://"> Ad9</a></li>
+</ol>
+<div class="dg-wrapper">
+  <div class="clr-row">
+    <div class="clr-col-8">
+      <h3>Ad9 </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>
+
+
+
+ 
+ <!-- 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>
+
+
+
+ 
+  <!-- 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 Ad9
+ <!--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> Approved Field Status</label>
+  <input id="name" class="clr-input" type="text" [(ngModel)]="rowSelected.approved_field_status" name="approved_field_status" />
+</div>
+
+  </div> 
+
+
+<!-- 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 Ad9 
+
+
+
+
+  <!-- aeroplane icon -->
+    &nbsp; &nbsp; &nbsp; &nbsp;
+    <a *ngIf="userrole?.includes('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: 'Ad9_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>  Approved Field status:</label>
+	          <input class="clr-input"  type="text"  formControlName="approved_field_status" />         </div>
+
+ 
+ </div> 
+
+
+<!-- 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>
+        <button type="submit" class="btn btn-primary" (click)="onSubmit()">ADD</button>
+        </div>
+</form>
+  </div>
+</clr-modal>
+
+
+
+
+  <!-- htmlpopup -->
diff --git a/test7oct-demot1-f/authsec_angular/frontend/angular-clarity-master/src/app/modules/main/BuilderComponents/angulardatatype/Ad9/Ad9.component.scss b/test7oct-demot1-f/authsec_angular/frontend/angular-clarity-master/src/app/modules/main/BuilderComponents/angulardatatype/Ad9/Ad9.component.scss
new file mode 100644
index 0000000..12f7fc8
--- /dev/null
+++ b/test7oct-demot1-f/authsec_angular/frontend/angular-clarity-master/src/app/modules/main/BuilderComponents/angulardatatype/Ad9/Ad9.component.scss
@@ -0,0 +1,85 @@
+//@import "../../../../assets/scss/var";
+.s-info-bar {
+  display: flex;
+  flex-direction: row;
+  justify-content: space-between;
+  button {
+    outline: none;
+  }
+}
+.delete,.heading{
+  text-align: center;
+  color: red;
+}
+.entry-pg {
+  width: 750px;
+}
+
+.button1::after {
+  content: none;
+}
+.button1:hover::after {
+  content: "ADD ROWS";
+}
+
+.section {
+  background-color: #dddddd;
+  height: 40px;
+}
+
+.section p {
+  //color: white;
+  padding: 10px;
+  font-size: 18px;
+}
+
+.clr-input {
+  color: #212529;
+  border: 1px solid #ced4da;
+  border-radius: 0.25rem;
+  padding: 0.75rem 0.75rem;
+  margin-top: 3px;
+  width: 100%;
+  margin-bottom: 10px;
+}
+
+.clr-file {
+  color: #212529;
+  border: 1px solid #ced4da;
+  border-radius: 0.25rem;
+  //padding: 0.6rem 0.75rem;
+  margin-top: 3px;
+  width: 100%;
+  margin-bottom: 10px;
+}
+
+.center {
+  text-align: center;
+}
+select{
+  width: 100%;
+  margin-top: 3px;
+  padding: 5px 5px;
+  border: 1px solid #ccc;
+  border-radius: 4px;
+}
+input[type=text],[type=date],[type=number],textarea {
+  width: 100%;
+  padding: 15px 15px;
+  background-color:rgb(255, 255, 255);
+ // margin: 8px 0;
+  display: inline-block;
+  border: 1px solid #ccc;
+  border-radius: 4px;
+  box-sizing: border-box;
+}
+.error_mess {
+  color: red;
+}
+.universal-section-header {
+  margin: 24px 0 10px 0;
+  font-weight: 600;
+  color: #1a237e;
+  letter-spacing: 0.5px;
+  font-size: 1.25rem;
+}
\ No newline at end of file
diff --git a/test7oct-demot1-f/authsec_angular/frontend/angular-clarity-master/src/app/modules/main/BuilderComponents/angulardatatype/Ad9/Ad9.component.ts b/test7oct-demot1-f/authsec_angular/frontend/angular-clarity-master/src/app/modules/main/BuilderComponents/angulardatatype/Ad9/Ad9.component.ts
new file mode 100644
index 0000000..65bcd67
--- /dev/null
+++ b/test7oct-demot1-f/authsec_angular/frontend/angular-clarity-master/src/app/modules/main/BuilderComponents/angulardatatype/Ad9/Ad9.component.ts
@@ -0,0 +1,282 @@
+import { Component, OnInit } from '@angular/core';
+import { ToastrService } from 'ngx-toastr';
+import { AlertService } from 'src/app/services/alert.service';
+import { Ad9service} from './Ad9.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 { Ad9cardvariable } from './Ad9_cardvariable';
+import { UserInfoService } from 'src/app/services/user-info.service';
+declare var JsBarcode: any; 
+@Component({
+  selector: 'app-Ad9',
+  templateUrl: './Ad9.component.html',
+  styleUrls: ['./Ad9.component.scss']
+})
+export class Ad9Component implements OnInit {
+  cardButton = Ad9cardvariable.cardButton;
+  cardmodeldata = Ad9cardvariable.cardmodeldata;
+  public dashboardArray: DashboardContentModel2[];
+  isCardview = Ad9cardvariable.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 = 'Ad9_formCode'
+tableName = 'Ad9';  checkFormCode; selected: any[] = []; constructor(
+    private extensionService: ExtensionService,
+private userInfoService:UserInfoService,
+    private mainService:Ad9service,
+    private alertService: AlertService,
+    private toastr: ToastrService,
+    private _fb: FormBuilder,
+  ) { }
+  private editInterval: any;
+// component button 
+  ngOnInit(): void {
+    if(this.cardmodeldata !== ''){
+     this.cardmodal = JSON.parse(this.cardmodeldata);
+    this.dashboardArray = this.cardmodal.dashboard.slice();
+    console.log(this.dashboardArray)
+    }
+    this.userrole=this.userInfoService.getRoles();
+    this.getData();
+    this.entryForm = this._fb.group({
+name : [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 === "Ad9_formCode");
+      console.log(this.checkFormCode);
+      console.log(this.additionalFieldsFromBackend);
+      if (this.additionalFieldsFromBackend && this.additionalFieldsFromBackend.length > 0) {
+        this.additionalFieldsFromBackend.forEach(field => {
+          if (field.formCode === this.formcode) {
+            if (!this.entryForm.contains(field.extValue)) {
+              // Add the control only if it doesn't exist in the form
+              this.entryForm.addControl(field.extValue, this._fb.control(field.fieldValue));
+            }
+          }
+        });
+      }
+    });
+    console.log(this.entryForm.value);
+    // form code end 
+
+
+
+
+
+  }
+ ngOnDestroy(): void {
+    if (this.editInterval) {
+      clearInterval(this.editInterval);
+    }
+  }
+
+approved_field_tablename = 'Ad9' 
+
+ error; 
+  getData() {
+    this.mainService.getAll().subscribe((data) => {
+      console.log(data);
+      this.product = data;
+this.product = [...this.product].reverse(); if(this.product.length==0){
+        this.error="No Data Available"
+     }   
+    },(error) => {
+      console.log(error);
+      if(error){
+       this.error="Server Error";
+     }
+    });
+  }
+  onEdit(row) {
+    this.rowSelected = row;
+
+
+  this.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;
+
+
+
+
+    //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);
+
+// 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;
+
+
+
+
+  }
+ submitted = false;
+onSubmit() {
+  console.log(this.entryForm.value);
+ this.submitted = true;
+  if (this.entryForm.invalid) {
+    return;
+  }this.onCreate();
+
+} 
+
+
+ // 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/test7oct-demot1-f/authsec_angular/frontend/angular-clarity-master/src/app/modules/main/BuilderComponents/angulardatatype/Ad9/Ad9.service.ts b/test7oct-demot1-f/authsec_angular/frontend/angular-clarity-master/src/app/modules/main/BuilderComponents/angulardatatype/Ad9/Ad9.service.ts
new file mode 100644
index 0000000..9b477f1
--- /dev/null
+++ b/test7oct-demot1-f/authsec_angular/frontend/angular-clarity-master/src/app/modules/main/BuilderComponents/angulardatatype/Ad9/Ad9.service.ts
@@ -0,0 +1,40 @@
+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 Ad9service{
+  private baseURL = "Ad9/Ad9" ;  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);
+  }
+
+
+// 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/test7oct-demot1-f/authsec_angular/frontend/angular-clarity-master/src/app/modules/main/BuilderComponents/angulardatatype/Ad9/Ad9_cardvariable.ts b/test7oct-demot1-f/authsec_angular/frontend/angular-clarity-master/src/app/modules/main/BuilderComponents/angulardatatype/Ad9/Ad9_cardvariable.ts
new file mode 100644
index 0000000..dca4e0f
--- /dev/null
+++ b/test7oct-demot1-f/authsec_angular/frontend/angular-clarity-master/src/app/modules/main/BuilderComponents/angulardatatype/Ad9/Ad9_cardvariable.ts
@@ -0,0 +1,4 @@
+export const Ad9cardvariable = {
+    "cardButton": false,
+    "cardmodeldata": ``
+}
\ No newline at end of file
diff --git a/test7oct-demot1-f/authsec_angular/frontend/angular-clarity-master/src/app/modules/main/BuilderComponents/angulardatatype/Adv1/Adv1.component.html b/test7oct-demot1-f/authsec_angular/frontend/angular-clarity-master/src/app/modules/main/BuilderComponents/angulardatatype/Adv1/Adv1.component.html
new file mode 100644
index 0000000..3542316
--- /dev/null
+++ b/test7oct-demot1-f/authsec_angular/frontend/angular-clarity-master/src/app/modules/main/BuilderComponents/angulardatatype/Adv1/Adv1.component.html
@@ -0,0 +1,1380 @@
+<ol class="breadcrumb breadcrumb-arrow font-trirong">
+  <li><a href="javascript://"> Adv1</a></li>
+</ol>
+<div class="dg-wrapper">
+  <div class="clr-row">
+    <div class="clr-col-8">
+      <h3>Adv1 </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]="'ismale'"> <ng-container *clrDgHideableColumn="{hidden: false}"> ismale
+						    </ng-container></clr-dg-column>
+
+
+<clr-dg-column [clrDgField]="'idfemale'"> <ng-container *clrDgHideableColumn="{hidden: false}"> idfemale
+						    </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]="' t1'"> <ng-container *clrDgHideableColumn="{hidden: false}"> t1
+						    </ng-container></clr-dg-column>
+   
+
+ 
+<clr-dg-column [clrDgField]="' t2'"> <ng-container *clrDgHideableColumn="{hidden: false}"> t2
+						    </ng-container></clr-dg-column>
+   
+
+ 
+<clr-dg-column [clrDgField]="' t4'"> <ng-container *clrDgHideableColumn="{hidden: false}"> t4
+						    </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.ismale }}</clr-dg-cell>
+
+
+<clr-dg-cell>{{user.idfemale }}</clr-dg-cell>
+
+
+
+ 
+<clr-dg-cell>{{user.test1}}</clr-dg-cell>
+   
+
+ 
+<clr-dg-cell>{{user.test2}}</clr-dg-cell>
+   
+
+
+
+
+
+ 
+<clr-dg-cell>{{user.t1}}</clr-dg-cell>
+   
+
+ 
+<clr-dg-cell>{{user.t2}}</clr-dg-cell>
+   
+
+ 
+<clr-dg-cell>{{user.t4}}</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 Adv1
+ <!--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> ismale</label>             
+           <clr-radio-container clrInline style="margin-top: 0;">
+               
+ 
+               <clr-radio-wrapper>
+                                 <input type="radio" clrRadio  (change)="updateismaleEdit('no')" [checked]="rowSelected.ismale  === 'no'" />
+                                 <label>no</label>
+                               </clr-radio-wrapper>
+                
+
+ 
+               <clr-radio-wrapper>
+                                 <input type="radio" clrRadio  (change)="updateismaleEdit('other')" [checked]="rowSelected.ismale  === 'other'" />
+                                 <label>other</label>
+                               </clr-radio-wrapper>
+                
+
+ 
+               <clr-radio-wrapper>
+                                 <input type="radio" clrRadio  (change)="updateismaleEdit('yes')" [checked]="rowSelected.ismale  === 'yes'" />
+                                 <label>yes</label>
+                               </clr-radio-wrapper>
+                
+
+               </clr-radio-container>           </div>
+
+ <div class="clr-col-sm-12">            
+            <label> idfemale</label>             
+           <clr-radio-container clrInline style="margin-top: 0;">
+               
+ 
+               <clr-radio-wrapper>
+                                 <input type="radio" clrRadio  (change)="updateidfemaleEdit('no')" [checked]="rowSelected.idfemale  === 'no'" />
+                                 <label>no</label>
+                               </clr-radio-wrapper>
+                
+
+ 
+               <clr-radio-wrapper>
+                                 <input type="radio" clrRadio  (change)="updateidfemaleEdit('other')" [checked]="rowSelected.idfemale  === 'other'" />
+                                 <label>other</label>
+                               </clr-radio-wrapper>
+                
+
+ 
+               <clr-radio-wrapper>
+                                 <input type="radio" clrRadio  (change)="updateidfemaleEdit('yes')" [checked]="rowSelected.idfemale  === 'yes'" />
+                                 <label>yes</label>
+                               </clr-radio-wrapper>
+                
+
+               </clr-radio-container>           </div>
+
+<!-- multiselect checkbox field start -->
+<div class="clr-col-sm-12">
+ <label> checkbox Field</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 -->
+
+<!-- multiselect checkbox field start -->
+<div class="clr-col-sm-12">
+ <label> checkbox Field2</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="t1" name="t1" [(ngModel)]="rowSelected.t1" class="clr-checkbox" /> 
+<label for="t1" class="clr-control-label"> t1</label> </div>
+
+       
+
+ 
+
+      <div class="clr-checkbox-wrapper"> <input type="checkbox" id="t2" name="t2" [(ngModel)]="rowSelected.t2" class="clr-checkbox" /> 
+<label for="t2" class="clr-control-label"> t2</label> </div>
+
+       
+
+ 
+
+      <div class="clr-checkbox-wrapper"> <input type="checkbox" id="t4" name="t4" [(ngModel)]="rowSelected.t4" class="clr-checkbox" /> 
+<label for="t4" class="clr-control-label"> t4</label> </div>
+
+       
+
+
+    </div>
+  </div>
+</div>
+<!-- multiselect checkbox field end -->
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+  </div> 
+
+
+
+
+
+
+
+
+<h6> List of fileupload_field</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 FileDatafileupload_field; let i=index">
+              <td style="width: 70px;"><input type="text" class="clr-input"  value={{i+1}} [readonly]="true">  </td>
+              <td><input type="file" (change)="onFileChangedfileupload_field($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)="deleteRowfileupload_field(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)="onAddLinesfileupload_field()">
+            <clr-icon shape="plus"></clr-icon>
+          </button>
+ 
+        </table> </div>
+
+<h6> List of fileupload_field2</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 FileDatafileupload_field2; let i=index">
+              <td style="width: 70px;"><input type="text" class="clr-input"  value={{i+1}} [readonly]="true">  </td>
+              <td><input type="file" (change)="onFileChangedfileupload_field2($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)="deleteRowfileupload_field2(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)="onAddLinesfileupload_field2()">
+            <clr-icon shape="plus"></clr-icon>
+          </button>
+ 
+        </table> </div>
+
+<h6> List of imageupload_field</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 FileDataimageupload_field; let i=index">
+              <td style="width: 70px;"><input type="text" class="clr-input"  value={{i+1}} [readonly]="true">  </td>
+              <td><input type="file" (change)="onFileChangedimageupload_field($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)="deleteRowimageupload_field(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)="onAddLinesimageupload_field()">
+            <clr-icon shape="plus"></clr-icon>
+          </button>
+ 
+        </table> </div>
+
+<h6> List of imageupload_field2</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 FileDataimageupload_field2; let i=index">
+              <td style="width: 70px;"><input type="text" class="clr-input"  value={{i+1}} [readonly]="true">  </td>
+              <td><input type="file" (change)="onFileChangedimageupload_field2($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)="deleteRowimageupload_field2(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)="onAddLinesimageupload_field2()">
+            <clr-icon shape="plus"></clr-icon>
+          </button>
+ 
+        </table> </div>
+
+<h6> List of audio_field</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 FileDataaudio_field; let i=index">
+              <td style="width: 70px;"><input type="text" class="clr-input"  value={{i+1}} [readonly]="true">  </td>
+              <td><input type="file" (change)="onFileChangedaudio_field($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)="deleteRowaudio_field(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)="onAddLinesaudio_field()">
+            <clr-icon shape="plus"></clr-icon>
+          </button>
+ 
+        </table> </div>
+
+<h6> List of audio_field2</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 FileDataaudio_field2; let i=index">
+              <td style="width: 70px;"><input type="text" class="clr-input"  value={{i+1}} [readonly]="true">  </td>
+              <td><input type="file" (change)="onFileChangedaudio_field2($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)="deleteRowaudio_field2(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)="onAddLinesaudio_field2()">
+            <clr-icon shape="plus"></clr-icon>
+          </button>
+ 
+        </table> </div>
+
+<h6> List of video_field</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 FileDatavideo_field; let i=index">
+              <td style="width: 70px;"><input type="text" class="clr-input"  value={{i+1}} [readonly]="true">  </td>
+              <td><input type="file" (change)="onFileChangedvideo_field($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)="deleteRowvideo_field(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)="onAddLinesvideo_field()">
+            <clr-icon shape="plus"></clr-icon>
+          </button>
+ 
+        </table> </div>
+
+<h6> List of video_field2</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 FileDatavideo_field2; let i=index">
+              <td style="width: 70px;"><input type="text" class="clr-input"  value={{i+1}} [readonly]="true">  </td>
+              <td><input type="file" (change)="onFileChangedvideo_field2($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)="deleteRowvideo_field2(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)="onAddLinesvideo_field2()">
+            <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 Adv1 
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+  <!-- aeroplane icon -->
+    &nbsp; &nbsp; &nbsp; &nbsp;
+    <a *ngIf="userrole?.includes('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: 'Adv1_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>ismale</label>
+            <clr-radio-container clrInline style="margin-top: 0;"> 
+
+ 
+   <clr-radio-wrapper>
+                <input type="radio" clrRadio formControlName="ismale" (change)="updateismale('no')" [checked]="entryForm.get('ismale').value === 'no'" />
+                <label> no </label>
+              </clr-radio-wrapper>     
+ 
+
+ 
+   <clr-radio-wrapper>
+                <input type="radio" clrRadio formControlName="ismale" (change)="updateismale('other')" [checked]="entryForm.get('ismale').value === 'other'" />
+                <label> other </label>
+              </clr-radio-wrapper>     
+ 
+
+ 
+   <clr-radio-wrapper>
+                <input type="radio" clrRadio formControlName="ismale" (change)="updateismale('yes')" [checked]="entryForm.get('ismale').value === 'yes'" />
+                <label> yes </label>
+              </clr-radio-wrapper>     
+ 
+
+    
+ </clr-radio-container>
+          </div> 
+
+
+
+
+<div class="clr-col-sm-12">
+            <label>idfemale</label>
+            <clr-radio-container clrInline style="margin-top: 0;"> 
+
+ 
+   <clr-radio-wrapper>
+                <input type="radio" clrRadio formControlName="idfemale" (change)="updateidfemale('no')" [checked]="entryForm.get('idfemale').value === 'no'" />
+                <label> no </label>
+              </clr-radio-wrapper>     
+ 
+
+ 
+   <clr-radio-wrapper>
+                <input type="radio" clrRadio formControlName="idfemale" (change)="updateidfemale('other')" [checked]="entryForm.get('idfemale').value === 'other'" />
+                <label> other </label>
+              </clr-radio-wrapper>     
+ 
+
+ 
+   <clr-radio-wrapper>
+                <input type="radio" clrRadio formControlName="idfemale" (change)="updateidfemale('yes')" [checked]="entryForm.get('idfemale').value === 'yes'" />
+                <label> yes </label>
+              </clr-radio-wrapper>     
+ 
+
+    
+ </clr-radio-container>
+          </div> 
+
+
+
+
+<!-- multiselect checkbox field start -->
+     <div class="clr-col-sm-12">       
+		<label> checkbox Field</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 -->
+
+<!-- multiselect checkbox field start -->
+     <div class="clr-col-sm-12">       
+		<label> checkbox Field2</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="t1" formControlName="t1"  class="clr-checkbox" />       
+				    <label for="t1" class="clr-control-label">t1</label>  </div>
+	                            
+
+ 
+			<div class="clr-checkbox-wrapper">           
+				<input type="checkbox" id="t2" formControlName="t2"  class="clr-checkbox" />       
+				    <label for="t2" class="clr-control-label">t2</label>  </div>
+	                            
+
+ 
+			<div class="clr-checkbox-wrapper">           
+				<input type="checkbox" id="t4" formControlName="t4"  class="clr-checkbox" />       
+				    <label for="t4" class="clr-control-label">t4</label>  </div>
+	                            
+
+ </div>       </div>     </div>
+	              <!-- multiselect checkbox field end -->
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 
+ </div> 
+
+
+
+
+
+
+
+
+<h6> List of fileupload_field</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 FileDatafileupload_field; let i=index">
+             <td style="width: 70px;"><input type="text" class="clr-input"  value={{i+1}} [readonly]="true">  </td>
+             <td><input type="file" (change)="onFileChangedfileupload_field($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)="deleteRowfileupload_field(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)="onAddLinesfileupload_field()">
+           <clr-icon shape="plus"></clr-icon>
+         </button>
+
+       </table> </div>
+
+<h6> List of fileupload_field2</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 FileDatafileupload_field2; let i=index">
+             <td style="width: 70px;"><input type="text" class="clr-input"  value={{i+1}} [readonly]="true">  </td>
+             <td><input type="file" (change)="onFileChangedfileupload_field2($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)="deleteRowfileupload_field2(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)="onAddLinesfileupload_field2()">
+           <clr-icon shape="plus"></clr-icon>
+         </button>
+
+       </table> </div>
+
+<h6> List of imageupload_field</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 FileDataimageupload_field; let i=index">
+             <td style="width: 70px;"><input type="text" class="clr-input"  value={{i+1}} [readonly]="true">  </td>
+             <td><input type="file" (change)="onFileChangedimageupload_field($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)="deleteRowimageupload_field(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)="onAddLinesimageupload_field()">
+           <clr-icon shape="plus"></clr-icon>
+         </button>
+
+       </table> </div>
+
+<h6> List of imageupload_field2</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 FileDataimageupload_field2; let i=index">
+             <td style="width: 70px;"><input type="text" class="clr-input"  value={{i+1}} [readonly]="true">  </td>
+             <td><input type="file" (change)="onFileChangedimageupload_field2($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)="deleteRowimageupload_field2(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)="onAddLinesimageupload_field2()">
+           <clr-icon shape="plus"></clr-icon>
+         </button>
+
+       </table> </div>
+
+<h6> List of audio_field</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 FileDataaudio_field; let i=index">
+             <td style="width: 70px;"><input type="text" class="clr-input"  value={{i+1}} [readonly]="true">  </td>
+             <td><input type="file" (change)="onFileChangedaudio_field($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)="deleteRowaudio_field(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)="onAddLinesaudio_field()">
+           <clr-icon shape="plus"></clr-icon>
+         </button>
+
+       </table> </div>
+
+<h6> List of audio_field2</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 FileDataaudio_field2; let i=index">
+             <td style="width: 70px;"><input type="text" class="clr-input"  value={{i+1}} [readonly]="true">  </td>
+             <td><input type="file" (change)="onFileChangedaudio_field2($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)="deleteRowaudio_field2(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)="onAddLinesaudio_field2()">
+           <clr-icon shape="plus"></clr-icon>
+         </button>
+
+       </table> </div>
+
+<h6> List of video_field</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 FileDatavideo_field; let i=index">
+             <td style="width: 70px;"><input type="text" class="clr-input"  value={{i+1}} [readonly]="true">  </td>
+             <td><input type="file" (change)="onFileChangedvideo_field($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)="deleteRowvideo_field(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)="onAddLinesvideo_field()">
+           <clr-icon shape="plus"></clr-icon>
+         </button>
+
+       </table> </div>
+
+<h6> List of video_field2</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 FileDatavideo_field2; let i=index">
+             <td style="width: 70px;"><input type="text" class="clr-input"  value={{i+1}} [readonly]="true">  </td>
+             <td><input type="file" (change)="onFileChangedvideo_field2($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)="deleteRowvideo_field2(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)="onAddLinesvideo_field2()">
+           <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/test7oct-demot1-f/authsec_angular/frontend/angular-clarity-master/src/app/modules/main/BuilderComponents/angulardatatype/Adv1/Adv1.component.scss b/test7oct-demot1-f/authsec_angular/frontend/angular-clarity-master/src/app/modules/main/BuilderComponents/angulardatatype/Adv1/Adv1.component.scss
new file mode 100644
index 0000000..12f7fc8
--- /dev/null
+++ b/test7oct-demot1-f/authsec_angular/frontend/angular-clarity-master/src/app/modules/main/BuilderComponents/angulardatatype/Adv1/Adv1.component.scss
@@ -0,0 +1,85 @@
+//@import "../../../../assets/scss/var";
+.s-info-bar {
+  display: flex;
+  flex-direction: row;
+  justify-content: space-between;
+  button {
+    outline: none;
+  }
+}
+.delete,.heading{
+  text-align: center;
+  color: red;
+}
+.entry-pg {
+  width: 750px;
+}
+
+.button1::after {
+  content: none;
+}
+.button1:hover::after {
+  content: "ADD ROWS";
+}
+
+.section {
+  background-color: #dddddd;
+  height: 40px;
+}
+
+.section p {
+  //color: white;
+  padding: 10px;
+  font-size: 18px;
+}
+
+.clr-input {
+  color: #212529;
+  border: 1px solid #ced4da;
+  border-radius: 0.25rem;
+  padding: 0.75rem 0.75rem;
+  margin-top: 3px;
+  width: 100%;
+  margin-bottom: 10px;
+}
+
+.clr-file {
+  color: #212529;
+  border: 1px solid #ced4da;
+  border-radius: 0.25rem;
+  //padding: 0.6rem 0.75rem;
+  margin-top: 3px;
+  width: 100%;
+  margin-bottom: 10px;
+}
+
+.center {
+  text-align: center;
+}
+select{
+  width: 100%;
+  margin-top: 3px;
+  padding: 5px 5px;
+  border: 1px solid #ccc;
+  border-radius: 4px;
+}
+input[type=text],[type=date],[type=number],textarea {
+  width: 100%;
+  padding: 15px 15px;
+  background-color:rgb(255, 255, 255);
+ // margin: 8px 0;
+  display: inline-block;
+  border: 1px solid #ccc;
+  border-radius: 4px;
+  box-sizing: border-box;
+}
+.error_mess {
+  color: red;
+}
+.universal-section-header {
+  margin: 24px 0 10px 0;
+  font-weight: 600;
+  color: #1a237e;
+  letter-spacing: 0.5px;
+  font-size: 1.25rem;
+}
\ No newline at end of file
diff --git a/test7oct-demot1-f/authsec_angular/frontend/angular-clarity-master/src/app/modules/main/BuilderComponents/angulardatatype/Adv1/Adv1.component.ts b/test7oct-demot1-f/authsec_angular/frontend/angular-clarity-master/src/app/modules/main/BuilderComponents/angulardatatype/Adv1/Adv1.component.ts
new file mode 100644
index 0000000..c6ec0e8
--- /dev/null
+++ b/test7oct-demot1-f/authsec_angular/frontend/angular-clarity-master/src/app/modules/main/BuilderComponents/angulardatatype/Adv1/Adv1.component.ts
@@ -0,0 +1,957 @@
+import { Component, OnInit } from '@angular/core';
+import { ToastrService } from 'ngx-toastr';
+import { AlertService } from 'src/app/services/alert.service';
+import { Adv1service} from './Adv1.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 { Adv1cardvariable } from './Adv1_cardvariable';
+import { UserInfoService } from 'src/app/services/user-info.service';
+declare var JsBarcode: any; 
+@Component({
+  selector: 'app-Adv1',
+  templateUrl: './Adv1.component.html',
+  styleUrls: ['./Adv1.component.scss']
+})
+export class Adv1Component implements OnInit {
+  cardButton = Adv1cardvariable.cardButton;
+  cardmodeldata = Adv1cardvariable.cardmodeldata;
+  public dashboardArray: DashboardContentModel2[];
+  isCardview = Adv1cardvariable.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 = 'Adv1_formCode'
+tableName = 'Adv1';  checkFormCode; selected: any[] = []; constructor(
+    private extensionService: ExtensionService,
+private userInfoService:UserInfoService,
+    private mainService:Adv1service,
+    private alertService: AlertService,
+    private toastr: ToastrService,
+    private _fb: FormBuilder,
+  ) { }
+  private editInterval: any;
+// component button 
+  ngOnInit(): void {
+    if(this.cardmodeldata !== ''){
+     this.cardmodal = JSON.parse(this.cardmodeldata);
+    this.dashboardArray = this.cardmodal.dashboard.slice();
+    console.log(this.dashboardArray)
+    }
+    this.userrole=this.userInfoService.getRoles();
+    this.getData();
+    this.entryForm = this._fb.group({
+ismale : [null],
+
+idfemale : [null],
+
+  
+ 
+test1:[false],
+   
+
+ 
+test2:[false],
+   
+
+
+  
+ 
+t1:[false],
+   
+
+ 
+t2:[false],
+   
+
+ 
+t4:[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 === "Adv1_formCode");
+      console.log(this.checkFormCode);
+      console.log(this.additionalFieldsFromBackend);
+      if (this.additionalFieldsFromBackend && this.additionalFieldsFromBackend.length > 0) {
+        this.additionalFieldsFromBackend.forEach(field => {
+          if (field.formCode === this.formcode) {
+            if (!this.entryForm.contains(field.extValue)) {
+              // Add the control only if it doesn't exist in the form
+              this.entryForm.addControl(field.extValue, this._fb.control(field.fieldValue));
+            }
+          }
+        });
+      }
+    });
+    console.log(this.entryForm.value);
+    // form code end 
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+  }
+ ngOnDestroy(): void {
+    if (this.editInterval) {
+      clearInterval(this.editInterval);
+    }
+  }
+
+
+
+
+
+
+
+
+
+
+
+FileDataImageupload_field: any[];
+  selectedImageupload_field: any[];
+
+FileDataImageupload_field2: any[];
+  selectedImageupload_field2: any[];
+
+FileDataAudio_field: any[];
+  selectedAudio_field: any[];
+
+FileDataAudio_field2: any[];
+  selectedAudio_field2: any[];
+
+FileDataVideo_field: any[];
+  selectedVideo_field: any[];
+
+
+FileDataVideo_field2: any[];
+  selectedVideo_field2: any[];
+
+
+ error; 
+  getData() {
+    this.mainService.getAll().subscribe((data) => {
+      console.log(data);
+      this.product = data;
+this.product = [...this.product].reverse(); if(this.product.length==0){
+        this.error="No Data Available"
+     }   
+    },(error) => {
+      console.log(error);
+      if(error){
+       this.error="Server Error";
+     }
+    });
+  }
+  onEdit(row) {
+    this.rowSelected = row;
+
+
+
+
+
+
+
+
+    this.selectedfileupload_field = [];
+    this.mainService.uploadfilegetByIdfileupload_field(row.id,this.tableName).subscribe(uploaddata =>{
+      console.log(uploaddata);
+      this.FileDatafileupload_field = uploaddata;
+    
+    })
+
+    this.selectedfileupload_field2 = [];
+    this.mainService.uploadfilegetByIdfileupload_field2(row.id,this.tableName).subscribe(uploaddata =>{
+      console.log(uploaddata);
+      this.FileDatafileupload_field2 = uploaddata;
+    
+    })
+
+    this.selectedimageupload_field = [];
+    this.mainService.uploadImageupload_fieldgetById(row.id,this.tableName).subscribe(uploaddata =>{
+      console.log(uploaddata);
+      this.FileDataimageupload_field = uploaddata;
+    
+    })
+
+    this.selectedimageupload_field2 = [];
+    this.mainService.uploadImageupload_field2getById(row.id,this.tableName).subscribe(uploaddata =>{
+      console.log(uploaddata);
+      this.FileDataimageupload_field2 = uploaddata;
+    
+    })
+
+    this.selectedaudio_field = [];
+    this.mainService.uploadAudio_fieldgetById(row.id,this.tableName).subscribe(uploaddata =>{
+      console.log(uploaddata);
+      this.FileDataaudio_field = uploaddata;
+    
+    })
+
+    this.selectedaudio_field2 = [];
+    this.mainService.uploadAudio_field2getById(row.id,this.tableName).subscribe(uploaddata =>{
+      console.log(uploaddata);
+      this.FileDataaudio_field2 = uploaddata;
+    
+    })
+
+    this.selectedvideo_field = [];
+    this.mainService.uploadVideo_fieldgetById(row.id,this.tableName).subscribe(uploaddata =>{
+      console.log(uploaddata);
+      this.FileDatavideo_field = uploaddata;
+    
+    })
+
+    this.selectedvideo_field2 = [];
+    this.mainService.uploadVideo_field2getById(row.id,this.tableName).subscribe(uploaddata =>{
+      console.log(uploaddata);
+      this.FileDatavideo_field2 = 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.selectedfileupload_field.length; i++){
+
+  this.mainService.uploadfilefileupload_field(data.id,this.tableName,this.selectedfileupload_field[i]).subscribe(uploaddata =>{
+    console.log(uploaddata);
+  })
+}
+
+for (let i = 0; i < this.selectedfileupload_field2.length; i++){
+
+  this.mainService.uploadfilefileupload_field2(data.id,this.tableName,this.selectedfileupload_field2[i]).subscribe(uploaddata =>{
+    console.log(uploaddata);
+  })
+}
+
+for (let i = 0; i < this.selectedimageupload_field.length; i++){
+
+  this.mainService.uploadImageupload_field(data.id,this.tableName,this.selectedimageupload_field[i]).subscribe(uploaddata =>{
+    console.log(uploaddata);
+  })
+}
+
+for (let i = 0; i < this.selectedimageupload_field2.length; i++){
+
+  this.mainService.uploadImageupload_field2(data.id,this.tableName,this.selectedimageupload_field2[i]).subscribe(uploaddata =>{
+    console.log(uploaddata);
+  })
+}
+
+for (let i = 0; i < this.selectedaudio_field.length; i++){
+
+  this.mainService.uploadAudio_field(data.id,this.tableName,this.selectedaudio_field[i]).subscribe(uploaddata =>{
+    console.log(uploaddata);
+  })
+}
+
+for (let i = 0; i < this.selectedaudio_field2.length; i++){
+
+  this.mainService.uploadAudio_field2(data.id,this.tableName,this.selectedaudio_field2[i]).subscribe(uploaddata =>{
+    console.log(uploaddata);
+  })
+}
+
+for (let i = 0; i < this.selectedvideo_field.length; i++){
+
+  this.mainService.uploadVideo_field(data.id,this.tableName,this.selectedvideo_field[i]).subscribe(uploaddata =>{
+    console.log(uploaddata);
+  })
+}
+
+for (let i = 0; i < this.selectedvideo_field2.length; i++){
+
+  this.mainService.uploadVideo_field2(data.id,this.tableName,this.selectedvideo_field2[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.selectedfileupload_field.length; i++){
+
+  this.mainService.uploadfilefileupload_field(data.id,this.tableName,this.selectedfileupload_field[i]).subscribe(uploaddata =>{
+    console.log(uploaddata);
+  })
+}
+
+for (let i = 0; i < this.selectedfileupload_field2.length; i++){
+
+  this.mainService.uploadfilefileupload_field2(data.id,this.tableName,this.selectedfileupload_field2[i]).subscribe(uploaddata =>{
+    console.log(uploaddata);
+  })
+}
+
+for (let i = 0; i < this.selectedimageupload_field.length; i++){
+
+  this.mainService.uploadImageupload_field(data.id,this.tableName,this.selectedimageupload_field[i]).subscribe(uploaddata =>{
+    console.log(uploaddata);
+  })
+}
+
+for (let i = 0; i < this.selectedimageupload_field2.length; i++){
+
+  this.mainService.uploadImageupload_field2(data.id,this.tableName,this.selectedimageupload_field2[i]).subscribe(uploaddata =>{
+    console.log(uploaddata);
+  })
+}
+
+for (let i = 0; i < this.selectedaudio_field.length; i++){
+
+  this.mainService.uploadAudio_field(data.id,this.tableName,this.selectedaudio_field[i]).subscribe(uploaddata =>{
+    console.log(uploaddata);
+  })
+}
+
+for (let i = 0; i < this.selectedaudio_field2.length; i++){
+
+  this.mainService.uploadAudio_field2(data.id,this.tableName,this.selectedaudio_field2[i]).subscribe(uploaddata =>{
+    console.log(uploaddata);
+  })
+}
+
+for (let i = 0; i < this.selectedvideo_field.length; i++){
+
+  this.mainService.uploadVideo_field(data.id,this.tableName,this.selectedvideo_field[i]).subscribe(uploaddata =>{
+    console.log(uploaddata);
+  })
+}
+
+for (let i = 0; i < this.selectedvideo_field2.length; i++){
+
+  this.mainService.uploadVideo_field2(data.id,this.tableName,this.selectedvideo_field2[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.FileDatafileupload_field = [];
+this.selectedfileupload_field =[];
+
+this.FileDatafileupload_field2 = [];
+this.selectedfileupload_field2 =[];
+
+this.FileDataImageupload_field = [];
+this.selectedImageupload_field =[];
+
+this.FileDataImageupload_field2 = [];
+this.selectedImageupload_field2 =[];
+
+this.FileDataAudio_field = [];
+this.selectedAudio_field =[];
+
+this.FileDataAudio_field2 = [];
+this.selectedAudio_field2 =[];
+
+this.FileDataVideo_field = [];
+this.selectedVideo_field =[];
+
+this.FileDataVideo_field2 = [];
+this.selectedVideo_field2 =[];
+
+
+  }
+ submitted = false;
+onSubmit() {
+  console.log(this.entryForm.value);
+ this.submitted = true;
+  if (this.entryForm.invalid) {
+    return;
+  }this.onCreate();
+
+} 
+updateismale (ismale : string): void {    
+ this.entryForm.get('ismale').setValue(ismale);   }
+
+updateismaleEdit(ismale : string): void {    this.rowSelected.ismale  =  ismale }
+						 ;
+
+updateidfemale (idfemale : string): void {    
+ this.entryForm.get('idfemale').setValue(idfemale);   }
+
+updateidfemaleEdit(idfemale : string): void {    this.rowSelected.idfemale  =  idfemale }
+						 ;
+
+
+
+
+
+filePreviewfileupload_field: string | ArrayBuffer | null = null;
+FileDatafileupload_field: {uploadedfile_name?:any, filePreview: string | ArrayBuffer | null }[] = []; // Initialize the array
+selectedfileupload_field: File[]=[]; 
+public onFileChangedfileupload_field(event, index) {
+  const files = event.target.files;
+  for (let i = 0; i < files.length; i++) {
+    const file = files[i];
+    this.FileDatafileupload_field[index].uploadedfile_name = files[i].name;
+    this.selectedfileupload_field.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.FileDatafileupload_field[index] = {
+          ...this.FileDatafileupload_field[index], // Preserve existing properties
+          filePreview: filePreview // Update only the filePreview property
+        };
+      };
+      reader.readAsDataURL(file);
+    }
+  }
+}
+    onAddLinesfileupload_field(){
+      this.FileDatafileupload_field.push({
+        uploadedfile_name: "",
+        filePreview: "",
+        // f3: "",
+      });
+    }
+    deleteRowfileupload_field(index,id) {
+      this.FileDatafileupload_field.splice(index, 1);
+
+      if(id){
+      this.mainService.uploadfiledeletefileupload_field(id).subscribe(data =>{
+        console.log(data);
+      })
+      }
+    }
+
+filePreviewfileupload_field2: string | ArrayBuffer | null = null;
+FileDatafileupload_field2: {uploadedfile_name?:any, filePreview: string | ArrayBuffer | null }[] = []; // Initialize the array
+selectedfileupload_field2: File[]=[]; 
+public onFileChangedfileupload_field2(event, index) {
+  const files = event.target.files;
+  for (let i = 0; i < files.length; i++) {
+    const file = files[i];
+    this.FileDatafileupload_field2[index].uploadedfile_name = files[i].name;
+    this.selectedfileupload_field2.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.FileDatafileupload_field2[index] = {
+          ...this.FileDatafileupload_field2[index], // Preserve existing properties
+          filePreview: filePreview // Update only the filePreview property
+        };
+      };
+      reader.readAsDataURL(file);
+    }
+  }
+}
+    onAddLinesfileupload_field2(){
+      this.FileDatafileupload_field2.push({
+        uploadedfile_name: "",
+        filePreview: "",
+        // f3: "",
+      });
+    }
+    deleteRowfileupload_field2(index,id) {
+      this.FileDatafileupload_field2.splice(index, 1);
+
+      if(id){
+      this.mainService.uploadfiledeletefileupload_field2(id).subscribe(data =>{
+        console.log(data);
+      })
+      }
+    }
+
+filePreviewimageupload_field: string | ArrayBuffer | null = null;
+FileDataimageupload_field: {uploadedfile_name?:any, filePreview: string | ArrayBuffer | null }[] = []; // Initialize the array
+selectedimageupload_field: File[]=[]; 
+public onFileChangedimageupload_field(event, index) {
+  const files = event.target.files;
+  for (let i = 0; i < files.length; i++) {
+    const file = files[i];
+    this.FileDataimageupload_field[index].uploadedfile_name = files[i].name;
+    this.selectedimageupload_field.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.FileDataimageupload_field[index] = {
+          ...this.FileDataimageupload_field[index], // Preserve existing properties
+          filePreview: filePreview // Update only the filePreview property
+        };
+      };
+      reader.readAsDataURL(file);
+    }
+  }
+}
+    onAddLinesimageupload_field(){
+      this.FileDataimageupload_field.push({
+        uploadedfile_name: "",
+        filePreview: "",
+        // f3: "",
+      });
+    }
+    deleteRowimageupload_field(index,id) {
+      this.FileDataimageupload_field.splice(index, 1);
+
+      if(id){
+      this.mainService.uploadImageupload_fielddelete(id).subscribe(data =>{
+        console.log(data);
+      })
+      }
+    }
+
+filePreviewimageupload_field2: string | ArrayBuffer | null = null;
+FileDataimageupload_field2: {uploadedfile_name?:any, filePreview: string | ArrayBuffer | null }[] = []; // Initialize the array
+selectedimageupload_field2: File[]=[]; 
+public onFileChangedimageupload_field2(event, index) {
+  const files = event.target.files;
+  for (let i = 0; i < files.length; i++) {
+    const file = files[i];
+    this.FileDataimageupload_field2[index].uploadedfile_name = files[i].name;
+    this.selectedimageupload_field2.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.FileDataimageupload_field2[index] = {
+          ...this.FileDataimageupload_field2[index], // Preserve existing properties
+          filePreview: filePreview // Update only the filePreview property
+        };
+      };
+      reader.readAsDataURL(file);
+    }
+  }
+}
+    onAddLinesimageupload_field2(){
+      this.FileDataimageupload_field2.push({
+        uploadedfile_name: "",
+        filePreview: "",
+        // f3: "",
+      });
+    }
+    deleteRowimageupload_field2(index,id) {
+      this.FileDataimageupload_field2.splice(index, 1);
+
+      if(id){
+      this.mainService.uploadImageupload_field2delete(id).subscribe(data =>{
+        console.log(data);
+      })
+      }
+    }
+
+filePreviewaudio_field: string | ArrayBuffer | null = null;
+FileDataaudio_field: {uploadedfile_name?:any, filePreview: string | ArrayBuffer | null }[] = []; // Initialize the array
+selectedaudio_field: File[]=[]; 
+public onFileChangedaudio_field(event, index) {
+  const files = event.target.files;
+  for (let i = 0; i < files.length; i++) {
+    const file = files[i];
+    this.FileDataaudio_field[index].uploadedfile_name = files[i].name;
+    this.selectedaudio_field.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.FileDataaudio_field[index] = {
+          ...this.FileDataaudio_field[index], // Preserve existing properties
+          filePreview: filePreview // Update only the filePreview property
+        };
+      };
+      reader.readAsDataURL(file);
+    }
+  }
+}
+    onAddLinesaudio_field(){
+      this.FileDataaudio_field.push({
+        uploadedfile_name: "",
+        filePreview: "",
+        // f3: "",
+      });
+    }
+    deleteRowaudio_field(index,id) {
+      this.FileDataaudio_field.splice(index, 1);
+
+      if(id){
+      this.mainService.uploadAudio_fielddelete(id).subscribe(data =>{
+        console.log(data);
+      })
+      }
+    }
+
+filePreviewaudio_field2: string | ArrayBuffer | null = null;
+FileDataaudio_field2: {uploadedfile_name?:any, filePreview: string | ArrayBuffer | null }[] = []; // Initialize the array
+selectedaudio_field2: File[]=[]; 
+public onFileChangedaudio_field2(event, index) {
+  const files = event.target.files;
+  for (let i = 0; i < files.length; i++) {
+    const file = files[i];
+    this.FileDataaudio_field2[index].uploadedfile_name = files[i].name;
+    this.selectedaudio_field2.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.FileDataaudio_field2[index] = {
+          ...this.FileDataaudio_field2[index], // Preserve existing properties
+          filePreview: filePreview // Update only the filePreview property
+        };
+      };
+      reader.readAsDataURL(file);
+    }
+  }
+}
+    onAddLinesaudio_field2(){
+      this.FileDataaudio_field2.push({
+        uploadedfile_name: "",
+        filePreview: "",
+        // f3: "",
+      });
+    }
+    deleteRowaudio_field2(index,id) {
+      this.FileDataaudio_field2.splice(index, 1);
+
+      if(id){
+      this.mainService.uploadAudio_field2delete(id).subscribe(data =>{
+        console.log(data);
+      })
+      }
+    }
+
+filePreviewvideo_field: string | ArrayBuffer | null = null;
+FileDatavideo_field: {uploadedfile_name?:any, filePreview: string | ArrayBuffer | null }[] = []; // Initialize the array
+selectedvideo_field: File[]=[]; 
+public onFileChangedvideo_field(event, index) {
+  const files = event.target.files;
+  for (let i = 0; i < files.length; i++) {
+    const file = files[i];
+    this.FileDatavideo_field[index].uploadedfile_name = files[i].name;
+    this.selectedvideo_field.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.FileDatavideo_field[index] = {
+          ...this.FileDatavideo_field[index], // Preserve existing properties
+          filePreview: filePreview // Update only the filePreview property
+        };
+      };
+      reader.readAsDataURL(file);
+    }
+  }
+}
+    onAddLinesvideo_field(){
+      this.FileDatavideo_field.push({
+        uploadedfile_name: "",
+        filePreview: "",
+        // f3: "",
+      });
+    }
+    deleteRowvideo_field(index,id) {
+      this.FileDatavideo_field.splice(index, 1);
+
+      if(id){
+      this.mainService.uploadVideo_fielddelete(id).subscribe(data =>{
+        console.log(data);
+      })
+      }
+    }
+
+filePreviewvideo_field2: string | ArrayBuffer | null = null;
+FileDatavideo_field2: {uploadedfile_name?:any, filePreview: string | ArrayBuffer | null }[] = []; // Initialize the array
+selectedvideo_field2: File[]=[]; 
+public onFileChangedvideo_field2(event, index) {
+  const files = event.target.files;
+  for (let i = 0; i < files.length; i++) {
+    const file = files[i];
+    this.FileDatavideo_field2[index].uploadedfile_name = files[i].name;
+    this.selectedvideo_field2.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.FileDatavideo_field2[index] = {
+          ...this.FileDatavideo_field2[index], // Preserve existing properties
+          filePreview: filePreview // Update only the filePreview property
+        };
+      };
+      reader.readAsDataURL(file);
+    }
+  }
+}
+    onAddLinesvideo_field2(){
+      this.FileDatavideo_field2.push({
+        uploadedfile_name: "",
+        filePreview: "",
+        // f3: "",
+      });
+    }
+    deleteRowvideo_field2(index,id) {
+      this.FileDatavideo_field2.splice(index, 1);
+
+      if(id){
+      this.mainService.uploadVideo_field2delete(id).subscribe(data =>{
+        console.log(data);
+      })
+      }
+    }
+
+// updateaction
+}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/test7oct-demot1-f/authsec_angular/frontend/angular-clarity-master/src/app/modules/main/BuilderComponents/angulardatatype/Adv1/Adv1.service.ts b/test7oct-demot1-f/authsec_angular/frontend/angular-clarity-master/src/app/modules/main/BuilderComponents/angulardatatype/Adv1/Adv1.service.ts
new file mode 100644
index 0000000..ab39515
--- /dev/null
+++ b/test7oct-demot1-f/authsec_angular/frontend/angular-clarity-master/src/app/modules/main/BuilderComponents/angulardatatype/Adv1/Adv1.service.ts
@@ -0,0 +1,161 @@
+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 Adv1service{
+  private baseURL = "Adv1/Adv1" ;  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);
+  }
+
+
+
+
+
+
+
+
+  uploadfilefileupload_field(ref:any, Adv1:any, file:any): Observable<any>{
+    const formData = new FormData();
+    formData.append('file', file);
+    return this.apiRequest.postFormData(`FileUpload/Uploadeddocs/${ref}/${Adv1}`, formData);
+  }
+
+  uploadfilegetByIdfileupload_field(ref:any, Adv1:any,): Observable<any> {
+    return this.apiRequest.get(`FileUpload/Uploadeddocs/${ref}/${Adv1}`);
+  }
+
+
+  uploadfiledeletefileupload_field(id: number): Observable<any> {
+    return this.apiRequest.delete(`FileUpload/Uploadeddocs/${id}`);
+  }
+
+  uploadfilefileupload_field2(ref:any, Adv1:any, file:any): Observable<any>{
+    const formData = new FormData();
+    formData.append('file', file);
+    return this.apiRequest.postFormData(`FileUpload/Uploadeddocs/${ref}/${Adv1}`, formData);
+  }
+
+  uploadfilegetByIdfileupload_field2(ref:any, Adv1:any,): Observable<any> {
+    return this.apiRequest.get(`FileUpload/Uploadeddocs/${ref}/${Adv1}`);
+  }
+
+
+  uploadfiledeletefileupload_field2(id: number): Observable<any> {
+    return this.apiRequest.delete(`FileUpload/Uploadeddocs/${id}`);
+  }
+
+  uploadImageupload_field(ref:any, Adv1:any, file:any): Observable<any>{
+    const formData = new FormData();
+    formData.append('file', file);
+    return this.apiRequest.postFormData(`FileUpload/Uploadeddocs/${ref}/${Adv1}`, formData);
+  }
+
+  uploadImageupload_fieldgetById(ref:any, Adv1:any,): Observable<any> {
+    return this.apiRequest.get(`FileUpload/Uploadeddocs/${ref}/${Adv1}`);
+  }
+
+
+  uploadImageupload_fielddelete(id: number): Observable<any> {
+    return this.apiRequest.delete(`FileUpload/Uploadeddocs/${id}`);
+  }
+
+  uploadImageupload_field2(ref:any, Adv1:any, file:any): Observable<any>{
+    const formData = new FormData();
+    formData.append('file', file);
+    return this.apiRequest.postFormData(`FileUpload/Uploadeddocs/${ref}/${Adv1}`, formData);
+  }
+
+  uploadImageupload_field2getById(ref:any, Adv1:any,): Observable<any> {
+    return this.apiRequest.get(`FileUpload/Uploadeddocs/${ref}/${Adv1}`);
+  }
+
+
+  uploadImageupload_field2delete(id: number): Observable<any> {
+    return this.apiRequest.delete(`FileUpload/Uploadeddocs/${id}`);
+  }
+
+  uploadAudio_field(ref:any, Adv1:any, file:any): Observable<any>{
+    const formData = new FormData();
+    formData.append('file', file);
+    return this.apiRequest.postFormData(`FileUpload/Uploadeddocs/${ref}/${Adv1}`, formData);
+  }
+
+  uploadAudio_fieldgetById(ref:any, Adv1:any,): Observable<any> {
+    return this.apiRequest.get(`FileUpload/Uploadeddocs/${ref}/${Adv1}`);
+  }
+
+
+  uploadAudio_fielddelete(id: number): Observable<any> {
+    return this.apiRequest.delete(`FileUpload/Uploadeddocs/${id}`);
+  }
+
+  uploadAudio_field2(ref:any, Adv1:any, file:any): Observable<any>{
+    const formData = new FormData();
+    formData.append('file', file);
+    return this.apiRequest.postFormData(`FileUpload/Uploadeddocs/${ref}/${Adv1}`, formData);
+  }
+
+  uploadAudio_field2getById(ref:any, Adv1:any,): Observable<any> {
+    return this.apiRequest.get(`FileUpload/Uploadeddocs/${ref}/${Adv1}`);
+  }
+
+
+  uploadAudio_field2delete(id: number): Observable<any> {
+    return this.apiRequest.delete(`FileUpload/Uploadeddocs/${id}`);
+  }
+
+  uploadVideo_field(ref:any, Adv1:any, file:any): Observable<any>{
+    const formData = new FormData();
+    formData.append('file', file);
+    return this.apiRequest.postFormData(`FileUpload/Uploadeddocs/${ref}/${Adv1}`, formData);
+  }
+
+  uploadVideo_fieldgetById(ref:any, Adv1:any,): Observable<any> {
+    return this.apiRequest.get(`FileUpload/Uploadeddocs/${ref}/${Adv1}`);
+  }
+
+
+  uploadVideo_fielddelete(id: number): Observable<any> {
+    return this.apiRequest.delete(`FileUpload/Uploadeddocs/${id}`);
+  }
+
+  uploadVideo_field2(ref:any, Adv1:any, file:any): Observable<any>{
+    const formData = new FormData();
+    formData.append('file', file);
+    return this.apiRequest.postFormData(`FileUpload/Uploadeddocs/${ref}/${Adv1}`, formData);
+  }
+
+  uploadVideo_field2getById(ref:any, Adv1:any,): Observable<any> {
+    return this.apiRequest.get(`FileUpload/Uploadeddocs/${ref}/${Adv1}`);
+  }
+
+
+  uploadVideo_field2delete(id: number): Observable<any> {
+    return this.apiRequest.delete(`FileUpload/Uploadeddocs/${id}`);
+  }
+
+// updateaction
+}
\ No newline at end of file
diff --git a/test7oct-demot1-f/authsec_angular/frontend/angular-clarity-master/src/app/modules/main/BuilderComponents/angulardatatype/Adv1/Adv1_cardvariable.ts b/test7oct-demot1-f/authsec_angular/frontend/angular-clarity-master/src/app/modules/main/BuilderComponents/angulardatatype/Adv1/Adv1_cardvariable.ts
new file mode 100644
index 0000000..8b2bd5c
--- /dev/null
+++ b/test7oct-demot1-f/authsec_angular/frontend/angular-clarity-master/src/app/modules/main/BuilderComponents/angulardatatype/Adv1/Adv1_cardvariable.ts
@@ -0,0 +1,4 @@
+export const Adv1cardvariable = {
+    "cardButton": false,
+    "cardmodeldata": ``
+}
\ No newline at end of file
diff --git a/test7oct-demot1-f/authsec_angular/frontend/angular-clarity-master/src/app/modules/main/BuilderComponents/angulardatatype/Adv3/Adv3.component.html b/test7oct-demot1-f/authsec_angular/frontend/angular-clarity-master/src/app/modules/main/BuilderComponents/angulardatatype/Adv3/Adv3.component.html
new file mode 100644
index 0000000..97e973b
--- /dev/null
+++ b/test7oct-demot1-f/authsec_angular/frontend/angular-clarity-master/src/app/modules/main/BuilderComponents/angulardatatype/Adv3/Adv3.component.html
@@ -0,0 +1,898 @@
+<ol class="breadcrumb breadcrumb-arrow font-trirong">
+  <li><a href="javascript://"> Adv3</a></li>
+</ol>
+<div class="dg-wrapper">
+  <div class="clr-row">
+    <div class="clr-col-8">
+      <h3>Adv3 </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]="'country'"> <ng-container *clrDgHideableColumn="{hidden: false}"> country
+						    </ng-container></clr-dg-column>
+
+
+<clr-dg-column [clrDgField]="'state'"> <ng-container *clrDgHideableColumn="{hidden: false}"> state
+						    </ng-container></clr-dg-column>
+
+
+<clr-dg-column [clrDgField]="'stmlit'"> <ng-container *clrDgHideableColumn="{hidden: false}"> stmlit
+						    </ng-container></clr-dg-column>
+
+
+<clr-dg-column [clrDgField]="'stmmlt2'"> <ng-container *clrDgHideableColumn="{hidden: false}"> stmmlt2
+						    </ng-container></clr-dg-column>
+
+
+<clr-dg-column [clrDgField]="'dy2'"> <ng-container *clrDgHideableColumn="{hidden: false}"> dy2
+						    </ng-container></clr-dg-column>
+
+
+<clr-dg-column [clrDgField]="'dy1'"> <ng-container *clrDgHideableColumn="{hidden: false}"> dy1
+						    </ng-container></clr-dg-column>
+
+
+<clr-dg-column [clrDgField]="'dymlti1'"> <ng-container *clrDgHideableColumn="{hidden: false}"> dymlti1
+						    </ng-container></clr-dg-column>
+
+
+<clr-dg-column [clrDgField]="'dymlt2'"> <ng-container *clrDgHideableColumn="{hidden: false}"> dymlt2
+						    </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.country }}</clr-dg-cell>
+
+
+<clr-dg-cell>{{user.state }}</clr-dg-cell>
+
+
+<clr-dg-cell>{{user.stmlit }}</clr-dg-cell>
+
+
+<clr-dg-cell>{{user.stmmlt2 }}</clr-dg-cell>
+
+
+<clr-dg-cell>{{user.dy2identifier}}</clr-dg-cell>
+
+
+<clr-dg-cell>{{user.dy1identifier}}</clr-dg-cell>
+
+
+<clr-dg-cell>{{user. dymlti1 }}</clr-dg-cell>
+
+
+<clr-dg-cell>{{user. dymlt2 }}</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 Adv3
+ <!--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> country</label> 
+<select name="country" [(ngModel)]="rowSelected.country">
+    <option [value]="null">Selectcountry
+    </option>
+
+
+    
+ 
+
+    <option> bharat </option>
+     
+
+ 
+
+    <option> nepal </option>
+     
+
+ 
+
+    <option> bhutan </option>
+     
+
+
+  </select> </div>
+
+<div class="clr-col-sm-12">
+ <label> state</label> 
+<select name="state" [(ngModel)]="rowSelected.state">
+    <option [value]="null">Selectstate
+    </option>
+
+
+    
+ 
+
+    <option> maharastra </option>
+     
+
+ 
+
+    <option> bihar </option>
+     
+
+ 
+
+    <option> test </option>
+     
+
+
+  </select> </div>
+
+<div class="clr-col-sm-12">
+  <label> stmlit</label>
+  <clr-combobox-container style="margin-top: 0; padding-top: 0;">
+    <clr-combobox [(ngModel)]="nodeEditPropertiesstmlit .editselectedAttributesstmlit"  name="
+      editselectedAttributesstmlit" clrMulti="true">
+      <ng-container *clrOptionSelected="let selected">
+        {{selected}} </ng-container>
+      <clr-options>
+        <clr-option *clrOptionItems="let item of selectstmlit" [clrValue]=" item"> {{item}}
+        </clr-option> </clr-options>
+    </clr-combobox>
+  </clr-combobox-container>
+</div>
+
+<div class="clr-col-sm-12">
+  <label> stmmlt2</label>
+  <clr-combobox-container style="margin-top: 0; padding-top: 0;">
+    <clr-combobox [(ngModel)]="nodeEditPropertiesstmmlt2 .editselectedAttributesstmmlt2"  name="
+      editselectedAttributesstmmlt2" clrMulti="true">
+      <ng-container *clrOptionSelected="let selected">
+        {{selected}} </ng-container>
+      <clr-options>
+        <clr-option *clrOptionItems="let item of selectstmmlt2" [clrValue]=" item"> {{item}}
+        </clr-option> </clr-options>
+    </clr-combobox>
+  </clr-combobox-container>
+</div>
+
+
+ 
+<div class="clr-col-sm-12"> 
+<label>dy2</label>
+<select name="dy2" [(ngModel)]="rowSelected.dy2"> 
+  <option [value]="null">Choose dy2</option>
+<option *ngFor=" let item of selectdy2" [value]="item.id">{{item.name }}</option> </select> </div>
+ 
+
+
+
+ 
+<div class="clr-col-sm-12"> 
+<label>dy1</label>
+<select name="dy1" [(ngModel)]="rowSelected.dy1"> 
+  <option [value]="null">Choose dy1</option>
+<option *ngFor=" let item of selectdy1" [value]="item.id">{{item.description }}</option> </select> </div>
+ 
+
+
+
+ 
+<div class="clr-col-sm-12">
+            <label> dymlti1</label>
+            <clr-combobox-container style="margin-top: 0; padding-top: 0;">
+              <clr-combobox [(ngModel)]="nodeEditPropertiesdymlti1.editselectedAttributesdymlti1"  name="editselectedAttributesdymlti1" clrMulti="true"             >
+               <ng-container *clrOptionSelected="let selected">
+                 {{selected}}              </ng-container>
+               <clr-options>
+                 <clr-option *clrOptionItems="let item of selectdymlti1" [clrValue]="item.name">{{item.name}} </clr-option>              </clr-options>
+             </clr-combobox>             
+            </clr-combobox-container>         </div>
+
+ 
+
+
+
+ 
+<div class="clr-col-sm-12">
+            <label> dymlt2</label>
+            <clr-combobox-container style="margin-top: 0; padding-top: 0;">
+              <clr-combobox [(ngModel)]="nodeEditPropertiesdymlt2.editselectedAttributesdymlt2"  name="editselectedAttributesdymlt2" clrMulti="true"             >
+               <ng-container *clrOptionSelected="let selected">
+                 {{selected}}              </ng-container>
+               <clr-options>
+                 <clr-option *clrOptionItems="let item of selectdymlt2" [clrValue]="item.description">{{item.description}} </clr-option>              </clr-options>
+             </clr-combobox>             
+            </clr-combobox-container>         </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 Adv3 
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+  <!-- aeroplane icon -->
+    &nbsp; &nbsp; &nbsp; &nbsp;
+    <a *ngIf="userrole?.includes('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: 'Adv3_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>country</label>
+							 <select formControlName="country">
+							    <option [value]="null">Select  country </option> 
+								
+ 
+								<option> bharat </option>
+								 
+
+ 
+								<option> nepal </option>
+								 
+
+ 
+								<option> bhutan </option>
+								 
+
+						</select></div>
+
+<div class="clr-col-sm-12">             
+	 <label>state</label>
+							 <select formControlName="state">
+							    <option [value]="null">Select  state </option> 
+								
+ 
+								<option> maharastra </option>
+								 
+
+ 
+								<option> bihar </option>
+								 
+
+ 
+								<option> test </option>
+								 
+
+						</select></div>
+
+ <div class="clr-col-sm-12">       
+	   <label>stmlit</label>
+							          <clr-combobox-container style="margin-top: 0; padding-top: 0;">
+							            <clr-combobox [(ngModel)]="nodeEditPropertiesstmlit.addselectedAttributesstmlit"  formControlName="stmlit" clrMulti="true">
+							             <ng-container *clrOptionSelected="let selected">
+							               {{selected}}          </ng-container>
+							            <clr-options>
+							                <clr-option *clrOptionItems="let item of selectstmlit" [clrValue]="item"> {{item}}
+							                </clr-option>            </clr-options> 
+							           </clr-combobox>           
+							          </clr-combobox-container>      </div> 
+
+ <div class="clr-col-sm-12">       
+	   <label>stmmlt2</label>
+							          <clr-combobox-container style="margin-top: 0; padding-top: 0;">
+							            <clr-combobox [(ngModel)]="nodeEditPropertiesstmmlt2.addselectedAttributesstmmlt2"  formControlName="stmmlt2" clrMulti="true">
+							             <ng-container *clrOptionSelected="let selected">
+							               {{selected}}          </ng-container>
+							            <clr-options>
+							                <clr-option *clrOptionItems="let item of selectstmmlt2" [clrValue]="item"> {{item}}
+							                </clr-option>            </clr-options> 
+							           </clr-combobox>           
+							          </clr-combobox-container>      </div> 
+
+
+ 
+<div class="clr-col-sm-12">
+	          <label>  dy2</label> 
+<select  formControlName="dy2">  
+  <option [value]="null">Choose dy2</option>
+				<option *ngFor="let item of selectdy2" [value]="item.id">{{item.name}}</option>
+	      </select>          </div>
+ 
+
+
+
+  <!--  order form start -->
+ <div *ngIf="isdy2order" class="clr-col-sm-12" style="margin-bottom: 10px;">
+          <button type="button" class="btn btn-primary" (click)="adddy2Order()">
+            + Add to Order
+          </button>
+        </div>
+
+        <!-- Order Summary Table -->
+        <div class="clr-col-sm-12" *ngIf="dy2Summary.length > 0">
+          <h4>Order Summary</h4>
+          <table class="table table-bordered">
+            <thead>
+              <tr>
+                <th>Line</th>
+
+
+                <th>Action</th>
+              </tr>
+            </thead>
+            <tbody>
+              <tr *ngFor="let item of dy2Summary; let i = index">
+
+                <td>{{ item.line }}</td>
+
+                <td>
+                  <button type="button" class="btn btn-danger btn-sm" (click)="removedy2Order(i)">
+                    🗑
+                  </button>
+                </td>
+              </tr>
+            </tbody>
+          </table>
+          <div style="max-width: 350px; float: right; margin-top: 18px;">
+            <table style="width: 100%; font-size: 16px;">
+              <tr>
+                <td style="text-align: right; font-weight: 500; color: #333;">Subtotal:</td>
+                <td style="text-align: right; font-weight: 600; color: #222; width: 120px;">₹ {{ getdy2Subtotal() | number:'1.4-4' }}</td>
+              </tr>
+              <tr>
+                <td style="text-align: right; font-weight: 500; color: #333;">GST (18%):</td>
+                <td style="text-align: right; font-weight: 600; color: #007bff;">₹ {{ getdy2GST() | number:'1.4-4' }}</td>
+              </tr>
+              <tr>
+                <td colspan="2"><hr style="margin: 8px 0;"></td>
+              </tr>
+              <tr>
+                <td style="text-align: right; font-size: 18px; font-weight: 700; color: #1a237e;">Total:</td>
+                <td style="text-align: right; font-size: 20px; font-weight: 700; color: #1a237e;">₹ {{ getdy2GrandTotal() | number:'1.4-4' }}</td>
+              </tr>
+            </table>
+          </div>
+        </div>
+
+ <!--  order form end -->
+
+
+
+ 
+<div class="clr-col-sm-12">
+	          <label>  dy1</label> 
+<select  formControlName="dy1">  
+  <option [value]="null">Choose dy1</option>
+				<option *ngFor="let item of selectdy1" [value]="item.id">{{item.description}}</option>
+	      </select>          </div>
+ 
+
+
+
+  <!--  order form start -->
+ <div *ngIf="isdy1order" class="clr-col-sm-12" style="margin-bottom: 10px;">
+          <button type="button" class="btn btn-primary" (click)="adddy1Order()">
+            + Add to Order
+          </button>
+        </div>
+
+        <!-- Order Summary Table -->
+        <div class="clr-col-sm-12" *ngIf="dy1Summary.length > 0">
+          <h4>Order Summary</h4>
+          <table class="table table-bordered">
+            <thead>
+              <tr>
+                <th>Line</th>
+
+
+                <th>Action</th>
+              </tr>
+            </thead>
+            <tbody>
+              <tr *ngFor="let item of dy1Summary; let i = index">
+
+                <td>{{ item.line }}</td>
+
+                <td>
+                  <button type="button" class="btn btn-danger btn-sm" (click)="removedy1Order(i)">
+                    🗑
+                  </button>
+                </td>
+              </tr>
+            </tbody>
+          </table>
+          <div style="max-width: 350px; float: right; margin-top: 18px;">
+            <table style="width: 100%; font-size: 16px;">
+              <tr>
+                <td style="text-align: right; font-weight: 500; color: #333;">Subtotal:</td>
+                <td style="text-align: right; font-weight: 600; color: #222; width: 120px;">₹ {{ getdy1Subtotal() | number:'1.4-4' }}</td>
+              </tr>
+              <tr>
+                <td style="text-align: right; font-weight: 500; color: #333;">GST (18%):</td>
+                <td style="text-align: right; font-weight: 600; color: #007bff;">₹ {{ getdy1GST() | number:'1.4-4' }}</td>
+              </tr>
+              <tr>
+                <td colspan="2"><hr style="margin: 8px 0;"></td>
+              </tr>
+              <tr>
+                <td style="text-align: right; font-size: 18px; font-weight: 700; color: #1a237e;">Total:</td>
+                <td style="text-align: right; font-size: 20px; font-weight: 700; color: #1a237e;">₹ {{ getdy1GrandTotal() | number:'1.4-4' }}</td>
+              </tr>
+            </table>
+          </div>
+        </div>
+
+ <!--  order form end -->
+
+
+
+ 
+<div class="clr-col-sm-12">           
+<label>dymlti1</label>
+	          <clr-combobox-container style="margin-top: 0; padding-top: 0;">
+	            <clr-combobox [(ngModel)]="nodeEditPropertiesdymlti1.addselectedAttributesdymlti1"  formControlName="dymlti1" clrMulti="true"             >
+	             <ng-container *clrOptionSelected="let selected">
+	               {{selected}}              </ng-container>
+	             <clr-options>
+	               <clr-option *clrOptionItems="let item of selectdymlti1" [clrValue]="item. name"> {{item. name}}</clr-option></clr-options>
+	           </clr-combobox>             
+	          </clr-combobox-container>         </div>
+ 
+
+
+
+ 
+<div class="clr-col-sm-12">           
+<label>dymlt2</label>
+	          <clr-combobox-container style="margin-top: 0; padding-top: 0;">
+	            <clr-combobox [(ngModel)]="nodeEditPropertiesdymlt2.addselectedAttributesdymlt2"  formControlName="dymlt2" clrMulti="true"             >
+	             <ng-container *clrOptionSelected="let selected">
+	               {{selected}}              </ng-container>
+	             <clr-options>
+	               <clr-option *clrOptionItems="let item of selectdymlt2" [clrValue]="item. description"> {{item. description}}</clr-option></clr-options>
+	           </clr-combobox>             
+	          </clr-combobox-container>         </div>
+ 
+
+
+ 
+ </div> 
+<!--Data grid field start-->
+<div class="clr-row">
+  <div class="clr-col-6">
+    <h3> datagrid Field</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 getHeadersdatagrid_field() let i=index">{{co}}</th>
+          </tr>
+        </thead>
+        <tbody>
+          <tr *ngFor="let item of rowsdatagrid_field?.slice()?.reverse()">
+            <td *ngFor="let key of getHeadersdatagrid_field()">{{item[key]}}</td>
+          </tr>
+        </tbody>
+      </table>
+    </div>
+  </div>
+</div>
+<!--Data grid field end-->
+
+<!--Data grid field start-->
+<div class="clr-row">
+  <div class="clr-col-6">
+    <h3> datagrid Field2</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 getHeadersdatagrid_field2() let i=index">{{co}}</th>
+          </tr>
+        </thead>
+        <tbody>
+          <tr *ngFor="let item of rowsdatagrid_field2?.slice()?.reverse()">
+            <td *ngFor="let key of getHeadersdatagrid_field2()">{{item[key]}}</td>
+          </tr>
+        </tbody>
+      </table>
+    </div>
+  </div>
+</div>
+<!--Data grid field 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>
+        <button type="submit" class="btn btn-primary" (click)="onSubmit()">ADD</button>
+        </div>
+</form>
+  </div>
+</clr-modal>
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+  <!-- htmlpopup -->
diff --git a/test7oct-demot1-f/authsec_angular/frontend/angular-clarity-master/src/app/modules/main/BuilderComponents/angulardatatype/Adv3/Adv3.component.scss b/test7oct-demot1-f/authsec_angular/frontend/angular-clarity-master/src/app/modules/main/BuilderComponents/angulardatatype/Adv3/Adv3.component.scss
new file mode 100644
index 0000000..12f7fc8
--- /dev/null
+++ b/test7oct-demot1-f/authsec_angular/frontend/angular-clarity-master/src/app/modules/main/BuilderComponents/angulardatatype/Adv3/Adv3.component.scss
@@ -0,0 +1,85 @@
+//@import "../../../../assets/scss/var";
+.s-info-bar {
+  display: flex;
+  flex-direction: row;
+  justify-content: space-between;
+  button {
+    outline: none;
+  }
+}
+.delete,.heading{
+  text-align: center;
+  color: red;
+}
+.entry-pg {
+  width: 750px;
+}
+
+.button1::after {
+  content: none;
+}
+.button1:hover::after {
+  content: "ADD ROWS";
+}
+
+.section {
+  background-color: #dddddd;
+  height: 40px;
+}
+
+.section p {
+  //color: white;
+  padding: 10px;
+  font-size: 18px;
+}
+
+.clr-input {
+  color: #212529;
+  border: 1px solid #ced4da;
+  border-radius: 0.25rem;
+  padding: 0.75rem 0.75rem;
+  margin-top: 3px;
+  width: 100%;
+  margin-bottom: 10px;
+}
+
+.clr-file {
+  color: #212529;
+  border: 1px solid #ced4da;
+  border-radius: 0.25rem;
+  //padding: 0.6rem 0.75rem;
+  margin-top: 3px;
+  width: 100%;
+  margin-bottom: 10px;
+}
+
+.center {
+  text-align: center;
+}
+select{
+  width: 100%;
+  margin-top: 3px;
+  padding: 5px 5px;
+  border: 1px solid #ccc;
+  border-radius: 4px;
+}
+input[type=text],[type=date],[type=number],textarea {
+  width: 100%;
+  padding: 15px 15px;
+  background-color:rgb(255, 255, 255);
+ // margin: 8px 0;
+  display: inline-block;
+  border: 1px solid #ccc;
+  border-radius: 4px;
+  box-sizing: border-box;
+}
+.error_mess {
+  color: red;
+}
+.universal-section-header {
+  margin: 24px 0 10px 0;
+  font-weight: 600;
+  color: #1a237e;
+  letter-spacing: 0.5px;
+  font-size: 1.25rem;
+}
\ No newline at end of file
diff --git a/test7oct-demot1-f/authsec_angular/frontend/angular-clarity-master/src/app/modules/main/BuilderComponents/angulardatatype/Adv3/Adv3.component.ts b/test7oct-demot1-f/authsec_angular/frontend/angular-clarity-master/src/app/modules/main/BuilderComponents/angulardatatype/Adv3/Adv3.component.ts
new file mode 100644
index 0000000..cdc58c7
--- /dev/null
+++ b/test7oct-demot1-f/authsec_angular/frontend/angular-clarity-master/src/app/modules/main/BuilderComponents/angulardatatype/Adv3/Adv3.component.ts
@@ -0,0 +1,777 @@
+import { Component, OnInit } from '@angular/core';
+import { ToastrService } from 'ngx-toastr';
+import { AlertService } from 'src/app/services/alert.service';
+import { Adv3service} from './Adv3.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 { Adv3cardvariable } from './Adv3_cardvariable';
+import { UserInfoService } from 'src/app/services/user-info.service';
+declare var JsBarcode: any; 
+@Component({
+  selector: 'app-Adv3',
+  templateUrl: './Adv3.component.html',
+  styleUrls: ['./Adv3.component.scss']
+})
+export class Adv3Component implements OnInit {
+  cardButton = Adv3cardvariable.cardButton;
+  cardmodeldata = Adv3cardvariable.cardmodeldata;
+  public dashboardArray: DashboardContentModel2[];
+  isCardview = Adv3cardvariable.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 = 'Adv3_formCode'
+tableName = 'Adv3';  checkFormCode; selected: any[] = []; constructor(
+    private extensionService: ExtensionService,
+private userInfoService:UserInfoService,
+    private mainService:Adv3service,
+    private alertService: AlertService,
+    private toastr: ToastrService,
+    private _fb: FormBuilder,
+  ) { }
+  private editInterval: any;
+// component button 
+  ngOnInit(): void {
+    if(this.cardmodeldata !== ''){
+     this.cardmodal = JSON.parse(this.cardmodeldata);
+    this.dashboardArray = this.cardmodal.dashboard.slice();
+    console.log(this.dashboardArray)
+    }
+    this.userrole=this.userInfoService.getRoles();
+    this.getData();
+    this.entryForm = this._fb.group({
+ 
+
+ 
+
+
+
+country : [null],
+
+state : [null],
+
+stmlit : [null],
+
+stmmlt2 : [null],
+
+dy2 : [null],
+
+dy1 : [null],
+
+dymlti1 : [null],
+
+dymlt2 : [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 === "Adv3_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.getalldy2();
+
+
+
+    if (this.dy2default) {
+    // Listen for product changes to auto-fill description
+
+
+ 
+    this.entryForm.get('dy2')?.valueChanges.subscribe(name => {
+      if (name && this.selectdy2) {
+
+        const found = this.selectdy2.find(p => p.name === name);
+ 
+
+
+        console.log('found is ', found);
+
+        // Auto-fill price when product is selected
+        if (found && found.default_field) {
+          this.entryForm.patchValue({ default_field: found.default_field_link });
+        } else {
+          this.entryForm.patchValue({ default_field: null });
+        }
+
+      }
+    });
+}
+
+this.getalldy1();
+
+
+
+    if (this.dy1default) {
+    // Listen for product changes to auto-fill description
+
+
+ 
+    this.entryForm.get('dy1')?.valueChanges.subscribe(description => {
+      if (description && this.selectdy1) {
+
+        const found = this.selectdy1.find(p => p.description === description);
+ 
+
+
+        console.log('found is ', found);
+
+        // Auto-fill price when product is selected
+        if (found && found.default_field) {
+          this.entryForm.patchValue({ default_field: found.default_field_link });
+        } else {
+          this.entryForm.patchValue({ default_field: null });
+        }
+
+      }
+    });
+}
+
+this.getalldymlti1();
+
+this.getalldymlt2();
+
+
+  }
+ ngOnDestroy(): void {
+    if (this.editInterval) {
+      clearInterval(this.editInterval);
+    }
+  }
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ error; 
+  getData() {
+    this.mainService.getAll().subscribe((data) => {
+      console.log(data);
+      this.product = data;
+this.product = [...this.product].reverse(); if(this.product.length==0){
+        this.error="No Data Available"
+     }   
+    },(error) => {
+      console.log(error);
+      if(error){
+       this.error="Server Error";
+     }
+    });
+  }
+  onEdit(row) {
+    this.rowSelected = row;
+
+
+
+
+
+
+
+
+
+
+this.nodeEditPropertiesstmlit.editselectedAttributesstmlit = JSON.parse(this.rowSelected.stmlit );
+
+this.nodeEditPropertiesstmmlt2.editselectedAttributesstmmlt2 = JSON.parse(this.rowSelected.stmmlt2 );
+
+
+
+
+
+this.nodeEditPropertiesdymlti1.editselectedAttributesdymlti1 = JSON.parse(this.rowSelected.dymlti1 );
+
+this.nodeEditPropertiesdymlt2.editselectedAttributesdymlt2 = JSON.parse(this.rowSelected.dymlt2 );
+
+
+    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;
+
+
+
+
+
+
+
+
+
+
+this.rowSelected.stmlit  = JSON.stringify(this.nodeEditPropertiesstmlit.editselectedAttributesstmlit  );
+
+this.rowSelected.stmmlt2  = JSON.stringify(this.nodeEditPropertiesstmmlt2.editselectedAttributesstmmlt2  );
+
+
+
+
+
+this.rowSelected.dymlti1  = JSON.stringify(this.nodeEditPropertiesdymlti1.editselectedAttributesdymlti1  );
+
+this.rowSelected.dymlt2  = JSON.stringify(this.nodeEditPropertiesdymlt2.editselectedAttributesdymlt2  );
+
+    //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.entryForm.value.stmlit  = JSON.stringify(this.nodeEditPropertiesstmlit.addselectedAttributesstmlit );
+
+this.entryForm.value.stmmlt2  = JSON.stringify(this.nodeEditPropertiesstmmlt2.addselectedAttributesstmmlt2 );
+
+
+
+
+
+this.entryForm.value.dymlti1  = JSON.stringify(this.nodeEditPropertiesdymlti1.addselectedAttributesdymlti1 );
+
+this.entryForm.value.dymlt2  = JSON.stringify(this.nodeEditPropertiesdymlt2.addselectedAttributesdymlt2 );
+
+  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; this.getdatagrid_fieldData();
+
+ this.getdatagrid_field2Data();
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+this.nodeEditPropertiesdymlti1.addselectedAttributesdymlti1 = ""
+
+this.nodeEditPropertiesdymlt2.addselectedAttributesdymlt2 = ""
+
+
+  }
+ submitted = false;
+onSubmit() {
+  console.log(this.entryForm.value);
+ this.submitted = true;
+  if (this.entryForm.invalid) {
+    return;
+  }this.onCreate();
+
+} 
+//datagrid datagrid_field  filed start    
+productdatagrid_field;     
+ rowsdatagrid_field :any[];
+         getHeadersdatagrid_field () {          
+			 this.rowsdatagrid_field = this.productdatagrid_field;         
+  let headers: string[] = [];
+          if(this.rowsdatagrid_field ) {             
+this.rowsdatagrid_field.forEach((value) => {         
+      Object.keys(value).forEach((key) => {
+                if(!headers.find((header) => header == key)){
+                  headers.push(key)             
+    }         
+              })                 
+     })         
+}
+         
+ return headers;      
+   } 
+ //datagrid datagrid_field filed end 
+					    
+getdatagrid_fieldData() {
+    this.mainService.getdatagrid_fieldAll().subscribe((data) => {
+      console.log(data);      this.productdatagrid_field  = data; 
+    });
+}
+
+//datagrid datagrid_field2  filed start    
+productdatagrid_field2;     
+ rowsdatagrid_field2 :any[];
+         getHeadersdatagrid_field2 () {          
+			 this.rowsdatagrid_field2 = this.productdatagrid_field2;         
+  let headers: string[] = [];
+          if(this.rowsdatagrid_field2 ) {             
+this.rowsdatagrid_field2.forEach((value) => {         
+      Object.keys(value).forEach((key) => {
+                if(!headers.find((header) => header == key)){
+                  headers.push(key)             
+    }         
+              })                 
+     })         
+}
+         
+ return headers;      
+   } 
+ //datagrid datagrid_field2 filed end 
+					    
+getdatagrid_field2Data() {
+    this.mainService.getdatagrid_field2All().subscribe((data) => {
+      console.log(data);      this.productdatagrid_field2  = data; 
+    });
+}
+
+
+
+
+
+
+
+nodeEditPropertiesstmlit  = {   addselectedAttributesstmlit :"",   editselectedAttributesstmlit :"" }
+							 selectstmlit =[
+								
+ 
+								'bihar',
+								 
+
+ 
+								'sikkim',
+								 
+
+							];
+
+nodeEditPropertiesstmmlt2  = {   addselectedAttributesstmmlt2 :"",   editselectedAttributesstmmlt2 :"" }
+							 selectstmmlt2 =[
+								
+ 
+								'p2',
+								 
+
+ 
+								'p3',
+								 
+
+ 
+								'ap',
+								 
+
+							];
+
+dy2default=false
+selectdy2 ;     
+getalldy2() {
+ this.mainService.getAlldy2().subscribe(data=>{
+this.selectdy2 = data;       
+console.log(data);
+},(error) => {       console.log(error);     });   }		
+
+
+
+  // ================== ORDER SUMMARY LOGIC START ==================
+  /**
+   * Order Summary Array and Methods for Add to Order functionality
+   */
+  dy2Summary: any[] = [];
+  dy2total;
+isdy2order =false;
+  /**
+   * Add selected product to order summary
+   */
+  adddy2Order() {
+    const formValue = this.entryForm.value;
+    if (!formValue.dy2 ) {
+      this.toastr.error('Please select dy2');
+      return;
+    }
+    // Get description from master (selectdy2)
+
+
+   
+
+    if (this.selectdy2 && Array.isArray(this.selectdy2)) {
+
+ 
+      const found = this.selectdy2.find(p => p.name === formValue.dy2);
+ 
+
+    
+
+    }
+    const line = this.dy2Summary.length + 1;
+    const orderItem = {
+      line: line,
+
+      // unitPrice: Number(formValue.price),
+      // quantity: Number(formValue.quantity),
+      // total: Number(formValue.price) * Number(formValue.quantity)
+    };
+    this.dy2Summary.push(orderItem);
+    
+    this.dy2total = '';
+  }
+
+  /**
+   * Remove item from order summary by index
+   */
+  removedy2Order(index: number) {
+    this.dy2Summary.splice(index, 1);
+    // Recalculate line numbers
+    this.dy2Summary.forEach((item, i) => {
+      item.line = i + 1;
+    });
+  }
+
+  /**
+   * Calculate subtotal of all order items
+   */
+  getdy2Subtotal(): number {
+    return this.dy2Summary.reduce((sum, item) => sum + item.total, 0);
+  }
+
+  /**
+   * Calculate GST (18%)
+   */
+  getdy2GST(): number {
+    return this.getdy2Subtotal() * 0.18;
+  }
+
+  /**
+   * Calculate grand total (subtotal + GST)
+   */
+  getdy2GrandTotal(): number {
+    return this.getdy2Subtotal() + this.getdy2GST();
+
+  }
+  // ================== ORDER SUMMARY LOGIC END ==================
+
+
+dy1default=false
+selectdy1 ;     
+getalldy1() {
+ this.mainService.getAlldy1().subscribe(data=>{
+this.selectdy1 = data;       
+console.log(data);
+},(error) => {       console.log(error);     });   }		
+
+
+
+  // ================== ORDER SUMMARY LOGIC START ==================
+  /**
+   * Order Summary Array and Methods for Add to Order functionality
+   */
+  dy1Summary: any[] = [];
+  dy1total;
+isdy1order =false;
+  /**
+   * Add selected product to order summary
+   */
+  adddy1Order() {
+    const formValue = this.entryForm.value;
+    if (!formValue.dy1 ) {
+      this.toastr.error('Please select dy1');
+      return;
+    }
+    // Get description from master (selectdy1)
+
+
+   
+
+    if (this.selectdy1 && Array.isArray(this.selectdy1)) {
+
+ 
+      const found = this.selectdy1.find(p => p.description === formValue.dy1);
+ 
+
+    
+
+    }
+    const line = this.dy1Summary.length + 1;
+    const orderItem = {
+      line: line,
+
+      // unitPrice: Number(formValue.price),
+      // quantity: Number(formValue.quantity),
+      // total: Number(formValue.price) * Number(formValue.quantity)
+    };
+    this.dy1Summary.push(orderItem);
+    
+    this.dy1total = '';
+  }
+
+  /**
+   * Remove item from order summary by index
+   */
+  removedy1Order(index: number) {
+    this.dy1Summary.splice(index, 1);
+    // Recalculate line numbers
+    this.dy1Summary.forEach((item, i) => {
+      item.line = i + 1;
+    });
+  }
+
+  /**
+   * Calculate subtotal of all order items
+   */
+  getdy1Subtotal(): number {
+    return this.dy1Summary.reduce((sum, item) => sum + item.total, 0);
+  }
+
+  /**
+   * Calculate GST (18%)
+   */
+  getdy1GST(): number {
+    return this.getdy1Subtotal() * 0.18;
+  }
+
+  /**
+   * Calculate grand total (subtotal + GST)
+   */
+  getdy1GrandTotal(): number {
+    return this.getdy1Subtotal() + this.getdy1GST();
+
+  }
+  // ================== ORDER SUMMARY LOGIC END ==================
+
+
+selectdymlti1;    
+ getalldymlti1 () {
+		this.mainService.getAlldymlti1().subscribe(data=>{
+							      this.selectdymlti1 = data;     
+  console.log(data);
+ },(error) => {       console.log(error);     });   } 
+ nodeEditPropertiesdymlti1  = {     addselectedAttributesdymlti1:"",  editselectedAttributesdymlti1 :""   }
+
+selectdymlt2;    
+ getalldymlt2 () {
+		this.mainService.getAlldymlt2().subscribe(data=>{
+							      this.selectdymlt2 = data;     
+  console.log(data);
+ },(error) => {       console.log(error);     });   } 
+ nodeEditPropertiesdymlt2  = {     addselectedAttributesdymlt2:"",  editselectedAttributesdymlt2 :""   }
+
+// updateaction
+}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/test7oct-demot1-f/authsec_angular/frontend/angular-clarity-master/src/app/modules/main/BuilderComponents/angulardatatype/Adv3/Adv3.service.ts b/test7oct-demot1-f/authsec_angular/frontend/angular-clarity-master/src/app/modules/main/BuilderComponents/angulardatatype/Adv3/Adv3.service.ts
new file mode 100644
index 0000000..c497e6f
--- /dev/null
+++ b/test7oct-demot1-f/authsec_angular/frontend/angular-clarity-master/src/app/modules/main/BuilderComponents/angulardatatype/Adv3/Adv3.service.ts
@@ -0,0 +1,63 @@
+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 Adv3service{
+  private baseURL = "Adv3/Adv3" ;  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);
+  }
+getdatagrid_fieldAll(page?: number, size?: number): Observable<any> {
+    return this.apiRequest.get("Country_ListFilter1/Country_ListFilter1");
+
+						    }
+
+getdatagrid_field2All(page?: number, size?: number): Observable<any> {
+    return this.apiRequest.get("Country_ListFilter1/Country_ListFilter1");
+
+						    }
+
+
+
+
+
+
+
+
+
+
+
+getAlldy2(): Observable<any> {   
+return this.apiRequest.get("Country_ListFilter1/Country_ListFilter1");  }
+
+getAlldy1(): Observable<any> {   
+return this.apiRequest.get("Country_ListFilter1/Country_ListFilter1");  }
+
+getAlldymlti1(): Observable<any> {   return this.apiRequest.get("Country_ListFilter1/Country_ListFilter1");  }
+
+getAlldymlt2(): Observable<any> {   return this.apiRequest.get("Country_ListFilter1/Country_ListFilter1");  }
+
+// updateaction
+}
\ No newline at end of file
diff --git a/test7oct-demot1-f/authsec_angular/frontend/angular-clarity-master/src/app/modules/main/BuilderComponents/angulardatatype/Adv3/Adv3_cardvariable.ts b/test7oct-demot1-f/authsec_angular/frontend/angular-clarity-master/src/app/modules/main/BuilderComponents/angulardatatype/Adv3/Adv3_cardvariable.ts
new file mode 100644
index 0000000..8ed38af
--- /dev/null
+++ b/test7oct-demot1-f/authsec_angular/frontend/angular-clarity-master/src/app/modules/main/BuilderComponents/angulardatatype/Adv3/Adv3_cardvariable.ts
@@ -0,0 +1,4 @@
+export const Adv3cardvariable = {
+    "cardButton": false,
+    "cardmodeldata": ``
+}
\ No newline at end of file
diff --git a/test7oct-demot1-f/authsec_angular/frontend/angular-clarity-master/src/app/modules/main/BuilderComponents/angulardatatype/Adv4/Adv4.component.html b/test7oct-demot1-f/authsec_angular/frontend/angular-clarity-master/src/app/modules/main/BuilderComponents/angulardatatype/Adv4/Adv4.component.html
new file mode 100644
index 0000000..cd312d1
--- /dev/null
+++ b/test7oct-demot1-f/authsec_angular/frontend/angular-clarity-master/src/app/modules/main/BuilderComponents/angulardatatype/Adv4/Adv4.component.html
@@ -0,0 +1,623 @@
+<ol class="breadcrumb breadcrumb-arrow font-trirong">
+  <li><a href="javascript://"> Adv4</a></li>
+</ol>
+<div class="dg-wrapper">
+  <div class="clr-row">
+    <div class="clr-col-8">
+      <h3>Adv4 </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]="'atoc'"> <ng-container *clrDgHideableColumn="{hidden: false}"> atoc
+						    </ng-container></clr-dg-column>
+
+
+<clr-dg-column [clrDgField]="'atc2'"> <ng-container *clrDgHideableColumn="{hidden: false}"> atc2
+						    </ng-container></clr-dg-column>
+
+
+<clr-dg-column [clrDgField]="'atdy1'"> <ng-container *clrDgHideableColumn="{hidden: false}"> atdy1
+						    </ng-container></clr-dg-column>
+
+
+<clr-dg-column [clrDgField]="'atdy2'"> <ng-container *clrDgHideableColumn="{hidden: false}"> atdy2
+						    </ng-container></clr-dg-column>
+
+
+
+ 
+<clr-dg-column [clrDgField]="'support.description'"> <ng-container *clrDgHideableColumn="{hidden: false}">description</ng-container></clr-dg-column>
+ 
+
+ 
+<clr-dg-column [clrDgField]="'support.name'"> <ng-container *clrDgHideableColumn="{hidden: false}">name</ng-container></clr-dg-column>
+ 
+
+
+
+
+ 
+<clr-dg-column [clrDgField]="'childform.active'"> <ng-container *clrDgHideableColumn="{hidden: false}">active</ng-container></clr-dg-column>
+ 
+
+ 
+<clr-dg-column [clrDgField]="'childform.description'"> <ng-container *clrDgHideableColumn="{hidden: false}">description</ng-container></clr-dg-column>
+ 
+
+ 
+<clr-dg-column [clrDgField]="'childform.name'"> <ng-container *clrDgHideableColumn="{hidden: false}">name</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.atocidentifier}}</clr-dg-cell>
+
+
+<clr-dg-cell>{{user.atc2identifier}}</clr-dg-cell>
+
+
+<clr-dg-cell>{{user. atdy1 }}</clr-dg-cell>
+
+
+<clr-dg-cell>{{user. atdy2 }}</clr-dg-cell>
+
+
+
+ 
+<clr-dg-cell>{{user.support?.description}}</clr-dg-cell>
+ 
+
+ 
+<clr-dg-cell>{{user.support?.name}}</clr-dg-cell>
+ 
+
+
+
+
+ 
+<clr-dg-cell>{{user.childform?.active}}</clr-dg-cell>
+ 
+
+ 
+<clr-dg-cell>{{user.childform?.description}}</clr-dg-cell>
+ 
+
+ 
+<clr-dg-cell>{{user.childform?.name}}</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 Adv4
+ <!--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> atoc</label>
+        <input type="text" list="atocconfig" class="clr-input" name="atoc" [(ngModel)]="rowSelected.atoc">      
+ <datalist id="atocconfig">
+        <option *ngFor="let item of selectatoc" [value]="item.id">{{item.name }}</option>  </datalist>         </div>
+ 
+
+
+
+ 
+
+<div class="clr-col-sm-12">
+        <label> atc2</label>
+        <input type="text" list="atc2config" class="clr-input" name="atc2" [(ngModel)]="rowSelected.atc2">      
+ <datalist id="atc2config">
+        <option *ngFor="let item of selectatc2" [value]="item.id">{{item.name }}</option>  </datalist>         </div>
+ 
+
+
+
+ 
+<div class="clr-col-sm-12">
+            <label> atdy1</label>
+            <clr-combobox-container style="margin-top: 0; padding-top: 0;">
+              <clr-combobox [(ngModel)]="nodeEditPropertiesatdy1.editselectedAttributesatdy1"  name="editselectedAttributesatdy1" clrMulti="true"             >
+               <ng-container *clrOptionSelected="let selected">
+                 {{selected}}              </ng-container>
+               <clr-options>
+                 <clr-option *clrOptionItems="let item of selectatdy1" [clrValue]="item.name">{{item.name}} </clr-option>              </clr-options>
+             </clr-combobox>             
+            </clr-combobox-container>         </div>
+
+ 
+
+
+
+ 
+<div class="clr-col-sm-12">
+            <label> atdy2</label>
+            <clr-combobox-container style="margin-top: 0; padding-top: 0;">
+              <clr-combobox [(ngModel)]="nodeEditPropertiesatdy2.editselectedAttributesatdy2"  name="editselectedAttributesatdy2" clrMulti="true"             >
+               <ng-container *clrOptionSelected="let selected">
+                 {{selected}}              </ng-container>
+               <clr-options>
+                 <clr-option *clrOptionItems="let item of selectatdy2" [clrValue]="item.description">{{item.description}} </clr-option>              </clr-options>
+             </clr-combobox>             
+            </clr-combobox-container>         </div>
+
+ 
+
+
+
+
+
+
+  </div> 
+
+
+
+
+
+
+
+
+
+ 
+
+<div class="clr-col-md-4 clr-col-sm-12"> <label>description</label>
+  <input class="clr-input" id="name" type="text" [(ngModel)]="rowSelected.support.description" name="description" />
+</div>
+ 
+
+ 
+
+<div class="clr-col-md-4 clr-col-sm-12"> <label>name</label>
+  <input class="clr-input" id="name" type="text" [(ngModel)]="rowSelected.support.name" name="name" />
+</div>
+ 
+
+
+
+ 
+
+<div class="clr-col-md-4 clr-col-sm-12"> <label>active</label>
+  <input class="clr-input" id="name" type="text" [(ngModel)]="rowSelected.childform.active" name="active" />
+</div>
+ 
+
+ 
+
+<div class="clr-col-md-4 clr-col-sm-12"> <label>description</label>
+  <input class="clr-input" id="name" type="text" [(ngModel)]="rowSelected.childform.description" name="description" />
+</div>
+ 
+
+ 
+
+<div class="clr-col-md-4 clr-col-sm-12"> <label>name</label>
+  <input class="clr-input" id="name" type="text" [(ngModel)]="rowSelected.childform.name" name="name" />
+</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 Adv4 
+
+
+
+
+
+
+
+
+
+
+
+
+  <!-- aeroplane icon -->
+    &nbsp; &nbsp; &nbsp; &nbsp;
+    <a *ngIf="userrole?.includes('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: 'Adv4_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>  atoc</label>
+	        <input type="text" list="atocconfig" class="clr-input" formControlName="atoc">
+	        <datalist id="atocconfig"> <option *ngFor="let item of selectatoc" [value]="item.id">{{item. name }}</option>     </datalist>       </div>
+ 
+
+
+
+ 
+<div class="clr-col-sm-12" >
+	        <label>  atc2</label>
+	        <input type="text" list="atc2config" class="clr-input" formControlName="atc2">
+	        <datalist id="atc2config"> <option *ngFor="let item of selectatc2" [value]="item.id">{{item. name }}</option>     </datalist>       </div>
+ 
+
+
+
+ 
+<div class="clr-col-sm-12">           
+<label>atdy1</label>
+	          <clr-combobox-container style="margin-top: 0; padding-top: 0;">
+	            <clr-combobox [(ngModel)]="nodeEditPropertiesatdy1.addselectedAttributesatdy1"  formControlName="atdy1" clrMulti="true"             >
+	             <ng-container *clrOptionSelected="let selected">
+	               {{selected}}              </ng-container>
+	             <clr-options>
+	               <clr-option *clrOptionItems="let item of selectatdy1" [clrValue]="item. name"> {{item. name}}</clr-option></clr-options>
+	           </clr-combobox>             
+	          </clr-combobox-container>         </div>
+ 
+
+
+
+ 
+<div class="clr-col-sm-12">           
+<label>atdy2</label>
+	          <clr-combobox-container style="margin-top: 0; padding-top: 0;">
+	            <clr-combobox [(ngModel)]="nodeEditPropertiesatdy2.addselectedAttributesatdy2"  formControlName="atdy2" clrMulti="true"             >
+	             <ng-container *clrOptionSelected="let selected">
+	               {{selected}}              </ng-container>
+	             <clr-options>
+	               <clr-option *clrOptionItems="let item of selectatdy2" [clrValue]="item. description"> {{item. description}}</clr-option></clr-options>
+	           </clr-combobox>             
+	          </clr-combobox-container>         </div>
+ 
+
+
+
+
+
+
+ 
+ </div> 
+
+
+
+
+
+
+
+
+<div style="margin-top: 30px;">       
+<h4 style="display: inline;">support </h4>   </div> <hr>
+						  <div class="clr-row" formArrayName="support">
+				
+ 
+					<div class="clr-col-md-4 clr-col-sm-12">          
+<label> description</label>
+	 <input class="clr-input" type="text" formControlName="description" />     </div> 
+ 
+
+ 
+					<div class="clr-col-md-4 clr-col-sm-12">          
+<label> name</label>
+	 <input class="clr-input" type="text" formControlName="name" />     </div> 
+ 
+				
+</div>
+
+
+<div style="margin-top: 30px;">       
+<h4 style="display: inline;">childform </h4>   </div> <hr>
+						  <div class="clr-row" formArrayName="childform">
+				
+ 
+					<div class="clr-col-md-4 clr-col-sm-12">          
+<label> active</label>
+	 <input class="clr-input" type="text" formControlName="active" />     </div> 
+ 
+
+ 
+					<div class="clr-col-md-4 clr-col-sm-12">          
+<label> description</label>
+	 <input class="clr-input" type="text" formControlName="description" />     </div> 
+ 
+
+ 
+					<div class="clr-col-md-4 clr-col-sm-12">          
+<label> name</label>
+	 <input class="clr-input" type="text" formControlName="name" />     </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/test7oct-demot1-f/authsec_angular/frontend/angular-clarity-master/src/app/modules/main/BuilderComponents/angulardatatype/Adv4/Adv4.component.scss b/test7oct-demot1-f/authsec_angular/frontend/angular-clarity-master/src/app/modules/main/BuilderComponents/angulardatatype/Adv4/Adv4.component.scss
new file mode 100644
index 0000000..12f7fc8
--- /dev/null
+++ b/test7oct-demot1-f/authsec_angular/frontend/angular-clarity-master/src/app/modules/main/BuilderComponents/angulardatatype/Adv4/Adv4.component.scss
@@ -0,0 +1,85 @@
+//@import "../../../../assets/scss/var";
+.s-info-bar {
+  display: flex;
+  flex-direction: row;
+  justify-content: space-between;
+  button {
+    outline: none;
+  }
+}
+.delete,.heading{
+  text-align: center;
+  color: red;
+}
+.entry-pg {
+  width: 750px;
+}
+
+.button1::after {
+  content: none;
+}
+.button1:hover::after {
+  content: "ADD ROWS";
+}
+
+.section {
+  background-color: #dddddd;
+  height: 40px;
+}
+
+.section p {
+  //color: white;
+  padding: 10px;
+  font-size: 18px;
+}
+
+.clr-input {
+  color: #212529;
+  border: 1px solid #ced4da;
+  border-radius: 0.25rem;
+  padding: 0.75rem 0.75rem;
+  margin-top: 3px;
+  width: 100%;
+  margin-bottom: 10px;
+}
+
+.clr-file {
+  color: #212529;
+  border: 1px solid #ced4da;
+  border-radius: 0.25rem;
+  //padding: 0.6rem 0.75rem;
+  margin-top: 3px;
+  width: 100%;
+  margin-bottom: 10px;
+}
+
+.center {
+  text-align: center;
+}
+select{
+  width: 100%;
+  margin-top: 3px;
+  padding: 5px 5px;
+  border: 1px solid #ccc;
+  border-radius: 4px;
+}
+input[type=text],[type=date],[type=number],textarea {
+  width: 100%;
+  padding: 15px 15px;
+  background-color:rgb(255, 255, 255);
+ // margin: 8px 0;
+  display: inline-block;
+  border: 1px solid #ccc;
+  border-radius: 4px;
+  box-sizing: border-box;
+}
+.error_mess {
+  color: red;
+}
+.universal-section-header {
+  margin: 24px 0 10px 0;
+  font-weight: 600;
+  color: #1a237e;
+  letter-spacing: 0.5px;
+  font-size: 1.25rem;
+}
\ No newline at end of file
diff --git a/test7oct-demot1-f/authsec_angular/frontend/angular-clarity-master/src/app/modules/main/BuilderComponents/angulardatatype/Adv4/Adv4.component.ts b/test7oct-demot1-f/authsec_angular/frontend/angular-clarity-master/src/app/modules/main/BuilderComponents/angulardatatype/Adv4/Adv4.component.ts
new file mode 100644
index 0000000..c6ba54c
--- /dev/null
+++ b/test7oct-demot1-f/authsec_angular/frontend/angular-clarity-master/src/app/modules/main/BuilderComponents/angulardatatype/Adv4/Adv4.component.ts
@@ -0,0 +1,395 @@
+import { Component, OnInit } from '@angular/core';
+import { ToastrService } from 'ngx-toastr';
+import { AlertService } from 'src/app/services/alert.service';
+import { Adv4service} from './Adv4.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 { Adv4cardvariable } from './Adv4_cardvariable';
+import { UserInfoService } from 'src/app/services/user-info.service';
+declare var JsBarcode: any; 
+@Component({
+  selector: 'app-Adv4',
+  templateUrl: './Adv4.component.html',
+  styleUrls: ['./Adv4.component.scss']
+})
+export class Adv4Component implements OnInit {
+  cardButton = Adv4cardvariable.cardButton;
+  cardmodeldata = Adv4cardvariable.cardmodeldata;
+  public dashboardArray: DashboardContentModel2[];
+  isCardview = Adv4cardvariable.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 = 'Adv4_formCode'
+tableName = 'Adv4';  checkFormCode; selected: any[] = []; constructor(
+    private extensionService: ExtensionService,
+private userInfoService:UserInfoService,
+    private mainService:Adv4service,
+    private alertService: AlertService,
+    private toastr: ToastrService,
+    private _fb: FormBuilder,
+  ) { }
+  private editInterval: any;
+// component button 
+  ngOnInit(): void {
+    if(this.cardmodeldata !== ''){
+     this.cardmodal = JSON.parse(this.cardmodeldata);
+    this.dashboardArray = this.cardmodal.dashboard.slice();
+    console.log(this.dashboardArray)
+    }
+    this.userrole=this.userInfoService.getRoles();
+    this.getData();
+    this.entryForm = this._fb.group({
+atoc : [null],
+
+atc2 : [null],
+
+atdy1 : [null],
+
+atdy2 : [null],
+
+support: this.supportinitLinesForm(),
+
+childform: this.childforminitLinesForm(),
+
+
+ 
+
+
+
+
+
+
+
+
+
+
+
+  }); // 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 === "Adv4_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.getallatoc();
+
+this.getallatc2();
+
+this.getallatdy1();
+
+this.getallatdy2();
+
+
+
+
+
+
+  }
+ ngOnDestroy(): void {
+    if (this.editInterval) {
+      clearInterval(this.editInterval);
+    }
+  }
+
+
+
+
+
+
+
+
+supportinitLinesForm() {   return this._fb.group({
+
+ 
+  description: [null],
+ 
+
+ 
+  name: [null],
+ 
+		
+
+});   } 
+		
+
+
+childforminitLinesForm() {   return this._fb.group({
+
+ 
+  active: [null],
+ 
+
+ 
+  description: [null],
+ 
+
+ 
+  name: [null],
+ 
+		
+
+});   } 
+		
+
+ error; 
+  getData() {
+    this.mainService.getAll().subscribe((data) => {
+      console.log(data);
+      this.product = data;
+this.product = [...this.product].reverse(); if(this.product.length==0){
+        this.error="No Data Available"
+     }   
+    },(error) => {
+      console.log(error);
+      if(error){
+       this.error="Server Error";
+     }
+    });
+  }
+  onEdit(row) {
+    this.rowSelected = row;
+
+
+
+
+this.nodeEditPropertiesatdy1.editselectedAttributesatdy1 = JSON.parse(this.rowSelected.atdy1 );
+
+this.nodeEditPropertiesatdy2.editselectedAttributesatdy2 = JSON.parse(this.rowSelected.atdy2 );
+
+
+
+
+
+
+    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;
+
+
+
+
+this.rowSelected.atdy1  = JSON.stringify(this.nodeEditPropertiesatdy1.editselectedAttributesatdy1  );
+
+this.rowSelected.atdy2  = JSON.stringify(this.nodeEditPropertiesatdy2.editselectedAttributesatdy2  );
+
+
+
+
+
+    //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.entryForm.value.atdy1  = JSON.stringify(this.nodeEditPropertiesatdy1.addselectedAttributesatdy1 );
+
+this.entryForm.value.atdy2  = JSON.stringify(this.nodeEditPropertiesatdy2.addselectedAttributesatdy2 );
+
+
+
+
+
+  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;
+
+
+
+this.nodeEditPropertiesatdy1.addselectedAttributesatdy1 = ""
+
+this.nodeEditPropertiesatdy2.addselectedAttributesatdy2 = ""
+
+
+
+
+
+
+  }
+ submitted = false;
+onSubmit() {
+  console.log(this.entryForm.value);
+ this.submitted = true;
+  if (this.entryForm.invalid) {
+    return;
+  }this.onCreate();
+
+} 
+selectatoc ;    
+ getallatoc () {
+							    this.mainService.getAllatoc().subscribe(data=>{
+							      this.selectatoc = data;       console.log(data);
+							    },(error) => {       console.log(error);     });   }
+
+selectatc2 ;    
+ getallatc2 () {
+							    this.mainService.getAllatc2().subscribe(data=>{
+							      this.selectatc2 = data;       console.log(data);
+							    },(error) => {       console.log(error);     });   }
+
+selectatdy1;    
+ getallatdy1 () {
+		this.mainService.getAllatdy1().subscribe(data=>{
+							      this.selectatdy1 = data;     
+  console.log(data);
+ },(error) => {       console.log(error);     });   } 
+ nodeEditPropertiesatdy1  = {     addselectedAttributesatdy1:"",  editselectedAttributesatdy1 :""   }
+
+selectatdy2;    
+ getallatdy2 () {
+		this.mainService.getAllatdy2().subscribe(data=>{
+							      this.selectatdy2 = data;     
+  console.log(data);
+ },(error) => {       console.log(error);     });   } 
+ nodeEditPropertiesatdy2  = {     addselectedAttributesatdy2:"",  editselectedAttributesatdy2 :""   }
+
+
+
+
+
+// updateaction
+}
+
+
+
+
+
+
+
+
+
+
+
diff --git a/test7oct-demot1-f/authsec_angular/frontend/angular-clarity-master/src/app/modules/main/BuilderComponents/angulardatatype/Adv4/Adv4.service.ts b/test7oct-demot1-f/authsec_angular/frontend/angular-clarity-master/src/app/modules/main/BuilderComponents/angulardatatype/Adv4/Adv4.service.ts
new file mode 100644
index 0000000..fd55127
--- /dev/null
+++ b/test7oct-demot1-f/authsec_angular/frontend/angular-clarity-master/src/app/modules/main/BuilderComponents/angulardatatype/Adv4/Adv4.service.ts
@@ -0,0 +1,45 @@
+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 Adv4service{
+  private baseURL = "Adv4/Adv4" ;  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);
+  }
+getAllatoc(): Observable<any> {   return this.apiRequest.get("Country_ListFilter1/Country_ListFilter1");  }
+
+getAllatc2(): Observable<any> {   return this.apiRequest.get("Country_ListFilter1/Country_ListFilter1");  }
+
+getAllatdy1(): Observable<any> {   return this.apiRequest.get("Country_ListFilter1/Country_ListFilter1");  }
+
+getAllatdy2(): Observable<any> {   return this.apiRequest.get("Country_ListFilter1/Country_ListFilter1");  }
+
+
+
+
+
+// updateaction
+}
\ No newline at end of file
diff --git a/test7oct-demot1-f/authsec_angular/frontend/angular-clarity-master/src/app/modules/main/BuilderComponents/angulardatatype/Adv4/Adv4_cardvariable.ts b/test7oct-demot1-f/authsec_angular/frontend/angular-clarity-master/src/app/modules/main/BuilderComponents/angulardatatype/Adv4/Adv4_cardvariable.ts
new file mode 100644
index 0000000..bee29d9
--- /dev/null
+++ b/test7oct-demot1-f/authsec_angular/frontend/angular-clarity-master/src/app/modules/main/BuilderComponents/angulardatatype/Adv4/Adv4_cardvariable.ts
@@ -0,0 +1,4 @@
+export const Adv4cardvariable = {
+    "cardButton": false,
+    "cardmodeldata": ``
+}
\ No newline at end of file
diff --git a/test7oct-demot1-f/authsec_angular/frontend/angular-clarity-master/src/app/modules/main/BuilderComponents/angulardatatype/Adv5/Adv5.component.html b/test7oct-demot1-f/authsec_angular/frontend/angular-clarity-master/src/app/modules/main/BuilderComponents/angulardatatype/Adv5/Adv5.component.html
new file mode 100644
index 0000000..88fba21
--- /dev/null
+++ b/test7oct-demot1-f/authsec_angular/frontend/angular-clarity-master/src/app/modules/main/BuilderComponents/angulardatatype/Adv5/Adv5.component.html
@@ -0,0 +1,787 @@
+<ol class="breadcrumb breadcrumb-arrow font-trirong">
+  <li><a href="javascript://"> Adv5</a></li>
+</ol>
+<div class="dg-wrapper">
+  <div class="clr-row">
+    <div class="clr-col-8">
+      <h3>Adv5 </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]="'age'"> <ng-container *clrDgHideableColumn="{hidden: false}"> age
+						    </ng-container></clr-dg-column>
+
+
+<clr-dg-column [clrDgField]="'age2'"> <ng-container *clrDgHideableColumn="{hidden: false}"> age2
+						    </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.age }}</clr-dg-cell>
+
+
+<clr-dg-cell>{{user.age2 }}</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 Adv5
+ <!--update button -->
+
+
+
+
+
+
+
+
+
+
+
+<button  class="btn btn-icon btn-primary" (click)="openvalueListvalue_list_field('EDIT')">V</button>
+
+<button  class="btn btn-icon btn-primary" (click)="openvalueListvalue_list_field2('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>age</label>
+	        <input id="name" class="clr-input"  type="number" [(ngModel)]="rowSelected.age" name="age" />
+	      </div>
+
+<div class="clr-col-sm-12">       
+<label>age2</label>
+	        <input id="name" class="clr-input"  type="number" [(ngModel)]="rowSelected.age2" name="age2" />
+	      </div>
+
+ <div class="clr-col-sm-12">
+          <label>addition</label>
+          <input class="clr-input" type="text" [value]="additiontotal" readonly />
+        </div>
+
+ <div class="clr-col-sm-12">
+          <label>multiplication</label>
+          <input class="clr-input" type="text" [value]="multiplicationtotal" readonly />
+        </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;">description</th>
+           
+
+ 
+          <th class="left" style="width:200px;">name</th>
+           
+
+       <th class="right" style="width:200px;">{{ supportcomponents?.length >= 1 ? 'Actions' : '' }}</th>
+        </tr>
+      </thead>
+      <tbody>
+        <tr *ngFor="let component of supportcomponents; let i = index">
+
+          
+ 
+          <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)="oneditsupport()" style="margin-left: 20px;">
+        <clr-icon shape="plus"></clr-icon> </button>
+    </table>
+  </div>
+</div>
+<!-- one to many code end here -->
+
+
+
+
+
+
+
+
+
+
+
+
+
+<!-- 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;">{{ childformcomponents?.length >= 1 ? 'Actions' : '' }}</th>
+        </tr>
+      </thead>
+      <tbody>
+        <tr *ngFor="let component of childformcomponents; 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)="oneditchildform()" style="margin-left: 20px;">
+        <clr-icon shape="plus"></clr-icon> </button>
+    </table>
+  </div>
+</div>
+<!-- one to many code end here -->
+
+<!-- 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 Adv5 
+
+
+
+
+
+
+
+
+
+
+
+<button  class="btn btn-icon btn-primary" (click)="openvalueListvalue_list_field('ADD')">V</button>
+
+<button  class="btn btn-icon btn-primary" (click)="openvalueListvalue_list_field2('ADD')">V</button>
+
+
+
+
+  <!-- aeroplane icon -->
+    &nbsp; &nbsp; &nbsp; &nbsp;
+    <a *ngIf="userrole?.includes('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: 'Adv5_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>  age</label>
+ <input class="clr-input"  type="number"  formControlName="age" />      
+ <div *ngIf="submitted && entryForm.controls.age.errors" class="error_mess">
+  <div *ngIf="submitted && entryForm.controls.age.errors.required" class="error_mess">*This field is Required</div>
+</div>  
+ </div>
+
+<div class="clr-col-sm-12">
+ <label>  age2</label>
+ <input class="clr-input"  type="number"  formControlName="age2" />      
+ <div *ngIf="submitted && entryForm.controls.age2.errors" class="error_mess">
+  <div *ngIf="submitted && entryForm.controls.age2.errors.required" class="error_mess">*This field is Required</div>
+</div>  
+ </div>
+
+ <div class="clr-col-sm-12">
+          <label>addition</label>
+          <input class="clr-input" type="text" [value]="additiontotal" readonly />
+        </div>
+
+ <div class="clr-col-sm-12">
+          <label>multiplication</label>
+          <input class="clr-input" type="text" [value]="multiplicationtotal" readonly />
+        </div>
+
+
+
+
+
+
+
+ 
+ </div> 
+
+
+<!-- one to many code start here -->
+<div style="margin-top: 30px;"><h4 style="display: inline;">support </h4>
+</div>
+<hr>
+<div class="clr-row">
+  <div class="clr-col-lg-12">
+    <table class="table" style="width:100%;" formArrayName="support">
+      <thead>
+        <tr>
+
+          
+ 
+          <th class="left" style="width:125px;">description</th>
+           
+
+ 
+          <th class="left" style="width:125px;">name</th>
+           
+
+
+          <th class="right" style="width:125px;">{{ supportcontrols.length > 1 ? 'Actions' : '' }}</th>
+        </tr>
+      </thead>
+      <tbody>
+        <tr *ngFor="let item of supportcontrols; let i=index" [formGroupName]="i">
+          
+ 
+          <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="supportcontrols.length > 1" (click)="onRemovesupport(i)"><clr-icon shape="trash" class="is-error"></clr-icon>
+            </a>
+          </td>
+        </tr>
+      </tbody>
+      <button type="button" class="btn btn-primary button1" (click)="onAddsupport()" >
+        <clr-icon shape="plus"></clr-icon> </button>
+    </table>
+  </div>
+</div>
+<!-- one to many code end here -->
+
+
+
+
+
+
+
+
+
+
+
+
+
+<!-- one to many code start here -->
+<div style="margin-top: 30px;"><h4 style="display: inline;">childform </h4>
+</div>
+<hr>
+<div class="clr-row">
+  <div class="clr-col-lg-12">
+    <table class="table" style="width:100%;" formArrayName="childform">
+      <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;">{{ childformcontrols.length > 1 ? 'Actions' : '' }}</th>
+        </tr>
+      </thead>
+      <tbody>
+        <tr *ngFor="let item of childformcontrols; 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="childformcontrols.length > 1" (click)="onRemovechildform(i)"><clr-icon shape="trash" class="is-error"></clr-icon>
+            </a>
+          </td>
+        </tr>
+      </tbody>
+      <button type="button" class="btn btn-primary button1" (click)="onAddchildform()" >
+        <clr-icon shape="plus"></clr-icon> </button>
+    </table>
+  </div>
+</div>
+<!-- one to many code end here -->
+
+
+
+      <!-- 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>
+
+
+
+
+
+
+
+
+
+
+
+
+ <!--   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]="'age'"> <ng-container *clrDgHideableColumn="{hidden: false}">age</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.age}}</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-->
+
+ <!--   value List field start-->
+ <clr-modal [(clrModalOpen)]="valueListModalvalue_list_field2" [clrModalSize]="'md'">
+	  <h3 class="modal-title"><b>Select From  value_list_field2  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_field2" [(ngModel)]="searchcusttextvalue_list_field2">       </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-column [clrDgField]="'age2'"> <ng-container *clrDgHideableColumn="{hidden: false}">age2</ng-container></clr-dg-column> 
+		  
+
+ 
+		   <clr-dg-column [clrDgField]="'age'"> <ng-container *clrDgHideableColumn="{hidden: false}">age</ng-container></clr-dg-column> 
+		  
+
+<clr-dg-row *clrDgItems="let user of product?.slice()?.reverse() | filter:searchcusttextvalue_list_field2;  let i = index " [clrDgItem]="user">
+
+	
+ 
+	<clr-dg-cell (click)="getcustvalue_list_field2ID(user.id)" style="color: rgb(108, 108, 194); cursor:pointer;">{{user.name}}</clr-dg-cell>
+ 
+
+ 
+	<clr-dg-cell (click)="getcustvalue_list_field2ID(user.id)" style="color: rgb(108, 108, 194); cursor:pointer;">{{user.age2}}</clr-dg-cell>
+ 
+
+ 
+	<clr-dg-cell (click)="getcustvalue_list_field2ID(user.id)" style="color: rgb(108, 108, 194); cursor:pointer;">{{user.age}}</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-->
+
+
+
+  <!-- htmlpopup -->
diff --git a/test7oct-demot1-f/authsec_angular/frontend/angular-clarity-master/src/app/modules/main/BuilderComponents/angulardatatype/Adv5/Adv5.component.scss b/test7oct-demot1-f/authsec_angular/frontend/angular-clarity-master/src/app/modules/main/BuilderComponents/angulardatatype/Adv5/Adv5.component.scss
new file mode 100644
index 0000000..12f7fc8
--- /dev/null
+++ b/test7oct-demot1-f/authsec_angular/frontend/angular-clarity-master/src/app/modules/main/BuilderComponents/angulardatatype/Adv5/Adv5.component.scss
@@ -0,0 +1,85 @@
+//@import "../../../../assets/scss/var";
+.s-info-bar {
+  display: flex;
+  flex-direction: row;
+  justify-content: space-between;
+  button {
+    outline: none;
+  }
+}
+.delete,.heading{
+  text-align: center;
+  color: red;
+}
+.entry-pg {
+  width: 750px;
+}
+
+.button1::after {
+  content: none;
+}
+.button1:hover::after {
+  content: "ADD ROWS";
+}
+
+.section {
+  background-color: #dddddd;
+  height: 40px;
+}
+
+.section p {
+  //color: white;
+  padding: 10px;
+  font-size: 18px;
+}
+
+.clr-input {
+  color: #212529;
+  border: 1px solid #ced4da;
+  border-radius: 0.25rem;
+  padding: 0.75rem 0.75rem;
+  margin-top: 3px;
+  width: 100%;
+  margin-bottom: 10px;
+}
+
+.clr-file {
+  color: #212529;
+  border: 1px solid #ced4da;
+  border-radius: 0.25rem;
+  //padding: 0.6rem 0.75rem;
+  margin-top: 3px;
+  width: 100%;
+  margin-bottom: 10px;
+}
+
+.center {
+  text-align: center;
+}
+select{
+  width: 100%;
+  margin-top: 3px;
+  padding: 5px 5px;
+  border: 1px solid #ccc;
+  border-radius: 4px;
+}
+input[type=text],[type=date],[type=number],textarea {
+  width: 100%;
+  padding: 15px 15px;
+  background-color:rgb(255, 255, 255);
+ // margin: 8px 0;
+  display: inline-block;
+  border: 1px solid #ccc;
+  border-radius: 4px;
+  box-sizing: border-box;
+}
+.error_mess {
+  color: red;
+}
+.universal-section-header {
+  margin: 24px 0 10px 0;
+  font-weight: 600;
+  color: #1a237e;
+  letter-spacing: 0.5px;
+  font-size: 1.25rem;
+}
\ No newline at end of file
diff --git a/test7oct-demot1-f/authsec_angular/frontend/angular-clarity-master/src/app/modules/main/BuilderComponents/angulardatatype/Adv5/Adv5.component.ts b/test7oct-demot1-f/authsec_angular/frontend/angular-clarity-master/src/app/modules/main/BuilderComponents/angulardatatype/Adv5/Adv5.component.ts
new file mode 100644
index 0000000..93aecb3
--- /dev/null
+++ b/test7oct-demot1-f/authsec_angular/frontend/angular-clarity-master/src/app/modules/main/BuilderComponents/angulardatatype/Adv5/Adv5.component.ts
@@ -0,0 +1,851 @@
+import { Component, OnInit } from '@angular/core';
+import { ToastrService } from 'ngx-toastr';
+import { AlertService } from 'src/app/services/alert.service';
+import { Adv5service} from './Adv5.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 { Adv5cardvariable } from './Adv5_cardvariable';
+import { UserInfoService } from 'src/app/services/user-info.service';
+declare var JsBarcode: any; 
+@Component({
+  selector: 'app-Adv5',
+  templateUrl: './Adv5.component.html',
+  styleUrls: ['./Adv5.component.scss']
+})
+export class Adv5Component implements OnInit {
+  cardButton = Adv5cardvariable.cardButton;
+  cardmodeldata = Adv5cardvariable.cardmodeldata;
+  public dashboardArray: DashboardContentModel2[];
+  isCardview = Adv5cardvariable.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 = 'Adv5_formCode'
+tableName = 'Adv5';  checkFormCode; selected: any[] = []; constructor(
+    private extensionService: ExtensionService,
+private userInfoService:UserInfoService,
+    private mainService:Adv5service,
+    private alertService: AlertService,
+    private toastr: ToastrService,
+    private _fb: FormBuilder,
+  ) { }
+  private editInterval: any;
+// component button 
+  ngOnInit(): void {
+    if(this.cardmodeldata !== ''){
+     this.cardmodal = JSON.parse(this.cardmodeldata);
+    this.dashboardArray = this.cardmodal.dashboard.slice();
+    console.log(this.dashboardArray)
+    }
+    this.userrole=this.userInfoService.getRoles();
+    this.getData();
+    this.entryForm = this._fb.group({
+name : [null],
+
+support: this._fb.array([this.initsupportForm()]),
+
+age : [null,[Validators.required]],
+
+age2 : [null,[Validators.required]],
+
+
+
+
+
+
+
+
+
+childform: this._fb.array([this.initchildformForm()]),
+
+
+ 
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+  }); // 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 === "Adv5_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 
+
+
+
+
+
+
+
+
+  // Subscribe to value changes for auto calculation
+    this.entryForm.valueChanges.subscribe(() => {
+      this.onInputChangeaddition('add');
+    });
+
+// Start polling for edit changes
+    this.editInterval = setInterval(() => {
+      if (this.modalEdit) {
+        this.onInputChangeaddition('edit');
+      }
+    }, 200);
+
+  // Subscribe to value changes for auto calculation
+    this.entryForm.valueChanges.subscribe(() => {
+      this.onInputChangemultiplication('add');
+    });
+
+// Start polling for edit changes
+    this.editInterval = setInterval(() => {
+      if (this.modalEdit) {
+        this.onInputChangemultiplication('edit');
+      }
+    }, 200);
+
+
+
+
+
+
+
+
+  }
+ ngOnDestroy(): void {
+    if (this.editInterval) {
+      clearInterval(this.editInterval);
+    }
+  }
+
+// one to many start
+ initsupportForm() {    return this._fb.group({ 
+
+
+ 	
+ description: [null],
+ 
+
+ 	
+ name: [null],
+ 
+
+
+});  }  
+get supportcontrols() {return (this.entryForm.get("support") as FormArray).controls;  }
+onAddsupport() {
+(<FormArray>this.entryForm.get("support")).push(this.initsupportForm());  }
+onRemovesupport(index: number) {
+(<FormArray>this.entryForm.get("support")).removeAt(index);  }
+ oneditsupport() {    this.supportcomponents.push({ 
+
+ 
+description: "",
+ 
+
+ 
+name: "",
+ 
+
+
+	  });  }  
+ deletesupportRow(index) {
+ this.supportcomponents.splice(index, 1); 
+ }  
+supportcomponents;
+ // one to many end 
+
+
+
+
+
+
+
+
+
+
+
+
+
+// one to many start
+ initchildformForm() {    return this._fb.group({ 
+
+
+ 	
+ active: [null],
+ 
+
+ 	
+ description: [null],
+ 
+
+ 	
+ name: [null],
+ 
+
+
+});  }  
+get childformcontrols() {return (this.entryForm.get("childform") as FormArray).controls;  }
+onAddchildform() {
+(<FormArray>this.entryForm.get("childform")).push(this.initchildformForm());  }
+onRemovechildform(index: number) {
+(<FormArray>this.entryForm.get("childform")).removeAt(index);  }
+ oneditchildform() {    this.childformcomponents.push({ 
+
+ 
+active: "",
+ 
+
+ 
+description: "",
+ 
+
+ 
+name: "",
+ 
+
+
+	  });  }  
+ deletechildformRow(index) {
+ this.childformcomponents.splice(index, 1); 
+ }  
+childformcomponents;
+ // one to many end 
+
+ error; 
+  getData() {
+    this.mainService.getAll().subscribe((data) => {
+      console.log(data);
+      this.product = data;
+this.product = [...this.product].reverse(); if(this.product.length==0){
+        this.error="No Data Available"
+     }   
+    },(error) => {
+      console.log(error);
+      if(error){
+       this.error="Server Error";
+     }
+    });
+  }
+  onEdit(row) {
+    this.rowSelected = row;
+
+
+this.supportcomponents = row.support;
+
+
+
+
+
+
+
+
+
+
+
+
+
+this.childformcomponents = row.childform;
+
+
+    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.onInputChangeaddition ('edit');
+ //calculated field end
+
+//calculated field start
+	
+this.onInputChangemultiplication ('edit');
+ //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;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+  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();
+
+} 
+
+
+
+
+
+
+
+
+
+  // calculated field code start 
+
+
+ 
+ additionage; 
+  
+
+ 
+ additionage2; 
+  
+
+
+  additiontotal;
+  additioncalculateOperators: 'Addition' | 'Subtraction' | 'Multiplication' | 'Division' | 'Concatination' = "Addition"
+  onInputChangeaddition(mode: 'add' | 'edit') {
+
+  
+    const lastObj = 0
+    const lastObjstring = ''
+    if (mode === 'add') {
+      
+ 
+      this.additionage = this.entryForm.value.age || '';
+       
+
+ 
+      this.additionage2 = this.entryForm.value.age2 || '';
+       
+
+
+    } else {
+
+ 
+      this.additionage = this.rowSelected.age;
+ 
+
+ 
+      this.additionage2 = this.rowSelected.age2;
+ 
+
+    }
+    
+ 
+    const ageValue = parseFloat(this.additionage) || 0;
+     
+
+ 
+    const age2Value = parseFloat(this.additionage2) || 0;
+     
+
+    switch (this.additioncalculateOperators) {
+      case 'Addition':
+        this.additiontotal = (
+          
+ 
+          ageValue +
+           
+
+ 
+          age2Value +
+           
+
+          lastObj).toString();
+        break;
+      case 'Subtraction':
+        this.additiontotal = (
+          
+ 
+          ageValue -
+           
+
+ 
+          age2Value -
+           
+
+          lastObj).toString();
+        break;
+      case 'Multiplication':
+        this.additiontotal = (
+          
+ 
+          ageValue *
+           
+
+ 
+          age2Value *
+           
+
+         1).toString();
+
+        break;
+      case 'Division':
+
+        this.additiontotal = (
+          
+ 
+          ageValue /
+           
+
+ 
+          age2Value /
+           
+
+          1).toString();
+
+        break;
+      case 'Concatination':
+        this.additiontotal = `
+          
+ 
+          ${this.additionage || ''}
+           
+
+ 
+          ${this.additionage2 || ''}
+           
+
+          ${lastObjstring || ''}`;
+
+        break;
+      default:
+        this.additiontotal = '';
+    }
+  }
+
+
+
+  // calculated field code start 
+
+
+ 
+ multiplicationage; 
+  
+
+ 
+ multiplicationage2; 
+  
+
+
+  multiplicationtotal;
+  multiplicationcalculateOperators: 'Addition' | 'Subtraction' | 'Multiplication' | 'Division' | 'Concatination' = "Multiplication"
+  onInputChangemultiplication(mode: 'add' | 'edit') {
+
+  
+    const lastObj = 0
+    const lastObjstring = ''
+    if (mode === 'add') {
+      
+ 
+      this.multiplicationage = this.entryForm.value.age || '';
+       
+
+ 
+      this.multiplicationage2 = this.entryForm.value.age2 || '';
+       
+
+
+    } else {
+
+ 
+      this.multiplicationage = this.rowSelected.age;
+ 
+
+ 
+      this.multiplicationage2 = this.rowSelected.age2;
+ 
+
+    }
+    
+ 
+    const ageValue = parseFloat(this.multiplicationage) || 0;
+     
+
+ 
+    const age2Value = parseFloat(this.multiplicationage2) || 0;
+     
+
+    switch (this.multiplicationcalculateOperators) {
+      case 'Addition':
+        this.multiplicationtotal = (
+          
+ 
+          ageValue +
+           
+
+ 
+          age2Value +
+           
+
+          lastObj).toString();
+        break;
+      case 'Subtraction':
+        this.multiplicationtotal = (
+          
+ 
+          ageValue -
+           
+
+ 
+          age2Value -
+           
+
+          lastObj).toString();
+        break;
+      case 'Multiplication':
+        this.multiplicationtotal = (
+          
+ 
+          ageValue *
+           
+
+ 
+          age2Value *
+           
+
+         1).toString();
+
+        break;
+      case 'Division':
+
+        this.multiplicationtotal = (
+          
+ 
+          ageValue /
+           
+
+ 
+          age2Value /
+           
+
+          1).toString();
+
+        break;
+      case 'Concatination':
+        this.multiplicationtotal = `
+          
+ 
+          ${this.multiplicationage || ''}
+           
+
+ 
+          ${this.multiplicationage2 || ''}
+           
+
+          ${lastObjstring || ''}`;
+
+        break;
+      default:
+        this.multiplicationtotal = '';
+    }
+  }
+
+
+//Value List field start    
+value_list_fieldMode;
+searchcusttextvalue_list_field :any;    
+ valueListModalvalue_list_field :boolean=false;
+    openvalueListvalue_list_field(mode){
+ this.valueListModalvalue_list_field=!this.valueListModalvalue_list_field ; 
+      this.value_list_fieldMode = mode;     }
+     customerdatavalue_list_field ;     
+value_list_fielderror;
+clickedvalue_list_fieldID:number;
+
+getcustvalue_list_fieldID(id:number){    
+ this.clickedvalue_list_fieldID=id;
+						    console.log("clicked by id"+ id);
+						    this.mainService.getById(id).subscribe((data) => {       console.log(data);
+						         if(this.value_list_fieldMode == "ADD"){ 
+
+							
+ 
+							this.entryForm.get('age').setValue(data.age);
+							 
+
+
+						}else if(this.value_list_fieldMode == "EDIT"){
+
+							
+ 
+							this.rowSelected.age= data. age
+							 
+
+
+						}       });       this.valueListModalvalue_list_field =false;
+						    }    //value List field end 
+
+//Value List field start    
+value_list_field2Mode;
+searchcusttextvalue_list_field2 :any;    
+ valueListModalvalue_list_field2 :boolean=false;
+    openvalueListvalue_list_field2(mode){
+ this.valueListModalvalue_list_field2=!this.valueListModalvalue_list_field2 ; 
+      this.value_list_field2Mode = mode;     }
+     customerdatavalue_list_field2 ;     
+value_list_field2error;
+clickedvalue_list_field2ID:number;
+
+getcustvalue_list_field2ID(id:number){    
+ this.clickedvalue_list_field2ID=id;
+						    console.log("clicked by id"+ id);
+						    this.mainService.getById(id).subscribe((data) => {       console.log(data);
+						         if(this.value_list_field2Mode == "ADD"){ 
+
+							
+ 
+							this.entryForm.get('name').setValue(data.name);
+							 
+
+ 
+							this.entryForm.get('age2').setValue(data.age2);
+							 
+
+ 
+							this.entryForm.get('age').setValue(data.age);
+							 
+
+
+						}else if(this.value_list_field2Mode == "EDIT"){
+
+							
+ 
+							this.rowSelected.name= data. name
+							 
+
+ 
+							this.rowSelected.age2= data. age2
+							 
+
+ 
+							this.rowSelected.age= data. age
+							 
+
+
+						}       });       this.valueListModalvalue_list_field2 =false;
+						    }    //value List field end 
+
+
+
+// updateaction
+}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/test7oct-demot1-f/authsec_angular/frontend/angular-clarity-master/src/app/modules/main/BuilderComponents/angulardatatype/Adv5/Adv5.service.ts b/test7oct-demot1-f/authsec_angular/frontend/angular-clarity-master/src/app/modules/main/BuilderComponents/angulardatatype/Adv5/Adv5.service.ts
new file mode 100644
index 0000000..814350a
--- /dev/null
+++ b/test7oct-demot1-f/authsec_angular/frontend/angular-clarity-master/src/app/modules/main/BuilderComponents/angulardatatype/Adv5/Adv5.service.ts
@@ -0,0 +1,51 @@
+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 Adv5service{
+  private baseURL = "Adv5/Adv5" ;  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/test7oct-demot1-f/authsec_angular/frontend/angular-clarity-master/src/app/modules/main/BuilderComponents/angulardatatype/Adv5/Adv5_cardvariable.ts b/test7oct-demot1-f/authsec_angular/frontend/angular-clarity-master/src/app/modules/main/BuilderComponents/angulardatatype/Adv5/Adv5_cardvariable.ts
new file mode 100644
index 0000000..e55c622
--- /dev/null
+++ b/test7oct-demot1-f/authsec_angular/frontend/angular-clarity-master/src/app/modules/main/BuilderComponents/angulardatatype/Adv5/Adv5_cardvariable.ts
@@ -0,0 +1,4 @@
+export const Adv5cardvariable = {
+    "cardButton": false,
+    "cardmodeldata": ``
+}
\ No newline at end of file
diff --git a/test7oct-demot1-f/authsec_angular/frontend/angular-clarity-master/src/app/modules/main/BuilderComponents/angulardatatype/Basicp1/Basicp1.component.html b/test7oct-demot1-f/authsec_angular/frontend/angular-clarity-master/src/app/modules/main/BuilderComponents/angulardatatype/Basicp1/Basicp1.component.html
new file mode 100644
index 0000000..9fb505a
--- /dev/null
+++ b/test7oct-demot1-f/authsec_angular/frontend/angular-clarity-master/src/app/modules/main/BuilderComponents/angulardatatype/Basicp1/Basicp1.component.html
@@ -0,0 +1,679 @@
+<ol class="breadcrumb breadcrumb-arrow font-trirong">
+  <li><a href="javascript://"> Basicp1</a></li>
+</ol>
+<div class="dg-wrapper">
+  <div class="clr-row">
+    <div class="clr-col-8">
+      <h3>Basicp1 </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]="'name2'"> <ng-container *clrDgHideableColumn="{hidden: false}"> name2
+						    </ng-container></clr-dg-column>
+
+
+<clr-dg-column [clrDgField]="'number1'"> <ng-container *clrDgHideableColumn="{hidden: false}"> number1
+						    </ng-container></clr-dg-column>
+
+
+<clr-dg-column [clrDgField]="'number2'"> <ng-container *clrDgHideableColumn="{hidden: false}"> number2
+						    </ng-container></clr-dg-column>
+
+
+<clr-dg-column [clrDgField]="'phone_number'"> <ng-container *clrDgHideableColumn="{hidden: false}"> Phone Number
+						    </ng-container></clr-dg-column>
+
+
+<clr-dg-column [clrDgField]="'phone_number2'"> <ng-container *clrDgHideableColumn="{hidden: false}"> Phone Number2
+						    </ng-container></clr-dg-column>
+
+
+<clr-dg-column [clrDgField]="'paragraph_field'"> <ng-container *clrDgHideableColumn="{hidden: false}"> Paragraph Field
+						    </ng-container></clr-dg-column>
+
+
+<clr-dg-column [clrDgField]="'paragraph_field2'"> <ng-container *clrDgHideableColumn="{hidden: false}"> Paragraph Field2
+						    </ng-container></clr-dg-column>
+
+
+ <clr-dg-column [clrDgField]="'password_field'"> <ng-container *clrDgHideableColumn="{hidden: false}">Password Field
+						 </ng-container></clr-dg-column>
+
+
+<clr-dg-column [clrDgField]="'textarea'"> <ng-container *clrDgHideableColumn="{hidden: false}"> Textarea
+						    </ng-container></clr-dg-column>
+
+
+<clr-dg-column [clrDgField]="'textarea_field'"> <ng-container *clrDgHideableColumn="{hidden: false}"> Textarea Field
+						    </ng-container></clr-dg-column>
+
+
+<clr-dg-column [clrDgField]="'textarea_field2'"> <ng-container *clrDgHideableColumn="{hidden: false}"> Textarea Field2
+						    </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.name2 }}</clr-dg-cell>
+
+
+<clr-dg-cell>{{user.number1 }}</clr-dg-cell>
+
+
+<clr-dg-cell>{{user.number2 }}</clr-dg-cell>
+
+
+<clr-dg-cell>{{user.phone_number }}</clr-dg-cell>
+
+
+<clr-dg-cell>{{user.phone_number2 }}</clr-dg-cell>
+
+
+<clr-dg-cell (click)="goToReplaceStringparagraph_field(user.paragraph_field)" style="cursor: pointer; align-items: center;"><clr-icon shape="details"></clr-icon></clr-dg-cell>
+
+
+<clr-dg-cell (click)="goToReplaceStringparagraph_field2(user.paragraph_field2)" style="cursor: pointer; align-items: center;"><clr-icon shape="details"></clr-icon></clr-dg-cell>
+
+
+<clr-dg-cell>{{user.password_field }}</clr-dg-cell>
+
+
+<clr-dg-cell (click)="goToReplaceStringtextarea (user.textarea)" style="cursor: pointer; align-items: center;"><clr-icon shape="details"></clr-icon>
+</clr-dg-cell>
+
+
+<clr-dg-cell (click)="goToReplaceStringtextarea_field (user.textarea_field)" style="cursor: pointer; align-items: center;"><clr-icon shape="details"></clr-icon>
+</clr-dg-cell>
+
+
+<clr-dg-cell (click)="goToReplaceStringtextarea_field2 (user.textarea_field2)" style="cursor: pointer; align-items: center;"><clr-icon shape="details"></clr-icon>
+</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)]="rsModalparagraph_field" [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)]="rsModalparagraph_field2" [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)]="rsModaltextarea" [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)]="rsModaltextarea_field" [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)]="rsModaltextarea_field2" [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 Basicp1
+ <!--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>name2</label>
+	        <input class="clr-input"  type="text" [(ngModel)]="rowSelected.name2" name="name2" />
+	      </div>
+
+<div class="clr-col-sm-12">       
+<label>number1</label>
+	        <input id="name" class="clr-input"  type="number" [(ngModel)]="rowSelected.number1" name="number1" />
+	      </div>
+
+<div class="clr-col-sm-12">       
+<label>number2</label>
+	        <input id="name" class="clr-input"  type="number" [(ngModel)]="rowSelected.number2" name="number2" />
+	      </div>
+
+<div class="clr-col-sm-12">         
+<label> Phone Number</label>
+	        <input id="name" class="clr-input" type="Text" [(ngModel)]="rowSelected.phone_number " name="phone_number" pattern="((\\+)?([1-9]{2}))?[1-9]{1}[0-9]{9}$" />
+	        <div *ngIf="rowSelected.phone_number  && !isValidPhone_number(rowSelected.phone_number)" class="error_mess">
+	          * Please Follow your pattern,+91 Enter 10 digit Mobile Number.
+	        </div>       </div> 
+
+<div class="clr-col-sm-12">         
+<label> Phone Number2</label>
+	        <input id="name" class="clr-input" type="Text" [(ngModel)]="rowSelected.phone_number2 " name="phone_number2" pattern="((\\+)?([1-9]{2}))?[1-9]{1}[0-9]{9}$" />
+	        <div *ngIf="rowSelected.phone_number2  && !isValidPhone_number2(rowSelected.phone_number2)" class="error_mess">
+	          * Please Follow your pattern,+91 Enter 10 digit Mobile Number.
+	        </div>       </div> 
+
+<div class="clr-col-sm-12">         
+<label> Paragraph Field</label>
+	        <input id="name"  type="Text" class="form-control" style="border: none; outline: none; height:33px !important;" [(ngModel)]="rowSelected.paragraph_field" name=" paragraph_field " />       </div>
+
+<div class="clr-col-sm-12">         
+<label> Paragraph Field2</label>
+	        <input id="name"  type="Text" class="form-control" style="border: none; outline: none; height:33px !important;" [(ngModel)]="rowSelected.paragraph_field2" name=" paragraph_field2 " />       </div>
+
+<div class="clr-col-sm-12">       
+<label> Password Field</label><br>      
+ <div><input [type]="newpHidepassword_field ? 'password': 'text'" class="clr-input" style="width: 93% !important;" [(ngModel)]="rowSelected.password_field" name="password_field">&nbsp;
+	      <clr-icon [attr.shape]="newIconpassword_field" (click)="newShapeChangerpassword_field()"></clr-icon></div>
+	    </div>
+
+<div class="clr-col-sm-12">               
+<label> Textarea</label>
+	              <textarea cols="10" rows="2"[(ngModel)]="rowSelected.textarea" name="textarea " placeholder="Textarea">  </textarea>
+	           </div> 
+
+<div class="clr-col-sm-12">               
+<label> Textarea Field</label>
+	              <textarea cols="10" rows="2"[(ngModel)]="rowSelected.textarea_field" name="textarea_field " placeholder="Textarea">  </textarea>
+	           </div> 
+
+<div class="clr-col-sm-12">               
+<label> Textarea Field2</label>
+	              <textarea cols="10" rows="2"[(ngModel)]="rowSelected.textarea_field2" name="textarea_field2 " placeholder="Textarea">  </textarea>
+	           </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 Basicp1 
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+  <!-- aeroplane icon -->
+    &nbsp; &nbsp; &nbsp; &nbsp;
+    <a *ngIf="userrole?.includes('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: 'Basicp1_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>  name2</label>
+ <input class="clr-input"  type="text"  formControlName="name2" />       
+ </div>
+
+<div class="clr-col-sm-12">
+ <label>  number1</label>
+ <input class="clr-input"  type="number"  formControlName="number1" />      
+ <div *ngIf="submitted && entryForm.controls.number1.errors" class="error_mess">
+  <div *ngIf="submitted && entryForm.controls.number1.errors.required" class="error_mess">*This field is Required</div>
+</div>  
+ </div>
+
+<div class="clr-col-sm-12">
+ <label>  number2</label>
+ <input class="clr-input"  type="number"  formControlName="number2" />      
+ <div *ngIf="submitted && entryForm.controls.number2.errors" class="error_mess">
+  <div *ngIf="submitted && entryForm.controls.number2.errors.required" class="error_mess">*This field is Required</div>
+</div>  
+ </div>
+
+<div class="clr-col-sm-12">        
+<label>  Phone Number</label>        
+<input class="clr-input" type="text" formControlName="phone_number" pattern="((\+)?([1-9]{2}))?[1-9]{1}[0-9]{9}$" />
+	        <div *ngIf="submitted && entryForm.controls['phone_number'].errors" class="error_mess">
+	          <div *ngIf="submitted && entryForm.controls['phone_number'].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>  Phone Number2</label>        
+<input class="clr-input" type="text" formControlName="phone_number2" pattern="((\+)?([1-9]{2}))?[1-9]{1}[0-9]{9}$" />
+	        <div *ngIf="submitted && entryForm.controls['phone_number2'].errors" class="error_mess">
+	          <div *ngIf="submitted && entryForm.controls['phone_number2'].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>Paragraph Field</label>      
+   <input class="form-control" type="Text" formControlName="paragraph_field" style="border: none; outline: none; height:33px !important;" />
+	      </div>
+
+<div class="clr-col-sm-12">        
+ <label>Paragraph Field2</label>      
+   <input class="form-control" type="Text" formControlName="paragraph_field2" style="border: none; outline: none; height:33px !important;" />
+	      </div>
+
+<div class="clr-col-sm-12">       
+	<label>Password Field</label><br>
+	<div><input class="clr-input" style="width: 93% !important;" [type]="newaddpHidepassword_field ? 'password': 'text'" formControlName="password_field" autocomplete >&nbsp;
+		<clr-icon [attr.shape]="newaddIconpassword_field" (click)="newaddChangerpassword_field()"></clr-icon></div>
+	</div>
+
+          <div class="clr-col-sm-12">
+<label>Confirm Password Field</label><br>
+           <input type="password" class="clr-input" formControlName="confirmpassword_field" autocomplete >
+           <div *ngIf="entryForm.controls.confirmpassword_field.errors" class="error_mess">
+            <div *ngIf="entryForm.controls.confirmpassword_field.errors.confirmedpassword_fieldValidator" class="error_mess">* Password and Confirm Password must be match.</div>
+        </div>
+          </div>
+
+<div class="clr-col-sm-12">             
+ <label>  Textarea</label>             
+ <textarea cols="10" rows="2" formControlName="textarea" placeholder="Textarea">  </textarea>
+	            </div>
+
+<div class="clr-col-sm-12">             
+ <label>  Textarea Field</label>             
+ <textarea cols="10" rows="2" formControlName="textarea_field" placeholder="Textarea">  </textarea>
+	            </div>
+
+<div class="clr-col-sm-12">             
+ <label>  Textarea Field2</label>             
+ <textarea cols="10" rows="2" formControlName="textarea_field2" placeholder="Textarea">  </textarea>
+	            </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/test7oct-demot1-f/authsec_angular/frontend/angular-clarity-master/src/app/modules/main/BuilderComponents/angulardatatype/Basicp1/Basicp1.component.scss b/test7oct-demot1-f/authsec_angular/frontend/angular-clarity-master/src/app/modules/main/BuilderComponents/angulardatatype/Basicp1/Basicp1.component.scss
new file mode 100644
index 0000000..12f7fc8
--- /dev/null
+++ b/test7oct-demot1-f/authsec_angular/frontend/angular-clarity-master/src/app/modules/main/BuilderComponents/angulardatatype/Basicp1/Basicp1.component.scss
@@ -0,0 +1,85 @@
+//@import "../../../../assets/scss/var";
+.s-info-bar {
+  display: flex;
+  flex-direction: row;
+  justify-content: space-between;
+  button {
+    outline: none;
+  }
+}
+.delete,.heading{
+  text-align: center;
+  color: red;
+}
+.entry-pg {
+  width: 750px;
+}
+
+.button1::after {
+  content: none;
+}
+.button1:hover::after {
+  content: "ADD ROWS";
+}
+
+.section {
+  background-color: #dddddd;
+  height: 40px;
+}
+
+.section p {
+  //color: white;
+  padding: 10px;
+  font-size: 18px;
+}
+
+.clr-input {
+  color: #212529;
+  border: 1px solid #ced4da;
+  border-radius: 0.25rem;
+  padding: 0.75rem 0.75rem;
+  margin-top: 3px;
+  width: 100%;
+  margin-bottom: 10px;
+}
+
+.clr-file {
+  color: #212529;
+  border: 1px solid #ced4da;
+  border-radius: 0.25rem;
+  //padding: 0.6rem 0.75rem;
+  margin-top: 3px;
+  width: 100%;
+  margin-bottom: 10px;
+}
+
+.center {
+  text-align: center;
+}
+select{
+  width: 100%;
+  margin-top: 3px;
+  padding: 5px 5px;
+  border: 1px solid #ccc;
+  border-radius: 4px;
+}
+input[type=text],[type=date],[type=number],textarea {
+  width: 100%;
+  padding: 15px 15px;
+  background-color:rgb(255, 255, 255);
+ // margin: 8px 0;
+  display: inline-block;
+  border: 1px solid #ccc;
+  border-radius: 4px;
+  box-sizing: border-box;
+}
+.error_mess {
+  color: red;
+}
+.universal-section-header {
+  margin: 24px 0 10px 0;
+  font-weight: 600;
+  color: #1a237e;
+  letter-spacing: 0.5px;
+  font-size: 1.25rem;
+}
\ No newline at end of file
diff --git a/test7oct-demot1-f/authsec_angular/frontend/angular-clarity-master/src/app/modules/main/BuilderComponents/angulardatatype/Basicp1/Basicp1.component.ts b/test7oct-demot1-f/authsec_angular/frontend/angular-clarity-master/src/app/modules/main/BuilderComponents/angulardatatype/Basicp1/Basicp1.component.ts
new file mode 100644
index 0000000..0a13508
--- /dev/null
+++ b/test7oct-demot1-f/authsec_angular/frontend/angular-clarity-master/src/app/modules/main/BuilderComponents/angulardatatype/Basicp1/Basicp1.component.ts
@@ -0,0 +1,533 @@
+import { Component, OnInit } from '@angular/core';
+import { ToastrService } from 'ngx-toastr';
+import { AlertService } from 'src/app/services/alert.service';
+import { Basicp1service} from './Basicp1.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 { Basicp1cardvariable } from './Basicp1_cardvariable';
+import { UserInfoService } from 'src/app/services/user-info.service';
+declare var JsBarcode: any; 
+@Component({
+  selector: 'app-Basicp1',
+  templateUrl: './Basicp1.component.html',
+  styleUrls: ['./Basicp1.component.scss']
+})
+export class Basicp1Component implements OnInit {
+  cardButton = Basicp1cardvariable.cardButton;
+  cardmodeldata = Basicp1cardvariable.cardmodeldata;
+  public dashboardArray: DashboardContentModel2[];
+  isCardview = Basicp1cardvariable.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 = 'Basicp1_formCode'
+tableName = 'Basicp1';  checkFormCode; selected: any[] = []; constructor(
+    private extensionService: ExtensionService,
+private userInfoService:UserInfoService,
+    private mainService:Basicp1service,
+    private alertService: AlertService,
+    private toastr: ToastrService,
+    private _fb: FormBuilder,
+  ) { }
+  private editInterval: any;
+// component button 
+  ngOnInit(): void {
+    if(this.cardmodeldata !== ''){
+     this.cardmodal = JSON.parse(this.cardmodeldata);
+    this.dashboardArray = this.cardmodal.dashboard.slice();
+    console.log(this.dashboardArray)
+    }
+    this.userrole=this.userInfoService.getRoles();
+    this.getData();
+    this.entryForm = this._fb.group({
+name : [null],
+
+name2 : [null],
+
+number1 : [null,[Validators.required]],
+
+number2 : [null,[Validators.required]],
+
+phone_number: ['+91'],
+
+phone_number2: ['+91'],
+
+paragraph_field : [null],
+
+paragraph_field2 : [null],
+
+password_field : [null],
+confirmpassword_field : [null],
+
+textarea : [null],
+
+textarea_field : [null],
+
+textarea_field2 : [null],
+
+
+ 
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+    }, {
+        validator: Confirmedpassword_fieldValidator('password_field', 'confirmpassword_field')
+
+
+
+
+
+
+
+  }); // 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 === "Basicp1_formCode");
+      console.log(this.checkFormCode);
+      console.log(this.additionalFieldsFromBackend);
+      if (this.additionalFieldsFromBackend && this.additionalFieldsFromBackend.length > 0) {
+        this.additionalFieldsFromBackend.forEach(field => {
+          if (field.formCode === this.formcode) {
+            if (!this.entryForm.contains(field.extValue)) {
+              // Add the control only if it doesn't exist in the form
+              this.entryForm.addControl(field.extValue, this._fb.control(field.fieldValue));
+            }
+          }
+        });
+      }
+    });
+    console.log(this.entryForm.value);
+    // form code end 
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+  }
+ ngOnDestroy(): void {
+    if (this.editInterval) {
+      clearInterval(this.editInterval);
+    }
+  }
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ error; 
+  getData() {
+    this.mainService.getAll().subscribe((data) => {
+      console.log(data);
+      this.product = data;
+this.product = [...this.product].reverse(); if(this.product.length==0){
+        this.error="No Data Available"
+     }   
+    },(error) => {
+      console.log(error);
+      if(error){
+       this.error="Server Error";
+     }
+    });
+  }
+  onEdit(row) {
+    this.rowSelected = row;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+    this.modalEdit = true;
+  }
+   onDelete(row) {
+    this.rowSelected = row;
+     this.modaldelete=true;
+  }
+  delete(id)
+  {
+    this.modaldelete = false;
+    console.log("in delete  "+id);
+    this.mainService.delete(id).subscribe(
+      (data) => {
+        console.log(data);
+        this.ngOnInit();
+  if (data) {				      this.toastr.success('Deleted successfully');      }
+    });
+  }
+    onUpdate(id) {
+    this.modalEdit = false;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+    //console.log("in update");
+    console.log("id  " + id);
+    console.log(this.rowSelected);
+    //console.log("out update");
+    this.mainService.update(id, this.rowSelected).subscribe(
+      (data) => {
+        console.log(data);
+        if (data || data.status >= 200 && data.status <= 299) {
+          this.toastr.success("Update Successfully");
+        }
+setTimeout(() => {
+      this.ngOnInit();
+    }, 500);
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+      }, (error) => {
+        console.log(error);
+        if (error.status >= 200 && error.status <= 299) {
+          // this.toastr.success("update Succesfully");
+        }
+        if (error.status >= 400 && error.status <= 499) {
+          this.toastr.error("Not Updated");
+        }
+        if (error.status >= 500 && error.status <= 599) {
+          this.toastr.error("Not Updated");
+        }
+      });
+    setTimeout(() => {
+      this.ngOnInit();
+    }, 500);
+  } 
+onCreate() {
+     this.modalAdd=false;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+  this.mainService.create(this.entryForm.value).subscribe(
+    (data) => {
+      console.log(data);
+  if (data || data.status >= 200 && data.status <= 299) {
+          this.toastr.success("Added Successfully");
+        }
+setTimeout(() => {
+      this.ngOnInit();
+    }, 500);
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+      }, (error) => {
+        console.log(error);
+        if (error.status >= 200 && error.status <= 299) {
+          // this.toastr.success("Added Succesfully");
+        }
+        if (error.status >= 400 && error.status <= 499) {
+          this.toastr.error("Not Added");
+        }
+        if (error.status >= 500 && error.status <= 599) {
+          this.toastr.error("Not Added");
+        }
+      });
+    setTimeout(() => {
+      this.ngOnInit();
+    }, 500);
+  }
+  goToAdd(row) {
+this.modalAdd = true; this.submitted = false;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+  }
+ submitted = false;
+onSubmit() {
+  console.log(this.entryForm.value);
+ this.submitted = true;
+  if (this.entryForm.invalid) {
+    return;
+  }this.onCreate();
+
+} 
+
+
+
+
+
+
+
+
+isValidPhone_number(phone: string): boolean {
+  const phonePattern = /^(\+[1-9][0-9]{0,2})?[1-9][0-9]{9}$/;
+  return phonePattern.test(phone);
+}
+
+isValidPhone_number2(phone: string): boolean {
+  const phonePattern = /^(\+[1-9][0-9]{0,2})?[1-9][0-9]{9}$/;
+  return phonePattern.test(phone);
+}
+
+rsModalparagraph_field = false;  
+ goToReplaceStringparagraph_field (row){
+						    this.rowSelected = row;     this.rsModalparagraph_field  =true;   }
+
+rsModalparagraph_field2 = false;  
+ goToReplaceStringparagraph_field2 (row){
+						    this.rowSelected = row;     this.rsModalparagraph_field2  =true;   }
+
+newpHidepassword_field: boolean = true;
+ newIconpassword_field: string = "eye"; 
+newShapeChangerpassword_field() {
+this.newpHidepassword_field = !this.newpHidepassword_field;  
+ if(this.newpHidepassword_field){
+this.newIconpassword_field = 'eye'   } else {     this.newIconpassword_field = 'eye-hide'   }
+} 
+
+ newaddpHidepassword_field: boolean = true;
+ newaddIconpassword_field: string = "eye";
+newaddChangerpassword_field() {   this.newaddpHidepassword_field = !this.newaddpHidepassword_field;
+ if(this.newaddpHidepassword_field){     this.newaddIconpassword_field = 'eye'   } else {
+  this.newaddIconpassword_field = 'eye-hide'   } }
+
+rsModaltextarea = false;   
+goToReplaceStringtextarea(row){
+this.rowSelected = row;     this.rsModaltextarea  =true;   }
+
+rsModaltextarea_field = false;   
+goToReplaceStringtextarea_field(row){
+this.rowSelected = row;     this.rsModaltextarea_field  =true;   }
+
+rsModaltextarea_field2 = false;   
+goToReplaceStringtextarea_field2(row){
+this.rowSelected = row;     this.rsModaltextarea_field2  =true;   }
+
+// updateaction
+}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+export function Confirmedpassword_fieldValidator(controlName: string, matchingControlName: string){
+  return (formGroup: FormGroup) => {
+      const control = formGroup.controls[controlName];
+      const matchingControl = formGroup.controls[matchingControlName];
+      if (matchingControl.errors && !matchingControl.errors.confirmedpassword_fieldValidator) {
+          return;
+      }
+      if (control.value !== matchingControl.value) {
+          matchingControl.setErrors({ confirmedpassword_fieldValidator: true });
+      } else {
+          matchingControl.setErrors(null);
+      }
+  }
+}
+
+
+
+
+
+
+
+
diff --git a/test7oct-demot1-f/authsec_angular/frontend/angular-clarity-master/src/app/modules/main/BuilderComponents/angulardatatype/Basicp1/Basicp1.service.ts b/test7oct-demot1-f/authsec_angular/frontend/angular-clarity-master/src/app/modules/main/BuilderComponents/angulardatatype/Basicp1/Basicp1.service.ts
new file mode 100644
index 0000000..4258bf3
--- /dev/null
+++ b/test7oct-demot1-f/authsec_angular/frontend/angular-clarity-master/src/app/modules/main/BuilderComponents/angulardatatype/Basicp1/Basicp1.service.ts
@@ -0,0 +1,57 @@
+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 Basicp1service{
+  private baseURL = "Basicp1/Basicp1" ;  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/test7oct-demot1-f/authsec_angular/frontend/angular-clarity-master/src/app/modules/main/BuilderComponents/angulardatatype/Basicp1/Basicp1_cardvariable.ts b/test7oct-demot1-f/authsec_angular/frontend/angular-clarity-master/src/app/modules/main/BuilderComponents/angulardatatype/Basicp1/Basicp1_cardvariable.ts
new file mode 100644
index 0000000..69dfa6e
--- /dev/null
+++ b/test7oct-demot1-f/authsec_angular/frontend/angular-clarity-master/src/app/modules/main/BuilderComponents/angulardatatype/Basicp1/Basicp1_cardvariable.ts
@@ -0,0 +1,4 @@
+export const Basicp1cardvariable = {
+    "cardButton": false,
+    "cardmodeldata": ``
+}
\ No newline at end of file
diff --git a/test7oct-demot1-f/authsec_angular/frontend/angular-clarity-master/src/app/modules/main/BuilderComponents/angulardatatype/Basicp2/Basicp2.component.html b/test7oct-demot1-f/authsec_angular/frontend/angular-clarity-master/src/app/modules/main/BuilderComponents/angulardatatype/Basicp2/Basicp2.component.html
new file mode 100644
index 0000000..9fdc3e8
--- /dev/null
+++ b/test7oct-demot1-f/authsec_angular/frontend/angular-clarity-master/src/app/modules/main/BuilderComponents/angulardatatype/Basicp2/Basicp2.component.html
@@ -0,0 +1,560 @@
+<ol class="breadcrumb breadcrumb-arrow font-trirong">
+  <li><a href="javascript://"> Basicp2</a></li>
+</ol>
+<div class="dg-wrapper">
+  <div class="clr-row">
+    <div class="clr-col-8">
+      <h3>Basicp2 </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]="'about'"> <ng-container *clrDgHideableColumn="{hidden: false}"> about
+						    </ng-container></clr-dg-column>
+
+
+<clr-dg-column [clrDgField]="'textarea2'"> <ng-container *clrDgHideableColumn="{hidden: false}"> Textarea2
+						    </ng-container></clr-dg-column>
+
+
+<clr-dg-column [clrDgField]="'date_field'"> <ng-container *clrDgHideableColumn="{hidden: false}"> Date Field
+						    </ng-container></clr-dg-column>
+
+
+<clr-dg-column [clrDgField]="'date_field2'"> <ng-container *clrDgHideableColumn="{hidden: false}"> Date Field2
+						    </ng-container></clr-dg-column>
+
+
+<clr-dg-column [clrDgField]="'datetime_field'"> <ng-container *clrDgHideableColumn="{hidden: false}"> Datetime Field
+						    </ng-container></clr-dg-column>
+
+
+<clr-dg-column [clrDgField]="'datetime_field2'"> <ng-container *clrDgHideableColumn="{hidden: false}"> Datetime Field2
+						    </ng-container></clr-dg-column>
+
+
+<clr-dg-column [clrDgField]="'email_field'"> <ng-container *clrDgHideableColumn="{hidden: false}"> Email Field
+						    </ng-container></clr-dg-column>
+
+
+<clr-dg-column [clrDgField]="'email_field2'"> <ng-container *clrDgHideableColumn="{hidden: false}"> Email Field2
+						    </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 (click)="goToReplaceStringabout (user.about)" style="cursor: pointer; align-items: center;"><clr-icon shape="details"></clr-icon>
+</clr-dg-cell>
+
+
+<clr-dg-cell (click)="goToReplaceStringtextarea2 (user.textarea2)" style="cursor: pointer; align-items: center;"><clr-icon shape="details"></clr-icon>
+</clr-dg-cell>
+
+
+<clr-dg-cell>{{user.date_field }}</clr-dg-cell>
+
+
+<clr-dg-cell>{{user.date_field2 }}</clr-dg-cell>
+
+
+<clr-dg-cell>{{user.datetime_field }}</clr-dg-cell>
+
+
+<clr-dg-cell>{{user.datetime_field2 }}</clr-dg-cell>
+
+
+<clr-dg-cell>{{user.email_field }}</clr-dg-cell>
+
+
+<clr-dg-cell>{{user.email_field2 }}</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)]="rsModalabout" [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)]="rsModaltextarea2" [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 Basicp2
+ <!--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> about</label>
+	              <textarea cols="10" rows="2"[(ngModel)]="rowSelected.about" name="about " placeholder="Textarea">  </textarea>
+	           </div> 
+
+<div class="clr-col-sm-12">               
+<label> Textarea2</label>
+	              <textarea cols="10" rows="2"[(ngModel)]="rowSelected.textarea2" name="textarea2 " placeholder="Textarea">  </textarea>
+	           </div> 
+
+<div class="clr-col-sm-12">       
+<label>Date Field</label>
+	        <input id="name" class="clr-input"  type="date" [(ngModel)]="rowSelected.date_field" name="date_field" />
+	      </div>
+
+<div class="clr-col-sm-12">       
+<label>Date Field2</label>
+	        <input id="name" class="clr-input"  type="date" [(ngModel)]="rowSelected.date_field2" name="date_field2" />
+	      </div>
+
+<div class="clr-col-sm-12">       
+<label>Datetime Field</label>
+	        <input  class="clr-input"  type="datetime-local" [(ngModel)]="rowSelected.datetime_field" name="datetime_field" />
+	      </div>
+
+<div class="clr-col-sm-12">       
+<label>Datetime Field2</label>
+	        <input  class="clr-input"  type="datetime-local" [(ngModel)]="rowSelected.datetime_field2" name="datetime_field2" />
+	      </div>
+
+<div class="clr-col-sm-12">     
+<label> Email Field</label>
+								  <input id="name" class="clr-input" type="email" 
+						 [(ngModel)]="rowSelected.email_field " name="email_field" pattern="[a-zA-Z0-9._%+-]+@[a-zA-Z0-9.-]+\.[a-zA-Z]{2,}$">
+								  <div *ngIf="rowSelected.email_field && !isValidemail_field(rowSelected.email_field )" class="error_mess">
+	            * Email must be a valid email address.         
+  </div> </div>
+
+<div class="clr-col-sm-12">     
+<label> Email Field2</label>
+								  <input id="name" class="clr-input" type="email" 
+						 [(ngModel)]="rowSelected.email_field2 " name="email_field2" pattern="[a-zA-Z0-9._%+-]+@[a-zA-Z0-9.-]+\.[a-zA-Z]{2,}$">
+								  <div *ngIf="rowSelected.email_field2 && !isValidemail_field2(rowSelected.email_field2 )" class="error_mess">
+	            * Email must be a valid email address.         
+  </div> </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 Basicp2 
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+  <!-- aeroplane icon -->
+    &nbsp; &nbsp; &nbsp; &nbsp;
+    <a *ngIf="userrole?.includes('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: 'Basicp2_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>  about</label>             
+ <textarea cols="10" rows="2" formControlName="about" placeholder="Textarea">  </textarea>
+	            </div>
+
+<div class="clr-col-sm-12">             
+ <label>  Textarea2</label>             
+ <textarea cols="10" rows="2" formControlName="textarea2" placeholder="Textarea">  </textarea>
+	            </div>
+
+<div class="clr-col-sm-12">
+ <label>  Date Field</label>
+ <input class="clr-input"  type="date"  formControlName="date_field" />       
+ </div>
+
+<div class="clr-col-sm-12">
+ <label>  Date Field2</label>
+ <input class="clr-input"  type="date"  formControlName="date_field2" />       
+ </div>
+
+<div class="clr-col-sm-12">
+ <label>  Datetime Field</label>
+ <input class="clr-input"  type="datetime-local"  formControlName="datetime_field" />       
+ </div>
+
+<div class="clr-col-sm-12">
+ <label>  Datetime Field2</label>
+ <input class="clr-input"  type="datetime-local"  formControlName="datetime_field2" />       
+ </div>
+
+<div class="clr-col-sm-12">
+						<label> Email Field</label>
+<input class="clr-input" type="email" formControlName="email_field" pattern="[a-zA-Z0-9._%+-]+@[a-zA-Z0-9.-]+\.[a-zA-Z]{2,}$">
+<div *ngIf="entryForm.controls['email_field'].errors" class="error_mess">
+						          <div *ngIf="entryForm.controls['email_field'].hasError('pattern')" class="error_mess">* Email must be a valid email address
+						            </div>  </div>
+</div>
+
+<div class="clr-col-sm-12">
+						<label> Email Field2</label>
+<input class="clr-input" type="email" formControlName="email_field2" pattern="[a-zA-Z0-9._%+-]+@[a-zA-Z0-9.-]+\.[a-zA-Z]{2,}$">
+<div *ngIf="entryForm.controls['email_field2'].errors" class="error_mess">
+						          <div *ngIf="entryForm.controls['email_field2'].hasError('pattern')" class="error_mess">* Email must be a valid email address
+						            </div>  </div>
+</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/test7oct-demot1-f/authsec_angular/frontend/angular-clarity-master/src/app/modules/main/BuilderComponents/angulardatatype/Basicp2/Basicp2.component.scss b/test7oct-demot1-f/authsec_angular/frontend/angular-clarity-master/src/app/modules/main/BuilderComponents/angulardatatype/Basicp2/Basicp2.component.scss
new file mode 100644
index 0000000..12f7fc8
--- /dev/null
+++ b/test7oct-demot1-f/authsec_angular/frontend/angular-clarity-master/src/app/modules/main/BuilderComponents/angulardatatype/Basicp2/Basicp2.component.scss
@@ -0,0 +1,85 @@
+//@import "../../../../assets/scss/var";
+.s-info-bar {
+  display: flex;
+  flex-direction: row;
+  justify-content: space-between;
+  button {
+    outline: none;
+  }
+}
+.delete,.heading{
+  text-align: center;
+  color: red;
+}
+.entry-pg {
+  width: 750px;
+}
+
+.button1::after {
+  content: none;
+}
+.button1:hover::after {
+  content: "ADD ROWS";
+}
+
+.section {
+  background-color: #dddddd;
+  height: 40px;
+}
+
+.section p {
+  //color: white;
+  padding: 10px;
+  font-size: 18px;
+}
+
+.clr-input {
+  color: #212529;
+  border: 1px solid #ced4da;
+  border-radius: 0.25rem;
+  padding: 0.75rem 0.75rem;
+  margin-top: 3px;
+  width: 100%;
+  margin-bottom: 10px;
+}
+
+.clr-file {
+  color: #212529;
+  border: 1px solid #ced4da;
+  border-radius: 0.25rem;
+  //padding: 0.6rem 0.75rem;
+  margin-top: 3px;
+  width: 100%;
+  margin-bottom: 10px;
+}
+
+.center {
+  text-align: center;
+}
+select{
+  width: 100%;
+  margin-top: 3px;
+  padding: 5px 5px;
+  border: 1px solid #ccc;
+  border-radius: 4px;
+}
+input[type=text],[type=date],[type=number],textarea {
+  width: 100%;
+  padding: 15px 15px;
+  background-color:rgb(255, 255, 255);
+ // margin: 8px 0;
+  display: inline-block;
+  border: 1px solid #ccc;
+  border-radius: 4px;
+  box-sizing: border-box;
+}
+.error_mess {
+  color: red;
+}
+.universal-section-header {
+  margin: 24px 0 10px 0;
+  font-weight: 600;
+  color: #1a237e;
+  letter-spacing: 0.5px;
+  font-size: 1.25rem;
+}
\ No newline at end of file
diff --git a/test7oct-demot1-f/authsec_angular/frontend/angular-clarity-master/src/app/modules/main/BuilderComponents/angulardatatype/Basicp2/Basicp2.component.ts b/test7oct-demot1-f/authsec_angular/frontend/angular-clarity-master/src/app/modules/main/BuilderComponents/angulardatatype/Basicp2/Basicp2.component.ts
new file mode 100644
index 0000000..bb0c699
--- /dev/null
+++ b/test7oct-demot1-f/authsec_angular/frontend/angular-clarity-master/src/app/modules/main/BuilderComponents/angulardatatype/Basicp2/Basicp2.component.ts
@@ -0,0 +1,425 @@
+import { Component, OnInit } from '@angular/core';
+import { ToastrService } from 'ngx-toastr';
+import { AlertService } from 'src/app/services/alert.service';
+import { Basicp2service} from './Basicp2.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 { Basicp2cardvariable } from './Basicp2_cardvariable';
+import { UserInfoService } from 'src/app/services/user-info.service';
+declare var JsBarcode: any; 
+@Component({
+  selector: 'app-Basicp2',
+  templateUrl: './Basicp2.component.html',
+  styleUrls: ['./Basicp2.component.scss']
+})
+export class Basicp2Component implements OnInit {
+  cardButton = Basicp2cardvariable.cardButton;
+  cardmodeldata = Basicp2cardvariable.cardmodeldata;
+  public dashboardArray: DashboardContentModel2[];
+  isCardview = Basicp2cardvariable.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 = 'Basicp2_formCode'
+tableName = 'Basicp2';  checkFormCode; selected: any[] = []; constructor(
+    private extensionService: ExtensionService,
+private userInfoService:UserInfoService,
+    private mainService:Basicp2service,
+    private alertService: AlertService,
+    private toastr: ToastrService,
+    private _fb: FormBuilder,
+  ) { }
+  private editInterval: any;
+// component button 
+  ngOnInit(): void {
+    if(this.cardmodeldata !== ''){
+     this.cardmodal = JSON.parse(this.cardmodeldata);
+    this.dashboardArray = this.cardmodal.dashboard.slice();
+    console.log(this.dashboardArray)
+    }
+    this.userrole=this.userInfoService.getRoles();
+    this.getData();
+    this.entryForm = this._fb.group({
+about : [null],
+
+textarea2 : [null],
+
+date_field : [null],
+
+date_field2 : [null],
+
+datetime_field : [null],
+
+datetime_field2 : [null],
+
+email_field : [null],
+
+email_field2 : [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 === "Basicp2_formCode");
+      console.log(this.checkFormCode);
+      console.log(this.additionalFieldsFromBackend);
+      if (this.additionalFieldsFromBackend && this.additionalFieldsFromBackend.length > 0) {
+        this.additionalFieldsFromBackend.forEach(field => {
+          if (field.formCode === this.formcode) {
+            if (!this.entryForm.contains(field.extValue)) {
+              // Add the control only if it doesn't exist in the form
+              this.entryForm.addControl(field.extValue, this._fb.control(field.fieldValue));
+            }
+          }
+        });
+      }
+    });
+    console.log(this.entryForm.value);
+    // form code end 
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+  }
+ ngOnDestroy(): void {
+    if (this.editInterval) {
+      clearInterval(this.editInterval);
+    }
+  }
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ error; 
+  getData() {
+    this.mainService.getAll().subscribe((data) => {
+      console.log(data);
+      this.product = data;
+this.product = [...this.product].reverse(); if(this.product.length==0){
+        this.error="No Data Available"
+     }   
+    },(error) => {
+      console.log(error);
+      if(error){
+       this.error="Server Error";
+     }
+    });
+  }
+  onEdit(row) {
+    this.rowSelected = row;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+    this.modalEdit = true;
+  }
+   onDelete(row) {
+    this.rowSelected = row;
+     this.modaldelete=true;
+  }
+  delete(id)
+  {
+    this.modaldelete = false;
+    console.log("in delete  "+id);
+    this.mainService.delete(id).subscribe(
+      (data) => {
+        console.log(data);
+        this.ngOnInit();
+  if (data) {				      this.toastr.success('Deleted successfully');      }
+    });
+  }
+    onUpdate(id) {
+    this.modalEdit = false;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+    //console.log("in update");
+    console.log("id  " + id);
+    console.log(this.rowSelected);
+    //console.log("out update");
+    this.mainService.update(id, this.rowSelected).subscribe(
+      (data) => {
+        console.log(data);
+        if (data || data.status >= 200 && data.status <= 299) {
+          this.toastr.success("Update Successfully");
+        }
+setTimeout(() => {
+      this.ngOnInit();
+    }, 500);
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+      }, (error) => {
+        console.log(error);
+        if (error.status >= 200 && error.status <= 299) {
+          // this.toastr.success("update Succesfully");
+        }
+        if (error.status >= 400 && error.status <= 499) {
+          this.toastr.error("Not Updated");
+        }
+        if (error.status >= 500 && error.status <= 599) {
+          this.toastr.error("Not Updated");
+        }
+      });
+    setTimeout(() => {
+      this.ngOnInit();
+    }, 500);
+  } 
+onCreate() {
+     this.modalAdd=false;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+  this.mainService.create(this.entryForm.value).subscribe(
+    (data) => {
+      console.log(data);
+  if (data || data.status >= 200 && data.status <= 299) {
+          this.toastr.success("Added Successfully");
+        }
+setTimeout(() => {
+      this.ngOnInit();
+    }, 500);
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+      }, (error) => {
+        console.log(error);
+        if (error.status >= 200 && error.status <= 299) {
+          // this.toastr.success("Added Succesfully");
+        }
+        if (error.status >= 400 && error.status <= 499) {
+          this.toastr.error("Not Added");
+        }
+        if (error.status >= 500 && error.status <= 599) {
+          this.toastr.error("Not Added");
+        }
+      });
+    setTimeout(() => {
+      this.ngOnInit();
+    }, 500);
+  }
+  goToAdd(row) {
+this.modalAdd = true; this.submitted = false;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+  }
+ submitted = false;
+onSubmit() {
+  console.log(this.entryForm.value);
+ this.submitted = true;
+  if (this.entryForm.invalid) {
+    return;
+  }this.onCreate();
+
+} 
+rsModalabout = false;   
+goToReplaceStringabout(row){
+this.rowSelected = row;     this.rsModalabout  =true;   }
+
+rsModaltextarea2 = false;   
+goToReplaceStringtextarea2(row){
+this.rowSelected = row;     this.rsModaltextarea2  =true;   }
+
+
+
+
+
+
+
+
+
+isValidemail_field(email: string): boolean {
+						 const emailPattern = /^[a-zA-Z0-9._%+-]+@[a-zA-Z0-9.-]+\.[a-zA-Z]{2,}$/;
+						    return emailPattern.test(email);   }
+
+isValidemail_field2(email: string): boolean {
+						 const emailPattern = /^[a-zA-Z0-9._%+-]+@[a-zA-Z0-9.-]+\.[a-zA-Z]{2,}$/;
+						    return emailPattern.test(email);   }
+
+
+
+// updateaction
+}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/test7oct-demot1-f/authsec_angular/frontend/angular-clarity-master/src/app/modules/main/BuilderComponents/angulardatatype/Basicp2/Basicp2.service.ts b/test7oct-demot1-f/authsec_angular/frontend/angular-clarity-master/src/app/modules/main/BuilderComponents/angulardatatype/Basicp2/Basicp2.service.ts
new file mode 100644
index 0000000..dfd7233
--- /dev/null
+++ b/test7oct-demot1-f/authsec_angular/frontend/angular-clarity-master/src/app/modules/main/BuilderComponents/angulardatatype/Basicp2/Basicp2.service.ts
@@ -0,0 +1,51 @@
+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 Basicp2service{
+  private baseURL = "Basicp2/Basicp2" ;  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/test7oct-demot1-f/authsec_angular/frontend/angular-clarity-master/src/app/modules/main/BuilderComponents/angulardatatype/Basicp2/Basicp2_cardvariable.ts b/test7oct-demot1-f/authsec_angular/frontend/angular-clarity-master/src/app/modules/main/BuilderComponents/angulardatatype/Basicp2/Basicp2_cardvariable.ts
new file mode 100644
index 0000000..48d7ae9
--- /dev/null
+++ b/test7oct-demot1-f/authsec_angular/frontend/angular-clarity-master/src/app/modules/main/BuilderComponents/angulardatatype/Basicp2/Basicp2_cardvariable.ts
@@ -0,0 +1,4 @@
+export const Basicp2cardvariable = {
+    "cardButton": false,
+    "cardmodeldata": ``
+}
\ No newline at end of file
diff --git a/test7oct-demot1-f/authsec_angular/frontend/angular-clarity-master/src/app/modules/main/BuilderComponents/angulardatatype/Basicp3/Basicp3.component.html b/test7oct-demot1-f/authsec_angular/frontend/angular-clarity-master/src/app/modules/main/BuilderComponents/angulardatatype/Basicp3/Basicp3.component.html
new file mode 100644
index 0000000..5d03ef2
--- /dev/null
+++ b/test7oct-demot1-f/authsec_angular/frontend/angular-clarity-master/src/app/modules/main/BuilderComponents/angulardatatype/Basicp3/Basicp3.component.html
@@ -0,0 +1,627 @@
+<ol class="breadcrumb breadcrumb-arrow font-trirong">
+  <li><a href="javascript://"> Basicp3</a></li>
+</ol>
+<div class="dg-wrapper">
+  <div class="clr-row">
+    <div class="clr-col-8">
+      <h3>Basicp3 </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]="'toggle_switch'"> <ng-container *clrDgHideableColumn="{hidden: false}"> Toggle Switch
+						    </ng-container></clr-dg-column>
+
+
+<clr-dg-column [clrDgField]="'toggle_switch2'"> <ng-container *clrDgHideableColumn="{hidden: false}"> Toggle Switch2
+						    </ng-container></clr-dg-column>
+
+
+ <clr-dg-column [clrDgField]="'url_field'"> <ng-container *clrDgHideableColumn="{hidden: false}"> Url Field
+						 </ng-container></clr-dg-column>
+
+
+ <clr-dg-column [clrDgField]="'url_field2'"> <ng-container *clrDgHideableColumn="{hidden: false}"> Url Field2
+						 </ng-container></clr-dg-column>
+
+
+<clr-dg-column [clrDgField]="'decimal_field'"> <ng-container *clrDgHideableColumn="{hidden: false}"> Decimal Field
+						    </ng-container></clr-dg-column>
+
+
+<clr-dg-column [clrDgField]="'decimal_field2'"> <ng-container *clrDgHideableColumn="{hidden: false}"> Decimal Field2
+						    </ng-container></clr-dg-column>
+
+
+<clr-dg-column [clrDgField]="'percentage_field'"> <ng-container *clrDgHideableColumn="{hidden: false}"> Percentage Field
+						    </ng-container></clr-dg-column>
+
+
+<clr-dg-column [clrDgField]="'percentage_field2'"> <ng-container *clrDgHideableColumn="{hidden: false}"> Percentage Field2
+						    </ng-container></clr-dg-column>
+
+
+<clr-dg-column [clrDgField]="'documentsequenc'"> <ng-container *clrDgHideableColumn="{hidden: false}"> documentsequenc
+						    </ng-container></clr-dg-column>
+
+
+<clr-dg-column [clrDgField]="'recaptcha'"> <ng-container *clrDgHideableColumn="{hidden: false}"> recaptcha
+						    </ng-container></clr-dg-column>
+
+
+<clr-dg-column [clrDgField]="'recaptcha2'"> <ng-container *clrDgHideableColumn="{hidden: false}"> recaptcha2
+						    </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.toggle_switch }}</clr-dg-cell>
+
+
+<clr-dg-cell>{{user.toggle_switch2 }}</clr-dg-cell>
+
+
+<clr-dg-cell (click)="goTourl_fieldUrl(user.url_field)" style="cursor: pointer; color: rgb(108, 108, 194);">{{user.url_field}}</clr-dg-cell>
+
+
+<clr-dg-cell (click)="goTourl_field2Url(user.url_field2)" style="cursor: pointer; color: rgb(108, 108, 194);">{{user.url_field2}}</clr-dg-cell>
+
+
+<clr-dg-cell>{{user.decimal_field }}</clr-dg-cell>
+
+
+<clr-dg-cell>{{user.decimal_field2 }}</clr-dg-cell>
+
+
+<clr-dg-cell>{{user.percentage_field }}</clr-dg-cell>
+
+
+<clr-dg-cell>{{user.percentage_field2 }}</clr-dg-cell>
+
+
+<clr-dg-cell>{{user.documentsequenc }}</clr-dg-cell>
+
+
+<clr-dg-cell>{{user.recaptcha }}</clr-dg-cell>
+
+
+<clr-dg-cell>{{user.recaptcha2 }}</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 Basicp3
+ <!--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> Toggle Switch</label> 
+<input type="checkbox" name="toggle_switch" clrToggle [(ngModel)]="rowSelected.toggle_switch" /> </div>
+
+<div class="clr-col-sm-12"> 
+<label> Toggle Switch2</label> 
+<input type="checkbox" name="toggle_switch2" clrToggle [(ngModel)]="rowSelected.toggle_switch2" /> </div>
+
+<div class="clr-col-sm-12">         
+<label> Url Field</label>
+	        <input type="url" name="url_field" [(ngModel)]="rowSelected.url_field" placeholder="Enter URL" class="clr-input" pattern="https?://.+">
+	        <div *ngIf="!isValidurl_field(rowSelected.url_field )" class="error_mess">  * Please enter a valid URL.         </div>     </div>
+
+<div class="clr-col-sm-12">         
+<label> Url Field2</label>
+	        <input type="url" name="url_field2" [(ngModel)]="rowSelected.url_field2" placeholder="Enter URL" class="clr-input" pattern="https?://.+">
+	        <div *ngIf="!isValidurl_field2(rowSelected.url_field2 )" class="error_mess">  * Please enter a valid URL.         </div>     </div>
+
+<div class="clr-col-sm-12">        
+<label> Decimal Field</label>
+          <input  class="clr-input" type="number" step ="0.01" [(ngModel)]="rowSelected.decimal_field" name="decimal_field" /> </div>
+
+<div class="clr-col-sm-12">        
+<label> Decimal Field2</label>
+          <input  class="clr-input" type="number" step ="0.01" [(ngModel)]="rowSelected.decimal_field2" name="decimal_field2" /> </div>
+
+<div class="clr-col-sm-12">       
+<label>Percentage Field</label>
+	        <input id="name" class="clr-input"  type="number" [(ngModel)]="rowSelected.percentage_field" name="percentage_field" />
+	      </div>
+
+<div class="clr-col-sm-12">       
+<label>Percentage Field2</label>
+	        <input id="name" class="clr-input"  type="number" [(ngModel)]="rowSelected.percentage_field2" name="percentage_field2" />
+	      </div>
+
+
+
+<div class="clr-col-sm-12">            
+ <label> recaptcha</label>   <div><b>{{ recaptchaCode }}</b> &nbsp; <button  class="btn btn-icon btn-primary btn-sm" (click)="generaterecaptcha()">
+<clr-icon shape="refresh"></clr-icon>   </button></div>
+	            <input type="text" name="recaptcha" [(ngModel)]="rowSelected.recaptcha" (ngModelChange)="checkrecaptchaEdit()" class="clr-input">
+	            <div *ngIf=" recaptchaMismatch" class="error_mess">
+	              <div class="error_mess"> recaptcha  not valid.</div>
+	            </div>         
+</div> 
+
+<div class="clr-col-sm-12">            
+ <label> recaptcha2</label>   <div><b>{{ recaptcha2Code }}</b> &nbsp; <button  class="btn btn-icon btn-primary btn-sm" (click)="generaterecaptcha2()">
+<clr-icon shape="refresh"></clr-icon>   </button></div>
+	            <input type="text" name="recaptcha2" [(ngModel)]="rowSelected.recaptcha2" (ngModelChange)="checkrecaptcha2Edit()" class="clr-input">
+	            <div *ngIf=" recaptcha2Mismatch" class="error_mess">
+	              <div class="error_mess"> recaptcha2  not valid.</div>
+	            </div>         
+</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 Basicp3 
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+  <!-- aeroplane icon -->
+    &nbsp; &nbsp; &nbsp; &nbsp;
+    <a *ngIf="userrole?.includes('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: 'Basicp3_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> Toggle Switch</label>            
+  <input type="checkbox" formControlName="toggle_switch" clrToggle/>            </div>
+
+<div class="clr-col-sm-12">            
+ <label> Toggle Switch2</label>            
+  <input type="checkbox" formControlName="toggle_switch2" clrToggle/>            </div>
+
+<div class="clr-col-sm-12">        
+	 <label> Url Field </label>
+		<input type="url" formControlName="url_field" class="clr-input" pattern="https?://.+">
+		<div *ngIf="entryForm.controls['url_field'].errors" class="error_mess">          
+			 <div *ngIf="entryForm.controls['url_field'].hasError('pattern')" class="error_mess">    * Please enter a valid URL.</div>
+						      </div>     </div>
+
+<div class="clr-col-sm-12">        
+	 <label> Url Field2 </label>
+		<input type="url" formControlName="url_field2" class="clr-input" pattern="https?://.+">
+		<div *ngIf="entryForm.controls['url_field2'].errors" class="error_mess">          
+			 <div *ngIf="entryForm.controls['url_field2'].hasError('pattern')" class="error_mess">    * Please enter a valid URL.</div>
+						      </div>     </div>
+
+<div class="clr-col-sm-12">           
+<label> Decimal Field</label>          
+ <input type="number" step ="0.01"  formControlName="decimal_field" /> 
+ <div *ngIf="submitted && entryForm.controls.decimal_field.errors" class="error_mess">
+  <div *ngIf="submitted && entryForm.controls.decimal_field.errors.required" class="error_mess">*This field is Required</div>
+</div> 
+        </div>
+
+
+<div class="clr-col-sm-12">           
+<label> Decimal Field2</label>          
+ <input type="number" step ="0.01"  formControlName="decimal_field2" /> 
+ <div *ngIf="submitted && entryForm.controls.decimal_field2.errors" class="error_mess">
+  <div *ngIf="submitted && entryForm.controls.decimal_field2.errors.required" class="error_mess">*This field is Required</div>
+</div> 
+        </div>
+
+
+<div class="clr-col-sm-12">
+ <label>  Percentage Field</label>
+ <input class="clr-input"  type="number"  formControlName="percentage_field" />      
+ <div *ngIf="submitted && entryForm.controls.percentage_field.errors" class="error_mess">
+  <div *ngIf="submitted && entryForm.controls.percentage_field.errors.required" class="error_mess">*This field is Required</div>
+</div>  
+ </div>
+
+<div class="clr-col-sm-12">
+ <label>  Percentage Field2</label>
+ <input class="clr-input"  type="number"  formControlName="percentage_field2" />      
+ <div *ngIf="submitted && entryForm.controls.percentage_field2.errors" class="error_mess">
+  <div *ngIf="submitted && entryForm.controls.percentage_field2.errors.required" class="error_mess">*This field is Required</div>
+</div>  
+ </div>
+
+
+
+<div class="clr-col-sm-12">            
+<label> recaptcha</label><div><b>{{ recaptchaCode }}</b> &nbsp; <button  class="btn btn-icon btn-primary btn-sm" (click)="generaterecaptcha()"><clr-icon shape="refresh"></clr-icon></button></div>
+	            <input type="text" formControlName="recaptcha" class="clr-input">       
+<div *ngIf="submitted && entryForm.controls.recaptcha?.errors.required" class="error_mess">*This field is Required</div>          
+<div *ngIf="submitted && entryForm.get('recaptcha')?.errors && entryForm.get('recaptcha')?.dirty" class="error_mess">
+	              <div *ngIf="submitted && entryForm.controls['recaptcha']?.hasError('recaptchaMismatch')" class="error_mess"> recaptcha  not valid.</div>
+	            </div>        
+</div>
+
+<div class="clr-col-sm-12">            
+<label> recaptcha2</label><div><b>{{ recaptcha2Code }}</b> &nbsp; <button  class="btn btn-icon btn-primary btn-sm" (click)="generaterecaptcha2()"><clr-icon shape="refresh"></clr-icon></button></div>
+	            <input type="text" formControlName="recaptcha2" class="clr-input">       
+<div *ngIf="submitted && entryForm.controls.recaptcha2?.errors.required" class="error_mess">*This field is Required</div>          
+<div *ngIf="submitted && entryForm.get('recaptcha2')?.errors && entryForm.get('recaptcha2')?.dirty" class="error_mess">
+	              <div *ngIf="submitted && entryForm.controls['recaptcha2']?.hasError('recaptcha2Mismatch')" class="error_mess"> recaptcha2  not valid.</div>
+	            </div>        
+</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/test7oct-demot1-f/authsec_angular/frontend/angular-clarity-master/src/app/modules/main/BuilderComponents/angulardatatype/Basicp3/Basicp3.component.scss b/test7oct-demot1-f/authsec_angular/frontend/angular-clarity-master/src/app/modules/main/BuilderComponents/angulardatatype/Basicp3/Basicp3.component.scss
new file mode 100644
index 0000000..12f7fc8
--- /dev/null
+++ b/test7oct-demot1-f/authsec_angular/frontend/angular-clarity-master/src/app/modules/main/BuilderComponents/angulardatatype/Basicp3/Basicp3.component.scss
@@ -0,0 +1,85 @@
+//@import "../../../../assets/scss/var";
+.s-info-bar {
+  display: flex;
+  flex-direction: row;
+  justify-content: space-between;
+  button {
+    outline: none;
+  }
+}
+.delete,.heading{
+  text-align: center;
+  color: red;
+}
+.entry-pg {
+  width: 750px;
+}
+
+.button1::after {
+  content: none;
+}
+.button1:hover::after {
+  content: "ADD ROWS";
+}
+
+.section {
+  background-color: #dddddd;
+  height: 40px;
+}
+
+.section p {
+  //color: white;
+  padding: 10px;
+  font-size: 18px;
+}
+
+.clr-input {
+  color: #212529;
+  border: 1px solid #ced4da;
+  border-radius: 0.25rem;
+  padding: 0.75rem 0.75rem;
+  margin-top: 3px;
+  width: 100%;
+  margin-bottom: 10px;
+}
+
+.clr-file {
+  color: #212529;
+  border: 1px solid #ced4da;
+  border-radius: 0.25rem;
+  //padding: 0.6rem 0.75rem;
+  margin-top: 3px;
+  width: 100%;
+  margin-bottom: 10px;
+}
+
+.center {
+  text-align: center;
+}
+select{
+  width: 100%;
+  margin-top: 3px;
+  padding: 5px 5px;
+  border: 1px solid #ccc;
+  border-radius: 4px;
+}
+input[type=text],[type=date],[type=number],textarea {
+  width: 100%;
+  padding: 15px 15px;
+  background-color:rgb(255, 255, 255);
+ // margin: 8px 0;
+  display: inline-block;
+  border: 1px solid #ccc;
+  border-radius: 4px;
+  box-sizing: border-box;
+}
+.error_mess {
+  color: red;
+}
+.universal-section-header {
+  margin: 24px 0 10px 0;
+  font-weight: 600;
+  color: #1a237e;
+  letter-spacing: 0.5px;
+  font-size: 1.25rem;
+}
\ No newline at end of file
diff --git a/test7oct-demot1-f/authsec_angular/frontend/angular-clarity-master/src/app/modules/main/BuilderComponents/angulardatatype/Basicp3/Basicp3.component.ts b/test7oct-demot1-f/authsec_angular/frontend/angular-clarity-master/src/app/modules/main/BuilderComponents/angulardatatype/Basicp3/Basicp3.component.ts
new file mode 100644
index 0000000..41b9c71
--- /dev/null
+++ b/test7oct-demot1-f/authsec_angular/frontend/angular-clarity-master/src/app/modules/main/BuilderComponents/angulardatatype/Basicp3/Basicp3.component.ts
@@ -0,0 +1,517 @@
+import { Component, OnInit } from '@angular/core';
+import { ToastrService } from 'ngx-toastr';
+import { AlertService } from 'src/app/services/alert.service';
+import { Basicp3service} from './Basicp3.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 { Basicp3cardvariable } from './Basicp3_cardvariable';
+import { UserInfoService } from 'src/app/services/user-info.service';
+declare var JsBarcode: any; 
+@Component({
+  selector: 'app-Basicp3',
+  templateUrl: './Basicp3.component.html',
+  styleUrls: ['./Basicp3.component.scss']
+})
+export class Basicp3Component implements OnInit {
+  cardButton = Basicp3cardvariable.cardButton;
+  cardmodeldata = Basicp3cardvariable.cardmodeldata;
+  public dashboardArray: DashboardContentModel2[];
+  isCardview = Basicp3cardvariable.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 = 'Basicp3_formCode'
+tableName = 'Basicp3';  checkFormCode; selected: any[] = []; constructor(
+    private extensionService: ExtensionService,
+private userInfoService:UserInfoService,
+    private mainService:Basicp3service,
+    private alertService: AlertService,
+    private toastr: ToastrService,
+    private _fb: FormBuilder,
+  ) { }
+  private editInterval: any;
+// component button 
+  ngOnInit(): void {
+    if(this.cardmodeldata !== ''){
+     this.cardmodal = JSON.parse(this.cardmodeldata);
+    this.dashboardArray = this.cardmodal.dashboard.slice();
+    console.log(this.dashboardArray)
+    }
+    this.userrole=this.userInfoService.getRoles();
+    this.getData();
+    this.entryForm = this._fb.group({
+toggle_switch : [true],
+
+toggle_switch2 : [true],
+
+url_field : [null],
+
+url_field2 : [null],
+
+decimal_field : [null,[Validators.required]],
+
+decimal_field2 : [null,[Validators.required]],
+
+percentage_field : [null,[Validators.required]],
+
+percentage_field2 : [null,[Validators.required]],
+
+documentsequenc : [null],
+
+recaptcha : ['', [Validators.required,this.checkrecaptcha.bind(this)]],
+
+recaptcha2 : ['', [Validators.required,this.checkrecaptcha2.bind(this)]],
+
+
+ 
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+  }); // 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 === "Basicp3_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.generaterecaptcha()
+
+this.generaterecaptcha2()
+
+
+  }
+ ngOnDestroy(): void {
+    if (this.editInterval) {
+      clearInterval(this.editInterval);
+    }
+  }
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ error; 
+  getData() {
+    this.mainService.getAll().subscribe((data) => {
+      console.log(data);
+      this.product = data;
+this.product = [...this.product].reverse(); if(this.product.length==0){
+        this.error="No Data Available"
+     }   
+    },(error) => {
+      console.log(error);
+      if(error){
+       this.error="Server Error";
+     }
+    });
+  }
+  onEdit(row) {
+    this.rowSelected = row;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+    this.modalEdit = true;
+  }
+   onDelete(row) {
+    this.rowSelected = row;
+     this.modaldelete=true;
+  }
+  delete(id)
+  {
+    this.modaldelete = false;
+    console.log("in delete  "+id);
+    this.mainService.delete(id).subscribe(
+      (data) => {
+        console.log(data);
+        this.ngOnInit();
+  if (data) {				      this.toastr.success('Deleted successfully');      }
+    });
+  }
+    onUpdate(id) {
+    this.modalEdit = false;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+    //console.log("in update");
+    console.log("id  " + id);
+    console.log(this.rowSelected);
+    //console.log("out update");
+    this.mainService.update(id, this.rowSelected).subscribe(
+      (data) => {
+        console.log(data);
+        if (data || data.status >= 200 && data.status <= 299) {
+          this.toastr.success("Update Successfully");
+        }
+setTimeout(() => {
+      this.ngOnInit();
+    }, 500);
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+      }, (error) => {
+        console.log(error);
+        if (error.status >= 200 && error.status <= 299) {
+          // this.toastr.success("update Succesfully");
+        }
+        if (error.status >= 400 && error.status <= 499) {
+          this.toastr.error("Not Updated");
+        }
+        if (error.status >= 500 && error.status <= 599) {
+          this.toastr.error("Not Updated");
+        }
+      });
+    setTimeout(() => {
+      this.ngOnInit();
+    }, 500);
+  } 
+onCreate() {
+     this.modalAdd=false;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+  this.mainService.create(this.entryForm.value).subscribe(
+    (data) => {
+      console.log(data);
+  if (data || data.status >= 200 && data.status <= 299) {
+          this.toastr.success("Added Successfully");
+        }
+setTimeout(() => {
+      this.ngOnInit();
+    }, 500);
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+      }, (error) => {
+        console.log(error);
+        if (error.status >= 200 && error.status <= 299) {
+          // this.toastr.success("Added Succesfully");
+        }
+        if (error.status >= 400 && error.status <= 499) {
+          this.toastr.error("Not Added");
+        }
+        if (error.status >= 500 && error.status <= 599) {
+          this.toastr.error("Not Added");
+        }
+      });
+    setTimeout(() => {
+      this.ngOnInit();
+    }, 500);
+  }
+  goToAdd(row) {
+this.modalAdd = true; this.submitted = false;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+  }
+ submitted = false;
+onSubmit() {
+  console.log(this.entryForm.value);
+ this.submitted = true;
+  if (this.entryForm.invalid) {
+    return;
+  }this.onCreate();
+
+} 
+
+
+
+
+isValidurl_field(url: string): boolean {
+						    return  /^(https?|ftp):\/\/[^\s/$.?#].[^\s]*$/.test(url);   } 
+						goTourl_fieldUrl(val){     window.open(val)   }
+
+isValidurl_field2(url: string): boolean {
+						    return  /^(https?|ftp):\/\/[^\s/$.?#].[^\s]*$/.test(url);   } 
+						goTourl_field2Url(val){     window.open(val)   }
+
+
+
+
+
+
+
+
+
+
+
+recaptchaCode = '';  
+generaterecaptcha (): void {
+  const possibleCharacters = 'ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789';
+  const codeLength = 6; // Change to desired length
+
+  let recaptcha= '';
+  for (let i = 0; i < codeLength; i++) {
+    const randomIndex = Math.floor(Math.random() * possibleCharacters.length);
+    recaptcha += possibleCharacters.charAt(randomIndex);
+  }
+  this.recaptchaCode = recaptcha;
+}
+
+checkrecaptcha(control: AbstractControl): ValidationErrors | null {
+  if (control.value !== this.recaptchaCode) {
+    return { recaptchaMismatch: true };
+  }
+  return null;
+}  
+
+recaptchaMismatch = false;  
+
+checkrecaptchaEdit(): void {
+	  if (this.rowSelected.recaptcha  !== this. recaptchaCode) {
+	  this. recaptchaMismatch = true;    } else {      this.recaptchaMismatch = false;    }  } 
+
+recaptcha2Code = '';  
+generaterecaptcha2 (): void {
+  const possibleCharacters = 'ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789';
+  const codeLength = 6; // Change to desired length
+
+  let recaptcha2= '';
+  for (let i = 0; i < codeLength; i++) {
+    const randomIndex = Math.floor(Math.random() * possibleCharacters.length);
+    recaptcha2 += possibleCharacters.charAt(randomIndex);
+  }
+  this.recaptcha2Code = recaptcha2;
+}
+
+checkrecaptcha2(control: AbstractControl): ValidationErrors | null {
+  if (control.value !== this.recaptcha2Code) {
+    return { recaptcha2Mismatch: true };
+  }
+  return null;
+}  
+
+recaptcha2Mismatch = false;  
+
+checkrecaptcha2Edit(): void {
+	  if (this.rowSelected.recaptcha2  !== this. recaptcha2Code) {
+	  this. recaptcha2Mismatch = true;    } else {      this.recaptcha2Mismatch = false;    }  } 
+
+// updateaction
+}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/test7oct-demot1-f/authsec_angular/frontend/angular-clarity-master/src/app/modules/main/BuilderComponents/angulardatatype/Basicp3/Basicp3.service.ts b/test7oct-demot1-f/authsec_angular/frontend/angular-clarity-master/src/app/modules/main/BuilderComponents/angulardatatype/Basicp3/Basicp3.service.ts
new file mode 100644
index 0000000..d02c10d
--- /dev/null
+++ b/test7oct-demot1-f/authsec_angular/frontend/angular-clarity-master/src/app/modules/main/BuilderComponents/angulardatatype/Basicp3/Basicp3.service.ts
@@ -0,0 +1,55 @@
+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 Basicp3service{
+  private baseURL = "Basicp3/Basicp3" ;  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/test7oct-demot1-f/authsec_angular/frontend/angular-clarity-master/src/app/modules/main/BuilderComponents/angulardatatype/Basicp3/Basicp3_cardvariable.ts b/test7oct-demot1-f/authsec_angular/frontend/angular-clarity-master/src/app/modules/main/BuilderComponents/angulardatatype/Basicp3/Basicp3_cardvariable.ts
new file mode 100644
index 0000000..ff91595
--- /dev/null
+++ b/test7oct-demot1-f/authsec_angular/frontend/angular-clarity-master/src/app/modules/main/BuilderComponents/angulardatatype/Basicp3/Basicp3_cardvariable.ts
@@ -0,0 +1,4 @@
+export const Basicp3cardvariable = {
+    "cardButton": false,
+    "cardmodeldata": ``
+}
\ No newline at end of file
diff --git a/test7oct-demot1-f/authsec_angular/frontend/angular-clarity-master/src/app/modules/main/BuilderComponents/angulardatatype/Dv2/Dv2.component.html b/test7oct-demot1-f/authsec_angular/frontend/angular-clarity-master/src/app/modules/main/BuilderComponents/angulardatatype/Dv2/Dv2.component.html
new file mode 100644
index 0000000..96f9833
--- /dev/null
+++ b/test7oct-demot1-f/authsec_angular/frontend/angular-clarity-master/src/app/modules/main/BuilderComponents/angulardatatype/Dv2/Dv2.component.html
@@ -0,0 +1,688 @@
+<ol class="breadcrumb breadcrumb-arrow font-trirong">
+  <li><a href="javascript://"> Dv2</a></li>
+</ol>
+<div class="dg-wrapper">
+  <div class="clr-row">
+    <div class="clr-col-8">
+      <h3>Dv2 </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]="' test3'"> <ng-container *clrDgHideableColumn="{hidden: false}"> test3
+						    </ng-container></clr-dg-column>
+  
+
+ 
+<clr-dg-column [clrDgField]="' name'"> <ng-container *clrDgHideableColumn="{hidden: false}"> name
+						    </ng-container></clr-dg-column>
+  
+
+ 
+<clr-dg-column [clrDgField]="' last_name'"> <ng-container *clrDgHideableColumn="{hidden: false}"> last_name
+						    </ng-container></clr-dg-column>
+  
+
+
+
+ 
+
+ 
+<clr-dg-column [clrDgField]="' test'"> <ng-container *clrDgHideableColumn="{hidden: false}"> test
+						    </ng-container></clr-dg-column>
+  
+
+
+
+
+<clr-dg-column [clrDgField]="'currency'"> <ng-container *clrDgHideableColumn="{hidden: false}"> Currency
+						    </ng-container></clr-dg-column>
+
+
+<clr-dg-column [clrDgField]="'currency2'"> <ng-container *clrDgHideableColumn="{hidden: false}"> Currency2
+						    </ng-container></clr-dg-column>
+
+
+<clr-dg-column [clrDgField]="'qrcode_field'"> <ng-container *clrDgHideableColumn="{hidden: false}"> QRCode Field
+						    </ng-container></clr-dg-column>
+
+
+<clr-dg-column [clrDgField]="'qrcode_field2'"> <ng-container *clrDgHideableColumn="{hidden: false}"> QRCode Field2
+						    </ng-container></clr-dg-column>
+
+
+<clr-dg-column [clrDgField]="'barcode_field'"> <ng-container *clrDgHideableColumn="{hidden: false}"> BarCode Field
+						    </ng-container></clr-dg-column>
+
+
+<clr-dg-column [clrDgField]="'barcode_field2'"> <ng-container *clrDgHideableColumn="{hidden: false}"> BarCode Field2
+						    </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. test3}}</clr-dg-cell>
+ 
+
+ 
+<clr-dg-cell>{{user. name}}</clr-dg-cell>
+ 
+
+ 
+<clr-dg-cell>{{user. last_name}}</clr-dg-cell>
+ 
+
+
+
+
+
+ 
+<clr-dg-cell>{{user. test}}</clr-dg-cell>
+ 
+
+
+
+
+<clr-dg-cell>{{user.currency }}</clr-dg-cell>
+
+
+<clr-dg-cell>{{user.currency2 }}</clr-dg-cell>
+
+
+<clr-dg-cell>{{user.qrcode_field }}</clr-dg-cell>
+
+
+<clr-dg-cell>{{user.qrcode_field2 }}</clr-dg-cell>
+
+
+<clr-dg-cell>{{user.barcode_field }}</clr-dg-cell>
+
+
+<clr-dg-cell>{{user.barcode_field2 }}</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 Dv2
+ <!--update button -->
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+</h3>
+  <div class="modal-body" *ngIf="rowSelected.id">
+    <h2 class="heading">{{rowSelected.id}}</h2>
+<!-- button -->
+    <form >
+<div class="clr-row"> 
+<!-- multiselect field start -->
+<div class="clr-col-sm-12">
+ <label> Address</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>test3</label>
+	        <input class="clr-input"  type="text" [(ngModel)]="rowSelected.test3" name="test3" />
+	      </div>
+
+      
+
+ 
+
+    <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>last_name</label>
+	        <input class="clr-input"  type="text" [(ngModel)]="rowSelected.last_name" name="last_name" />
+	      </div>
+
+      
+
+
+    </div>
+  </div>
+</div>
+<!-- multiselect field end -->
+
+<!-- multiselect field start -->
+<div class="clr-col-sm-12">
+ <label> per address</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>test</label>
+	        <input class="clr-input"  type="text" [(ngModel)]="rowSelected.test" name="test" />
+	      </div>
+
+      
+
+
+    </div>
+  </div>
+</div>
+<!-- multiselect field end -->
+
+<!-- currency field start -->
+<div class="clr-col-sm-12">
+  <label> Currency</label>
+  <input type="number" class="clr-input" [(ngModel)]="rowSelected.currency" name="currency" (blur)="formatCurrencycurrency()" [value]="rowSelected.currency  | removeCommas">
+</div>
+<!-- currency field end -->
+
+<!-- currency field start -->
+<div class="clr-col-sm-12">
+  <label> Currency2</label>
+  <input type="number" class="clr-input" [(ngModel)]="rowSelected.currency2" name="currency2" (blur)="formatCurrencycurrency2()" [value]="rowSelected.currency2  | removeCommas">
+</div>
+<!-- currency field end -->
+
+<!-- qrCode field start -->
+<div class="clr-col-sm-12">
+  <label> QRCode Field</label>
+  <input class="clr-input" type="text" name="qrcode_field" [(ngModel)]="rowSelected.qrcode_field" />
+  <qrcode [qrdata]="rowSelected.qrcode_field  ? rowSelected.qrcode_field : '' " [width]="135" [errorCorrectionLevel]="'M'"></qrcode>
+</div>
+<!-- qrCode field end -->
+
+<!-- qrCode field start -->
+<div class="clr-col-sm-12">
+  <label> QRCode Field2</label>
+  <input class="clr-input" type="text" name="qrcode_field2" [(ngModel)]="rowSelected.qrcode_field2" />
+  <qrcode [qrdata]="rowSelected.qrcode_field2  ? rowSelected.qrcode_field2 : '' " [width]="135" [errorCorrectionLevel]="'M'"></qrcode>
+</div>
+<!-- qrCode field end -->
+
+<!-- bar code field start -->
+<div class="clr-col-sm-12">
+  <label> BarCode Field</label>
+  <input type="text" class="clr-input" name="barcode_field" [(ngModel)]="rowSelected.barcode_field"  (input)="generateBarcodebarcode_field($event.target.value)" /> <svg  id="barcodebarcode_field"></svg>
+     </div> <!-- bar code field end -->
+
+<!-- bar code field start -->
+<div class="clr-col-sm-12">
+  <label> BarCode Field2</label>
+  <input type="text" class="clr-input" name="barcode_field2" [(ngModel)]="rowSelected.barcode_field2"  (input)="generateBarcodebarcode_field2($event.target.value)" /> <svg  id="barcodebarcode_field2"></svg>
+     </div> <!-- bar code field end -->
+
+
+
+  </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 Dv2 
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+  <!-- aeroplane icon -->
+    &nbsp; &nbsp; &nbsp; &nbsp;
+    <a *ngIf="userrole?.includes('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: 'Dv2_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;">
+
+<!-- multiselect  field start -->
+     <div class="clr-col-sm-12">       
+		<label> Address</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>  test3</label>
+ <input class="clr-input"  type="text"  formControlName="test3" />       
+ </div>
+	                           
+
+ 
+			<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>  last_name</label>
+ <input class="clr-input"  type="text"  formControlName="last_name" />       
+ </div>
+	                           
+
+ </div>       </div>     </div>
+	              <!-- multiselect  field end -->
+
+<!-- multiselect  field start -->
+     <div class="clr-col-sm-12">       
+		<label> per address</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>  test</label>
+ <input class="clr-input"  type="text"  formControlName="test" />       
+ </div>
+	                           
+
+ </div>       </div>     </div>
+	              <!-- multiselect  field end -->
+
+<!-- currency field start -->
+      <div class="clr-col-sm-12">        
+ <label> Currency</label>         
+<input type="number"  class="clr-input"   formControlName="currency"  [value]="entryForm.value.currency | number:'1.2-2' | removeCommas">   
+    </div> 
+	      <!-- currency field end -->
+
+<!-- currency field start -->
+      <div class="clr-col-sm-12">        
+ <label> Currency2</label>         
+<input type="number"  class="clr-input"   formControlName="currency2"  [value]="entryForm.value.currency2 | number:'1.2-2' | removeCommas">   
+    </div> 
+	      <!-- currency field end -->
+
+<!-- qrCode field start -->   
+<div class="clr-col-sm-12">
+	    <label>QRCode Field</label>
+	    <input class="clr-input" type="text" formControlName="qrcode_field" />
+	    <qrcode [qrdata]="entryForm.value.qrcode_field  ? entryForm.value.qrcode_field : '' " [width]="135" [errorCorrectionLevel]="'M'"  ></qrcode>   </div>
+	<!-- qrCode field end -->
+
+<!-- qrCode field start -->   
+<div class="clr-col-sm-12">
+	    <label>QRCode Field2</label>
+	    <input class="clr-input" type="text" formControlName="qrcode_field2" />
+	    <qrcode [qrdata]="entryForm.value.qrcode_field2  ? entryForm.value.qrcode_field2 : '' " [width]="135" [errorCorrectionLevel]="'M'"  ></qrcode>   </div>
+	<!-- qrCode field end -->
+
+<!-- bar code field start -->    
+<div class="clr-col-sm-12">
+	    <label> BarCode Field</label>
+	    <input  type="text" class="clr-input" formControlName="barcode_field" (input)="generateBarcodebarcode_field($event.target.value)" />
+	    <svg id="barcodebarcode_field"></svg>   </div>
+	<!-- bar code field end -->
+
+<!-- bar code field start -->    
+<div class="clr-col-sm-12">
+	    <label> BarCode Field2</label>
+	    <input  type="text" class="clr-input" formControlName="barcode_field2" (input)="generateBarcodebarcode_field2($event.target.value)" />
+	    <svg id="barcodebarcode_field2"></svg>   </div>
+	<!-- bar code field end -->
+
+
+
+ 
+ </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/test7oct-demot1-f/authsec_angular/frontend/angular-clarity-master/src/app/modules/main/BuilderComponents/angulardatatype/Dv2/Dv2.component.scss b/test7oct-demot1-f/authsec_angular/frontend/angular-clarity-master/src/app/modules/main/BuilderComponents/angulardatatype/Dv2/Dv2.component.scss
new file mode 100644
index 0000000..12f7fc8
--- /dev/null
+++ b/test7oct-demot1-f/authsec_angular/frontend/angular-clarity-master/src/app/modules/main/BuilderComponents/angulardatatype/Dv2/Dv2.component.scss
@@ -0,0 +1,85 @@
+//@import "../../../../assets/scss/var";
+.s-info-bar {
+  display: flex;
+  flex-direction: row;
+  justify-content: space-between;
+  button {
+    outline: none;
+  }
+}
+.delete,.heading{
+  text-align: center;
+  color: red;
+}
+.entry-pg {
+  width: 750px;
+}
+
+.button1::after {
+  content: none;
+}
+.button1:hover::after {
+  content: "ADD ROWS";
+}
+
+.section {
+  background-color: #dddddd;
+  height: 40px;
+}
+
+.section p {
+  //color: white;
+  padding: 10px;
+  font-size: 18px;
+}
+
+.clr-input {
+  color: #212529;
+  border: 1px solid #ced4da;
+  border-radius: 0.25rem;
+  padding: 0.75rem 0.75rem;
+  margin-top: 3px;
+  width: 100%;
+  margin-bottom: 10px;
+}
+
+.clr-file {
+  color: #212529;
+  border: 1px solid #ced4da;
+  border-radius: 0.25rem;
+  //padding: 0.6rem 0.75rem;
+  margin-top: 3px;
+  width: 100%;
+  margin-bottom: 10px;
+}
+
+.center {
+  text-align: center;
+}
+select{
+  width: 100%;
+  margin-top: 3px;
+  padding: 5px 5px;
+  border: 1px solid #ccc;
+  border-radius: 4px;
+}
+input[type=text],[type=date],[type=number],textarea {
+  width: 100%;
+  padding: 15px 15px;
+  background-color:rgb(255, 255, 255);
+ // margin: 8px 0;
+  display: inline-block;
+  border: 1px solid #ccc;
+  border-radius: 4px;
+  box-sizing: border-box;
+}
+.error_mess {
+  color: red;
+}
+.universal-section-header {
+  margin: 24px 0 10px 0;
+  font-weight: 600;
+  color: #1a237e;
+  letter-spacing: 0.5px;
+  font-size: 1.25rem;
+}
\ No newline at end of file
diff --git a/test7oct-demot1-f/authsec_angular/frontend/angular-clarity-master/src/app/modules/main/BuilderComponents/angulardatatype/Dv2/Dv2.component.ts b/test7oct-demot1-f/authsec_angular/frontend/angular-clarity-master/src/app/modules/main/BuilderComponents/angulardatatype/Dv2/Dv2.component.ts
new file mode 100644
index 0000000..995f9a3
--- /dev/null
+++ b/test7oct-demot1-f/authsec_angular/frontend/angular-clarity-master/src/app/modules/main/BuilderComponents/angulardatatype/Dv2/Dv2.component.ts
@@ -0,0 +1,471 @@
+import { Component, OnInit } from '@angular/core';
+import { ToastrService } from 'ngx-toastr';
+import { AlertService } from 'src/app/services/alert.service';
+import { Dv2service} from './Dv2.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 { Dv2cardvariable } from './Dv2_cardvariable';
+import { UserInfoService } from 'src/app/services/user-info.service';
+declare var JsBarcode: any; 
+@Component({
+  selector: 'app-Dv2',
+  templateUrl: './Dv2.component.html',
+  styleUrls: ['./Dv2.component.scss']
+})
+export class Dv2Component implements OnInit {
+  cardButton = Dv2cardvariable.cardButton;
+  cardmodeldata = Dv2cardvariable.cardmodeldata;
+  public dashboardArray: DashboardContentModel2[];
+  isCardview = Dv2cardvariable.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 = 'Dv2_formCode'
+tableName = 'Dv2';  checkFormCode; selected: any[] = []; constructor(
+    private extensionService: ExtensionService,
+private userInfoService:UserInfoService,
+    private mainService:Dv2service,
+    private alertService: AlertService,
+    private toastr: ToastrService,
+    private _fb: FormBuilder,
+  ) { }
+  private editInterval: any;
+// component button 
+  ngOnInit(): void {
+    if(this.cardmodeldata !== ''){
+     this.cardmodal = JSON.parse(this.cardmodeldata);
+    this.dashboardArray = this.cardmodal.dashboard.slice();
+    console.log(this.dashboardArray)
+    }
+    this.userrole=this.userInfoService.getRoles();
+    this.getData();
+    this.entryForm = this._fb.group({
+ 
+ 
+test3:[null],
+ 
+
+ 
+name:[null],
+ 
+
+ 
+last_name:[null],
+ 
+
+
+ 
+ 
+test:[null],
+ 
+
+
+currency : [null, { updateOn: 'blur' }],
+
+currency2 : [null, { updateOn: 'blur' }],
+
+qrcode_field : [null],
+
+qrcode_field2 : [null],
+
+barcode_field : [null],
+
+barcode_field2 : [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 === "Dv2_formCode");
+      console.log(this.checkFormCode);
+      console.log(this.additionalFieldsFromBackend);
+      if (this.additionalFieldsFromBackend && this.additionalFieldsFromBackend.length > 0) {
+        this.additionalFieldsFromBackend.forEach(field => {
+          if (field.formCode === this.formcode) {
+            if (!this.entryForm.contains(field.extValue)) {
+              // Add the control only if it doesn't exist in the form
+              this.entryForm.addControl(field.extValue, this._fb.control(field.fieldValue));
+            }
+          }
+        });
+      }
+    });
+    console.log(this.entryForm.value);
+    // form code end 
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+  }
+ ngOnDestroy(): void {
+    if (this.editInterval) {
+      clearInterval(this.editInterval);
+    }
+  }
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ error; 
+  getData() {
+    this.mainService.getAll().subscribe((data) => {
+      console.log(data);
+      this.product = data;
+this.product = [...this.product].reverse(); if(this.product.length==0){
+        this.error="No Data Available"
+     }   
+    },(error) => {
+      console.log(error);
+      if(error){
+       this.error="Server Error";
+     }
+    });
+  }
+  onEdit(row) {
+    this.rowSelected = row;
+
+
+
+
+
+
+
+
+
+
+
+
+  //    bar code field start 
+   setTimeout(function(){ 
+		JsBarcode("#barcodebarcode_field", row?.barcode_field);
+	     }, 500);
+	   //    bar code field start
+
+  //    bar code field start 
+   setTimeout(function(){ 
+		JsBarcode("#barcodebarcode_field2", row?.barcode_field2);
+	     }, 500);
+	   //    bar code field start
+
+
+
+
+    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();
+
+} 
+
+
+
+
+//currency  field start
+   formatCurrencycurrency () {
+    // Format the currency with two decimal places    
+	this.rowSelected.currency = Number(this.rowSelected.currency ).toFixed(2);
+    // Remove commas from the formatted currency   
+	 this.rowSelected.currency = this.rowSelected.currency?.replace(/,/g, '');  }
+  //currency  field end
+
+//currency  field start
+   formatCurrencycurrency2 () {
+    // Format the currency with two decimal places    
+	this.rowSelected.currency2 = Number(this.rowSelected.currency2 ).toFixed(2);
+    // Remove commas from the formatted currency   
+	 this.rowSelected.currency2 = this.rowSelected.currency2?.replace(/,/g, '');  }
+  //currency  field end
+
+
+
+
+
+//bar code field start 
+     generateBarcodebarcode_field(value) {
+      const barcodeValue = value;
+      const barcodeElement = document.getElementById("barcodebarcode_field"); 
+      if (barcodeElement) {         if (barcodeValue) {
+          JsBarcode(barcodeElement, barcodeValue, {             format: "CODE128"
+          });         } else {
+          // Clear the barcode if the input is empty
+          barcodeElement.innerHTML = '';         }       }     }
+         //    bar code field end 
+
+//bar code field start 
+     generateBarcodebarcode_field2(value) {
+      const barcodeValue = value;
+      const barcodeElement = document.getElementById("barcodebarcode_field2"); 
+      if (barcodeElement) {         if (barcodeValue) {
+          JsBarcode(barcodeElement, barcodeValue, {             format: "CODE128"
+          });         } else {
+          // Clear the barcode if the input is empty
+          barcodeElement.innerHTML = '';         }       }     }
+         //    bar code field end 
+
+
+
+// updateaction
+}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/test7oct-demot1-f/authsec_angular/frontend/angular-clarity-master/src/app/modules/main/BuilderComponents/angulardatatype/Dv2/Dv2.service.ts b/test7oct-demot1-f/authsec_angular/frontend/angular-clarity-master/src/app/modules/main/BuilderComponents/angulardatatype/Dv2/Dv2.service.ts
new file mode 100644
index 0000000..39b761c
--- /dev/null
+++ b/test7oct-demot1-f/authsec_angular/frontend/angular-clarity-master/src/app/modules/main/BuilderComponents/angulardatatype/Dv2/Dv2.service.ts
@@ -0,0 +1,51 @@
+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 Dv2service{
+  private baseURL = "Dv2/Dv2" ;  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/test7oct-demot1-f/authsec_angular/frontend/angular-clarity-master/src/app/modules/main/BuilderComponents/angulardatatype/Dv2/Dv2_cardvariable.ts b/test7oct-demot1-f/authsec_angular/frontend/angular-clarity-master/src/app/modules/main/BuilderComponents/angulardatatype/Dv2/Dv2_cardvariable.ts
new file mode 100644
index 0000000..d4c379f
--- /dev/null
+++ b/test7oct-demot1-f/authsec_angular/frontend/angular-clarity-master/src/app/modules/main/BuilderComponents/angulardatatype/Dv2/Dv2_cardvariable.ts
@@ -0,0 +1,4 @@
+export const Dv2cardvariable = {
+    "cardButton": false,
+    "cardmodeldata": ``
+}
\ No newline at end of file
diff --git a/test7oct-demot1-f/authsec_angular/frontend/angular-clarity-master/src/app/modules/main/BuilderComponents/angulardatatype/Support/Support.component.html b/test7oct-demot1-f/authsec_angular/frontend/angular-clarity-master/src/app/modules/main/BuilderComponents/angulardatatype/Support/Support.component.html
new file mode 100644
index 0000000..3995fc0
--- /dev/null
+++ b/test7oct-demot1-f/authsec_angular/frontend/angular-clarity-master/src/app/modules/main/BuilderComponents/angulardatatype/Support/Support.component.html
@@ -0,0 +1,349 @@
+<ol class="breadcrumb breadcrumb-arrow font-trirong">
+  <li><a href="javascript://"> Support</a></li>
+</ol>
+<div class="dg-wrapper">
+  <div class="clr-row">
+    <div class="clr-col-8">
+      <h3>Support </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>
+
+ 
+ <!-- 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>
+
+ 
+  <!-- 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 Support
+ <!--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> 
+
+
+
+
+<!-- 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 Support 
+
+
+
+
+  <!-- aeroplane icon -->
+    &nbsp; &nbsp; &nbsp; &nbsp;
+    <a *ngIf="userrole?.includes('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: 'Support_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> 
+
+
+
+
+
+
+      <!-- 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/test7oct-demot1-f/authsec_angular/frontend/angular-clarity-master/src/app/modules/main/BuilderComponents/angulardatatype/Support/Support.component.scss b/test7oct-demot1-f/authsec_angular/frontend/angular-clarity-master/src/app/modules/main/BuilderComponents/angulardatatype/Support/Support.component.scss
new file mode 100644
index 0000000..12f7fc8
--- /dev/null
+++ b/test7oct-demot1-f/authsec_angular/frontend/angular-clarity-master/src/app/modules/main/BuilderComponents/angulardatatype/Support/Support.component.scss
@@ -0,0 +1,85 @@
+//@import "../../../../assets/scss/var";
+.s-info-bar {
+  display: flex;
+  flex-direction: row;
+  justify-content: space-between;
+  button {
+    outline: none;
+  }
+}
+.delete,.heading{
+  text-align: center;
+  color: red;
+}
+.entry-pg {
+  width: 750px;
+}
+
+.button1::after {
+  content: none;
+}
+.button1:hover::after {
+  content: "ADD ROWS";
+}
+
+.section {
+  background-color: #dddddd;
+  height: 40px;
+}
+
+.section p {
+  //color: white;
+  padding: 10px;
+  font-size: 18px;
+}
+
+.clr-input {
+  color: #212529;
+  border: 1px solid #ced4da;
+  border-radius: 0.25rem;
+  padding: 0.75rem 0.75rem;
+  margin-top: 3px;
+  width: 100%;
+  margin-bottom: 10px;
+}
+
+.clr-file {
+  color: #212529;
+  border: 1px solid #ced4da;
+  border-radius: 0.25rem;
+  //padding: 0.6rem 0.75rem;
+  margin-top: 3px;
+  width: 100%;
+  margin-bottom: 10px;
+}
+
+.center {
+  text-align: center;
+}
+select{
+  width: 100%;
+  margin-top: 3px;
+  padding: 5px 5px;
+  border: 1px solid #ccc;
+  border-radius: 4px;
+}
+input[type=text],[type=date],[type=number],textarea {
+  width: 100%;
+  padding: 15px 15px;
+  background-color:rgb(255, 255, 255);
+ // margin: 8px 0;
+  display: inline-block;
+  border: 1px solid #ccc;
+  border-radius: 4px;
+  box-sizing: border-box;
+}
+.error_mess {
+  color: red;
+}
+.universal-section-header {
+  margin: 24px 0 10px 0;
+  font-weight: 600;
+  color: #1a237e;
+  letter-spacing: 0.5px;
+  font-size: 1.25rem;
+}
\ No newline at end of file
diff --git a/test7oct-demot1-f/authsec_angular/frontend/angular-clarity-master/src/app/modules/main/BuilderComponents/angulardatatype/Support/Support.component.ts b/test7oct-demot1-f/authsec_angular/frontend/angular-clarity-master/src/app/modules/main/BuilderComponents/angulardatatype/Support/Support.component.ts
new file mode 100644
index 0000000..9af1ee4
--- /dev/null
+++ b/test7oct-demot1-f/authsec_angular/frontend/angular-clarity-master/src/app/modules/main/BuilderComponents/angulardatatype/Support/Support.component.ts
@@ -0,0 +1,251 @@
+import { Component, OnInit } from '@angular/core';
+import { ToastrService } from 'ngx-toastr';
+import { AlertService } from 'src/app/services/alert.service';
+import { Supportservice} from './Support.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 { Supportcardvariable } from './Support_cardvariable';
+import { UserInfoService } from 'src/app/services/user-info.service';
+declare var JsBarcode: any; 
+@Component({
+  selector: 'app-Support',
+  templateUrl: './Support.component.html',
+  styleUrls: ['./Support.component.scss']
+})
+export class SupportComponent implements OnInit {
+  cardButton = Supportcardvariable.cardButton;
+  cardmodeldata = Supportcardvariable.cardmodeldata;
+  public dashboardArray: DashboardContentModel2[];
+  isCardview = Supportcardvariable.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 = 'Support_formCode'
+tableName = 'Support';  checkFormCode; selected: any[] = []; constructor(
+    private extensionService: ExtensionService,
+private userInfoService:UserInfoService,
+    private mainService:Supportservice,
+    private alertService: AlertService,
+    private toastr: ToastrService,
+    private _fb: FormBuilder,
+  ) { }
+  private editInterval: any;
+// component button 
+  ngOnInit(): void {
+    if(this.cardmodeldata !== ''){
+     this.cardmodal = JSON.parse(this.cardmodeldata);
+    this.dashboardArray = this.cardmodal.dashboard.slice();
+    console.log(this.dashboardArray)
+    }
+    this.userrole=this.userInfoService.getRoles();
+    this.getData();
+    this.entryForm = this._fb.group({
+name : [null],
+
+description : [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 === "Support_formCode");
+      console.log(this.checkFormCode);
+      console.log(this.additionalFieldsFromBackend);
+      if (this.additionalFieldsFromBackend && this.additionalFieldsFromBackend.length > 0) {
+        this.additionalFieldsFromBackend.forEach(field => {
+          if (field.formCode === this.formcode) {
+            if (!this.entryForm.contains(field.extValue)) {
+              // Add the control only if it doesn't exist in the form
+              this.entryForm.addControl(field.extValue, this._fb.control(field.fieldValue));
+            }
+          }
+        });
+      }
+    });
+    console.log(this.entryForm.value);
+    // form code end 
+
+
+
+
+
+  }
+ ngOnDestroy(): void {
+    if (this.editInterval) {
+      clearInterval(this.editInterval);
+    }
+  }
+
+
+
+ error; 
+  getData() {
+    this.mainService.getAll().subscribe((data) => {
+      console.log(data);
+      this.product = data;
+this.product = [...this.product].reverse(); if(this.product.length==0){
+        this.error="No Data Available"
+     }   
+    },(error) => {
+      console.log(error);
+      if(error){
+       this.error="Server Error";
+     }
+    });
+  }
+  onEdit(row) {
+    this.rowSelected = row;
+
+
+
+
+
+    this.modalEdit = true;
+  }
+   onDelete(row) {
+    this.rowSelected = row;
+     this.modaldelete=true;
+  }
+  delete(id)
+  {
+    this.modaldelete = false;
+    console.log("in delete  "+id);
+    this.mainService.delete(id).subscribe(
+      (data) => {
+        console.log(data);
+        this.ngOnInit();
+  if (data) {				      this.toastr.success('Deleted successfully');      }
+    });
+  }
+    onUpdate(id) {
+    this.modalEdit = false;
+
+
+
+
+    //console.log("in update");
+    console.log("id  " + id);
+    console.log(this.rowSelected);
+    //console.log("out update");
+    this.mainService.update(id, this.rowSelected).subscribe(
+      (data) => {
+        console.log(data);
+        if (data || data.status >= 200 && data.status <= 299) {
+          this.toastr.success("Update Successfully");
+        }
+setTimeout(() => {
+      this.ngOnInit();
+    }, 500);
+
+
+
+
+      }, (error) => {
+        console.log(error);
+        if (error.status >= 200 && error.status <= 299) {
+          // this.toastr.success("update Succesfully");
+        }
+        if (error.status >= 400 && error.status <= 499) {
+          this.toastr.error("Not Updated");
+        }
+        if (error.status >= 500 && error.status <= 599) {
+          this.toastr.error("Not Updated");
+        }
+      });
+    setTimeout(() => {
+      this.ngOnInit();
+    }, 500);
+  } 
+onCreate() {
+     this.modalAdd=false;
+
+
+
+
+  this.mainService.create(this.entryForm.value).subscribe(
+    (data) => {
+      console.log(data);
+  if (data || data.status >= 200 && data.status <= 299) {
+          this.toastr.success("Added Successfully");
+        }
+setTimeout(() => {
+      this.ngOnInit();
+    }, 500);
+
+
+
+
+      }, (error) => {
+        console.log(error);
+        if (error.status >= 200 && error.status <= 299) {
+          // this.toastr.success("Added Succesfully");
+        }
+        if (error.status >= 400 && error.status <= 499) {
+          this.toastr.error("Not Added");
+        }
+        if (error.status >= 500 && error.status <= 599) {
+          this.toastr.error("Not Added");
+        }
+      });
+    setTimeout(() => {
+      this.ngOnInit();
+    }, 500);
+  }
+  goToAdd(row) {
+this.modalAdd = true; this.submitted = false;
+
+
+
+
+  }
+ submitted = false;
+onSubmit() {
+  console.log(this.entryForm.value);
+ this.submitted = true;
+  if (this.entryForm.invalid) {
+    return;
+  }this.onCreate();
+
+} 
+
+
+rsModaldescription = false;   
+goToReplaceStringdescription(row){
+this.rowSelected = row;     this.rsModaldescription  =true;   }
+
+// updateaction
+}
+
+
+
diff --git a/test7oct-demot1-f/authsec_angular/frontend/angular-clarity-master/src/app/modules/main/BuilderComponents/angulardatatype/Support/Support.service.ts b/test7oct-demot1-f/authsec_angular/frontend/angular-clarity-master/src/app/modules/main/BuilderComponents/angulardatatype/Support/Support.service.ts
new file mode 100644
index 0000000..d3f45f1
--- /dev/null
+++ b/test7oct-demot1-f/authsec_angular/frontend/angular-clarity-master/src/app/modules/main/BuilderComponents/angulardatatype/Support/Support.service.ts
@@ -0,0 +1,37 @@
+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 Supportservice{
+  private baseURL = "Support/Support" ;  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/test7oct-demot1-f/authsec_angular/frontend/angular-clarity-master/src/app/modules/main/BuilderComponents/angulardatatype/Support/Support_cardvariable.ts b/test7oct-demot1-f/authsec_angular/frontend/angular-clarity-master/src/app/modules/main/BuilderComponents/angulardatatype/Support/Support_cardvariable.ts
new file mode 100644
index 0000000..544e78a
--- /dev/null
+++ b/test7oct-demot1-f/authsec_angular/frontend/angular-clarity-master/src/app/modules/main/BuilderComponents/angulardatatype/Support/Support_cardvariable.ts
@@ -0,0 +1,4 @@
+export const Supportcardvariable = {
+    "cardButton": false,
+    "cardmodeldata": ``
+}
\ No newline at end of file
diff --git a/test7oct-demot1-f/authsec_angular/frontend/angular-clarity-master/src/app/modules/main/BuilderComponents/stpkg/Childform/Childform.component.html b/test7oct-demot1-f/authsec_angular/frontend/angular-clarity-master/src/app/modules/main/BuilderComponents/stpkg/Childform/Childform.component.html
new file mode 100644
index 0000000..75c7b56
--- /dev/null
+++ b/test7oct-demot1-f/authsec_angular/frontend/angular-clarity-master/src/app/modules/main/BuilderComponents/stpkg/Childform/Childform.component.html
@@ -0,0 +1,376 @@
+<ol class="breadcrumb breadcrumb-arrow font-trirong">
+  <li><a href="javascript://"> Childform</a></li>
+</ol>
+<div class="dg-wrapper">
+  <div class="clr-row">
+    <div class="clr-col-8">
+      <h3>Childform </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 Childform
+ <!--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 Childform 
+
+
+
+
+
+
+  <!-- aeroplane icon -->
+    &nbsp; &nbsp; &nbsp; &nbsp;
+    <a *ngIf="userrole?.includes('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: 'Childform_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/test7oct-demot1-f/authsec_angular/frontend/angular-clarity-master/src/app/modules/main/BuilderComponents/stpkg/Childform/Childform.component.scss b/test7oct-demot1-f/authsec_angular/frontend/angular-clarity-master/src/app/modules/main/BuilderComponents/stpkg/Childform/Childform.component.scss
new file mode 100644
index 0000000..12f7fc8
--- /dev/null
+++ b/test7oct-demot1-f/authsec_angular/frontend/angular-clarity-master/src/app/modules/main/BuilderComponents/stpkg/Childform/Childform.component.scss
@@ -0,0 +1,85 @@
+//@import "../../../../assets/scss/var";
+.s-info-bar {
+  display: flex;
+  flex-direction: row;
+  justify-content: space-between;
+  button {
+    outline: none;
+  }
+}
+.delete,.heading{
+  text-align: center;
+  color: red;
+}
+.entry-pg {
+  width: 750px;
+}
+
+.button1::after {
+  content: none;
+}
+.button1:hover::after {
+  content: "ADD ROWS";
+}
+
+.section {
+  background-color: #dddddd;
+  height: 40px;
+}
+
+.section p {
+  //color: white;
+  padding: 10px;
+  font-size: 18px;
+}
+
+.clr-input {
+  color: #212529;
+  border: 1px solid #ced4da;
+  border-radius: 0.25rem;
+  padding: 0.75rem 0.75rem;
+  margin-top: 3px;
+  width: 100%;
+  margin-bottom: 10px;
+}
+
+.clr-file {
+  color: #212529;
+  border: 1px solid #ced4da;
+  border-radius: 0.25rem;
+  //padding: 0.6rem 0.75rem;
+  margin-top: 3px;
+  width: 100%;
+  margin-bottom: 10px;
+}
+
+.center {
+  text-align: center;
+}
+select{
+  width: 100%;
+  margin-top: 3px;
+  padding: 5px 5px;
+  border: 1px solid #ccc;
+  border-radius: 4px;
+}
+input[type=text],[type=date],[type=number],textarea {
+  width: 100%;
+  padding: 15px 15px;
+  background-color:rgb(255, 255, 255);
+ // margin: 8px 0;
+  display: inline-block;
+  border: 1px solid #ccc;
+  border-radius: 4px;
+  box-sizing: border-box;
+}
+.error_mess {
+  color: red;
+}
+.universal-section-header {
+  margin: 24px 0 10px 0;
+  font-weight: 600;
+  color: #1a237e;
+  letter-spacing: 0.5px;
+  font-size: 1.25rem;
+}
\ No newline at end of file
diff --git a/test7oct-demot1-f/authsec_angular/frontend/angular-clarity-master/src/app/modules/main/BuilderComponents/stpkg/Childform/Childform.component.ts b/test7oct-demot1-f/authsec_angular/frontend/angular-clarity-master/src/app/modules/main/BuilderComponents/stpkg/Childform/Childform.component.ts
new file mode 100644
index 0000000..6a60776
--- /dev/null
+++ b/test7oct-demot1-f/authsec_angular/frontend/angular-clarity-master/src/app/modules/main/BuilderComponents/stpkg/Childform/Childform.component.ts
@@ -0,0 +1,275 @@
+import { Component, OnInit } from '@angular/core';
+import { ToastrService } from 'ngx-toastr';
+import { AlertService } from 'src/app/services/alert.service';
+import { Childformservice} from './Childform.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 { Childformcardvariable } from './Childform_cardvariable';
+import { UserInfoService } from 'src/app/services/user-info.service';
+declare var JsBarcode: any; 
+@Component({
+  selector: 'app-Childform',
+  templateUrl: './Childform.component.html',
+  styleUrls: ['./Childform.component.scss']
+})
+export class ChildformComponent implements OnInit {
+  cardButton = Childformcardvariable.cardButton;
+  cardmodeldata = Childformcardvariable.cardmodeldata;
+  public dashboardArray: DashboardContentModel2[];
+  isCardview = Childformcardvariable.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 = 'Childform_formCode'
+tableName = 'Childform';  checkFormCode; selected: any[] = []; constructor(
+    private extensionService: ExtensionService,
+private userInfoService:UserInfoService,
+    private mainService:Childformservice,
+    private alertService: AlertService,
+    private toastr: ToastrService,
+    private _fb: FormBuilder,
+  ) { }
+  private editInterval: any;
+// component button 
+  ngOnInit(): void {
+    if(this.cardmodeldata !== ''){
+     this.cardmodal = JSON.parse(this.cardmodeldata);
+    this.dashboardArray = this.cardmodal.dashboard.slice();
+    console.log(this.dashboardArray)
+    }
+    this.userrole=this.userInfoService.getRoles();
+    this.getData();
+    this.entryForm = this._fb.group({
+name : [null],
+
+description : [null],
+
+active : [true],
+
+
+ 
+
+
+
+
+
+  }); // 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 === "Childform_formCode");
+      console.log(this.checkFormCode);
+      console.log(this.additionalFieldsFromBackend);
+      if (this.additionalFieldsFromBackend && this.additionalFieldsFromBackend.length > 0) {
+        this.additionalFieldsFromBackend.forEach(field => {
+          if (field.formCode === this.formcode) {
+            if (!this.entryForm.contains(field.extValue)) {
+              // Add the control only if it doesn't exist in the form
+              this.entryForm.addControl(field.extValue, this._fb.control(field.fieldValue));
+            }
+          }
+        });
+      }
+    });
+    console.log(this.entryForm.value);
+    // form code end 
+
+
+
+
+
+
+
+  }
+ ngOnDestroy(): void {
+    if (this.editInterval) {
+      clearInterval(this.editInterval);
+    }
+  }
+
+
+
+
+
+ error; 
+  getData() {
+    this.mainService.getAll().subscribe((data) => {
+      console.log(data);
+      this.product = data;
+this.product = [...this.product].reverse(); if(this.product.length==0){
+        this.error="No Data Available"
+     }   
+    },(error) => {
+      console.log(error);
+      if(error){
+       this.error="Server Error";
+     }
+    });
+  }
+  onEdit(row) {
+    this.rowSelected = row;
+
+
+
+
+
+
+
+    this.modalEdit = true;
+  }
+   onDelete(row) {
+    this.rowSelected = row;
+     this.modaldelete=true;
+  }
+  delete(id)
+  {
+    this.modaldelete = false;
+    console.log("in delete  "+id);
+    this.mainService.delete(id).subscribe(
+      (data) => {
+        console.log(data);
+        this.ngOnInit();
+  if (data) {				      this.toastr.success('Deleted successfully');      }
+    });
+  }
+    onUpdate(id) {
+    this.modalEdit = false;
+
+
+
+
+
+
+    //console.log("in update");
+    console.log("id  " + id);
+    console.log(this.rowSelected);
+    //console.log("out update");
+    this.mainService.update(id, this.rowSelected).subscribe(
+      (data) => {
+        console.log(data);
+        if (data || data.status >= 200 && data.status <= 299) {
+          this.toastr.success("Update Successfully");
+        }
+setTimeout(() => {
+      this.ngOnInit();
+    }, 500);
+
+
+
+
+
+
+      }, (error) => {
+        console.log(error);
+        if (error.status >= 200 && error.status <= 299) {
+          // this.toastr.success("update Succesfully");
+        }
+        if (error.status >= 400 && error.status <= 499) {
+          this.toastr.error("Not Updated");
+        }
+        if (error.status >= 500 && error.status <= 599) {
+          this.toastr.error("Not Updated");
+        }
+      });
+    setTimeout(() => {
+      this.ngOnInit();
+    }, 500);
+  } 
+onCreate() {
+     this.modalAdd=false;
+
+
+
+
+
+
+  this.mainService.create(this.entryForm.value).subscribe(
+    (data) => {
+      console.log(data);
+  if (data || data.status >= 200 && data.status <= 299) {
+          this.toastr.success("Added Successfully");
+        }
+setTimeout(() => {
+      this.ngOnInit();
+    }, 500);
+
+
+
+
+
+
+      }, (error) => {
+        console.log(error);
+        if (error.status >= 200 && error.status <= 299) {
+          // this.toastr.success("Added Succesfully");
+        }
+        if (error.status >= 400 && error.status <= 499) {
+          this.toastr.error("Not Added");
+        }
+        if (error.status >= 500 && error.status <= 599) {
+          this.toastr.error("Not Added");
+        }
+      });
+    setTimeout(() => {
+      this.ngOnInit();
+    }, 500);
+  }
+  goToAdd(row) {
+this.modalAdd = true; this.submitted = false;
+
+
+
+
+
+
+  }
+ submitted = false;
+onSubmit() {
+  console.log(this.entryForm.value);
+ this.submitted = true;
+  if (this.entryForm.invalid) {
+    return;
+  }this.onCreate();
+
+} 
+
+
+rsModaldescription = false;   
+goToReplaceStringdescription(row){
+this.rowSelected = row;     this.rsModaldescription  =true;   }
+
+
+
+// updateaction
+}
+
+
+
+
+
diff --git a/test7oct-demot1-f/authsec_angular/frontend/angular-clarity-master/src/app/modules/main/BuilderComponents/stpkg/Childform/Childform.service.ts b/test7oct-demot1-f/authsec_angular/frontend/angular-clarity-master/src/app/modules/main/BuilderComponents/stpkg/Childform/Childform.service.ts
new file mode 100644
index 0000000..3c8571d
--- /dev/null
+++ b/test7oct-demot1-f/authsec_angular/frontend/angular-clarity-master/src/app/modules/main/BuilderComponents/stpkg/Childform/Childform.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 Childformservice{
+  private baseURL = "Childform/Childform" ;  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/test7oct-demot1-f/authsec_angular/frontend/angular-clarity-master/src/app/modules/main/BuilderComponents/stpkg/Childform/Childform_cardvariable.ts b/test7oct-demot1-f/authsec_angular/frontend/angular-clarity-master/src/app/modules/main/BuilderComponents/stpkg/Childform/Childform_cardvariable.ts
new file mode 100644
index 0000000..8809902
--- /dev/null
+++ b/test7oct-demot1-f/authsec_angular/frontend/angular-clarity-master/src/app/modules/main/BuilderComponents/stpkg/Childform/Childform_cardvariable.ts
@@ -0,0 +1,4 @@
+export const Childformcardvariable = {
+    "cardButton": false,
+    "cardmodeldata": ``
+}
\ No newline at end of file
diff --git a/test7oct-demot1-f/authsec_angular/frontend/angular-clarity-master/src/app/modules/main/BuilderComponents/testdata/Country/Country.component.html b/test7oct-demot1-f/authsec_angular/frontend/angular-clarity-master/src/app/modules/main/BuilderComponents/testdata/Country/Country.component.html
new file mode 100644
index 0000000..e5ee328
--- /dev/null
+++ b/test7oct-demot1-f/authsec_angular/frontend/angular-clarity-master/src/app/modules/main/BuilderComponents/testdata/Country/Country.component.html
@@ -0,0 +1,376 @@
+<ol class="breadcrumb breadcrumb-arrow font-trirong">
+  <li><a href="javascript://"> Country</a></li>
+</ol>
+<div class="dg-wrapper">
+  <div class="clr-row">
+    <div class="clr-col-8">
+      <h3>Country </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 Country
+ <!--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 Country 
+
+
+
+
+
+
+  <!-- aeroplane icon -->
+    &nbsp; &nbsp; &nbsp; &nbsp;
+    <a *ngIf="userrole?.includes('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: 'Country_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/test7oct-demot1-f/authsec_angular/frontend/angular-clarity-master/src/app/modules/main/BuilderComponents/testdata/Country/Country.component.scss b/test7oct-demot1-f/authsec_angular/frontend/angular-clarity-master/src/app/modules/main/BuilderComponents/testdata/Country/Country.component.scss
new file mode 100644
index 0000000..12f7fc8
--- /dev/null
+++ b/test7oct-demot1-f/authsec_angular/frontend/angular-clarity-master/src/app/modules/main/BuilderComponents/testdata/Country/Country.component.scss
@@ -0,0 +1,85 @@
+//@import "../../../../assets/scss/var";
+.s-info-bar {
+  display: flex;
+  flex-direction: row;
+  justify-content: space-between;
+  button {
+    outline: none;
+  }
+}
+.delete,.heading{
+  text-align: center;
+  color: red;
+}
+.entry-pg {
+  width: 750px;
+}
+
+.button1::after {
+  content: none;
+}
+.button1:hover::after {
+  content: "ADD ROWS";
+}
+
+.section {
+  background-color: #dddddd;
+  height: 40px;
+}
+
+.section p {
+  //color: white;
+  padding: 10px;
+  font-size: 18px;
+}
+
+.clr-input {
+  color: #212529;
+  border: 1px solid #ced4da;
+  border-radius: 0.25rem;
+  padding: 0.75rem 0.75rem;
+  margin-top: 3px;
+  width: 100%;
+  margin-bottom: 10px;
+}
+
+.clr-file {
+  color: #212529;
+  border: 1px solid #ced4da;
+  border-radius: 0.25rem;
+  //padding: 0.6rem 0.75rem;
+  margin-top: 3px;
+  width: 100%;
+  margin-bottom: 10px;
+}
+
+.center {
+  text-align: center;
+}
+select{
+  width: 100%;
+  margin-top: 3px;
+  padding: 5px 5px;
+  border: 1px solid #ccc;
+  border-radius: 4px;
+}
+input[type=text],[type=date],[type=number],textarea {
+  width: 100%;
+  padding: 15px 15px;
+  background-color:rgb(255, 255, 255);
+ // margin: 8px 0;
+  display: inline-block;
+  border: 1px solid #ccc;
+  border-radius: 4px;
+  box-sizing: border-box;
+}
+.error_mess {
+  color: red;
+}
+.universal-section-header {
+  margin: 24px 0 10px 0;
+  font-weight: 600;
+  color: #1a237e;
+  letter-spacing: 0.5px;
+  font-size: 1.25rem;
+}
\ No newline at end of file
diff --git a/test7oct-demot1-f/authsec_angular/frontend/angular-clarity-master/src/app/modules/main/BuilderComponents/testdata/Country/Country.component.ts b/test7oct-demot1-f/authsec_angular/frontend/angular-clarity-master/src/app/modules/main/BuilderComponents/testdata/Country/Country.component.ts
new file mode 100644
index 0000000..ad128e1
--- /dev/null
+++ b/test7oct-demot1-f/authsec_angular/frontend/angular-clarity-master/src/app/modules/main/BuilderComponents/testdata/Country/Country.component.ts
@@ -0,0 +1,275 @@
+import { Component, OnInit } from '@angular/core';
+import { ToastrService } from 'ngx-toastr';
+import { AlertService } from 'src/app/services/alert.service';
+import { Countryservice} from './Country.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 { Countrycardvariable } from './Country_cardvariable';
+import { UserInfoService } from 'src/app/services/user-info.service';
+declare var JsBarcode: any; 
+@Component({
+  selector: 'app-Country',
+  templateUrl: './Country.component.html',
+  styleUrls: ['./Country.component.scss']
+})
+export class CountryComponent implements OnInit {
+  cardButton = Countrycardvariable.cardButton;
+  cardmodeldata = Countrycardvariable.cardmodeldata;
+  public dashboardArray: DashboardContentModel2[];
+  isCardview = Countrycardvariable.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 = 'Country_formCode'
+tableName = 'Country';  checkFormCode; selected: any[] = []; constructor(
+    private extensionService: ExtensionService,
+private userInfoService:UserInfoService,
+    private mainService:Countryservice,
+    private alertService: AlertService,
+    private toastr: ToastrService,
+    private _fb: FormBuilder,
+  ) { }
+  private editInterval: any;
+// component button 
+  ngOnInit(): void {
+    if(this.cardmodeldata !== ''){
+     this.cardmodal = JSON.parse(this.cardmodeldata);
+    this.dashboardArray = this.cardmodal.dashboard.slice();
+    console.log(this.dashboardArray)
+    }
+    this.userrole=this.userInfoService.getRoles();
+    this.getData();
+    this.entryForm = this._fb.group({
+name : [null],
+
+description : [null],
+
+active : [true],
+
+
+ 
+
+
+
+
+
+  }); // 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 === "Country_formCode");
+      console.log(this.checkFormCode);
+      console.log(this.additionalFieldsFromBackend);
+      if (this.additionalFieldsFromBackend && this.additionalFieldsFromBackend.length > 0) {
+        this.additionalFieldsFromBackend.forEach(field => {
+          if (field.formCode === this.formcode) {
+            if (!this.entryForm.contains(field.extValue)) {
+              // Add the control only if it doesn't exist in the form
+              this.entryForm.addControl(field.extValue, this._fb.control(field.fieldValue));
+            }
+          }
+        });
+      }
+    });
+    console.log(this.entryForm.value);
+    // form code end 
+
+
+
+
+
+
+
+  }
+ ngOnDestroy(): void {
+    if (this.editInterval) {
+      clearInterval(this.editInterval);
+    }
+  }
+
+
+
+
+
+ error; 
+  getData() {
+    this.mainService.getAll().subscribe((data) => {
+      console.log(data);
+      this.product = data;
+this.product = [...this.product].reverse(); if(this.product.length==0){
+        this.error="No Data Available"
+     }   
+    },(error) => {
+      console.log(error);
+      if(error){
+       this.error="Server Error";
+     }
+    });
+  }
+  onEdit(row) {
+    this.rowSelected = row;
+
+
+
+
+
+
+
+    this.modalEdit = true;
+  }
+   onDelete(row) {
+    this.rowSelected = row;
+     this.modaldelete=true;
+  }
+  delete(id)
+  {
+    this.modaldelete = false;
+    console.log("in delete  "+id);
+    this.mainService.delete(id).subscribe(
+      (data) => {
+        console.log(data);
+        this.ngOnInit();
+  if (data) {				      this.toastr.success('Deleted successfully');      }
+    });
+  }
+    onUpdate(id) {
+    this.modalEdit = false;
+
+
+
+
+
+
+    //console.log("in update");
+    console.log("id  " + id);
+    console.log(this.rowSelected);
+    //console.log("out update");
+    this.mainService.update(id, this.rowSelected).subscribe(
+      (data) => {
+        console.log(data);
+        if (data || data.status >= 200 && data.status <= 299) {
+          this.toastr.success("Update Successfully");
+        }
+setTimeout(() => {
+      this.ngOnInit();
+    }, 500);
+
+
+
+
+
+
+      }, (error) => {
+        console.log(error);
+        if (error.status >= 200 && error.status <= 299) {
+          // this.toastr.success("update Succesfully");
+        }
+        if (error.status >= 400 && error.status <= 499) {
+          this.toastr.error("Not Updated");
+        }
+        if (error.status >= 500 && error.status <= 599) {
+          this.toastr.error("Not Updated");
+        }
+      });
+    setTimeout(() => {
+      this.ngOnInit();
+    }, 500);
+  } 
+onCreate() {
+     this.modalAdd=false;
+
+
+
+
+
+
+  this.mainService.create(this.entryForm.value).subscribe(
+    (data) => {
+      console.log(data);
+  if (data || data.status >= 200 && data.status <= 299) {
+          this.toastr.success("Added Successfully");
+        }
+setTimeout(() => {
+      this.ngOnInit();
+    }, 500);
+
+
+
+
+
+
+      }, (error) => {
+        console.log(error);
+        if (error.status >= 200 && error.status <= 299) {
+          // this.toastr.success("Added Succesfully");
+        }
+        if (error.status >= 400 && error.status <= 499) {
+          this.toastr.error("Not Added");
+        }
+        if (error.status >= 500 && error.status <= 599) {
+          this.toastr.error("Not Added");
+        }
+      });
+    setTimeout(() => {
+      this.ngOnInit();
+    }, 500);
+  }
+  goToAdd(row) {
+this.modalAdd = true; this.submitted = false;
+
+
+
+
+
+
+  }
+ submitted = false;
+onSubmit() {
+  console.log(this.entryForm.value);
+ this.submitted = true;
+  if (this.entryForm.invalid) {
+    return;
+  }this.onCreate();
+
+} 
+
+
+rsModaldescription = false;   
+goToReplaceStringdescription(row){
+this.rowSelected = row;     this.rsModaldescription  =true;   }
+
+
+
+// updateaction
+}
+
+
+
+
+
diff --git a/test7oct-demot1-f/authsec_angular/frontend/angular-clarity-master/src/app/modules/main/BuilderComponents/testdata/Country/Country.service.ts b/test7oct-demot1-f/authsec_angular/frontend/angular-clarity-master/src/app/modules/main/BuilderComponents/testdata/Country/Country.service.ts
new file mode 100644
index 0000000..05a5665
--- /dev/null
+++ b/test7oct-demot1-f/authsec_angular/frontend/angular-clarity-master/src/app/modules/main/BuilderComponents/testdata/Country/Country.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 Countryservice{
+  private baseURL = "Country/Country" ;  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/test7oct-demot1-f/authsec_angular/frontend/angular-clarity-master/src/app/modules/main/BuilderComponents/testdata/Country/Country_cardvariable.ts b/test7oct-demot1-f/authsec_angular/frontend/angular-clarity-master/src/app/modules/main/BuilderComponents/testdata/Country/Country_cardvariable.ts
new file mode 100644
index 0000000..efc9e50
--- /dev/null
+++ b/test7oct-demot1-f/authsec_angular/frontend/angular-clarity-master/src/app/modules/main/BuilderComponents/testdata/Country/Country_cardvariable.ts
@@ -0,0 +1,4 @@
+export const Countrycardvariable = {
+    "cardButton": false,
+    "cardmodeldata": ``
+}
\ No newline at end of file
diff --git a/test7oct-demot1-f/authsec_angular/frontend/angular-clarity-master/src/app/modules/main/BuilderComponents/testdata/District/District.component.html b/test7oct-demot1-f/authsec_angular/frontend/angular-clarity-master/src/app/modules/main/BuilderComponents/testdata/District/District.component.html
new file mode 100644
index 0000000..125eb51
--- /dev/null
+++ b/test7oct-demot1-f/authsec_angular/frontend/angular-clarity-master/src/app/modules/main/BuilderComponents/testdata/District/District.component.html
@@ -0,0 +1,405 @@
+<ol class="breadcrumb breadcrumb-arrow font-trirong">
+  <li><a href="javascript://"> District</a></li>
+</ol>
+<div class="dg-wrapper">
+  <div class="clr-row">
+    <div class="clr-col-8">
+      <h3>District </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]="'district_name'"> <ng-container *clrDgHideableColumn="{hidden: false}"> district 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>
+
+
+<clr-dg-column [clrDgField]="'state_name'"> <ng-container *clrDgHideableColumn="{hidden: false}"> state name
+						    </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.district_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>
+
+
+<clr-dg-cell>{{user.state_name }}</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 District
+ <!--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>district name</label>
+	        <input class="clr-input"  type="text" [(ngModel)]="rowSelected.district_name" name="district_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 class="clr-col-sm-12">       
+<label>state name</label>
+	        <input class="clr-input"  type="text" [(ngModel)]="rowSelected.state_name" name="state_name" />
+	      </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 District 
+
+
+
+
+
+
+
+
+  <!-- aeroplane icon -->
+    &nbsp; &nbsp; &nbsp; &nbsp;
+    <a *ngIf="userrole?.includes('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: 'District_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>  district name</label>
+ <input class="clr-input"  type="text"  formControlName="district_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 class="clr-col-sm-12">
+ <label>  state name</label>
+ <input class="clr-input"  type="text"  formControlName="state_name" />       
+ </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/test7oct-demot1-f/authsec_angular/frontend/angular-clarity-master/src/app/modules/main/BuilderComponents/testdata/District/District.component.scss b/test7oct-demot1-f/authsec_angular/frontend/angular-clarity-master/src/app/modules/main/BuilderComponents/testdata/District/District.component.scss
new file mode 100644
index 0000000..12f7fc8
--- /dev/null
+++ b/test7oct-demot1-f/authsec_angular/frontend/angular-clarity-master/src/app/modules/main/BuilderComponents/testdata/District/District.component.scss
@@ -0,0 +1,85 @@
+//@import "../../../../assets/scss/var";
+.s-info-bar {
+  display: flex;
+  flex-direction: row;
+  justify-content: space-between;
+  button {
+    outline: none;
+  }
+}
+.delete,.heading{
+  text-align: center;
+  color: red;
+}
+.entry-pg {
+  width: 750px;
+}
+
+.button1::after {
+  content: none;
+}
+.button1:hover::after {
+  content: "ADD ROWS";
+}
+
+.section {
+  background-color: #dddddd;
+  height: 40px;
+}
+
+.section p {
+  //color: white;
+  padding: 10px;
+  font-size: 18px;
+}
+
+.clr-input {
+  color: #212529;
+  border: 1px solid #ced4da;
+  border-radius: 0.25rem;
+  padding: 0.75rem 0.75rem;
+  margin-top: 3px;
+  width: 100%;
+  margin-bottom: 10px;
+}
+
+.clr-file {
+  color: #212529;
+  border: 1px solid #ced4da;
+  border-radius: 0.25rem;
+  //padding: 0.6rem 0.75rem;
+  margin-top: 3px;
+  width: 100%;
+  margin-bottom: 10px;
+}
+
+.center {
+  text-align: center;
+}
+select{
+  width: 100%;
+  margin-top: 3px;
+  padding: 5px 5px;
+  border: 1px solid #ccc;
+  border-radius: 4px;
+}
+input[type=text],[type=date],[type=number],textarea {
+  width: 100%;
+  padding: 15px 15px;
+  background-color:rgb(255, 255, 255);
+ // margin: 8px 0;
+  display: inline-block;
+  border: 1px solid #ccc;
+  border-radius: 4px;
+  box-sizing: border-box;
+}
+.error_mess {
+  color: red;
+}
+.universal-section-header {
+  margin: 24px 0 10px 0;
+  font-weight: 600;
+  color: #1a237e;
+  letter-spacing: 0.5px;
+  font-size: 1.25rem;
+}
\ No newline at end of file
diff --git a/test7oct-demot1-f/authsec_angular/frontend/angular-clarity-master/src/app/modules/main/BuilderComponents/testdata/District/District.component.ts b/test7oct-demot1-f/authsec_angular/frontend/angular-clarity-master/src/app/modules/main/BuilderComponents/testdata/District/District.component.ts
new file mode 100644
index 0000000..781fdf0
--- /dev/null
+++ b/test7oct-demot1-f/authsec_angular/frontend/angular-clarity-master/src/app/modules/main/BuilderComponents/testdata/District/District.component.ts
@@ -0,0 +1,299 @@
+import { Component, OnInit } from '@angular/core';
+import { ToastrService } from 'ngx-toastr';
+import { AlertService } from 'src/app/services/alert.service';
+import { Districtservice} from './District.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 { Districtcardvariable } from './District_cardvariable';
+import { UserInfoService } from 'src/app/services/user-info.service';
+declare var JsBarcode: any; 
+@Component({
+  selector: 'app-District',
+  templateUrl: './District.component.html',
+  styleUrls: ['./District.component.scss']
+})
+export class DistrictComponent implements OnInit {
+  cardButton = Districtcardvariable.cardButton;
+  cardmodeldata = Districtcardvariable.cardmodeldata;
+  public dashboardArray: DashboardContentModel2[];
+  isCardview = Districtcardvariable.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 = 'District_formCode'
+tableName = 'District';  checkFormCode; selected: any[] = []; constructor(
+    private extensionService: ExtensionService,
+private userInfoService:UserInfoService,
+    private mainService:Districtservice,
+    private alertService: AlertService,
+    private toastr: ToastrService,
+    private _fb: FormBuilder,
+  ) { }
+  private editInterval: any;
+// component button 
+  ngOnInit(): void {
+    if(this.cardmodeldata !== ''){
+     this.cardmodal = JSON.parse(this.cardmodeldata);
+    this.dashboardArray = this.cardmodal.dashboard.slice();
+    console.log(this.dashboardArray)
+    }
+    this.userrole=this.userInfoService.getRoles();
+    this.getData();
+    this.entryForm = this._fb.group({
+district_name : [null],
+
+description : [null],
+
+active : [true],
+
+state_name : [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 === "District_formCode");
+      console.log(this.checkFormCode);
+      console.log(this.additionalFieldsFromBackend);
+      if (this.additionalFieldsFromBackend && this.additionalFieldsFromBackend.length > 0) {
+        this.additionalFieldsFromBackend.forEach(field => {
+          if (field.formCode === this.formcode) {
+            if (!this.entryForm.contains(field.extValue)) {
+              // Add the control only if it doesn't exist in the form
+              this.entryForm.addControl(field.extValue, this._fb.control(field.fieldValue));
+            }
+          }
+        });
+      }
+    });
+    console.log(this.entryForm.value);
+    // form code end 
+
+
+
+
+
+
+
+
+
+  }
+ ngOnDestroy(): void {
+    if (this.editInterval) {
+      clearInterval(this.editInterval);
+    }
+  }
+
+
+
+
+
+
+
+ error; 
+  getData() {
+    this.mainService.getAll().subscribe((data) => {
+      console.log(data);
+      this.product = data;
+this.product = [...this.product].reverse(); if(this.product.length==0){
+        this.error="No Data Available"
+     }   
+    },(error) => {
+      console.log(error);
+      if(error){
+       this.error="Server Error";
+     }
+    });
+  }
+  onEdit(row) {
+    this.rowSelected = row;
+
+
+
+
+
+
+
+
+
+    this.modalEdit = true;
+  }
+   onDelete(row) {
+    this.rowSelected = row;
+     this.modaldelete=true;
+  }
+  delete(id)
+  {
+    this.modaldelete = false;
+    console.log("in delete  "+id);
+    this.mainService.delete(id).subscribe(
+      (data) => {
+        console.log(data);
+        this.ngOnInit();
+  if (data) {				      this.toastr.success('Deleted successfully');      }
+    });
+  }
+    onUpdate(id) {
+    this.modalEdit = false;
+
+
+
+
+
+
+
+
+    //console.log("in update");
+    console.log("id  " + id);
+    console.log(this.rowSelected);
+    //console.log("out update");
+    this.mainService.update(id, this.rowSelected).subscribe(
+      (data) => {
+        console.log(data);
+        if (data || data.status >= 200 && data.status <= 299) {
+          this.toastr.success("Update Successfully");
+        }
+setTimeout(() => {
+      this.ngOnInit();
+    }, 500);
+
+
+
+
+
+
+
+
+      }, (error) => {
+        console.log(error);
+        if (error.status >= 200 && error.status <= 299) {
+          // this.toastr.success("update Succesfully");
+        }
+        if (error.status >= 400 && error.status <= 499) {
+          this.toastr.error("Not Updated");
+        }
+        if (error.status >= 500 && error.status <= 599) {
+          this.toastr.error("Not Updated");
+        }
+      });
+    setTimeout(() => {
+      this.ngOnInit();
+    }, 500);
+  } 
+onCreate() {
+     this.modalAdd=false;
+
+
+
+
+
+
+
+
+  this.mainService.create(this.entryForm.value).subscribe(
+    (data) => {
+      console.log(data);
+  if (data || data.status >= 200 && data.status <= 299) {
+          this.toastr.success("Added Successfully");
+        }
+setTimeout(() => {
+      this.ngOnInit();
+    }, 500);
+
+
+
+
+
+
+
+
+      }, (error) => {
+        console.log(error);
+        if (error.status >= 200 && error.status <= 299) {
+          // this.toastr.success("Added Succesfully");
+        }
+        if (error.status >= 400 && error.status <= 499) {
+          this.toastr.error("Not Added");
+        }
+        if (error.status >= 500 && error.status <= 599) {
+          this.toastr.error("Not Added");
+        }
+      });
+    setTimeout(() => {
+      this.ngOnInit();
+    }, 500);
+  }
+  goToAdd(row) {
+this.modalAdd = true; this.submitted = false;
+
+
+
+
+
+
+
+
+  }
+ submitted = false;
+onSubmit() {
+  console.log(this.entryForm.value);
+ this.submitted = true;
+  if (this.entryForm.invalid) {
+    return;
+  }this.onCreate();
+
+} 
+
+
+rsModaldescription = false;   
+goToReplaceStringdescription(row){
+this.rowSelected = row;     this.rsModaldescription  =true;   }
+
+
+
+
+
+// updateaction
+}
+
+
+
+
+
+
+
diff --git a/test7oct-demot1-f/authsec_angular/frontend/angular-clarity-master/src/app/modules/main/BuilderComponents/testdata/District/District.service.ts b/test7oct-demot1-f/authsec_angular/frontend/angular-clarity-master/src/app/modules/main/BuilderComponents/testdata/District/District.service.ts
new file mode 100644
index 0000000..3484a22
--- /dev/null
+++ b/test7oct-demot1-f/authsec_angular/frontend/angular-clarity-master/src/app/modules/main/BuilderComponents/testdata/District/District.service.ts
@@ -0,0 +1,41 @@
+import { Injectable } from '@angular/core';
+import { Observable } from "rxjs";
+import { HttpClient, HttpHeaders, HttpParams, } from "@angular/common/http";
+import { ApiRequestService } from "src/app/services/api/api-request.service";
+import { environment } from 'src/environments/environment';
+@Injectable({
+  providedIn: 'root'
+})
+export class Districtservice{
+  private baseURL = "District/District" ;  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/test7oct-demot1-f/authsec_angular/frontend/angular-clarity-master/src/app/modules/main/BuilderComponents/testdata/District/District_cardvariable.ts b/test7oct-demot1-f/authsec_angular/frontend/angular-clarity-master/src/app/modules/main/BuilderComponents/testdata/District/District_cardvariable.ts
new file mode 100644
index 0000000..7dd47dd
--- /dev/null
+++ b/test7oct-demot1-f/authsec_angular/frontend/angular-clarity-master/src/app/modules/main/BuilderComponents/testdata/District/District_cardvariable.ts
@@ -0,0 +1,4 @@
+export const Districtcardvariable = {
+    "cardButton": false,
+    "cardmodeldata": ``
+}
\ No newline at end of file
diff --git a/test7oct-demot1-f/authsec_angular/frontend/angular-clarity-master/src/app/modules/main/BuilderComponents/testdata/State/State.component.html b/test7oct-demot1-f/authsec_angular/frontend/angular-clarity-master/src/app/modules/main/BuilderComponents/testdata/State/State.component.html
new file mode 100644
index 0000000..e9e8cf1
--- /dev/null
+++ b/test7oct-demot1-f/authsec_angular/frontend/angular-clarity-master/src/app/modules/main/BuilderComponents/testdata/State/State.component.html
@@ -0,0 +1,405 @@
+<ol class="breadcrumb breadcrumb-arrow font-trirong">
+  <li><a href="javascript://"> State</a></li>
+</ol>
+<div class="dg-wrapper">
+  <div class="clr-row">
+    <div class="clr-col-8">
+      <h3>State </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]="'state_name'"> <ng-container *clrDgHideableColumn="{hidden: false}"> state 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>
+
+
+<clr-dg-column [clrDgField]="'country_name'"> <ng-container *clrDgHideableColumn="{hidden: false}"> country name
+						    </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.state_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>
+
+
+<clr-dg-cell>{{user.country_name }}</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 State
+ <!--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>state name</label>
+	        <input class="clr-input"  type="text" [(ngModel)]="rowSelected.state_name" name="state_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 class="clr-col-sm-12">       
+<label>country name</label>
+	        <input class="clr-input"  type="text" [(ngModel)]="rowSelected.country_name" name="country_name" />
+	      </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 State 
+
+
+
+
+
+
+
+
+  <!-- aeroplane icon -->
+    &nbsp; &nbsp; &nbsp; &nbsp;
+    <a *ngIf="userrole?.includes('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: 'State_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>  state name</label>
+ <input class="clr-input"  type="text"  formControlName="state_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 class="clr-col-sm-12">
+ <label>  country name</label>
+ <input class="clr-input"  type="text"  formControlName="country_name" />       
+ </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/test7oct-demot1-f/authsec_angular/frontend/angular-clarity-master/src/app/modules/main/BuilderComponents/testdata/State/State.component.scss b/test7oct-demot1-f/authsec_angular/frontend/angular-clarity-master/src/app/modules/main/BuilderComponents/testdata/State/State.component.scss
new file mode 100644
index 0000000..12f7fc8
--- /dev/null
+++ b/test7oct-demot1-f/authsec_angular/frontend/angular-clarity-master/src/app/modules/main/BuilderComponents/testdata/State/State.component.scss
@@ -0,0 +1,85 @@
+//@import "../../../../assets/scss/var";
+.s-info-bar {
+  display: flex;
+  flex-direction: row;
+  justify-content: space-between;
+  button {
+    outline: none;
+  }
+}
+.delete,.heading{
+  text-align: center;
+  color: red;
+}
+.entry-pg {
+  width: 750px;
+}
+
+.button1::after {
+  content: none;
+}
+.button1:hover::after {
+  content: "ADD ROWS";
+}
+
+.section {
+  background-color: #dddddd;
+  height: 40px;
+}
+
+.section p {
+  //color: white;
+  padding: 10px;
+  font-size: 18px;
+}
+
+.clr-input {
+  color: #212529;
+  border: 1px solid #ced4da;
+  border-radius: 0.25rem;
+  padding: 0.75rem 0.75rem;
+  margin-top: 3px;
+  width: 100%;
+  margin-bottom: 10px;
+}
+
+.clr-file {
+  color: #212529;
+  border: 1px solid #ced4da;
+  border-radius: 0.25rem;
+  //padding: 0.6rem 0.75rem;
+  margin-top: 3px;
+  width: 100%;
+  margin-bottom: 10px;
+}
+
+.center {
+  text-align: center;
+}
+select{
+  width: 100%;
+  margin-top: 3px;
+  padding: 5px 5px;
+  border: 1px solid #ccc;
+  border-radius: 4px;
+}
+input[type=text],[type=date],[type=number],textarea {
+  width: 100%;
+  padding: 15px 15px;
+  background-color:rgb(255, 255, 255);
+ // margin: 8px 0;
+  display: inline-block;
+  border: 1px solid #ccc;
+  border-radius: 4px;
+  box-sizing: border-box;
+}
+.error_mess {
+  color: red;
+}
+.universal-section-header {
+  margin: 24px 0 10px 0;
+  font-weight: 600;
+  color: #1a237e;
+  letter-spacing: 0.5px;
+  font-size: 1.25rem;
+}
\ No newline at end of file
diff --git a/test7oct-demot1-f/authsec_angular/frontend/angular-clarity-master/src/app/modules/main/BuilderComponents/testdata/State/State.component.ts b/test7oct-demot1-f/authsec_angular/frontend/angular-clarity-master/src/app/modules/main/BuilderComponents/testdata/State/State.component.ts
new file mode 100644
index 0000000..1ac0731
--- /dev/null
+++ b/test7oct-demot1-f/authsec_angular/frontend/angular-clarity-master/src/app/modules/main/BuilderComponents/testdata/State/State.component.ts
@@ -0,0 +1,299 @@
+import { Component, OnInit } from '@angular/core';
+import { ToastrService } from 'ngx-toastr';
+import { AlertService } from 'src/app/services/alert.service';
+import { Stateservice} from './State.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 { Statecardvariable } from './State_cardvariable';
+import { UserInfoService } from 'src/app/services/user-info.service';
+declare var JsBarcode: any; 
+@Component({
+  selector: 'app-State',
+  templateUrl: './State.component.html',
+  styleUrls: ['./State.component.scss']
+})
+export class StateComponent implements OnInit {
+  cardButton = Statecardvariable.cardButton;
+  cardmodeldata = Statecardvariable.cardmodeldata;
+  public dashboardArray: DashboardContentModel2[];
+  isCardview = Statecardvariable.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 = 'State_formCode'
+tableName = 'State';  checkFormCode; selected: any[] = []; constructor(
+    private extensionService: ExtensionService,
+private userInfoService:UserInfoService,
+    private mainService:Stateservice,
+    private alertService: AlertService,
+    private toastr: ToastrService,
+    private _fb: FormBuilder,
+  ) { }
+  private editInterval: any;
+// component button 
+  ngOnInit(): void {
+    if(this.cardmodeldata !== ''){
+     this.cardmodal = JSON.parse(this.cardmodeldata);
+    this.dashboardArray = this.cardmodal.dashboard.slice();
+    console.log(this.dashboardArray)
+    }
+    this.userrole=this.userInfoService.getRoles();
+    this.getData();
+    this.entryForm = this._fb.group({
+state_name : [null],
+
+description : [null],
+
+active : [true],
+
+country_name : [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 === "State_formCode");
+      console.log(this.checkFormCode);
+      console.log(this.additionalFieldsFromBackend);
+      if (this.additionalFieldsFromBackend && this.additionalFieldsFromBackend.length > 0) {
+        this.additionalFieldsFromBackend.forEach(field => {
+          if (field.formCode === this.formcode) {
+            if (!this.entryForm.contains(field.extValue)) {
+              // Add the control only if it doesn't exist in the form
+              this.entryForm.addControl(field.extValue, this._fb.control(field.fieldValue));
+            }
+          }
+        });
+      }
+    });
+    console.log(this.entryForm.value);
+    // form code end 
+
+
+
+
+
+
+
+
+
+  }
+ ngOnDestroy(): void {
+    if (this.editInterval) {
+      clearInterval(this.editInterval);
+    }
+  }
+
+
+
+
+
+
+
+ error; 
+  getData() {
+    this.mainService.getAll().subscribe((data) => {
+      console.log(data);
+      this.product = data;
+this.product = [...this.product].reverse(); if(this.product.length==0){
+        this.error="No Data Available"
+     }   
+    },(error) => {
+      console.log(error);
+      if(error){
+       this.error="Server Error";
+     }
+    });
+  }
+  onEdit(row) {
+    this.rowSelected = row;
+
+
+
+
+
+
+
+
+
+    this.modalEdit = true;
+  }
+   onDelete(row) {
+    this.rowSelected = row;
+     this.modaldelete=true;
+  }
+  delete(id)
+  {
+    this.modaldelete = false;
+    console.log("in delete  "+id);
+    this.mainService.delete(id).subscribe(
+      (data) => {
+        console.log(data);
+        this.ngOnInit();
+  if (data) {				      this.toastr.success('Deleted successfully');      }
+    });
+  }
+    onUpdate(id) {
+    this.modalEdit = false;
+
+
+
+
+
+
+
+
+    //console.log("in update");
+    console.log("id  " + id);
+    console.log(this.rowSelected);
+    //console.log("out update");
+    this.mainService.update(id, this.rowSelected).subscribe(
+      (data) => {
+        console.log(data);
+        if (data || data.status >= 200 && data.status <= 299) {
+          this.toastr.success("Update Successfully");
+        }
+setTimeout(() => {
+      this.ngOnInit();
+    }, 500);
+
+
+
+
+
+
+
+
+      }, (error) => {
+        console.log(error);
+        if (error.status >= 200 && error.status <= 299) {
+          // this.toastr.success("update Succesfully");
+        }
+        if (error.status >= 400 && error.status <= 499) {
+          this.toastr.error("Not Updated");
+        }
+        if (error.status >= 500 && error.status <= 599) {
+          this.toastr.error("Not Updated");
+        }
+      });
+    setTimeout(() => {
+      this.ngOnInit();
+    }, 500);
+  } 
+onCreate() {
+     this.modalAdd=false;
+
+
+
+
+
+
+
+
+  this.mainService.create(this.entryForm.value).subscribe(
+    (data) => {
+      console.log(data);
+  if (data || data.status >= 200 && data.status <= 299) {
+          this.toastr.success("Added Successfully");
+        }
+setTimeout(() => {
+      this.ngOnInit();
+    }, 500);
+
+
+
+
+
+
+
+
+      }, (error) => {
+        console.log(error);
+        if (error.status >= 200 && error.status <= 299) {
+          // this.toastr.success("Added Succesfully");
+        }
+        if (error.status >= 400 && error.status <= 499) {
+          this.toastr.error("Not Added");
+        }
+        if (error.status >= 500 && error.status <= 599) {
+          this.toastr.error("Not Added");
+        }
+      });
+    setTimeout(() => {
+      this.ngOnInit();
+    }, 500);
+  }
+  goToAdd(row) {
+this.modalAdd = true; this.submitted = false;
+
+
+
+
+
+
+
+
+  }
+ submitted = false;
+onSubmit() {
+  console.log(this.entryForm.value);
+ this.submitted = true;
+  if (this.entryForm.invalid) {
+    return;
+  }this.onCreate();
+
+} 
+
+
+rsModaldescription = false;   
+goToReplaceStringdescription(row){
+this.rowSelected = row;     this.rsModaldescription  =true;   }
+
+
+
+
+
+// updateaction
+}
+
+
+
+
+
+
+
diff --git a/test7oct-demot1-f/authsec_angular/frontend/angular-clarity-master/src/app/modules/main/BuilderComponents/testdata/State/State.service.ts b/test7oct-demot1-f/authsec_angular/frontend/angular-clarity-master/src/app/modules/main/BuilderComponents/testdata/State/State.service.ts
new file mode 100644
index 0000000..b072891
--- /dev/null
+++ b/test7oct-demot1-f/authsec_angular/frontend/angular-clarity-master/src/app/modules/main/BuilderComponents/testdata/State/State.service.ts
@@ -0,0 +1,41 @@
+import { Injectable } from '@angular/core';
+import { Observable } from "rxjs";
+import { HttpClient, HttpHeaders, HttpParams, } from "@angular/common/http";
+import { ApiRequestService } from "src/app/services/api/api-request.service";
+import { environment } from 'src/environments/environment';
+@Injectable({
+  providedIn: 'root'
+})
+export class Stateservice{
+  private baseURL = "State/State" ;  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/test7oct-demot1-f/authsec_angular/frontend/angular-clarity-master/src/app/modules/main/BuilderComponents/testdata/State/State_cardvariable.ts b/test7oct-demot1-f/authsec_angular/frontend/angular-clarity-master/src/app/modules/main/BuilderComponents/testdata/State/State_cardvariable.ts
new file mode 100644
index 0000000..fce7bf8
--- /dev/null
+++ b/test7oct-demot1-f/authsec_angular/frontend/angular-clarity-master/src/app/modules/main/BuilderComponents/testdata/State/State_cardvariable.ts
@@ -0,0 +1,4 @@
+export const Statecardvariable = {
+    "cardButton": false,
+    "cardmodeldata": ``
+}
\ No newline at end of file
diff --git a/test7oct-demot1-f/authsec_angular/frontend/angular-clarity-master/src/app/modules/main/main-routing.module.ts b/test7oct-demot1-f/authsec_angular/frontend/angular-clarity-master/src/app/modules/main/main-routing.module.ts
index 5b6b3b6..135ca33 100644
--- a/test7oct-demot1-f/authsec_angular/frontend/angular-clarity-master/src/app/modules/main/main-routing.module.ts
+++ b/test7oct-demot1-f/authsec_angular/frontend/angular-clarity-master/src/app/modules/main/main-routing.module.ts
@@ -1,3 +1,20 @@
+import { ChildformComponent } from './BuilderComponents/stpkg/Childform/Childform.component';
+import { DistrictComponent } from './BuilderComponents/testdata/District/District.component';
+import { StateComponent } from './BuilderComponents/testdata/State/State.component';
+import { CountryComponent } from './BuilderComponents/testdata/Country/Country.component';
+import { Ad9Component } from './BuilderComponents/angulardatatype/Ad9/Ad9.component';
+import { Ad8Component } from './BuilderComponents/angulardatatype/Ad8/Ad8.component';
+import { Ad7Component } from './BuilderComponents/angulardatatype/Ad7/Ad7.component';
+import { Ad6Component } from './BuilderComponents/angulardatatype/Ad6/Ad6.component';
+import { Adv5Component } from './BuilderComponents/angulardatatype/Adv5/Adv5.component';
+import { Adv4Component } from './BuilderComponents/angulardatatype/Adv4/Adv4.component';
+import { SupportComponent } from './BuilderComponents/angulardatatype/Support/Support.component';
+import { Adv3Component } from './BuilderComponents/angulardatatype/Adv3/Adv3.component';
+import { Dv2Component } from './BuilderComponents/angulardatatype/Dv2/Dv2.component';
+import { Adv1Component } from './BuilderComponents/angulardatatype/Adv1/Adv1.component';
+import { Basicp3Component } from './BuilderComponents/angulardatatype/Basicp3/Basicp3.component';
+import { Basicp2Component } from './BuilderComponents/angulardatatype/Basicp2/Basicp2.component';
+import { Basicp1Component } from './BuilderComponents/angulardatatype/Basicp1/Basicp1.component';
 
 import { SequencegenaratorComponent } from './fnd/sequencegenarator/sequencegenarator.component';
 import { Component, NgModule } from '@angular/core';
@@ -260,6 +277,57 @@ const routes: Routes = [
 
 
       // buildercomponents
+{path:'Childform',component:ChildformComponent},
+
+
+{path:'District',component:DistrictComponent},
+
+
+{path:'State',component:StateComponent},
+
+
+{path:'Country',component:CountryComponent},
+
+
+{path:'Ad9',component:Ad9Component},
+
+
+{path:'Ad8',component:Ad8Component},
+
+
+{path:'Ad7',component:Ad7Component},
+
+
+{path:'Ad6',component:Ad6Component},
+
+
+{path:'Adv5',component:Adv5Component},
+
+
+{path:'Adv4',component:Adv4Component},
+
+
+{path:'Support',component:SupportComponent},
+
+
+{path:'Adv3',component:Adv3Component},
+
+
+{path:'Dv2',component:Dv2Component},
+
+
+{path:'Adv1',component:Adv1Component},
+
+
+{path:'Basicp3',component:Basicp3Component},
+
+
+{path:'Basicp2',component:Basicp2Component},
+
+
+{path:'Basicp1',component:Basicp1Component},
+
+
 
       { path: 'tokenregistery', component: Token_registeryComponent },
 
diff --git a/test7oct-demot1-f/authsec_angular/frontend/angular-clarity-master/src/app/modules/main/main.module.ts b/test7oct-demot1-f/authsec_angular/frontend/angular-clarity-master/src/app/modules/main/main.module.ts
index 0914655..6512450 100644
--- a/test7oct-demot1-f/authsec_angular/frontend/angular-clarity-master/src/app/modules/main/main.module.ts
+++ b/test7oct-demot1-f/authsec_angular/frontend/angular-clarity-master/src/app/modules/main/main.module.ts
@@ -1,3 +1,20 @@
+import { ChildformComponent } from './BuilderComponents/stpkg/Childform/Childform.component';
+import { DistrictComponent } from './BuilderComponents/testdata/District/District.component';
+import { StateComponent } from './BuilderComponents/testdata/State/State.component';
+import { CountryComponent } from './BuilderComponents/testdata/Country/Country.component';
+import { Ad9Component } from './BuilderComponents/angulardatatype/Ad9/Ad9.component';
+import { Ad8Component } from './BuilderComponents/angulardatatype/Ad8/Ad8.component';
+import { Ad7Component } from './BuilderComponents/angulardatatype/Ad7/Ad7.component';
+import { Ad6Component } from './BuilderComponents/angulardatatype/Ad6/Ad6.component';
+import { Adv5Component } from './BuilderComponents/angulardatatype/Adv5/Adv5.component';
+import { Adv4Component } from './BuilderComponents/angulardatatype/Adv4/Adv4.component';
+import { SupportComponent } from './BuilderComponents/angulardatatype/Support/Support.component';
+import { Adv3Component } from './BuilderComponents/angulardatatype/Adv3/Adv3.component';
+import { Dv2Component } from './BuilderComponents/angulardatatype/Dv2/Dv2.component';
+import { Adv1Component } from './BuilderComponents/angulardatatype/Adv1/Adv1.component';
+import { Basicp3Component } from './BuilderComponents/angulardatatype/Basicp3/Basicp3.component';
+import { Basicp2Component } from './BuilderComponents/angulardatatype/Basicp2/Basicp2.component';
+import { Basicp1Component } from './BuilderComponents/angulardatatype/Basicp1/Basicp1.component';
 
 
 import { CommonModule } from '@angular/common';
@@ -133,6 +150,57 @@ import { MyworkspaceComponent } from './admin/myworkspace/myworkspace.component'
 
 
     // buildercomponents
+ChildformComponent,
+
+
+DistrictComponent,
+
+
+StateComponent,
+
+
+CountryComponent,
+
+
+Ad9Component,
+
+
+Ad8Component,
+
+
+Ad7Component,
+
+
+Ad6Component,
+
+
+Adv5Component,
+
+
+Adv4Component,
+
+
+SupportComponent,
+
+
+Adv3Component,
+
+
+Dv2Component,
+
+
+Adv1Component,
+
+
+Basicp3Component,
+
+
+Basicp2Component,
+
+
+Basicp1Component,
+
+
 
 
 
diff --git a/test7oct-demot1-f/authsec_angular/frontend/angular-clarity-master/src/assets/i18n/en.json b/test7oct-demot1-f/authsec_angular/frontend/angular-clarity-master/src/assets/i18n/en.json
index 0b299c4..57d2b9b 100644
--- a/test7oct-demot1-f/authsec_angular/frontend/angular-clarity-master/src/assets/i18n/en.json
+++ b/test7oct-demot1-f/authsec_angular/frontend/angular-clarity-master/src/assets/i18n/en.json
@@ -228,113 +228,82 @@
   "SUB_MENU": "Sub Menu",
   "video_Field2": "video_Field2",
   "video_Field": "video_Field",
-  "numadd": "numadd",
   "Support": "Support",
   "about": "about",
   "Button_Field2": "Button_Field2",
-  "autotest": "autotest",
   "Childform": "Childform",
-  "Test2": "Test2",
-  "Chtes2": "Chtes2",
   "documentsequenc": "documentsequenc",
   "state_name": "state_name",
   "Currency": "Currency",
-  "token_name": "token_name",
   "state": "state",
   "Adv5": "Adv5",
   "Adv4": "Adv4",
   "Adv3": "Adv3",
   "addition": "addition",
-  "automulti": "automulti",
-  "calculated_Field": "calculated_Field",
-  "counrymulti": "counrymulti",
   "Paragraph_Field2": "Paragraph_Field2",
-  "Number_Field": "Number_Field",
   "Basicp1": "Basicp1",
-  "Sum": "Sum",
   "ButtonUpdate": "ButtonUpdate",
-  "datagrid_Field": "datagrid_Field",
   "Email_Field": "Email_Field",
+  "datagrid_Field": "datagrid_Field",
   "audio_Field2": "audio_Field2",
   "QRCode_Field2": "QRCode_Field2",
-  "dylist": "dylist",
   "Basicp3": "Basicp3",
   "Basicp2": "Basicp2",
   "stmlit": "stmlit",
-  "1ega": "1ega",
-  "Country": "Country",
   "BarCode_Field2": "BarCode_Field2",
+  "Country": "Country",
   "Imageupload_Field": "Imageupload_Field",
-  "dy2": "dy2",
   "name2": "name2",
   "idfemale": "idfemale",
-  "dy1": "dy1",
+  "dy2": "dy2",
   "Url_Field2": "Url_Field2",
   "t1": "t1",
-  "age2": "age2",
+  "dy1": "dy1",
   "t2": "t2",
-  "age1": "age1",
-  "Sum2": "Sum2",
+  "age2": "age2",
   "t4": "t4",
   "Decimal_Field2": "Decimal_Field2",
   "Description": "Description",
-  "gender": "gender",
-  "select_Field": "select_Field",
   "QRCode_Field": "QRCode_Field",
   "Datetime_Field": "Datetime_Field",
-  "sum": "sum",
   "test1": "test1",
-  "Test11": "Test11",
-  "Checkout_Field": "Checkout_Field",
   "Ad6": "Ad6",
-  "picupload": "picupload",
   "Textarea_Field": "Textarea_Field",
   "Textarea": "Textarea",
   "Ad8": "Ad8",
   "Ad7": "Ad7",
   "Ad9": "Ad9",
-  "num1": "num1",
   "multiplication": "multiplication",
   "Date_Field": "Date_Field",
-  "num3": "num3",
-  "num2": "num2",
-  "Token_registery": "Token_registery",
-  "dymulti": "dymulti",
   "Toggle_Switch": "Toggle_Switch",
   "last_name": "last_name",
   "atoc": "atoc",
   "Percentage_Field2": "Percentage_Field2",
-  "Test22": "Test22",
   "Date_Field2": "Date_Field2",
-  "default_Prce": "default_Prce",
-  "token": "token",
   "test2": "test2",
   "test3": "test3",
   "dymlti1": "dymlti1",
   "Fileupload_Field2": "Fileupload_Field2",
   "audio_Field": "audio_Field",
-  "mobile_number": "mobile_number",
   "Decimal_Field": "Decimal_Field",
   "country": "country",
   "ismale": "ismale",
   "Currency2": "Currency2",
   "Name": "Name",
   "atc2": "atc2",
-  "data_grid_Field": "data_grid_Field",
-  "BarCode_Field": "BarCode_Field",
   "Imageupload_Field2": "Imageupload_Field2",
+  "BarCode_Field": "BarCode_Field",
   "recaptcha2": "recaptcha2",
   "Buttonupdate2": "Buttonupdate2",
   "test": "test",
   "atdy1": "atdy1",
   "Phone_Number2": "Phone_Number2",
   "atdy2": "atdy2",
-  "Sttest": "Sttest",
   "Percentage_Field": "Percentage_Field",
   "Textarea2": "Textarea2",
   "Url_Field": "Url_Field",
-  "Active": "Active",
   "dymlt2": "dymlt2",
+  "Active": "Active",
   "Paragraph_Field": "Paragraph_Field",
   "State": "State",
   "district": "district",
@@ -343,7 +312,6 @@
   "Email_Field2": "Email_Field2",
   "Static": "Static",
   "District": "District",
-  "about_yourself": "about_yourself",
   "datagrid_Field2": "datagrid_Field2",
   "Toggle_Switch2": "Toggle_Switch2",
   "Dv2": "Dv2",
@@ -351,8 +319,8 @@
   "description": "description",
   "number1": "number1",
   "Phone_Number": "Phone_Number",
-  "Fileupload_Field": "Fileupload_Field",
   "number2": "number2",
+  "Fileupload_Field": "Fileupload_Field",
   "Value_List_Field": "Value_List_Field",
   "Value_List_Field2": "Value_List_Field2",
   "district_name": "district_name",
@@ -360,15 +328,11 @@
   "recaptcha": "recaptcha",
   "stmmlt2": "stmmlt2",
   "country_name": "country_name",
-  "Dependent_Dropdown_Field": "Dependent_Dropdown_Field",
   "Adv1": "Adv1",
   "OneToManyExtension": "OneToManyExtension",
   "Datetime_Field2": "Datetime_Field2",
-  "country_list": "country_list",
   "Textarea_Field2": "Textarea_Field2",
-  "Defatest": "Defatest",
   "Approved_Field": "Approved_Field",
-  "select_Field2": "select_Field2",
   "Password_Field": "Password_Field",
   "age": "age",
   "Button_Field": "Button_Field"
diff --git a/test7oct-test2-b/authsec_springboot/backend/src/main/java/com/realnet/Builders/Services/BuilderService.java b/test7oct-test2-b/authsec_springboot/backend/src/main/java/com/realnet/Builders/Services/BuilderService.java
index f9801fb..4ec8bc3 100644
--- a/test7oct-test2-b/authsec_springboot/backend/src/main/java/com/realnet/Builders/Services/BuilderService.java
+++ b/test7oct-test2-b/authsec_springboot/backend/src/main/java/com/realnet/Builders/Services/BuilderService.java
@@ -69,6 +69,57 @@ public class BuilderService {
 		executeDump(true);
 
 		// ADD OTHER SERVICE
+addCustomMenu( "Childform","Childform",  "Transcations"); 
+
+
+addCustomMenu( "District","District",  "Transcations"); 
+
+
+addCustomMenu( "State","State",  "Transcations"); 
+
+
+addCustomMenu( "Country","Country",  "Transcations"); 
+
+
+addCustomMenu( "Ad9","Ad9",  "Transcations"); 
+
+
+addCustomMenu( "Ad8","Ad8",  "Transcations"); 
+
+
+addCustomMenu( "Ad7","Ad7",  "Transcations"); 
+
+
+addCustomMenu( "Ad6","Ad6",  "Transcations"); 
+
+
+addCustomMenu( "Adv5","Adv5",  "Transcations"); 
+
+
+addCustomMenu( "Adv4","Adv4",  "Transcations"); 
+
+
+addCustomMenu( "Support","Support",  "Transcations"); 
+
+
+addCustomMenu( "Adv3","Adv3",  "Transcations"); 
+
+
+addCustomMenu( "Dv2","Dv2",  "Transcations"); 
+
+
+addCustomMenu( "Adv1","Adv1",  "Transcations"); 
+
+
+addCustomMenu( "Basicp3","Basicp3",  "Transcations"); 
+
+
+addCustomMenu( "Basicp2","Basicp2",  "Transcations"); 
+
+
+addCustomMenu( "Basicp1","Basicp1",  "Transcations"); 
+
+
 
 		System.out.println("dashboard and menu inserted...");
 
diff --git a/test7oct-test2-b/authsec_springboot/backend/src/main/java/com/realnet/angulardatatype/Controllers/Ad6Controller.java b/test7oct-test2-b/authsec_springboot/backend/src/main/java/com/realnet/angulardatatype/Controllers/Ad6Controller.java
new file mode 100644
index 0000000..efeb618
--- /dev/null
+++ b/test7oct-test2-b/authsec_springboot/backend/src/main/java/com/realnet/angulardatatype/Controllers/Ad6Controller.java
@@ -0,0 +1,115 @@
+package com.realnet.angulardatatype.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.angulardatatype.Entity.Ad6;
+import com.realnet.angulardatatype.Services.Ad6Service ;
+
+
+
+
+
+
+
+
+
+
+@RequestMapping(value = "/Ad6")
+ @CrossOrigin("*") 
+@RestController
+public class Ad6Controller {
+	@Autowired
+	private Ad6Service Service;
+
+@Value("${projectPath}")
+	private String projectPath;
+ 
+
+
+
+
+
+
+
+
+
+
+	@PostMapping("/Ad6")
+		  public Ad6 Savedata(@RequestBody Ad6 data) {
+		Ad6 save = Service.Savedata(data)	;
+
+
+
+
+
+
+
+
+
+		System.out.println("data saved..." + save);
+
+ return save;
+	  }
+@PutMapping("/Ad6/{id}")
+	public  Ad6 update(@RequestBody Ad6 data,@PathVariable Integer id ) {
+		Ad6 update = Service.update(data,id);
+		System.out.println("data update..." + update);
+		return update;
+	}	 
+//	get all with pagination
+	@GetMapping("/Ad6/getall/page")
+	public Page<Ad6> getall(@RequestParam(value = "page", required = false) Integer page,
+			@RequestParam(value = "size", required = false) Integer size) {
+		Pageable paging = PageRequest.of(page, size);
+		Page<Ad6> get = Service.getAllWithPagination(paging);
+
+		return get;
+
+	}	
+	@GetMapping("/Ad6")
+	public List<Ad6> getdetails() {
+		 List<Ad6> get = Service.getdetails();		
+		return get;
+}
+// get all without authentication 
+
+	@GetMapping("/token/Ad6")
+	public List<Ad6> getallwioutsec() {
+		 List<Ad6> get = Service.getdetails();		
+		return get;
+}
+@GetMapping("/Ad6/{id}")
+	public  Ad6  getdetailsbyId(@PathVariable Integer id ) {
+		Ad6  get = Service.getdetailsbyId(id);
+		return get;
+	}
+@DeleteMapping("/Ad6/{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/test7oct-test2-b/authsec_springboot/backend/src/main/java/com/realnet/angulardatatype/Controllers/Ad7Controller.java b/test7oct-test2-b/authsec_springboot/backend/src/main/java/com/realnet/angulardatatype/Controllers/Ad7Controller.java
new file mode 100644
index 0000000..e9045ed
--- /dev/null
+++ b/test7oct-test2-b/authsec_springboot/backend/src/main/java/com/realnet/angulardatatype/Controllers/Ad7Controller.java
@@ -0,0 +1,113 @@
+package com.realnet.angulardatatype.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.angulardatatype.Entity.Ad7;
+import com.realnet.angulardatatype.Services.Ad7Service ;
+
+
+import com.realnet.angulardatatype.Entity.Basicp3;
+
+
+import com.realnet.angulardatatype.Entity.Support;
+
+
+@RequestMapping(value = "/Ad7")
+ @CrossOrigin("*") 
+@RestController
+public class Ad7Controller {
+	@Autowired
+	private Ad7Service Service;
+
+@Value("${projectPath}")
+	private String projectPath;
+ 
+
+
+
+
+
+
+	@PostMapping("/Ad7")
+		  public Ad7 Savedata(@RequestBody Ad7 data) {
+		Ad7 save = Service.Savedata(data)	;
+
+
+
+
+
+		System.out.println("data saved..." + save);
+
+ return save;
+	  }
+@PutMapping("/Ad7/{id}")
+	public  Ad7 update(@RequestBody Ad7 data,@PathVariable Integer id ) {
+		Ad7 update = Service.update(data,id);
+		System.out.println("data update..." + update);
+		return update;
+	}	 
+//	get all with pagination
+	@GetMapping("/Ad7/getall/page")
+	public Page<Ad7> getall(@RequestParam(value = "page", required = false) Integer page,
+			@RequestParam(value = "size", required = false) Integer size) {
+		Pageable paging = PageRequest.of(page, size);
+		Page<Ad7> get = Service.getAllWithPagination(paging);
+
+		return get;
+
+	}	
+	@GetMapping("/Ad7")
+	public List<Ad7> getdetails() {
+		 List<Ad7> get = Service.getdetails();		
+		return get;
+}
+// get all without authentication 
+
+	@GetMapping("/token/Ad7")
+	public List<Ad7> getallwioutsec() {
+		 List<Ad7> get = Service.getdetails();		
+		return get;
+}
+@GetMapping("/Ad7/{id}")
+	public  Ad7  getdetailsbyId(@PathVariable Integer id ) {
+		Ad7  get = Service.getdetailsbyId(id);
+		return get;
+	}
+@DeleteMapping("/Ad7/{id}")
+	public  ResponseEntity<?> delete_by_id(@PathVariable Integer id ) {
+	Service.delete_by_id(id);
+			return new ResponseEntity<>(new EntityResponse("Deleted"), HttpStatus.OK);
+	
+	}
+
+
+
+
+
+	@PostMapping("/Ad7/Basicp3_insert")
+	public Basicp3 insertBasicp3(@RequestBody Basicp3 data) {
+		Basicp3 insertaction = Service.insertBasicp3(data);
+		return insertaction;
+	}
+
+
+
+	@PostMapping("/Ad7/Support_insert")
+	public Support insertSupport(@RequestBody Support data) {
+		Support insertaction = Service.insertSupport(data);
+		return insertaction;
+	}
+
+}
\ No newline at end of file
diff --git a/test7oct-test2-b/authsec_springboot/backend/src/main/java/com/realnet/angulardatatype/Controllers/Ad8Controller.java b/test7oct-test2-b/authsec_springboot/backend/src/main/java/com/realnet/angulardatatype/Controllers/Ad8Controller.java
new file mode 100644
index 0000000..b8a4690
--- /dev/null
+++ b/test7oct-test2-b/authsec_springboot/backend/src/main/java/com/realnet/angulardatatype/Controllers/Ad8Controller.java
@@ -0,0 +1,131 @@
+package com.realnet.angulardatatype.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.angulardatatype.Entity.Ad8;
+import com.realnet.angulardatatype.Services.Ad8Service ;
+
+
+import com.realnet.angulardatatype.Entity.Support;
+
+
+import com.realnet.stpkg.Entity.Childform;
+
+
+
+
+
+
+@RequestMapping(value = "/Ad8")
+ @CrossOrigin("*") 
+@RestController
+public class Ad8Controller {
+	@Autowired
+	private Ad8Service Service;
+
+@Value("${projectPath}")
+	private String projectPath;
+ 
+
+
+
+
+
+
+
+
+
+
+	@PostMapping("/Ad8")
+		  public Ad8 Savedata(@RequestBody Ad8 data) {
+		Ad8 save = Service.Savedata(data)	;
+
+
+
+
+
+
+
+
+
+		System.out.println("data saved..." + save);
+
+ return save;
+	  }
+@PutMapping("/Ad8/{id}")
+	public  Ad8 update(@RequestBody Ad8 data,@PathVariable Integer id ) {
+		Ad8 update = Service.update(data,id);
+		System.out.println("data update..." + update);
+		return update;
+	}	 
+//	get all with pagination
+	@GetMapping("/Ad8/getall/page")
+	public Page<Ad8> getall(@RequestParam(value = "page", required = false) Integer page,
+			@RequestParam(value = "size", required = false) Integer size) {
+		Pageable paging = PageRequest.of(page, size);
+		Page<Ad8> get = Service.getAllWithPagination(paging);
+
+		return get;
+
+	}	
+	@GetMapping("/Ad8")
+	public List<Ad8> getdetails() {
+		 List<Ad8> get = Service.getdetails();		
+		return get;
+}
+// get all without authentication 
+
+	@GetMapping("/token/Ad8")
+	public List<Ad8> getallwioutsec() {
+		 List<Ad8> get = Service.getdetails();		
+		return get;
+}
+@GetMapping("/Ad8/{id}")
+	public  Ad8  getdetailsbyId(@PathVariable Integer id ) {
+		Ad8  get = Service.getdetailsbyId(id);
+		return get;
+	}
+@DeleteMapping("/Ad8/{id}")
+	public  ResponseEntity<?> delete_by_id(@PathVariable Integer id ) {
+	Service.delete_by_id(id);
+			return new ResponseEntity<>(new EntityResponse("Deleted"), HttpStatus.OK);
+	
+	}
+
+
+
+
+
+@PutMapping("/Ad8/Support_update/{id}")
+	public ResponseEntity<?> updateSupport(@PathVariable Integer id, @RequestBody Support data) {
+		ResponseEntity<?> update = Service.updateSupport(id, data);
+		System.out.println(update + " updateed");
+		return update;
+	}
+
+
+
+@PutMapping("/Ad8/Childform_update/{id}")
+	public ResponseEntity<?> updateChildform(@PathVariable Integer id, @RequestBody Childform data) {
+		ResponseEntity<?> update = Service.updateChildform(id, data);
+		System.out.println(update + " updateed");
+		return update;
+	}
+
+
+
+
+
+}
\ No newline at end of file
diff --git a/test7oct-test2-b/authsec_springboot/backend/src/main/java/com/realnet/angulardatatype/Controllers/Ad9Controller.java b/test7oct-test2-b/authsec_springboot/backend/src/main/java/com/realnet/angulardatatype/Controllers/Ad9Controller.java
new file mode 100644
index 0000000..b361ba0
--- /dev/null
+++ b/test7oct-test2-b/authsec_springboot/backend/src/main/java/com/realnet/angulardatatype/Controllers/Ad9Controller.java
@@ -0,0 +1,91 @@
+package com.realnet.angulardatatype.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.angulardatatype.Entity.Ad9;
+import com.realnet.angulardatatype.Services.Ad9Service ;
+
+
+
+
+@RequestMapping(value = "/Ad9")
+ @CrossOrigin("*") 
+@RestController
+public class Ad9Controller {
+	@Autowired
+	private Ad9Service Service;
+
+@Value("${projectPath}")
+	private String projectPath;
+ 
+
+
+
+
+	@PostMapping("/Ad9")
+		  public Ad9 Savedata(@RequestBody Ad9 data) {
+		Ad9 save = Service.Savedata(data)	;
+
+
+
+		System.out.println("data saved..." + save);
+
+ return save;
+	  }
+@PutMapping("/Ad9/{id}")
+	public  Ad9 update(@RequestBody Ad9 data,@PathVariable Integer id ) {
+		Ad9 update = Service.update(data,id);
+		System.out.println("data update..." + update);
+		return update;
+	}	 
+//	get all with pagination
+	@GetMapping("/Ad9/getall/page")
+	public Page<Ad9> getall(@RequestParam(value = "page", required = false) Integer page,
+			@RequestParam(value = "size", required = false) Integer size) {
+		Pageable paging = PageRequest.of(page, size);
+		Page<Ad9> get = Service.getAllWithPagination(paging);
+
+		return get;
+
+	}	
+	@GetMapping("/Ad9")
+	public List<Ad9> getdetails() {
+		 List<Ad9> get = Service.getdetails();		
+		return get;
+}
+// get all without authentication 
+
+	@GetMapping("/token/Ad9")
+	public List<Ad9> getallwioutsec() {
+		 List<Ad9> get = Service.getdetails();		
+		return get;
+}
+@GetMapping("/Ad9/{id}")
+	public  Ad9  getdetailsbyId(@PathVariable Integer id ) {
+		Ad9  get = Service.getdetailsbyId(id);
+		return get;
+	}
+@DeleteMapping("/Ad9/{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/test7oct-test2-b/authsec_springboot/backend/src/main/java/com/realnet/angulardatatype/Controllers/Adv1Controller.java b/test7oct-test2-b/authsec_springboot/backend/src/main/java/com/realnet/angulardatatype/Controllers/Adv1Controller.java
new file mode 100644
index 0000000..bd75017
--- /dev/null
+++ b/test7oct-test2-b/authsec_springboot/backend/src/main/java/com/realnet/angulardatatype/Controllers/Adv1Controller.java
@@ -0,0 +1,171 @@
+package com.realnet.angulardatatype.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.angulardatatype.Entity.Adv1;
+import com.realnet.angulardatatype.Services.Adv1Service ;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+@RequestMapping(value = "/Adv1")
+ @CrossOrigin("*") 
+@RestController
+public class Adv1Controller {
+	@Autowired
+	private Adv1Service Service;
+
+@Value("${projectPath}")
+	private String projectPath;
+ 
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+	@PostMapping("/Adv1")
+		  public Adv1 Savedata(@RequestBody Adv1 data) {
+		Adv1 save = Service.Savedata(data)	;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+		System.out.println("data saved..." + save);
+
+ return save;
+	  }
+@PutMapping("/Adv1/{id}")
+	public  Adv1 update(@RequestBody Adv1 data,@PathVariable Integer id ) {
+		Adv1 update = Service.update(data,id);
+		System.out.println("data update..." + update);
+		return update;
+	}	 
+//	get all with pagination
+	@GetMapping("/Adv1/getall/page")
+	public Page<Adv1> getall(@RequestParam(value = "page", required = false) Integer page,
+			@RequestParam(value = "size", required = false) Integer size) {
+		Pageable paging = PageRequest.of(page, size);
+		Page<Adv1> get = Service.getAllWithPagination(paging);
+
+		return get;
+
+	}	
+	@GetMapping("/Adv1")
+	public List<Adv1> getdetails() {
+		 List<Adv1> get = Service.getdetails();		
+		return get;
+}
+// get all without authentication 
+
+	@GetMapping("/token/Adv1")
+	public List<Adv1> getallwioutsec() {
+		 List<Adv1> get = Service.getdetails();		
+		return get;
+}
+@GetMapping("/Adv1/{id}")
+	public  Adv1  getdetailsbyId(@PathVariable Integer id ) {
+		Adv1  get = Service.getdetailsbyId(id);
+		return get;
+	}
+@DeleteMapping("/Adv1/{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/test7oct-test2-b/authsec_springboot/backend/src/main/java/com/realnet/angulardatatype/Controllers/Adv3Controller.java b/test7oct-test2-b/authsec_springboot/backend/src/main/java/com/realnet/angulardatatype/Controllers/Adv3Controller.java
new file mode 100644
index 0000000..126655b
--- /dev/null
+++ b/test7oct-test2-b/authsec_springboot/backend/src/main/java/com/realnet/angulardatatype/Controllers/Adv3Controller.java
@@ -0,0 +1,163 @@
+package com.realnet.angulardatatype.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.angulardatatype.Entity.Adv3;
+import com.realnet.angulardatatype.Services.Adv3Service ;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+@RequestMapping(value = "/Adv3")
+ @CrossOrigin("*") 
+@RestController
+public class Adv3Controller {
+	@Autowired
+	private Adv3Service Service;
+
+@Value("${projectPath}")
+	private String projectPath;
+ 
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+	@PostMapping("/Adv3")
+		  public Adv3 Savedata(@RequestBody Adv3 data) {
+		Adv3 save = Service.Savedata(data)	;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+		System.out.println("data saved..." + save);
+
+ return save;
+	  }
+@PutMapping("/Adv3/{id}")
+	public  Adv3 update(@RequestBody Adv3 data,@PathVariable Integer id ) {
+		Adv3 update = Service.update(data,id);
+		System.out.println("data update..." + update);
+		return update;
+	}	 
+//	get all with pagination
+	@GetMapping("/Adv3/getall/page")
+	public Page<Adv3> getall(@RequestParam(value = "page", required = false) Integer page,
+			@RequestParam(value = "size", required = false) Integer size) {
+		Pageable paging = PageRequest.of(page, size);
+		Page<Adv3> get = Service.getAllWithPagination(paging);
+
+		return get;
+
+	}	
+	@GetMapping("/Adv3")
+	public List<Adv3> getdetails() {
+		 List<Adv3> get = Service.getdetails();		
+		return get;
+}
+// get all without authentication 
+
+	@GetMapping("/token/Adv3")
+	public List<Adv3> getallwioutsec() {
+		 List<Adv3> get = Service.getdetails();		
+		return get;
+}
+@GetMapping("/Adv3/{id}")
+	public  Adv3  getdetailsbyId(@PathVariable Integer id ) {
+		Adv3  get = Service.getdetailsbyId(id);
+		return get;
+	}
+@DeleteMapping("/Adv3/{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/test7oct-test2-b/authsec_springboot/backend/src/main/java/com/realnet/angulardatatype/Controllers/Adv4Controller.java b/test7oct-test2-b/authsec_springboot/backend/src/main/java/com/realnet/angulardatatype/Controllers/Adv4Controller.java
new file mode 100644
index 0000000..9548212
--- /dev/null
+++ b/test7oct-test2-b/authsec_springboot/backend/src/main/java/com/realnet/angulardatatype/Controllers/Adv4Controller.java
@@ -0,0 +1,123 @@
+package com.realnet.angulardatatype.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.angulardatatype.Entity.Adv4;
+import com.realnet.angulardatatype.Services.Adv4Service ;
+
+
+
+
+
+
+
+
+
+
+
+
+@RequestMapping(value = "/Adv4")
+ @CrossOrigin("*") 
+@RestController
+public class Adv4Controller {
+	@Autowired
+	private Adv4Service Service;
+
+@Value("${projectPath}")
+	private String projectPath;
+ 
+
+
+
+
+
+
+
+
+
+
+
+
+	@PostMapping("/Adv4")
+		  public Adv4 Savedata(@RequestBody Adv4 data) {
+		Adv4 save = Service.Savedata(data)	;
+
+
+
+
+
+
+
+
+
+
+
+		System.out.println("data saved..." + save);
+
+ return save;
+	  }
+@PutMapping("/Adv4/{id}")
+	public  Adv4 update(@RequestBody Adv4 data,@PathVariable Integer id ) {
+		Adv4 update = Service.update(data,id);
+		System.out.println("data update..." + update);
+		return update;
+	}	 
+//	get all with pagination
+	@GetMapping("/Adv4/getall/page")
+	public Page<Adv4> getall(@RequestParam(value = "page", required = false) Integer page,
+			@RequestParam(value = "size", required = false) Integer size) {
+		Pageable paging = PageRequest.of(page, size);
+		Page<Adv4> get = Service.getAllWithPagination(paging);
+
+		return get;
+
+	}	
+	@GetMapping("/Adv4")
+	public List<Adv4> getdetails() {
+		 List<Adv4> get = Service.getdetails();		
+		return get;
+}
+// get all without authentication 
+
+	@GetMapping("/token/Adv4")
+	public List<Adv4> getallwioutsec() {
+		 List<Adv4> get = Service.getdetails();		
+		return get;
+}
+@GetMapping("/Adv4/{id}")
+	public  Adv4  getdetailsbyId(@PathVariable Integer id ) {
+		Adv4  get = Service.getdetailsbyId(id);
+		return get;
+	}
+@DeleteMapping("/Adv4/{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/test7oct-test2-b/authsec_springboot/backend/src/main/java/com/realnet/angulardatatype/Controllers/Adv5Controller.java b/test7oct-test2-b/authsec_springboot/backend/src/main/java/com/realnet/angulardatatype/Controllers/Adv5Controller.java
new file mode 100644
index 0000000..44efce2
--- /dev/null
+++ b/test7oct-test2-b/authsec_springboot/backend/src/main/java/com/realnet/angulardatatype/Controllers/Adv5Controller.java
@@ -0,0 +1,147 @@
+package com.realnet.angulardatatype.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.angulardatatype.Entity.Adv5;
+import com.realnet.angulardatatype.Services.Adv5Service ;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+@RequestMapping(value = "/Adv5")
+ @CrossOrigin("*") 
+@RestController
+public class Adv5Controller {
+	@Autowired
+	private Adv5Service Service;
+
+@Value("${projectPath}")
+	private String projectPath;
+ 
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+	@PostMapping("/Adv5")
+		  public Adv5 Savedata(@RequestBody Adv5 data) {
+		Adv5 save = Service.Savedata(data)	;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+		System.out.println("data saved..." + save);
+
+ return save;
+	  }
+@PutMapping("/Adv5/{id}")
+	public  Adv5 update(@RequestBody Adv5 data,@PathVariable Integer id ) {
+		Adv5 update = Service.update(data,id);
+		System.out.println("data update..." + update);
+		return update;
+	}	 
+//	get all with pagination
+	@GetMapping("/Adv5/getall/page")
+	public Page<Adv5> getall(@RequestParam(value = "page", required = false) Integer page,
+			@RequestParam(value = "size", required = false) Integer size) {
+		Pageable paging = PageRequest.of(page, size);
+		Page<Adv5> get = Service.getAllWithPagination(paging);
+
+		return get;
+
+	}	
+	@GetMapping("/Adv5")
+	public List<Adv5> getdetails() {
+		 List<Adv5> get = Service.getdetails();		
+		return get;
+}
+// get all without authentication 
+
+	@GetMapping("/token/Adv5")
+	public List<Adv5> getallwioutsec() {
+		 List<Adv5> get = Service.getdetails();		
+		return get;
+}
+@GetMapping("/Adv5/{id}")
+	public  Adv5  getdetailsbyId(@PathVariable Integer id ) {
+		Adv5  get = Service.getdetailsbyId(id);
+		return get;
+	}
+@DeleteMapping("/Adv5/{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/test7oct-test2-b/authsec_springboot/backend/src/main/java/com/realnet/angulardatatype/Controllers/Basicp1Controller.java b/test7oct-test2-b/authsec_springboot/backend/src/main/java/com/realnet/angulardatatype/Controllers/Basicp1Controller.java
new file mode 100644
index 0000000..2be35e3
--- /dev/null
+++ b/test7oct-test2-b/authsec_springboot/backend/src/main/java/com/realnet/angulardatatype/Controllers/Basicp1Controller.java
@@ -0,0 +1,171 @@
+package com.realnet.angulardatatype.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.angulardatatype.Entity.Basicp1;
+import com.realnet.angulardatatype.Services.Basicp1Service ;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+@RequestMapping(value = "/Basicp1")
+ @CrossOrigin("*") 
+@RestController
+public class Basicp1Controller {
+	@Autowired
+	private Basicp1Service Service;
+
+@Value("${projectPath}")
+	private String projectPath;
+ 
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+	@PostMapping("/Basicp1")
+		  public Basicp1 Savedata(@RequestBody Basicp1 data) {
+		Basicp1 save = Service.Savedata(data)	;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+		System.out.println("data saved..." + save);
+
+ return save;
+	  }
+@PutMapping("/Basicp1/{id}")
+	public  Basicp1 update(@RequestBody Basicp1 data,@PathVariable Integer id ) {
+		Basicp1 update = Service.update(data,id);
+		System.out.println("data update..." + update);
+		return update;
+	}	 
+//	get all with pagination
+	@GetMapping("/Basicp1/getall/page")
+	public Page<Basicp1> getall(@RequestParam(value = "page", required = false) Integer page,
+			@RequestParam(value = "size", required = false) Integer size) {
+		Pageable paging = PageRequest.of(page, size);
+		Page<Basicp1> get = Service.getAllWithPagination(paging);
+
+		return get;
+
+	}	
+	@GetMapping("/Basicp1")
+	public List<Basicp1> getdetails() {
+		 List<Basicp1> get = Service.getdetails();		
+		return get;
+}
+// get all without authentication 
+
+	@GetMapping("/token/Basicp1")
+	public List<Basicp1> getallwioutsec() {
+		 List<Basicp1> get = Service.getdetails();		
+		return get;
+}
+@GetMapping("/Basicp1/{id}")
+	public  Basicp1  getdetailsbyId(@PathVariable Integer id ) {
+		Basicp1  get = Service.getdetailsbyId(id);
+		return get;
+	}
+@DeleteMapping("/Basicp1/{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/test7oct-test2-b/authsec_springboot/backend/src/main/java/com/realnet/angulardatatype/Controllers/Basicp2Controller.java b/test7oct-test2-b/authsec_springboot/backend/src/main/java/com/realnet/angulardatatype/Controllers/Basicp2Controller.java
new file mode 100644
index 0000000..0ed5536
--- /dev/null
+++ b/test7oct-test2-b/authsec_springboot/backend/src/main/java/com/realnet/angulardatatype/Controllers/Basicp2Controller.java
@@ -0,0 +1,147 @@
+package com.realnet.angulardatatype.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.angulardatatype.Entity.Basicp2;
+import com.realnet.angulardatatype.Services.Basicp2Service ;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+@RequestMapping(value = "/Basicp2")
+ @CrossOrigin("*") 
+@RestController
+public class Basicp2Controller {
+	@Autowired
+	private Basicp2Service Service;
+
+@Value("${projectPath}")
+	private String projectPath;
+ 
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+	@PostMapping("/Basicp2")
+		  public Basicp2 Savedata(@RequestBody Basicp2 data) {
+		Basicp2 save = Service.Savedata(data)	;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+		System.out.println("data saved..." + save);
+
+ return save;
+	  }
+@PutMapping("/Basicp2/{id}")
+	public  Basicp2 update(@RequestBody Basicp2 data,@PathVariable Integer id ) {
+		Basicp2 update = Service.update(data,id);
+		System.out.println("data update..." + update);
+		return update;
+	}	 
+//	get all with pagination
+	@GetMapping("/Basicp2/getall/page")
+	public Page<Basicp2> getall(@RequestParam(value = "page", required = false) Integer page,
+			@RequestParam(value = "size", required = false) Integer size) {
+		Pageable paging = PageRequest.of(page, size);
+		Page<Basicp2> get = Service.getAllWithPagination(paging);
+
+		return get;
+
+	}	
+	@GetMapping("/Basicp2")
+	public List<Basicp2> getdetails() {
+		 List<Basicp2> get = Service.getdetails();		
+		return get;
+}
+// get all without authentication 
+
+	@GetMapping("/token/Basicp2")
+	public List<Basicp2> getallwioutsec() {
+		 List<Basicp2> get = Service.getdetails();		
+		return get;
+}
+@GetMapping("/Basicp2/{id}")
+	public  Basicp2  getdetailsbyId(@PathVariable Integer id ) {
+		Basicp2  get = Service.getdetailsbyId(id);
+		return get;
+	}
+@DeleteMapping("/Basicp2/{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/test7oct-test2-b/authsec_springboot/backend/src/main/java/com/realnet/angulardatatype/Controllers/Basicp3Controller.java b/test7oct-test2-b/authsec_springboot/backend/src/main/java/com/realnet/angulardatatype/Controllers/Basicp3Controller.java
new file mode 100644
index 0000000..7e1b203
--- /dev/null
+++ b/test7oct-test2-b/authsec_springboot/backend/src/main/java/com/realnet/angulardatatype/Controllers/Basicp3Controller.java
@@ -0,0 +1,163 @@
+package com.realnet.angulardatatype.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.angulardatatype.Entity.Basicp3;
+import com.realnet.angulardatatype.Services.Basicp3Service ;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+@RequestMapping(value = "/Basicp3")
+ @CrossOrigin("*") 
+@RestController
+public class Basicp3Controller {
+	@Autowired
+	private Basicp3Service Service;
+
+@Value("${projectPath}")
+	private String projectPath;
+ 
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+	@PostMapping("/Basicp3")
+		  public Basicp3 Savedata(@RequestBody Basicp3 data) {
+		Basicp3 save = Service.Savedata(data)	;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+		System.out.println("data saved..." + save);
+
+ return save;
+	  }
+@PutMapping("/Basicp3/{id}")
+	public  Basicp3 update(@RequestBody Basicp3 data,@PathVariable Integer id ) {
+		Basicp3 update = Service.update(data,id);
+		System.out.println("data update..." + update);
+		return update;
+	}	 
+//	get all with pagination
+	@GetMapping("/Basicp3/getall/page")
+	public Page<Basicp3> getall(@RequestParam(value = "page", required = false) Integer page,
+			@RequestParam(value = "size", required = false) Integer size) {
+		Pageable paging = PageRequest.of(page, size);
+		Page<Basicp3> get = Service.getAllWithPagination(paging);
+
+		return get;
+
+	}	
+	@GetMapping("/Basicp3")
+	public List<Basicp3> getdetails() {
+		 List<Basicp3> get = Service.getdetails();		
+		return get;
+}
+// get all without authentication 
+
+	@GetMapping("/token/Basicp3")
+	public List<Basicp3> getallwioutsec() {
+		 List<Basicp3> get = Service.getdetails();		
+		return get;
+}
+@GetMapping("/Basicp3/{id}")
+	public  Basicp3  getdetailsbyId(@PathVariable Integer id ) {
+		Basicp3  get = Service.getdetailsbyId(id);
+		return get;
+	}
+@DeleteMapping("/Basicp3/{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/test7oct-test2-b/authsec_springboot/backend/src/main/java/com/realnet/angulardatatype/Controllers/Basicp3InsertController2.java b/test7oct-test2-b/authsec_springboot/backend/src/main/java/com/realnet/angulardatatype/Controllers/Basicp3InsertController2.java
new file mode 100644
index 0000000..9963a59
--- /dev/null
+++ b/test7oct-test2-b/authsec_springboot/backend/src/main/java/com/realnet/angulardatatype/Controllers/Basicp3InsertController2.java
@@ -0,0 +1,21 @@
+package com.realnet.angulardatatype.Controllers;
+import java.util.List;
+import org.springframework.beans.factory.annotation.Autowired;
+ import org.springframework.web.bind.annotation.*;
+import org.springframework.http.*;
+import com.realnet.angulardatatype.Entity.Basicp3;
+import com.realnet.angulardatatype.Services.Basicp3InsertService2;
+@RequestMapping(value = "/Basicp3")
+@RestController
+public class Basicp3InsertController2{
+	
+	@Autowired
+	private Basicp3InsertService2 Service;
+
+@PostMapping("/Basicp3_insert") 
+	public  ResponseEntity<?> insert(@RequestBody Basicp3 basicp3) {
+		Basicp3 insertaction = Service.insertaction(basicp3);
+		return new ResponseEntity<>(insertaction, HttpStatus.OK);
+	}
+
+}
\ No newline at end of file
diff --git a/test7oct-test2-b/authsec_springboot/backend/src/main/java/com/realnet/angulardatatype/Controllers/ChildformUpdateController3.java b/test7oct-test2-b/authsec_springboot/backend/src/main/java/com/realnet/angulardatatype/Controllers/ChildformUpdateController3.java
new file mode 100644
index 0000000..b791086
--- /dev/null
+++ b/test7oct-test2-b/authsec_springboot/backend/src/main/java/com/realnet/angulardatatype/Controllers/ChildformUpdateController3.java
@@ -0,0 +1,23 @@
+package com.realnet.angulardatatype.Controllers;
+
+ import java.util.List;
+import org.springframework.http.ResponseEntity;
+import org.springframework.beans.factory.annotation.Autowired;
+ import org.springframework.web.bind.annotation.*;
+import com.realnet.stpkg.Entity.Childform;
+import com.realnet.angulardatatype.Services.ChildformUpdateService3 ;
+@RequestMapping(value = "/Childform")
+@RestController
+public class ChildformUpdateController3{
+	
+	@Autowired
+	private ChildformUpdateService3 Service;
+
+@PutMapping("/Childform_update/{id}") 
+	public  ResponseEntity<?> update(@PathVariable Integer id,@RequestBody Childform  childform) {
+		ResponseEntity<?> update = Service.updateaction(id,childform );
+		System.out.println(update+" updateed");
+		return update;
+	}
+
+}
\ No newline at end of file
diff --git a/test7oct-test2-b/authsec_springboot/backend/src/main/java/com/realnet/angulardatatype/Controllers/District_ListFilter1Controller.java b/test7oct-test2-b/authsec_springboot/backend/src/main/java/com/realnet/angulardatatype/Controllers/District_ListFilter1Controller.java
new file mode 100644
index 0000000..48015b1
--- /dev/null
+++ b/test7oct-test2-b/authsec_springboot/backend/src/main/java/com/realnet/angulardatatype/Controllers/District_ListFilter1Controller.java
@@ -0,0 +1,24 @@
+package com.realnet.angulardatatype.Controllers;
+import java.util.List;
+import org.springframework.beans.factory.annotation.Autowired;
+ import org.springframework.web.bind.annotation.*;
+import com.realnet.angulardatatype.Entity.District_ListFilter1;
+import com.realnet.angulardatatype.Services.District_ListFilter1Service ;
+@RequestMapping(value = "/District_ListFilter1")
+@RestController
+public class District_ListFilter1Controller {
+	
+	@Autowired
+	private District_ListFilter1Service Service;
+
+		@GetMapping("/District_ListFilter1")
+	public List<District_ListFilter1> getlist() {
+		 List<District_ListFilter1> get = Service.getlistbuilder();		
+		return get;
+}
+		@GetMapping("/District_ListFilter11/{item}")
+	public List<District_ListFilter1> getlistwithparam(  @PathVariable String item) {
+		 List<District_ListFilter1> get = Service.getlistbuilderparam(  item);		
+		return get;
+}
+}
\ No newline at end of file
diff --git a/test7oct-test2-b/authsec_springboot/backend/src/main/java/com/realnet/angulardatatype/Controllers/Dv2Controller.java b/test7oct-test2-b/authsec_springboot/backend/src/main/java/com/realnet/angulardatatype/Controllers/Dv2Controller.java
new file mode 100644
index 0000000..9f3d963
--- /dev/null
+++ b/test7oct-test2-b/authsec_springboot/backend/src/main/java/com/realnet/angulardatatype/Controllers/Dv2Controller.java
@@ -0,0 +1,147 @@
+package com.realnet.angulardatatype.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.angulardatatype.Entity.Dv2;
+import com.realnet.angulardatatype.Services.Dv2Service ;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+@RequestMapping(value = "/Dv2")
+ @CrossOrigin("*") 
+@RestController
+public class Dv2Controller {
+	@Autowired
+	private Dv2Service Service;
+
+@Value("${projectPath}")
+	private String projectPath;
+ 
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+	@PostMapping("/Dv2")
+		  public Dv2 Savedata(@RequestBody Dv2 data) {
+		Dv2 save = Service.Savedata(data)	;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+		System.out.println("data saved..." + save);
+
+ return save;
+	  }
+@PutMapping("/Dv2/{id}")
+	public  Dv2 update(@RequestBody Dv2 data,@PathVariable Integer id ) {
+		Dv2 update = Service.update(data,id);
+		System.out.println("data update..." + update);
+		return update;
+	}	 
+//	get all with pagination
+	@GetMapping("/Dv2/getall/page")
+	public Page<Dv2> getall(@RequestParam(value = "page", required = false) Integer page,
+			@RequestParam(value = "size", required = false) Integer size) {
+		Pageable paging = PageRequest.of(page, size);
+		Page<Dv2> get = Service.getAllWithPagination(paging);
+
+		return get;
+
+	}	
+	@GetMapping("/Dv2")
+	public List<Dv2> getdetails() {
+		 List<Dv2> get = Service.getdetails();		
+		return get;
+}
+// get all without authentication 
+
+	@GetMapping("/token/Dv2")
+	public List<Dv2> getallwioutsec() {
+		 List<Dv2> get = Service.getdetails();		
+		return get;
+}
+@GetMapping("/Dv2/{id}")
+	public  Dv2  getdetailsbyId(@PathVariable Integer id ) {
+		Dv2  get = Service.getdetailsbyId(id);
+		return get;
+	}
+@DeleteMapping("/Dv2/{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/test7oct-test2-b/authsec_springboot/backend/src/main/java/com/realnet/angulardatatype/Controllers/State_ListFilter1Controller.java b/test7oct-test2-b/authsec_springboot/backend/src/main/java/com/realnet/angulardatatype/Controllers/State_ListFilter1Controller.java
new file mode 100644
index 0000000..f6483bb
--- /dev/null
+++ b/test7oct-test2-b/authsec_springboot/backend/src/main/java/com/realnet/angulardatatype/Controllers/State_ListFilter1Controller.java
@@ -0,0 +1,24 @@
+package com.realnet.angulardatatype.Controllers;
+import java.util.List;
+import org.springframework.beans.factory.annotation.Autowired;
+ import org.springframework.web.bind.annotation.*;
+import com.realnet.angulardatatype.Entity.State_ListFilter1;
+import com.realnet.angulardatatype.Services.State_ListFilter1Service ;
+@RequestMapping(value = "/State_ListFilter1")
+@RestController
+public class State_ListFilter1Controller {
+	
+	@Autowired
+	private State_ListFilter1Service Service;
+
+		@GetMapping("/State_ListFilter1")
+	public List<State_ListFilter1> getlist() {
+		 List<State_ListFilter1> get = Service.getlistbuilder();		
+		return get;
+}
+		@GetMapping("/State_ListFilter11/{item}")
+	public List<State_ListFilter1> getlistwithparam(  @PathVariable String item) {
+		 List<State_ListFilter1> get = Service.getlistbuilderparam(  item);		
+		return get;
+}
+}
\ No newline at end of file
diff --git a/test7oct-test2-b/authsec_springboot/backend/src/main/java/com/realnet/angulardatatype/Controllers/SupportController.java b/test7oct-test2-b/authsec_springboot/backend/src/main/java/com/realnet/angulardatatype/Controllers/SupportController.java
new file mode 100644
index 0000000..9469a8c
--- /dev/null
+++ b/test7oct-test2-b/authsec_springboot/backend/src/main/java/com/realnet/angulardatatype/Controllers/SupportController.java
@@ -0,0 +1,91 @@
+package com.realnet.angulardatatype.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.angulardatatype.Entity.Support;
+import com.realnet.angulardatatype.Services.SupportService ;
+
+
+
+
+@RequestMapping(value = "/Support")
+ @CrossOrigin("*") 
+@RestController
+public class SupportController {
+	@Autowired
+	private SupportService Service;
+
+@Value("${projectPath}")
+	private String projectPath;
+ 
+
+
+
+
+	@PostMapping("/Support")
+		  public Support Savedata(@RequestBody Support data) {
+		Support save = Service.Savedata(data)	;
+
+
+
+		System.out.println("data saved..." + save);
+
+ return save;
+	  }
+@PutMapping("/Support/{id}")
+	public  Support update(@RequestBody Support data,@PathVariable Integer id ) {
+		Support update = Service.update(data,id);
+		System.out.println("data update..." + update);
+		return update;
+	}	 
+//	get all with pagination
+	@GetMapping("/Support/getall/page")
+	public Page<Support> getall(@RequestParam(value = "page", required = false) Integer page,
+			@RequestParam(value = "size", required = false) Integer size) {
+		Pageable paging = PageRequest.of(page, size);
+		Page<Support> get = Service.getAllWithPagination(paging);
+
+		return get;
+
+	}	
+	@GetMapping("/Support")
+	public List<Support> getdetails() {
+		 List<Support> get = Service.getdetails();		
+		return get;
+}
+// get all without authentication 
+
+	@GetMapping("/token/Support")
+	public List<Support> getallwioutsec() {
+		 List<Support> get = Service.getdetails();		
+		return get;
+}
+@GetMapping("/Support/{id}")
+	public  Support  getdetailsbyId(@PathVariable Integer id ) {
+		Support  get = Service.getdetailsbyId(id);
+		return get;
+	}
+@DeleteMapping("/Support/{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/test7oct-test2-b/authsec_springboot/backend/src/main/java/com/realnet/angulardatatype/Controllers/SupportInsertController3.java b/test7oct-test2-b/authsec_springboot/backend/src/main/java/com/realnet/angulardatatype/Controllers/SupportInsertController3.java
new file mode 100644
index 0000000..19c926d
--- /dev/null
+++ b/test7oct-test2-b/authsec_springboot/backend/src/main/java/com/realnet/angulardatatype/Controllers/SupportInsertController3.java
@@ -0,0 +1,21 @@
+package com.realnet.angulardatatype.Controllers;
+import java.util.List;
+import org.springframework.beans.factory.annotation.Autowired;
+ import org.springframework.web.bind.annotation.*;
+import org.springframework.http.*;
+import com.realnet.angulardatatype.Entity.Support;
+import com.realnet.angulardatatype.Services.SupportInsertService3;
+@RequestMapping(value = "/Support")
+@RestController
+public class SupportInsertController3{
+	
+	@Autowired
+	private SupportInsertService3 Service;
+
+@PostMapping("/Support_insert") 
+	public  ResponseEntity<?> insert(@RequestBody Support support) {
+		Support insertaction = Service.insertaction(support);
+		return new ResponseEntity<>(insertaction, HttpStatus.OK);
+	}
+
+}
\ No newline at end of file
diff --git a/test7oct-test2-b/authsec_springboot/backend/src/main/java/com/realnet/angulardatatype/Controllers/SupportUpdateController2.java b/test7oct-test2-b/authsec_springboot/backend/src/main/java/com/realnet/angulardatatype/Controllers/SupportUpdateController2.java
new file mode 100644
index 0000000..6948143
--- /dev/null
+++ b/test7oct-test2-b/authsec_springboot/backend/src/main/java/com/realnet/angulardatatype/Controllers/SupportUpdateController2.java
@@ -0,0 +1,23 @@
+package com.realnet.angulardatatype.Controllers;
+
+ import java.util.List;
+import org.springframework.http.ResponseEntity;
+import org.springframework.beans.factory.annotation.Autowired;
+ import org.springframework.web.bind.annotation.*;
+import com.realnet.angulardatatype.Entity.Support;
+import com.realnet.angulardatatype.Services.SupportUpdateService2 ;
+@RequestMapping(value = "/Support")
+@RestController
+public class SupportUpdateController2{
+	
+	@Autowired
+	private SupportUpdateService2 Service;
+
+@PutMapping("/Support_update/{id}") 
+	public  ResponseEntity<?> update(@PathVariable Integer id,@RequestBody Support  support) {
+		ResponseEntity<?> update = Service.updateaction(id,support );
+		System.out.println(update+" updateed");
+		return update;
+	}
+
+}
\ No newline at end of file
diff --git a/test7oct-test2-b/authsec_springboot/backend/src/main/java/com/realnet/angulardatatype/Controllers/tokenFree_Ad6Controller.java b/test7oct-test2-b/authsec_springboot/backend/src/main/java/com/realnet/angulardatatype/Controllers/tokenFree_Ad6Controller.java
new file mode 100644
index 0000000..cb2bf8a
--- /dev/null
+++ b/test7oct-test2-b/authsec_springboot/backend/src/main/java/com/realnet/angulardatatype/Controllers/tokenFree_Ad6Controller.java
@@ -0,0 +1,115 @@
+package com.realnet.angulardatatype.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.angulardatatype.Entity.Ad6;
+import com.realnet.angulardatatype.Services.Ad6Service ;
+
+
+
+
+
+
+
+
+
+
+@RequestMapping(value = "/token/Ad6")
+ @CrossOrigin("*") 
+@RestController
+public class tokenFree_Ad6Controller {
+	@Autowired
+	private Ad6Service Service;
+
+@Value("${projectPath}")
+	private String projectPath;
+ 
+
+
+
+
+
+
+
+
+
+
+	@PostMapping("/Ad6")
+		  public Ad6 Savedata(@RequestBody Ad6 data) {
+		Ad6 save = Service.Savedata(data)	;
+
+
+
+
+
+
+
+
+
+		System.out.println("data saved..." + save);
+
+ return save;
+	  }
+@PutMapping("/Ad6/{id}")
+	public  Ad6 update(@RequestBody Ad6 data,@PathVariable Integer id ) {
+		Ad6 update = Service.update(data,id);
+		System.out.println("data update..." + update);
+		return update;
+	}	 
+//	get all with pagination
+	@GetMapping("/Ad6/getall/page")
+	public Page<Ad6> getall(@RequestParam(value = "page", required = false) Integer page,
+			@RequestParam(value = "size", required = false) Integer size) {
+		Pageable paging = PageRequest.of(page, size);
+		Page<Ad6> get = Service.getAllWithPagination(paging);
+
+		return get;
+
+	}	
+	@GetMapping("/Ad6")
+	public List<Ad6> getdetails() {
+		 List<Ad6> get = Service.getdetails();		
+		return get;
+}
+// get all without authentication 
+
+	@GetMapping("/token/Ad6")
+	public List<Ad6> getallwioutsec() {
+		 List<Ad6> get = Service.getdetails();		
+		return get;
+}
+@GetMapping("/Ad6/{id}")
+	public  Ad6  getdetailsbyId(@PathVariable Integer id ) {
+		Ad6  get = Service.getdetailsbyId(id);
+		return get;
+	}
+@DeleteMapping("/Ad6/{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/test7oct-test2-b/authsec_springboot/backend/src/main/java/com/realnet/angulardatatype/Controllers/tokenFree_Ad7Controller.java b/test7oct-test2-b/authsec_springboot/backend/src/main/java/com/realnet/angulardatatype/Controllers/tokenFree_Ad7Controller.java
new file mode 100644
index 0000000..f76af28
--- /dev/null
+++ b/test7oct-test2-b/authsec_springboot/backend/src/main/java/com/realnet/angulardatatype/Controllers/tokenFree_Ad7Controller.java
@@ -0,0 +1,113 @@
+package com.realnet.angulardatatype.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.angulardatatype.Entity.Ad7;
+import com.realnet.angulardatatype.Services.Ad7Service ;
+
+
+import com.realnet.angulardatatype.Entity.Basicp3;
+
+
+import com.realnet.angulardatatype.Entity.Support;
+
+
+@RequestMapping(value = "/token/Ad7")
+ @CrossOrigin("*") 
+@RestController
+public class tokenFree_Ad7Controller {
+	@Autowired
+	private Ad7Service Service;
+
+@Value("${projectPath}")
+	private String projectPath;
+ 
+
+
+
+
+
+
+	@PostMapping("/Ad7")
+		  public Ad7 Savedata(@RequestBody Ad7 data) {
+		Ad7 save = Service.Savedata(data)	;
+
+
+
+
+
+		System.out.println("data saved..." + save);
+
+ return save;
+	  }
+@PutMapping("/Ad7/{id}")
+	public  Ad7 update(@RequestBody Ad7 data,@PathVariable Integer id ) {
+		Ad7 update = Service.update(data,id);
+		System.out.println("data update..." + update);
+		return update;
+	}	 
+//	get all with pagination
+	@GetMapping("/Ad7/getall/page")
+	public Page<Ad7> getall(@RequestParam(value = "page", required = false) Integer page,
+			@RequestParam(value = "size", required = false) Integer size) {
+		Pageable paging = PageRequest.of(page, size);
+		Page<Ad7> get = Service.getAllWithPagination(paging);
+
+		return get;
+
+	}	
+	@GetMapping("/Ad7")
+	public List<Ad7> getdetails() {
+		 List<Ad7> get = Service.getdetails();		
+		return get;
+}
+// get all without authentication 
+
+	@GetMapping("/token/Ad7")
+	public List<Ad7> getallwioutsec() {
+		 List<Ad7> get = Service.getdetails();		
+		return get;
+}
+@GetMapping("/Ad7/{id}")
+	public  Ad7  getdetailsbyId(@PathVariable Integer id ) {
+		Ad7  get = Service.getdetailsbyId(id);
+		return get;
+	}
+@DeleteMapping("/Ad7/{id}")
+	public  ResponseEntity<?> delete_by_id(@PathVariable Integer id ) {
+	Service.delete_by_id(id);
+			return new ResponseEntity<>(new EntityResponse("Deleted"), HttpStatus.OK);
+	
+	}
+
+
+
+
+
+	@PostMapping("/Ad7/Basicp3_insert")
+	public Basicp3 insertBasicp3(@RequestBody Basicp3 data) {
+		Basicp3 insertaction = Service.insertBasicp3(data);
+		return insertaction;
+	}
+
+
+
+	@PostMapping("/Ad7/Support_insert")
+	public Support insertSupport(@RequestBody Support data) {
+		Support insertaction = Service.insertSupport(data);
+		return insertaction;
+	}
+
+}
\ No newline at end of file
diff --git a/test7oct-test2-b/authsec_springboot/backend/src/main/java/com/realnet/angulardatatype/Controllers/tokenFree_Ad8Controller.java b/test7oct-test2-b/authsec_springboot/backend/src/main/java/com/realnet/angulardatatype/Controllers/tokenFree_Ad8Controller.java
new file mode 100644
index 0000000..bfa3043
--- /dev/null
+++ b/test7oct-test2-b/authsec_springboot/backend/src/main/java/com/realnet/angulardatatype/Controllers/tokenFree_Ad8Controller.java
@@ -0,0 +1,131 @@
+package com.realnet.angulardatatype.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.angulardatatype.Entity.Ad8;
+import com.realnet.angulardatatype.Services.Ad8Service ;
+
+
+import com.realnet.angulardatatype.Entity.Support;
+
+
+import com.realnet.stpkg.Entity.Childform;
+
+
+
+
+
+
+@RequestMapping(value = "/token/Ad8")
+ @CrossOrigin("*") 
+@RestController
+public class tokenFree_Ad8Controller {
+	@Autowired
+	private Ad8Service Service;
+
+@Value("${projectPath}")
+	private String projectPath;
+ 
+
+
+
+
+
+
+
+
+
+
+	@PostMapping("/Ad8")
+		  public Ad8 Savedata(@RequestBody Ad8 data) {
+		Ad8 save = Service.Savedata(data)	;
+
+
+
+
+
+
+
+
+
+		System.out.println("data saved..." + save);
+
+ return save;
+	  }
+@PutMapping("/Ad8/{id}")
+	public  Ad8 update(@RequestBody Ad8 data,@PathVariable Integer id ) {
+		Ad8 update = Service.update(data,id);
+		System.out.println("data update..." + update);
+		return update;
+	}	 
+//	get all with pagination
+	@GetMapping("/Ad8/getall/page")
+	public Page<Ad8> getall(@RequestParam(value = "page", required = false) Integer page,
+			@RequestParam(value = "size", required = false) Integer size) {
+		Pageable paging = PageRequest.of(page, size);
+		Page<Ad8> get = Service.getAllWithPagination(paging);
+
+		return get;
+
+	}	
+	@GetMapping("/Ad8")
+	public List<Ad8> getdetails() {
+		 List<Ad8> get = Service.getdetails();		
+		return get;
+}
+// get all without authentication 
+
+	@GetMapping("/token/Ad8")
+	public List<Ad8> getallwioutsec() {
+		 List<Ad8> get = Service.getdetails();		
+		return get;
+}
+@GetMapping("/Ad8/{id}")
+	public  Ad8  getdetailsbyId(@PathVariable Integer id ) {
+		Ad8  get = Service.getdetailsbyId(id);
+		return get;
+	}
+@DeleteMapping("/Ad8/{id}")
+	public  ResponseEntity<?> delete_by_id(@PathVariable Integer id ) {
+	Service.delete_by_id(id);
+			return new ResponseEntity<>(new EntityResponse("Deleted"), HttpStatus.OK);
+	
+	}
+
+
+
+
+
+@PutMapping("/Ad8/Support_update/{id}")
+	public ResponseEntity<?> updateSupport(@PathVariable Integer id, @RequestBody Support data) {
+		ResponseEntity<?> update = Service.updateSupport(id, data);
+		System.out.println(update + " updateed");
+		return update;
+	}
+
+
+
+@PutMapping("/Ad8/Childform_update/{id}")
+	public ResponseEntity<?> updateChildform(@PathVariable Integer id, @RequestBody Childform data) {
+		ResponseEntity<?> update = Service.updateChildform(id, data);
+		System.out.println(update + " updateed");
+		return update;
+	}
+
+
+
+
+
+}
\ No newline at end of file
diff --git a/test7oct-test2-b/authsec_springboot/backend/src/main/java/com/realnet/angulardatatype/Controllers/tokenFree_Ad9Controller.java b/test7oct-test2-b/authsec_springboot/backend/src/main/java/com/realnet/angulardatatype/Controllers/tokenFree_Ad9Controller.java
new file mode 100644
index 0000000..e4d563d
--- /dev/null
+++ b/test7oct-test2-b/authsec_springboot/backend/src/main/java/com/realnet/angulardatatype/Controllers/tokenFree_Ad9Controller.java
@@ -0,0 +1,91 @@
+package com.realnet.angulardatatype.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.angulardatatype.Entity.Ad9;
+import com.realnet.angulardatatype.Services.Ad9Service ;
+
+
+
+
+@RequestMapping(value = "/token/Ad9")
+ @CrossOrigin("*") 
+@RestController
+public class tokenFree_Ad9Controller {
+	@Autowired
+	private Ad9Service Service;
+
+@Value("${projectPath}")
+	private String projectPath;
+ 
+
+
+
+
+	@PostMapping("/Ad9")
+		  public Ad9 Savedata(@RequestBody Ad9 data) {
+		Ad9 save = Service.Savedata(data)	;
+
+
+
+		System.out.println("data saved..." + save);
+
+ return save;
+	  }
+@PutMapping("/Ad9/{id}")
+	public  Ad9 update(@RequestBody Ad9 data,@PathVariable Integer id ) {
+		Ad9 update = Service.update(data,id);
+		System.out.println("data update..." + update);
+		return update;
+	}	 
+//	get all with pagination
+	@GetMapping("/Ad9/getall/page")
+	public Page<Ad9> getall(@RequestParam(value = "page", required = false) Integer page,
+			@RequestParam(value = "size", required = false) Integer size) {
+		Pageable paging = PageRequest.of(page, size);
+		Page<Ad9> get = Service.getAllWithPagination(paging);
+
+		return get;
+
+	}	
+	@GetMapping("/Ad9")
+	public List<Ad9> getdetails() {
+		 List<Ad9> get = Service.getdetails();		
+		return get;
+}
+// get all without authentication 
+
+	@GetMapping("/token/Ad9")
+	public List<Ad9> getallwioutsec() {
+		 List<Ad9> get = Service.getdetails();		
+		return get;
+}
+@GetMapping("/Ad9/{id}")
+	public  Ad9  getdetailsbyId(@PathVariable Integer id ) {
+		Ad9  get = Service.getdetailsbyId(id);
+		return get;
+	}
+@DeleteMapping("/Ad9/{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/test7oct-test2-b/authsec_springboot/backend/src/main/java/com/realnet/angulardatatype/Controllers/tokenFree_Adv1Controller.java b/test7oct-test2-b/authsec_springboot/backend/src/main/java/com/realnet/angulardatatype/Controllers/tokenFree_Adv1Controller.java
new file mode 100644
index 0000000..e495341
--- /dev/null
+++ b/test7oct-test2-b/authsec_springboot/backend/src/main/java/com/realnet/angulardatatype/Controllers/tokenFree_Adv1Controller.java
@@ -0,0 +1,171 @@
+package com.realnet.angulardatatype.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.angulardatatype.Entity.Adv1;
+import com.realnet.angulardatatype.Services.Adv1Service ;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+@RequestMapping(value = "/token/Adv1")
+ @CrossOrigin("*") 
+@RestController
+public class tokenFree_Adv1Controller {
+	@Autowired
+	private Adv1Service Service;
+
+@Value("${projectPath}")
+	private String projectPath;
+ 
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+	@PostMapping("/Adv1")
+		  public Adv1 Savedata(@RequestBody Adv1 data) {
+		Adv1 save = Service.Savedata(data)	;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+		System.out.println("data saved..." + save);
+
+ return save;
+	  }
+@PutMapping("/Adv1/{id}")
+	public  Adv1 update(@RequestBody Adv1 data,@PathVariable Integer id ) {
+		Adv1 update = Service.update(data,id);
+		System.out.println("data update..." + update);
+		return update;
+	}	 
+//	get all with pagination
+	@GetMapping("/Adv1/getall/page")
+	public Page<Adv1> getall(@RequestParam(value = "page", required = false) Integer page,
+			@RequestParam(value = "size", required = false) Integer size) {
+		Pageable paging = PageRequest.of(page, size);
+		Page<Adv1> get = Service.getAllWithPagination(paging);
+
+		return get;
+
+	}	
+	@GetMapping("/Adv1")
+	public List<Adv1> getdetails() {
+		 List<Adv1> get = Service.getdetails();		
+		return get;
+}
+// get all without authentication 
+
+	@GetMapping("/token/Adv1")
+	public List<Adv1> getallwioutsec() {
+		 List<Adv1> get = Service.getdetails();		
+		return get;
+}
+@GetMapping("/Adv1/{id}")
+	public  Adv1  getdetailsbyId(@PathVariable Integer id ) {
+		Adv1  get = Service.getdetailsbyId(id);
+		return get;
+	}
+@DeleteMapping("/Adv1/{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/test7oct-test2-b/authsec_springboot/backend/src/main/java/com/realnet/angulardatatype/Controllers/tokenFree_Adv3Controller.java b/test7oct-test2-b/authsec_springboot/backend/src/main/java/com/realnet/angulardatatype/Controllers/tokenFree_Adv3Controller.java
new file mode 100644
index 0000000..aa59320
--- /dev/null
+++ b/test7oct-test2-b/authsec_springboot/backend/src/main/java/com/realnet/angulardatatype/Controllers/tokenFree_Adv3Controller.java
@@ -0,0 +1,163 @@
+package com.realnet.angulardatatype.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.angulardatatype.Entity.Adv3;
+import com.realnet.angulardatatype.Services.Adv3Service ;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+@RequestMapping(value = "/token/Adv3")
+ @CrossOrigin("*") 
+@RestController
+public class tokenFree_Adv3Controller {
+	@Autowired
+	private Adv3Service Service;
+
+@Value("${projectPath}")
+	private String projectPath;
+ 
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+	@PostMapping("/Adv3")
+		  public Adv3 Savedata(@RequestBody Adv3 data) {
+		Adv3 save = Service.Savedata(data)	;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+		System.out.println("data saved..." + save);
+
+ return save;
+	  }
+@PutMapping("/Adv3/{id}")
+	public  Adv3 update(@RequestBody Adv3 data,@PathVariable Integer id ) {
+		Adv3 update = Service.update(data,id);
+		System.out.println("data update..." + update);
+		return update;
+	}	 
+//	get all with pagination
+	@GetMapping("/Adv3/getall/page")
+	public Page<Adv3> getall(@RequestParam(value = "page", required = false) Integer page,
+			@RequestParam(value = "size", required = false) Integer size) {
+		Pageable paging = PageRequest.of(page, size);
+		Page<Adv3> get = Service.getAllWithPagination(paging);
+
+		return get;
+
+	}	
+	@GetMapping("/Adv3")
+	public List<Adv3> getdetails() {
+		 List<Adv3> get = Service.getdetails();		
+		return get;
+}
+// get all without authentication 
+
+	@GetMapping("/token/Adv3")
+	public List<Adv3> getallwioutsec() {
+		 List<Adv3> get = Service.getdetails();		
+		return get;
+}
+@GetMapping("/Adv3/{id}")
+	public  Adv3  getdetailsbyId(@PathVariable Integer id ) {
+		Adv3  get = Service.getdetailsbyId(id);
+		return get;
+	}
+@DeleteMapping("/Adv3/{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/test7oct-test2-b/authsec_springboot/backend/src/main/java/com/realnet/angulardatatype/Controllers/tokenFree_Adv4Controller.java b/test7oct-test2-b/authsec_springboot/backend/src/main/java/com/realnet/angulardatatype/Controllers/tokenFree_Adv4Controller.java
new file mode 100644
index 0000000..5b0fab5
--- /dev/null
+++ b/test7oct-test2-b/authsec_springboot/backend/src/main/java/com/realnet/angulardatatype/Controllers/tokenFree_Adv4Controller.java
@@ -0,0 +1,123 @@
+package com.realnet.angulardatatype.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.angulardatatype.Entity.Adv4;
+import com.realnet.angulardatatype.Services.Adv4Service ;
+
+
+
+
+
+
+
+
+
+
+
+
+@RequestMapping(value = "/token/Adv4")
+ @CrossOrigin("*") 
+@RestController
+public class tokenFree_Adv4Controller {
+	@Autowired
+	private Adv4Service Service;
+
+@Value("${projectPath}")
+	private String projectPath;
+ 
+
+
+
+
+
+
+
+
+
+
+
+
+	@PostMapping("/Adv4")
+		  public Adv4 Savedata(@RequestBody Adv4 data) {
+		Adv4 save = Service.Savedata(data)	;
+
+
+
+
+
+
+
+
+
+
+
+		System.out.println("data saved..." + save);
+
+ return save;
+	  }
+@PutMapping("/Adv4/{id}")
+	public  Adv4 update(@RequestBody Adv4 data,@PathVariable Integer id ) {
+		Adv4 update = Service.update(data,id);
+		System.out.println("data update..." + update);
+		return update;
+	}	 
+//	get all with pagination
+	@GetMapping("/Adv4/getall/page")
+	public Page<Adv4> getall(@RequestParam(value = "page", required = false) Integer page,
+			@RequestParam(value = "size", required = false) Integer size) {
+		Pageable paging = PageRequest.of(page, size);
+		Page<Adv4> get = Service.getAllWithPagination(paging);
+
+		return get;
+
+	}	
+	@GetMapping("/Adv4")
+	public List<Adv4> getdetails() {
+		 List<Adv4> get = Service.getdetails();		
+		return get;
+}
+// get all without authentication 
+
+	@GetMapping("/token/Adv4")
+	public List<Adv4> getallwioutsec() {
+		 List<Adv4> get = Service.getdetails();		
+		return get;
+}
+@GetMapping("/Adv4/{id}")
+	public  Adv4  getdetailsbyId(@PathVariable Integer id ) {
+		Adv4  get = Service.getdetailsbyId(id);
+		return get;
+	}
+@DeleteMapping("/Adv4/{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/test7oct-test2-b/authsec_springboot/backend/src/main/java/com/realnet/angulardatatype/Controllers/tokenFree_Adv5Controller.java b/test7oct-test2-b/authsec_springboot/backend/src/main/java/com/realnet/angulardatatype/Controllers/tokenFree_Adv5Controller.java
new file mode 100644
index 0000000..9f62704
--- /dev/null
+++ b/test7oct-test2-b/authsec_springboot/backend/src/main/java/com/realnet/angulardatatype/Controllers/tokenFree_Adv5Controller.java
@@ -0,0 +1,147 @@
+package com.realnet.angulardatatype.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.angulardatatype.Entity.Adv5;
+import com.realnet.angulardatatype.Services.Adv5Service ;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+@RequestMapping(value = "/token/Adv5")
+ @CrossOrigin("*") 
+@RestController
+public class tokenFree_Adv5Controller {
+	@Autowired
+	private Adv5Service Service;
+
+@Value("${projectPath}")
+	private String projectPath;
+ 
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+	@PostMapping("/Adv5")
+		  public Adv5 Savedata(@RequestBody Adv5 data) {
+		Adv5 save = Service.Savedata(data)	;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+		System.out.println("data saved..." + save);
+
+ return save;
+	  }
+@PutMapping("/Adv5/{id}")
+	public  Adv5 update(@RequestBody Adv5 data,@PathVariable Integer id ) {
+		Adv5 update = Service.update(data,id);
+		System.out.println("data update..." + update);
+		return update;
+	}	 
+//	get all with pagination
+	@GetMapping("/Adv5/getall/page")
+	public Page<Adv5> getall(@RequestParam(value = "page", required = false) Integer page,
+			@RequestParam(value = "size", required = false) Integer size) {
+		Pageable paging = PageRequest.of(page, size);
+		Page<Adv5> get = Service.getAllWithPagination(paging);
+
+		return get;
+
+	}	
+	@GetMapping("/Adv5")
+	public List<Adv5> getdetails() {
+		 List<Adv5> get = Service.getdetails();		
+		return get;
+}
+// get all without authentication 
+
+	@GetMapping("/token/Adv5")
+	public List<Adv5> getallwioutsec() {
+		 List<Adv5> get = Service.getdetails();		
+		return get;
+}
+@GetMapping("/Adv5/{id}")
+	public  Adv5  getdetailsbyId(@PathVariable Integer id ) {
+		Adv5  get = Service.getdetailsbyId(id);
+		return get;
+	}
+@DeleteMapping("/Adv5/{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/test7oct-test2-b/authsec_springboot/backend/src/main/java/com/realnet/angulardatatype/Controllers/tokenFree_Basicp1Controller.java b/test7oct-test2-b/authsec_springboot/backend/src/main/java/com/realnet/angulardatatype/Controllers/tokenFree_Basicp1Controller.java
new file mode 100644
index 0000000..e5ce486
--- /dev/null
+++ b/test7oct-test2-b/authsec_springboot/backend/src/main/java/com/realnet/angulardatatype/Controllers/tokenFree_Basicp1Controller.java
@@ -0,0 +1,171 @@
+package com.realnet.angulardatatype.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.angulardatatype.Entity.Basicp1;
+import com.realnet.angulardatatype.Services.Basicp1Service ;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+@RequestMapping(value = "/token/Basicp1")
+ @CrossOrigin("*") 
+@RestController
+public class tokenFree_Basicp1Controller {
+	@Autowired
+	private Basicp1Service Service;
+
+@Value("${projectPath}")
+	private String projectPath;
+ 
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+	@PostMapping("/Basicp1")
+		  public Basicp1 Savedata(@RequestBody Basicp1 data) {
+		Basicp1 save = Service.Savedata(data)	;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+		System.out.println("data saved..." + save);
+
+ return save;
+	  }
+@PutMapping("/Basicp1/{id}")
+	public  Basicp1 update(@RequestBody Basicp1 data,@PathVariable Integer id ) {
+		Basicp1 update = Service.update(data,id);
+		System.out.println("data update..." + update);
+		return update;
+	}	 
+//	get all with pagination
+	@GetMapping("/Basicp1/getall/page")
+	public Page<Basicp1> getall(@RequestParam(value = "page", required = false) Integer page,
+			@RequestParam(value = "size", required = false) Integer size) {
+		Pageable paging = PageRequest.of(page, size);
+		Page<Basicp1> get = Service.getAllWithPagination(paging);
+
+		return get;
+
+	}	
+	@GetMapping("/Basicp1")
+	public List<Basicp1> getdetails() {
+		 List<Basicp1> get = Service.getdetails();		
+		return get;
+}
+// get all without authentication 
+
+	@GetMapping("/token/Basicp1")
+	public List<Basicp1> getallwioutsec() {
+		 List<Basicp1> get = Service.getdetails();		
+		return get;
+}
+@GetMapping("/Basicp1/{id}")
+	public  Basicp1  getdetailsbyId(@PathVariable Integer id ) {
+		Basicp1  get = Service.getdetailsbyId(id);
+		return get;
+	}
+@DeleteMapping("/Basicp1/{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/test7oct-test2-b/authsec_springboot/backend/src/main/java/com/realnet/angulardatatype/Controllers/tokenFree_Basicp2Controller.java b/test7oct-test2-b/authsec_springboot/backend/src/main/java/com/realnet/angulardatatype/Controllers/tokenFree_Basicp2Controller.java
new file mode 100644
index 0000000..1370e4c
--- /dev/null
+++ b/test7oct-test2-b/authsec_springboot/backend/src/main/java/com/realnet/angulardatatype/Controllers/tokenFree_Basicp2Controller.java
@@ -0,0 +1,147 @@
+package com.realnet.angulardatatype.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.angulardatatype.Entity.Basicp2;
+import com.realnet.angulardatatype.Services.Basicp2Service ;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+@RequestMapping(value = "/token/Basicp2")
+ @CrossOrigin("*") 
+@RestController
+public class tokenFree_Basicp2Controller {
+	@Autowired
+	private Basicp2Service Service;
+
+@Value("${projectPath}")
+	private String projectPath;
+ 
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+	@PostMapping("/Basicp2")
+		  public Basicp2 Savedata(@RequestBody Basicp2 data) {
+		Basicp2 save = Service.Savedata(data)	;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+		System.out.println("data saved..." + save);
+
+ return save;
+	  }
+@PutMapping("/Basicp2/{id}")
+	public  Basicp2 update(@RequestBody Basicp2 data,@PathVariable Integer id ) {
+		Basicp2 update = Service.update(data,id);
+		System.out.println("data update..." + update);
+		return update;
+	}	 
+//	get all with pagination
+	@GetMapping("/Basicp2/getall/page")
+	public Page<Basicp2> getall(@RequestParam(value = "page", required = false) Integer page,
+			@RequestParam(value = "size", required = false) Integer size) {
+		Pageable paging = PageRequest.of(page, size);
+		Page<Basicp2> get = Service.getAllWithPagination(paging);
+
+		return get;
+
+	}	
+	@GetMapping("/Basicp2")
+	public List<Basicp2> getdetails() {
+		 List<Basicp2> get = Service.getdetails();		
+		return get;
+}
+// get all without authentication 
+
+	@GetMapping("/token/Basicp2")
+	public List<Basicp2> getallwioutsec() {
+		 List<Basicp2> get = Service.getdetails();		
+		return get;
+}
+@GetMapping("/Basicp2/{id}")
+	public  Basicp2  getdetailsbyId(@PathVariable Integer id ) {
+		Basicp2  get = Service.getdetailsbyId(id);
+		return get;
+	}
+@DeleteMapping("/Basicp2/{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/test7oct-test2-b/authsec_springboot/backend/src/main/java/com/realnet/angulardatatype/Controllers/tokenFree_Basicp3Controller.java b/test7oct-test2-b/authsec_springboot/backend/src/main/java/com/realnet/angulardatatype/Controllers/tokenFree_Basicp3Controller.java
new file mode 100644
index 0000000..a44ab5b
--- /dev/null
+++ b/test7oct-test2-b/authsec_springboot/backend/src/main/java/com/realnet/angulardatatype/Controllers/tokenFree_Basicp3Controller.java
@@ -0,0 +1,163 @@
+package com.realnet.angulardatatype.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.angulardatatype.Entity.Basicp3;
+import com.realnet.angulardatatype.Services.Basicp3Service ;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+@RequestMapping(value = "/token/Basicp3")
+ @CrossOrigin("*") 
+@RestController
+public class tokenFree_Basicp3Controller {
+	@Autowired
+	private Basicp3Service Service;
+
+@Value("${projectPath}")
+	private String projectPath;
+ 
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+	@PostMapping("/Basicp3")
+		  public Basicp3 Savedata(@RequestBody Basicp3 data) {
+		Basicp3 save = Service.Savedata(data)	;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+		System.out.println("data saved..." + save);
+
+ return save;
+	  }
+@PutMapping("/Basicp3/{id}")
+	public  Basicp3 update(@RequestBody Basicp3 data,@PathVariable Integer id ) {
+		Basicp3 update = Service.update(data,id);
+		System.out.println("data update..." + update);
+		return update;
+	}	 
+//	get all with pagination
+	@GetMapping("/Basicp3/getall/page")
+	public Page<Basicp3> getall(@RequestParam(value = "page", required = false) Integer page,
+			@RequestParam(value = "size", required = false) Integer size) {
+		Pageable paging = PageRequest.of(page, size);
+		Page<Basicp3> get = Service.getAllWithPagination(paging);
+
+		return get;
+
+	}	
+	@GetMapping("/Basicp3")
+	public List<Basicp3> getdetails() {
+		 List<Basicp3> get = Service.getdetails();		
+		return get;
+}
+// get all without authentication 
+
+	@GetMapping("/token/Basicp3")
+	public List<Basicp3> getallwioutsec() {
+		 List<Basicp3> get = Service.getdetails();		
+		return get;
+}
+@GetMapping("/Basicp3/{id}")
+	public  Basicp3  getdetailsbyId(@PathVariable Integer id ) {
+		Basicp3  get = Service.getdetailsbyId(id);
+		return get;
+	}
+@DeleteMapping("/Basicp3/{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/test7oct-test2-b/authsec_springboot/backend/src/main/java/com/realnet/angulardatatype/Controllers/tokenFree_District_ListFilter1Controller.java b/test7oct-test2-b/authsec_springboot/backend/src/main/java/com/realnet/angulardatatype/Controllers/tokenFree_District_ListFilter1Controller.java
new file mode 100644
index 0000000..dc0afc4
--- /dev/null
+++ b/test7oct-test2-b/authsec_springboot/backend/src/main/java/com/realnet/angulardatatype/Controllers/tokenFree_District_ListFilter1Controller.java
@@ -0,0 +1,24 @@
+package com.realnet.angulardatatype.Controllers;
+import java.util.List;
+import org.springframework.beans.factory.annotation.Autowired;
+ import org.springframework.web.bind.annotation.*;
+import com.realnet.angulardatatype.Entity.District_ListFilter1;
+import com.realnet.angulardatatype.Services.District_ListFilter1Service ;
+@RequestMapping(value = "/token/District_ListFilter1")
+@RestController
+public class tokenFree_District_ListFilter1Controller {
+	
+	@Autowired
+	private District_ListFilter1Service Service;
+
+		@GetMapping("/District_ListFilter1")
+	public List<District_ListFilter1> getlist() {
+		 List<District_ListFilter1> get = Service.getlistbuilder();		
+		return get;
+}
+		@GetMapping("/District_ListFilter11/{item}")
+	public List<District_ListFilter1> getlistwithparam(  @PathVariable String item) {
+		 List<District_ListFilter1> get = Service.getlistbuilderparam(  item);		
+		return get;
+}
+}
\ No newline at end of file
diff --git a/test7oct-test2-b/authsec_springboot/backend/src/main/java/com/realnet/angulardatatype/Controllers/tokenFree_Dv2Controller.java b/test7oct-test2-b/authsec_springboot/backend/src/main/java/com/realnet/angulardatatype/Controllers/tokenFree_Dv2Controller.java
new file mode 100644
index 0000000..2402cf7
--- /dev/null
+++ b/test7oct-test2-b/authsec_springboot/backend/src/main/java/com/realnet/angulardatatype/Controllers/tokenFree_Dv2Controller.java
@@ -0,0 +1,147 @@
+package com.realnet.angulardatatype.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.angulardatatype.Entity.Dv2;
+import com.realnet.angulardatatype.Services.Dv2Service ;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+@RequestMapping(value = "/token/Dv2")
+ @CrossOrigin("*") 
+@RestController
+public class tokenFree_Dv2Controller {
+	@Autowired
+	private Dv2Service Service;
+
+@Value("${projectPath}")
+	private String projectPath;
+ 
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+	@PostMapping("/Dv2")
+		  public Dv2 Savedata(@RequestBody Dv2 data) {
+		Dv2 save = Service.Savedata(data)	;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+		System.out.println("data saved..." + save);
+
+ return save;
+	  }
+@PutMapping("/Dv2/{id}")
+	public  Dv2 update(@RequestBody Dv2 data,@PathVariable Integer id ) {
+		Dv2 update = Service.update(data,id);
+		System.out.println("data update..." + update);
+		return update;
+	}	 
+//	get all with pagination
+	@GetMapping("/Dv2/getall/page")
+	public Page<Dv2> getall(@RequestParam(value = "page", required = false) Integer page,
+			@RequestParam(value = "size", required = false) Integer size) {
+		Pageable paging = PageRequest.of(page, size);
+		Page<Dv2> get = Service.getAllWithPagination(paging);
+
+		return get;
+
+	}	
+	@GetMapping("/Dv2")
+	public List<Dv2> getdetails() {
+		 List<Dv2> get = Service.getdetails();		
+		return get;
+}
+// get all without authentication 
+
+	@GetMapping("/token/Dv2")
+	public List<Dv2> getallwioutsec() {
+		 List<Dv2> get = Service.getdetails();		
+		return get;
+}
+@GetMapping("/Dv2/{id}")
+	public  Dv2  getdetailsbyId(@PathVariable Integer id ) {
+		Dv2  get = Service.getdetailsbyId(id);
+		return get;
+	}
+@DeleteMapping("/Dv2/{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/test7oct-test2-b/authsec_springboot/backend/src/main/java/com/realnet/angulardatatype/Controllers/tokenFree_State_ListFilter1Controller.java b/test7oct-test2-b/authsec_springboot/backend/src/main/java/com/realnet/angulardatatype/Controllers/tokenFree_State_ListFilter1Controller.java
new file mode 100644
index 0000000..853ea2a
--- /dev/null
+++ b/test7oct-test2-b/authsec_springboot/backend/src/main/java/com/realnet/angulardatatype/Controllers/tokenFree_State_ListFilter1Controller.java
@@ -0,0 +1,24 @@
+package com.realnet.angulardatatype.Controllers;
+import java.util.List;
+import org.springframework.beans.factory.annotation.Autowired;
+ import org.springframework.web.bind.annotation.*;
+import com.realnet.angulardatatype.Entity.State_ListFilter1;
+import com.realnet.angulardatatype.Services.State_ListFilter1Service ;
+@RequestMapping(value = "/token/State_ListFilter1")
+@RestController
+public class tokenFree_State_ListFilter1Controller {
+	
+	@Autowired
+	private State_ListFilter1Service Service;
+
+		@GetMapping("/State_ListFilter1")
+	public List<State_ListFilter1> getlist() {
+		 List<State_ListFilter1> get = Service.getlistbuilder();		
+		return get;
+}
+		@GetMapping("/State_ListFilter11/{item}")
+	public List<State_ListFilter1> getlistwithparam(  @PathVariable String item) {
+		 List<State_ListFilter1> get = Service.getlistbuilderparam(  item);		
+		return get;
+}
+}
\ No newline at end of file
diff --git a/test7oct-test2-b/authsec_springboot/backend/src/main/java/com/realnet/angulardatatype/Controllers/tokenFree_SupportController.java b/test7oct-test2-b/authsec_springboot/backend/src/main/java/com/realnet/angulardatatype/Controllers/tokenFree_SupportController.java
new file mode 100644
index 0000000..0ab27f2
--- /dev/null
+++ b/test7oct-test2-b/authsec_springboot/backend/src/main/java/com/realnet/angulardatatype/Controllers/tokenFree_SupportController.java
@@ -0,0 +1,91 @@
+package com.realnet.angulardatatype.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.angulardatatype.Entity.Support;
+import com.realnet.angulardatatype.Services.SupportService ;
+
+
+
+
+@RequestMapping(value = "/token/Support")
+ @CrossOrigin("*") 
+@RestController
+public class tokenFree_SupportController {
+	@Autowired
+	private SupportService Service;
+
+@Value("${projectPath}")
+	private String projectPath;
+ 
+
+
+
+
+	@PostMapping("/Support")
+		  public Support Savedata(@RequestBody Support data) {
+		Support save = Service.Savedata(data)	;
+
+
+
+		System.out.println("data saved..." + save);
+
+ return save;
+	  }
+@PutMapping("/Support/{id}")
+	public  Support update(@RequestBody Support data,@PathVariable Integer id ) {
+		Support update = Service.update(data,id);
+		System.out.println("data update..." + update);
+		return update;
+	}	 
+//	get all with pagination
+	@GetMapping("/Support/getall/page")
+	public Page<Support> getall(@RequestParam(value = "page", required = false) Integer page,
+			@RequestParam(value = "size", required = false) Integer size) {
+		Pageable paging = PageRequest.of(page, size);
+		Page<Support> get = Service.getAllWithPagination(paging);
+
+		return get;
+
+	}	
+	@GetMapping("/Support")
+	public List<Support> getdetails() {
+		 List<Support> get = Service.getdetails();		
+		return get;
+}
+// get all without authentication 
+
+	@GetMapping("/token/Support")
+	public List<Support> getallwioutsec() {
+		 List<Support> get = Service.getdetails();		
+		return get;
+}
+@GetMapping("/Support/{id}")
+	public  Support  getdetailsbyId(@PathVariable Integer id ) {
+		Support  get = Service.getdetailsbyId(id);
+		return get;
+	}
+@DeleteMapping("/Support/{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/test7oct-test2-b/authsec_springboot/backend/src/main/java/com/realnet/angulardatatype/Entity/Ad6.java b/test7oct-test2-b/authsec_springboot/backend/src/main/java/com/realnet/angulardatatype/Entity/Ad6.java
new file mode 100644
index 0000000..d853238
--- /dev/null
+++ b/test7oct-test2-b/authsec_springboot/backend/src/main/java/com/realnet/angulardatatype/Entity/Ad6.java
@@ -0,0 +1,49 @@
+package com.realnet.angulardatatype.Entity;
+ import lombok.*;
+import com.realnet.WhoColumn.Entity.Extension; 
+ import javax.persistence.*;
+ import java.time.LocalDateTime;
+ import java.util.*;
+
+
+
+
+
+
+
+
+
+
+ @Entity 
+ @Data
+ public class    Ad6 extends Extension { 
+ /**
+	 * 
+	 */
+	private static final long serialVersionUID = 1L;
+
+ @Id
+ @GeneratedValue(strategy = GenerationType.IDENTITY)
+ private Integer id;
+
+private String  name;
+
+private String  description;
+
+private String country;
+private String countryidentifier;
+
+private String state;
+
+
+
+
+
+private String district;
+
+
+
+
+
+
+}
diff --git a/test7oct-test2-b/authsec_springboot/backend/src/main/java/com/realnet/angulardatatype/Entity/Ad7.java b/test7oct-test2-b/authsec_springboot/backend/src/main/java/com/realnet/angulardatatype/Entity/Ad7.java
new file mode 100644
index 0000000..71961ec
--- /dev/null
+++ b/test7oct-test2-b/authsec_springboot/backend/src/main/java/com/realnet/angulardatatype/Entity/Ad7.java
@@ -0,0 +1,32 @@
+package com.realnet.angulardatatype.Entity;
+ import lombok.*;
+import com.realnet.WhoColumn.Entity.Extension; 
+ import javax.persistence.*;
+ import java.time.LocalDateTime;
+ import java.util.*;
+
+
+
+
+
+
+ @Entity 
+ @Data
+ public class    Ad7 extends Extension { 
+ /**
+	 * 
+	 */
+	private static final long serialVersionUID = 1L;
+
+ @Id
+ @GeneratedValue(strategy = GenerationType.IDENTITY)
+ private Integer id;
+
+private String  name;
+
+
+
+
+
+
+}
diff --git a/test7oct-test2-b/authsec_springboot/backend/src/main/java/com/realnet/angulardatatype/Entity/Ad8.java b/test7oct-test2-b/authsec_springboot/backend/src/main/java/com/realnet/angulardatatype/Entity/Ad8.java
new file mode 100644
index 0000000..23f4a45
--- /dev/null
+++ b/test7oct-test2-b/authsec_springboot/backend/src/main/java/com/realnet/angulardatatype/Entity/Ad8.java
@@ -0,0 +1,42 @@
+package com.realnet.angulardatatype.Entity;
+ import lombok.*;
+import com.realnet.WhoColumn.Entity.Extension; 
+ import javax.persistence.*;
+ import java.time.LocalDateTime;
+ import java.util.*;
+
+
+
+
+
+
+import com.realnet.angulardatatype.Entity.Support;
+
+import com.realnet.stpkg.Entity.Childform;
+
+ @Entity 
+ @Data
+ public class    Ad8 extends Extension { 
+ /**
+	 * 
+	 */
+	private static final long serialVersionUID = 1L;
+
+ @Id
+ @GeneratedValue(strategy = GenerationType.IDENTITY)
+ private Integer id;
+
+private String  name;
+
+
+
+
+
+@OneToOne(  cascade=CascadeType.ALL)
+ private  Support support; 
+
+@OneToMany(  cascade=CascadeType.ALL)
+ private List<Childform> childform = new ArrayList<>();
+
+
+}
diff --git a/test7oct-test2-b/authsec_springboot/backend/src/main/java/com/realnet/angulardatatype/Entity/Ad9.java b/test7oct-test2-b/authsec_springboot/backend/src/main/java/com/realnet/angulardatatype/Entity/Ad9.java
new file mode 100644
index 0000000..ea62708
--- /dev/null
+++ b/test7oct-test2-b/authsec_springboot/backend/src/main/java/com/realnet/angulardatatype/Entity/Ad9.java
@@ -0,0 +1,28 @@
+package com.realnet.angulardatatype.Entity;
+ import lombok.*;
+import com.realnet.WhoColumn.Entity.Extension; 
+ import javax.persistence.*;
+ import java.time.LocalDateTime;
+ import java.util.*;
+
+
+
+
+ @Entity 
+ @Data
+ public class    Ad9 extends Extension { 
+ /**
+	 * 
+	 */
+	private static final long serialVersionUID = 1L;
+
+ @Id
+ @GeneratedValue(strategy = GenerationType.IDENTITY)
+ private Integer id;
+
+private String  name;
+
+private String approved_field_status;
+
+
+}
diff --git a/test7oct-test2-b/authsec_springboot/backend/src/main/java/com/realnet/angulardatatype/Entity/Adv1.java b/test7oct-test2-b/authsec_springboot/backend/src/main/java/com/realnet/angulardatatype/Entity/Adv1.java
new file mode 100644
index 0000000..d873782
--- /dev/null
+++ b/test7oct-test2-b/authsec_springboot/backend/src/main/java/com/realnet/angulardatatype/Entity/Adv1.java
@@ -0,0 +1,98 @@
+package com.realnet.angulardatatype.Entity;
+ import lombok.*;
+import com.realnet.WhoColumn.Entity.Extension; 
+ import javax.persistence.*;
+ import java.time.LocalDateTime;
+ import java.util.*;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ @Entity 
+ @Data
+ public class    Adv1 extends Extension { 
+ /**
+	 * 
+	 */
+	private static final long serialVersionUID = 1L;
+
+ @Id
+ @GeneratedValue(strategy = GenerationType.IDENTITY)
+ private Integer id;
+
+ private String ismale;
+
+ private String idfemale;
+
+
+  
+ 
+private Boolean test1;
+   
+
+ 
+private Boolean test2;
+   
+
+
+
+  
+ 
+private Boolean t1;
+   
+
+ 
+private Boolean t2;
+   
+
+ 
+private Boolean t4;
+   
+
+
+private String  fileupload_fieldname;
+private String  fileupload_fieldpath ;
+
+private String  fileupload_field2name;
+private String  fileupload_field2path ;
+
+private String  imageupload_fieldname;
+private String  imageupload_fieldpath ;
+
+private String  imageupload_field2name;
+private String  imageupload_field2path ;
+
+private String  audio_fieldname;
+private String  audio_fieldpath ;
+
+private String  audio_field2name;
+private String  audio_field2path ;
+
+private String  video_fieldname;
+private String  video_fieldpath ;
+
+private String  video_field2name;
+private String  video_field2path ;
+
+
+}
diff --git a/test7oct-test2-b/authsec_springboot/backend/src/main/java/com/realnet/angulardatatype/Entity/Adv3.java b/test7oct-test2-b/authsec_springboot/backend/src/main/java/com/realnet/angulardatatype/Entity/Adv3.java
new file mode 100644
index 0000000..371be22
--- /dev/null
+++ b/test7oct-test2-b/authsec_springboot/backend/src/main/java/com/realnet/angulardatatype/Entity/Adv3.java
@@ -0,0 +1,66 @@
+package com.realnet.angulardatatype.Entity;
+ import lombok.*;
+import com.realnet.WhoColumn.Entity.Extension; 
+ import javax.persistence.*;
+ import java.time.LocalDateTime;
+ import java.util.*;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ @Entity 
+ @Data
+ public class    Adv3 extends Extension { 
+ /**
+	 * 
+	 */
+	private static final long serialVersionUID = 1L;
+
+ @Id
+ @GeneratedValue(strategy = GenerationType.IDENTITY)
+ private Integer id;
+
+
+
+
+
+
+
+private String country;
+
+private String state;
+
+private String stmlit;
+
+private String stmmlt2;
+
+private String dy2;
+private String dy2identifier;
+
+private String dy1;
+private String dy1identifier;
+
+private String dymlti1;
+
+private String dymlt2;
+
+
+}
diff --git a/test7oct-test2-b/authsec_springboot/backend/src/main/java/com/realnet/angulardatatype/Entity/Adv4.java b/test7oct-test2-b/authsec_springboot/backend/src/main/java/com/realnet/angulardatatype/Entity/Adv4.java
new file mode 100644
index 0000000..e05240b
--- /dev/null
+++ b/test7oct-test2-b/authsec_springboot/backend/src/main/java/com/realnet/angulardatatype/Entity/Adv4.java
@@ -0,0 +1,48 @@
+package com.realnet.angulardatatype.Entity;
+ import lombok.*;
+import com.realnet.WhoColumn.Entity.Extension; 
+ import javax.persistence.*;
+ import java.time.LocalDateTime;
+ import java.util.*;
+
+
+
+
+
+
+
+
+import com.realnet.angulardatatype.Entity.Support;
+
+import com.realnet.stpkg.Entity.Childform;
+
+ @Entity 
+ @Data
+ public class    Adv4 extends Extension { 
+ /**
+	 * 
+	 */
+	private static final long serialVersionUID = 1L;
+
+ @Id
+ @GeneratedValue(strategy = GenerationType.IDENTITY)
+ private Integer id;
+
+private String atoc;
+private String atocidentifier;
+
+private String atc2;
+private String atc2identifier;
+
+private String atdy1;
+
+private String atdy2;
+
+@OneToOne(  cascade=CascadeType.ALL)
+ private  Support support; 
+
+@OneToOne(  cascade=CascadeType.ALL)
+ private  Childform childform; 
+
+
+}
diff --git a/test7oct-test2-b/authsec_springboot/backend/src/main/java/com/realnet/angulardatatype/Entity/Adv5.java b/test7oct-test2-b/authsec_springboot/backend/src/main/java/com/realnet/angulardatatype/Entity/Adv5.java
new file mode 100644
index 0000000..ed07a91
--- /dev/null
+++ b/test7oct-test2-b/authsec_springboot/backend/src/main/java/com/realnet/angulardatatype/Entity/Adv5.java
@@ -0,0 +1,58 @@
+package com.realnet.angulardatatype.Entity;
+ import lombok.*;
+import com.realnet.WhoColumn.Entity.Extension; 
+ import javax.persistence.*;
+ import java.time.LocalDateTime;
+ import java.util.*;
+
+
+import com.realnet.angulardatatype.Entity.Support;
+
+
+
+
+
+
+
+
+
+
+
+
+
+import com.realnet.stpkg.Entity.Childform;
+
+ @Entity 
+ @Data
+ public class    Adv5 extends Extension { 
+ /**
+	 * 
+	 */
+	private static final long serialVersionUID = 1L;
+
+ @Id
+ @GeneratedValue(strategy = GenerationType.IDENTITY)
+ private Integer id;
+
+private String  name;
+
+@OneToMany(  cascade=CascadeType.ALL)
+ private List<Support> support = new ArrayList<>();
+
+private int age;
+
+private int age2;
+
+private String addition;
+
+private String multiplication;
+
+
+
+
+
+@OneToMany(  cascade=CascadeType.ALL)
+ private List<Childform> childform = new ArrayList<>();
+
+
+}
diff --git a/test7oct-test2-b/authsec_springboot/backend/src/main/java/com/realnet/angulardatatype/Entity/Basicp1.java b/test7oct-test2-b/authsec_springboot/backend/src/main/java/com/realnet/angulardatatype/Entity/Basicp1.java
new file mode 100644
index 0000000..75f1105
--- /dev/null
+++ b/test7oct-test2-b/authsec_springboot/backend/src/main/java/com/realnet/angulardatatype/Entity/Basicp1.java
@@ -0,0 +1,77 @@
+package com.realnet.angulardatatype.Entity;
+ import lombok.*;
+import com.realnet.WhoColumn.Entity.Extension; 
+ import javax.persistence.*;
+ import java.time.LocalDateTime;
+ import java.util.*;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ @Entity 
+ @Data
+ public class    Basicp1 extends Extension { 
+ /**
+	 * 
+	 */
+	private static final long serialVersionUID = 1L;
+
+ @Id
+ @GeneratedValue(strategy = GenerationType.IDENTITY)
+ private Integer id;
+
+private String  name;
+
+private String  name2;
+
+private int number1;
+
+private int number2;
+
+ private String phone_number;
+
+ private String phone_number2;
+
+
+@Column(length = 2000)
+private String paragraph_field;
+
+
+@Column(length = 2000)
+private String paragraph_field2;
+
+private String password_field;
+@Transient
+private String confirmpassword_field;
+
+@Column(length = 2000)
+private String textarea;
+
+@Column(length = 2000)
+private String textarea_field;
+
+@Column(length = 2000)
+private String textarea_field2;
+
+
+}
diff --git a/test7oct-test2-b/authsec_springboot/backend/src/main/java/com/realnet/angulardatatype/Entity/Basicp2.java b/test7oct-test2-b/authsec_springboot/backend/src/main/java/com/realnet/angulardatatype/Entity/Basicp2.java
new file mode 100644
index 0000000..6fb3d3d
--- /dev/null
+++ b/test7oct-test2-b/authsec_springboot/backend/src/main/java/com/realnet/angulardatatype/Entity/Basicp2.java
@@ -0,0 +1,59 @@
+package com.realnet.angulardatatype.Entity;
+ import lombok.*;
+import com.realnet.WhoColumn.Entity.Extension; 
+ import javax.persistence.*;
+ import java.time.LocalDateTime;
+ import java.util.*;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ @Entity 
+ @Data
+ public class    Basicp2 extends Extension { 
+ /**
+	 * 
+	 */
+	private static final long serialVersionUID = 1L;
+
+ @Id
+ @GeneratedValue(strategy = GenerationType.IDENTITY)
+ private Integer id;
+
+@Column(length = 2000)
+private String about;
+
+@Column(length = 2000)
+private String textarea2;
+
+private String date_field;
+
+private String date_field2;
+
+private String datetime_field;
+
+private String datetime_field2;
+
+private String email_field;
+
+private String email_field2;
+
+	private Long user_id;
+	private String user_name;
+
+
+}
diff --git a/test7oct-test2-b/authsec_springboot/backend/src/main/java/com/realnet/angulardatatype/Entity/Basicp3.java b/test7oct-test2-b/authsec_springboot/backend/src/main/java/com/realnet/angulardatatype/Entity/Basicp3.java
new file mode 100644
index 0000000..8ab08b6
--- /dev/null
+++ b/test7oct-test2-b/authsec_springboot/backend/src/main/java/com/realnet/angulardatatype/Entity/Basicp3.java
@@ -0,0 +1,64 @@
+package com.realnet.angulardatatype.Entity;
+ import lombok.*;
+import com.realnet.WhoColumn.Entity.Extension; 
+ import javax.persistence.*;
+ import java.time.LocalDateTime;
+ import java.util.*;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ @Entity 
+ @Data
+ public class    Basicp3 extends Extension { 
+ /**
+	 * 
+	 */
+	private static final long serialVersionUID = 1L;
+
+ @Id
+ @GeneratedValue(strategy = GenerationType.IDENTITY)
+ private Integer id;
+
+private Boolean toggle_switch;
+
+private Boolean toggle_switch2;
+
+private String url_field;
+
+private String url_field2;
+
+ private double decimal_field;
+
+ private double decimal_field2;
+
+private int percentage_field;
+
+private int percentage_field2;
+
+private String documentsequenc;
+
+private String recaptcha;
+
+private String recaptcha2;
+
+
+}
diff --git a/test7oct-test2-b/authsec_springboot/backend/src/main/java/com/realnet/angulardatatype/Entity/District_ListFilter1.java b/test7oct-test2-b/authsec_springboot/backend/src/main/java/com/realnet/angulardatatype/Entity/District_ListFilter1.java
new file mode 100644
index 0000000..ec9c429
--- /dev/null
+++ b/test7oct-test2-b/authsec_springboot/backend/src/main/java/com/realnet/angulardatatype/Entity/District_ListFilter1.java
@@ -0,0 +1,14 @@
+package com.realnet.angulardatatype.Entity;
+ import lombok.*;
+ import javax.persistence.*;
+ import java.time.LocalDateTime;
+ import java.util.*;
+
+ @Data
+ public class    District_ListFilter1 { 
+
+ private Integer id;
+
+
+ private String district_name;
+}
diff --git a/test7oct-test2-b/authsec_springboot/backend/src/main/java/com/realnet/angulardatatype/Entity/Dv2.java b/test7oct-test2-b/authsec_springboot/backend/src/main/java/com/realnet/angulardatatype/Entity/Dv2.java
new file mode 100644
index 0000000..1bc2ee2
--- /dev/null
+++ b/test7oct-test2-b/authsec_springboot/backend/src/main/java/com/realnet/angulardatatype/Entity/Dv2.java
@@ -0,0 +1,78 @@
+package com.realnet.angulardatatype.Entity;
+ import lombok.*;
+import com.realnet.WhoColumn.Entity.Extension; 
+ import javax.persistence.*;
+ import java.time.LocalDateTime;
+ import java.util.*;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ @Entity 
+ @Data
+ public class    Dv2 extends Extension { 
+ /**
+	 * 
+	 */
+	private static final long serialVersionUID = 1L;
+
+ @Id
+ @GeneratedValue(strategy = GenerationType.IDENTITY)
+ private Integer id;
+
+
+ 
+ 
+
+private String test3;
+ 
+
+ 
+
+private String name;
+ 
+
+ 
+
+private String last_name;
+ 
+
+
+
+ 
+ 
+
+private String test;
+ 
+
+
+private String currency;
+
+private String currency2;
+
+private String qrcode_field;
+
+private String qrcode_field2;
+
+private String barcode_field;
+
+private String barcode_field2;
+
+
+
+
+}
diff --git a/test7oct-test2-b/authsec_springboot/backend/src/main/java/com/realnet/angulardatatype/Entity/State_ListFilter1.java b/test7oct-test2-b/authsec_springboot/backend/src/main/java/com/realnet/angulardatatype/Entity/State_ListFilter1.java
new file mode 100644
index 0000000..e74dac0
--- /dev/null
+++ b/test7oct-test2-b/authsec_springboot/backend/src/main/java/com/realnet/angulardatatype/Entity/State_ListFilter1.java
@@ -0,0 +1,14 @@
+package com.realnet.angulardatatype.Entity;
+ import lombok.*;
+ import javax.persistence.*;
+ import java.time.LocalDateTime;
+ import java.util.*;
+
+ @Data
+ public class    State_ListFilter1 { 
+
+ private Integer id;
+
+
+ private String state_name;
+}
diff --git a/test7oct-test2-b/authsec_springboot/backend/src/main/java/com/realnet/angulardatatype/Entity/Support.java b/test7oct-test2-b/authsec_springboot/backend/src/main/java/com/realnet/angulardatatype/Entity/Support.java
new file mode 100644
index 0000000..35edae1
--- /dev/null
+++ b/test7oct-test2-b/authsec_springboot/backend/src/main/java/com/realnet/angulardatatype/Entity/Support.java
@@ -0,0 +1,29 @@
+package com.realnet.angulardatatype.Entity;
+ import lombok.*;
+import com.realnet.WhoColumn.Entity.Extension; 
+ import javax.persistence.*;
+ import java.time.LocalDateTime;
+ import java.util.*;
+
+
+
+
+ @Entity 
+ @Data
+ public class    Support 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;
+
+
+}
diff --git a/test7oct-test2-b/authsec_springboot/backend/src/main/java/com/realnet/angulardatatype/Repository/Ad6Repository.java b/test7oct-test2-b/authsec_springboot/backend/src/main/java/com/realnet/angulardatatype/Repository/Ad6Repository.java
new file mode 100644
index 0000000..ec45c66
--- /dev/null
+++ b/test7oct-test2-b/authsec_springboot/backend/src/main/java/com/realnet/angulardatatype/Repository/Ad6Repository.java
@@ -0,0 +1,34 @@
+package com.realnet.angulardatatype.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.angulardatatype.Entity.Ad6;
+
+@Repository
+public interface  Ad6Repository  extends  JpaRepository<Ad6, Integer>  { 
+
+@Query(value = "select * from ad6 where  created_by=?1", nativeQuery = true)
+	List<Ad6> findAll(Long creayedBy);
+
+@Query(value = "select * from ad6 where  created_by=?1", nativeQuery = true)
+	Page<Ad6> findAll( Long creayedBy,Pageable page);
+}
\ No newline at end of file
diff --git a/test7oct-test2-b/authsec_springboot/backend/src/main/java/com/realnet/angulardatatype/Repository/Ad7Repository.java b/test7oct-test2-b/authsec_springboot/backend/src/main/java/com/realnet/angulardatatype/Repository/Ad7Repository.java
new file mode 100644
index 0000000..311a792
--- /dev/null
+++ b/test7oct-test2-b/authsec_springboot/backend/src/main/java/com/realnet/angulardatatype/Repository/Ad7Repository.java
@@ -0,0 +1,30 @@
+package com.realnet.angulardatatype.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.angulardatatype.Entity.Ad7;
+
+@Repository
+public interface  Ad7Repository  extends  JpaRepository<Ad7, Integer>  { 
+
+@Query(value = "select * from ad7 where  created_by=?1", nativeQuery = true)
+	List<Ad7> findAll(Long creayedBy);
+
+@Query(value = "select * from ad7 where  created_by=?1", nativeQuery = true)
+	Page<Ad7> findAll( Long creayedBy,Pageable page);
+}
\ No newline at end of file
diff --git a/test7oct-test2-b/authsec_springboot/backend/src/main/java/com/realnet/angulardatatype/Repository/Ad8Repository.java b/test7oct-test2-b/authsec_springboot/backend/src/main/java/com/realnet/angulardatatype/Repository/Ad8Repository.java
new file mode 100644
index 0000000..c971ea4
--- /dev/null
+++ b/test7oct-test2-b/authsec_springboot/backend/src/main/java/com/realnet/angulardatatype/Repository/Ad8Repository.java
@@ -0,0 +1,34 @@
+package com.realnet.angulardatatype.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.angulardatatype.Entity.Ad8;
+
+@Repository
+public interface  Ad8Repository  extends  JpaRepository<Ad8, Integer>  { 
+
+@Query(value = "select * from ad8 where  created_by=?1", nativeQuery = true)
+	List<Ad8> findAll(Long creayedBy);
+
+@Query(value = "select * from ad8 where  created_by=?1", nativeQuery = true)
+	Page<Ad8> findAll( Long creayedBy,Pageable page);
+}
\ No newline at end of file
diff --git a/test7oct-test2-b/authsec_springboot/backend/src/main/java/com/realnet/angulardatatype/Repository/Ad9Repository.java b/test7oct-test2-b/authsec_springboot/backend/src/main/java/com/realnet/angulardatatype/Repository/Ad9Repository.java
new file mode 100644
index 0000000..b2302f5
--- /dev/null
+++ b/test7oct-test2-b/authsec_springboot/backend/src/main/java/com/realnet/angulardatatype/Repository/Ad9Repository.java
@@ -0,0 +1,28 @@
+package com.realnet.angulardatatype.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.angulardatatype.Entity.Ad9;
+
+@Repository
+public interface  Ad9Repository  extends  JpaRepository<Ad9, Integer>  { 
+
+@Query(value = "select * from ad9 where  created_by=?1", nativeQuery = true)
+	List<Ad9> findAll(Long creayedBy);
+
+@Query(value = "select * from ad9 where  created_by=?1", nativeQuery = true)
+	Page<Ad9> findAll( Long creayedBy,Pageable page);
+}
\ No newline at end of file
diff --git a/test7oct-test2-b/authsec_springboot/backend/src/main/java/com/realnet/angulardatatype/Repository/Adv1Repository.java b/test7oct-test2-b/authsec_springboot/backend/src/main/java/com/realnet/angulardatatype/Repository/Adv1Repository.java
new file mode 100644
index 0000000..50436d6
--- /dev/null
+++ b/test7oct-test2-b/authsec_springboot/backend/src/main/java/com/realnet/angulardatatype/Repository/Adv1Repository.java
@@ -0,0 +1,48 @@
+package com.realnet.angulardatatype.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.angulardatatype.Entity.Adv1;
+
+@Repository
+public interface  Adv1Repository  extends  JpaRepository<Adv1, Integer>  { 
+
+@Query(value = "select * from adv1 where  created_by=?1", nativeQuery = true)
+	List<Adv1> findAll(Long creayedBy);
+
+@Query(value = "select * from adv1 where  created_by=?1", nativeQuery = true)
+	Page<Adv1> findAll( Long creayedBy,Pageable page);
+}
\ No newline at end of file
diff --git a/test7oct-test2-b/authsec_springboot/backend/src/main/java/com/realnet/angulardatatype/Repository/Adv3Repository.java b/test7oct-test2-b/authsec_springboot/backend/src/main/java/com/realnet/angulardatatype/Repository/Adv3Repository.java
new file mode 100644
index 0000000..3712ebb
--- /dev/null
+++ b/test7oct-test2-b/authsec_springboot/backend/src/main/java/com/realnet/angulardatatype/Repository/Adv3Repository.java
@@ -0,0 +1,46 @@
+package com.realnet.angulardatatype.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.angulardatatype.Entity.Adv3;
+
+@Repository
+public interface  Adv3Repository  extends  JpaRepository<Adv3, Integer>  { 
+
+@Query(value = "select * from adv3 where  created_by=?1", nativeQuery = true)
+	List<Adv3> findAll(Long creayedBy);
+
+@Query(value = "select * from adv3 where  created_by=?1", nativeQuery = true)
+	Page<Adv3> findAll( Long creayedBy,Pageable page);
+}
\ No newline at end of file
diff --git a/test7oct-test2-b/authsec_springboot/backend/src/main/java/com/realnet/angulardatatype/Repository/Adv4Repository.java b/test7oct-test2-b/authsec_springboot/backend/src/main/java/com/realnet/angulardatatype/Repository/Adv4Repository.java
new file mode 100644
index 0000000..65cb947
--- /dev/null
+++ b/test7oct-test2-b/authsec_springboot/backend/src/main/java/com/realnet/angulardatatype/Repository/Adv4Repository.java
@@ -0,0 +1,36 @@
+package com.realnet.angulardatatype.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.angulardatatype.Entity.Adv4;
+
+@Repository
+public interface  Adv4Repository  extends  JpaRepository<Adv4, Integer>  { 
+
+@Query(value = "select * from adv4 where  created_by=?1", nativeQuery = true)
+	List<Adv4> findAll(Long creayedBy);
+
+@Query(value = "select * from adv4 where  created_by=?1", nativeQuery = true)
+	Page<Adv4> findAll( Long creayedBy,Pageable page);
+}
\ No newline at end of file
diff --git a/test7oct-test2-b/authsec_springboot/backend/src/main/java/com/realnet/angulardatatype/Repository/Adv5Repository.java b/test7oct-test2-b/authsec_springboot/backend/src/main/java/com/realnet/angulardatatype/Repository/Adv5Repository.java
new file mode 100644
index 0000000..749a768
--- /dev/null
+++ b/test7oct-test2-b/authsec_springboot/backend/src/main/java/com/realnet/angulardatatype/Repository/Adv5Repository.java
@@ -0,0 +1,42 @@
+package com.realnet.angulardatatype.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.angulardatatype.Entity.Adv5;
+
+@Repository
+public interface  Adv5Repository  extends  JpaRepository<Adv5, Integer>  { 
+
+@Query(value = "select * from adv5 where  created_by=?1", nativeQuery = true)
+	List<Adv5> findAll(Long creayedBy);
+
+@Query(value = "select * from adv5 where  created_by=?1", nativeQuery = true)
+	Page<Adv5> findAll( Long creayedBy,Pageable page);
+}
\ No newline at end of file
diff --git a/test7oct-test2-b/authsec_springboot/backend/src/main/java/com/realnet/angulardatatype/Repository/Basicp1Repository.java b/test7oct-test2-b/authsec_springboot/backend/src/main/java/com/realnet/angulardatatype/Repository/Basicp1Repository.java
new file mode 100644
index 0000000..fd659f8
--- /dev/null
+++ b/test7oct-test2-b/authsec_springboot/backend/src/main/java/com/realnet/angulardatatype/Repository/Basicp1Repository.java
@@ -0,0 +1,48 @@
+package com.realnet.angulardatatype.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.angulardatatype.Entity.Basicp1;
+
+@Repository
+public interface  Basicp1Repository  extends  JpaRepository<Basicp1, Integer>  { 
+
+@Query(value = "select * from basicp1 where  created_by=?1", nativeQuery = true)
+	List<Basicp1> findAll(Long creayedBy);
+
+@Query(value = "select * from basicp1 where  created_by=?1", nativeQuery = true)
+	Page<Basicp1> findAll( Long creayedBy,Pageable page);
+}
\ No newline at end of file
diff --git a/test7oct-test2-b/authsec_springboot/backend/src/main/java/com/realnet/angulardatatype/Repository/Basicp2Repository.java b/test7oct-test2-b/authsec_springboot/backend/src/main/java/com/realnet/angulardatatype/Repository/Basicp2Repository.java
new file mode 100644
index 0000000..d0a7f01
--- /dev/null
+++ b/test7oct-test2-b/authsec_springboot/backend/src/main/java/com/realnet/angulardatatype/Repository/Basicp2Repository.java
@@ -0,0 +1,42 @@
+package com.realnet.angulardatatype.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.angulardatatype.Entity.Basicp2;
+
+@Repository
+public interface  Basicp2Repository  extends  JpaRepository<Basicp2, Integer>  { 
+
+@Query(value = "select * from basicp2 where  created_by=?1", nativeQuery = true)
+	List<Basicp2> findAll(Long creayedBy);
+
+@Query(value = "select * from basicp2 where  created_by=?1", nativeQuery = true)
+	Page<Basicp2> findAll( Long creayedBy,Pageable page);
+}
\ No newline at end of file
diff --git a/test7oct-test2-b/authsec_springboot/backend/src/main/java/com/realnet/angulardatatype/Repository/Basicp3Repository.java b/test7oct-test2-b/authsec_springboot/backend/src/main/java/com/realnet/angulardatatype/Repository/Basicp3Repository.java
new file mode 100644
index 0000000..29d7f24
--- /dev/null
+++ b/test7oct-test2-b/authsec_springboot/backend/src/main/java/com/realnet/angulardatatype/Repository/Basicp3Repository.java
@@ -0,0 +1,46 @@
+package com.realnet.angulardatatype.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.angulardatatype.Entity.Basicp3;
+
+@Repository
+public interface  Basicp3Repository  extends  JpaRepository<Basicp3, Integer>  { 
+
+@Query(value = "select * from basicp3 where  created_by=?1", nativeQuery = true)
+	List<Basicp3> findAll(Long creayedBy);
+
+@Query(value = "select * from basicp3 where  created_by=?1", nativeQuery = true)
+	Page<Basicp3> findAll( Long creayedBy,Pageable page);
+}
\ No newline at end of file
diff --git a/test7oct-test2-b/authsec_springboot/backend/src/main/java/com/realnet/angulardatatype/Repository/Dv2Repository.java b/test7oct-test2-b/authsec_springboot/backend/src/main/java/com/realnet/angulardatatype/Repository/Dv2Repository.java
new file mode 100644
index 0000000..87bb9d8
--- /dev/null
+++ b/test7oct-test2-b/authsec_springboot/backend/src/main/java/com/realnet/angulardatatype/Repository/Dv2Repository.java
@@ -0,0 +1,42 @@
+package com.realnet.angulardatatype.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.angulardatatype.Entity.Dv2;
+
+@Repository
+public interface  Dv2Repository  extends  JpaRepository<Dv2, Integer>  { 
+
+@Query(value = "select * from dv2 where  created_by=?1", nativeQuery = true)
+	List<Dv2> findAll(Long creayedBy);
+
+@Query(value = "select * from dv2 where  created_by=?1", nativeQuery = true)
+	Page<Dv2> findAll( Long creayedBy,Pageable page);
+}
\ No newline at end of file
diff --git a/test7oct-test2-b/authsec_springboot/backend/src/main/java/com/realnet/angulardatatype/Repository/SupportRepository.java b/test7oct-test2-b/authsec_springboot/backend/src/main/java/com/realnet/angulardatatype/Repository/SupportRepository.java
new file mode 100644
index 0000000..d3049f4
--- /dev/null
+++ b/test7oct-test2-b/authsec_springboot/backend/src/main/java/com/realnet/angulardatatype/Repository/SupportRepository.java
@@ -0,0 +1,28 @@
+package com.realnet.angulardatatype.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.angulardatatype.Entity.Support;
+
+@Repository
+public interface  SupportRepository  extends  JpaRepository<Support, Integer>  { 
+
+@Query(value = "select * from support where  created_by=?1", nativeQuery = true)
+	List<Support> findAll(Long creayedBy);
+
+@Query(value = "select * from support where  created_by=?1", nativeQuery = true)
+	Page<Support> findAll( Long creayedBy,Pageable page);
+}
\ No newline at end of file
diff --git a/test7oct-test2-b/authsec_springboot/backend/src/main/java/com/realnet/angulardatatype/Services/Ad6Service.java b/test7oct-test2-b/authsec_springboot/backend/src/main/java/com/realnet/angulardatatype/Services/Ad6Service.java
new file mode 100644
index 0000000..d3ef3bb
--- /dev/null
+++ b/test7oct-test2-b/authsec_springboot/backend/src/main/java/com/realnet/angulardatatype/Services/Ad6Service.java
@@ -0,0 +1,142 @@
+package com.realnet.angulardatatype.Services;
+import com.realnet.angulardatatype.Repository.Ad6Repository;
+import com.realnet.angulardatatype.Entity.Ad6
+;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 com.realnet.testdata.Entity.Country;
+import com.realnet.testdata.Services.CountryService;
+
+
+
+
+
+
+
+	import org.springframework.stereotype.Service;
+
+@Service
+ public class Ad6Service {
+@Autowired
+private Ad6Repository Repository;
+	@Autowired
+	private AppUserServiceImpl userService; 
+@Autowired
+	private RealmService realmService;
+
+
+
+@Autowired
+	private CountryService countryserv;
+
+
+
+
+
+public Ad6 Savedata(Ad6 data) {
+
+
+
+
+
+ 
+if (data.getCountry() != null) {
+		try {	
+  int countryId = Integer.valueOf(data.getCountry());
+Country get =  countryserv.getdetailsbyId(countryId);
+			if (get != null) {
+
+			data.setCountryidentifier(get.getName());
+}
+} catch (NumberFormatException e) {
+				System.out.println(" countryId is not integer..");
+				// Invalid integer string — ignore or log
+data.setCountryidentifier(data.getCountry());
+			}
+
+		}
+
+ 
+
+
+
+
+
+
+	data.setUpdatedBy(getUser().getUserId());
+		data.setCreatedBy(getUser().getUserId());
+		data.setAccountId(getUser().getAccount().getAccount_id());
+Ad6 save = Repository.save(data);
+				return save;	
+			}
+
+
+//	get all with pagination
+	public Page<Ad6> getAllWithPagination(Pageable page) {
+		return Repository.findAll( getUser().getUserId(),page);
+	}			
+public List<Ad6> getdetails() {  
+		List<Realm> realm = realmService.findByUserId(getUser().getUserId());
+List<Ad6> all = Repository.findAll(getUser().getUserId());
+		
+		return all ;		}
+
+
+public Ad6 getdetailsbyId(Integer id) {
+	return Repository.findById(id).get();
+			}
+
+
+	public void delete_by_id(Integer id) {
+ Repository.deleteById(id);
+}
+
+
+public Ad6 update(Ad6 data,Integer id) {
+	Ad6 old = Repository.findById(id).get();
+old.setName(data.getName());
+
+old.setDescription(data.getDescription());
+
+old.setCountry(data.getCountry());
+
+old.setState(data.getState());
+
+
+
+
+old.setDistrict(data.getDistrict());
+
+
+
+
+final Ad6 test = Repository.save(old);
+		data.setUpdatedBy(getUser().getUserId());
+  return test;} 
+
+
+
+
+
+
+
+
+
+
+ public AppUser getUser() {
+		AppUser user = userService.getLoggedInUser();
+		return user;
+
+	}}
diff --git a/test7oct-test2-b/authsec_springboot/backend/src/main/java/com/realnet/angulardatatype/Services/Ad7Service.java b/test7oct-test2-b/authsec_springboot/backend/src/main/java/com/realnet/angulardatatype/Services/Ad7Service.java
new file mode 100644
index 0000000..9df2f15
--- /dev/null
+++ b/test7oct-test2-b/authsec_springboot/backend/src/main/java/com/realnet/angulardatatype/Services/Ad7Service.java
@@ -0,0 +1,129 @@
+package com.realnet.angulardatatype.Services;
+import com.realnet.angulardatatype.Repository.Ad7Repository;
+import com.realnet.angulardatatype.Entity.Ad7
+;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 com.realnet.angulardatatype.Entity.Basicp3;
+
+import com.realnet.angulardatatype.Repository.Basicp3Repository;
+
+
+import com.realnet.angulardatatype.Entity.Support;
+
+import com.realnet.angulardatatype.Repository.SupportRepository;
+
+
+	import org.springframework.stereotype.Service;
+
+@Service
+ public class Ad7Service {
+@Autowired
+private Ad7Repository Repository;
+	@Autowired
+	private AppUserServiceImpl userService; 
+@Autowired
+	private RealmService realmService;
+
+
+
+
+
+public Ad7 Savedata(Ad7 data) {
+
+
+
+
+
+
+	data.setUpdatedBy(getUser().getUserId());
+		data.setCreatedBy(getUser().getUserId());
+		data.setAccountId(getUser().getAccount().getAccount_id());
+Ad7 save = Repository.save(data);
+				return save;	
+			}
+
+
+//	get all with pagination
+	public Page<Ad7> getAllWithPagination(Pageable page) {
+		return Repository.findAll( getUser().getUserId(),page);
+	}			
+public List<Ad7> getdetails() {  
+		List<Realm> realm = realmService.findByUserId(getUser().getUserId());
+List<Ad7> all = Repository.findAll(getUser().getUserId());
+		
+		return all ;		}
+
+
+public Ad7 getdetailsbyId(Integer id) {
+	return Repository.findById(id).get();
+			}
+
+
+	public void delete_by_id(Integer id) {
+ Repository.deleteById(id);
+}
+
+
+public Ad7 update(Ad7 data,Integer id) {
+	Ad7 old = Repository.findById(id).get();
+old.setName(data.getName());
+
+
+
+
+
+final Ad7 test = Repository.save(old);
+		data.setUpdatedBy(getUser().getUserId());
+  return test;} 
+
+
+
+//	Insert Action
+
+	@Autowired
+	private Basicp3Repository basicp3insertrepository;
+
+public Basicp3 insertBasicp3(Basicp3 data) {
+
+data.setUpdatedBy(getUser().getUserId());
+		data.setCreatedBy(getUser().getUserId());
+		data.setAccountId(getUser().getAccount().getAccount_id());
+
+
+		final Basicp3 save = basicp3insertrepository.save(data);
+		return save;
+	}
+
+
+//	Insert Action
+
+	@Autowired
+	private SupportRepository supportinsertrepository;
+
+public Support insertSupport(Support data) {
+
+data.setUpdatedBy(getUser().getUserId());
+		data.setCreatedBy(getUser().getUserId());
+		data.setAccountId(getUser().getAccount().getAccount_id());
+
+
+		final Support save = supportinsertrepository.save(data);
+		return save;
+	}
+
+ public AppUser getUser() {
+		AppUser user = userService.getLoggedInUser();
+		return user;
+
+	}}
diff --git a/test7oct-test2-b/authsec_springboot/backend/src/main/java/com/realnet/angulardatatype/Services/Ad8Service.java b/test7oct-test2-b/authsec_springboot/backend/src/main/java/com/realnet/angulardatatype/Services/Ad8Service.java
new file mode 100644
index 0000000..c4c3e72
--- /dev/null
+++ b/test7oct-test2-b/authsec_springboot/backend/src/main/java/com/realnet/angulardatatype/Services/Ad8Service.java
@@ -0,0 +1,185 @@
+package com.realnet.angulardatatype.Services;
+import com.realnet.angulardatatype.Repository.Ad8Repository;
+import com.realnet.angulardatatype.Entity.Ad8
+;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 com.realnet.angulardatatype.Entity.Support;
+
+import com.realnet.angulardatatype.Repository.SupportRepository;
+
+
+import com.realnet.stpkg.Entity.Childform;
+
+import com.realnet.stpkg.Repository.ChildformRepository;
+
+
+
+
+
+
+	import org.springframework.stereotype.Service;
+
+@Service
+ public class Ad8Service {
+@Autowired
+private Ad8Repository Repository;
+	@Autowired
+	private AppUserServiceImpl userService; 
+@Autowired
+	private RealmService realmService;
+
+
+
+
+
+
+
+
+
+public Ad8 Savedata(Ad8 data) {
+
+
+
+
+
+
+
+
+
+
+	data.setUpdatedBy(getUser().getUserId());
+		data.setCreatedBy(getUser().getUserId());
+		data.setAccountId(getUser().getAccount().getAccount_id());
+Ad8 save = Repository.save(data);
+				return save;	
+			}
+
+
+//	get all with pagination
+	public Page<Ad8> getAllWithPagination(Pageable page) {
+		return Repository.findAll( getUser().getUserId(),page);
+	}			
+public List<Ad8> getdetails() {  
+		List<Realm> realm = realmService.findByUserId(getUser().getUserId());
+List<Ad8> all = Repository.findAll(getUser().getUserId());
+		
+		return all ;		}
+
+
+public Ad8 getdetailsbyId(Integer id) {
+	return Repository.findById(id).get();
+			}
+
+
+	public void delete_by_id(Integer id) {
+ Repository.deleteById(id);
+}
+
+
+public Ad8 update(Ad8 data,Integer id) {
+	Ad8 old = Repository.findById(id).get();
+old.setName(data.getName());
+
+
+
+
+
+old.setSupport(data.getSupport());
+
+old.setChildform(data.getChildform());
+
+final Ad8 test = Repository.save(old);
+		data.setUpdatedBy(getUser().getUserId());
+  return test;} 
+
+
+
+//	update Action
+
+	@Autowired
+	private SupportRepository supportupdaterepository;
+
+
+	public ResponseEntity<?> updateSupport(Integer id, Support data) {
+		Integer i = 0;
+		Ad8 s = Repository.findById(id).get();
+
+		List<Support> list = new ArrayList<>();
+
+		Object supportObject = s.getSupport();
+
+		if (supportObject instanceof List<?>) {
+			// If it's a list, cast and add all elements to the list
+			list.addAll((List<Support>) supportObject);
+		} else if (supportObject instanceof Support) {
+			// If it's a single Support object, add it to the list
+			list.add((Support) supportObject);
+		}
+		
+
+		for (Support li : list) {
+			Support old = supportupdaterepository.findById(li.getId()).get();
+
+		
+			
+			final Support supportdata = supportupdaterepository.save(old);
+			i++;
+		}
+		return new ResponseEntity<>(i + " updated", HttpStatus.OK);
+	}
+
+
+//	update Action
+
+	@Autowired
+	private ChildformRepository childformupdaterepository;
+
+
+	public ResponseEntity<?> updateChildform(Integer id, Childform data) {
+		Integer i = 0;
+		Ad8 s = Repository.findById(id).get();
+
+		List<Childform> list = new ArrayList<>();
+
+		Object childformObject = s.getChildform();
+
+		if (childformObject instanceof List<?>) {
+			// If it's a list, cast and add all elements to the list
+			list.addAll((List<Childform>) childformObject);
+		} else if (childformObject instanceof Childform) {
+			// If it's a single Childform object, add it to the list
+			list.add((Childform) childformObject);
+		}
+		
+
+		for (Childform li : list) {
+			Childform old = childformupdaterepository.findById(li.getId()).get();
+
+		
+			
+			final Childform childformdata = childformupdaterepository.save(old);
+			i++;
+		}
+		return new ResponseEntity<>(i + " updated", HttpStatus.OK);
+	}
+
+
+
+
+
+ public AppUser getUser() {
+		AppUser user = userService.getLoggedInUser();
+		return user;
+
+	}}
diff --git a/test7oct-test2-b/authsec_springboot/backend/src/main/java/com/realnet/angulardatatype/Services/Ad9Service.java b/test7oct-test2-b/authsec_springboot/backend/src/main/java/com/realnet/angulardatatype/Services/Ad9Service.java
new file mode 100644
index 0000000..f9abbbb
--- /dev/null
+++ b/test7oct-test2-b/authsec_springboot/backend/src/main/java/com/realnet/angulardatatype/Services/Ad9Service.java
@@ -0,0 +1,83 @@
+package com.realnet.angulardatatype.Services;
+import com.realnet.angulardatatype.Repository.Ad9Repository;
+import com.realnet.angulardatatype.Entity.Ad9
+;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 Ad9Service {
+@Autowired
+private Ad9Repository Repository;
+	@Autowired
+	private AppUserServiceImpl userService; 
+@Autowired
+	private RealmService realmService;
+
+
+
+public Ad9 Savedata(Ad9 data) {
+
+
+
+
+	data.setUpdatedBy(getUser().getUserId());
+		data.setCreatedBy(getUser().getUserId());
+		data.setAccountId(getUser().getAccount().getAccount_id());
+Ad9 save = Repository.save(data);
+				return save;	
+			}
+
+
+//	get all with pagination
+	public Page<Ad9> getAllWithPagination(Pageable page) {
+		return Repository.findAll( getUser().getUserId(),page);
+	}			
+public List<Ad9> getdetails() {  
+		List<Realm> realm = realmService.findByUserId(getUser().getUserId());
+List<Ad9> all = Repository.findAll(getUser().getUserId());
+		
+		return all ;		}
+
+
+public Ad9 getdetailsbyId(Integer id) {
+	return Repository.findById(id).get();
+			}
+
+
+	public void delete_by_id(Integer id) {
+ Repository.deleteById(id);
+}
+
+
+public Ad9 update(Ad9 data,Integer id) {
+	Ad9 old = Repository.findById(id).get();
+old.setName(data.getName());
+
+old.setApproved_field_status(data.getApproved_field_status());
+
+final Ad9 test = Repository.save(old);
+		data.setUpdatedBy(getUser().getUserId());
+  return test;} 
+
+
+
+
+ public AppUser getUser() {
+		AppUser user = userService.getLoggedInUser();
+		return user;
+
+	}}
diff --git a/test7oct-test2-b/authsec_springboot/backend/src/main/java/com/realnet/angulardatatype/Services/Adv1Service.java b/test7oct-test2-b/authsec_springboot/backend/src/main/java/com/realnet/angulardatatype/Services/Adv1Service.java
new file mode 100644
index 0000000..8919aaa
--- /dev/null
+++ b/test7oct-test2-b/authsec_springboot/backend/src/main/java/com/realnet/angulardatatype/Services/Adv1Service.java
@@ -0,0 +1,207 @@
+package com.realnet.angulardatatype.Services;
+import com.realnet.angulardatatype.Repository.Adv1Repository;
+import com.realnet.angulardatatype.Entity.Adv1
+;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 Adv1Service {
+@Autowired
+private Adv1Repository Repository;
+	@Autowired
+	private AppUserServiceImpl userService; 
+@Autowired
+	private RealmService realmService;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+public Adv1 Savedata(Adv1 data) {
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+	data.setUpdatedBy(getUser().getUserId());
+		data.setCreatedBy(getUser().getUserId());
+		data.setAccountId(getUser().getAccount().getAccount_id());
+Adv1 save = Repository.save(data);
+				return save;	
+			}
+
+
+//	get all with pagination
+	public Page<Adv1> getAllWithPagination(Pageable page) {
+		return Repository.findAll( getUser().getUserId(),page);
+	}			
+public List<Adv1> getdetails() {  
+		List<Realm> realm = realmService.findByUserId(getUser().getUserId());
+List<Adv1> all = Repository.findAll(getUser().getUserId());
+		
+		return all ;		}
+
+
+public Adv1 getdetailsbyId(Integer id) {
+	return Repository.findById(id).get();
+			}
+
+
+	public void delete_by_id(Integer id) {
+ Repository.deleteById(id);
+}
+
+
+public Adv1 update(Adv1 data,Integer id) {
+	Adv1 old = Repository.findById(id).get();
+old.setIsmale(data.getIsmale());
+
+old.setIdfemale(data.getIdfemale());
+
+  
+ 
+old.setTest1(data.getTest1());
+   
+
+ 
+old.setTest2(data.getTest2());
+   
+
+
+  
+
+  
+ 
+old.setT1(data.getT1());
+   
+
+ 
+old.setT2(data.getT2());
+   
+
+ 
+old.setT4(data.getT4());
+   
+
+
+  
+
+ 
+
+ 
+
+ 
+
+ 
+
+ 
+
+ 
+
+ 
+
+ 
+
+final Adv1 test = Repository.save(old);
+		data.setUpdatedBy(getUser().getUserId());
+  return test;} 
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ public AppUser getUser() {
+		AppUser user = userService.getLoggedInUser();
+		return user;
+
+	}}
diff --git a/test7oct-test2-b/authsec_springboot/backend/src/main/java/com/realnet/angulardatatype/Services/Adv3Service.java b/test7oct-test2-b/authsec_springboot/backend/src/main/java/com/realnet/angulardatatype/Services/Adv3Service.java
new file mode 100644
index 0000000..f2d12c6
--- /dev/null
+++ b/test7oct-test2-b/authsec_springboot/backend/src/main/java/com/realnet/angulardatatype/Services/Adv3Service.java
@@ -0,0 +1,236 @@
+package com.realnet.angulardatatype.Services;
+import com.realnet.angulardatatype.Repository.Adv3Repository;
+import com.realnet.angulardatatype.Entity.Adv3
+;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 com.realnet.config.EmailService;
+
+
+
+
+
+
+
+
+
+
+import com.realnet.testdata.Entity.Country;
+import com.realnet.testdata.Services.CountryService;
+
+
+
+import com.realnet.testdata.Entity.Country;
+import com.realnet.testdata.Services.CountryService;
+
+
+
+
+
+
+
+	import org.springframework.stereotype.Service;
+
+@Service
+ public class Adv3Service {
+@Autowired
+private Adv3Repository Repository;
+	@Autowired
+	private AppUserServiceImpl userService; 
+@Autowired
+	private RealmService realmService;
+
+
+
+@Autowired
+	private EmailService emailServicedynamic;
+
+
+
+
+
+
+
+
+
+@Autowired
+	private CountryService dy2serv;
+
+@Autowired
+	private CountryService dy1serv;
+
+
+
+
+
+public Adv3 Savedata(Adv3 data) {
+
+
+
+
+
+ 
+
+try 
+		   {
+
+		// emailServicedynamic.sendEmail( "gaurav_dekatc_com","Adv3", "testing");
+		emailServicedynamic.sendEmailViaSetu( "gaurav_dekatc_com","testing","","ganesh");
+
+} catch (Exception e) {
+			// TODO: handle exception
+			System.out.println("Got error  During Mail Send " + e);
+		}
+
+ 
+
+
+
+
+
+
+
+
+
+
+
+ 
+if (data.getDy2() != null) {
+		try {	
+  int dy2Id = Integer.valueOf(data.getDy2());
+Country get =  dy2serv.getdetailsbyId(dy2Id);
+			if (get != null) {
+
+			data.setDy2identifier(get.getName());
+}
+} catch (NumberFormatException e) {
+				System.out.println(" dy2Id is not integer..");
+				// Invalid integer string — ignore or log
+data.setDy2identifier(data.getDy2());
+			}
+
+		}
+
+ 
+
+
+
+ 
+if (data.getDy1() != null) {
+		try {	
+  int dy1Id = Integer.valueOf(data.getDy1());
+Country get =  dy1serv.getdetailsbyId(dy1Id);
+			if (get != null) {
+
+			data.setDy1identifier(get.getDescription());
+}
+} catch (NumberFormatException e) {
+				System.out.println(" dy1Id is not integer..");
+				// Invalid integer string — ignore or log
+data.setDy1identifier(data.getDy1());
+			}
+
+		}
+
+ 
+
+
+
+
+
+
+	data.setUpdatedBy(getUser().getUserId());
+		data.setCreatedBy(getUser().getUserId());
+		data.setAccountId(getUser().getAccount().getAccount_id());
+Adv3 save = Repository.save(data);
+				return save;	
+			}
+
+
+//	get all with pagination
+	public Page<Adv3> getAllWithPagination(Pageable page) {
+		return Repository.findAll( getUser().getUserId(),page);
+	}			
+public List<Adv3> getdetails() {  
+		List<Realm> realm = realmService.findByUserId(getUser().getUserId());
+List<Adv3> all = Repository.findAll(getUser().getUserId());
+		
+		return all ;		}
+
+
+public Adv3 getdetailsbyId(Integer id) {
+	return Repository.findById(id).get();
+			}
+
+
+	public void delete_by_id(Integer id) {
+ Repository.deleteById(id);
+}
+
+
+public Adv3 update(Adv3 data,Integer id) {
+	Adv3 old = Repository.findById(id).get();
+
+
+
+
+
+
+old.setCountry(data.getCountry());
+
+old.setState(data.getState());
+
+old.setStmlit(data.getStmlit());
+
+old.setStmmlt2(data.getStmmlt2());
+
+old.setDy2(data.getDy2());
+
+old.setDy1(data.getDy1());
+
+old.setDymlti1(data.getDymlti1());
+
+old.setDymlt2(data.getDymlt2());
+
+final Adv3 test = Repository.save(old);
+		data.setUpdatedBy(getUser().getUserId());
+  return test;} 
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ public AppUser getUser() {
+		AppUser user = userService.getLoggedInUser();
+		return user;
+
+	}}
diff --git a/test7oct-test2-b/authsec_springboot/backend/src/main/java/com/realnet/angulardatatype/Services/Adv4Service.java b/test7oct-test2-b/authsec_springboot/backend/src/main/java/com/realnet/angulardatatype/Services/Adv4Service.java
new file mode 100644
index 0000000..76f60ee
--- /dev/null
+++ b/test7oct-test2-b/authsec_springboot/backend/src/main/java/com/realnet/angulardatatype/Services/Adv4Service.java
@@ -0,0 +1,171 @@
+package com.realnet.angulardatatype.Services;
+import com.realnet.angulardatatype.Repository.Adv4Repository;
+import com.realnet.angulardatatype.Entity.Adv4
+;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 com.realnet.testdata.Entity.Country;
+import com.realnet.testdata.Services.CountryService;
+
+
+
+import com.realnet.testdata.Entity.Country;
+import com.realnet.testdata.Services.CountryService;
+
+
+
+
+
+
+
+
+
+
+
+	import org.springframework.stereotype.Service;
+
+@Service
+ public class Adv4Service {
+@Autowired
+private Adv4Repository Repository;
+	@Autowired
+	private AppUserServiceImpl userService; 
+@Autowired
+	private RealmService realmService;@Autowired
+	private CountryService atocserv;
+
+@Autowired
+	private CountryService atc2serv;
+
+
+
+
+
+
+
+
+
+public Adv4 Savedata(Adv4 data) {
+
+ 
+if (data.getAtoc() != null) {
+		try {	
+  int atocId = Integer.valueOf(data.getAtoc());
+Country get =  atocserv.getdetailsbyId(atocId);
+			if (get != null) {
+
+			data.setAtocidentifier(get.getName());
+}
+} catch (NumberFormatException e) {
+				System.out.println(" atocId is not integer..");
+				// Invalid integer string — ignore or log
+data.setAtocidentifier(data.getAtoc());
+
+			}
+
+		}
+
+ 
+
+
+
+ 
+if (data.getAtc2() != null) {
+		try {	
+  int atc2Id = Integer.valueOf(data.getAtc2());
+Country get =  atc2serv.getdetailsbyId(atc2Id);
+			if (get != null) {
+
+			data.setAtc2identifier(get.getName());
+}
+} catch (NumberFormatException e) {
+				System.out.println(" atc2Id is not integer..");
+				// Invalid integer string — ignore or log
+data.setAtc2identifier(data.getAtc2());
+
+			}
+
+		}
+
+ 
+
+
+
+
+
+
+
+
+
+
+	data.setUpdatedBy(getUser().getUserId());
+		data.setCreatedBy(getUser().getUserId());
+		data.setAccountId(getUser().getAccount().getAccount_id());
+Adv4 save = Repository.save(data);
+				return save;	
+			}
+
+
+//	get all with pagination
+	public Page<Adv4> getAllWithPagination(Pageable page) {
+		return Repository.findAll( getUser().getUserId(),page);
+	}			
+public List<Adv4> getdetails() {  
+		List<Realm> realm = realmService.findByUserId(getUser().getUserId());
+List<Adv4> all = Repository.findAll(getUser().getUserId());
+		
+		return all ;		}
+
+
+public Adv4 getdetailsbyId(Integer id) {
+	return Repository.findById(id).get();
+			}
+
+
+	public void delete_by_id(Integer id) {
+ Repository.deleteById(id);
+}
+
+
+public Adv4 update(Adv4 data,Integer id) {
+	Adv4 old = Repository.findById(id).get();
+old.setAtoc(data.getAtoc());
+
+old.setAtc2(data.getAtc2());
+
+old.setAtdy1(data.getAtdy1());
+
+old.setAtdy2(data.getAtdy2());
+
+old.setSupport(data.getSupport());
+
+old.setChildform(data.getChildform());
+
+final Adv4 test = Repository.save(old);
+		data.setUpdatedBy(getUser().getUserId());
+  return test;} 
+
+
+
+
+
+
+
+
+
+
+
+
+ public AppUser getUser() {
+		AppUser user = userService.getLoggedInUser();
+		return user;
+
+	}}
diff --git a/test7oct-test2-b/authsec_springboot/backend/src/main/java/com/realnet/angulardatatype/Services/Adv5Service.java b/test7oct-test2-b/authsec_springboot/backend/src/main/java/com/realnet/angulardatatype/Services/Adv5Service.java
new file mode 100644
index 0000000..73a84bb
--- /dev/null
+++ b/test7oct-test2-b/authsec_springboot/backend/src/main/java/com/realnet/angulardatatype/Services/Adv5Service.java
@@ -0,0 +1,153 @@
+package com.realnet.angulardatatype.Services;
+import com.realnet.angulardatatype.Repository.Adv5Repository;
+import com.realnet.angulardatatype.Entity.Adv5
+;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 Adv5Service {
+@Autowired
+private Adv5Repository Repository;
+	@Autowired
+	private AppUserServiceImpl userService; 
+@Autowired
+	private RealmService realmService;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+public Adv5 Savedata(Adv5 data) {
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+	data.setUpdatedBy(getUser().getUserId());
+		data.setCreatedBy(getUser().getUserId());
+		data.setAccountId(getUser().getAccount().getAccount_id());
+Adv5 save = Repository.save(data);
+				return save;	
+			}
+
+
+//	get all with pagination
+	public Page<Adv5> getAllWithPagination(Pageable page) {
+		return Repository.findAll( getUser().getUserId(),page);
+	}			
+public List<Adv5> getdetails() {  
+		List<Realm> realm = realmService.findByUserId(getUser().getUserId());
+List<Adv5> all = Repository.findAll(getUser().getUserId());
+		
+		return all ;		}
+
+
+public Adv5 getdetailsbyId(Integer id) {
+	return Repository.findById(id).get();
+			}
+
+
+	public void delete_by_id(Integer id) {
+ Repository.deleteById(id);
+}
+
+
+public Adv5 update(Adv5 data,Integer id) {
+	Adv5 old = Repository.findById(id).get();
+old.setName(data.getName());
+
+old.setSupport(data.getSupport());
+
+old.setAge(data.getAge());
+
+old.setAge2(data.getAge2());
+
+old.setAddition(data.getAddition());
+
+old.setMultiplication(data.getMultiplication());
+
+
+
+
+
+old.setChildform(data.getChildform());
+
+final Adv5 test = Repository.save(old);
+		data.setUpdatedBy(getUser().getUserId());
+  return test;} 
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ public AppUser getUser() {
+		AppUser user = userService.getLoggedInUser();
+		return user;
+
+	}}
diff --git a/test7oct-test2-b/authsec_springboot/backend/src/main/java/com/realnet/angulardatatype/Services/Basicp1Service.java b/test7oct-test2-b/authsec_springboot/backend/src/main/java/com/realnet/angulardatatype/Services/Basicp1Service.java
new file mode 100644
index 0000000..7db69c0
--- /dev/null
+++ b/test7oct-test2-b/authsec_springboot/backend/src/main/java/com/realnet/angulardatatype/Services/Basicp1Service.java
@@ -0,0 +1,183 @@
+package com.realnet.angulardatatype.Services;
+import com.realnet.angulardatatype.Repository.Basicp1Repository;
+import com.realnet.angulardatatype.Entity.Basicp1
+;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 Basicp1Service {
+@Autowired
+private Basicp1Repository Repository;
+	@Autowired
+	private AppUserServiceImpl userService; 
+@Autowired
+	private RealmService realmService;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+public Basicp1 Savedata(Basicp1 data) {
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+	data.setUpdatedBy(getUser().getUserId());
+		data.setCreatedBy(getUser().getUserId());
+		data.setAccountId(getUser().getAccount().getAccount_id());
+Basicp1 save = Repository.save(data);
+				return save;	
+			}
+
+
+//	get all with pagination
+	public Page<Basicp1> getAllWithPagination(Pageable page) {
+		return Repository.findAll( getUser().getUserId(),page);
+	}			
+public List<Basicp1> getdetails() {  
+		List<Realm> realm = realmService.findByUserId(getUser().getUserId());
+List<Basicp1> all = Repository.findAll(getUser().getUserId());
+		
+		return all ;		}
+
+
+public Basicp1 getdetailsbyId(Integer id) {
+	return Repository.findById(id).get();
+			}
+
+
+	public void delete_by_id(Integer id) {
+ Repository.deleteById(id);
+}
+
+
+public Basicp1 update(Basicp1 data,Integer id) {
+	Basicp1 old = Repository.findById(id).get();
+old.setName(data.getName());
+
+old.setName2(data.getName2());
+
+old.setNumber1(data.getNumber1());
+
+old.setNumber2(data.getNumber2());
+
+old.setPhone_number(data.getPhone_number());
+
+old.setPhone_number2(data.getPhone_number2());
+
+old.setParagraph_field(data.getParagraph_field());
+
+old.setParagraph_field2(data.getParagraph_field2());
+
+old.setPassword_field(data.getPassword_field());
+
+old.setTextarea(data.getTextarea());
+
+old.setTextarea_field(data.getTextarea_field());
+
+old.setTextarea_field2(data.getTextarea_field2());
+
+final Basicp1 test = Repository.save(old);
+		data.setUpdatedBy(getUser().getUserId());
+  return test;} 
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ public AppUser getUser() {
+		AppUser user = userService.getLoggedInUser();
+		return user;
+
+	}}
diff --git a/test7oct-test2-b/authsec_springboot/backend/src/main/java/com/realnet/angulardatatype/Services/Basicp2Service.java b/test7oct-test2-b/authsec_springboot/backend/src/main/java/com/realnet/angulardatatype/Services/Basicp2Service.java
new file mode 100644
index 0000000..be91c5f
--- /dev/null
+++ b/test7oct-test2-b/authsec_springboot/backend/src/main/java/com/realnet/angulardatatype/Services/Basicp2Service.java
@@ -0,0 +1,154 @@
+package com.realnet.angulardatatype.Services;
+import com.realnet.angulardatatype.Repository.Basicp2Repository;
+import com.realnet.angulardatatype.Entity.Basicp2
+;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 Basicp2Service {
+@Autowired
+private Basicp2Repository Repository;
+	@Autowired
+	private AppUserServiceImpl userService; 
+@Autowired
+	private RealmService realmService;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+public Basicp2 Savedata(Basicp2 data) {
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+data.setUser_id(getUser().getUserId());
+		data.setUser_name(getUser().getFullName());
+
+	data.setUpdatedBy(getUser().getUserId());
+		data.setCreatedBy(getUser().getUserId());
+		data.setAccountId(getUser().getAccount().getAccount_id());
+Basicp2 save = Repository.save(data);
+				return save;	
+			}
+
+
+//	get all with pagination
+	public Page<Basicp2> getAllWithPagination(Pageable page) {
+		return Repository.findAll( getUser().getUserId(),page);
+	}			
+public List<Basicp2> getdetails() {  
+		List<Realm> realm = realmService.findByUserId(getUser().getUserId());
+List<Basicp2> all = Repository.findAll(getUser().getUserId());
+		
+		return all ;		}
+
+
+public Basicp2 getdetailsbyId(Integer id) {
+	return Repository.findById(id).get();
+			}
+
+
+	public void delete_by_id(Integer id) {
+ Repository.deleteById(id);
+}
+
+
+public Basicp2 update(Basicp2 data,Integer id) {
+	Basicp2 old = Repository.findById(id).get();
+old.setAbout(data.getAbout());
+
+old.setTextarea2(data.getTextarea2());
+
+old.setDate_field(data.getDate_field());
+
+old.setDate_field2(data.getDate_field2());
+
+old.setDatetime_field(data.getDatetime_field());
+
+old.setDatetime_field2(data.getDatetime_field2());
+
+old.setEmail_field(data.getEmail_field());
+
+old.setEmail_field2(data.getEmail_field2());
+
+
+
+final Basicp2 test = Repository.save(old);
+		data.setUpdatedBy(getUser().getUserId());
+  return test;} 
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ public AppUser getUser() {
+		AppUser user = userService.getLoggedInUser();
+		return user;
+
+	}}
diff --git a/test7oct-test2-b/authsec_springboot/backend/src/main/java/com/realnet/angulardatatype/Services/Basicp3InsertService2.java b/test7oct-test2-b/authsec_springboot/backend/src/main/java/com/realnet/angulardatatype/Services/Basicp3InsertService2.java
new file mode 100644
index 0000000..0d79fa2
--- /dev/null
+++ b/test7oct-test2-b/authsec_springboot/backend/src/main/java/com/realnet/angulardatatype/Services/Basicp3InsertService2.java
@@ -0,0 +1,31 @@
+package com.realnet.angulardatatype.Services;
+import com.realnet.angulardatatype.Repository.Basicp3Repository;
+import com.realnet.angulardatatype.Entity.Basicp3;
+ import java.util.List;
+import com.realnet.users.entity1.AppUser;
+import com.realnet.users.service1.AppUserServiceImpl;
+import org.springframework.beans.factory.annotation.Autowired;
+	import org.springframework.stereotype.Service;
+
+@Service
+ public class Basicp3InsertService2 {
+@Autowired
+private Basicp3Repository Repository;
+@Autowired
+	private AppUserServiceImpl userService; 
+
+
+public Basicp3 insertaction(Basicp3 basicp3	) {
+
+
+	basicp3.setUpdatedBy(getUser().getUserId());
+		basicp3.setCreatedBy(getUser().getUserId());
+		basicp3.setAccountId(getUser().getAccount().getAccount_id()); 
+	final Basicp3 save = Repository.save(basicp3);
+		return save;
+} 
+public AppUser getUser() {
+		AppUser user = userService.getLoggedInUser();
+		return user;
+
+	}}
\ No newline at end of file
diff --git a/test7oct-test2-b/authsec_springboot/backend/src/main/java/com/realnet/angulardatatype/Services/Basicp3Service.java b/test7oct-test2-b/authsec_springboot/backend/src/main/java/com/realnet/angulardatatype/Services/Basicp3Service.java
new file mode 100644
index 0000000..9b00ad6
--- /dev/null
+++ b/test7oct-test2-b/authsec_springboot/backend/src/main/java/com/realnet/angulardatatype/Services/Basicp3Service.java
@@ -0,0 +1,174 @@
+package com.realnet.angulardatatype.Services;
+import com.realnet.angulardatatype.Repository.Basicp3Repository;
+import com.realnet.angulardatatype.Entity.Basicp3
+;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 Basicp3Service {
+@Autowired
+private Basicp3Repository Repository;
+	@Autowired
+	private AppUserServiceImpl userService; 
+@Autowired
+	private RealmService realmService;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+@Autowired
+ private SequenceService documentsequencsequenceService;
+
+
+
+
+
+public Basicp3 Savedata(Basicp3 data) {
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+data.setDocumentsequenc (documentsequencsequenceService.GenerateSequence("ff"));
+
+
+
+
+
+	data.setUpdatedBy(getUser().getUserId());
+		data.setCreatedBy(getUser().getUserId());
+		data.setAccountId(getUser().getAccount().getAccount_id());
+Basicp3 save = Repository.save(data);
+				return save;	
+			}
+
+
+//	get all with pagination
+	public Page<Basicp3> getAllWithPagination(Pageable page) {
+		return Repository.findAll( getUser().getUserId(),page);
+	}			
+public List<Basicp3> getdetails() {  
+		List<Realm> realm = realmService.findByUserId(getUser().getUserId());
+List<Basicp3> all = Repository.findAll(getUser().getUserId());
+		
+		return all ;		}
+
+
+public Basicp3 getdetailsbyId(Integer id) {
+	return Repository.findById(id).get();
+			}
+
+
+	public void delete_by_id(Integer id) {
+ Repository.deleteById(id);
+}
+
+
+public Basicp3 update(Basicp3 data,Integer id) {
+	Basicp3 old = Repository.findById(id).get();
+old.setToggle_switch (data.getToggle_switch());
+
+old.setToggle_switch2 (data.getToggle_switch2());
+
+old.setUrl_field(data.getUrl_field());
+
+old.setUrl_field2(data.getUrl_field2());
+
+old.setDecimal_field(data.getDecimal_field());
+
+old.setDecimal_field2(data.getDecimal_field2());
+
+old.setPercentage_field(data.getPercentage_field());
+
+old.setPercentage_field2(data.getPercentage_field2());
+
+old.setDocumentsequenc(data.getDocumentsequenc());
+
+old.setRecaptcha(data.getRecaptcha());
+
+old.setRecaptcha2(data.getRecaptcha2());
+
+final Basicp3 test = Repository.save(old);
+		data.setUpdatedBy(getUser().getUserId());
+  return test;} 
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ public AppUser getUser() {
+		AppUser user = userService.getLoggedInUser();
+		return user;
+
+	}}
diff --git a/test7oct-test2-b/authsec_springboot/backend/src/main/java/com/realnet/angulardatatype/Services/ChildformUpdateService3.java b/test7oct-test2-b/authsec_springboot/backend/src/main/java/com/realnet/angulardatatype/Services/ChildformUpdateService3.java
new file mode 100644
index 0000000..7a57975
--- /dev/null
+++ b/test7oct-test2-b/authsec_springboot/backend/src/main/java/com/realnet/angulardatatype/Services/ChildformUpdateService3.java
@@ -0,0 +1,42 @@
+package com.realnet.angulardatatype.Services;
+import com.realnet.stpkg.Repository.ChildformRepository;
+import com.realnet.stpkg.Entity.Childform;
+ import java.util.List;
+import org.springframework.http.ResponseEntity;
+import java.util.ArrayList;
+
+import org.springframework.http.HttpStatus;
+
+import org.springframework.beans.factory.annotation.Autowired;
+import com.realnet.angulardatatype.Entity.Ad8;
+import com.realnet.angulardatatype.Repository.Ad8Repository;
+	import org.springframework.stereotype.Service;
+
+@Service
+ public class ChildformUpdateService3 {
+@Autowired
+private ChildformRepository Repository;
+@Autowired
+	private Ad8Repository ad8repository;
+
+
+public  ResponseEntity<?>  updateaction(Integer id, Childform childform	) {
+	Integer i = 0;	Ad8 ad8 = ad8repository.findById(id).get();
+List<Childform> list = new ArrayList<>();
+
+		Object ChildformObject = ad8.getChildform();
+
+		if (ChildformObject instanceof List<?>) {
+			// If it's a list, cast and add all elements to the list
+			list.addAll((List<Childform>) ChildformObject);
+		} else if (ChildformObject instanceof Childform) {
+			// If it's a single Childb object, add it to the list
+			list.add((Childform) ChildformObject);
+		}		for (Childform li : list) {		Childform old = Repository.findById(li.getId()).get();
+
+		old.setActive(childform.getActive());
+old.setDescription(childform.getDescription());
+old.setName(childform.getName());
+final Childform childformdata = Repository.save(old);
+i++;}		 			return new ResponseEntity<>(i+" updated", HttpStatus.OK);
+ }}
\ No newline at end of file
diff --git a/test7oct-test2-b/authsec_springboot/backend/src/main/java/com/realnet/angulardatatype/Services/District_ListFilter1Service.java b/test7oct-test2-b/authsec_springboot/backend/src/main/java/com/realnet/angulardatatype/Services/District_ListFilter1Service.java
new file mode 100644
index 0000000..0c263e8
--- /dev/null
+++ b/test7oct-test2-b/authsec_springboot/backend/src/main/java/com/realnet/angulardatatype/Services/District_ListFilter1Service.java
@@ -0,0 +1,57 @@
+package com.realnet.angulardatatype.Services;
+import java.util.*;
+import com.realnet.testdata.Repository.DistrictRepository;
+import com.realnet.testdata.Entity.District;
+
+import com.realnet.angulardatatype.Entity.District_ListFilter1;
+import java.util.List;
+
+import org.springframework.beans.factory.annotation.Autowired;
+	import org.springframework.stereotype.Service;
+
+@Service
+ public class District_ListFilter1Service {
+@Autowired
+private DistrictRepository Repository;
+
+
+
+
+ public   List<District_ListFilter1>   getlistbuilder() {
+	List<District> list= Repository.findAll();
+		ArrayList<District_ListFilter1> l = new ArrayList<>();
+		for (District data : list) {
+Boolean isActive = data.getActive();
+
+				if (Boolean.TRUE.equals(isActive)) {String State_name = data.getState_name();
+ System.out.println(State_name + "\n");
+
+			if ("item".equals(State_name)){	
+District_ListFilter1 dummy = new District_ListFilter1();
+			dummy.setId(data.getId());
+  dummy.setDistrict_name(data.getDistrict_name());
+	l.add(dummy);
+}} 
+} 		
+return l;}
+
+
+
+ public   List<District_ListFilter1>   getlistbuilderparam(  String item) {
+	List<District> list= Repository.findAll();
+		ArrayList<District_ListFilter1> l = new ArrayList<>();
+		for (District data : list) {
+Boolean isActive = data.getActive();
+
+				if (Boolean.TRUE.equals(isActive)) {String State_name = data.getState_name();
+ System.out.println(State_name + "\n");
+
+			if (item.equals(State_name)){	
+District_ListFilter1 dummy = new District_ListFilter1();
+			dummy.setId(data.getId());
+  dummy.setDistrict_name(data.getDistrict_name());
+	l.add(dummy);
+}} 
+} 		
+return l;}
+}
\ No newline at end of file
diff --git a/test7oct-test2-b/authsec_springboot/backend/src/main/java/com/realnet/angulardatatype/Services/Dv2Service.java b/test7oct-test2-b/authsec_springboot/backend/src/main/java/com/realnet/angulardatatype/Services/Dv2Service.java
new file mode 100644
index 0000000..eac7752
--- /dev/null
+++ b/test7oct-test2-b/authsec_springboot/backend/src/main/java/com/realnet/angulardatatype/Services/Dv2Service.java
@@ -0,0 +1,188 @@
+package com.realnet.angulardatatype.Services;
+import com.realnet.angulardatatype.Repository.Dv2Repository;
+import com.realnet.angulardatatype.Entity.Dv2
+;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 com.realnet.config.EmailService;
+
+
+	import org.springframework.stereotype.Service;
+
+@Service
+ public class Dv2Service {
+@Autowired
+private Dv2Repository Repository;
+	@Autowired
+	private AppUserServiceImpl userService; 
+@Autowired
+	private RealmService realmService;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+@Autowired
+	private EmailService emailServicestatic;
+
+public Dv2 Savedata(Dv2 data) {
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 
+
+try 
+		   {
+
+		// emailServicestatic.sendEmail( getUser().getEmail(),"Dv2", "test");
+		emailServicestatic.sendEmailViaSetu(getUser().getEmail(),"test","","ganesh");
+
+} catch (Exception e) {
+			// TODO: handle exception
+			System.out.println("Got error  During Mail Send " + e);
+		}
+
+ 
+
+
+	data.setUpdatedBy(getUser().getUserId());
+		data.setCreatedBy(getUser().getUserId());
+		data.setAccountId(getUser().getAccount().getAccount_id());
+Dv2 save = Repository.save(data);
+				return save;	
+			}
+
+
+//	get all with pagination
+	public Page<Dv2> getAllWithPagination(Pageable page) {
+		return Repository.findAll( getUser().getUserId(),page);
+	}			
+public List<Dv2> getdetails() {  
+		List<Realm> realm = realmService.findByUserId(getUser().getUserId());
+List<Dv2> all = Repository.findAll(getUser().getUserId());
+		
+		return all ;		}
+
+
+public Dv2 getdetailsbyId(Integer id) {
+	return Repository.findById(id).get();
+			}
+
+
+	public void delete_by_id(Integer id) {
+ Repository.deleteById(id);
+}
+
+
+public Dv2 update(Dv2 data,Integer id) {
+	Dv2 old = Repository.findById(id).get();
+
+ 
+old.setTest3(data.getTest3());
+ 
+
+ 
+old.setName(data.getName());
+ 
+
+ 
+old.setLast_name(data.getLast_name());
+ 
+
+  
+
+
+ 
+old.setTest(data.getTest());
+ 
+
+  
+
+old.setCurrency(data.getCurrency());
+
+old.setCurrency2(data.getCurrency2());
+
+old.setQrcode_field(data.getQrcode_field());
+
+old.setQrcode_field2(data.getQrcode_field2());
+
+old.setBarcode_field(data.getBarcode_field());
+
+old.setBarcode_field2(data.getBarcode_field2());
+
+
+
+final Dv2 test = Repository.save(old);
+		data.setUpdatedBy(getUser().getUserId());
+  return test;} 
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ public AppUser getUser() {
+		AppUser user = userService.getLoggedInUser();
+		return user;
+
+	}}
diff --git a/test7oct-test2-b/authsec_springboot/backend/src/main/java/com/realnet/angulardatatype/Services/State_ListFilter1Service.java b/test7oct-test2-b/authsec_springboot/backend/src/main/java/com/realnet/angulardatatype/Services/State_ListFilter1Service.java
new file mode 100644
index 0000000..34b1283
--- /dev/null
+++ b/test7oct-test2-b/authsec_springboot/backend/src/main/java/com/realnet/angulardatatype/Services/State_ListFilter1Service.java
@@ -0,0 +1,57 @@
+package com.realnet.angulardatatype.Services;
+import java.util.*;
+import com.realnet.testdata.Repository.StateRepository;
+import com.realnet.testdata.Entity.State;
+
+import com.realnet.angulardatatype.Entity.State_ListFilter1;
+import java.util.List;
+
+import org.springframework.beans.factory.annotation.Autowired;
+	import org.springframework.stereotype.Service;
+
+@Service
+ public class State_ListFilter1Service {
+@Autowired
+private StateRepository Repository;
+
+
+
+
+ public   List<State_ListFilter1>   getlistbuilder() {
+	List<State> list= Repository.findAll();
+		ArrayList<State_ListFilter1> l = new ArrayList<>();
+		for (State data : list) {
+Boolean isActive = data.getActive();
+
+				if (Boolean.TRUE.equals(isActive)) {String Country_name = data.getCountry_name();
+ System.out.println(Country_name + "\n");
+
+			if ("item".equals(Country_name)){	
+State_ListFilter1 dummy = new State_ListFilter1();
+			dummy.setId(data.getId());
+  dummy.setState_name(data.getState_name());
+	l.add(dummy);
+}} 
+} 		
+return l;}
+
+
+
+ public   List<State_ListFilter1>   getlistbuilderparam(  String item) {
+	List<State> list= Repository.findAll();
+		ArrayList<State_ListFilter1> l = new ArrayList<>();
+		for (State data : list) {
+Boolean isActive = data.getActive();
+
+				if (Boolean.TRUE.equals(isActive)) {String Country_name = data.getCountry_name();
+ System.out.println(Country_name + "\n");
+
+			if (item.equals(Country_name)){	
+State_ListFilter1 dummy = new State_ListFilter1();
+			dummy.setId(data.getId());
+  dummy.setState_name(data.getState_name());
+	l.add(dummy);
+}} 
+} 		
+return l;}
+}
\ No newline at end of file
diff --git a/test7oct-test2-b/authsec_springboot/backend/src/main/java/com/realnet/angulardatatype/Services/SupportInsertService3.java b/test7oct-test2-b/authsec_springboot/backend/src/main/java/com/realnet/angulardatatype/Services/SupportInsertService3.java
new file mode 100644
index 0000000..f9ec8ed
--- /dev/null
+++ b/test7oct-test2-b/authsec_springboot/backend/src/main/java/com/realnet/angulardatatype/Services/SupportInsertService3.java
@@ -0,0 +1,31 @@
+package com.realnet.angulardatatype.Services;
+import com.realnet.angulardatatype.Repository.SupportRepository;
+import com.realnet.angulardatatype.Entity.Support;
+ import java.util.List;
+import com.realnet.users.entity1.AppUser;
+import com.realnet.users.service1.AppUserServiceImpl;
+import org.springframework.beans.factory.annotation.Autowired;
+	import org.springframework.stereotype.Service;
+
+@Service
+ public class SupportInsertService3 {
+@Autowired
+private SupportRepository Repository;
+@Autowired
+	private AppUserServiceImpl userService; 
+
+
+public Support insertaction(Support support	) {
+
+
+	support.setUpdatedBy(getUser().getUserId());
+		support.setCreatedBy(getUser().getUserId());
+		support.setAccountId(getUser().getAccount().getAccount_id()); 
+	final Support save = Repository.save(support);
+		return save;
+} 
+public AppUser getUser() {
+		AppUser user = userService.getLoggedInUser();
+		return user;
+
+	}}
\ No newline at end of file
diff --git a/test7oct-test2-b/authsec_springboot/backend/src/main/java/com/realnet/angulardatatype/Services/SupportService.java b/test7oct-test2-b/authsec_springboot/backend/src/main/java/com/realnet/angulardatatype/Services/SupportService.java
new file mode 100644
index 0000000..c841e7a
--- /dev/null
+++ b/test7oct-test2-b/authsec_springboot/backend/src/main/java/com/realnet/angulardatatype/Services/SupportService.java
@@ -0,0 +1,83 @@
+package com.realnet.angulardatatype.Services;
+import com.realnet.angulardatatype.Repository.SupportRepository;
+import com.realnet.angulardatatype.Entity.Support
+;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 SupportService {
+@Autowired
+private SupportRepository Repository;
+	@Autowired
+	private AppUserServiceImpl userService; 
+@Autowired
+	private RealmService realmService;
+
+
+
+public Support Savedata(Support data) {
+
+
+
+
+	data.setUpdatedBy(getUser().getUserId());
+		data.setCreatedBy(getUser().getUserId());
+		data.setAccountId(getUser().getAccount().getAccount_id());
+Support save = Repository.save(data);
+				return save;	
+			}
+
+
+//	get all with pagination
+	public Page<Support> getAllWithPagination(Pageable page) {
+		return Repository.findAll( getUser().getUserId(),page);
+	}			
+public List<Support> getdetails() {  
+		List<Realm> realm = realmService.findByUserId(getUser().getUserId());
+List<Support> all = Repository.findAll(getUser().getUserId());
+		
+		return all ;		}
+
+
+public Support getdetailsbyId(Integer id) {
+	return Repository.findById(id).get();
+			}
+
+
+	public void delete_by_id(Integer id) {
+ Repository.deleteById(id);
+}
+
+
+public Support update(Support data,Integer id) {
+	Support old = Repository.findById(id).get();
+old.setName(data.getName());
+
+old.setDescription(data.getDescription());
+
+final Support test = Repository.save(old);
+		data.setUpdatedBy(getUser().getUserId());
+  return test;} 
+
+
+
+
+ public AppUser getUser() {
+		AppUser user = userService.getLoggedInUser();
+		return user;
+
+	}}
diff --git a/test7oct-test2-b/authsec_springboot/backend/src/main/java/com/realnet/angulardatatype/Services/SupportUpdateService2.java b/test7oct-test2-b/authsec_springboot/backend/src/main/java/com/realnet/angulardatatype/Services/SupportUpdateService2.java
new file mode 100644
index 0000000..d8bc3ea
--- /dev/null
+++ b/test7oct-test2-b/authsec_springboot/backend/src/main/java/com/realnet/angulardatatype/Services/SupportUpdateService2.java
@@ -0,0 +1,41 @@
+package com.realnet.angulardatatype.Services;
+import com.realnet.angulardatatype.Repository.SupportRepository;
+import com.realnet.angulardatatype.Entity.Support;
+ import java.util.List;
+import org.springframework.http.ResponseEntity;
+import java.util.ArrayList;
+
+import org.springframework.http.HttpStatus;
+
+import org.springframework.beans.factory.annotation.Autowired;
+import com.realnet.angulardatatype.Entity.Ad8;
+import com.realnet.angulardatatype.Repository.Ad8Repository;
+	import org.springframework.stereotype.Service;
+
+@Service
+ public class SupportUpdateService2 {
+@Autowired
+private SupportRepository Repository;
+@Autowired
+	private Ad8Repository ad8repository;
+
+
+public  ResponseEntity<?>  updateaction(Integer id, Support support	) {
+	Integer i = 0;	Ad8 ad8 = ad8repository.findById(id).get();
+List<Support> list = new ArrayList<>();
+
+		Object SupportObject = ad8.getSupport();
+
+		if (SupportObject instanceof List<?>) {
+			// If it's a list, cast and add all elements to the list
+			list.addAll((List<Support>) SupportObject);
+		} else if (SupportObject instanceof Support) {
+			// If it's a single Childb object, add it to the list
+			list.add((Support) SupportObject);
+		}		for (Support li : list) {		Support old = Repository.findById(li.getId()).get();
+
+		old.setDescription(support.getDescription());
+old.setName(support.getName());
+final Support supportdata = Repository.save(old);
+i++;}		 			return new ResponseEntity<>(i+" updated", HttpStatus.OK);
+ }}
\ No newline at end of file
diff --git a/test7oct-test2-b/authsec_springboot/backend/src/main/java/com/realnet/stpkg/Controllers/ChildformController.java b/test7oct-test2-b/authsec_springboot/backend/src/main/java/com/realnet/stpkg/Controllers/ChildformController.java
new file mode 100644
index 0000000..4eb8fc6
--- /dev/null
+++ b/test7oct-test2-b/authsec_springboot/backend/src/main/java/com/realnet/stpkg/Controllers/ChildformController.java
@@ -0,0 +1,99 @@
+package com.realnet.stpkg.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.stpkg.Entity.Childform;
+import com.realnet.stpkg.Services.ChildformService ;
+
+
+
+
+
+
+@RequestMapping(value = "/Childform")
+ @CrossOrigin("*") 
+@RestController
+public class ChildformController {
+	@Autowired
+	private ChildformService Service;
+
+@Value("${projectPath}")
+	private String projectPath;
+ 
+
+
+
+
+
+
+	@PostMapping("/Childform")
+		  public Childform Savedata(@RequestBody Childform data) {
+		Childform save = Service.Savedata(data)	;
+
+
+
+
+
+		System.out.println("data saved..." + save);
+
+ return save;
+	  }
+@PutMapping("/Childform/{id}")
+	public  Childform update(@RequestBody Childform data,@PathVariable Integer id ) {
+		Childform update = Service.update(data,id);
+		System.out.println("data update..." + update);
+		return update;
+	}	 
+//	get all with pagination
+	@GetMapping("/Childform/getall/page")
+	public Page<Childform> getall(@RequestParam(value = "page", required = false) Integer page,
+			@RequestParam(value = "size", required = false) Integer size) {
+		Pageable paging = PageRequest.of(page, size);
+		Page<Childform> get = Service.getAllWithPagination(paging);
+
+		return get;
+
+	}	
+	@GetMapping("/Childform")
+	public List<Childform> getdetails() {
+		 List<Childform> get = Service.getdetails();		
+		return get;
+}
+// get all without authentication 
+
+	@GetMapping("/token/Childform")
+	public List<Childform> getallwioutsec() {
+		 List<Childform> get = Service.getdetails();		
+		return get;
+}
+@GetMapping("/Childform/{id}")
+	public  Childform  getdetailsbyId(@PathVariable Integer id ) {
+		Childform  get = Service.getdetailsbyId(id);
+		return get;
+	}
+@DeleteMapping("/Childform/{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/test7oct-test2-b/authsec_springboot/backend/src/main/java/com/realnet/stpkg/Controllers/tokenFree_ChildformController.java b/test7oct-test2-b/authsec_springboot/backend/src/main/java/com/realnet/stpkg/Controllers/tokenFree_ChildformController.java
new file mode 100644
index 0000000..41b60f2
--- /dev/null
+++ b/test7oct-test2-b/authsec_springboot/backend/src/main/java/com/realnet/stpkg/Controllers/tokenFree_ChildformController.java
@@ -0,0 +1,99 @@
+package com.realnet.stpkg.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.stpkg.Entity.Childform;
+import com.realnet.stpkg.Services.ChildformService ;
+
+
+
+
+
+
+@RequestMapping(value = "/token/Childform")
+ @CrossOrigin("*") 
+@RestController
+public class tokenFree_ChildformController {
+	@Autowired
+	private ChildformService Service;
+
+@Value("${projectPath}")
+	private String projectPath;
+ 
+
+
+
+
+
+
+	@PostMapping("/Childform")
+		  public Childform Savedata(@RequestBody Childform data) {
+		Childform save = Service.Savedata(data)	;
+
+
+
+
+
+		System.out.println("data saved..." + save);
+
+ return save;
+	  }
+@PutMapping("/Childform/{id}")
+	public  Childform update(@RequestBody Childform data,@PathVariable Integer id ) {
+		Childform update = Service.update(data,id);
+		System.out.println("data update..." + update);
+		return update;
+	}	 
+//	get all with pagination
+	@GetMapping("/Childform/getall/page")
+	public Page<Childform> getall(@RequestParam(value = "page", required = false) Integer page,
+			@RequestParam(value = "size", required = false) Integer size) {
+		Pageable paging = PageRequest.of(page, size);
+		Page<Childform> get = Service.getAllWithPagination(paging);
+
+		return get;
+
+	}	
+	@GetMapping("/Childform")
+	public List<Childform> getdetails() {
+		 List<Childform> get = Service.getdetails();		
+		return get;
+}
+// get all without authentication 
+
+	@GetMapping("/token/Childform")
+	public List<Childform> getallwioutsec() {
+		 List<Childform> get = Service.getdetails();		
+		return get;
+}
+@GetMapping("/Childform/{id}")
+	public  Childform  getdetailsbyId(@PathVariable Integer id ) {
+		Childform  get = Service.getdetailsbyId(id);
+		return get;
+	}
+@DeleteMapping("/Childform/{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/test7oct-test2-b/authsec_springboot/backend/src/main/java/com/realnet/stpkg/Entity/Childform.java b/test7oct-test2-b/authsec_springboot/backend/src/main/java/com/realnet/stpkg/Entity/Childform.java
new file mode 100644
index 0000000..670e45e
--- /dev/null
+++ b/test7oct-test2-b/authsec_springboot/backend/src/main/java/com/realnet/stpkg/Entity/Childform.java
@@ -0,0 +1,33 @@
+package com.realnet.stpkg.Entity;
+ import lombok.*;
+import com.realnet.WhoColumn.Entity.Extension; 
+ import javax.persistence.*;
+ import java.time.LocalDateTime;
+ import java.util.*;
+
+
+
+
+
+
+ @Entity 
+ @Data
+ public class    Childform 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/test7oct-test2-b/authsec_springboot/backend/src/main/java/com/realnet/stpkg/Repository/ChildformRepository.java b/test7oct-test2-b/authsec_springboot/backend/src/main/java/com/realnet/stpkg/Repository/ChildformRepository.java
new file mode 100644
index 0000000..b645742
--- /dev/null
+++ b/test7oct-test2-b/authsec_springboot/backend/src/main/java/com/realnet/stpkg/Repository/ChildformRepository.java
@@ -0,0 +1,30 @@
+package com.realnet.stpkg.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.stpkg.Entity.Childform;
+
+@Repository
+public interface  ChildformRepository  extends  JpaRepository<Childform, Integer>  { 
+
+@Query(value = "select * from childform where  created_by=?1", nativeQuery = true)
+	List<Childform> findAll(Long creayedBy);
+
+@Query(value = "select * from childform where  created_by=?1", nativeQuery = true)
+	Page<Childform> findAll( Long creayedBy,Pageable page);
+}
\ No newline at end of file
diff --git a/test7oct-test2-b/authsec_springboot/backend/src/main/java/com/realnet/stpkg/Services/ChildformService.java b/test7oct-test2-b/authsec_springboot/backend/src/main/java/com/realnet/stpkg/Services/ChildformService.java
new file mode 100644
index 0000000..93fb0e0
--- /dev/null
+++ b/test7oct-test2-b/authsec_springboot/backend/src/main/java/com/realnet/stpkg/Services/ChildformService.java
@@ -0,0 +1,93 @@
+package com.realnet.stpkg.Services;
+import com.realnet.stpkg.Repository.ChildformRepository;
+import com.realnet.stpkg.Entity.Childform
+;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 ChildformService {
+@Autowired
+private ChildformRepository Repository;
+	@Autowired
+	private AppUserServiceImpl userService; 
+@Autowired
+	private RealmService realmService;
+
+
+
+
+
+public Childform Savedata(Childform data) {
+
+
+
+
+
+
+	data.setUpdatedBy(getUser().getUserId());
+		data.setCreatedBy(getUser().getUserId());
+		data.setAccountId(getUser().getAccount().getAccount_id());
+Childform save = Repository.save(data);
+				return save;	
+			}
+
+
+//	get all with pagination
+	public Page<Childform> getAllWithPagination(Pageable page) {
+		return Repository.findAll( getUser().getUserId(),page);
+	}			
+public List<Childform> getdetails() {  
+		List<Realm> realm = realmService.findByUserId(getUser().getUserId());
+List<Childform> all = Repository.findAll(getUser().getUserId());
+		
+		return all ;		}
+
+
+public Childform getdetailsbyId(Integer id) {
+	return Repository.findById(id).get();
+			}
+
+
+	public void delete_by_id(Integer id) {
+ Repository.deleteById(id);
+}
+
+
+public Childform update(Childform data,Integer id) {
+	Childform old = Repository.findById(id).get();
+old.setName(data.getName());
+
+old.setDescription(data.getDescription());
+
+old.setActive (data.getActive());
+
+final Childform test = Repository.save(old);
+		data.setUpdatedBy(getUser().getUserId());
+  return test;} 
+
+
+
+
+
+
+ public AppUser getUser() {
+		AppUser user = userService.getLoggedInUser();
+		return user;
+
+	}}
diff --git a/test7oct-test2-b/authsec_springboot/backend/src/main/java/com/realnet/testdata/Controllers/CountryController.java b/test7oct-test2-b/authsec_springboot/backend/src/main/java/com/realnet/testdata/Controllers/CountryController.java
new file mode 100644
index 0000000..ad0da5a
--- /dev/null
+++ b/test7oct-test2-b/authsec_springboot/backend/src/main/java/com/realnet/testdata/Controllers/CountryController.java
@@ -0,0 +1,99 @@
+package com.realnet.testdata.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.testdata.Entity.Country;
+import com.realnet.testdata.Services.CountryService ;
+
+
+
+
+
+
+@RequestMapping(value = "/Country")
+ @CrossOrigin("*") 
+@RestController
+public class CountryController {
+	@Autowired
+	private CountryService Service;
+
+@Value("${projectPath}")
+	private String projectPath;
+ 
+
+
+
+
+
+
+	@PostMapping("/Country")
+		  public Country Savedata(@RequestBody Country data) {
+		Country save = Service.Savedata(data)	;
+
+
+
+
+
+		System.out.println("data saved..." + save);
+
+ return save;
+	  }
+@PutMapping("/Country/{id}")
+	public  Country update(@RequestBody Country data,@PathVariable Integer id ) {
+		Country update = Service.update(data,id);
+		System.out.println("data update..." + update);
+		return update;
+	}	 
+//	get all with pagination
+	@GetMapping("/Country/getall/page")
+	public Page<Country> getall(@RequestParam(value = "page", required = false) Integer page,
+			@RequestParam(value = "size", required = false) Integer size) {
+		Pageable paging = PageRequest.of(page, size);
+		Page<Country> get = Service.getAllWithPagination(paging);
+
+		return get;
+
+	}	
+	@GetMapping("/Country")
+	public List<Country> getdetails() {
+		 List<Country> get = Service.getdetails();		
+		return get;
+}
+// get all without authentication 
+
+	@GetMapping("/token/Country")
+	public List<Country> getallwioutsec() {
+		 List<Country> get = Service.getdetails();		
+		return get;
+}
+@GetMapping("/Country/{id}")
+	public  Country  getdetailsbyId(@PathVariable Integer id ) {
+		Country  get = Service.getdetailsbyId(id);
+		return get;
+	}
+@DeleteMapping("/Country/{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/test7oct-test2-b/authsec_springboot/backend/src/main/java/com/realnet/testdata/Controllers/Country_ListFilter1Controller.java b/test7oct-test2-b/authsec_springboot/backend/src/main/java/com/realnet/testdata/Controllers/Country_ListFilter1Controller.java
new file mode 100644
index 0000000..24626d8
--- /dev/null
+++ b/test7oct-test2-b/authsec_springboot/backend/src/main/java/com/realnet/testdata/Controllers/Country_ListFilter1Controller.java
@@ -0,0 +1,24 @@
+package com.realnet.testdata.Controllers;
+import java.util.List;
+import org.springframework.beans.factory.annotation.Autowired;
+ import org.springframework.web.bind.annotation.*;
+import com.realnet.testdata.Entity.Country_ListFilter1;
+import com.realnet.testdata.Services.Country_ListFilter1Service ;
+@RequestMapping(value = "/Country_ListFilter1")
+@RestController
+public class Country_ListFilter1Controller {
+	
+	@Autowired
+	private Country_ListFilter1Service Service;
+
+		@GetMapping("/Country_ListFilter1")
+	public List<Country_ListFilter1> getlist() {
+		 List<Country_ListFilter1> get = Service.getlistbuilder();		
+		return get;
+}
+		@GetMapping("/Country_ListFilter11")
+	public List<Country_ListFilter1> getlistwithparam( ) {
+		 List<Country_ListFilter1> get = Service.getlistbuilderparam( );		
+		return get;
+}
+}
\ No newline at end of file
diff --git a/test7oct-test2-b/authsec_springboot/backend/src/main/java/com/realnet/testdata/Controllers/DistrictController.java b/test7oct-test2-b/authsec_springboot/backend/src/main/java/com/realnet/testdata/Controllers/DistrictController.java
new file mode 100644
index 0000000..15790c8
--- /dev/null
+++ b/test7oct-test2-b/authsec_springboot/backend/src/main/java/com/realnet/testdata/Controllers/DistrictController.java
@@ -0,0 +1,107 @@
+package com.realnet.testdata.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.testdata.Entity.District;
+import com.realnet.testdata.Services.DistrictService ;
+
+
+
+
+
+
+
+
+@RequestMapping(value = "/District")
+ @CrossOrigin("*") 
+@RestController
+public class DistrictController {
+	@Autowired
+	private DistrictService Service;
+
+@Value("${projectPath}")
+	private String projectPath;
+ 
+
+
+
+
+
+
+
+
+	@PostMapping("/District")
+		  public District Savedata(@RequestBody District data) {
+		District save = Service.Savedata(data)	;
+
+
+
+
+
+
+
+		System.out.println("data saved..." + save);
+
+ return save;
+	  }
+@PutMapping("/District/{id}")
+	public  District update(@RequestBody District data,@PathVariable Integer id ) {
+		District update = Service.update(data,id);
+		System.out.println("data update..." + update);
+		return update;
+	}	 
+//	get all with pagination
+	@GetMapping("/District/getall/page")
+	public Page<District> getall(@RequestParam(value = "page", required = false) Integer page,
+			@RequestParam(value = "size", required = false) Integer size) {
+		Pageable paging = PageRequest.of(page, size);
+		Page<District> get = Service.getAllWithPagination(paging);
+
+		return get;
+
+	}	
+	@GetMapping("/District")
+	public List<District> getdetails() {
+		 List<District> get = Service.getdetails();		
+		return get;
+}
+// get all without authentication 
+
+	@GetMapping("/token/District")
+	public List<District> getallwioutsec() {
+		 List<District> get = Service.getdetails();		
+		return get;
+}
+@GetMapping("/District/{id}")
+	public  District  getdetailsbyId(@PathVariable Integer id ) {
+		District  get = Service.getdetailsbyId(id);
+		return get;
+	}
+@DeleteMapping("/District/{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/test7oct-test2-b/authsec_springboot/backend/src/main/java/com/realnet/testdata/Controllers/StateController.java b/test7oct-test2-b/authsec_springboot/backend/src/main/java/com/realnet/testdata/Controllers/StateController.java
new file mode 100644
index 0000000..7a7638f
--- /dev/null
+++ b/test7oct-test2-b/authsec_springboot/backend/src/main/java/com/realnet/testdata/Controllers/StateController.java
@@ -0,0 +1,107 @@
+package com.realnet.testdata.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.testdata.Entity.State;
+import com.realnet.testdata.Services.StateService ;
+
+
+
+
+
+
+
+
+@RequestMapping(value = "/State")
+ @CrossOrigin("*") 
+@RestController
+public class StateController {
+	@Autowired
+	private StateService Service;
+
+@Value("${projectPath}")
+	private String projectPath;
+ 
+
+
+
+
+
+
+
+
+	@PostMapping("/State")
+		  public State Savedata(@RequestBody State data) {
+		State save = Service.Savedata(data)	;
+
+
+
+
+
+
+
+		System.out.println("data saved..." + save);
+
+ return save;
+	  }
+@PutMapping("/State/{id}")
+	public  State update(@RequestBody State data,@PathVariable Integer id ) {
+		State update = Service.update(data,id);
+		System.out.println("data update..." + update);
+		return update;
+	}	 
+//	get all with pagination
+	@GetMapping("/State/getall/page")
+	public Page<State> getall(@RequestParam(value = "page", required = false) Integer page,
+			@RequestParam(value = "size", required = false) Integer size) {
+		Pageable paging = PageRequest.of(page, size);
+		Page<State> get = Service.getAllWithPagination(paging);
+
+		return get;
+
+	}	
+	@GetMapping("/State")
+	public List<State> getdetails() {
+		 List<State> get = Service.getdetails();		
+		return get;
+}
+// get all without authentication 
+
+	@GetMapping("/token/State")
+	public List<State> getallwioutsec() {
+		 List<State> get = Service.getdetails();		
+		return get;
+}
+@GetMapping("/State/{id}")
+	public  State  getdetailsbyId(@PathVariable Integer id ) {
+		State  get = Service.getdetailsbyId(id);
+		return get;
+	}
+@DeleteMapping("/State/{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/test7oct-test2-b/authsec_springboot/backend/src/main/java/com/realnet/testdata/Controllers/tokenFree_CountryController.java b/test7oct-test2-b/authsec_springboot/backend/src/main/java/com/realnet/testdata/Controllers/tokenFree_CountryController.java
new file mode 100644
index 0000000..e920d13
--- /dev/null
+++ b/test7oct-test2-b/authsec_springboot/backend/src/main/java/com/realnet/testdata/Controllers/tokenFree_CountryController.java
@@ -0,0 +1,99 @@
+package com.realnet.testdata.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.testdata.Entity.Country;
+import com.realnet.testdata.Services.CountryService ;
+
+
+
+
+
+
+@RequestMapping(value = "/token/Country")
+ @CrossOrigin("*") 
+@RestController
+public class tokenFree_CountryController {
+	@Autowired
+	private CountryService Service;
+
+@Value("${projectPath}")
+	private String projectPath;
+ 
+
+
+
+
+
+
+	@PostMapping("/Country")
+		  public Country Savedata(@RequestBody Country data) {
+		Country save = Service.Savedata(data)	;
+
+
+
+
+
+		System.out.println("data saved..." + save);
+
+ return save;
+	  }
+@PutMapping("/Country/{id}")
+	public  Country update(@RequestBody Country data,@PathVariable Integer id ) {
+		Country update = Service.update(data,id);
+		System.out.println("data update..." + update);
+		return update;
+	}	 
+//	get all with pagination
+	@GetMapping("/Country/getall/page")
+	public Page<Country> getall(@RequestParam(value = "page", required = false) Integer page,
+			@RequestParam(value = "size", required = false) Integer size) {
+		Pageable paging = PageRequest.of(page, size);
+		Page<Country> get = Service.getAllWithPagination(paging);
+
+		return get;
+
+	}	
+	@GetMapping("/Country")
+	public List<Country> getdetails() {
+		 List<Country> get = Service.getdetails();		
+		return get;
+}
+// get all without authentication 
+
+	@GetMapping("/token/Country")
+	public List<Country> getallwioutsec() {
+		 List<Country> get = Service.getdetails();		
+		return get;
+}
+@GetMapping("/Country/{id}")
+	public  Country  getdetailsbyId(@PathVariable Integer id ) {
+		Country  get = Service.getdetailsbyId(id);
+		return get;
+	}
+@DeleteMapping("/Country/{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/test7oct-test2-b/authsec_springboot/backend/src/main/java/com/realnet/testdata/Controllers/tokenFree_Country_ListFilter1Controller.java b/test7oct-test2-b/authsec_springboot/backend/src/main/java/com/realnet/testdata/Controllers/tokenFree_Country_ListFilter1Controller.java
new file mode 100644
index 0000000..c348307
--- /dev/null
+++ b/test7oct-test2-b/authsec_springboot/backend/src/main/java/com/realnet/testdata/Controllers/tokenFree_Country_ListFilter1Controller.java
@@ -0,0 +1,24 @@
+package com.realnet.testdata.Controllers;
+import java.util.List;
+import org.springframework.beans.factory.annotation.Autowired;
+ import org.springframework.web.bind.annotation.*;
+import com.realnet.testdata.Entity.Country_ListFilter1;
+import com.realnet.testdata.Services.Country_ListFilter1Service ;
+@RequestMapping(value = "/token/Country_ListFilter1")
+@RestController
+public class tokenFree_Country_ListFilter1Controller {
+	
+	@Autowired
+	private Country_ListFilter1Service Service;
+
+		@GetMapping("/Country_ListFilter1")
+	public List<Country_ListFilter1> getlist() {
+		 List<Country_ListFilter1> get = Service.getlistbuilder();		
+		return get;
+}
+		@GetMapping("/Country_ListFilter11")
+	public List<Country_ListFilter1> getlistwithparam( ) {
+		 List<Country_ListFilter1> get = Service.getlistbuilderparam( );		
+		return get;
+}
+}
\ No newline at end of file
diff --git a/test7oct-test2-b/authsec_springboot/backend/src/main/java/com/realnet/testdata/Controllers/tokenFree_DistrictController.java b/test7oct-test2-b/authsec_springboot/backend/src/main/java/com/realnet/testdata/Controllers/tokenFree_DistrictController.java
new file mode 100644
index 0000000..41af86c
--- /dev/null
+++ b/test7oct-test2-b/authsec_springboot/backend/src/main/java/com/realnet/testdata/Controllers/tokenFree_DistrictController.java
@@ -0,0 +1,107 @@
+package com.realnet.testdata.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.testdata.Entity.District;
+import com.realnet.testdata.Services.DistrictService ;
+
+
+
+
+
+
+
+
+@RequestMapping(value = "/token/District")
+ @CrossOrigin("*") 
+@RestController
+public class tokenFree_DistrictController {
+	@Autowired
+	private DistrictService Service;
+
+@Value("${projectPath}")
+	private String projectPath;
+ 
+
+
+
+
+
+
+
+
+	@PostMapping("/District")
+		  public District Savedata(@RequestBody District data) {
+		District save = Service.Savedata(data)	;
+
+
+
+
+
+
+
+		System.out.println("data saved..." + save);
+
+ return save;
+	  }
+@PutMapping("/District/{id}")
+	public  District update(@RequestBody District data,@PathVariable Integer id ) {
+		District update = Service.update(data,id);
+		System.out.println("data update..." + update);
+		return update;
+	}	 
+//	get all with pagination
+	@GetMapping("/District/getall/page")
+	public Page<District> getall(@RequestParam(value = "page", required = false) Integer page,
+			@RequestParam(value = "size", required = false) Integer size) {
+		Pageable paging = PageRequest.of(page, size);
+		Page<District> get = Service.getAllWithPagination(paging);
+
+		return get;
+
+	}	
+	@GetMapping("/District")
+	public List<District> getdetails() {
+		 List<District> get = Service.getdetails();		
+		return get;
+}
+// get all without authentication 
+
+	@GetMapping("/token/District")
+	public List<District> getallwioutsec() {
+		 List<District> get = Service.getdetails();		
+		return get;
+}
+@GetMapping("/District/{id}")
+	public  District  getdetailsbyId(@PathVariable Integer id ) {
+		District  get = Service.getdetailsbyId(id);
+		return get;
+	}
+@DeleteMapping("/District/{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/test7oct-test2-b/authsec_springboot/backend/src/main/java/com/realnet/testdata/Controllers/tokenFree_StateController.java b/test7oct-test2-b/authsec_springboot/backend/src/main/java/com/realnet/testdata/Controllers/tokenFree_StateController.java
new file mode 100644
index 0000000..5195902
--- /dev/null
+++ b/test7oct-test2-b/authsec_springboot/backend/src/main/java/com/realnet/testdata/Controllers/tokenFree_StateController.java
@@ -0,0 +1,107 @@
+package com.realnet.testdata.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.testdata.Entity.State;
+import com.realnet.testdata.Services.StateService ;
+
+
+
+
+
+
+
+
+@RequestMapping(value = "/token/State")
+ @CrossOrigin("*") 
+@RestController
+public class tokenFree_StateController {
+	@Autowired
+	private StateService Service;
+
+@Value("${projectPath}")
+	private String projectPath;
+ 
+
+
+
+
+
+
+
+
+	@PostMapping("/State")
+		  public State Savedata(@RequestBody State data) {
+		State save = Service.Savedata(data)	;
+
+
+
+
+
+
+
+		System.out.println("data saved..." + save);
+
+ return save;
+	  }
+@PutMapping("/State/{id}")
+	public  State update(@RequestBody State data,@PathVariable Integer id ) {
+		State update = Service.update(data,id);
+		System.out.println("data update..." + update);
+		return update;
+	}	 
+//	get all with pagination
+	@GetMapping("/State/getall/page")
+	public Page<State> getall(@RequestParam(value = "page", required = false) Integer page,
+			@RequestParam(value = "size", required = false) Integer size) {
+		Pageable paging = PageRequest.of(page, size);
+		Page<State> get = Service.getAllWithPagination(paging);
+
+		return get;
+
+	}	
+	@GetMapping("/State")
+	public List<State> getdetails() {
+		 List<State> get = Service.getdetails();		
+		return get;
+}
+// get all without authentication 
+
+	@GetMapping("/token/State")
+	public List<State> getallwioutsec() {
+		 List<State> get = Service.getdetails();		
+		return get;
+}
+@GetMapping("/State/{id}")
+	public  State  getdetailsbyId(@PathVariable Integer id ) {
+		State  get = Service.getdetailsbyId(id);
+		return get;
+	}
+@DeleteMapping("/State/{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/test7oct-test2-b/authsec_springboot/backend/src/main/java/com/realnet/testdata/Entity/Country.java b/test7oct-test2-b/authsec_springboot/backend/src/main/java/com/realnet/testdata/Entity/Country.java
new file mode 100644
index 0000000..a6c8bb6
--- /dev/null
+++ b/test7oct-test2-b/authsec_springboot/backend/src/main/java/com/realnet/testdata/Entity/Country.java
@@ -0,0 +1,33 @@
+package com.realnet.testdata.Entity;
+ import lombok.*;
+import com.realnet.WhoColumn.Entity.Extension; 
+ import javax.persistence.*;
+ import java.time.LocalDateTime;
+ import java.util.*;
+
+
+
+
+
+
+ @Entity 
+ @Data
+ public class    Country 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/test7oct-test2-b/authsec_springboot/backend/src/main/java/com/realnet/testdata/Entity/Country_ListFilter1.java b/test7oct-test2-b/authsec_springboot/backend/src/main/java/com/realnet/testdata/Entity/Country_ListFilter1.java
new file mode 100644
index 0000000..3230334
--- /dev/null
+++ b/test7oct-test2-b/authsec_springboot/backend/src/main/java/com/realnet/testdata/Entity/Country_ListFilter1.java
@@ -0,0 +1,15 @@
+package com.realnet.testdata.Entity;
+ import lombok.*;
+ import javax.persistence.*;
+ import java.time.LocalDateTime;
+ import java.util.*;
+
+ @Data
+ public class    Country_ListFilter1 { 
+
+ private Integer id;
+
+
+ private String name;
+ private String description;
+}
diff --git a/test7oct-test2-b/authsec_springboot/backend/src/main/java/com/realnet/testdata/Entity/District.java b/test7oct-test2-b/authsec_springboot/backend/src/main/java/com/realnet/testdata/Entity/District.java
new file mode 100644
index 0000000..f4e2bf0
--- /dev/null
+++ b/test7oct-test2-b/authsec_springboot/backend/src/main/java/com/realnet/testdata/Entity/District.java
@@ -0,0 +1,37 @@
+package com.realnet.testdata.Entity;
+ import lombok.*;
+import com.realnet.WhoColumn.Entity.Extension; 
+ import javax.persistence.*;
+ import java.time.LocalDateTime;
+ import java.util.*;
+
+
+
+
+
+
+
+
+ @Entity 
+ @Data
+ public class    District extends Extension { 
+ /**
+	 * 
+	 */
+	private static final long serialVersionUID = 1L;
+
+ @Id
+ @GeneratedValue(strategy = GenerationType.IDENTITY)
+ private Integer id;
+
+private String  district_name;
+
+@Column(length = 2000)
+private String description;
+
+private Boolean active;
+
+private String  state_name;
+
+
+}
diff --git a/test7oct-test2-b/authsec_springboot/backend/src/main/java/com/realnet/testdata/Entity/State.java b/test7oct-test2-b/authsec_springboot/backend/src/main/java/com/realnet/testdata/Entity/State.java
new file mode 100644
index 0000000..e39d873
--- /dev/null
+++ b/test7oct-test2-b/authsec_springboot/backend/src/main/java/com/realnet/testdata/Entity/State.java
@@ -0,0 +1,37 @@
+package com.realnet.testdata.Entity;
+ import lombok.*;
+import com.realnet.WhoColumn.Entity.Extension; 
+ import javax.persistence.*;
+ import java.time.LocalDateTime;
+ import java.util.*;
+
+
+
+
+
+
+
+
+ @Entity 
+ @Data
+ public class    State extends Extension { 
+ /**
+	 * 
+	 */
+	private static final long serialVersionUID = 1L;
+
+ @Id
+ @GeneratedValue(strategy = GenerationType.IDENTITY)
+ private Integer id;
+
+private String  state_name;
+
+@Column(length = 2000)
+private String description;
+
+private Boolean active;
+
+private String  country_name;
+
+
+}
diff --git a/test7oct-test2-b/authsec_springboot/backend/src/main/java/com/realnet/testdata/Repository/CountryRepository.java b/test7oct-test2-b/authsec_springboot/backend/src/main/java/com/realnet/testdata/Repository/CountryRepository.java
new file mode 100644
index 0000000..0d3efd5
--- /dev/null
+++ b/test7oct-test2-b/authsec_springboot/backend/src/main/java/com/realnet/testdata/Repository/CountryRepository.java
@@ -0,0 +1,30 @@
+package com.realnet.testdata.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.testdata.Entity.Country;
+
+@Repository
+public interface  CountryRepository  extends  JpaRepository<Country, Integer>  { 
+
+@Query(value = "select * from country where  created_by=?1", nativeQuery = true)
+	List<Country> findAll(Long creayedBy);
+
+@Query(value = "select * from country where  created_by=?1", nativeQuery = true)
+	Page<Country> findAll( Long creayedBy,Pageable page);
+}
\ No newline at end of file
diff --git a/test7oct-test2-b/authsec_springboot/backend/src/main/java/com/realnet/testdata/Repository/DistrictRepository.java b/test7oct-test2-b/authsec_springboot/backend/src/main/java/com/realnet/testdata/Repository/DistrictRepository.java
new file mode 100644
index 0000000..139bd94
--- /dev/null
+++ b/test7oct-test2-b/authsec_springboot/backend/src/main/java/com/realnet/testdata/Repository/DistrictRepository.java
@@ -0,0 +1,32 @@
+package com.realnet.testdata.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.testdata.Entity.District;
+
+@Repository
+public interface  DistrictRepository  extends  JpaRepository<District, Integer>  { 
+
+@Query(value = "select * from district where  created_by=?1", nativeQuery = true)
+	List<District> findAll(Long creayedBy);
+
+@Query(value = "select * from district where  created_by=?1", nativeQuery = true)
+	Page<District> findAll( Long creayedBy,Pageable page);
+}
\ No newline at end of file
diff --git a/test7oct-test2-b/authsec_springboot/backend/src/main/java/com/realnet/testdata/Repository/StateRepository.java b/test7oct-test2-b/authsec_springboot/backend/src/main/java/com/realnet/testdata/Repository/StateRepository.java
new file mode 100644
index 0000000..f8ab9d9
--- /dev/null
+++ b/test7oct-test2-b/authsec_springboot/backend/src/main/java/com/realnet/testdata/Repository/StateRepository.java
@@ -0,0 +1,32 @@
+package com.realnet.testdata.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.testdata.Entity.State;
+
+@Repository
+public interface  StateRepository  extends  JpaRepository<State, Integer>  { 
+
+@Query(value = "select * from state where  created_by=?1", nativeQuery = true)
+	List<State> findAll(Long creayedBy);
+
+@Query(value = "select * from state where  created_by=?1", nativeQuery = true)
+	Page<State> findAll( Long creayedBy,Pageable page);
+}
\ No newline at end of file
diff --git a/test7oct-test2-b/authsec_springboot/backend/src/main/java/com/realnet/testdata/Services/CountryService.java b/test7oct-test2-b/authsec_springboot/backend/src/main/java/com/realnet/testdata/Services/CountryService.java
new file mode 100644
index 0000000..e4de4a5
--- /dev/null
+++ b/test7oct-test2-b/authsec_springboot/backend/src/main/java/com/realnet/testdata/Services/CountryService.java
@@ -0,0 +1,93 @@
+package com.realnet.testdata.Services;
+import com.realnet.testdata.Repository.CountryRepository;
+import com.realnet.testdata.Entity.Country
+;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 CountryService {
+@Autowired
+private CountryRepository Repository;
+	@Autowired
+	private AppUserServiceImpl userService; 
+@Autowired
+	private RealmService realmService;
+
+
+
+
+
+public Country Savedata(Country data) {
+
+
+
+
+
+
+	data.setUpdatedBy(getUser().getUserId());
+		data.setCreatedBy(getUser().getUserId());
+		data.setAccountId(getUser().getAccount().getAccount_id());
+Country save = Repository.save(data);
+				return save;	
+			}
+
+
+//	get all with pagination
+	public Page<Country> getAllWithPagination(Pageable page) {
+		return Repository.findAll( getUser().getUserId(),page);
+	}			
+public List<Country> getdetails() {  
+		List<Realm> realm = realmService.findByUserId(getUser().getUserId());
+List<Country> all = Repository.findAll(getUser().getUserId());
+		
+		return all ;		}
+
+
+public Country getdetailsbyId(Integer id) {
+	return Repository.findById(id).get();
+			}
+
+
+	public void delete_by_id(Integer id) {
+ Repository.deleteById(id);
+}
+
+
+public Country update(Country data,Integer id) {
+	Country old = Repository.findById(id).get();
+old.setName(data.getName());
+
+old.setDescription(data.getDescription());
+
+old.setActive (data.getActive());
+
+final Country test = Repository.save(old);
+		data.setUpdatedBy(getUser().getUserId());
+  return test;} 
+
+
+
+
+
+
+ public AppUser getUser() {
+		AppUser user = userService.getLoggedInUser();
+		return user;
+
+	}}
diff --git a/test7oct-test2-b/authsec_springboot/backend/src/main/java/com/realnet/testdata/Services/Country_ListFilter1Service.java b/test7oct-test2-b/authsec_springboot/backend/src/main/java/com/realnet/testdata/Services/Country_ListFilter1Service.java
new file mode 100644
index 0000000..5282a33
--- /dev/null
+++ b/test7oct-test2-b/authsec_springboot/backend/src/main/java/com/realnet/testdata/Services/Country_ListFilter1Service.java
@@ -0,0 +1,53 @@
+package com.realnet.testdata.Services;
+import java.util.*;
+import com.realnet.testdata.Repository.CountryRepository;
+import com.realnet.testdata.Entity.Country;
+
+import com.realnet.testdata.Entity.Country_ListFilter1;
+import java.util.List;
+
+import org.springframework.beans.factory.annotation.Autowired;
+	import org.springframework.stereotype.Service;
+
+@Service
+ public class Country_ListFilter1Service {
+@Autowired
+private CountryRepository Repository;
+
+
+
+
+ public   List<Country_ListFilter1>   getlistbuilder() {
+	List<Country> list= Repository.findAll();
+		ArrayList<Country_ListFilter1> l = new ArrayList<>();
+		for (Country data : list) {
+Boolean isActive = data.getActive();
+
+				if (Boolean.TRUE.equals(isActive)) {{	
+Country_ListFilter1 dummy = new Country_ListFilter1();
+			dummy.setId(data.getId());
+  dummy.setName(data.getName());
+  dummy.setDescription(data.getDescription());
+	l.add(dummy);
+}} 
+} 		
+return l;}
+
+
+
+ public   List<Country_ListFilter1>   getlistbuilderparam( ) {
+	List<Country> list= Repository.findAll();
+		ArrayList<Country_ListFilter1> l = new ArrayList<>();
+		for (Country data : list) {
+Boolean isActive = data.getActive();
+
+				if (Boolean.TRUE.equals(isActive)) {{	
+Country_ListFilter1 dummy = new Country_ListFilter1();
+			dummy.setId(data.getId());
+  dummy.setName(data.getName());
+  dummy.setDescription(data.getDescription());
+	l.add(dummy);
+}} 
+} 		
+return l;}
+}
\ No newline at end of file
diff --git a/test7oct-test2-b/authsec_springboot/backend/src/main/java/com/realnet/testdata/Services/DistrictService.java b/test7oct-test2-b/authsec_springboot/backend/src/main/java/com/realnet/testdata/Services/DistrictService.java
new file mode 100644
index 0000000..11decc0
--- /dev/null
+++ b/test7oct-test2-b/authsec_springboot/backend/src/main/java/com/realnet/testdata/Services/DistrictService.java
@@ -0,0 +1,103 @@
+package com.realnet.testdata.Services;
+import com.realnet.testdata.Repository.DistrictRepository;
+import com.realnet.testdata.Entity.District
+;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 DistrictService {
+@Autowired
+private DistrictRepository Repository;
+	@Autowired
+	private AppUserServiceImpl userService; 
+@Autowired
+	private RealmService realmService;
+
+
+
+
+
+
+
+public District Savedata(District data) {
+
+
+
+
+
+
+
+
+	data.setUpdatedBy(getUser().getUserId());
+		data.setCreatedBy(getUser().getUserId());
+		data.setAccountId(getUser().getAccount().getAccount_id());
+District save = Repository.save(data);
+				return save;	
+			}
+
+
+//	get all with pagination
+	public Page<District> getAllWithPagination(Pageable page) {
+		return Repository.findAll( getUser().getUserId(),page);
+	}			
+public List<District> getdetails() {  
+		List<Realm> realm = realmService.findByUserId(getUser().getUserId());
+List<District> all = Repository.findAll(getUser().getUserId());
+		
+		return all ;		}
+
+
+public District getdetailsbyId(Integer id) {
+	return Repository.findById(id).get();
+			}
+
+
+	public void delete_by_id(Integer id) {
+ Repository.deleteById(id);
+}
+
+
+public District update(District data,Integer id) {
+	District old = Repository.findById(id).get();
+old.setDistrict_name(data.getDistrict_name());
+
+old.setDescription(data.getDescription());
+
+old.setActive (data.getActive());
+
+old.setState_name(data.getState_name());
+
+final District test = Repository.save(old);
+		data.setUpdatedBy(getUser().getUserId());
+  return test;} 
+
+
+
+
+
+
+
+
+ public AppUser getUser() {
+		AppUser user = userService.getLoggedInUser();
+		return user;
+
+	}}
diff --git a/test7oct-test2-b/authsec_springboot/backend/src/main/java/com/realnet/testdata/Services/StateService.java b/test7oct-test2-b/authsec_springboot/backend/src/main/java/com/realnet/testdata/Services/StateService.java
new file mode 100644
index 0000000..8851623
--- /dev/null
+++ b/test7oct-test2-b/authsec_springboot/backend/src/main/java/com/realnet/testdata/Services/StateService.java
@@ -0,0 +1,103 @@
+package com.realnet.testdata.Services;
+import com.realnet.testdata.Repository.StateRepository;
+import com.realnet.testdata.Entity.State
+;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 StateService {
+@Autowired
+private StateRepository Repository;
+	@Autowired
+	private AppUserServiceImpl userService; 
+@Autowired
+	private RealmService realmService;
+
+
+
+
+
+
+
+public State Savedata(State data) {
+
+
+
+
+
+
+
+
+	data.setUpdatedBy(getUser().getUserId());
+		data.setCreatedBy(getUser().getUserId());
+		data.setAccountId(getUser().getAccount().getAccount_id());
+State save = Repository.save(data);
+				return save;	
+			}
+
+
+//	get all with pagination
+	public Page<State> getAllWithPagination(Pageable page) {
+		return Repository.findAll( getUser().getUserId(),page);
+	}			
+public List<State> getdetails() {  
+		List<Realm> realm = realmService.findByUserId(getUser().getUserId());
+List<State> all = Repository.findAll(getUser().getUserId());
+		
+		return all ;		}
+
+
+public State getdetailsbyId(Integer id) {
+	return Repository.findById(id).get();
+			}
+
+
+	public void delete_by_id(Integer id) {
+ Repository.deleteById(id);
+}
+
+
+public State update(State data,Integer id) {
+	State old = Repository.findById(id).get();
+old.setState_name(data.getState_name());
+
+old.setDescription(data.getDescription());
+
+old.setActive (data.getActive());
+
+old.setCountry_name(data.getCountry_name());
+
+final State test = Repository.save(old);
+		data.setUpdatedBy(getUser().getUserId());
+  return test;} 
+
+
+
+
+
+
+
+
+ public AppUser getUser() {
+		AppUser user = userService.getLoggedInUser();
+		return user;
+
+	}}