build_app

This commit is contained in:
risadmin_prod 2025-06-23 05:38:22 +00:00
parent 551400be15
commit 9226092af3
20 changed files with 56 additions and 632 deletions

View File

@ -72,6 +72,18 @@ public class BuilderService {
addCustomMenu( "Steps","Stepper_workflow", "Transcations");
addCustomMenu( "Testdd","Testdd", "Transcations");
addCustomMenu( "State","State", "Transcations");
addCustomMenu( "Country","Country", "Transcations");
addCustomMenu( "Steps","Stepper_workflow", "Transcations");
addCustomMenu( "Village","Village", "Transcations");

View File

@ -26,12 +26,6 @@ import com.realnet.basicp1.Services.TestddService ;
@RequestMapping(value = "/Testdd")
@CrossOrigin("*")
@RestController
@ -52,12 +46,6 @@ public class TestddController {
@PostMapping("/Testdd")
public Testdd Savedata(@RequestBody Testdd data) {
Testdd save = Service.Savedata(data) ;
@ -70,12 +58,6 @@ public class TestddController {
System.out.println("data saved..." + save);
return save;
@ -130,10 +112,4 @@ public class TestddController {
}

View File

@ -26,12 +26,6 @@ import com.realnet.basicp1.Services.TestddService ;
@RequestMapping(value = "/token/Testdd")
@CrossOrigin("*")
@RestController
@ -52,12 +46,6 @@ public class tokenFree_TestddController {
@PostMapping("/Testdd")
public Testdd Savedata(@RequestBody Testdd data) {
Testdd save = Service.Savedata(data) ;
@ -70,12 +58,6 @@ public class tokenFree_TestddController {
System.out.println("data saved..." + save);
return save;
@ -130,10 +112,4 @@ public class tokenFree_TestddController {
}

View File

@ -14,12 +14,6 @@ import com.realnet.WhoColumn.Entity.Extension;
@Entity
@Data
public class Testdd extends Extension {
@ -48,23 +42,5 @@ private String state;
private String distric;
private String city;
private String village;
}

View File

@ -21,9 +21,7 @@ private CityRepository Repository;
List<City> list= Repository.findAll();
ArrayList<City_ListFilter1> l = new ArrayList<>();
for (City data : list) {
boolean isactive = data.isActive();
if (isactive) {String Distric_name = data.getDistric_name();
String Distric_name = data.getDistric_name();
System.out.println(Distric_name + "\n");
if ("item".equals(Distric_name)){
@ -31,7 +29,7 @@ City_ListFilter1 dummy = new City_ListFilter1();
dummy.setId(data.getId());
dummy.setCity_name(data.getCity_name());
l.add(dummy);
}}
}
}
return l;}
@ -41,9 +39,7 @@ return l;}
List<City> list= Repository.findAll();
ArrayList<City_ListFilter1> l = new ArrayList<>();
for (City data : list) {
boolean isactive = data.isActive();
if (isactive) {String Distric_name = data.getDistric_name();
String Distric_name = data.getDistric_name();
System.out.println(Distric_name + "\n");
if (item.equals(Distric_name)){
@ -51,7 +47,7 @@ City_ListFilter1 dummy = new City_ListFilter1();
dummy.setId(data.getId());
dummy.setCity_name(data.getCity_name());
l.add(dummy);
}}
}
}
return l;}
}

View File

@ -21,9 +21,7 @@ private DistricRepository Repository;
List<Distric> list= Repository.findAll();
ArrayList<Distric_ListFilter1> l = new ArrayList<>();
for (Distric data : list) {
boolean isactive = data.isActive();
if (isactive) {String State_name = data.getState_name();
String State_name = data.getState_name();
System.out.println(State_name + "\n");
if ("item".equals(State_name)){
@ -31,7 +29,7 @@ Distric_ListFilter1 dummy = new Distric_ListFilter1();
dummy.setId(data.getId());
dummy.setDistrict_name(data.getDistrict_name());
l.add(dummy);
}}
}
}
return l;}
@ -41,9 +39,7 @@ return l;}
List<Distric> list= Repository.findAll();
ArrayList<Distric_ListFilter1> l = new ArrayList<>();
for (Distric data : list) {
boolean isactive = data.isActive();
if (isactive) {String State_name = data.getState_name();
String State_name = data.getState_name();
System.out.println(State_name + "\n");
if (item.equals(State_name)){
@ -51,7 +47,7 @@ Distric_ListFilter1 dummy = new Distric_ListFilter1();
dummy.setId(data.getId());
dummy.setDistrict_name(data.getDistrict_name());
l.add(dummy);
}}
}
}
return l;}
}

View File

@ -25,12 +25,6 @@ import com.realnet.basicp1.Services.CountryService;
import org.springframework.stereotype.Service;
@Service
@ -51,12 +45,6 @@ private TestddRepository Repository;
public Testdd Savedata(Testdd data) {
@ -86,12 +74,6 @@ Country get = contryserv.getdetailsbyId(contryId);
data.setUpdatedBy(getUser().getUserId());
data.setCreatedBy(getUser().getUserId());
data.setAccountId(getUser().getAccount().getAccount_id());
@ -136,21 +118,6 @@ old.setState(data.getState());
old.setDistric(data.getDistric());
old.setCity(data.getCity());
old.setVillage(data.getVillage());
final Testdd test = Repository.save(old);
data.setUpdatedBy(getUser().getUserId());
return test;}
@ -164,12 +131,6 @@ final Testdd test = Repository.save(old);
public AppUser getUser() {
AppUser user = userService.getLoggedInUser();
return user;

View File

@ -21,9 +21,7 @@ private VillageRepository Repository;
List<Village> list= Repository.findAll();
ArrayList<Village_ListFilter1> l = new ArrayList<>();
for (Village data : list) {
boolean isactive = data.isActive();
if (isactive) {String City_name = data.getCity_name();
String City_name = data.getCity_name();
System.out.println(City_name + "\n");
if ("item".equals(City_name)){
@ -31,7 +29,7 @@ Village_ListFilter1 dummy = new Village_ListFilter1();
dummy.setId(data.getId());
dummy.setVillage_name(data.getVillage_name());
l.add(dummy);
}}
}
}
return l;}
@ -41,9 +39,7 @@ return l;}
List<Village> list= Repository.findAll();
ArrayList<Village_ListFilter1> l = new ArrayList<>();
for (Village data : list) {
boolean isactive = data.isActive();
if (isactive) {String City_name = data.getCity_name();
String City_name = data.getCity_name();
System.out.println(City_name + "\n");
if (item.equals(City_name)){
@ -51,7 +47,7 @@ Village_ListFilter1 dummy = new Village_ListFilter1();
dummy.setId(data.getId());
dummy.setVillage_name(data.getVillage_name());
l.add(dummy);
}}
}
}
return l;}
}

View File

@ -2,11 +2,5 @@ CREATE TABLE db.Country(id BIGINT NOT NULL AUTO_INCREMENT, active VARCHAR(400),
CREATE TABLE db.State(id BIGINT NOT NULL AUTO_INCREMENT, active VARCHAR(400), description VARCHAR(400), country_name VARCHAR(400), state_name VARCHAR(400), PRIMARY KEY (id));
CREATE TABLE db.Distric(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 db.Testdd(id BIGINT NOT NULL AUTO_INCREMENT, distric VARCHAR(400), active VARCHAR(400), description VARCHAR(400), city VARCHAR(400), contry int, state VARCHAR(400), village VARCHAR(400), name VARCHAR(400), PRIMARY KEY (id));
CREATE TABLE db.City(id BIGINT NOT NULL AUTO_INCREMENT, city_name VARCHAR(400), distric_name VARCHAR(400), active VARCHAR(400), description VARCHAR(400), PRIMARY KEY (id));
CREATE TABLE db.Village(id BIGINT NOT NULL AUTO_INCREMENT, active VARCHAR(400), city_name VARCHAR(400), description VARCHAR(400), village_name VARCHAR(400), PRIMARY KEY (id));
CREATE TABLE db.Testdd(id BIGINT NOT NULL AUTO_INCREMENT, active VARCHAR(400), description VARCHAR(400), contry int, state VARCHAR(400), name VARCHAR(400), PRIMARY KEY (id));

View File

@ -42,18 +42,6 @@
<clr-dg-column [clrDgField]="'state'"> <ng-container *clrDgHideableColumn="{hidden: false}"> state
</ng-container></clr-dg-column>
<clr-dg-column [clrDgField]="'distric'"> <ng-container *clrDgHideableColumn="{hidden: false}"> distric
</ng-container></clr-dg-column>
<clr-dg-column [clrDgField]="'city'"> <ng-container *clrDgHideableColumn="{hidden: false}"> city
</ng-container></clr-dg-column>
<clr-dg-column [clrDgField]="'village'"> <ng-container *clrDgHideableColumn="{hidden: false}"> village
</ng-container></clr-dg-column>
<!-- who column -->
<clr-dg-column> <ng-container *clrDgHideableColumn="{hidden: false}">
@ -78,15 +66,6 @@
<clr-dg-cell>{{user.state }}</clr-dg-cell>
<clr-dg-cell>{{user.distric }}</clr-dg-cell>
<clr-dg-cell>{{user.city }}</clr-dg-cell>
<clr-dg-cell>{{user.village }}</clr-dg-cell>
<!-- who column -->
<clr-dg-cell>
@ -253,12 +232,6 @@
<!-- // EDIT DATA......... -->
<clr-modal [(clrModalOpen)]="modalEdit" [clrModalSize]="'lg'" [clrModalStaticBackdrop]="true">
<h3 class="modal-title">Update Testdd
@ -272,12 +245,6 @@
</h3>
<div class="modal-body" *ngIf="rowSelected.id">
<h2 class="heading">{{rowSelected.id}}</h2>
@ -323,57 +290,6 @@
<!-- dependent dropdown field end -->
<!-- dependent dropdown field start -->
<div class="clr-col-sm-12">
<label> distric Dependent</label>
<select name=" distric" [(ngModel)]="rowSelected.distric_dependent " class="clr-dropdown">
<option [ngValue]="null">Select Option</option>
<option *ngFor="let entity of districdependentData" [value]="entity.district_name">{{entity.district_name}}</option>
</select>
</div>
<!-- dependent dropdown field end -->
<!-- dependent dropdown field start -->
<div class="clr-col-sm-12">
<label> city Dependent</label>
<select name=" city" [(ngModel)]="rowSelected.city_dependent " class="clr-dropdown">
<option [ngValue]="null">Select Option</option>
<option *ngFor="let entity of citydependentData" [value]="entity.city_name">{{entity.city_name}}</option>
</select>
</div>
<!-- dependent dropdown field end -->
<!-- dependent dropdown field start -->
<div class="clr-col-sm-12">
<label> village Dependent</label>
<select name=" village" [(ngModel)]="rowSelected.village_dependent " class="clr-dropdown">
<option [ngValue]="null">Select Option</option>
<option *ngFor="let entity of villagedependentData" [value]="entity.village_name">{{entity.village_name}}</option>
</select>
</div>
<!-- dependent dropdown field end -->
</div>
@ -387,12 +303,6 @@
<!-- form code start -->
<div *ngIf="checkFormCode">
<h4 style="font-weight: 300;display: inline;">Extension</h4>
@ -447,12 +357,6 @@
<!-- aeroplane icon -->
&nbsp; &nbsp; &nbsp; &nbsp;
<a *ngIf="userrole?.includes('ADMIN')" style="float: right;" href="javascript:void(0)" role="tooltip" aria-haspopup="true"
@ -504,51 +408,6 @@
</div>
<!-- dependent dropdown field end -->
<!-- dependent dropdown field start -->
<div class="clr-col-sm-12">
<label> distric</label> <select formControlName="distric" class="clr-dropdown">
<option [ngValue]="null">Select Option</option>
<option *ngFor="let entity of districdependentData" [value]="entity.district_name">{{ entity.district_name}}</option>
</select>
</div>
<!-- dependent dropdown field end -->
<!-- dependent dropdown field start -->
<div class="clr-col-sm-12">
<label> city</label> <select formControlName="city" class="clr-dropdown">
<option [ngValue]="null">Select Option</option>
<option *ngFor="let entity of citydependentData" [value]="entity.city_name">{{ entity.city_name}}</option>
</select>
</div>
<!-- dependent dropdown field end -->
<!-- dependent dropdown field start -->
<div class="clr-col-sm-12">
<label> village</label> <select formControlName="village" class="clr-dropdown">
<option [ngValue]="null">Select Option</option>
<option *ngFor="let entity of villagedependentData" [value]="entity.village_name">{{ entity.village_name}}</option>
</select>
</div>
<!-- dependent dropdown field end -->
@ -563,12 +422,6 @@
<!-- form code start -->
@ -611,10 +464,4 @@
<!-- htmlpopup -->

View File

@ -74,15 +74,6 @@ contry : [null],
state : [null],
distric : [null],
city : [null],
village : [null],
@ -94,12 +85,6 @@ village : [null],
}); // component_button200
// form code start
this.extensionService.getJsonObjectsByFormCodeList(this.formcode).subscribe(data => {
@ -146,54 +131,6 @@ this.getallcontry();
});
// Listen for country changes
this.entryForm.get('state')?.valueChanges.subscribe((item) => {
if (item) {
this.dependet2distric(item);
} else {
this.districdependentData = [];
this.entryForm.get('distric')?.setValue(null); // clear state
}
});
// Listen for country changes
this.entryForm.get('distric')?.valueChanges.subscribe((item) => {
if (item) {
this.dependet2city(item);
} else {
this.citydependentData = [];
this.entryForm.get('city')?.setValue(null); // clear state
}
});
// Listen for country changes
this.entryForm.get('city')?.valueChanges.subscribe((item) => {
if (item) {
this.dependet2village(item);
} else {
this.villagedependentData = [];
this.entryForm.get('village')?.setValue(null); // clear state
}
});
}
@ -206,12 +143,6 @@ this.getallcontry();
error;
getData() {
this.mainService.getAll().subscribe((data) => {
@ -241,18 +172,6 @@ this.getallcontry();
this.dependet2state(row.dependentDD);
// Dependemt Dropdown field end
// Dependemt Dropdown field start
this.dependet2distric(row.dependentDD);
// Dependemt Dropdown field end
// Dependemt Dropdown field start
this.dependet2city(row.dependentDD);
// Dependemt Dropdown field end
// Dependemt Dropdown field start
this.dependet2village(row.dependentDD);
// Dependemt Dropdown field end
this.modalEdit = true;
}
@ -283,12 +202,6 @@ this.dependet2village(row.dependentDD);
//console.log("in update");
console.log("id " + id);
console.log(this.rowSelected);
@ -312,12 +225,6 @@ setTimeout(() => {
}, (error) => {
console.log(error);
if (error.status >= 200 && error.status <= 299) {
@ -346,12 +253,6 @@ onCreate() {
this.mainService.create(this.entryForm.value).subscribe(
(data) => {
console.log(data);
@ -370,12 +271,6 @@ setTimeout(() => {
}, (error) => {
console.log(error);
@ -404,12 +299,6 @@ this.modalAdd = true; this.submitted = false;
}
submitted = false;
@ -448,48 +337,6 @@ dependet2state (item){
}
// DependemtDropdown field end
// Dependemt Dropdown field start
districdependentData: any;
dependet2distric (item){
this.mainService.getdistricDependent(item).subscribe( (data) => {
console.log(data);
this.districdependentData = data;
},(error) => { console.log(error); });
}
// DependemtDropdown field end
// Dependemt Dropdown field start
citydependentData: any;
dependet2city (item){
this.mainService.getcityDependent(item).subscribe( (data) => {
console.log(data);
this.citydependentData = data;
},(error) => { console.log(error); });
}
// DependemtDropdown field end
// Dependemt Dropdown field start
villagedependentData: any;
dependet2village (item){
this.mainService.getvillageDependent(item).subscribe( (data) => {
console.log(data);
this.villagedependentData = data;
},(error) => { console.log(error); });
}
// DependemtDropdown field end
// updateaction
@ -503,9 +350,3 @@ dependet2village (item){

View File

@ -46,29 +46,5 @@ return this.apiRequest.get("Country_ListFilter1/Country_ListFilter1"); }
getdistricDependent(field: string): Observable<any> {
return this.apiRequest.get("Distric_ListFilter1/Distric_ListFilter11/" + field);
}
getcityDependent(field: string): Observable<any> {
return this.apiRequest.get("City_ListFilter1/City_ListFilter11/" + field);
}
getvillageDependent(field: string): Observable<any> {
return this.apiRequest.get("Village_ListFilter1/Village_ListFilter11/" + field);
}
// updateaction
}

View File

@ -20,6 +20,7 @@
import { Component, OnInit } from '@angular/core';
@ -250,6 +251,8 @@ export class Stepper_workflowComponent implements OnInit {
console.log('id is ', id)
// stepper route
this.router.navigate(["../steps/", id], { relativeTo: this.route });

View File

@ -97,48 +97,6 @@
<option *ngFor="let entity of dependentData" [value]="entity.id">{{entity.fieldOption}}</option>
</select> </div> <!-- dependent dropdown field end -->
<!-- dependent dropdown field start -->
<div class="clr-col-sm-12">
<label>distric</label>
<select formControlName="distric"
(change)="onEntityChangedistric($event.target.value)" class="clr-dropdown">
<option [ngValue]="null">Select Option</option>
<option *ngFor="let entity of product" [value]="entity.id">{{entity.fieldOption}}</option>
</select> </div>
<div class="clr-col-sm-12">
<label> distric</label> <select formControlName="distric" class="clr-dropdown">
<option [ngValue]="null">Select Option</option>
<option *ngFor="let entity of dependentData" [value]="entity.id">{{entity.fieldOption}}</option>
</select> </div> <!-- dependent dropdown field end -->
<!-- dependent dropdown field start -->
<div class="clr-col-sm-12">
<label>city</label>
<select formControlName="city"
(change)="onEntityChangecity($event.target.value)" class="clr-dropdown">
<option [ngValue]="null">Select Option</option>
<option *ngFor="let entity of product" [value]="entity.id">{{entity.fieldOption}}</option>
</select> </div>
<div class="clr-col-sm-12">
<label> city</label> <select formControlName="city" class="clr-dropdown">
<option [ngValue]="null">Select Option</option>
<option *ngFor="let entity of dependentData" [value]="entity.id">{{entity.fieldOption}}</option>
</select> </div> <!-- dependent dropdown field end -->
<!-- dependent dropdown field start -->
<div class="clr-col-sm-12">
<label>village</label>
<select formControlName="village"
(change)="onEntityChangevillage($event.target.value)" class="clr-dropdown">
<option [ngValue]="null">Select Option</option>
<option *ngFor="let entity of product" [value]="entity.id">{{entity.fieldOption}}</option>
</select> </div>
<div class="clr-col-sm-12">
<label> village</label> <select formControlName="village" class="clr-dropdown">
<option [ngValue]="null">Select Option</option>
<option *ngFor="let entity of dependentData" [value]="entity.id">{{entity.fieldOption}}</option>
</select> </div> <!-- dependent dropdown field end -->
</div>
@ -152,12 +110,6 @@
<div class="clr-row">
</div>
@ -196,12 +148,6 @@
<p><strong>state : </strong> {{ TestddentryForm.get('state')?.value | json}}</p>
<p><strong>distric : </strong> {{ TestddentryForm.get('distric')?.value | json}}</p>
<p><strong>city : </strong> {{ TestddentryForm.get('city')?.value | json}}</p>
<p><strong>village : </strong> {{ TestddentryForm.get('village')?.value | json}}</p>
</div>
</div><div class="button">

View File

@ -79,12 +79,6 @@ contry : [null],
state : [null],
distric : [null],
city : [null],
village : [null],
});
@ -97,12 +91,6 @@ this.getallcontry();
const stepId = this.id; // or from route/query/etc
this.getResolvedDataFromStepper(stepId).subscribe(res => {
@ -139,12 +127,6 @@ contry: data.contry || '',
state: data.state || '',
distric: data.distric || '',
city: data.city || '',
village: data.village || '',
});
}
getResolvedDataFromStepper(id: number): Observable<any> {
@ -253,12 +235,6 @@ village: data.village || '',
this.mainService.createTestdd(this.TestddentryForm.value).subscribe(
(data) => {
console.log('adding data ', data);
@ -291,12 +267,6 @@ village: data.village || '',
}, (error) => {
console.log(error);
if (error.status >= 200 && error.status <= 299) {
@ -369,42 +339,6 @@ dependet2state (item){
},(error) => { console.log(error); }); }
// DependemtDropdown field end
// Dependemt Dropdown field start
onEntityChangedistric(item){
this.dependet2distric(item); }
dependentData: any;
dependet2distric (item){
this.mainService.getById(item).subscribe( (data) => {
console.log(data); this.dependentData = [data];
},(error) => { console.log(error); }); }
// DependemtDropdown field end
// Dependemt Dropdown field start
onEntityChangecity(item){
this.dependet2city(item); }
dependentData: any;
dependet2city (item){
this.mainService.getById(item).subscribe( (data) => {
console.log(data); this.dependentData = [data];
},(error) => { console.log(error); }); }
// DependemtDropdown field end
// Dependemt Dropdown field start
onEntityChangevillage(item){
this.dependet2village(item); }
dependentData: any;
dependet2village (item){
this.mainService.getById(item).subscribe( (data) => {
console.log(data); this.dependentData = [data];
},(error) => { console.log(error); }); }
// DependemtDropdown field end
@ -426,9 +360,3 @@ dependet2village (item){

View File

@ -53,11 +53,5 @@ return this.apiRequest.get("Country_ListFilter1/Country_ListFilter1"); }
// updateaction
}

View File

@ -1,3 +1,7 @@
import { stepsComponent } from './BuilderComponents/stepperworkflow/steps/steps.component';
import { VillageComponent } from './BuilderComponents/basicp1/Village/Village.component';
import { CityComponent } from './BuilderComponents/basicp1/City/City.component';
@ -263,6 +267,14 @@ const routes: Routes = [
// buildercomponents
{path:'steps/:id',component:stepsComponent},

View File

@ -1,3 +1,7 @@
import { stepsComponent } from './BuilderComponents/stepperworkflow/steps/steps.component';
import { VillageComponent } from './BuilderComponents/basicp1/Village/Village.component';
import { CityComponent } from './BuilderComponents/basicp1/City/City.component';
@ -136,6 +140,14 @@ import { Stepper_workflowComponent } from './BuilderComponents/stepperworkflow/S
// buildercomponents
stepsComponent,

View File

@ -226,27 +226,15 @@
"MENU_ACTION_LINK": "Menu Action Link",
"STATUS": "Status",
"SUB_MENU": "Sub Menu",
"city_Name": "city_Name",
"distric_name": "distric_name",
"distric": "distric",
"district_Name": "district_Name",
"Active": "Active",
"Description": "Description",
"Country_name": "Country_name",
"city": "city",
"Village": "Village",
"contry": "contry",
"village_Name": "village_Name",
"City": "City",
"Testdd": "Testdd",
"Name": "Name",
"Active": "Active",
"city_name": "city_name",
"state_name": "state_name",
"State": "State",
"State_Name": "State_Name",
"contry": "contry",
"Country": "Country",
"Distric": "Distric",
"state": "state",
"Country_Name": "Country_Name",
"village": "village"
"Testdd": "Testdd",
"Name": "Name"
}