diff --git a/ng6-seed/sineedge_prod_270119.zip b/ng6-seed/sineedge_prod_270119.zip deleted file mode 100644 index e92de0121..000000000 Binary files a/ng6-seed/sineedge_prod_270119.zip and /dev/null differ diff --git a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/add-pd/add-pd.component.html b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/add-pd/add-pd.component.html index 84726cfcf..53af6fa0f 100755 --- a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/add-pd/add-pd.component.html +++ b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/add-pd/add-pd.component.html @@ -178,7 +178,8 @@ - + + Enter Valid Pincode. diff --git a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/add-pd/add-pd.component.ts b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/add-pd/add-pd.component.ts index 3b82ab9cd..f1dd890d8 100755 --- a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/add-pd/add-pd.component.ts +++ b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/add-pd/add-pd.component.ts @@ -95,7 +95,7 @@ export class AddPdComponent implements OnInit, OnDestroy { fk_city: [null], fk_state: [null],   pincode : [null],/** ,Validators.compose([Validators.minLength(6),Validators.maxLength(6)]) */ - other_pincode:[null], + other_pincode:[null,Validators.compose([Validators.minLength(6),Validators.maxLength(6)])], remarks:[null],   // allocation_type: [null],   // sub_allocation_type: [null], @@ -168,6 +168,7 @@ export class AddPdComponent implements OnInit, OnDestroy { this.subProductList= this.productList.filter(item => item.product_id == productID); this.subProductList=this.subProductList[0].subproducts; + this.subProductList = this.subProductList.filter(item => item.is_others == 0); } // get city list details based on state id diff --git a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/edit-pd-master/edit-pd-master.component.html b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/edit-pd-master/edit-pd-master.component.html index 583560975..68612360f 100755 --- a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/edit-pd-master/edit-pd-master.component.html +++ b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/edit-pd-master/edit-pd-master.component.html @@ -152,7 +152,8 @@ - + + Enter Valid Pincode. diff --git a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/edit-pd-master/edit-pd-master.component.ts b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/edit-pd-master/edit-pd-master.component.ts index d38eb1f45..30d6fbc55 100755 --- a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/edit-pd-master/edit-pd-master.component.ts +++ b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/edit-pd-master/edit-pd-master.component.ts @@ -134,6 +134,7 @@ export class EditPdMasterComponent implements OnInit { loadFormData() { console.log('this.data.record',this.data.records); + console.log('this.reocrds',this.data.records.pincode_id); let stdcode; let landline; if(this.data.records.pd_contact_landline){ @@ -170,15 +171,10 @@ export class EditPdMasterComponent implements OnInit {   addressline1: [this.data.records.addressline1], fk_city: [this.data.records.fk_city], fk_state: [this.data.records.fk_state], -   pincode : [this.data.records.pincode],/** Validators.compose([Validators.minLength(6),Validators.maxLength(6),Validators.pattern('^[0-9]*$')])], */ - other_pincode:[this.data.records.other_pincode], +   pincode : [this.data.records.pincode_id], + other_pincode:[this.data.records.other_pincode,Validators.compose([Validators.minLength(6),Validators.maxLength(6),Validators.pattern('^[0-9]*$')])], remarks: [this.data.records.remarks], }); - console.log('this.pincodeList.filter(data => data.pincode == formValue.pincode).pincode_id',this.pincodeList.filter(data => data.pincode == this.data.records.pincode).pincode_id); - console.log('this.pincodeList.filter(data => data.pincode == formValue.pincode)',this.pincodeList.filter(data => data.pincode == this.data.records.pincode)); - console.log('this',this.pincodeList); - console.log(this.data.records.pincode); - this._EditPDtriggerForm.controls.pincode.setValue(1); } get pdMain() { return this._EditPDtriggerForm.controls; } diff --git a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/address/address.component.ts b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/address/address.component.ts index 9eb3c9d30..fd6681916 100755 --- a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/address/address.component.ts +++ b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/address/address.component.ts @@ -159,7 +159,7 @@ export class AddressComponent implements OnInit { // } this.addressForm.controls.other_premises_bussiness_activity.setValue(data.records.other_premises_bussiness_activity); if(data.records.other_premises_bussiness_activity != '' && data.records.other_premises_bussiness_activity !=null) { - this.addressForm.controls.bussiness_activity_remark.setValue(data.records.other_premises_bussiness_activity); + this.addressForm.controls.bussiness_activity_remark.setValue(data.records.bussiness_activity_remark); } else{ this.addressForm.controls.bussiness_activity_remark.setValue(''); diff --git a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/business-assets-info/business-assets-info.component.html b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/business-assets-info/business-assets-info.component.html index 240abb48c..3b0febd23 100644 --- a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/business-assets-info/business-assets-info.component.html +++ b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/business-assets-info/business-assets-info.component.html @@ -35,9 +35,9 @@
-
+
-
+
@@ -45,10 +45,18 @@ {{ prop.name | titlecase }} - - + + + + Owned + Rented + + + + +
@@ -200,12 +208,12 @@
- + {{"₹"}} {{appxMarketAmtInwords[i]}} Only - + @@ -229,11 +237,9 @@ -->
- - - + - Vintage + Approx Vintage @@ -244,9 +250,9 @@ - - - + + +
@@ -257,13 +263,12 @@
-
-
diff --git a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/business-assets-info/business-assets-info.component.scss b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/business-assets-info/business-assets-info.component.scss index 2f381258f..a1c689d8e 100644 --- a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/business-assets-info/business-assets-info.component.scss +++ b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/business-assets-info/business-assets-info.component.scss @@ -14,10 +14,15 @@ ::ng-deep .cdk-global-overlay-wrapper{ justify-content: center !important; } + +.matcard mat-form-field { + margin: 0 2%; +} - mat-form-field { +mat-form-field { margin: 0 2%; - } +} + $base-card-box-shadow:1.5px 2.6px 24px 0 rgba(0, 35, 136, 0.08) !important; $product-bg-color-hover: rgba(103, 58, 183, 0.7); .p-list-main { diff --git a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/business-assets-info/business-assets-info.component.ts b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/business-assets-info/business-assets-info.component.ts index 5b66497e0..0fabc4ae1 100644 --- a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/business-assets-info/business-assets-info.component.ts +++ b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/business-assets-info/business-assets-info.component.ts @@ -16,7 +16,7 @@ import { PdTrigerService } from '../../../../../pd-service/pd-triger.service'; }) export class BusinessAssetsInfoComponent implements OnInit { - pageTitle: string ="Business Assets"; + pageTitle: string ="Assets used for Business"; pdid:string; public _businessAssetsQuesFrom: FormGroup; @@ -36,6 +36,7 @@ export class BusinessAssetsInfoComponent implements OnInit { AssetValueInwords: any = []; // B_emiAmtInwords: any = []; public m_propertyType = []; + PropertyOwnedType : any = []; // public m_investmentType = []; // public m_freqOfPurchase = []; private notifier: NotifierService; @@ -228,7 +229,22 @@ export class BusinessAssetsInfoComponent implements OnInit { business_emi: [''], }); } - + selectedPropertyOwnedType(e,s,i){ + + // const control = (this._businessAssetsQuesFrom.controls['business_assets_details']).at(i).get('business_details') as FormArray ; + if(e == "owned"){ + // console.log('e o',e); + // console.log('s o',s); + // console.log('i o',i); + this.PropertyOwnedType[i] = true; + } + else{ + // console.log('e r',e); + // console.log('s r',s); + // console.log('i r',i); + this.PropertyOwnedType[i] = false; + } + } show: boolean; selectedAssetsType(e: any, i: any): void { let val = i; @@ -287,7 +303,9 @@ export class BusinessAssetsInfoComponent implements OnInit { loadProperty() { return this._formBuilder.group({ property_type: [''], - other_property_type: [''] + other_property_type: [''], + properties_ownership_type : [''], + properties_monthly_rented_amt:[''] }); } @@ -352,7 +370,9 @@ export class BusinessAssetsInfoComponent implements OnInit { loadPropertyWithData(data) { return this._formBuilder.group({ property_type: [data.property_type], - other_property_type: [data.other_property_type] + other_property_type: [data.other_property_type], + properties_ownership_type : [data.properties_ownership_type], + properties_monthly_rented_amt:[data.properties_monthly_rented_amt] //property_type:[''] }); } @@ -477,7 +497,8 @@ export class BusinessAssetsInfoComponent implements OnInit { case '2': { let business_property_datas : any; data.forEach((datas,i) => { - business_property_datas = { 'property_type':datas.property_type,'other_property_type':datas.other_property_type }; + business_property_datas = { 'property_type':datas.property_type,'other_property_type':datas.other_property_type,'properties_ownership_type':datas.properties_ownership_type,'properties_monthly_rented_amt':datas.properties_monthly_rented_amt }; + this.selectedPropertyOwnedType(datas.properties_ownership_type,i,val); }); const control = (this._businessAssetsQuesFrom.controls['business_assets_details']).at(val).get('business_details') as FormArray ; control.push(this.loadPropertyWithData(business_property_datas)); diff --git a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/business-info/business-info.component.html b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/business-info/business-info.component.html index c0ec7fa7d..f6f98c3c0 100755 --- a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/business-info/business-info.component.html +++ b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/business-info/business-info.component.html @@ -43,7 +43,7 @@ delete
-
+
@@ -57,8 +57,8 @@
-

No of Years in Current Business

-
+

No of Years since formation of {{pageTitle}}

+
@@ -70,19 +70,21 @@ + Total Experience is Lower than Experience's Year
-
+
-
+ +
- +
@@ -426,8 +432,8 @@ @@ -514,9 +520,9 @@
-
+
- + Countries Where Export Is Being Done for {{retail.value.main_products}} @@ -526,8 +532,9 @@ - - + + +
@@ -662,8 +671,8 @@ @@ -750,9 +759,9 @@
-
+
- + Countries Where The Export Is Being Done for {{wholesale.value.main_products}} @@ -760,8 +769,9 @@ - - + + +
@@ -896,8 +908,8 @@ @@ -1116,7 +1128,8 @@
-
@@ -1126,8 +1139,8 @@ @@ -1143,7 +1156,8 @@
-
@@ -1153,8 +1167,8 @@ 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 fe11894ba..8833df39f 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 @@ -46,6 +46,7 @@ export class BusinessInfoComponent implements OnInit { relativeNames: any; applicants: any; + EntityTypeFlag : boolean = false; public businessForm: FormGroup; private notifier: NotifierService; // 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"] @@ -117,6 +118,7 @@ export class BusinessInfoComponent implements OnInit { this.getCountryDataList(); this.initBusinessForm(); this.getCompanyRelation(); + this.getTitle(); // const Desgn = this.businessForm.controls['designation']; // const Partnr = this.businessForm.controls['partners']; // const otherDoc = this.businessForm.controls['documents']; @@ -1087,8 +1089,40 @@ export class BusinessInfoComponent implements OnInit { 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; + + // console.log(this.businessEntityTypeList.business_entity_type_id+' , '+this.businessEntityTypeList.business_entity_type_name+' , '+this.businessEntityTypeList.section_label); + // if(this.businessEntityTypeList.business_entity_type_name == 'OPC (One Person Company)' || this.businessEntityTypeList.business_entity_type_name == 'Sole proprietorship'){ + // console.log('condition'); + // this.EntityTypeFlag = true; + // const Partnr: any = this.businessForm.controls['partners']; + + // Partnr.partner_other_name.updateValueAndValidity(); + // Partnr.partner_other_name.clearValidators(); + // // Partnr.partner_other_name.setValue(''); + + // Partnr.shareholding.setValue(''); + + // Partnr.started_business.setValue(''); + + // Partnr.current_business_experiance_year.clearValidators(); + // Partnr.current_business_experiance_year.updateValueAndValidity(); + // Partnr.current_business_experiance_year.setValue(''); + + // Partnr.current_business_experiance_month.setValue(''); + + // Partnr.total_business_experiance.clearValidators(); + // Partnr.total_business_experiance.updateValueAndValidity(); + // Partnr.total_business_experiance.setValue(''); + + // Partnr.total_business_previous_experience.clearValidators(); + // Partnr.total_business_previous_experience.updateValueAndValidity(); + // Partnr.total_business_previous_experience.setValue(''); + + // Partnr.total_business_previous_experience.setValue(''); + + // } // data.records.forEach(val => { // this.businessEntityTypeList.push(val); // this.sourceNames[val.business_entity_type_id] = val.section_label @@ -1234,6 +1268,16 @@ export class BusinessInfoComponent implements OnInit { let control: any = this.businessForm.get('partners') as FormArray; value=='Others' ? control.controls[key].addControl('partner_other_name', new FormControl('', Validators.required)) : control.controls[key].removeControl('partner_other_name'); } + + // Out of Total Export Sales what % of Sales is done in Albania? + getPlaceHolderName(id){ + let name = this.countryDataList.filter(value=>value.country_id == id); + // console.log(name); + // console.log(name[0].country_name); + // console.log(id); + return 'Out of Total Export Sales what % of Sales is done in '+ name[0].country_name +' ?'; + // return name[0].country_name +'?'; + } // get work experience based on create form control getWorkExperience(event, key) { let current_experience = event.current_business_experiance_year=='' ? 0 : parseInt(event.current_business_experiance_year); @@ -1294,6 +1338,7 @@ export class BusinessInfoComponent implements OnInit { } // let design: any; let records = this.businessForm.value; + // console.log(records); //to check the Appx. sale validation. // this.validateAppxSales(records); @@ -1310,6 +1355,18 @@ export class BusinessInfoComponent implements OnInit { let validationFlag : number = 0; + // let shareHoldValidationFlag : number = 0; + // console.log(records.partners.length); + // console.log(records.partners); + + if(records.partners.length > 0){ + let total = records.partners.map(shares => shares.shareholding).reduce((a, b) => a + +b, 0); + if(total > 100){ + this.notifier.notify('warning',"Shareholding is greater than 100%"); + return; + } + } + // return; //type 1: Checking manufacturing_activity_details if(records.manufacturing_activity_details.length > 0){ @@ -1321,7 +1378,7 @@ export class BusinessInfoComponent implements OnInit { }); let total = ManufacturingArray.reduce((sum, item) => sum + +item.approx_sale, 0); if(total > 100 || total < 100){ - validationFlag++; + this.notifier.notify('warning',"Approximate sales doesn't add upto 100%"); } } }); diff --git a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/financial-info/financial-info.component.html b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/financial-info/financial-info.component.html index 420ea59ce..fb9ea3aee 100755 --- a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/financial-info/financial-info.component.html +++ b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/financial-info/financial-info.component.html @@ -27,16 +27,17 @@
- + - + Yes No +
- +
Enter year from which financials provided @@ -50,8 +51,8 @@ -
+
@@ -92,8 +93,7 @@
- - + Net Profit Net Loss @@ -160,7 +160,7 @@
- + @@ -176,7 +176,7 @@ - + Yes No @@ -196,11 +196,13 @@ - + + {{"₹"}} {{AV_SalesFrmInwords[i]}} Only - + + {{"₹"}} {{AV_SalesToInwords[i]}} Only @@ -212,15 +214,23 @@
- + - + Net Profit Net Loss - + + + + Yes + No + + + + -
+
@@ -241,12 +251,14 @@ {{"₹"}} {{AV_marginProfitAmtInwords[i]}} Only ( {{"₹"}} {{details.get('estimate_profit_margin').value}} )
-
+
- + + {{"₹"}} {{AV_netProfitAmtFrmInwords[i]}} Only - + + {{"₹"}} {{AV_netProfitAmtToInwords[i]}} Only @@ -254,11 +266,11 @@
- + - -
+ +
@@ -271,12 +283,14 @@
-
+
- + + {{"₹"}} {{AV_netLossAmtFrmInwords[i]}} Only - + + {{"₹"}} {{AV_netLossAmtToInwords[i]}} Only @@ -284,7 +298,12 @@ -
+
+
+ + + +
- +