Merge branch 'master' of https://bitbucket.org/sriramv18/pd_officer

src/pages/pd-question/pd-question-final-remark/pd-question-final-remark.html

@@ -132,8 +132,10 @@
   <div formArrayName="recommendation_positive">
     <div *ngFor="let details of _finalRemarkForm.get('recommendation_positive').controls; let i=index; let l=last" [formGroupName]="i">
       <mat-form-field>
-        <mat-placeholder>Reason for Marking PD Status as Positive</mat-placeholder>
+          <mat-placeholder>Reason for Marking PD Status as Positive</mat-placeholder>
-        <input matInput autocomplete="off"  formControlName="reason_for_positive" required>
+          <textarea matInput autocomplete="off" formControlName="reason_for_positive" required></textarea>
+        <!-- <mat-placeholder>Reason for Marking PD Status as Positive</mat-placeholder>
+        <input matInput autocomplete="off"  formControlName="reason_for_positive" required> -->
       </mat-form-field>
       <ion-buttons end>
         <ion-col col-3 offset-3 *ngIf="_finalRemarkForm.get('recommendation_positive').controls.length > 1">

src/pages/pd-question/pd-question-loans/pd-question-loans.ts

@@ -462,7 +462,8 @@ export class PdQuestionLoansPage {
   mortage_type(mortage_value)
   {
       let mortagetypes = this.m_mortageTypeProperty.filter(mor=>mor.mortage_property_id==mortage_value)[0];
-      let property_name = mortagetypes.property_name.replace(/\s/g, "").toLowerCase();
+      if(mortagetypes != undefined){
+        let property_name = mortagetypes.property_name.replace(/\s/g, "").toLowerCase();
       if(property_name=='others(pleasespecify)' || property_name=='others')
       {
         this.mortageAccess = true;
@@ -470,6 +471,9 @@ export class PdQuestionLoansPage {
       {
         this.mortageAccess = false; 
       }
+
+      }
+      
      
      
   }
@@ -507,6 +511,7 @@ export class PdQuestionLoansPage {
       data => {
         this.m_endUseForLoan = data['records'].filter(data => data.isactive == 1);
       });
+      this.loanDetailsForm.controls['end_use'].setValue('');
      
   }
   ChangeProperty(subproduct_id){
@@ -538,7 +543,9 @@ export class PdQuestionLoansPage {
     //this.endUserList = [];
     event.forEach(option => {
       let othresData = this.m_endUseForLoan.filter(sub=>sub.enduse_of_loan_id==option)[0];
+      if(othresData != undefined){
       othresData = othresData.enduse_of_loan.substr(0,6).toLowerCase();
+      }
       this.endUserList.push({ end_use: option });
       if (othresData == 'others') {
         
@@ -625,9 +632,13 @@ export class PdQuestionLoansPage {
         // }
         // get end user final group data
         let dataEnd_user_data = [];
-        this.loanDetailsForm.controls['end_use'].value.forEach(element => {
+        console.log(this.loanDetailsForm.controls['end_use'].value.length> 0);
-                dataEnd_user_data.push({end_use: element})
+        if(this.loanDetailsForm.controls['end_use'].value.length> 0){
-                });
+          this.loanDetailsForm.controls['end_use'].value.forEach(element => {
+            dataEnd_user_data.push({end_use: element})
+            });
+        }
+        
         records.end_use_group = dataEnd_user_data;
 
         if (this.isOtherPurpose) {

src/pages/pd-question/pd-question-rental-info/pd-question-rental-dash/pd-question-rental-dash.ts

@@ -116,13 +116,23 @@ this.loadingProvider.dataLoader();
     console.log("d",values)
   }
   addMore(){
-    let passValues: any = {
+    let params: any = {};
-      manage_status: 1,
+    console.log('add params',params);
-      // parentData: this.parentData,
+    params.pd_id = this.pdDetails.pd_id;
-      // masterData: this.masterData,
+    console.log(this.pdDetails.pd_id);
-      existing_rental_count_id: this.existing_rental_count_id + 1,
+      this.qustCat.getPropertyCount(this.pdDetails.pd_id).subscribe(data => {
-    }
+          if (data.status == 200){ 
-    this.navCtrl.push(PdQuestionRentalInfoPage,{"values":passValues,'pdDetails':this.pdDetails,'FormId':this.form_details});
+            let passValues: any = {
+              manage_status: 1,
+              // parentData: this.parentData,
+              // masterData: this.masterData,
+              existing_rental_count_id: data.records,
+            }
+            this.navCtrl.push(PdQuestionRentalInfoPage,{"values":passValues,'pdDetails':this.pdDetails,'FormId':this.form_details});
+            
+          }         
+        })
+    
   }
 
   isactiveProperty(info){

src/pages/queries-docs/queries-docs.html

@@ -36,8 +36,9 @@
             <mat-form-field style="width:100%">
               <!-- <mat-placeholder>
                 {{item.add_requirement}}
-              </mat-placeholder> -->
+              </mat-placeholder> --> 
-              <input matInput type="text" [formControlName]="item.add_req_id" placeholder="Enter the Text">
+               <textarea matInput autocomplete="off" [formControlName]="item.add_req_id" placeholder="Enter the Text"></textarea>
+              <!-- <input matInput type="text" [formControlName]="item.add_req_id" placeholder="Enter the Text"> -->
             </mat-form-field>
           </div>
         </div>
@@ -75,7 +76,8 @@
                 </ion-row>
                   <!-- <button *ngIf="camera_btn[i] == true" ion-button slot="end" small float-right (click)="capture(i,item)">Capture<ion-icon name="md-camera"></ion-icon></button> -->
               <mat-form-field *ngIf="item.controls['reason']" style="width: 100%">
-              <input matInput type="text" formControlName="reason" placeholder="Enter the Reason">
+                  <textarea matInput autocomplete="off" formControlName="reason" placeholder="Enter the Reason"></textarea>
+              <!-- <input matInput type="text" formControlName="reason" placeholder="Enter the Reason"> -->
               </mat-form-field>
             </div>
         </mat-card-content>

src/providers/question-category/question-category.ts

@@ -77,6 +77,11 @@ apiurl:any;
     return this.http.post(this.apiurl + 'deactiveFormData', { "records": params })
      
  }
+ getPropertyCount(params :any): Observable<any> {  
+   console.log('service params',params)
+  return this.http.get(this.apiurl + 'getNextRentalCount?pdid=' +params)
+       
+}
 
   /**Assessed Form Details API */
   saveassessedForms(api,saveData)