+
Export
+
+
@@ -1060,18 +1039,22 @@
-
+
-
-
-
+
+
+
+
+
+
+
@@ -1089,10 +1072,10 @@
-
-
@@ -1111,10 +1094,10 @@
-
-
@@ -1202,70 +1185,13 @@
-->
-
-
- Investment In Business By Applicants
-
-
-
-
-
-
-
-
-
-
-
-
- Location
-
-
-
-
- Well Suited.
- Fairly Suited
- Not Suited
-
-
-
-
-
Documents Sighted
-
Yes
No
@@ -1280,7 +1206,7 @@
Not Applicable
-
+
Yes
@@ -1288,7 +1214,7 @@
Not Applicable
-
+
Yes
@@ -1296,7 +1222,7 @@
Not Applicable
-
+
Yes
@@ -1321,11 +1247,11 @@
-
Yes
No
- Not Applicable
+
@@ -1347,6 +1273,22 @@
+
+
+ Location
+
+
+
+
+ Well Suited.
+ Fairly Suited
+ Not Suited
+
+
+
+
diff --git a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/business-info/business-info.component.scss b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/business-info/business-info.component.scss
index 5defc5be7..cc4dc8bf0 100755
--- a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/business-info/business-info.component.scss
+++ b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/business-info/business-info.component.scss
@@ -135,7 +135,7 @@ mat-header-cell mat-cell {
margin: 0 10px;
}
.tab_class {
- margin-top: 3%;
+ margin-top: 2%;
}
.state-margin {
margin-left: 2%;
diff --git a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/business-info/business-info.component.ts b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/business-info/business-info.component.ts
index e103aa3b3..03a4227d7 100755
--- a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/business-info/business-info.component.ts
+++ b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/business-info/business-info.component.ts
@@ -47,9 +47,12 @@ export class BusinessInfoComponent implements OnInit {
applicants: any;
public businessForm: FormGroup;
private notifier: NotifierService;
- existCompanyList: any = [];
// businessEntityTypeList: any=["Private Limited Company","Proprietorship","Partnership","Limited Liability Partnership (LLP)","One Person Company (OPC)","Hindu Undivided Family (HUF)","Society","Cooperative","Trust","Public Ltd Company","Others"]
- businessEntityTypeList: any =[];
+ businessEntityTypeList: any ={
+ business_entity_type_id:String,
+ business_entity_type_name:String,
+ sourcsection_labeleName:String
+ };
filterCityList : any = [];
// this is for automatic bind entitity name for display
//sourceNames: any = {"Private Limited Company": 'Director / Shareholder Details',"Proprietorship": 'Proprietor Details', "Sole Proprietorship": 'Proprietor Details',"Partnership": 'Partner Details',"Limited Liability Partnership (LLP)": 'Partner Details',"One Person Company (OPC)": 'Director Details',"Hindu Undivided Family (HUF)": 'Karta Details',"Society": 'Member Details',"Cooperative": 'Member Details',"Trust": 'Trustee Details',"Public Ltd Company": 'Director / Shareholder Details','Individual':'Self',"Others": 'Other Enitity Details'};
@@ -58,6 +61,11 @@ export class BusinessInfoComponent implements OnInit {
// InvestedAmountInWords:any;
public relationSource= new MatTableDataSource();
displayedColumns = ['family_member_name','relation','relation_to','relationship_with_company','started_business'];
+ generalExistEntityType:string;
+ generalExistEntityType_other:string;
+ generalExistBusinessYear:Number;
+ generalExistBusinessMonth:Number;
+
constructor(notifier: NotifierService,
private fb: FormBuilder,
private route: ActivatedRoute,
@@ -71,7 +79,10 @@ export class BusinessInfoComponent implements OnInit {
this.pageTitle = this.pd_all_details.company_name;
this.applicants = this.pd_all_details.pdapplicants_detials;
this.form_id = 13;
- this.notifier = notifier;
+ this.notifier = notifier;
+ this.generalExistEntityType = this.pd_all_details.business_entity_type;
+ this.generalExistEntityType_other = this.pd_all_details.business_entity_type_other;
+
}
public viewerOptions: any = {
@@ -104,7 +115,6 @@ export class BusinessInfoComponent implements OnInit {
this.getCountryDataList();
this.initBusinessForm();
this.getCompanyRelation();
- this.getCompanyListForBusiness();
// const Desgn =
this.businessForm.controls['designation'];
// const Partnr = this.businessForm.controls['partners'];
// const otherDoc = this.businessForm.controls['documents'];
@@ -114,8 +124,8 @@ export class BusinessInfoComponent implements OnInit {
params.company_id = this.company_id;
this._pd.retriveForm(params).subscribe(data => {
let businessVal = data.records;
- // this.inWords(data.records.invested_amount);
let constVal: any;
+
//const Desgn = this.businessForm.controls['designation'];
const Partnr: any = this.businessForm.controls['partners'];
const otherDoc = this.businessForm.controls['documents'];
@@ -237,13 +247,7 @@ export class BusinessInfoComponent implements OnInit {
// dynamically add form group control
if(data.dataStatus){
- if(data.records.profession_name.toUpperCase()=='OTHERS'){
- this.businessForm.addControl('profession_name_other', new FormControl('', Validators.required));
- }
-
- if(data.records.business_entity_type.toUpperCase()=='11'){
- this.businessForm.addControl('business_entity_type_other', new FormControl('', Validators.required));
- }
+
if(data.records.seasonality.toUpperCase()=='YES'){
this.businessForm.addControl('peak_period_of_business', new FormControl('', Validators.required));
this.businessForm.addControl('month_of_business_run', new FormControl('', Validators.required)); }
@@ -255,6 +259,9 @@ export class BusinessInfoComponent implements OnInit {
return data.records.manufacturing_activity_details[key];
});
if(selectedManufacturing.length > 0) {
+ // this is for auto generate fields
+ selectedManufacturing.length > 0 ? this.businessForm.addControl('export_import_cert', new FormControl('', Validators.required)) : this.businessForm.removeControl('export_import_cert');
+ selectedManufacturing.length > 0 ? this.businessForm.addControl('factory_cert', new FormControl('', Validators.required)) : this.businessForm.removeControl('factory_cert');
selectedManufacturing.forEach((element,index)=>{
manufacturingControl.push(this.createActivity());
if(element.area_of_sale=='Within India'){
@@ -317,6 +324,7 @@ export class BusinessInfoComponent implements OnInit {
return data.records.retail_trading_activity_details[key];
});
if(selectedRetail.length > 0) {
+ selectedRetail.length > 0 ? this.businessForm.addControl('export_import_cert', new FormControl('', Validators.required)) : this.businessForm.removeControl('export_import_cert');
selectedRetail.forEach((element,index)=>{
retailControl.push(this.createActivity());
if(element.area_of_sale=='Within India'){
@@ -376,6 +384,7 @@ export class BusinessInfoComponent implements OnInit {
return data.records.wholesale_trading_activity_details[key];
});
if(selectedWholesale.length > 0) {
+ selectedWholesale.length > 0 ? this.businessForm.addControl('export_import_cert', new FormControl('', Validators.required)) : this.businessForm.removeControl('export_import_cert');
selectedWholesale.forEach((element,index)=>{
wholesaleControl.push(this.createActivity());
if(element.area_of_sale=='Within India'){
@@ -437,6 +446,8 @@ export class BusinessInfoComponent implements OnInit {
return data.records.service_provider_activity_details[key];
});
if(selectedService.length > 0) {
+ selectedService.length > 0 ? this.businessForm.addControl('practice_cert', new FormControl('', Validators.required)) : this.businessForm.removeControl('practice_cert');
+
selectedService.forEach((element,index)=>{
serviceProviderControl.push(this.createServiceActivity());
if(element.area_of_sale=='Within India'){
@@ -512,7 +523,8 @@ export class BusinessInfoComponent implements OnInit {
else {
businessVal.others_activity_details=[];
- }
+ }
+
this.businessForm.setValue(businessVal);
} else {
//Desgn.push(this.createDesignation());
@@ -536,32 +548,7 @@ export class BusinessInfoComponent implements OnInit {
// load exist company list from master
// this.existCompanyList = this.pd_all_details.pdapplicants_detials.filter(item=>item.company_name!=null).map(mapItem=>mapItem.company_name);
-
- this.businessForm.controls['profession_name'].valueChanges.subscribe(val => {
- val.toUpperCase()=='OTHERS' ? this.businessForm.addControl('profession_name_other', new FormControl('', Validators.required)) : this.businessForm.removeControl('profession_name_other');
- });
- this.businessForm.controls['business_entity_type'].valueChanges.subscribe(val => {
- val.toUpperCase()=='11' ? this.businessForm.addControl('business_entity_type_other', new FormControl('', Validators.required)) : this.businessForm.removeControl('business_entity_type_other');
- });
- this.businessForm.controls['business_date_object'].valueChanges.subscribe(val=>{
-
- let pd_initiation_date:string = this.pd_all_details.pdmaster_details.pd_date_of_initiation.split('/').reverse().join("/");
- let selected_date = this.pipe.transform(val, 'yyyy/MM/dd'); ;
- let diffInMs: number = Date.parse(pd_initiation_date) - Date.parse(selected_date);
- let diff: number = Math.floor(diffInMs / 1000);
- diff /= (60 * 60 * 24 * 30);
- diff=Math.abs(Math.round(diff));
- if(this.businessForm.controls['business_date_object'].value){
- this.businessForm.controls['business_years'].setValue(0);
- this.businessForm.controls['business_month'].setValue(0);
- }
-
- if(diff){
- this.businessForm.controls['business_years'].setValue(Math.floor(diff / 12));
- this.businessForm.controls['business_month'].setValue(Math.floor(diff % 12));
- }
- });
// change relation with businees update dat sorce table
this.businessForm.controls['persons_with_relationships'].valueChanges.subscribe(val=>{
let relationControl = this.businessForm.controls['persons_with_relationships'];
@@ -582,11 +569,6 @@ export class BusinessInfoComponent implements OnInit {
formid: this.form_id,
company_id: this.company_id,
fk_createdby: this.pdid,
- profession_name: [this.company_name, Validators.compose([Validators.required])],
- business_entity_type: ['', Validators.compose([Validators.required])],
- business_years: ['', Validators.compose([Validators.required])],
- business_month: ['', Validators.compose([Validators.required])],
- business_date_object: [''],
//industry: [''],
seasonality: ['', Validators.compose([Validators.required])],
//month_of_business_run : [''],
@@ -599,7 +581,6 @@ export class BusinessInfoComponent implements OnInit {
officer_total: ['', Validators.compose([Validators.required])],
// officer_permanent: ['', Validators.compose([Validators.required])],
// officer_temporary: ['', Validators.compose([Validators.required])],
- invested_amount: ['', Validators.compose([Validators.required])],
//working_capital: ['', Validators.compose([Validators.required])],
is_service_provided: ['', Validators.compose([Validators.required])],
// ownership_setup: ['', Validators.compose([Validators.required])],
@@ -607,9 +588,9 @@ export class BusinessInfoComponent implements OnInit {
// rent_paid: [''],
shop_eat_act_cert: ['', Validators.compose([Validators.required])],
gst_Regn_cert: ['', Validators.compose([Validators.required])],
- export_import_cert: ['', Validators.compose([Validators.required])],
- factory_cert: ['', Validators.compose([Validators.required])],
- practice_cert: ['', Validators.compose([Validators.required])],
+ // export_import_cert: ['', Validators.compose([Validators.required])],
+ //factory_cert: ['', Validators.compose([Validators.required])],
+ // practice_cert: ['', Validators.compose([Validators.required])],
pf_regn: ['', Validators.compose([Validators.required])],
esic_regn: ['', Validators.compose([Validators.required])],
other_documents: ['', Validators.compose([Validators.required])],
@@ -628,52 +609,60 @@ export class BusinessInfoComponent implements OnInit {
// businees activity type change event
changeBusinessActivity(event: any){
- if(event.value.exist_status==true && event.value.type_of_activity_id==1){
+
+ if(event.value.exist_status==true && event.value.type_of_activity_id==2){
let manufacturingControl = this.businessForm.controls['manufacturing_activity_details'];
manufacturingControl.controls = [];
- manufacturingControl.setValue([]);
+ manufacturingControl.setValue([]);
}
- else if(event.value.exist_status==false && event.value.type_of_activity_id==1){
+ else if(event.value.exist_status==false && event.value.type_of_activity_id==2){
let manufacturingControl = this.businessForm.controls['manufacturing_activity_details'];
manufacturingControl.push(this.createActivity());
+
+
}
- if(event.value.exist_status==true && event.value.type_of_activity_id==2){
+ if(event.value.exist_status==true && event.value.type_of_activity_id==3){
let retailControl = this.businessForm.controls['retail_trading_activity_details'];
retailControl.controls = [];
retailControl.setValue([]);
}
- else if(event.value.exist_status==false && event.value.type_of_activity_id==2){
+ else if(event.value.exist_status==false && event.value.type_of_activity_id==3){
let retailControl = this.businessForm.controls['retail_trading_activity_details'];
retailControl.push(this.createActivity());
}
- if(event.value.exist_status==true && event.value.type_of_activity_id==3){
+ if(event.value.exist_status==true && event.value.type_of_activity_id==4){
let wholesaleControl = this.businessForm.controls['wholesale_trading_activity_details'];
wholesaleControl.controls = [];
wholesaleControl.setValue([]);
}
- else if(event.value.exist_status==false && event.value.type_of_activity_id==3){
+ else if(event.value.exist_status==false && event.value.type_of_activity_id==4){
let wholesaleControl = this.businessForm.controls['wholesale_trading_activity_details'];
wholesaleControl.push(this.createActivity());
}
- if(event.value.exist_status==true && event.value.type_of_activity_id==4){
+ if(event.value.exist_status==true && event.value.type_of_activity_id==5){
let serviceControl = this.businessForm.controls['service_provider_activity_details'];
serviceControl.controls = [];
serviceControl.setValue([]);
}
- else if(event.value.exist_status==false && event.value.type_of_activity_id==4){
+ else if(event.value.exist_status==false && event.value.type_of_activity_id==5){
let serviceControl = this.businessForm.controls['service_provider_activity_details'];
serviceControl.push(this.createServiceActivity());
}
- if(event.value.exist_status==true && event.value.type_of_activity_id==5){
+ if(event.value.exist_status==true && event.value.type_of_activity_id==1){
let othersControl = this.businessForm.controls['others_activity_details'];
othersControl.controls = [];
othersControl.setValue([]);
}
- else if(event.value.exist_status==false && event.value.type_of_activity_id==5){
+ else if(event.value.exist_status==false && event.value.type_of_activity_id==1){
let othersControl = this.businessForm.controls['others_activity_details'];
othersControl.push(this.createOthersActivity());
}
+ // check activity type for make dosument sighted filed dynamically
+ this.businessForm.value.manufacturing_activity_details.length > 0 || this.businessForm.value.retail_trading_activity_details.length > 0 || this.businessForm.value.wholesale_trading_activity_details.length > 0 ? this.businessForm.addControl('export_import_cert', new FormControl(this.businessForm.value.export_import_cert, Validators.required)) : this.businessForm.removeControl('export_import_cert');
+ this.businessForm.value.manufacturing_activity_details.length > 0 ? this.businessForm.addControl('factory_cert', new FormControl(this.businessForm.value.factory_cert, Validators.required)) : this.businessForm.removeControl('factory_cert');
+ this.businessForm.value.service_provider_activity_details.length > 0 ? this.businessForm.addControl('practice_cert', new FormControl(this.businessForm.value.practice_cert, Validators.required)) : this.businessForm.removeControl('practice_cert');
+
}
// change area of sale options in manufacturing
changeManufacturingAreaSale(getDetails: any, getIndex){
@@ -879,6 +868,7 @@ export class BusinessInfoComponent implements OnInit {
return this.fb.group({
partner_name: ['', Validators.compose([Validators.required])],
shareholding: [''],
+ started_business: [''],
current_business_experiance_year: ['', Validators.compose([Validators.required])],
current_business_experiance_month: ['', Validators.compose([Validators.required])],
total_business_experiance: ['', Validators.compose([Validators.required])],
@@ -1084,10 +1074,16 @@ export class BusinessInfoComponent implements OnInit {
getBusinessEntity() {
let master_name = 'BUSINESSENTITYTYPE';
this._pd.getAllMasterDatas(master_name).subscribe(data => {
- data.records.forEach(val => {
- this.businessEntityTypeList.push(val);
- this.sourceNames[val.business_entity_type_id] = val.section_label
- });
+ let filterList = data.records.filter(val=>val.business_entity_type_id==this.generalExistEntityType);
+ this.businessEntityTypeList.business_entity_type_id = filterList[0].business_entity_type_id==1;
+ this.businessEntityTypeList.business_entity_type_name = filterList[0].business_entity_type_id!=1 ? filterList[0].business_entity_type_name : this.generalExistEntityType_other;
+ this.businessEntityTypeList.section_label = filterList[0].business_entity_type_id!=1 ? filterList[0].section_label : this.generalExistEntityType_other;
+
+
+ // data.records.forEach(val => {
+ // this.businessEntityTypeList.push(val);
+ // this.sourceNames[val.business_entity_type_id] = val.section_label
+ // });
});
}
@@ -1215,12 +1211,12 @@ export class BusinessInfoComponent implements OnInit {
else {
control.controls[key].removeControl('total_business_previous_experience')
}
- let total ;
- if(control.length > 0){
- total = control.value.reduce((sum, val) => sum + +val.current_business_experiance_year, 0);
- this.businessForm.controls.business_years.setValidators([Validators.required, Validators.min(+total)]);
- this.businessForm.controls.business_years.updateValueAndValidity();
- }
+ // let total ;
+ // if(control.length > 0){
+ // total = control.value.reduce((sum, val) => sum + +val.current_business_experiance_year, 0);
+ // this.businessForm.controls.business_years.setValidators([Validators.required, Validators.min(+total)]);
+ // this.businessForm.controls.business_years.updateValueAndValidity();
+ // }
}
/** To Convert Month into Year */
@@ -1236,18 +1232,6 @@ export class BusinessInfoComponent implements OnInit {
}
- ConvertMonthintoYearforBusiness(e){
-
- let business_year = this.businessForm.controls.business_years.value;
-
- let converted_month : number = e%12;
- let converted_year : number = e/12;
-
- this.businessForm.controls.business_years.setValue(+business_year + +Math.floor(converted_year));
- this.businessForm.controls.business_month.setValue(Math.floor(converted_month));
-
- }
-
/**
* This Function For validate For Appx. sale based on Type OF Activities
*/
@@ -1423,40 +1407,34 @@ export class BusinessInfoComponent implements OnInit {
}
}
- filterMaxSaleCities(datasource: any,filterValues:any) {
- // console.log('Whole State data',datasource); // Whole State data
- // console.log('Filtered state id',filterValues); // Filtered state id
+ filterMaxSaleCities(datasource: any,filterValues:any,selectedCites: any) {
+ let existCities: any = selectedCites.filter(cfVal=>cfVal.city_name!='').map(mcVal=>mcVal.city_name);
+ existCities = [].concat.apply([], existCities);
if(filterValues){
-
let getOriginalStateList = datasource.map(dval => dval.state_id);
- // console.log('Whole State id from Datasources',getOriginalStateList)//Whole State id from Datasources
let setCityFilter = filterValues.map(x => {
let findIndex = getOriginalStateList.indexOf(x);
findIndex = datasource[findIndex].cities;
return findIndex;
});
-
- // console.log('Filtered City Array Based on State Wise',setCityFilter)//Filtered City Array
- // console.log('Previous filtered City id List ',this.filterCityList);
let merged = [].concat.apply([], setCityFilter);
- let getFilteredCityValues = [].concat.apply([],this.filterCityList.filter(val =>val.city_name).map(mapVal => mapVal.city_name));
- let getOriginalCityList = merged.map(dval => dval.city_id);
-
- let Filter: any=[];
-
- Filter = getFilteredCityValues.map(x => {
- let findIndex = getOriginalCityList.indexOf(x);
- findIndex = merged[findIndex];
- // console.log('findIndex',findIndex);
- //return findIndex.filter(x => x !== undefined);
+ // console.log(merged)
+ if(merged.length>0){
+ let check: any = merged.filter(function(fVal){
+ return existCities.some(function(sVal){
+ return fVal.city_id==sVal;
});
-
- Filter = getFilteredCityValues.filter(x => x !== undefined);
-
- return merged.length > 0 ? merged : [];
- //return Filter.length > 0 ? Filter : [];
+ })
+ return check;
+ }
+ else {
+ return [];
+ }
+ }
+ else {
+ return [];
}
}
@@ -1475,15 +1453,6 @@ export class BusinessInfoComponent implements OnInit {
// this.InvestedAmountInWords = this._pd.convertNumberToWords(e);
// }
-
- getCompanyListForBusiness(): void{
- this._pd.getCompaniesListsForBusiness(this.pdid).subscribe(data=>{
- if(data.dataStatus){
- this.existCompanyList = data.records.filter(val =>val.is_active && val.company_order_id==this.company_id);
- }
- })
- }
-
checkTotal(FormData){
// console.log(FormData.value.employees_permanent);
// console.log(FormData.value.employees_temporary);