From 991b34c22f3cbeafc16491841c4543862ffc4b40 Mon Sep 17 00:00:00 2001
From: sriram-at-840620226347 <bitbucket@venbainfotech.com>
Date: Tue, 30 Jun 2020 18:24:33 +0530
Subject: [PATCH] Smart PD and Vendor changes done

---
 .../forms/address/address.component.html      |  6 +--
 .../forms/address/address.component.ts        |  2 +-
 .../business-assets-info.component.html       |  4 +-
 .../business-info.component.html              | 12 +++---
 .../business-info/business-info.component.ts  |  2 +-
 .../final-remarks.component.html              | 12 +++---
 .../final-remarks/final-remarks.component.ts  |  4 +-
 .../financial-info.component.html             |  8 ++--
 .../neighbour-hood.component.html             | 14 +++----
 .../queries-docs/queries-docs.component.html  |  4 +-
 .../start-pd/forms/stock/stock.component.html | 20 +++++-----
 .../start-pd/forms/stock/stock.component.ts   |  2 +-
 .../qc-list/qc-view/qc-view.component.ts      | 40 ++++++++++++++-----
 13 files changed, 74 insertions(+), 56 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 d20f7d92d..18003f29e 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
@@ -196,7 +196,7 @@
 
                                                             <mat-form-field style="width: 96%">
                                                                 <input matInput
-                                                                [placeholder]=" fk_pd_type == '3' ? 'Reason for change in business address' : 'Reason for change in PD visit address'"
+                                                                [placeholder]="(fk_pd_type == '3' || fk_pd_type == '2') ? 'Reason for change in business address' : 'Reason for change in PD visit address'"
                                                                     formControlName="reason_for_alternative_address"
                                                                     required autocomplete="off">
                                                                 <mat-error
@@ -277,7 +277,7 @@
                                         </div>
 
                                         <div fxFlex="100">
-                                            <mat-form-field style="width: 46%;" *ngIf="fk_pd_type != '3'">
+                                            <mat-form-field style="width: 46%;" *ngIf="fk_pd_type != '3' && fk_pd_type != '2'">
                                                 <mat-select placeholder="Approach to PD Location"
                                                     formControlName="pd_location" required>
                                                     <mat-option>Select</mat-option>
@@ -290,7 +290,7 @@
                                                     Approach to PD Location Required</mat-error>
                                             </mat-form-field>
 
-                                            <mat-form-field style="width: 46%;" *ngIf="fk_pd_type != '3'">
+                                            <mat-form-field style="width: 46%;" *ngIf="fk_pd_type != '3' && fk_pd_type != '2'">
                                                 <mat-select placeholder="Comment on Locality"
                                                     formControlName="comment_locality" required>
                                                     <mat-option>Select</mat-option>
diff --git a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/address/address.component.ts b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/address/address.component.ts
index fe9c5eb07..b3e357167 100755
--- a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/address/address.component.ts
+++ b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/address/address.component.ts
@@ -245,7 +245,7 @@ export class AddressComponent implements OnInit {
             // was_the_company_name_board_sighted:['', Validators.compose([Validators.required])],
             address_form_remark: ['']
         });
-        if(this.fk_pd_type == '3'){        
+        if(this.fk_pd_type == '3' || this.fk_pd_type == '2'){        
             this.addressForm.controls['pd_location'].clearValidators();
             this.addressForm.controls['pd_location'].updateValueAndValidity();
 
diff --git a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/business-assets-info/business-assets-info.component.html b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/business-assets-info/business-assets-info.component.html
index 8286dbfbf..20279e546 100755
--- a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/business-assets-info/business-assets-info.component.html
+++ b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/business-assets-info/business-assets-info.component.html
@@ -71,7 +71,7 @@
                         </div>
 
 
-                        <mat-form-field style="width: 95%;" *ngIf="fk_pd_type != '3'">
+                        <mat-form-field style="width: 95%;" *ngIf="fk_pd_type != '3' && fk_pd_type != '2'">
                           <mat-select
                             [placeholder]="placeholderName[i] ? placeholderName[i] :'Was any business activity seen at the Address Type during PD visit?'"
                             formControlName="business_is_pd_visited">
@@ -84,7 +84,7 @@
                         </mat-form-field>
 
 
-                        <mat-form-field *ngIf=" itemrow.get('business_is_pd_visited').value != '' && fk_pd_type != '3'" style="width: 95%;">
+                        <mat-form-field *ngIf=" itemrow.get('business_is_pd_visited').value != '' && fk_pd_type != '3' && fk_pd_type != '2'" style="width: 95%;">
                           <input matInput autocomplete="off" placeholder="Remarks"
                             formControlName="business_pd_visited_remark">
                           <mat-error *ngIf="itemrow.controls['business_pd_visited_remark'].hasError('required')">Remarks
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 b152e8e9d..7fb1134c4 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
@@ -1605,11 +1605,11 @@
                             </mat-card>
                             <mat-card>
                                 <mat-card-header>
-                                    <mat-card-title *ngIf="fk_pd_type != '3'">No of Employees Sighted By PD Officer During His Visit </mat-card-title>
-                                    <mat-card-title *ngIf="fk_pd_type == '3'">Company Name Board </mat-card-title>
+                                    <mat-card-title *ngIf="fk_pd_type != '3' && fk_pd_type != '2'">No of Employees Sighted By PD Officer During His Visit </mat-card-title>
+                                    <mat-card-title *ngIf="fk_pd_type == '3' || fk_pd_type == '2'">Company Name Board </mat-card-title>
                                 </mat-card-header>
                                 <mat-card-content class="matcard">
-                                    <mat-form-field *ngIf="fk_pd_type != '3'">
+                                    <mat-form-field *ngIf="fk_pd_type != '3' && fk_pd_type != '2'">
                                         <input matInput placeholder="Total" formControlName="officer_total" required>
                                         <mat-error *ngIf="businessForm.controls['officer_total'].hasError('required')">Total Required</mat-error>
                                     </mat-form-field>
@@ -1622,7 +1622,7 @@
                                                 formControlName="officer_temporary" required>
                                         </mat-form-field> -->
                                     <mat-form-field>
-                                        <mat-select [placeholder]=" fk_pd_type == '3' ? 'Company name board photo shared' : 'Was the Company name board sighted ?'" formControlName="was_the_company_name_board_sighted"
+                                        <mat-select [placeholder]=" (fk_pd_type == '3' || fk_pd_type == '2' ) ? 'Company name board photo shared' : 'Was the Company name board sighted ?'" formControlName="was_the_company_name_board_sighted"
                                             required>
                                             <mat-option value="yes">Yes</mat-option>
                                             <mat-option value="no">No</mat-option>
@@ -1634,8 +1634,8 @@
                             </mat-card>
                             <mat-card>
                                 <mat-card-header>
-                                    <mat-card-title *ngIf="fk_pd_type != '3'">Documents Sighted</mat-card-title>
-                                    <mat-card-title *ngIf="fk_pd_type == '3'">Documents Images Shared</mat-card-title>
+                                    <mat-card-title *ngIf="fk_pd_type != '3' && fk_pd_type != '2'">Documents Sighted</mat-card-title>
+                                    <mat-card-title *ngIf="fk_pd_type == '3' || fk_pd_type == '2'">Documents Images Shared</mat-card-title>
                                 </mat-card-header>
                                 <mat-card-content class="matcard">
 
diff --git a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/business-info/business-info.component.ts b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/business-info/business-info.component.ts
index e83310390..05b020680 100755
--- a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/business-info/business-info.component.ts
+++ b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/business-info/business-info.component.ts
@@ -764,7 +764,7 @@ export class BusinessInfoComponent implements OnInit {
             // others_activity_details: this.fb.array([]),
         });
 
-        if(this.fk_pd_type == '3'){        
+        if(this.fk_pd_type == '3' || this.fk_pd_type == '2'){        
             this.businessForm.controls['officer_total'].clearValidators();
             this.businessForm.controls['officer_total'].updateValueAndValidity();
 
diff --git a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/final-remarks/final-remarks.component.html b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/final-remarks/final-remarks.component.html
index cddca78e0..436115b3d 100755
--- a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/final-remarks/final-remarks.component.html
+++ b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/final-remarks/final-remarks.component.html
@@ -31,7 +31,7 @@
                 <mat-card>
                     <mat-card-content>
                         <mat-card-subtitle>Location</mat-card-subtitle>
-                        <mat-form-field style="width:94%;" *ngIf="fk_pd_type != '3'">
+                        <mat-form-field style="width:94%;" *ngIf="fk_pd_type != '3' && fk_pd_type != '2'">
                             <mat-select placeholder="Is the location of the business / profession suited to the nature of business / service provided? "
                                 formControlName="is_service_provided" required>
                                 <mat-option>Select</mat-option>
@@ -136,11 +136,11 @@
                         </div>
                     </div>
                 </span>
-                <div class="toggle" fxLayout="row nowrap" *ngIf="fk_pd_type != '3'">
+                <div class="toggle" fxLayout="row nowrap" *ngIf="fk_pd_type != '3' && fk_pd_type != '2'">
                     <mat-label>Any additional visit (Godown /multiple rental properties)</mat-label>&nbsp;&nbsp;
                     <mat-slide-toggle formControlName="was_the_pd_address_ogl" color="primary"></mat-slide-toggle>
                 </div>
-                 <mat-form-field style="width:50%;" *ngIf="fk_pd_type != '3'">
+                 <mat-form-field style="width:50%;" *ngIf="fk_pd_type != '3' && fk_pd_type != '2'">
                         <mat-select placeholder="Mode of Transport Used to Visit the PD address" formControlName="mode_of_transport_during_visit"
                             required>
                             <mat-option>Select</mat-option>
@@ -160,7 +160,7 @@
                     <mat-card-content>
                         <mat-card-subtitle *ngIf="lender_short_name == 'CLIX'">CLIX</mat-card-subtitle>
                         <mat-card-subtitle *ngIf="lender_short_name == 'MWISE'">MWISE</mat-card-subtitle>
-                                <mat-form-field style="width:94%;" *ngIf="_finalRemarkForm.controls['outlet_location'] && prod_catagory == 'LAEP' && fk_pd_type != '3'"> 
+                                <mat-form-field style="width:94%;" *ngIf="_finalRemarkForm.controls['outlet_location'] && prod_catagory == 'LAEP' && (fk_pd_type != '3' && fk_pd_type != '2')"> 
                                         <mat-select placeholder="Comment on Footfall in the market where the B2C outlet is located…" formControlName="outlet_location"
                                         required>
                                         <mat-option>Select</mat-option>
@@ -176,7 +176,7 @@
                         Is there Competition to the applicant’s business in the location <strong>( {{ _finalRemarkForm.value.is_competition ===true ? 'Yes' : 'No'}} )</strong>
                     </mat-checkbox>
                 </div> -->
-                <div *ngIf="fk_pd_type != '3'">
+                <div *ngIf="fk_pd_type != '3' && fk_pd_type != '2'">
                 <mat-form-field style="width:94%;" *ngIf="_finalRemarkForm.controls['is_competition']"> 
                     <mat-select placeholder="Is there Competition to the applicant’s business in the location" formControlName="is_competition" (selectionChange)="clixChange($event.value,1)">
                         <mat-option>Select</mat-option>
@@ -222,7 +222,7 @@
                 <mat-checkbox color="primary" formControlName="sealing_activity" (change)="clixChange($event.checked,3)">
                         Any sealing activity observed in the locality by PD office <strong>( {{ _finalRemarkForm.value.sealing_activity ===true ? 'Yes' : 'No'}} )</strong></mat-checkbox>
                 </div> -->
-                <div *ngIf="fk_pd_type != '3'">
+                <div *ngIf="fk_pd_type != '3' && fk_pd_type != '2'">
                 <mat-form-field style="width:94%;" *ngIf="_finalRemarkForm.controls['demolition_activity']"> 
                         <mat-select placeholder="Any sealing activity observed in the locality by PD officer" formControlName="sealing_activity" (selectionChange)="clixChange($event.value,3)">
                             <mat-option>Select</mat-option>
diff --git a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/final-remarks/final-remarks.component.ts b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/final-remarks/final-remarks.component.ts
index 06bdd4622..010e9d10b 100755
--- a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/final-remarks/final-remarks.component.ts
+++ b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/final-remarks/final-remarks.component.ts
@@ -108,7 +108,7 @@ export class FinalRemarksComponent implements OnInit {
       final_form_remarks: ['']
     });
 
-    if(this.fk_pd_type == '3'){        
+    if(this.fk_pd_type == '3' || this.fk_pd_type == '2'){        
       this._finalRemarkForm.controls['is_service_provided'].clearValidators();
       this._finalRemarkForm.controls['is_service_provided'].updateValueAndValidity();
 
@@ -116,7 +116,7 @@ export class FinalRemarksComponent implements OnInit {
       this._finalRemarkForm.controls['mode_of_transport_during_visit'].updateValueAndValidity();
   }
 
-    if(this.fk_pd_type != '3' && (this.lender_short_name == 'CLIX' || this.lender_short_name == 'MWISE' || this.prod_catagory == 'LAEP')){  
+    if((this.fk_pd_type != '3' && this.fk_pd_type != '2') && (this.lender_short_name == 'CLIX' || this.lender_short_name == 'MWISE' || this.prod_catagory == 'LAEP')){  
       this.prod_catagory == 'LAEP' ? this._finalRemarkForm.addControl('outlet_location', new FormControl('', Validators.required)) : this._finalRemarkForm.removeControl('outlet_location');
        this._finalRemarkForm.addControl('is_competition', new FormControl(''));
        this._finalRemarkForm.addControl('sealing_activity', new FormControl('')); 
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 147e3d991..2058feb50 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
@@ -17,7 +17,7 @@
                 <ng-template matTabContent>
                     <div fxLayout="row wrap">
                         <div fxFlex="100">
-                            <mat-card *ngIf="fk_pd_type != '3'">
+                            <mat-card *ngIf="fk_pd_type != '3' && fk_pd_type != '2'">
                                 <mat-card-header>
                                     <mat-card-title>
                                         <p>Data as Per Financial Statements</p>
@@ -499,15 +499,15 @@
                                                     </mat-radio-group>
                                                 </div><br/>
                                                 <div style="width:auto" *ngIf="financialForm.value.kuccha_records_shown == 'yes'">
-                                                        <mat-label *ngIf="fk_pd_type != '3'">Photograph of Kuchha bills allowed</mat-label><br/>
-                                                        <mat-label *ngIf="fk_pd_type == '3'">Photographs of kuccha bills uploaded</mat-label><br/>
+                                                        <mat-label *ngIf="fk_pd_type != '3' && fk_pd_type != '2'">Photograph of Kuchha bills allowed</mat-label><br/>
+                                                        <mat-label *ngIf="fk_pd_type == '3' || fk_pd_type == '2'">Photographs of kuccha bills uploaded</mat-label><br/>
                                                             <mat-radio-group formControlName="kuccha_bill_allowed" >
                                                                 <mat-radio-button  value="yes">Yes
                                                                 </mat-radio-button>&nbsp;&nbsp;
                                                                 <mat-radio-button  value="no"> No</mat-radio-button>
                                                                 </mat-radio-group>
                                                             </div><br/>
-                                                            <div style="width:auto" *ngIf="financialForm.value.kuccha_records_shown == 'yes' && fk_pd_type != '3'">
+                                                            <div style="width:auto" *ngIf="financialForm.value.kuccha_records_shown == 'yes' && (fk_pd_type != '3' && fk_pd_type != '2')">
                                                                     <mat-label>Does the Number of Kuccha Bills and Values therein, justify the customer declared turnover?</mat-label><br/>
                                                                         <mat-radio-group formControlName="customer_declared_turnover" >
                                                                             <mat-radio-button  value="yes">Yes
diff --git a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/neighbour-hood/neighbour-hood.component.html b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/neighbour-hood/neighbour-hood.component.html
index 364f916bb..b5e10d308 100755
--- a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/neighbour-hood/neighbour-hood.component.html
+++ b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/neighbour-hood/neighbour-hood.component.html
@@ -29,12 +29,12 @@
                                     <mat-card *ngFor="let neighbourhood of _neighbourhoodForm.controls.neighbourhood_list['controls']; let n = index; let last = last"
                                         [formGroupName]="n">
                                         <mat-card-content>
-                                            <mat-form-field style="width: 42%" *ngIf="fk_pd_type != '3'">
+                                            <mat-form-field style="width: 42%" *ngIf="fk_pd_type != '3' && fk_pd_type != '2'">
                                                 <input matInput autocomplete="off" placeholder="Neighbour Name" formControlName="neighbourhood_name" appCustomTitleCase
                                                 [value]="neighbourhood.get('neighbourhood_name').value" type="text">
                                             </mat-form-field>
                     
-                                            <mat-form-field style="width: 40%" *ngIf="fk_pd_type != '3'">
+                                            <mat-form-field style="width: 40%" *ngIf="fk_pd_type != '3' && fk_pd_type != '2'">
                                                 <!-- Do You Know the Applicant -->
                                                 <mat-select placeholder=" Do you know about the applicants or their business?"
                                                     formControlName="do_know">
@@ -44,8 +44,8 @@
                                                 </mat-select>
                                             </mat-form-field>
                     
-                                            <div fxLayout="row wrap" *ngIf="neighbourhood.controls.do_know.value!='' && fk_pd_type != '3'">
-                                                <div fxFlex="80" *ngIf="fk_pd_type != '3'">
+                                            <div fxLayout="row wrap" *ngIf="neighbourhood.controls.do_know.value!='' && fk_pd_type != '3' && fk_pd_type != '2'">
+                                                <div fxFlex="80" *ngIf="fk_pd_type != '3' && fk_pd_type != '2'">
                                                     <label>As per you how long has this business been in operation?</label>
                                                     <mat-form-field *ngIf="!this.isDisplay[n]">
                                                             <mat-label>Year</mat-label>
@@ -58,7 +58,7 @@
                                                             OnlyNumber type="text" (change)="ConvertMonthintoYear(neighbourhood,$event.target.value,1)">
                                                     </mat-form-field>
                                                 </div>
-                                                <div fxFlex="10" style="text-align: center;" *ngIf="fk_pd_type != '3'">
+                                                <div fxFlex="10" style="text-align: center;" *ngIf="fk_pd_type != '3' && fk_pd_type != '2'">
                                                     <label>Do not know</label>
                                                     <div>
                                                         <mat-checkbox color="primary" formControlName="did_not_know_the_business_operation"
@@ -70,7 +70,7 @@
                     
                                             <div fxLayout="row wrap" *ngIf="neighbourhood.controls.do_know.value!=''">
                     
-                                                <div fxFlex="60" *ngIf="fk_pd_type != '3'">
+                                                <div fxFlex="60" *ngIf="fk_pd_type != '3' && fk_pd_type != '2'">
                                                     <mat-form-field style="width: 95%" *ngIf="neighbourhood.controls.do_know.value!='' && !isDisplay2[n] ; else OtherCondition;">
                                                         <mat-select multiple placeholder="Who is the owner of the organisation?"
                                                             formControlName="organisation_owner" [compareWith]="compareObjects"
@@ -92,7 +92,7 @@
                                                             type="text" [value]="neighbourhood.controls.other_organisation_owner.value" appCustomTitleCase>
                                                     </mat-form-field>
                                                 </div>
-                                                <div fxFlex="10" style="text-align: center;">
+                                                <div fxFlex="10" style="text-align: center;" *ngIf="fk_pd_type != '3' && fk_pd_type != '2'">
                                                     <label>Do not know</label>
                                                     <div>
                                                         <mat-checkbox color="primary" formControlName="did_not_know_the_owner" (change)="toggleVisibility($event.checked,n,2)"></mat-checkbox>
diff --git a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/queries-docs/queries-docs.component.html b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/queries-docs/queries-docs.component.html
index 6300e421d..e0ffc8901 100755
--- a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/queries-docs/queries-docs.component.html
+++ b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/queries-docs/queries-docs.component.html
@@ -60,8 +60,8 @@
   <mat-card *ngIf="docs_array_value.length !=0 ">
       <mat-card-header>
         <mat-card-title>
-          <h5 *ngIf="fk_pd_type != '3'">Documents to be collected</h5>
-          <h5 *ngIf="fk_pd_type == '3'">Docuements to be uploaded</h5>
+          <h5 *ngIf="fk_pd_type != '3' && fk_pd_type != '2'">Documents to be collected</h5>
+          <h5 *ngIf="fk_pd_type == '3' || fk_pd_type == '2'">Docuements to be uploaded</h5>
         </mat-card-title>
       </mat-card-header>
       <mat-card style="margin-left: 15px;">
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 df7f427bc..b97f38d94 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
@@ -40,8 +40,8 @@
                                                                     (selectionChange)="checkComments($event.value,1,a);" required>
                                                                     <mat-option>Select</mat-option>
                                                                     <mat-option value="yes">Add Stock Details</mat-option>
-                                                                    <mat-option *ngIf="fk_pd_type != '3'" value="no">No Stock Observed</mat-option>
-                                                                    <mat-option *ngIf="fk_pd_type == '3'" value="no">No Stock Available</mat-option>
+                                                                    <mat-option *ngIf="fk_pd_type != '3' && fk_pd_type != '2'" value="no">No Stock Observed</mat-option>
+                                                                    <mat-option *ngIf="fk_pd_type == '3' || fk_pd_type == '2'" value="no">No Stock Available</mat-option>
                                                                     <!-- <mat-option value="stock not required to be maintained">Stock not required to be maintained</mat-option> -->
                                                                 </mat-select>
                                                                 <mat-error *ngIf="mrm.controls['stock_observed'].hasError('required')">Stock Required</mat-error>
@@ -137,8 +137,8 @@
                                                                     (selectionChange)="checkComments($event.value,2,b);" required>
                                                                     <mat-option>Select</mat-option>
                                                                     <mat-option value="yes">Add Stock Details</mat-option>
-                                                                    <mat-option *ngIf="fk_pd_type != '3'" value="no">No Stock Observed</mat-option>
-                                                                    <mat-option *ngIf="fk_pd_type == '3'" value="no">No Stock Available</mat-option>
+                                                                    <mat-option *ngIf="fk_pd_type != '3' && fk_pd_type != '2'" value="no">No Stock Observed</mat-option>
+                                                                    <mat-option *ngIf="fk_pd_type == '3' || fk_pd_type == '2'" value="no">No Stock Available</mat-option>
                                                                     <!-- <mat-option value="stock not required to be maintained">Stock not required to be maintained</mat-option> -->
                                                                 </mat-select>
                                                             </mat-form-field>
@@ -224,8 +224,8 @@
                                                                     (selectionChange)="checkComments($event.value,3,e)" required>
                                                                     <mat-option>Select</mat-option>
                                                                     <mat-option value="yes">Add Stock Details</mat-option>
-                                                                    <mat-option *ngIf="fk_pd_type != '3'" value="no">No Stock Observed</mat-option>
-                                                                    <mat-option *ngIf="fk_pd_type == '3'" value="no">No Stock Available</mat-option>
+                                                                    <mat-option *ngIf="fk_pd_type != '3' && fk_pd_type != '2'" value="no">No Stock Observed</mat-option>
+                                                                    <mat-option *ngIf="fk_pd_type == '3' || fk_pd_type == '2'" value="no">No Stock Available</mat-option>
                                                                     <!-- <mat-option value="stock not required to be maintained">Stock not required to be maintained</mat-option> -->
                                                                 </mat-select>
                                                             </mat-form-field>
@@ -314,8 +314,8 @@
                                                                     (selectionChange)="checkComments($event.value,4,g)" required>
                                                                     <mat-option>Select</mat-option>
                                                                     <mat-option value="yes">Add Stock Details</mat-option>
-                                                                    <mat-option *ngIf="fk_pd_type != '3'" value="no">No Stock Observed</mat-option>
-                                                                    <mat-option *ngIf="fk_pd_type == '3'" value="no">No Stock Available</mat-option>
+                                                                    <mat-option *ngIf="fk_pd_type != '3' && fk_pd_type != '2'" value="no">No Stock Observed</mat-option>
+                                                                    <mat-option *ngIf="fk_pd_type == '3' || fk_pd_type == '2'" value="no">No Stock Available</mat-option>
                                                                     <!-- <mat-option value="stock not required to be maintained">Stock not required to be maintained</mat-option> -->
                                                                 </mat-select>
                                                             </mat-form-field>
@@ -429,8 +429,8 @@
                                                                     (selectionChange)="checkComments($event.value,5,g)" required>
                                                                     <mat-option>Select</mat-option>
                                                                     <mat-option value="yes">Add Stock Details</mat-option>
-                                                                    <mat-option *ngIf="fk_pd_type != '3'" value="no">No Stock Observed</mat-option>
-                                                                    <mat-option *ngIf="fk_pd_type == '3'" value="no">No Stock Available</mat-option>
+                                                                    <mat-option *ngIf="fk_pd_type != '3' && fk_pd_type != '2'" value="no">No Stock Observed</mat-option>
+                                                                    <mat-option *ngIf="fk_pd_type == '3' || fk_pd_type == '2'" value="no">No Stock Available</mat-option>
                                                                     <!-- <mat-option value="stock not required to be maintained">Stock not required to be maintained</mat-option> -->
                                                                 </mat-select>
                                                             </mat-form-field>
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 de4ae1354..c814cf202 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
@@ -88,7 +88,7 @@ export class StockComponent implements OnInit {
     this.subproduct_abbr = this.pd_all_details.pdmaster_details.subproduct_abbr;
     this.customer_segment_abbr = this.pd_all_details.pdmaster_details.customer_segment_abbr;
     this.fk_pd_type = this.pd_all_details.pdmaster_details.fk_pd_type; 
-    if(this.fk_pd_type == '3'){
+    if(this.fk_pd_type == '3' || this.fk_pd_type == '2'){
       this.SPsufficientList.push({value:"not able to assess",isdisplayvalue:"Not able to assess",isdisabled:false})
       this.TGsufficientList.push({value:"not able to assess",isdisplayvalue:"Not able to assess",isdisabled:false})
       this.RMsufficientList.push({value:"not able to assess",isdisplayvalue:"Not able to assess",isdisabled:false})
diff --git a/ng6-seed/src/app/quality-check/qc-list/qc-view/qc-view.component.ts b/ng6-seed/src/app/quality-check/qc-list/qc-view/qc-view.component.ts
index b54572021..ca04c3f1c 100755
--- a/ng6-seed/src/app/quality-check/qc-list/qc-view/qc-view.component.ts
+++ b/ng6-seed/src/app/quality-check/qc-list/qc-view/qc-view.component.ts
@@ -17,6 +17,7 @@ import { InitiateAdditionalPdComponent } from './../../../personal-discussion/ma
 import {QcStartComponent} from '../qc-start/qc-start.component'
 
 import {DatePipe } from '@angular/common';
+import { VendorPdAllocationComponent } from 'app/personal-discussion/manage-pd/list-pd/vendor-pd-allocation/VendorPdAllocationComponent';
 
 @Component({
   selector: 'app-qc-view',
@@ -193,7 +194,7 @@ export class QcViewComponent implements OnInit, OnDestroy {
   // pd allocation to
   pdAllocationTo(pdData:any,childData: any) {
     pdData.pd_id = childData.assigned_pd;
-    if (pdData.fk_pd_type == 1 || pdData.fk_pd_type == 3) {
+    if (pdData.fk_pd_type == 1 || pdData.fk_pd_type == 3 || pdData.fk_pd_type == 2) {
       const dialogRef = this.dialog.open(PdAllocationComponent, {
         data: pdData,
         position: { right: '0'},
@@ -203,23 +204,40 @@ export class QcViewComponent implements OnInit, OnDestroy {
       dialogRef.afterClosed()
       .subscribe(dataresult => {
       //  this.notifier.notify('success', 'Successfully allocated.!');
-        this.viewPdDetails(this.viewID,this.masterRandomString)
-      });
-    }
-    else if(pdData.fk_pd_type == 2){
-      const dialogRef = this.dialog.open(SmartPdAllocationComponent, {
+      console.log(dataresult)
+      if(dataresult == 'openvendorallocation'){
+        const dialogSchedule = this.dialog.open(VendorPdAllocationComponent, {
         data: pdData,
+        disableClose: true,
         position: { right: '0'},
-        width: '80%',
-        disableClose: true
+        width:'100%',
+        // hasBackdrop:false
       });
-      dialogRef.afterClosed()
+      dialogSchedule.afterClosed()
       .subscribe(dataresult => {
-       // this.notifier.notify('success', 'Successfully allocated.!');
-
         this.viewPdDetails(this.viewID,this.masterRandomString)
+      });  
+      // this.notifier.notify('warning', 'No PD In Hand');
+      }else{
+      //  this.notifier.notify('success', 'Successfully allocated.!');
+      this.viewPdDetails(this.viewID,this.masterRandomString)
+      }
       });
     }
+    // else if(pdData.fk_pd_type == 2){
+    //   const dialogRef = this.dialog.open(SmartPdAllocationComponent, {
+    //     data: pdData,
+    //     position: { right: '0'},
+    //     width: '80%',
+    //     disableClose: true
+    //   });
+    //   dialogRef.afterClosed()
+    //   .subscribe(dataresult => {
+    //    // this.notifier.notify('success', 'Successfully allocated.!');
+
+    //     this.viewPdDetails(this.viewID,this.masterRandomString)
+    //   });
+    // }
     // else if(pdData.fk_pd_type == 3){
     //   const dialogRef = this.dialog.open(TelePdAllocationComponent, {
     //     data: pdData,