Sineedge/sparq-vendor
5
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Vendor Status Update

Browse Source
This commit is contained in:
sriram-at-840620226347 2020-06-26 16:54:34 +05:30
parent f64d8cd6d8
commit 54fea104fc
33 changed files with 117 additions and 176 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
ng6-seed/src/app/layouts/admin/admin-layout.component.html
View File

@ -354,7 +354,7 @@
<mat-list-item>
<h3 mat-line> {{item.applicant_name}} </h3>
<p mat-line> {{item.lender_applicant_id}}</p>
<p mat-line> {{item.entity_name}} - {{item.pd_status}} </p>
<p mat-line> {{item.entity_name}} - {{item.vendor_status}} </p>
</mat-list-item>
</ng-template>
</mat-nav-list>
@ -412,7 +412,7 @@
<mat-list-item>
<h3 mat-line> {{item.applicant_name}} </h3>
<p mat-line> {{item.lender_applicant_id}}</p>
<p mat-line> {{item.entity_name}} - {{item.pd_status}} </p>
<p mat-line> {{item.entity_name}} - {{item.vendor_status}} </p>
</mat-list-item>
</ng-template>
</mat-nav-list>

4
ng6-seed/src/app/layouts/admin/admin-layout.component.ts
View File

@ -103,8 +103,8 @@ export class AdminLayoutComponent implements OnInit, OnDestroy {
// console.log('Layout Alert Message Whole Data',data);
// this.alertCount = data.records.length;
// this.alertMsgTriggerType = data.records.filter(trigger=>trigger.pd_status == "TRIGGERED" );
// this.alertMsgAllocateType = data.records.filter(allocate=>allocate.pd_status == "ALLOCATED" );
// this.alertMsgTriggerType = data.records.filter(trigger=>trigger.vendor_status == "TRIGGERED" );
// this.alertMsgAllocateType = data.records.filter(allocate=>allocate.vendor_status == "ALLOCATED" );
// console.log('Layout Alert Message',this.alertMsgTriggerType);
// console.log('Layout Alert Message',this.alertMsgAllocateType);
// console.log('Layout Alert Count',this.alertCount);

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

@ -751,7 +751,7 @@ export class AddPdComponent implements OnInit, OnDestroy {
"pincode": formValue.addresses[0].pincode,
"other_pincode": formValue.addresses[0].other_pincode,
"remarks": formValue.remarks,
"pd_status": status,
"vendor_status": status,
"fk_createdby": this._aws.getlocale(),
};

14
ng6-seed/src/app/personal-discussion/manage-pd/list-pd/all-pd/all-pd.component.html
View File

@ -18,7 +18,7 @@
</mat-select>
</mat-form-field> &nbsp; &nbsp;
<mat-form-field style="width:25%">
<mat-select multiple formControlName="pd_status" placeholder="PD Status">
<mat-select multiple formControlName="vendor_status" placeholder="PD Status">
<mat-option *ngFor="let status of pdStatus" [value]="status.pd_status_name">{{status.pd_status_name}}</mat-option>
</mat-select>
</mat-form-field> &nbsp; &nbsp;
@ -113,21 +113,21 @@
</ng-container>
<ng-container matColumnDef="Status">
<mat-cell class="cell center" *matCellDef="let details;">
<span *ngIf="details.pd_status!='QC_COMPLETED'"> {{details.pd_status}}</span>
<span *ngIf="details.pd_status=='QC_COMPLETED'"> QC COMPLETED</span>
<span *ngIf="details.vendor_status!='QC_COMPLETED'"> {{details.vendor_status}}</span>
<span *ngIf="details.vendor_status=='QC_COMPLETED'"> QC COMPLETED</span>
<br>
<span class="fontsize" *ngIf="details.pd_status!='SCHEDULED' && details.pd_status!='QC_COMPLETED'" [matTooltip]="details.pd_status | titlecase"
<span class="fontsize" *ngIf="details.vendor_status!='SCHEDULED' && details.vendor_status!='QC_COMPLETED'" [matTooltip]="details.vendor_status | titlecase"
matTooltipPosition="above">{{ (details.updatedon)? (details.updatedon | slice:0:10):(details.updatedon) }}
</span>
<span class="fontsize" *ngIf="details.pd_status=='QC_COMPLETED'" matTooltip="QC Completed" matTooltipPosition="above">{{ (details.updatedon)? (details.updatedon | slice:0:10):(details.updatedon) }}
<span class="fontsize" *ngIf="details.vendor_status=='QC_COMPLETED'" matTooltip="QC Completed" matTooltipPosition="above">{{ (details.updatedon)? (details.updatedon | slice:0:10):(details.updatedon) }}
</span>
<span class="fontsize" *ngIf="details.pd_status=='SCHEDULED'" [matTooltip]="details.pd_status | titlecase" matTooltipPosition="above">{{details.scheduled_on}}
<span class="fontsize" *ngIf="details.vendor_status=='SCHEDULED'" [matTooltip]="details.vendor_status | titlecase" matTooltipPosition="above">{{details.scheduled_on}}
</span>
</mat-cell>
</ng-container>
<ng-container matColumnDef="Action">
<mat-cell class="cell center" *matCellDef="let details;">
<a [style.visibility]="details.pd_status=='INITIATED' && details.encrypted_url!=null && details.encrypted_url!='' ? 'visible' : 'hidden'" [attr.href]="details.encrypted_url" target="_blank">
<a [style.visibility]="details.vendor_status=='INITIATED' && details.encrypted_url!=null && details.encrypted_url!='' ? 'visible' : 'hidden'" [attr.href]="details.encrypted_url" target="_blank">
<button mat-button mat-icon-button class="mr-1 mb-1 hover-icon" type="button" color="primary"
matTooltip="Officer Tracking" matTooltipPosition="above">
<mat-icon>my_location</mat-icon>

6
ng6-seed/src/app/personal-discussion/manage-pd/list-pd/all-pd/all-pd.component.ts
View File

@ -57,7 +57,7 @@ export class AllPdComponent implements OnInit, OnChanges {
this.searchForm = this._fb.group(
{
pd_type:[null],
pd_status:[null],
vendor_status:[null],
pd_from_date:[null],
pd_to_date:[null],
pd_city:[null],
@ -208,12 +208,12 @@ console.log(this.displayedColumns)
this.searchForm.value.pd_type = [];
}
if(this.searchForm.value.pd_status !=null)
if(this.searchForm.value.vendor_status !=null)
{
}else
{
this.searchForm.value.pd_status = [];
this.searchForm.value.vendor_status = [];
}
this.searchForm.value.pd_from_date = this.pipe.transform(this.searchForm.value.pd_from_date,'yyyy-MM-dd');

4
ng6-seed/src/app/personal-discussion/manage-pd/list-pd/completed-pd/completed-pd.component.html
View File

@ -106,8 +106,8 @@
</ng-container>
<ng-container matColumnDef="Status">
<mat-cell class="cell center" *matCellDef="let details;">
<span> {{details.pd_status}}</span><br>
<span class="fontsize" [matTooltip]="details.pd_status | titlecase" >{{ (details.updatedon)? (details.updatedon | slice:0:10):(details.updatedon) }}
<span> {{details.vendor_status}}</span><br>
<span class="fontsize" [matTooltip]="details.vendor_status | titlecase" >{{ (details.updatedon)? (details.updatedon | slice:0:10):(details.updatedon) }}
</span>
</mat-cell>
</ng-container>

8
ng6-seed/src/app/personal-discussion/manage-pd/list-pd/completed-pd/completed-pd.component.ts
View File

@ -57,7 +57,7 @@ export class CompletedPdComponent implements OnInit, OnChanges {
this.searchForm = this._fb.group(
{
pd_type:[null],
pd_status:['COMPLETED'],
vendor_status:['COMPLETED'],
pd_from_date:[null],
pd_to_date:[null],
pd_city:[null],
@ -156,7 +156,7 @@ public VendorRoleID : any = localStorage.getItem('VendorRoleID');
if(res.dataStatus==true)
{
this.pdStatus = res.records.filter(status=>status.isactive==1 && status.pd_status_name==this.tabStatus);
// this.searchForm.controls['pd_status'].setValue(this.pdStatus[0]);
// this.searchForm.controls['vendor_status'].setValue(this.pdStatus[0]);
}
});
@ -213,12 +213,12 @@ public VendorRoleID : any = localStorage.getItem('VendorRoleID');
this.searchForm.value.pd_type = [];
}
if(this.searchForm.value.pd_status !=null)
if(this.searchForm.value.vendor_status !=null)
{
}else
{
this.searchForm.value.pd_status = [];
this.searchForm.value.vendor_status = [];
}
this.searchForm.value.pd_from_date = this.pipe.transform(this.searchForm.value.pd_from_date,'yyyy-MM-dd');

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

@ -80,7 +80,7 @@ export class EditPdMasterComponent implements OnInit {
@Inject(MAT_DIALOG_DATA) public data: any,private titleCase : TitleCasePipe,private userService:UserService) {
// console.log("hsdf",this.data)
this.notifier=notifier
this.currentPDStatus = data.records.pd_status;
this.currentPDStatus = data.records.vendor_status;
this.pdid = data.records.pd_id;
this.masterRandomString = data.records.random_string;
this.disableAfterSubmit = false;

6
ng6-seed/src/app/personal-discussion/manage-pd/list-pd/initiate-additional-pd/initiate-additional-pd.component.ts
View File

@ -47,7 +47,7 @@ export class InitiateAdditionalPdComponent implements OnInit {
pd_co_applicant_id:[this.data.type===false ? '' : '',Validators.required],
mobile_no:[this.data.type===false ? '' : '',Validators.required],
fk_address_id:[this.data.pd_address_id,Validators.required],
pd_status:[this.data.pd_status,Validators.required],
vendor_status:[this.data.vendor_status,Validators.required],
});
}
/** To Get City And Pincode Data For Address Form
@ -76,13 +76,13 @@ submitDetails(values: any) {
"parent_pd_id":values.parent_pd_id,
"fk_customer_segment":values.fk_customer_segment ,
"fk_address_id":values.fk_address_id,
"pd_status":"TRIGGERED",
"vendor_status":"TRIGGERED",
"pd_co_applicant_id":values.pd_co_applicant_id,
"mobile_no":values.mobile_no};
}
else{
update_details={"pd_id":values.pd_id,
"pd_status":"TRIGGERED",
"vendor_status":"TRIGGERED",
"parent_pd_id":values.parent_pd_id,
"fk_customer_segment":values.fk_customer_segment ,
"fk_primary_address_id":values.fk_address_id};

6
ng6-seed/src/app/personal-discussion/manage-pd/list-pd/inprogress-pd/inprogress-pd.component.html
View File

@ -19,7 +19,7 @@
</mat-select>
</mat-form-field> &nbsp; &nbsp;
<!-- <mat-form-field style="width:30%">
<mat-select multiple formControlName="pd_status" placeholder="PD Status">
<mat-select multiple formControlName="vendor_status" placeholder="PD Status">
<mat-option *ngFor="let status of pdStatus" [value]="status.pd_status_name">{{status.pd_status_name}}</mat-option>
</mat-select>
</mat-form-field> -->
@ -104,8 +104,8 @@
</ng-container>
<ng-container matColumnDef="Status">
<mat-cell class="cell center" *matCellDef="let details;">
<span> {{details.pd_status}}</span><br>
<span class="fontsize" [matTooltip]="details.pd_status | titlecase" matTooltipPosition="above">{{ (details.updatedon)? (details.updatedon | slice:0:10):(details.updatedon) }}
<span> {{details.vendor_status}}</span><br>
<span class="fontsize" [matTooltip]="details.vendor_status | titlecase" matTooltipPosition="above">{{ (details.updatedon)? (details.updatedon | slice:0:10):(details.updatedon) }}
</span>
</mat-cell>
</ng-container>

8
ng6-seed/src/app/personal-discussion/manage-pd/list-pd/inprogress-pd/inprogress-pd.component.ts
View File

@ -54,7 +54,7 @@ export class InprogressPdComponent implements OnInit, OnChanges {
this.searchForm = this._fb.group(
{
pd_type:[null],
pd_status:['INPROGRESS'],
vendor_status:['INPROGRESS'],
pd_from_date:[null],
pd_to_date:[null],
pd_city:[null],
@ -148,7 +148,7 @@ public VendorRoleID : string = localStorage.getItem('VendorRoleID');
{
this.pdStatus = res.records.filter(status=>status.isactive==1 && status.pd_status_name == this.tabStatus);
}
// this.searchForm.controls['pd_status'].setValue(this.pdStatus[0]);
// this.searchForm.controls['vendor_status'].setValue(this.pdStatus[0]);
});
this._pd.getAllMasterDatas('PDTYPE').subscribe(res=>
@ -203,12 +203,12 @@ public VendorRoleID : string = localStorage.getItem('VendorRoleID');
this.searchForm.value.pd_type = [];
}
if(this.searchForm.value.pd_status !=null)
if(this.searchForm.value.vendor_status !=null)
{
}else
{
this.searchForm.value.pd_status = [];
this.searchForm.value.vendor_status = [];
}
this.searchForm.value.pd_from_date = this.pipe.transform(this.searchForm.value.pd_from_date,'yyyy-MM-dd');

6
ng6-seed/src/app/personal-discussion/manage-pd/list-pd/map-pd-view/map-pd-view.component.html
View File

@ -26,7 +26,7 @@
</div>
<div *ngFor="let details of dataSource.connect() | async">
<div *ngIf="(details.pd_status=='TRIGGERED' || details.pd_status=='ALLOCATED') && details.fk_pd_type !='3' ">
<div *ngIf="(details.vendor_status=='TRIGGERED' || details.vendor_status=='ALLOCATED') && details.fk_pd_type !='3' ">
<mat-card [ngStyle]="{'border-left':'5px solid','border-left-color': getColor(details.fk_pd_type)}">
<mat-card-title *ngIf="details.applicat_details" style="margin-bottom: 0px;">
@ -35,7 +35,7 @@
<span style="font-weight:700">{{details.applicat_details[0].applicant_name}}</span><span style="font-size: 13px;"> ({{details.customer_segment_abbr}})</span> <br>
<span style="font-size: 13px;" >{{details.lender_full_name}} ({{details.lender_applicant_id}})</span><br>
</div>
<div fxFlex="45" style="text-align:right;" *ngIf="details.pd_status!=pdStatusCheck.DRAFT">
<div fxFlex="45" style="text-align:right;" *ngIf="details.vendor_status!=pdStatusCheck.DRAFT">
<!-- <button mat-raised-button mat-button-sm mat-icon-button class="mr-1 hover-icon" type="button" matTooltip="PD Allocation" matTooltipPosition="above" (click)="pdAllocationTo(details)" *ngIf="roleAccessDetails.allocate"><mat-icon>verified_user</mat-icon></button> -->
<!-- <button mat-raised-button mat-button-sm mat-icon-button class=" hover-icon" type="button" matTooltip="Schedule" matTooltipPosition="above" (click)="scheduleDetails(details)" *ngIf="roleAccessDetails.schedule"><mat-icon>schedule</mat-icon></button> -->
</div>
@ -47,7 +47,7 @@
<span style="font-size: 13px;" *ngIf="details.product_abbr">{{details.product_abbr}}/{{details.subproduct_abbr}}</span><br>
<!----<span style="font-size: 13px;"> {{details.customer_segment_abbr}}<span *ngIf="details.loan_amount" style="padding-left: 48%;"><i class="fa-1x fa fa-rupee">&nbsp;</i>{{details.loan_amount}}</span></span><br>-->
<span style="font-size: 13px;">{{details.pd_date_of_initiation}}</span> -
<span style="font-size: 13px;">{{details.pd_status}} <!--- {{ (details.updatedon)? (details.updatedon | slice:0:10):(details.updatedon) }}--></span>
<span style="font-size: 13px;">{{details.vendor_status}} <!--- {{ (details.updatedon)? (details.updatedon | slice:0:10):(details.updatedon) }}--></span>
</mat-card-content>
</mat-card>

18
ng6-seed/src/app/personal-discussion/manage-pd/list-pd/pd-report/pd-report.component.html
View File

@ -13,7 +13,7 @@
<div class="other-sideMenu">
<!-- this is for completed pd report -->
<ng-container *ngIf="pdReportRecords != '' && pdReportRecords.pd_status=='COMPLETED' || pdReportRecords.pd_status=='QC_COMPLETED'">
<ng-container *ngIf="pdReportRecords != '' && pdReportRecords.vendor_status=='COMPLETED' || pdReportRecords.vendor_status=='QC_COMPLETED'">
<div *ngIf="reGenerateBtn">
<mat-sidenav-container class="app-inner background-none shadow-none mail-db">
@ -46,13 +46,13 @@
<span class="empty-spacer"></span>
<span class="empty-spacer"></span>
<div style="margin-left: 65%;">
<button align="end" *ngIf="pdReportRecords.pd_status!='QC_COMPLETED'" mat-raised-button mat-icon-button class="mr-1 ml-1 hover-icon" type="button" matTooltip="Score" matTooltipPosition="above" (click)="showAction()" ><mat-icon>arrow_upward</mat-icon></button>
<button *ngIf="pdReportRecords.pd_status!='QC_COMPLETED'" mat-raised-button mat-icon-button class="mr-1 ml-1 hover-icon" type="button" matTooltip="Save" matTooltipPosition="above" (click)="getFrameContent(IFrameContent)" style="margin-right: 2px;"><mat-icon>save</mat-icon></button>
<button *ngIf="pdReportRecords.pd_status!='QC_COMPLETED'" mat-raised-button mat-icon-button class="mr-1 ml-1 hover-icon" type="button" matTooltip="QC Notes" matTooltipPosition="above" (click)="reportReview('REMARKS')" style="margin-right: 2px;"><mat-icon>notes</mat-icon></button>
<button *ngIf="pdReportRecords.pd_status!='QC_COMPLETED'" mat-raised-button mat-icon-button class="mr-1 ml-1 hover-icon" type="button" matTooltip="PD Officer Notes" matTooltipPosition="above" (click)="reportReview('pd_officer_notes')" style="margin-right: 2px;"><mat-icon>bookmarks</mat-icon></button>
<button *ngIf="pdReportRecords.pd_status!='QC_COMPLETED'" mat-raised-button mat-icon-button class="mr-1 ml-1 hover-icon" type="button" matTooltip="QC Complete" matTooltipPosition="above" (click)="reportReview('COMPLETE')" style="margin-right: 2px;"><mat-icon>done_all</mat-icon></button>
<button align="end" *ngIf="pdReportRecords.vendor_status!='QC_COMPLETED'" mat-raised-button mat-icon-button class="mr-1 ml-1 hover-icon" type="button" matTooltip="Score" matTooltipPosition="above" (click)="showAction()" ><mat-icon>arrow_upward</mat-icon></button>
<button *ngIf="pdReportRecords.vendor_status!='QC_COMPLETED'" mat-raised-button mat-icon-button class="mr-1 ml-1 hover-icon" type="button" matTooltip="Save" matTooltipPosition="above" (click)="getFrameContent(IFrameContent)" style="margin-right: 2px;"><mat-icon>save</mat-icon></button>
<button *ngIf="pdReportRecords.vendor_status!='QC_COMPLETED'" mat-raised-button mat-icon-button class="mr-1 ml-1 hover-icon" type="button" matTooltip="QC Notes" matTooltipPosition="above" (click)="reportReview('REMARKS')" style="margin-right: 2px;"><mat-icon>notes</mat-icon></button>
<button *ngIf="pdReportRecords.vendor_status!='QC_COMPLETED'" mat-raised-button mat-icon-button class="mr-1 ml-1 hover-icon" type="button" matTooltip="PD Officer Notes" matTooltipPosition="above" (click)="reportReview('pd_officer_notes')" style="margin-right: 2px;"><mat-icon>bookmarks</mat-icon></button>
<button *ngIf="pdReportRecords.vendor_status!='QC_COMPLETED'" mat-raised-button mat-icon-button class="mr-1 ml-1 hover-icon" type="button" matTooltip="QC Complete" matTooltipPosition="above" (click)="reportReview('COMPLETE')" style="margin-right: 2px;"><mat-icon>done_all</mat-icon></button>
<button *ngIf="pdReportRecords.pd_status!='QC_COMPLETED'" mat-raised-button mat-icon-button class="mr-1 ml-1 hover-icon" type="button" matTooltip="Re-generate Report" matTooltipPosition="above" (click)="reGeneratePFReport()"><mat-icon>autorenew</mat-icon></button>
<button *ngIf="pdReportRecords.vendor_status!='QC_COMPLETED'" mat-raised-button mat-icon-button class="mr-1 ml-1 hover-icon" type="button" matTooltip="Re-generate Report" matTooltipPosition="above" (click)="reGeneratePFReport()"><mat-icon>autorenew</mat-icon></button>
<button mat-raised-button mat-icon-button class="mr-1 ml-1 hover-icon" type="button" matTooltip="Download PD Report" matTooltipPosition="above" (click)="downloadPDReport()"><mat-icon>get_app</mat-icon></button>
<button mat-raised-button mat-icon-button class="mr-1 ml-1 hover-icon" type="button" matTooltip="Download PD Pictures" matTooltipPosition="above" (click)="archivePDImages()"><mat-icon>save_alt</mat-icon></button>
@ -128,8 +128,8 @@
</ng-container>
<!-- this is for qc completed pd report -->
<!-- <ng-container *ngIf="pdReportRecords && pdReportRecords.pd_status=='QC_COMPLETED'">
{{pdReportRecords.pd_status}}
<!-- <ng-container *ngIf="pdReportRecords && pdReportRecords.vendor_status=='QC_COMPLETED'">
{{pdReportRecords.vendor_status}}
<div *ngIf="reGenerateBtn" fxFlex.xs="100" fxFlex.sm="100" fxFlex.md="100" fxFlex.lg="100" fxFlex.xl="100">
{{qcStatus}}
<figure style="min-height: 240px;">

2
ng6-seed/src/app/personal-discussion/manage-pd/list-pd/pd-report/pd-report.component.ts
View File

@ -188,7 +188,7 @@ export class PdReportComponent implements OnInit {
if (data.status == 200) {
// console.log('getPdReportDetails',data);
this.pdReportRecords = data.records;
this.qcStatus = data.records.pd_status;
this.qcStatus = data.records.vendor_status;
// console.log(this.qcStatus);
this.generateBtn = data.records.is_original_report_created == 1 ? false : true;
// console.log(this.generateBtn);

4
ng6-seed/src/app/personal-discussion/manage-pd/list-pd/pd-report/qc-review/qc-review.component.ts
View File

@ -50,7 +50,7 @@ export class QcReviewComponent implements OnInit {
this.recordData = data.records[0];
this.ngForm = this._formBuilder.group({
qc_remarks: [this.recordData.qc_remarks],
pd_status: [this.recordData.pd_status]
vendor_status: [this.recordData.vendor_status]
})
this.showForm = true;
}
@ -65,7 +65,7 @@ export class QcReviewComponent implements OnInit {
this.ngForm = this._formBuilder.group({
qc_feedback: [this.recordData.qc_feedback],
qc_rating: [Number(this.recordData.qc_rating)],
pd_status: ["QC_COMPLETED"],
vendor_status: ["QC_COMPLETED"],
})
this.showForm = true;
}

2
ng6-seed/src/app/personal-discussion/manage-pd/list-pd/pd-status-change-dialogue/pd-status-change-dialogue.component.html
View File

@ -22,7 +22,7 @@
</mat-dialog-content>
<mat-dialog-actions align="end" *ngIf="CompletenessCheck">
<button *ngIf="enableAddonPD===true" mat-raised-button color="primary" (click)="changePDStatus(addonStatus)"><strong> Yes / Allow Addon PD</strong></button>
<button mat-raised-button color="primary" (click)="changePDStatus(this.data.pd_status)"><strong>Yes</strong></button>
<button mat-raised-button color="primary" (click)="changePDStatus(this.data.vendor_status)"><strong>Yes</strong></button>
<button mat-raised-button mat-dialog-close><strong> No </strong></button>
</mat-dialog-actions>
<mat-dialog-actions align="end" *ngIf="!CompletenessCheck">

12
ng6-seed/src/app/personal-discussion/manage-pd/list-pd/pd-status-change-dialogue/pd-status-change-dialogue.component.ts
View File

@ -24,15 +24,15 @@ export class PdStatusChangeDialogueComponent implements OnInit {
constructor(notifier: NotifierService , private pd: PdTrigerService,private dialogRef: MatDialogRef<PdStatusChangeDialogueComponent>,@Inject(MAT_DIALOG_DATA) public data: any)
{
this.notifier = notifier;
this.dialoge_title_content = this.data.pd_status=='INPROGRESS' ? 'Start Discussion' : this.data.pd_status=='COMPLETED' ? 'Complete Discussion' : 'Change Discussion';
this.dialoge_content = this.data.pd_status=='INPROGRESS' ? 'Are you starting the Discussion ?' : this.data.pd_status=='COMPLETED' ? 'Please confirm you are completing the Discussion and forwarding for Quality Check ?' : 'Change Discussion';
this.dialoge_title_content = this.data.vendor_status=='INPROGRESS' ? 'Start Discussion' : this.data.vendor_status=='COMPLETED' ? 'Complete Discussion' : 'Change Discussion';
this.dialoge_content = this.data.vendor_status=='INPROGRESS' ? 'Are you starting the Discussion ?' : this.data.vendor_status=='COMPLETED' ? 'Please confirm you are completing the Discussion and forwarding for Quality Check ?' : 'Change Discussion';
this.enableAddonPD = false;
this.CompletenessCheck = this.data.pd_status=='INPROGRESS' ? true : this.data.pd_status=='COMPLETED' ? false : true;
this.Loading = this.data.pd_status=='INPROGRESS' ? false : this.data.pd_status=='COMPLETED' ? true : false;
this.CompletenessCheck = this.data.vendor_status=='INPROGRESS' ? true : this.data.vendor_status=='COMPLETED' ? false : true;
this.Loading = this.data.vendor_status=='INPROGRESS' ? false : this.data.vendor_status=='COMPLETED' ? true : false;
}
ngOnInit() {
if(this.data.pd_status=='COMPLETED'){
if(this.data.vendor_status=='COMPLETED'){
let params: any={};
params.pd_id = this.data.pdid;
@ -64,7 +64,7 @@ export class PdStatusChangeDialogueComponent implements OnInit {
this.pd.editPdMasterDetails(update_status, status).subscribe(result => {
if (result.status == 200) {
this.dialogRef.close({update_status:true});
this.notifier.notify('success', this.data.pd_status=='INPROGRESS' ? 'Discussions Started Successfully' : this.data.pd_status=='COMPLETED' ? 'Discussions Completed Successfully' : 'Discussions Updated Successfully');
this.notifier.notify('success', this.data.vendor_status=='INPROGRESS' ? 'Discussions Started Successfully' : this.data.vendor_status=='COMPLETED' ? 'Discussions Completed Successfully' : 'Discussions Updated Successfully');
}
else {
this.dialogRef.close({update_status:false});

8
ng6-seed/src/app/personal-discussion/manage-pd/list-pd/qc-completed-pd/qc-completed-pd.component.ts
View File

@ -56,7 +56,7 @@ export class QcCompletedPdComponent implements OnInit, OnChanges {
this.searchForm = this._fb.group(
{
pd_type: [null],
pd_status: ['QC_COMPLETED'],
vendor_status: ['QC_COMPLETED'],
pd_from_date: [null],
pd_to_date: [null],
pd_city: [null],
@ -152,7 +152,7 @@ export class QcCompletedPdComponent implements OnInit, OnChanges {
this._pd.getAllMasterDatas('PDSTATUS').subscribe(res => {
if (res.dataStatus == true) {
this.pdStatus = res.records.filter(status => status.isactive == 1 && status.pd_status_name == this.tabStatus);
// this.searchForm.controls['pd_status'].setValue(this.pdStatus[0]);
// this.searchForm.controls['vendor_status'].setValue(this.pdStatus[0]);
}
});
@ -196,10 +196,10 @@ export class QcCompletedPdComponent implements OnInit, OnChanges {
this.searchForm.value.pd_type = [];
}
if (this.searchForm.value.pd_status != null) {
if (this.searchForm.value.vendor_status != null) {
} else {
this.searchForm.value.pd_status = [];
this.searchForm.value.vendor_status = [];
}
this.searchForm.value.pd_from_date = this.pipe.transform(this.searchForm.value.pd_from_date, 'yyyy-MM-dd');

4
ng6-seed/src/app/personal-discussion/manage-pd/list-pd/scheduled-pd/scheduled-pd.component.html
View File

@ -19,7 +19,7 @@
</mat-select>
</mat-form-field> &nbsp; &nbsp;
<!-- <mat-form-field style="width:40%">
<mat-select formControlName="pd_status" placeholder="PD Status">
<mat-select formControlName="vendor_status" placeholder="PD Status">
<mat-option *ngFor="let status of pdStatus" [value]="status.pd_status_name" [disabled]="'true'">{{status.pd_status_name}}</mat-option>
</mat-select>
</mat-form-field> -->
@ -104,7 +104,7 @@
</ng-container>
<ng-container matColumnDef="Status">
<mat-cell class="cell center" *matCellDef="let details;">
<span> {{details.pd_status}}</span><br>
<span> {{details.vendor_status}}</span><br>
<!-- <span class="fontsize">{{ (details.updatedon)? (details.updatedon | slice:0:10):(details.updatedon) }}
</span> -->
<span class="fontsize">{{details.scheduled_on}}

8
ng6-seed/src/app/personal-discussion/manage-pd/list-pd/scheduled-pd/scheduled-pd.component.ts
View File

@ -55,7 +55,7 @@ export class ScheduledPdComponent implements OnInit, OnChanges {
this.searchForm = this._fb.group(
{
pd_type:[null],
pd_status:['SCHEDULED'],
vendor_status:['SCHEDULED'],
pd_from_date:[null],
pd_to_date:[null],
pd_city:[null],
@ -152,7 +152,7 @@ public VendorRoleID : any = localStorage.getItem('VendorRoleID');
if(res.dataStatus==true)
{
this.pdStatus = res.records.filter(status=>status.isactive==1 && status.pd_status_name==this.tabStatus);
// this.searchForm.controls['pd_status'].setValue(this.pdStatus[0]);
// this.searchForm.controls['vendor_status'].setValue(this.pdStatus[0]);
}
});
@ -208,12 +208,12 @@ public VendorRoleID : any = localStorage.getItem('VendorRoleID');
this.searchForm.value.pd_type = [];
}
if(this.searchForm.value.pd_status !=null)
if(this.searchForm.value.vendor_status !=null)
{
}else
{
this.searchForm.value.pd_status = [];
this.searchForm.value.vendor_status = [];
}
this.searchForm.value.pd_from_date = this.pipe.transform(this.searchForm.value.pd_from_date,'yyyy-MM-dd');

103
ng6-seed/src/app/personal-discussion/manage-pd/list-pd/view-pd/view-pd.component.html
View File

@ -5,7 +5,7 @@
<div fxLayout="row wrap">
<div fxFlex.xs="100" fxFlex.sm="100" fxFlex.md="40" fxFlex.lg="30" fxFlex.xl="30" *ngFor="let master of pdMasterData">
<mat-card style="min-width: 80%;max-width: 100%;box-shadow: 0 5px 11px 0 rgba(0,0,0,.18), 0 4px 15px 0 rgba(0,0,0,.15) !important;margin-top:60px;">
<mat-card-content style="background-color: whitesmoke;padding:0px !important;">
<mat-card-content style="background-color: whitesmoke;padding:0px !important;height: 245px !important;">
<mat-list role="list" style="padding-top: 0px !important;">
<mat-list-item role="listitem" style="background-color:#e00201;height:48px !important;">
<div fxFlex="row">
@ -55,7 +55,7 @@
</div>
</mat-list-item>
<mat-list-item role="listitem" style="height:48px !important;" *ngIf="master.loan_amount != 0">
<!-- <mat-list-item role="listitem" style="height:48px !important;" *ngIf="master.loan_amount != 0">
<div fxFlex="row wrap">
<div fxFlex="100">
<div fxFlex="50" align="left" style="color:#e00201;">
@ -66,18 +66,17 @@
</div>
</div>
</div>
</mat-list-item>
</mat-list-item> -->
<mat-list-item role="listitem" *ngIf="master.loan_amount && master.loan_amount != 0">
<!-- <mat-list-item role="listitem" *ngIf="master.loan_amount && master.loan_amount != 0">
<div fxFlex="70" fxFlexOffset="30">
<div style="font-size:0.9rem !important;">{{master.loan_amount | numberToWords}} Only</div>
<!-- <div style="font-size:0.9rem !important;">{{ 9999999999 | numberToWords}} Only</div> -->
</div>
</mat-list-item>
</mat-list-item> -->
</mat-list>
<div>
<!-- <div>
<mat-card-title style="color:#e00201;">Lender Contact Details</mat-card-title>
<div *ngIf="master.pd_contact_person != '' && master.pd_contact_person != null">
<mat-list>
@ -90,18 +89,14 @@
</mat-list>
</div>
<div *ngIf="master.lender_credit_person_name != '' && master.lender_credit_person_name != null">
<!-- <mat-list-item> -->
<mat-card-subtitle>Credit Person</mat-card-subtitle>
<!-- </mat-list-item> -->
<div fxLayout="row" fxFlex="100">
<!-- <div > -->
<div fxFlex="50" align="left">
<i class="fa-1x fa fa-user"></i><small style="margin-left: 1%; font-size: inherit">{{master.lender_credit_person_name}}</small>
</div>
<div fxFlex="50" align="right">
<i class="fa-1x fa fa-phone"></i><small style="margin-left: 1%; font-size: inherit">{{master.lender_credit_person_contact_mobileno}}</small>
</div>
<!-- </div> -->
</div>
</div><br/>
<div *ngIf="master.lender_sales_person_name != '' && master.lender_sales_person_name != null">
@ -117,7 +112,7 @@
</div>
</div>
</div>
</div>
</div> -->
</mat-card-content>
</mat-card>
</div>
@ -125,7 +120,7 @@
<div fxLayout="row">
<div fxFlex="100" align="right">
<button mat-raised-button class="mr-1 mb-1" color="primary" style="cursor: not-allowed !important;">
<strong> {{master.pd_status==pdStatusCheck.QC_COMPLETED ? 'QC Completed' : master.pd_status==pdStatusCheck.ADD_ON_PENDING ? 'Addon Pending' : master.pd_status | titlecase}}</strong>
<strong> {{master.vendor_status==pdStatusCheck.QC_COMPLETED ? 'QC Completed' : master.vendor_status==pdStatusCheck.ADD_ON_PENDING ? 'Addon Pending' : master.vendor_status | titlecase}}</strong>
</button>
<button *ngIf="roleAccessDetails.trigger && currentPDStatus==pdStatusCheck.DRAFT" mat-raised-button mat-icon-button class="mr-1 mb-1 hover-icon" type="button" (click)="editPdMaster(master)" matTooltipPosition="above" matTooltip="Edit PD Master"><mat-icon>edit</mat-icon></button>
<button *ngIf="roleAccessDetails.trigger && currentPDStatus==pdStatusCheck.DRAFT" mat-raised-button mat-icon-button class="mr-1 mb-1 hover-icon" type="button" matTooltip="Trigger" matTooltipPosition="above" (click)="directTriggerPD(mandatoryFieldsValidations,master)"><mat-icon>flash_on</mat-icon></button>
@ -144,14 +139,14 @@
<div *ngSwitchCase="1">
<!-- <div fxFlex="50" align="left">
<div fxFlex="100" style="color: #e00201">
{{master.pd_status==pdStatusCheck.QC_COMPLETED ? 'QC Completed' : master.pd_status==pdStatusCheck.ADD_ON_PENDING ? 'Addon Pending' : master.pd_status | titlecase}}
{{master.vendor_status==pdStatusCheck.QC_COMPLETED ? 'QC Completed' : master.vendor_status==pdStatusCheck.ADD_ON_PENDING ? 'Addon Pending' : master.vendor_status | titlecase}}
</div>
</div> -->
<div fxLayout="row nowrap">
<div fxFlex="100">
<div fxFlex="40" align="left" style="color: #e00201">
{{master.pd_status==pdStatusCheck.QC_COMPLETED ? 'QC Completed' : master.pd_status==pdStatusCheck.ADD_ON_PENDING ? 'Completed' : master.pd_status | titlecase}}
{{master.vendor_status==pdStatusCheck.QC_COMPLETED ? 'QC Completed' : master.vendor_status==pdStatusCheck.ADD_ON_PENDING ? 'Completed' : master.vendor_status | titlecase}}
</div>
<div fxFlex="60" align="right">
<!-- <span><button mat-raised-button mat-button-md mat-icon-button class="mr-1 mb-1 hover-icon" type="button" [matTooltip]="master.fk_primary_address_id ? 'Initiate PD for this address' : 'Initiate Address for PD Process'" matTooltipPosition="above" (click)="initiateAddtionalPD(master,addresses,master.fk_primary_address_id ? true : false)"><mat-icon>where_to_vote</mat-icon></button></span> -->
@ -185,19 +180,19 @@
<mat-card-actions align="right" *ngIf="roleAccessDetails.trigger && master.fk_primary_address_id==null && addresses.addtional_pd_data.length==0">
<button mat-raised-button mat-button-md mat-icon-button class="mr-1 mb-1 hover-icon" type="button" [matTooltip]="master.fk_primary_address_id ? 'Initiate PD for this address' : 'Initiate Address for PD Process'" matTooltipPosition="above" (click)="initiateAddtionalPD(master,addresses,master.fk_primary_address_id ? true : false)"><mat-icon>where_to_vote</mat-icon></button>
</mat-card-actions>
<mat-card-actions align="right" *ngIf="roleAccessDetails.trigger && master.fk_primary_address_id!=null && addresses.addtional_pd_data.length==0 && master.pd_status==pdStatusCheck.ADD_ON_PENDING">
<!-- master.pd_status==pdStatusCheck.ADD_ON_PENDING -->
<mat-card-actions align="right" *ngIf="roleAccessDetails.trigger && master.fk_primary_address_id!=null && addresses.addtional_pd_data.length==0 && master.vendor_status==pdStatusCheck.ADD_ON_PENDING">
<!-- master.vendor_status==pdStatusCheck.ADD_ON_PENDING -->
<button mat-raised-button mat-button-md mat-icon-button class="mr-1 mb-1 hover-icon" type="button" [matTooltip]="master.fk_primary_address_id ? 'Initiate PD for this address' : 'Initiate Address for PD Process'" matTooltipPosition="above" (click)="initiateAddtionalPD(master,addresses,master.fk_primary_address_id ? true : false)"><mat-icon>where_to_vote</mat-icon></button>
</mat-card-actions>
<div *ngIf="master.fk_primary_address_id!=null && addresses.addtional_pd_data.length>0">
<div fxLayout="row nowrap">
<div fxFlex="40" align="left" style="color: #e00201">
{{addresses.addtional_pd_data[0].pd_status==pdStatusCheck.QC_COMPLETED ? 'QC Completed' : addresses.addtional_pd_data[0].pd_status==pdStatusCheck.ADD_ON_PENDING ? 'Completed' : addresses.addtional_pd_data[0].pd_status | titlecase}}
{{addresses.addtional_pd_data[0].vendor_status==pdStatusCheck.QC_COMPLETED ? 'QC Completed' : addresses.addtional_pd_data[0].vendor_status==pdStatusCheck.ADD_ON_PENDING ? 'Completed' : addresses.addtional_pd_data[0].vendor_status | titlecase}}
</div>
<div fxFlex="60" align="right">
<span><button *ngIf="VendorRoleID != 22" mat-raised-button mat-button-md mat-icon-button class="mr-1 mb-1 hover-icon" type="button" matTooltip="Allocate" matTooltipPosition="above" (click)="pdAllocationTo(master,addresses)"><mat-icon>verified_user</mat-icon></button></span>
<span><button mat-raised-button mat-button-md mat-icon-button class="mr-1 mb-1 hover-icon" type="button" matTooltip="Schedule" matTooltipPosition="above" (click)="scheduleDetails(master,addresses)"><mat-icon>schedule</mat-icon></button></span>
<!-- <span *ngIf="userRoleID == 3 || userRoleID == 4 || userRoleID == 5 || userRoleID == 10 "><button *ngIf="roleAccessDetails.discussions && addresses.assigned_pd && addresses.addtional_pd_data[0].pd_type_name && addresses.addtional_pd_data[0].pd_status!=pdStatusCheck.DRAFT && addresses.addtional_pd_data[0].pd_status!=pdStatusCheck.TRIGGERED" mat-raised-button mat-button-md mat-icon-button class="mr-1 mb-1 hover-icon" type="button" matTooltip="Discussion" matTooltipPosition="above" (click)="getPDStart(addresses,addresses.addtional_pd_data[0].pd_status)"><mat-icon>question_answer</mat-icon></button></span> -->
<!-- <span *ngIf="userRoleID == 3 || userRoleID == 4 || userRoleID == 5 || userRoleID == 10 "><button *ngIf="roleAccessDetails.discussions && addresses.assigned_pd && addresses.addtional_pd_data[0].pd_type_name && addresses.addtional_pd_data[0].vendor_status!=pdStatusCheck.DRAFT && addresses.addtional_pd_data[0].vendor_status!=pdStatusCheck.TRIGGERED" mat-raised-button mat-button-md mat-icon-button class="mr-1 mb-1 hover-icon" type="button" matTooltip="Discussion" matTooltipPosition="above" (click)="getPDStart(addresses,addresses.addtional_pd_data[0].vendor_status)"><mat-icon>question_answer</mat-icon></button></span> -->
</div>
</div>
<div fxLayout="row nowrap">
@ -247,7 +242,7 @@
</mat-card>
</div>
<div fxFlex="50" *ngIf="master.remarks">
<!-- <div fxFlex="50" *ngIf="master.remarks">
<mat-card style="box-shadow: 0 5px 11px 0 rgba(0,0,0,.18), 0 4px 15px 0 rgba(0,0,0,.15) !important;border-radius: 5px !important;border-bottom:1px solid #e00201 !important;">
<mat-card-header>
<mat-card-title style="color:#e00201;">Remarks</mat-card-title>
@ -257,7 +252,7 @@
<p>{{master.remarks}}</p>
</mat-card-content>
</mat-card>
</div>
</div> -->
</div>
@ -268,12 +263,7 @@
<mat-tab-group class="mt-2">
<mat-tab>
<ng-template mat-tab-label>Applicants</ng-template>
<!-- <div class="cardEdit" *ngIf="currentPDStatus==pdStatusCheck.DRAFT || currentPDStatus==pdStatusCheck.TRIGGERED || currentPDStatus==pdStatusCheck.ALLOCATED || currentPDStatus==pdStatusCheck.SCHEDULED">
<button mat-raised-button mat-button-sm mat-icon-button class="mr-1 mb-1 hover-icon" type="button" (click)="editPdApplicant(pdApplicantData)"><mat-icon>edit</mat-icon></button>
</div>
<mat-card-header>
<mat-card-title style="color:red !important;">Applicants</mat-card-title>
</mat-card-header> -->
<mat-card-header>
<div fxFlex="70" align="left" style="padding: 10px !important;">
<mat-card-title>Applicants</mat-card-title>
@ -310,20 +300,14 @@
</mat-card-content>
</ng-template>
</mat-tab>
<mat-tab>
<!-- <mat-tab>
<ng-template mat-tab-label>Queries</ng-template>
<!-- <div class="cardEdit" *ngIf="currentPDStatus==pdStatusCheck.DRAFT || currentPDStatus==pdStatusCheck.TRIGGERED || currentPDStatus==pdStatusCheck.ALLOCATED || currentPDStatus==pdStatusCheck.SCHEDULED">
<button mat-raised-button mat-button-sm mat-icon-button class="mr-1 mb-1 hover-icon" type="button" (click)="editAdditionalRequirement(pdAdditionalReqData)"><mat-icon>edit</mat-icon></button>
</div> -->
<!-- <mat-card-header>
<mat-card-title style="color:red !important;">Additional Requirements</mat-card-title>
</mat-card-header> -->
<mat-card-header>
<div fxFlex="70" align="left" style="padding: 10px !important;">
<mat-card-title>Credit Manager’s Specific Queries</mat-card-title>
</div>
<div fxFlex="30" align="end" style="padding: 10px !important;" *ngIf="roleAccessDetails.trigger && currentPDStatus==pdStatusCheck.DRAFT">
<!-- <span *ngIf="userRoleID == 10 || userRoleID == 3"><button mat-raised-button mat-button-sm mat-icon-button class="mr-1 mb-1 hover-icon" type="button" (click)="editAdditionalRequirement(pdAdditionalReqData)"><mat-icon>edit</mat-icon></button></span> -->
<span ><button mat-raised-button mat-button-sm mat-icon-button class="mr-1 mb-1 hover-icon" type="button" (click)="editAdditionalRequirement(pdAdditionalReqData)"><mat-icon>edit</mat-icon></button></span>
</div>
</mat-card-header>
@ -365,12 +349,7 @@
</mat-tab>
<mat-tab>
<ng-template mat-tab-label>Additional Requirements</ng-template>
<!-- <div class="cardEdit" *ngIf="currentPDStatus==pdStatusCheck.DRAFT || currentPDStatus==pdStatusCheck.TRIGGERED || currentPDStatus==pdStatusCheck.ALLOCATED || currentPDStatus==pdStatusCheck.SCHEDULED">
<button mat-raised-button mat-button-sm mat-icon-button class="mr-1 mb-1 hover-icon" type="button" (click)="editAdditionalRequirement(pdAdditionalReqData)"><mat-icon>edit</mat-icon></button>
</div> -->
<!-- <mat-card-header>
<mat-card-title style="color:red !important;">Additional Requirements</mat-card-title>
</mat-card-header> -->
<mat-card-header>
<div fxFlex="70" align="left" style="padding: 10px !important;">
<mat-card-title>Additional Requirements</mat-card-title>
@ -397,9 +376,7 @@
<div *ngIf="pdDocumentsData.length>0; else nodocument">
<mat-list *ngFor="let documents of pdDocumentsData">
<mat-list-item>
<!--<p><span><i class="fa-1x fa fa-file"></i> {{documents.pd_document_title}} </span></p> -->
<a href="{{documents.doc_url}}" target="_blank"><i class="fa-1x fa fa-file"></i> {{documents.pd_document_title}}</a>
<!-- <span class="mb-2 text-center hover-icon"> &nbsp;{{documents.pd_document_name}} </span> -->
</mat-list-item>
</mat-list>
</div>
@ -409,43 +386,7 @@
</mat-card-content>
</ng-template>
</mat-tab>
<!-- <mat-tab>
<ng-template mat-tab-label>QC Notes</ng-template>
<div>
<h6>QC Notes</h6>
</div>
<p>
{{ pdMasterData[0]?.qc_remarks}}</p>
</mat-tab>
<mat-tab>
<ng-template mat-tab-label>QC Feedback</ng-template>
<div *ngIf="pdMasterData[0]?.pd_status === 'QC_COMPLETED';else nodata" class="m-gap p-gap" fxFlex.xs="100" fxFlex.sm="100" fxFlex.md="100"
fxFlex.lg="100" fxFlex.xl="100">
<div>
<h6>QC Feedback</h6>
</div>
<div>
<div style="display: inline-flex">
<div style="margin: 12px; font-size: 21px;">
{{ pdMasterData[0]?.qc_rating}}
</div>
<div style="display: inline-block">
<app-rating [rating]="pd_QC_Rating"></app-rating>
</div>
</div>
</div>
<br>
<div style="display: inline-block;">
{{ pdMasterData[0]?.qc_feedback}}
</div>
</div>
<ng-template #nodata>
<mat-card-content>
<p>No Feedback</p>
</mat-card-content>
</ng-template>
</mat-tab> -->
<mat-tab>
<ng-template mat-tab-label>PD History</ng-template>
<div *ngIf="masterPdLogsData.length>0; else nohistory">
@ -469,7 +410,7 @@
<p>No History</p>
</mat-card-content>
</ng-template>
</mat-tab>
</mat-tab> -->
</mat-tab-group>
</mat-card>
</mat-card-content>

6
ng6-seed/src/app/personal-discussion/manage-pd/list-pd/view-pd/view-pd.component.ts
View File

@ -132,7 +132,7 @@ export class ViewPdComponent implements OnInit, OnDestroy {
this.pdMasterData[0].addresses = data.records.pd_address.filter(item => item.isactive == 1);
this.currentPDStatus = data.records.pd_master_details[0].pd_status;
this.currentPDStatus = data.records.pd_master_details[0].vendor_status;
this.pdAdditionalReqData = data.records.pd_additional_requirements;
this.pdCollectedDocument=data.records.docs_to_be_collected;
// enable pd start time
@ -359,7 +359,7 @@ export class ViewPdComponent implements OnInit, OnDestroy {
this.destroyType = 3;
if (status == this.pdStatusCheck.ALLOCATED || status == this.pdStatusCheck.SCHEDULED) {
const dialogRef = this.dialog.open(PdStatusChangeDialogueComponent, {
data: { pdid: pdDetails.assigned_pd, pd_status: this.pdStatusCheck.INPROGRESS },
data: { pdid: pdDetails.assigned_pd, vendor_status: this.pdStatusCheck.INPROGRESS },
disableClose: true,
minWidth: '30%',
maxWidth: '40%',
@ -453,7 +453,7 @@ export class ViewPdComponent implements OnInit, OnDestroy {
if(parentData.main_applicant){
masterApplicantID = this.pdApplicantData.filter(appt => appt.applicant_name == parentData.main_applicant)[0].pd_co_applicant_id;}
const dialogRef = this.dialog.open(InitiateAdditionalPdComponent, {
data: { "type":type,"pd_id":parentData.pd_id,"fk_customer_segment":parentData.fk_customer_segment, "pd_status":parentData.pd_status, "pd_address_id": childData.pd_address_id,"applicant_id":masterApplicantID,"applicants_details":this.pdApplicantData},
data: { "type":type,"pd_id":parentData.pd_id,"fk_customer_segment":parentData.fk_customer_segment, "vendor_status":parentData.vendor_status, "pd_address_id": childData.pd_address_id,"applicant_id":masterApplicantID,"applicants_details":this.pdApplicantData},
disableClose: true,
// position: { right: '0' },
minWidth: '40%',

2
ng6-seed/src/app/personal-discussion/pd-service/pd-triger.service.ts
View File

@ -237,7 +237,7 @@ export class PdTrigerService {
// update pd master details
editPdMasterDetails(editData: any, status: string): Observable<any> {
editData.pd_status = status;
editData.vendor_status = status;
editData.fk_updatedby = this._aws.getlocale();
// editData.updatedon = currentdate;
return this._http.post<any>(this.apiUrl + "updatePDMaster", { records: editData })

4
ng6-seed/src/app/quality-check/qc-list/qc-pd-report/qc-pd-report.component.html
View File

@ -1,5 +1,5 @@
<!-- this is for completed pd report -->
<ng-container *ngIf="pdReportRecords && pdReportRecords.pd_status=='COMPLETED'">
<ng-container *ngIf="pdReportRecords && pdReportRecords.vendor_status=='COMPLETED'">
<div *ngIf="reGenerateBtn">
<mat-sidenav-container class="app-inner background-none shadow-none mail-db">
@ -82,7 +82,7 @@
</ng-container>
<!-- this is for qc completed pd report -->
<ng-container *ngIf="pdReportRecords && pdReportRecords.pd_status=='QC_COMPLETED'">
<ng-container *ngIf="pdReportRecords && pdReportRecords.vendor_status=='QC_COMPLETED'">
<div *ngIf="reGenerateBtn" fxFlex.xs="100" fxFlex.sm="100" fxFlex.md="100" fxFlex.lg="100" fxFlex.xl="100">
<!--{{qcStatus}}-->

4
ng6-seed/src/app/quality-check/qc-list/qc-pd-report/qc-review/qc-review.component.ts
View File

@ -50,7 +50,7 @@ export class QcReviewComponent implements OnInit {
this.recordData = data.records[0];
this.ngForm = this._formBuilder.group({
qc_remarks: [this.recordData.qc_remarks],
pd_status: [this.recordData.pd_status]
vendor_status: [this.recordData.vendor_status]
})
this.showForm = true;
}
@ -65,7 +65,7 @@ export class QcReviewComponent implements OnInit {
this.ngForm = this._formBuilder.group({
qc_feedback: [this.recordData.qc_feedback],
qc_rating: [Number(this.recordData.qc_rating)],
pd_status: ["QC_COMPLETED"],
vendor_status: ["QC_COMPLETED"],
})
this.showForm = true;
}

18
ng6-seed/src/app/quality-check/qc-list/qc-view/qc-view.component.html
View File

@ -96,7 +96,7 @@
<div fxLayout="row">
<div fxFlex="100" align="right">
<button mat-raised-button class="mr-1 mb-1" color="primary" style="cursor: not-allowed !important;">
<strong> {{master.pd_status==pdStatusCheck.QC_COMPLETED ? 'QC Completed' : master.pd_status==pdStatusCheck.ADD_ON_PENDING ? 'Addon Pending' : master.pd_status | titlecase}}</strong>
<strong> {{master.vendor_status==pdStatusCheck.QC_COMPLETED ? 'QC Completed' : master.vendor_status==pdStatusCheck.ADD_ON_PENDING ? 'Addon Pending' : master.vendor_status | titlecase}}</strong>
</button>
<span *ngIf="userRoleID == 10 || userRoleID == 3"><button *ngIf="currentPDStatus==pdStatusCheck.DRAFT || currentPDStatus==pdStatusCheck.TRIGGERED || currentPDStatus==pdStatusCheck.ALLOCATED || currentPDStatus==pdStatusCheck.SCHEDULED || currentPDStatus==pdStatusCheck.COMPLETED" mat-raised-button mat-icon-button class="mr-1 mb-1 hover-icon" type="button" (click)="editPdMaster(master)" matTooltipPosition="above" matTooltip="Edit PD Master"><mat-icon>edit</mat-icon></button></span>
<!-- <button *ngIf="currentPDStatus==pdStatusCheck.DRAFT" mat-raised-button mat-icon-button class="mr-1 mb-1 hover-icon" type="button" matTooltip="Trigger" matTooltipPosition="above" (click)="directTriggerPD(mandatoryFieldsValidations,master)"><mat-icon>flash_on</mat-icon></button> -->
@ -115,13 +115,13 @@
<div *ngSwitchCase="1">
<!-- <div fxFlex="50" align="left">
<div fxFlex="100" style="color: #e00201">
{{master.pd_status==pdStatusCheck.QC_COMPLETED ? 'QC Completed' : master.pd_status==pdStatusCheck.ADD_ON_PENDING ? 'Addon Pending' : master.pd_status | titlecase}}
{{master.vendor_status==pdStatusCheck.QC_COMPLETED ? 'QC Completed' : master.vendor_status==pdStatusCheck.ADD_ON_PENDING ? 'Addon Pending' : master.vendor_status | titlecase}}
</div>
</div> -->
<div fxLayout="row nowrap">
<div fxFlex="100">
<div fxFlex="40" align="left" style="color: #e00201">
{{master.pd_status==pdStatusCheck.QC_COMPLETED ? 'QC Completed' : master.pd_status==pdStatusCheck.ADD_ON_PENDING ? 'Completed' : master.pd_status | titlecase}}
{{master.vendor_status==pdStatusCheck.QC_COMPLETED ? 'QC Completed' : master.vendor_status==pdStatusCheck.ADD_ON_PENDING ? 'Completed' : master.vendor_status | titlecase}}
</div>
<div fxFlex="60" align="right">
<button *ngIf="addresses.assigned_pd==null || addresses.assigned_pd==''" mat-raised-button mat-button-md mat-icon-button class="mr-1 mb-1 hover-icon" type="button" [matTooltip]="master.fk_primary_address_id ? 'Initiate Address for Additional PD Process' : 'Initiate Address for PD Process'" matTooltipPosition="above" (click)="initiateAddtionalPD(master,addresses,master.fk_primary_address_id ? true : false)"><mat-icon>where_to_vote</mat-icon></button>
@ -156,18 +156,18 @@
<mat-card-actions align="right" *ngIf="master.fk_primary_address_id==null && addresses.addtional_pd_data.length==0">
<button mat-raised-button mat-button-md mat-icon-button class="mr-1 mb-1 hover-icon" type="button" [matTooltip]="master.fk_primary_address_id ? 'Initiate Address for Additional PD Process' : 'Initiate Address for PD Process'" matTooltipPosition="above" (click)="initiateAddtionalPD(master,addresses,master.fk_primary_address_id ? true : false)"><mat-icon>where_to_vote</mat-icon></button>
</mat-card-actions>
<mat-card-actions align="right" *ngIf="master.fk_primary_address_id!=null && addresses.addtional_pd_data.length==0 && master.pd_status==pdStatusCheck.ADD_ON_PENDING">
<!-- master.pd_status==pdStatusCheck.ADD_ON_PENDING -->
<mat-card-actions align="right" *ngIf="master.fk_primary_address_id!=null && addresses.addtional_pd_data.length==0 && master.vendor_status==pdStatusCheck.ADD_ON_PENDING">
<!-- master.vendor_status==pdStatusCheck.ADD_ON_PENDING -->
<button mat-raised-button mat-button-md mat-icon-button class="mr-1 mb-1 hover-icon" type="button" [matTooltip]="master.fk_primary_address_id ? 'Initiate Address for Additional PD Process' : 'Initiate Address for PD Process'" matTooltipPosition="above" (click)="initiateAddtionalPD(master,addresses,master.fk_primary_address_id ? true : false)"><mat-icon>where_to_vote</mat-icon></button>
</mat-card-actions>
<div align="right" *ngIf="master.fk_primary_address_id!=null && addresses.addtional_pd_data.length>0">
<div fxLayout="row nowrap">
<div fxFlex="40" align="left" style="color: #e00201">
{{addresses.addtional_pd_data[0].pd_status==pdStatusCheck.QC_COMPLETED ? 'QC Completed' : addresses.addtional_pd_data[0].pd_status==pdStatusCheck.ADD_ON_PENDING ? 'Completed' : addresses.addtional_pd_data[0].pd_status | titlecase}}
{{addresses.addtional_pd_data[0].vendor_status==pdStatusCheck.QC_COMPLETED ? 'QC Completed' : addresses.addtional_pd_data[0].vendor_status==pdStatusCheck.ADD_ON_PENDING ? 'Completed' : addresses.addtional_pd_data[0].vendor_status | titlecase}}
</div>
<div fxFlex="60" align="right">
<!-- <span *ngIf="userRoleID == 10 || userRoleID == 3"><button *ngIf="addresses.assigned_pd && addresses.addtional_pd_data[0].pd_type_name && addresses.addtional_pd_data[0].pd_status!=pdStatusCheck.DRAFT && addresses.addtional_pd_data[0].pd_status!=pdStatusCheck.QC_COMPLETED" mat-raised-button mat-button-md mat-icon-button class="mr-1 mb-1 hover-icon" type="button" matTooltip="Allocate" matTooltipPosition="above" (click)="pdAllocationTo(master,addresses)"><mat-icon>verified_user</mat-icon></button></span> -->
<!-- <span *ngIf="userRoleID != 6 || userRoleID != 7 || userRoleID != 8 || userRoleID != 9 "><button *ngIf="addresses.assigned_pd && addresses.addtional_pd_data[0].pd_type_name && addresses.addtional_pd_data[0].pd_status!=pdStatusCheck.DRAFT && addresses.addtional_pd_data[0].pd_status!=pdStatusCheck.QC_COMPLETED" mat-raised-button mat-button-md mat-icon-button class="mr-1 mb-1 hover-icon" type="button" matTooltip="Schedule" matTooltipPosition="above" (click)="scheduleDetails(master,addresses)"><mat-icon>schedule</mat-icon></button></span> -->
<!-- <span *ngIf="userRoleID == 10 || userRoleID == 3"><button *ngIf="addresses.assigned_pd && addresses.addtional_pd_data[0].pd_type_name && addresses.addtional_pd_data[0].vendor_status!=pdStatusCheck.DRAFT && addresses.addtional_pd_data[0].vendor_status!=pdStatusCheck.QC_COMPLETED" mat-raised-button mat-button-md mat-icon-button class="mr-1 mb-1 hover-icon" type="button" matTooltip="Allocate" matTooltipPosition="above" (click)="pdAllocationTo(master,addresses)"><mat-icon>verified_user</mat-icon></button></span> -->
<!-- <span *ngIf="userRoleID != 6 || userRoleID != 7 || userRoleID != 8 || userRoleID != 9 "><button *ngIf="addresses.assigned_pd && addresses.addtional_pd_data[0].pd_type_name && addresses.addtional_pd_data[0].vendor_status!=pdStatusCheck.DRAFT && addresses.addtional_pd_data[0].vendor_status!=pdStatusCheck.QC_COMPLETED" mat-raised-button mat-button-md mat-icon-button class="mr-1 mb-1 hover-icon" type="button" matTooltip="Schedule" matTooltipPosition="above" (click)="scheduleDetails(master,addresses)"><mat-icon>schedule</mat-icon></button></span> -->
</div>
</div>
<div fxLayout="row nowrap">
@ -335,7 +335,7 @@
</mat-tab>
<mat-tab>
<ng-template mat-tab-label>QC Feedback</ng-template>
<div *ngIf="pdMasterData[0]?.pd_status === 'QC_COMPLETED';else nodata" class="m-gap p-gap" fxFlex.xs="100" fxFlex.sm="100" fxFlex.md="100"
<div *ngIf="pdMasterData[0]?.vendor_status === 'QC_COMPLETED';else nodata" class="m-gap p-gap" fxFlex.xs="100" fxFlex.sm="100" fxFlex.md="100"
fxFlex.lg="100" fxFlex.xl="100">
<div>
<h6>QC Feedback</h6>

4
ng6-seed/src/app/quality-check/qc-list/qc-view/qc-view.component.ts
View File

@ -79,7 +79,7 @@ export class QcViewComponent implements OnInit, OnDestroy {
this.masterPdLogsData=data.records.pd_logs.master;
this.pdMasterData[0].addresses = data.records.pd_address.filter(item => item.isactive == 1);
//this.applicantPDLogsData= data.records.pd_logs.master;
this.currentPDStatus = data.records.pd_master_details[0].pd_status;
this.currentPDStatus = data.records.pd_master_details[0].vendor_status;
this.pdAdditionalReqData = data.records.pd_additional_requirements;
// enable pd start time
if(data.records.pd_master_details[0].scheduled_on_for_validation){
@ -168,7 +168,7 @@ export class QcViewComponent implements OnInit, OnDestroy {
// this is for initiate additional pd
initiateAddtionalPD(parentData: any, childData: any, type: boolean){
const dialogRef = this.dialog.open(InitiateAdditionalPdComponent, {
data: { "type":type,"pd_id":parentData.pd_id,"fk_customer_segment":parentData.fk_customer_segment, "pd_status":parentData.pd_status, "pd_address_id": childData.pd_address_id},
data: { "type":type,"pd_id":parentData.pd_id,"fk_customer_segment":parentData.fk_customer_segment, "vendor_status":parentData.vendor_status, "pd_address_id": childData.pd_address_id},
disableClose: true,
// position: { right: '0' },
minWidth: '40%',

2
ng6-seed/src/app/quality-check/qc-service/qc.service.ts
View File

@ -152,7 +152,7 @@ export class QcService {
// update pd master details
editPdMasterDetails(editData: any, status: string): Observable<any> {
editData.pd_status = status;
editData.vendor_status = status;
editData.fk_updatedby = this._aws.getlocale();
// editData.updatedon = currentdate;
return this._http.post<any>(this.apiUrl + "updatePDMaster", { records: editData })

2
ng6-seed/src/app/reports/pd-mis/pd-mis.component.html
View File

@ -182,7 +182,7 @@
<td mat-cell *matCellDef="let row">
<span *ngIf="row.pd_officer" mat-line>{{row.pd_officer}}</span> </td>
</ng-container>
<ng-container matColumnDef="pd_status">
<ng-container matColumnDef="vendor_status">
<th mat-header-cell *matHeaderCellDef mat-sort-header> Status of the PD </th>
<td mat-cell *matCellDef="let row">
<span *ngIf="row.current_status" mat-line>{{row.current_status}}</span> </td>

2
ng6-seed/src/app/reports/pd-mis/pd-mis.component.ts
View File

@ -45,7 +45,7 @@ export class PdMisComponent implements OnInit {
'sending_pd_report_date',
'agency_name',
'officer_name',
'pd_status'];
'vendor_status'];

2
ng6-seed/src/app/sales-pd/advance-filter/advance-filter.component.html
View File

@ -15,7 +15,7 @@
<mat-list class="m-gap p-gap" >
<div [formGroup]="searchForm" fxLayout="row wrap" fxFlex="100%" fxLayoutGap="35px" fxLayoutAlign="flex-start stretch">
<mat-form-field style="width: 20%">
<mat-select multiple formControlName="pd_status" placeholder="PD Status">
<mat-select multiple formControlName="vendor_status" placeholder="PD Status">
<mat-option *ngFor="let status of pdStatus" [value]="status">{{status}}
</mat-option>
</mat-select>

4
ng6-seed/src/app/sales-pd/advance-filter/advance-filter.component.ts
View File

@ -29,7 +29,7 @@ export class AdvanceFilterComponent implements OnInit {
ngOnInit() {
this.searchForm=this._fb.group({
pd_status:[''],
vendor_status:[''],
pd_from_date:[''],
pd_to_date:[''],
pd_products:[''],
@ -66,7 +66,7 @@ export class AdvanceFilterComponent implements OnInit {
ngOnChanges(){
console.log(this.drop_down_datas)
if(this.drop_down_datas != undefined){
this.pdStatus=this.drop_down_datas.pd_status
this.pdStatus=this.drop_down_datas.vendor_status
if(this.ENTITY.length != 0) {
this.entityCheck()
}

12
ng6-seed/src/app/sales-pd/sales-pd.component.ts
View File

@ -63,7 +63,7 @@ export class SalesPdComponent implements OnInit {
if(this.salesPdData.length > 0){
let products=[]
let lenders=[]
let pd_status=[]
let vendor_status=[]
this.salesPdData.map(val=>{
if(products.length > 0 ){
if(products.filter(pro=>pro == val.product_id).length == 0 ){
@ -81,16 +81,16 @@ export class SalesPdComponent implements OnInit {
else{
lenders.push(val.lender_id)
}
if(pd_status.length > 0 ){
if(pd_status.filter(pro=>pro == val.status).length == 0 ){
pd_status.push(val.status)
if(vendor_status.length > 0 ){
if(vendor_status.filter(pro=>pro == val.status).length == 0 ){
vendor_status.push(val.status)
}
}
else{
pd_status.push(val.status)
vendor_status.push(val.status)
}
})
this.filter_drop_down_data={product_ids:products,lender_ids:lenders,pd_status:pd_status}
this.filter_drop_down_data={product_ids:products,lender_ids:lenders,vendor_status:vendor_status}
// console.log(this.filter_drop_down_data);
}
}