fixes : ps

src/pages/pd-question/pd-question-assessed-dash/pd-question-assessed-dash.html

@@ -106,7 +106,7 @@
         </ion-col>
       </ion-row> 
       <ion-row>
-        <ion-col col-6 text-center>
+        <!-- <ion-col col-6 text-center>
             <mat-card (click)="getViewPage(5)" class="item-ribbon" style="height: 110px;">
                 <span *ngIf="businessIncome;else nobusinessIncome"class="ribbon cruzeiro">
                     <span>--</span>
@@ -119,7 +119,7 @@
               <ion-icon class="ion-icon-custome" name="logo-android"></ion-icon>
                <h1 class="htag">OTHER BUSINESS INCOME</h1>
             </mat-card>
-        </ion-col>
+        </ion-col> -->
         <ion-col col-6 text-center *ngIf="finalAccess">
             <mat-card (click)="getViewPage(11)" class="item-ribbon" style="height: 110px;">
                 <span class="ribbon cruzeiro">

src/pages/pd-question/pd-question-assessed-info/pd-question-assessed-info.html

@@ -144,19 +144,29 @@
             </ion-col>
             </ion-row>
           <div *ngFor="let monthwise of sales_month_wise_data">
+            
             <div (click)="editAssessedDailyForm(monthwise.simId)">
           <h3 text-center>{{monthwise.salesItem | titlecase}}</h3>
         <ion-row>
           <ion-col col-12 *ngFor="let eachItem of monthwise.expandElements">
-             <mat-card-title>{{eachItem.header}}</mat-card-title>
+             <mat-card-title>
+             <span *ngIf="eachItem.header != 'Jan-1970';else freqtitle;">{{eachItem.header | titlecase}}</span>
+             <ng-template #freqtitle>YearWise Sale</ng-template>
+             </mat-card-title>
              <div *ngFor="let eachmonthItem of eachItem.value">
              <mat-card-subtitle >
               <ion-row>
                 <ion-col col-6>
+                  <span *ngIf="eachmonthItem.sales_date !== '0000-00-00 00:00:00';else freqname;">
                     {{eachmonthItem.sales_date | date:'dd-MM-yyyy'}}
+                    </span>
+                    <ng-template #freqname>{{eachmonthItem.frequency_name}}</ng-template>
                 </ion-col>
                 <ion-col col-6 text-right>
+                    <span *ngIf="eachmonthItem.sales_date !== '0000-00-00 00:00:00';else freqvalue;">
                     {{"&#8377;"}} {{eachmonthItem.sales_value}}
+                    </span>
+                    <ng-template #freqvalue>{{"&#8377;"}} {{eachmonthItem.frequency_value}}</ng-template>
                   </ion-col>
               </ion-row> 
                </mat-card-subtitle>

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)