From 92c498a762331607d75357a110bfa07bb0e12fb6 Mon Sep 17 00:00:00 2001 From: "venbatechnologies@gmail.com" Date: Tue, 18 Dec 2018 12:10:06 +0530 Subject: [PATCH 1/4] UI Changes --- .../family-details.component.html | 117 +----------------- 1 file changed, 4 insertions(+), 113 deletions(-) diff --git a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/family-details/family-details.component.html b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/family-details/family-details.component.html index 6d2bd2762..6729a36d9 100755 --- a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/family-details/family-details.component.html +++ b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/family-details/family-details.component.html @@ -246,120 +246,10 @@ - - - -
-
-
-
- -
-
-
-
- Nivi SKM - -
- -
-
-
-
-
-
-
-
- -
-
-
-
- Nivi SKM - -
- -
-
-
-
-
-
-
-
- -
-
-
-
- Nivi SKM - -
- -
-
-
-
-
-
-
-
- -
-
-
-
- Nivi SKM - -
- -
-
-
-
-
-
-
-
- -
-
-
-
- Nivi SKM - -
- -
-
-
-
-
-
-
-
- -
-
-
-
- Nivi SKM - -
- -
-
-
-
-
- -
- - - - + +
@@ -449,7 +339,8 @@
-
+ + From 3db4eb664ed20baa3f2fff54f5a3582007e0952f Mon Sep 17 00:00:00 2001 From: "venbatechnologies@gmail.com" Date: Tue, 18 Dec 2018 12:44:06 +0530 Subject: [PATCH 2/4] address,asset,stock : ps --- .../forms/address/address.component.html | 12 +- .../forms/address/address.component.ts | 337 +++++++--- .../assets-info/assets-info.component.html | 604 ++++++++++-------- .../assets-info/assets-info.component.ts | 58 +- .../start-pd/forms/stock/stock.component.html | 134 +++- .../start-pd/forms/stock/stock.component.ts | 368 +++++++++-- .../pd-service/pd-triger.service.ts | 7 + 7 files changed, 1056 insertions(+), 464 deletions(-) diff --git a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/address/address.component.html b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/address/address.component.html index 5829feb40..1f715afe1 100755 --- a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/address/address.component.html +++ b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/address/address.component.html @@ -102,19 +102,25 @@ - - +

Type of Premises

+
+
+ {{at.address_type}} +
+
- +
{ - enduse.push(val.premises_types); - existPremises.push(val); - }); + // // console.log(bussiness_address_type); + - this.formPremisesArray = existPremises; + // let selectedPremisesDBData = Object.keys(data.records.bussiness_address_type).map(function (key) { + // return data.records.bussiness_address_type[key]; + // }); - this.addressForm.controls.bussiness_address_type.setValue(enduse); - - var additionalPremisesResult = Object.keys(data.records.additional_premises).map(function (key) { - return data.records.additional_premises[key]; - }); + // let enduse: any = []; + // let existPremises: any =[]; - // let cityenduse: any = []; - // let existcity: any =[]; + // selectedPremisesDBData.forEach(val => { + // enduse.push(val.premises_types); + // existPremises.push(val); + // }); - // additionalPremisesResult.forEach(val => { - // cityenduse.push(val.premises_types); - // existcity.push(val); - // }); - - // this.formPremisesCityArray = existcity; - - additionalPremisesResult.forEach((val,index)=> - { - console.log(val); - let cityenduse: any = []; - let existcity: any =[]; - - if(val.premises_city != ''){ - this.formPremisesCityArray = []; - val.premises_city.forEach(option => { - // cityenduse.push(option); - // existcity.push(val); - //this.formPremisesCityArray.push({additional_premises_city: option}); - //this.addressForm.controls.additional_premises.value[index].premises_city = cityenduse; - console.log(option); - }); - //console.log(cityenduse); - //this.formPremisesCityArray = existcity; - } - - - }); - - - if (additionalPremisesResult.length == 0) { - additionalPremisesControl.push(this.createPremises()); - } else { - let cityenduse: any = []; - let existcity: any =[]; - - additionalPremisesResult.forEach(datas => { - if(datas.premises_city != ''){ - cityenduse.push(datas.additional_premises_city); - existcity.push(datas); - } - additionalPremisesControl.push(this.createPremises()); - }); - - this.formPremisesCityArray = existcity; - console.log(cityenduse); - console.log(existcity); - - this.addressForm.controls['additional_premises'].setValue(additionalPremisesResult); + // this.formPremisesArray = existPremises; - } + + // this.addressForm.controls.bussiness_address_type.setValue(enduse); + + // var additionalPremisesResult = Object.keys(data.records.additional_premises).map(function (key) { + // return data.records.additional_premises[key]; + // }); + + // this.additional_premises = additionalPremisesResult; + + // if (additionalPremisesResult.length == 0) { + // additionalPremisesControl.push(this.createPremises()); + // } else { + // additionalPremisesResult.forEach(datas => { + // additionalPremisesControl.push(this.createPremises()); + // }); + // } - if(data.records.bussiness_address_type == 12) { - this.addressForm.controls.bussiness_address_type_others.setValue(data.records.bussiness_address_type_others); - } + // if(data.records.bussiness_address_type == 12) { + // this.addressForm.controls.bussiness_address_type_others.setValue(data.records.bussiness_address_type_others); + // } + // } + + if(data.records.bussiness_activity == 'yes' && data.records.bussiness_address_type !=null) { + let that = this; + this.bussiness_address_type = []; + + this.bussiness_address_type = (Object.keys(data.records.bussiness_address_type).map(function(key) + { + return data.records.bussiness_address_type[key].premises_types; + })) + + this.additional_premises = Object.keys(data.records.additional_premises).map(function(key) + { + return data.records.additional_premises[key]; + }) + } + console.log(this.bussiness_address_type); + console.log(this.additional_premises); + + this.selectedValue(this.bussiness_address_type,this.additional_premises); if (data.records.locality_others) { this.addressForm.controls.locality_others.setValue(data.records.locality_others); } + // if (result.length == 0) { // control.push(this.createNeighbour()); // } else { @@ -221,6 +212,7 @@ export class AddressComponent implements OnInit { } }); } + public initAddressForm(): void { this.addressForm = this.fb.group({ address: ['', Validators.compose([Validators.required])], @@ -357,8 +349,12 @@ export class AddressComponent implements OnInit { // console.log(val); }); } - - + else{ + this.formPremisesCityArray = []; + + this.addressForm.controls.additional_premises.value[index].premises_city = null; + + } }); records.additional_premises = this.addressForm.controls.additional_premises.value; @@ -383,59 +379,194 @@ export class AddressComponent implements OnInit { // this.formPremisesCityArray.push({city: option}); // }); // } - SelectedPremises($event){ - console.log('event',$event); let premisesData = $event.source.value; - - - if($event.source._selected === true ){ - + console.log(premisesData); + + if($event.checked === true ){ + //this.formPremisesArray.push({member: $event.source.value}); //this.selectedSegmentDatas.push(CustomerSegmentName.name); //console.log('true',premisesData); - + //console.log(this.formPremisesArray); - + this.formPremisesArray.push({premises_types: $event.source.value}); - - //console.log(this.formPremisesArray); - - let array = this.addressData.filter(data => data.address_type_id == premisesData); - + + console.log(this.formPremisesArray); + const control = this.addressForm.controls['additional_premises']; + let array = this.addressData.filter(data => data.address_type_id == premisesData)[0]; + console.log(array); if(premisesData == 12){ this.PremisesOtherFlag = true; - this.PremisesLabel[this.z] = this.addressForm.get('bussiness_address_type_others').value; + // this.PremisesLabel[this.z] = this.pdQuestionAddress.get('bussiness_address_type_others').value; + control.push(this.createPremises()); + } else{ - this.PremisesLabel[this.z] = array[0].address_type; - } - this.z++; - - - const control = this.addressForm.controls['additional_premises']; + this.PremisesLabel[this.z] = array.address_type; control.push(this.createPremises()); - - + + } + console.log(this.PremisesLabel); + this.z++; + + + + + } - else if($event.source._selected === false ){ - - console.log('false',premisesData); - + else if($event.checked === false ){ if(premisesData == 12){ this.PremisesOtherFlag = false; } - + console.log(this.formPremisesArray); + let index = this.formPremisesArray.findIndex(form=>form.premises_types== $event.source.value); + console.log(index); const control = this.addressForm.controls['additional_premises']; - control.removeAt(this.z); + control.removeAt(index); + this.PremisesLabel.splice(index,1); + console.log(this.z); this.z--; - //let index = this.selectedSegmentDatas.indexOf(CustomerSegmentName.name); - //this.selectedSegmentDatas.splice(index,1); } + + } + + getCity(e) + { + this.cityData = []; + e.forEach(val=> + { + this.cityData.push({additional_premises_city:val}); + }); + console.log(this.cityData); + } + otherValueset() + { + let z = this.z; + this.PremisesLabel[z-1] = this.addressForm.get('bussiness_address_type_others').value; + } +// checkaddress(value) +// { +// // console.log(value); +// if(value=="OTHERS") +// { +// this.addressRemarksAccess = true; +// }else +// { +// this.addressRemarksAccess = false; +// } +// } + + + // SelectedPremises($event){ + // console.log('event',$event); + + // let premisesData = $event.source.value; + + + // if($event.source._selected === true ){ + + // //this.formPremisesArray.push({member: $event.source.value}); + // //this.selectedSegmentDatas.push(CustomerSegmentName.name); + // //console.log('true',premisesData); + + // //console.log(this.formPremisesArray); + + // this.formPremisesArray.push({premises_types: $event.source.value}); + + // //console.log(this.formPremisesArray); + + // let array = this.addressData.filter(data => data.address_type_id == premisesData); + // if(premisesData == 12){ + // this.PremisesOtherFlag = true; + // this.PremisesLabel[this.z] = this.addressForm.get('bussiness_address_type_others').value; + // } + // else{ + // this.PremisesLabel[this.z] = array[0].address_type; + // } + // this.z++; + + + // const control = this.addressForm.controls['additional_premises']; + // control.push(this.createPremises()); + + + + // } + // else if($event.source._selected === false ){ + + // console.log('false',premisesData); + + + // if(premisesData == 12){ + // this.PremisesOtherFlag = false; + // } + + // const control = this.addressForm.controls['additional_premises']; + // control.removeAt(this.z); + // this.z--; + // //let index = this.selectedSegmentDatas.indexOf(CustomerSegmentName.name); + // //this.selectedSegmentDatas.splice(index,1); + // } + + // } + + selectedValue(e,data) + { + console.log('501 function',); + console.log('inside function in bussiness_address_type,',e); + console.log('inside function in this.additional_premises,',data); + + let premisesData = e ; + this.tempArr = []; + let that = this; + this.addressData = Object.keys(this.addressData).map(function(key) + { + that.addressData[key].status = 0; + return that.addressData[key]; + }) + console.log(this.addressData); + premisesData.forEach((val,index)=> + { + console.log(val); + this.z++; + // console.log(this.addressTypes); + this.formPremisesArray.push({premises_types: val}); + + this.tempArr.push(this.addressData.filter(add=>add.address_type_id==val)[0]); + + this.PremisesLabel[index] = this.tempArr[index].address_type; + + if(data[index] !==undefined && data[index].premises_ownership < 2 ){ + data[index].premises_city = Object.keys(data[index].premises_city).map(function(key) + { + return data[index].premises_city[key].additional_premises_city; + }); + } + this.addressData.forEach(data=> + { + if(data.address_type_id == val) + { + data.status = 1; + } + }); + + }); + + const control = this.addressForm.controls['additional_premises'] as FormArray; + + // control.removeAt(0); + this.tempArr.forEach((item,index)=> + { + control.push(this.createPremises()); + }); + + this.addressForm.controls['additional_premises'].setValue(data); } validateAllFormFields(formGroup: FormGroup) { diff --git a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/assets-info/assets-info.component.html b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/assets-info/assets-info.component.html index d4645df51..292ea4a38 100755 --- a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/assets-info/assets-info.component.html +++ b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/assets-info/assets-info.component.html @@ -14,6 +14,306 @@ + + +
+
+ + +
+
+
+ + +
+
+ + + {{ asset.name }} + + +
+ +
+ +
+
+
+
+
+ + + {{ prop.name }} + + +
+
+ + + +
+
+
+
+
+ +
+
+
+
+
+ + + +
+
+
+
+
+ +
+
+
+
+
+ + + +
+
+
+
+
+ +
+
+
+
+
+ + + +
+
+
+
+
+ +
+
+
+
+
+
+ + + +
+
+ + + {{ freqn.name }} + + +
+
+ + + +
+
+
+
+ + + +
+
+
+
+
+
+ +
+
+
+
+
+
+ + + {{ ins_type.name }} + + +
+ + + + + +
+ + + +
+
+ + + +
+
+
+
+
+
+ + +
+
+
+
+
+ + + + + + + + + + + + Yes + No + NAN + + + + + + + +
+
+
+
+
+ +
+ + +
+
+
+ + + +
+
+
+ +
+ + + +
+ + + + +
+
+
+
+
+ + + Yes + No + + +
+
+ + + +
+
+ + + +
+
+ + + +
+
+ + + + +
+
+
+ + + +
+
+ + + +
+
+
+ + +
+
+
+ +
+ +
+ + + + + + +
+
+ +
@@ -233,11 +533,37 @@
-
+ +
+ + + + {{owner.applicant_name}} + + + +
+
+ + + +
+
+ + + + {{relations.name}} + + + +
-
- -
-
-
-
-
- - - {{ prop.name }} - - -
-
- - - -
-
-
-
-
- -
-
-
-
-
- - - -
-
-
-
-
- -
-
-
-
-
- - - -
-
-
-
-
- -
-
-
-
-
- - - -
-
-
-
-
- -
-
-
-
-
-
- - - -
-
- - - {{ freqn.name }} - - -
-
- - - -
-
-
-
- - - -
-
-
-
-
-
- -
-
-
-
-
-
- - - {{ ins_type.name }} - - -
- - - - - -
- - - -
-
- - - -
-
-
-
-
-
- - -
-
-
-
-
- - - - - - - - - - - - Yes - No - NAN - - - - - - - -
-
-
-
-
- -
- - -
-
-
- - - -
-
-
- -
- - - -
-
-
-
-
-
- - - Yes - No - - -
-
- - - -
-
- - - -
-
- - - -
- - - -
-
- - - -
-
- - - -
-
-
- - - - - - -
- -
- - - - - - - - - -
diff --git a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/assets-info/assets-info.component.ts b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/assets-info/assets-info.component.ts index 38fabb3d4..2c5988782 100755 --- a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/assets-info/assets-info.component.ts +++ b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/assets-info/assets-info.component.ts @@ -35,7 +35,9 @@ export class AssetsInfoComponent implements OnInit { public _assetsQuesFrom: FormGroup; public submitted = false; public m_assets_type = []; - + public m_relation = []; + public applicants: any; + // public m_assets_type = [ // { // 'id': "1", @@ -168,6 +170,8 @@ public m_investmentType = []; private pdTrigerService: PdTrigerService, @Inject(MAT_DIALOG_DATA) public pd_all_details: any) { this.pdid = this.pd_all_details.pdmaster_details.pd_id; + this.applicants = this.pd_all_details.pdapplicants_detials; + this.applicants.push({'pd_co_applicant_id':'0','applicant_name':'Others'}); this.notifier = notifier; } @@ -181,6 +185,7 @@ public m_investmentType = []; this.getM_PropertyType(); this.getM_InvestmentType(); this.getM_FreqOfPurchase(); + this.getM_Relation(); //this.getM_InsuranceType(); } @@ -222,7 +227,18 @@ public m_investmentType = []; ) } - getM_FreqOfPurchase() { + getM_Relation() { + this.pdTrigerService.getAllMasterDatas('RELATIONSHIPS').subscribe( + data => { + this.m_relation = data.records.filter(data => data.isactive == 1); + }, + error => { + this.notifier.notify('warning', 'No Category Records Found.!'); + } + ) + } + + getM_FreqOfPurchase() { this.pdTrigerService.getAllMasterDatas('FREQUENCY').subscribe( data => { this.m_freqOfPurchase = data.records.filter(data => data.isactive == 1); @@ -279,7 +295,7 @@ public m_investmentType = []; assets_form_remark:[value.assets_form_remark || 'check'] }); this.addAssetsDetailsWithData(value.assets_details); - this.addAssetsDetailsWithData2(value.business_assets_details); + this.addBusinessAssetsDetailsWithData(value.business_assets_details); } else { this._assetsQuesFrom = this._formBuilder.group({ pdid: [this.pdid], @@ -288,7 +304,7 @@ public m_investmentType = []; this.initDetails(), ]), business_assets_details : this._formBuilder.array([ - this.initnewDetails(), + this.initBusinessDetails(), ]), assets_form_remark:[''] }); @@ -310,6 +326,8 @@ public m_investmentType = []; details: this._formBuilder.array([]), approximate_market_value: ['', Validators.compose([])], name_of_the_owner: ['', Validators.compose([])], + other_owner:[''], + relation: [''], // purchase_year: ['', Validators.compose([])], //purchase_month: ['', Validators.compose([])], emi: [''], @@ -320,12 +338,14 @@ public m_investmentType = []; }); } - initnewDetails() { + initBusinessDetails() { return this._formBuilder.group({ business_assets_mode: ['', Validators.compose([Validators.required])], business_details: this._formBuilder.array([]), business_approximate_market_value: ['', Validators.compose([])], business_name_of_the_owner: ['', Validators.compose([])], + // other_owner:[''], + // relation:[''], // purchase_year: ['', Validators.compose([])], //purchase_month: ['', Validators.compose([])], business_emi: [''], @@ -544,6 +564,8 @@ public m_investmentType = []; details: this._formBuilder.array([]), approximate_market_value: [data.approximate_market_value, Validators.compose([])], name_of_the_owner: [data.name_of_the_owner, Validators.compose([])], + other_owner:[data.other_owner || ''], + relation: [data.relation || ''], // purchase_year: [data.purchase_year, Validators.compose([])], // purchase_month: [data.purchase_month, Validators.compose([])], emi: [data.emi || 0], @@ -553,12 +575,14 @@ public m_investmentType = []; elapsed_tenure: [data.elapsed_tenure || ''] }); } - initnewDetailsWithdata(data) { + initBusinessDetailsWithdata(data) { return this._formBuilder.group({ business_assets_mode: [data.business_assets_mode, Validators.compose([Validators.required])], business_details: this._formBuilder.array([]), business_approximate_market_value: [data.business_approximate_market_value, Validators.compose([])], business_name_of_the_owner: [data.business_name_of_the_owner, Validators.compose([])], + // other_owner:[data.other_owner || ''], + // relation: [data.relation || ''], // purchase_year: [data.purchase_year, Validators.compose([])], // purchase_month: [data.purchase_month, Validators.compose([])], business_emi: [data.business_emi || 0], @@ -580,6 +604,8 @@ public m_investmentType = []; assets_mode: val.assets_mode, approximate_market_value: val.approximate_market_value, name_of_the_owner: val.name_of_the_owner, + other_owner:val.other_owner, + relation: val.relation, // purchase_year: val.purchase_year, // purchase_month: val.purchase_month, emi: val.emi, @@ -596,7 +622,7 @@ public m_investmentType = []; this.loadDetails = true; } - addAssetsDetailsWithData2(supp_data) { + addBusinessAssetsDetailsWithData(supp_data) { console.log(supp_data); @@ -609,6 +635,8 @@ public m_investmentType = []; business_assets_mode: val.business_assets_mode, business_approximate_market_value: val.business_approximate_market_value, business_name_of_the_owner: val.business_name_of_the_owner, + // other_owner: val.other_owner, + // relation : val.relation, // purchase_year: val.purchase_year, // purchase_month: val.purchase_month, business_emi: val.business_emi, @@ -622,7 +650,7 @@ public m_investmentType = []; // this.setAssetsDetailsWithData(vals.business_assets_mode, val.details, control.length - 1) const control = this._assetsQuesFrom.controls['business_assets_details']; - control.push(this.initnewDetailsWithdata(vals)); + control.push(this.initBusinessDetailsWithdata(vals)); this.setAssetsDetailsWithData2(vals.business_assets_mode, val.business_details, control.length - 1) } } @@ -745,7 +773,7 @@ public m_investmentType = []; control.push(this.initDetails()); }else if(flag == 2){ const control = this._assetsQuesFrom.controls['business_assets_details']; - control.push(this.initnewDetails()); + control.push(this.initBusinessDetails()); } } removeLanguage(i: number,flag) { @@ -839,8 +867,9 @@ public m_investmentType = []; } } - loanCalc(details) + loanCalc(details ,flag) { + if(flag == 1){ //console.log(details.value); let ElapsedValues; @@ -848,6 +877,15 @@ public m_investmentType = []; ElapsedValues = details.value.original_loan_tenure - details.value.balance_tenure ; details.controls['elapsed_tenure'].setValue(ElapsedValues); } + } + else if(flag == 2){ + let BusinessElapsedValues; + + if(details.value.business_original_loan_tenure != null && details.value.business_original_loan_tenure != '' && details.value.business_balance_tenure != null && details.value.business_balance_tenure != ''){ + BusinessElapsedValues = details.value.business_original_loan_tenure - details.value.business_balance_tenure ; + details.controls['business_elapsed_tenure'].setValue(BusinessElapsedValues); + } + } } diff --git a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/stock/stock.component.html b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/stock/stock.component.html index 1df3ba854..23fa1c544 100755 --- a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/stock/stock.component.html +++ b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/stock/stock.component.html @@ -18,7 +18,7 @@
- +

Raw Materials

@@ -26,39 +26,50 @@

- + - + + formControlName="stock_observed" required + (selectionChange)="RawMaterialValidation($event)"> Yes No -
- + + - + {{uom.name}} - + - - + + + {{"₹"}} {{rawValueInWords}} Only - - + + + + Yes + No + -
+ + Please comment on the stock level observed? + + + +
+ +
+
+ + +

Stock of Goods Traded

+ +

+
+ + + + + + + Yes + No + + + + + + + + + {{"₹"}} {{tradedGoodsValueInWords}} Only + + + + + + + + Yes + No + + + + Please comment on the Traded Goods stock level observed? + + + + + + + +
+
+ + + +
+
@@ -238,7 +330,7 @@
- Please comment on the stock level observed? + Remarks
diff --git a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/stock/stock.component.ts b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/stock/stock.component.ts index 852581817..a1a25df07 100755 --- a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/stock/stock.component.ts +++ b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/stock/stock.component.ts @@ -38,8 +38,15 @@ export class StockComponent implements OnInit { public stockForm: FormGroup; private notifier: NotifierService; public uomData : any = []; - rawmaterial : any; + rawmaterial : any; + goodsValueInWords : any; + rawValueInWords : any; + tradedGoodsValueInWords : any; + rawMaterialAccess: boolean; + finishedGoodsAccess: boolean; + tradeConcernAccess: boolean; + constructor(notifier: NotifierService, private fb: FormBuilder, private route: ActivatedRoute, private router: Router, private _pd: PdTrigerService,@Inject(MAT_DIALOG_DATA) public pd_all_details: any) { @@ -50,90 +57,185 @@ export class StockComponent implements OnInit { ngOnInit() { this.initstockForm(); this.getUOM(); - this.setSku('data',0); + //this.setSku('data',0); let params: any = {}; + let activityArray : any = []; params.pd_id = this.pdid; params.pd_form_id = this.form_id; + this._pd.stockFormAccess({pd_id:this.pdid}).subscribe(value => { + console.log(value); + const rawMaterial = this.stockForm.controls['raw_materials']; + const finishedGoods = this.stockForm.controls['finished_goods']; + const tradedGoods = this.stockForm.controls['traded_goods']; + + if (value.status == 200) { + console.log('value.records',value.records); + value.records.type_of_activity.forEach(val => { + //console.log(val); + //console.log(val.type_of_activity_id); + this.rawMaterialAccess = true; + this.finishedGoodsAccess = true; + this.tradeConcernAccess = true; + if(val.type_of_activity_id == 1){ + rawMaterial.push(this.createRawmaterial()); + finishedGoods.push(this.createGoods()); + tradedGoods.push(this.createTradedGoods()); + } + else if(val.type_of_activity_id == 2){ + rawMaterial.push(this.createRawmaterial()); + finishedGoods.push(this.createGoods()); + } + else if(val.type_of_activity_id == 3){ + rawMaterial.push(this.createRawmaterial()); + finishedGoods.push(this.createGoods()); + } + // else if(val.type_of_activity_id == 4){ + // } + + }); + this._pd.retriveForm({pd_id:this.pdid,pd_form_id:'1'}).subscribe(value => { - console.log('Raw material Name',value.records.main_raw_materials); - - + //console.log('Raw material Name',value.records.main_raw_materials); + // const faControl = (this.stockForm.controls['raw_materials']).at(1); - const control = (this.stockForm.controls['raw_materials']).at(0); - console.log(control); + //const control = (this.stockForm.controls['raw_materials']).at(0); + //console.log(control); // this.stockForm.controls['raw_materials'].setValue(value.records.main_raw_materials); - if (value.status == 200) { - this.rawmaterial = value.records.main_raw_materials; - }else{ this.rawmaterial = ''; } + // if (value.status == 200) { + // this.rawmaterial = value.records.main_raw_materials; + // }else{ this.rawmaterial = ''; } }) + this._pd.retriveForm(params).subscribe(value => { - console.log('value', value); - const rawMaterial = this.stockForm.controls['raw_materials']; - const finishedGoods = this.stockForm.controls['finished_goods']; + //console.log('value', value); + if (value.status == 200) { - let result = Object.keys(value.records.raw_materials).map(function(key) { - return value.records.raw_materials[key]; - }); - let result_Goods = Object.keys(value.records.finished_goods).map(function(key) { - return value.records.finished_goods[key]; - }); + console.log('data',value); + // Raw Material Access is True means., Data have to load, + if(this.rawMaterialAccess == true){ + + let result = Object.keys(value.records.raw_materials).map(function(key) { + return value.records.raw_materials[key]; + }); + + if (result.length > 0) { + + result.forEach(val => { + + //this.RawMaterialValidation(val.stock_observed); + rawMaterial.push(this.createRawmaterial()); + if(val.raw_value != '' && val.raw_value != null ){ this.rawValueInWords = this._pd.convertNumberToWords(val.raw_value); } + }); + this.stockForm.controls['raw_materials'].setValue(result); + } else { + rawMaterial.push(this.createRawmaterial()); + } + } + + // Finished Goods Access is TRUE Means., data have to load., + if(this.finishedGoodsAccess == true){ + let result_Goods = Object.keys(value.records.finished_goods).map(function(key) { + return value.records.finished_goods[key]; + }); + + if (result_Goods.length > 0) { + + result_Goods.forEach(val => { + + //this.GoodsValidation(val.goods_observed); + finishedGoods.push(this.createGoods()); + if(val.goods_value != '' && val.goods_value != null ){ this.goodsValueInWords = this._pd.convertNumberToWords(val.goods_value); } + }); + this.stockForm.controls['finished_goods'].setValue(result_Goods); + } else { + finishedGoods.push(this.createGoods()); + } + } + + //TradeConcern Access is TRUE Means., data have to load., + if(this.tradeConcernAccess == true){ + let result_Traded_Goods = Object.keys(value.records.finished_goods).map(function(key) { + return value.records.traded_goods[key]; + }); + + if (result_Traded_Goods.length > 0) { + + result_Traded_Goods.forEach(val => { + + + tradedGoods.push(this.createTradedGoods()); + if(val.traded_goods_value != '' && val.traded_goods_value != null ) + { this.tradedGoodsValueInWords = this._pd.convertNumberToWords(val.traded_goods_value); } + }); + this.stockForm.controls['traded_goods'].setValue(result_Traded_Goods); + } else { + tradedGoods.push(this.createTradedGoods()); + } + } + + this.stockForm.controls['stock_remarks'].setValue(value.records.stock_remarks); - if (result.length > 0) { - result.forEach(val => { - rawMaterial.push(this.createRawmaterial()); - }); - this.stockForm.controls['raw_materials'].setValue(result); - } else { - rawMaterial.push(this.createRawmaterial()); - } - if (result_Goods.length > 0) { - result_Goods.forEach(val => { - finishedGoods.push(this.createGoods()); - }); - this.stockForm.controls['finished_goods'].setValue(result_Goods); - } else { - finishedGoods.push(this.createGoods()); - } + } else { - rawMaterial.push(this.createRawmaterial()); - finishedGoods.push(this.createGoods()); + // rawMaterial.push(this.createRawmaterial()); + // finishedGoods.push(this.createGoods()); + // tradedGoods.push(this.createTradedGoods()); } }) } +}); +} + public initstockForm(): void { this.stockForm = this.fb.group({ stock_remarks: ['', Validators.compose([Validators.required])], raw_materials: this.fb.array([]), - finished_goods: this.fb.array([]) + finished_goods: this.fb.array([]), + traded_goods: this.fb.array([]) }); } - setSku(sku: string, index: number) { + //setSku(sku: string, index: number) { // const faControl = // (this.stockForm.controls['raw_materials']).at(index); // faControl['controls'].raw_name.setValue(sku); - } + // } createRawmaterial() { return this.fb.group({ raw_name: ['', Validators.compose([Validators.required])], stock_observed:['', Validators.compose([Validators.required])], - raw_quantity: ['', Validators.compose([Validators.required])], - raw_uom: ['', Validators.compose([Validators.required])], + raw_quantity: [''], + raw_uom: [''], other_uom : [''], - raw_value: ['', Validators.compose([Validators.required])], - rawmaterial_value: ['', Validators.compose([Validators.required])], - is_sufficiant_raw: ['', Validators.compose([Validators.required])], + raw_value: [''], + rawmaterial_value: [''], + is_sufficiant_raw: [''], + rawmaterial_remarks:[''] }); } createGoods() { return this.fb.group({ goods_name: ['', Validators.compose([Validators.required])], - goods_quantity: ['', Validators.compose([Validators.required])], - goods_value: ['', Validators.compose([Validators.required])], - finished_goods_value: ['', Validators.compose([Validators.required])], - is_sufficiant_goods: ['', Validators.compose([Validators.required])], + goods_observed: ['', Validators.compose([Validators.required])], + goods_quantity: [''], + goods_value: [''], + finished_goods_value: [''], + is_sufficiant_goods: [''], + finishedgoods_remarks:[''] + }); + } + + createTradedGoods() { + return this.fb.group({ + traded_goods_name: ['', Validators.compose([Validators.required])], + traded_goods_observed: ['', Validators.compose([Validators.required])], + traded_goods_quantity: [''], + estimated_traded_goods_value: [''], + traded_goods_value: [''], + is_sufficiant_traded_goods: [''], + traded_goods_remarks:[''] }); } addRawMaterials() { @@ -152,6 +254,15 @@ export class StockComponent implements OnInit { const control = this.stockForm.controls['finished_goods']; control.removeAt(index); } + addTradedGoods() { + const control = this.stockForm.controls['traded_goods']; + control.push(this.createTradedGoods()); + } + deleteTradedGoods(index) { + const control = this.stockForm.controls['traded_goods']; + control.removeAt(index); + } + submitDetails() { if (!this.stockForm.valid) { return; @@ -160,12 +271,16 @@ export class StockComponent implements OnInit { records.pdid = this.pdid; records.formid = this.form_id; records.fk_createdby = this.pdid; - records.raw_materials = this.stockForm.controls['raw_materials'].value; + if(this.rawMaterialAccess == true){ + records.raw_materials = this.stockForm.controls['raw_materials'].value; } + if(this.finishedGoodsAccess == true){ + records.finished_goods = this.stockForm.controls['finished_goods'].value;} + if(this.tradeConcernAccess == true){ + records.traded_goods = this.stockForm.controls['traded_goods'].value; } records.stock_remarks = this.stockForm.controls['stock_remarks'].value; - records.finished_goods = this.stockForm.controls['finished_goods'].value; - console.log('data', records); + //console.log('data', records); this._pd.saveForm(records).subscribe(data => { - console.log('data', data); + //console.log('data', data); this.notifier.notify('success', 'Saved Successfully.'); }, error => { this.notifier.notify('warning', 'Something Wents Wrong Try Again.!'); @@ -201,4 +316,151 @@ export class StockComponent implements OnInit { event.preventDefault(); } } + + /** To Convert Amount into Words */ + inWords(e,flag:number){ + switch(flag){ + case 1 : + this.rawValueInWords = this._pd.convertNumberToWords(e.target.value); + break; + case 2 : + this.goodsValueInWords = this._pd.convertNumberToWords(e.target.value); + break; + case 3 : + this.tradedGoodsValueInWords = this._pd.convertNumberToWords(e.target.value); + break; + default: + break; + } + } + + // Validation Dynamically Add And Remove + GoodsValidation(event: any){ + // console.log('First Time',event); + // console.log('First Time Value',event.value); + + const control = this.stockForm.controls['finished_goods']; + + if(event.value == 'no') { + + control.controls[0].get('goods_quantity').setValidators([Validators.required]); + control.controls[0].get('goods_quantity').updateValueAndValidity(); + + control.controls[0].get('goods_value').setValidators([Validators.required]); + control.controls[0].get('goods_value').updateValueAndValidity(); + + control.controls[0].get('finished_goods_value').setValidators([Validators.required]); + control.controls[0].get('finished_goods_value').updateValueAndValidity(); + + control.controls[0].get('is_sufficiant_goods').setValidators([Validators.required]); + control.controls[0].get('is_sufficiant_goods').updateValueAndValidity(); + + + } + else + if(event.value == 'yes') { + + control.controls[0].get('goods_quantity').clearValidators(); + control.controls[0].get('goods_quantity').updateValueAndValidity(); + + control.controls[0].get('goods_value').clearValidators(); + control.controls[0].get('goods_value').updateValueAndValidity(); + + control.controls[0].get('finished_goods_value').clearValidators(); + control.controls[0].get('finished_goods_value').updateValueAndValidity(); + + control.controls[0].get('is_sufficiant_goods').clearValidators(); + control.controls[0].get('is_sufficiant_goods').updateValueAndValidity(); + + + + } + + } + + RawMaterialValidation(event: any){ + // console.log('First Time',event); + // console.log('First Time Value',event.value); + + const control = this.stockForm.controls['raw_materials']; + + if(event.value == 'no') { + + control.controls[0].get('raw_quantity').setValidators([Validators.required]); + control.controls[0].get('raw_quantity').updateValueAndValidity(); + + control.controls[0].get('raw_uom').setValidators([Validators.required]); + control.controls[0].get('raw_uom').updateValueAndValidity(); + + control.controls[0].get('raw_value').setValidators([Validators.required]); + control.controls[0].get('raw_value').updateValueAndValidity(); + + control.controls[0].get('rawmaterial_value').setValidators([Validators.required]); + control.controls[0].get('rawmaterial_value').updateValueAndValidity(); + + control.controls[0].get('is_sufficiant_raw').setValidators([Validators.required]); + control.controls[0].get('is_sufficiant_raw').updateValueAndValidity(); + + + } + else + if(event.value == 'yes') { + + control.controls[0].get('raw_quantity').clearValidators(); + control.controls[0].get('raw_quantity').updateValueAndValidity(); + + control.controls[0].get('raw_uom').clearValidators(); + control.controls[0].get('raw_uom').updateValueAndValidity(); + + control.controls[0].get('raw_value').clearValidators(); + control.controls[0].get('raw_value').updateValueAndValidity(); + + control.controls[0].get('rawmaterial_value').clearValidators(); + control.controls[0].get('rawmaterial_value').updateValueAndValidity(); + + control.controls[0].get('is_sufficiant_raw').clearValidators(); + control.controls[0].get('is_sufficiant_raw').updateValueAndValidity(); + } + + } + + TradedGoodsValidation(event: any){ + console.log('First Time',event); + console.log('First Time Value',event.value); + + const control = this.stockForm.controls['tradeded_goods']; + + if(event.value == 'no') { + + control.controls[0].get('traded_goods_quantity').setValidators([Validators.required]); + control.controls[0].get('traded_goods_quantity').updateValueAndValidity(); + + control.controls[0].get('estimated_traded_goods_value').setValidators([Validators.required]); + control.controls[0].get('estimated_traded_goods_value').updateValueAndValidity(); + + control.controls[0].get('traded_goods_value').setValidators([Validators.required]); + control.controls[0].get('traded_goods_value').updateValueAndValidity(); + + control.controls[0].get('is_sufficiant_traded_goods').setValidators([Validators.required]); + control.controls[0].get('is_sufficiant_traded_goods').updateValueAndValidity(); + } + else + if(event.value == 'yes') { + + control.controls[0].get('traded_goods_quantity').clearValidators(); + control.controls[0].get('traded_goods_quantity').updateValueAndValidity(); + + control.controls[0].get('estimated_traded_goods_value').clearValidators(); + control.controls[0].get('estimated_traded_goods_value').updateValueAndValidity(); + + control.controls[0].get('traded_goods_value').clearValidators(); + control.controls[0].get('traded_goods_value').updateValueAndValidity(); + + control.controls[0].get('is_sufficiant_traded_goods').clearValidators(); + control.controls[0].get('is_sufficiant_traded_goods').updateValueAndValidity(); + + } + + } + } diff --git a/ng6-seed/src/app/personal-discussion/pd-service/pd-triger.service.ts b/ng6-seed/src/app/personal-discussion/pd-service/pd-triger.service.ts index f281ec28c..cd65ca0f4 100755 --- a/ng6-seed/src/app/personal-discussion/pd-service/pd-triger.service.ts +++ b/ng6-seed/src/app/personal-discussion/pd-service/pd-triger.service.ts @@ -417,6 +417,13 @@ convertNumberToWords(amount) { ) } + stockFormAccess(pdid: any): Observable { + + return this._http.post(this.apiUrl+"getTypeOfActivetyFromBusinessForm",{"records":pdid}) + .pipe( + catchError(this.handleError('operation', [])) + ) + } // private handleError(operation = 'operation', result?: T) { // return (error: any): Observable => { // return of(result as T); From 84f4dc31c748704777c4561cf1416a7221366810 Mon Sep 17 00:00:00 2001 From: "venbatechnologies@gmail.com" Date: Tue, 18 Dec 2018 14:19:53 +0530 Subject: [PATCH 3/4] UI Changes --- .../forms/assessed-income/assessed-income.component.html | 4 +++- .../forms/banking-details/banking-details.component.html | 4 +++- .../start-pd/forms/business-info/business-info.component.html | 3 ++- .../start-pd/forms/current-loan/current-loan.component.html | 4 +++- .../forms/employment-info/employment-info.component.html | 4 +++- .../forms/financial-info/financial-info.component.html | 4 +++- .../lender-representative.component.html | 3 ++- .../start-pd/forms/loan-details/loan-details.component.html | 2 ++ .../start-pd/forms/other-income/other-income.component.html | 4 +++- .../start-pd/forms/personal-info/personal-info.component.html | 3 ++- .../start-pd/forms/rental-info/rental-info.component.html | 4 +++- .../list-pd/start-pd/forms/stock/stock.component.html | 4 +++- 12 files changed, 32 insertions(+), 11 deletions(-) diff --git a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/assessed-income/assessed-income.component.html b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/assessed-income/assessed-income.component.html index 9800a1c2e..206bbfe1e 100755 --- a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/assessed-income/assessed-income.component.html +++ b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/assessed-income/assessed-income.component.html @@ -280,6 +280,7 @@ +
@@ -369,7 +370,8 @@
-
+
+
diff --git a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/banking-details/banking-details.component.html b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/banking-details/banking-details.component.html index 5db1ff5fb..7da90f6ca 100755 --- a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/banking-details/banking-details.component.html +++ b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/banking-details/banking-details.component.html @@ -192,6 +192,7 @@ +
@@ -281,7 +282,8 @@
-
+ + 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 0d921b9be..53be6499e 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 @@ -388,6 +388,7 @@ +
@@ -478,7 +479,7 @@
- +
diff --git a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/current-loan/current-loan.component.html b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/current-loan/current-loan.component.html index dcc253f18..6f215861d 100755 --- a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/current-loan/current-loan.component.html +++ b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/current-loan/current-loan.component.html @@ -107,6 +107,7 @@ +
@@ -196,7 +197,8 @@
-
+ + diff --git a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/employment-info/employment-info.component.html b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/employment-info/employment-info.component.html index ccaeb1c8d..5aba83c46 100755 --- a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/employment-info/employment-info.component.html +++ b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/employment-info/employment-info.component.html @@ -128,6 +128,7 @@ +
@@ -217,7 +218,8 @@
-
+ + 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 fca7c549a..f3a333eb0 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 @@ -139,6 +139,7 @@ +
@@ -228,7 +229,8 @@
-
+ + diff --git a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/lender-representative/lender-representative.component.html b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/lender-representative/lender-representative.component.html index e3b05b4f2..e1e868f49 100755 --- a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/lender-representative/lender-representative.component.html +++ b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/lender-representative/lender-representative.component.html @@ -51,6 +51,7 @@ +
@@ -141,7 +142,7 @@
- +
diff --git a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/loan-details/loan-details.component.html b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/loan-details/loan-details.component.html index 5754e395d..dbb9413e2 100755 --- a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/loan-details/loan-details.component.html +++ b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/loan-details/loan-details.component.html @@ -183,6 +183,7 @@ +
@@ -273,6 +274,7 @@
+
diff --git a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/other-income/other-income.component.html b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/other-income/other-income.component.html index 1b3a0f32f..14f8677f1 100755 --- a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/other-income/other-income.component.html +++ b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/other-income/other-income.component.html @@ -93,6 +93,7 @@ +
@@ -182,7 +183,8 @@
-
+ + diff --git a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/personal-info/personal-info.component.html b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/personal-info/personal-info.component.html index f56e8be59..2571dd94a 100755 --- a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/personal-info/personal-info.component.html +++ b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/personal-info/personal-info.component.html @@ -209,6 +209,7 @@ +
@@ -299,7 +300,7 @@
- +
diff --git a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/rental-info/rental-info.component.html b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/rental-info/rental-info.component.html index 77b619fd5..c419c40d6 100755 --- a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/rental-info/rental-info.component.html +++ b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/rental-info/rental-info.component.html @@ -204,6 +204,7 @@ +
@@ -293,7 +294,8 @@
-
+ + diff --git a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/stock/stock.component.html b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/stock/stock.component.html index fdb89868b..f19986989 100755 --- a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/stock/stock.component.html +++ b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/stock/stock.component.html @@ -123,6 +123,7 @@ +
@@ -212,7 +213,8 @@
-
+ + From 66149c5a459c5319712c1632bc238632506fb4b2 Mon Sep 17 00:00:00 2001 From: "venbatechnologies@gmail.com" Date: Tue, 18 Dec 2018 15:17:07 +0530 Subject: [PATCH 4/4] UI changes --- .../manage-pd/list-pd/list-pd.component.html | 4 ++-- .../manage-pd/list-pd/list-pd.component.scss | 6 +++++- .../list-pd/map-pd-view/map-pd-view.component.html | 2 +- 3 files changed, 8 insertions(+), 4 deletions(-) diff --git a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/list-pd.component.html b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/list-pd.component.html index 718444dc0..4d90d020c 100755 --- a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/list-pd.component.html +++ b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/list-pd.component.html @@ -7,8 +7,8 @@
- - + +
diff --git a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/list-pd.component.scss b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/list-pd.component.scss index 123db6e6c..fda61348d 100755 --- a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/list-pd.component.scss +++ b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/list-pd.component.scss @@ -20,4 +20,8 @@ } .mat-tab-label-active{ color: red !important; - } \ No newline at end of file + } + .mat-fab.mat-accent{ + color:red !important; + background-color: #fff !important; + } diff --git a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/map-pd-view/map-pd-view.component.html b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/map-pd-view/map-pd-view.component.html index 8a6caf518..706b6cfcb 100755 --- a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/map-pd-view/map-pd-view.component.html +++ b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/map-pd-view/map-pd-view.component.html @@ -10,7 +10,7 @@
- +