From 87dc19c7dcaf3bf2e4481160d0c595a4bef02bb2 Mon Sep 17 00:00:00 2001 From: "venbatechnologies@gmail.com" Date: Tue, 26 Mar 2019 20:57:35 +0530 Subject: [PATCH] fixes : ps --- .../pd-question-assessed-dash.html | 4 +- .../pd-question-assessed-info.html | 12 +++++- .../pd-question-business-info.ts | 42 +++++++++++++++---- 3 files changed, 47 insertions(+), 11 deletions(-) diff --git a/src/pages/pd-question/pd-question-assessed-dash/pd-question-assessed-dash.html b/src/pages/pd-question/pd-question-assessed-dash/pd-question-assessed-dash.html index 13b3d6aa..9be19ab8 100755 --- a/src/pages/pd-question/pd-question-assessed-dash/pd-question-assessed-dash.html +++ b/src/pages/pd-question/pd-question-assessed-dash/pd-question-assessed-dash.html @@ -106,7 +106,7 @@ - + diff --git a/src/pages/pd-question/pd-question-assessed-info/pd-question-assessed-info.html b/src/pages/pd-question/pd-question-assessed-info/pd-question-assessed-info.html index 0de946bb..f9662f87 100755 --- a/src/pages/pd-question/pd-question-assessed-info/pd-question-assessed-info.html +++ b/src/pages/pd-question/pd-question-assessed-info/pd-question-assessed-info.html @@ -144,19 +144,29 @@
+

{{monthwise.salesItem | titlecase}}

- {{eachItem.header}} + + {{eachItem.header | titlecase}} + YearWise Sale +
+ {{eachmonthItem.sales_date | date:'dd-MM-yyyy'}} + + {{eachmonthItem.frequency_name}} + {{"₹"}} {{eachmonthItem.sales_value}} + + {{"₹"}} {{eachmonthItem.frequency_value}} diff --git a/src/pages/pd-question/pd-question-business-group/pd-question-business-info/pd-question-business-info.ts b/src/pages/pd-question/pd-question-business-group/pd-question-business-info/pd-question-business-info.ts index cf4d5103..185f7d0e 100755 --- a/src/pages/pd-question/pd-question-business-group/pd-question-business-info/pd-question-business-info.ts +++ b/src/pages/pd-question/pd-question-business-group/pd-question-business-info/pd-question-business-info.ts @@ -80,7 +80,7 @@ export class PdQuestionBusinessInfoPage { constructor(public navCtrl: NavController, public navParams: NavParams,public aws:AwsServiceProvider,public toast:ToastProvider,public qustCat:QuestionCategoryProvider,public fb:FormBuilder,public cons:ConstantsProvider) { this.getStateCityDet(); - console.log(typeof this.filteredCity) + // console.log(typeof this.filteredCity) this.pdDetails = this.navParams.get('pdDetails'); this.pdid=this.pdDetails.pd_id @@ -251,6 +251,7 @@ changeOfStartedBusiness(members,i,e){ params.pd_form_id = 13 params.company_id = this.pdDetails.company_id; this.qustCat.retiverForm(params).subscribe(data=>{ + console.log('data[records]',data['records']); let businessVal=data['records'] let constVal: any; @@ -803,7 +804,7 @@ filterCityData(datasource: any,filterid:number,index) { // this is for throuh out states city if(getAllCities.length>0){ setCityValues= setCityValues.concat.apply(setCityValues, findIndex); - console.log("First",setCityValues) + // console.log("First",setCityValues) } // this is for seleted states city else{ @@ -813,7 +814,7 @@ filterCityData(datasource: any,filterid:number,index) { }); }); setCityValues= setCityValues.concat.apply(setCityValues, check); - console.log("second",setCityValues) + // console.log("second",setCityValues) } } @@ -1773,6 +1774,31 @@ if(count>=101){ } records.select_business_activity_type = records.select_business_activity_type.filter(value=>value.exist_status==1); + +// if(records.manufacturing_activity_details.length > 0){ +// records.manufacturing_activity_details.forEach((val,index) => { +// let manufacturingControl: any = this.businessForm.get('manufacturing_activity_details') as FormArray; +// let childCtrl1 : any = manufacturingControl.controls[index].get('india_where_sale_done') as FormArray; +// let childCtrl2 : any = manufacturingControl.controls[index].get('max_sale_state_name') as FormArray; +// if(val.area_of_sale != "Export"){ +// if(val.india_where_sale_done.length > 0){ +// val.india_where_sale_done.forEach((vals,inx) => { +// childCtrl1.controls[inx].removeControl('citySearch'); +// delete vals.citySearch; +// childCtrl1.controls[inx].removeControl('stateSearch'); +// delete vals.stateSearch; +// }); +// } +// if(val.max_sale_state_name.length > 0){ +// val.max_sale_state_name.forEach((vals,inx) => { +// childCtrl2.controls[inx].removeControl('citySearch'); +// childCtrl2.controls[inx].removeControl('stateSearch'); +// }); +// } +// } +// }); +// } +// console.log('records',records); this.qustCat.saveForm(records).subscribe(data => { if(data['dataStatus']==true) { @@ -1963,7 +1989,7 @@ ServiceCounterArray: any = []; } changePOSMachinesAvailablity(e, flag) { -console.log(e) + e == 'yes' ? this.businessForm.addControl('no_of_pos_machines', new FormControl('')) : this.businessForm.removeControl('no_of_pos_machines'); @@ -1998,7 +2024,7 @@ toGetPOSMachinesDetails(e,flag){ } } searchFun(control:any,i:number,option){ - console.log("control",control) + if (option == 'city') { // this.cityData[i]=this.filterCity(this.stateList,control.value.state_name) control.controls['citySearch'].valueChanges @@ -2008,7 +2034,7 @@ toGetPOSMachinesDetails(e,flag){ }) } if (option == 'state') { - console.log("state") + // console.log("state") control.controls['stateSearch'].valueChanges .pipe(takeUntil(this._onDestroy)) .subscribe(()=>{ @@ -2018,7 +2044,7 @@ toGetPOSMachinesDetails(e,flag){ } SearchCity(val: any, i: number) { // let cityData= - console.log(this.cityData[i]) + // console.log(this.cityData[i]) if (!this.cityData[i]) { return } @@ -2032,7 +2058,7 @@ toGetPOSMachinesDetails(e,flag){ this.cityDataValue[i]= this.cityData[i].filter(val=>val.city_name.toLowerCase().indexOf(searchValue)> -1) - console.log("City Data value",this.cityDataValue[i]) + // console.log("City Data value",this.cityDataValue[i]) // this.filterCity('',1,this.cityData[i]) // this.filteredCity.next( // this.cityData[i].filter(value => value.city_name.toLowerCase().indexOf(searchValue) > -1)