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

ng6-seed/src/app/personal-discussion/manage-pd/list-pd/add-pd/add-pd.component.html

@@ -124,6 +124,9 @@
                         <mat-form-field style="width: 100%;">
                                 <input matInput placeholder="Pincode" formControlName="pincode">
                                 <!-- <mat-error *ngIf="pdMain.pincode.hasError('required')">Pincode Required.</mat-error> -->
+                        </mat-form-field> 
+                        <mat-form-field style="width: 100%;">
+                            <textarea matInput placeholder="Remarks" formControlName="remarks"></textarea>
                     </mat-form-field>
 						  <!-- <div class="ml-xs mr-xs" style="width: 100%;" fxLayout="row" >
 							   <h4 mat-dialog-title style="width: 14%;margin-top: 0%;">Allocation</h4>

ng6-seed/src/app/personal-discussion/manage-pd/list-pd/add-pd/add-pd.component.ts

@@ -85,6 +85,7 @@ export class AddPdComponent implements OnInit, OnDestroy {
       fk_city: [null],
       fk_state: [null],
  		  pincode : [null],
+      remarks:[null],
  		 // allocation_type: [null],
  		 // sub_allocation_type: [null],
       items: this._fb.array([]),
@@ -304,6 +305,7 @@ export class AddPdComponent implements OnInit, OnDestroy {
          "fk_city":formValue.fk_city,
          "fk_state":formValue.fk_state,
          "pincode":formValue.pincode ,
+         "remarks":formValue.remarks,
          "pd_status": status,
          //"fk_pd_allocation_type":this.allocationTypeModel ,
          "fk_createdby" : this._aws.getlocale(),

ng6-seed/src/app/personal-discussion/manage-pd/list-pd/edit-pd-applicant/edit-pd-applicant.component.ts

@@ -97,6 +97,7 @@ export class EditPdApplicantComponent implements OnInit {
     }
      
     }
+    
   get pdMainApplicant() { return this._EditApplicantForm.controls; }
   get pdCoApplicant() { return this._EditApplicantForm.get('coApplicantItems') as FormArray; }
   updatePdApplicant(formValue: any) {

ng6-seed/src/app/personal-discussion/manage-pd/list-pd/edit-pd-master/edit-pd-master.component.html

@@ -117,6 +117,9 @@
                                                     <input matInput placeholder="Pincode" formControlName="pincode">
                                                     <!-- <mat-error *ngIf="pdMain.pincode.hasError('required')">Pincode Required.</mat-error> -->
                                             </mat-form-field> 
+                                            <mat-form-field style="width: 100%;">
+                                                <textarea matInput placeholder="Remarks" formControlName="remarks"></textarea>
+                                        </mat-form-field>
 
           </div>
 
@@ -134,3 +137,14 @@
  </form>
 </mat-card>
 </div>
+
+
+
+
+
+
+
+
+
+
+

ng6-seed/src/app/personal-discussion/manage-pd/list-pd/edit-pd-master/edit-pd-master.component.ts

@@ -133,6 +133,7 @@ export class EditPdMasterComponent implements OnInit {
              fk_city: [this.data.records.fk_city],
              fk_state: [this.data.records.fk_state],
         		 pincode : [this.data.records.pincode],
+             remarks: [this.data.records.remarks],
        });
        if(this.data.records.fk_lender_id && this.data.records.fk_product_id && this.data.records.fk_subproduct_id && this.data.records.fk_pd_type && this.data.records.fk_customer_segment && this.data.records.loan_amount && this.data.records.addressline1 && this.data.records.fk_city && this.data.records.fk_state && this.data.records.pincode){
         this.enablePDButton=true;

ng6-seed/src/app/personal-discussion/manage-pd/list-pd/smart-pd-allocation/smart-pd-allocation.component.ts

@@ -98,7 +98,7 @@ export class SmartPdAllocationComponent implements OnInit {
       let updateData =  {
         "pd_id":this.data.pd_id,
         "fk_pd_allocated_to":pdOfficer.fk_user_id,
-        "excutive_id":excutiveOfficer.fk_user_id,
+        "executive_id":excutiveOfficer.fk_user_id,
       }
       this._pd.updatePdOfficer(updateData).subscribe(
         result => {