From 2710a542519d02bec0a0b9e49917b10ed0ed5691 Mon Sep 17 00:00:00 2001 From: "venbatechnologies@gmail.com" Date: Fri, 15 May 2020 14:50:30 +0530 Subject: [PATCH] Fairoj : Tele PD issue fixed --- .../business-assets-info.component.ts | 2 ++ .../forms/final-remarks/final-remarks.component.html | 4 ++-- .../forms/final-remarks/final-remarks.component.ts | 2 +- .../list-pd/start-pd/forms/stock/stock.component.ts | 8 +++++--- .../view-pd/speed-dial-fab/speed-dial-fab.component.scss | 9 +++++++++ .../manage-pd/list-pd/view-pd/view-pd.component.html | 9 ++++++--- .../manage-pd/list-pd/view-pd/view-pd.component.scss | 2 +- 7 files changed, 26 insertions(+), 10 deletions(-) diff --git a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/business-assets-info/business-assets-info.component.ts b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/business-assets-info/business-assets-info.component.ts index 34241ac0c..458c8c366 100755 --- a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/business-assets-info/business-assets-info.component.ts +++ b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/business-assets-info/business-assets-info.component.ts @@ -1210,8 +1210,10 @@ export class BusinessAssetsInfoComponent implements OnInit { if (flag == 1) { if (value == 'yes') { item.controls.business_years.setValidators([Validators.required]); + if(this.fk_pd_type != '3') { item.controls.business_is_pd_visited.setValidators([Validators.required]); item.controls.business_pd_visited_remark.setValidators([Validators.required]); + } item.controls.business_ownership_type.setValidators([Validators.required]); } else { 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 6cd7b0cb3..4e1608952 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 @@ -41,7 +41,7 @@ Service Provided Required - + @@ -156,7 +156,7 @@ Specify the Mode of Transport Used to Visit the PD address Required - + CLIX MWISE 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 70e310680..15bb49fa4 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 @@ -256,7 +256,7 @@ export class FinalRemarksComponent implements OnInit { this._finalRemarkForm.controls.market_intelligence.setValue(data.records.market_intelligence || ''); - if(this.lender_short_name == 'CLIX' || this.lender_short_name == 'MWISE' || this.prod_catagory == 'LAEP'){ + if(this.fk_pd_type != '3' && (this.lender_short_name == 'CLIX' || this.lender_short_name == 'MWISE' || this.prod_catagory == 'LAEP')){ if(this.prod_catagory == 'LAEP') {this._finalRemarkForm.controls.outlet_location.setValue(this.prod_catagory == 'LAEP' ? data.records.outlet_location : ''); } this._finalRemarkForm.controls.is_competition.setValue(data.records.is_competition); 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 d0585f518..8f6f7907d 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 @@ -9,8 +9,8 @@ import { MatDialog, MatDialogRef, MAT_DIALOG_DATA } from '@angular/material'; /** Service */ import { PdTrigerService } from '../../../../../pd-service/pd-triger.service'; import { ActivatedRoute, Router } from '@angular/router'; -import { analyzeAndValidateNgModules } from '@angular/compiler'; -import { ImageCropComponent } from '../dialogue/image-crop/image-crop.component'; +// import { analyzeAndValidateNgModules } from '@angular/compiler'; +// import { ImageCropComponent } from '../dialogue/image-crop/image-crop.component'; @Component({ // changeDetection: ChangeDetectionStrategy.OnPush, @@ -89,7 +89,9 @@ export class StockComponent implements OnInit { 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'){ - this.SPsufficientList.push({value:"not able to assess",isdisplayvalue:"Not able to assess",isdisabled:false}) + this.SPsufficientList.push({value:"not able to access",isdisplayvalue:"Not able to access",isdisabled:false}) + this.TGsufficientList.push({value:"not able to access",isdisplayvalue:"Not able to access",isdisabled:false}) + this.RMsufficientList.push({value:"not able to access",isdisplayvalue:"Not able to access",isdisabled:false}) } this.image_doc_params={pdid:this.pdid,form_id:this.form_id,company_id:this.company_id} } diff --git a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/view-pd/speed-dial-fab/speed-dial-fab.component.scss b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/view-pd/speed-dial-fab/speed-dial-fab.component.scss index 74fdfb0dc..729e995bb 100644 --- a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/view-pd/speed-dial-fab/speed-dial-fab.component.scss +++ b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/view-pd/speed-dial-fab/speed-dial-fab.component.scss @@ -24,6 +24,15 @@ } } } + @media(max-width:580px) { + .fab-container { + > div { + flex-direction: column !important; + right: 0px; + top: 53px; + } + } + } .fab-toggler { float: right; diff --git a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/view-pd/view-pd.component.html b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/view-pd/view-pd.component.html index daf3547e2..1f35d296a 100755 --- a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/view-pd/view-pd.component.html +++ b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/view-pd/view-pd.component.html @@ -125,8 +125,11 @@
-
-
+
+
+ +
+
@@ -135,13 +138,13 @@ matTooltip="Copy Customer Link" matTooltipPosition="above"> link --> +    -