merge changes : ps

This commit is contained in:
venbatechnologies@gmail.com 2018-11-01 17:43:26 +05:30
commit e60fefcbfb
13 changed files with 64 additions and 57 deletions

View File

@ -45,7 +45,7 @@
"karma-jasmine": "^1.1.1", "karma-jasmine": "^1.1.1",
"leaflet": "^1.0.2", "leaflet": "^1.0.2",
"moment": "^2.15.0", "moment": "^2.15.0",
"ng-pick-datetime": "^5.2.6", "ng-pick-datetime": "^6.0.16",
"ng2-charts": "1.6.0", "ng2-charts": "1.6.0",
"ng2-dragula": "1.3.1", "ng2-dragula": "1.3.1",
"ng2-file-upload": "1.2.1", "ng2-file-upload": "1.2.1",

View File

@ -2,27 +2,13 @@
<mat-table [dataSource]="dataSourceTab1" matSort *ngIf="PdListData.length > 0" > <mat-table [dataSource]="dataSourceTab1" matSort *ngIf="PdListData.length > 0" >
<ng-container matColumnDef="PDType"> <ng-container matColumnDef="PDType">
<mat-cell fxFlex="15" class="cell" *matCellDef="let details;" style="justify-content:flex-end"> <mat-cell fxFlex="15" class="cell" *matCellDef="let details;" style="justify-content:flex-end">
<!-- <button *ngIf="details.fk_pd_type == '1'" mat-icon-button class="hover-icon pd_circle" matTooltip="Full PD"
matTooltipPosition="above"><strong>F</strong></button> -->
<!-- <button *ngIf="details.fk_pd_type != null" [matTooltip]="details.fk_pd_type == '1' ? 'Full PD' : details.fk_pd_type == '2' ? 'Smart PD' : details.fk_pd_type == '3' ? 'Tele PD' : '' " mat-button mat-icon-button class="mr-1 mb-1 hover-icon pd_circle" type="button"
matTooltipPosition="above"><strong>{{(details.pd_type_name | slice:0:1)}}</strong></button> -->
<!-- <button *ngIf="details.fk_pd_type != null" [matTooltip]="details.pd_type_name" mat-button mat-icon-button class="mr-1 mb-1 hover-icon pd_circle" type="button"
matTooltipPosition="above"><strong>{{(details.pd_type_name | slice:0:1)}}</strong></button> -->
<div *ngIf="details.fk_pd_type != null" [ngClass]="(details.fk_pd_type=='1')?'fullPD':(details.fk_pd_type=='2')?'smartPD':'telePD'" class="mr-1 mb-1 hover-icon commonPDType" <div *ngIf="details.fk_pd_type != null" [ngClass]="(details.fk_pd_type=='1')?'fullPD':(details.fk_pd_type=='2')?'smartPD':'telePD'" class="mr-1 mb-1 hover-icon commonPDType"
[matTooltip]="details.pd_type_name" matTooltipPosition="above"><strong>{{(details.pd_type_name | slice:0:1)}}</strong></div> [matTooltip]="details.pd_type_name" matTooltipPosition="above"><strong>{{(details.pd_type_name | slice:0:1)}}</strong></div>
<!-- <button *ngIf="details.fk_pd_type == '3'" mat-button mat-icon-button class="mr-1 mb-1 hover-icon pd_circle" type="button" matTooltip="Tele PD"
matTooltipPosition="above"><strong>T</strong></button> -->
<!-- <strong *ngIf="details.fk_pd_type == '2'" class="pd_circle" >S</strong> </mat-cell>
<strong *ngIf="details.fk_pd_type == '3'" class="pd_circle" >T</strong> -->
<!-- <mat-icon color="primary" [matTooltip]="details.fk_pd_type == '1' ? 'Full PD' : details.fk_pd_type == '2' ? 'Smart PD' : 'Tele PD' "
matTooltipPosition="above" class="mr-1 mb-1">control_camera</mat-icon>
-->
</mat-cell>
</ng-container> </ng-container>
<ng-container matColumnDef="Name"> <ng-container matColumnDef="Name">
<mat-cell class="cell" *matCellDef="let details;"> <mat-cell class="cell" *matCellDef="let details;">
@ -45,8 +31,11 @@
</ng-container> </ng-container>
<ng-container matColumnDef="Status"> <ng-container matColumnDef="Status">
<mat-cell class="cell center" *matCellDef="let details;"> <mat-cell class="cell center" *matCellDef="let details;">
<span> {{details.pd_status}}</span><br> <span *ngIf="details.pd_status!='QC_COMPLETED'"> {{details.pd_status}}</span>
<span class="fontsize" *ngIf="details.pd_status!='SCHEDULED'" [matTooltip]="details.pd_status | titlecase" matTooltipPosition="above" >{{ (details.updatedon)? (details.updatedon | slice:0:10):(details.updatedon) }} <span *ngIf="details.pd_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" 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> </span>
<span class="fontsize" *ngIf="details.pd_status=='SCHEDULED'" [matTooltip]="details.pd_status | titlecase" matTooltipPosition="above" >{{details.scheduled_on}} <span class="fontsize" *ngIf="details.pd_status=='SCHEDULED'" [matTooltip]="details.pd_status | titlecase" matTooltipPosition="above" >{{details.scheduled_on}}
</span> </span>

View File

@ -127,7 +127,7 @@ export class EditPdApplicantComponent implements OnInit {
this._pd.updatePdApplicant(pd_applicant_details).subscribe(result => { this._pd.updatePdApplicant(pd_applicant_details).subscribe(result => {
if (result.status == 200) { if (result.status == 200) {
this.notifier.notify('success', 'Applicants updated..'); this.notifier.notify('success', 'PD Details Updated.');
this.dialogRef.close(); this.dialogRef.close();
} }
else { else {

View File

@ -179,7 +179,7 @@ export class EditPdMasterComponent implements OnInit {
Object.keys(my_array).forEach((key) => ( my_array[key] == null) && delete my_array[key]); Object.keys(my_array).forEach((key) => ( my_array[key] == null) && delete my_array[key]);
this._pd.editPdMasterDetails(my_array, updateStatus).subscribe(result => { this._pd.editPdMasterDetails(my_array, updateStatus).subscribe(result => {
if (result.status == 200) { if (result.status == 200) {
this.notifier.notify('success', 'PD Master Updated.'); this.notifier.notify('success', 'PD Details Updated.');
this.dialogRef.close(); this.dialogRef.close();
} }
else { else {

View File

@ -34,7 +34,7 @@
</mat-tab> </mat-tab>
<mat-tab> <mat-tab>
<ng-template mat-tab-label><mat-icon>done_all</mat-icon>&nbsp;QC_Completed </ng-template> <ng-template mat-tab-label><mat-icon>done_all</mat-icon>&nbsp;QC Completed </ng-template>
<app-qc-completed-pd [bindFilterValue]="filterValue" (loadPdView)="viewPDDetails($event)"></app-qc-completed-pd> <app-qc-completed-pd [bindFilterValue]="filterValue" (loadPdView)="viewPDDetails($event)"></app-qc-completed-pd>

View File

@ -10,8 +10,9 @@
<div> <div>
<div style="text-align:right;position:absolute;z-index:2;right:1px"> <div style="text-align:right;position:absolute;z-index:2;right:1px">
<button mat-fab color="primary" matTooltip="Close" matTooltipPosition="above" (click)="goList()"><mat-icon>close</mat-icon></button> <button mat-fab color="primary" matTooltip="Close" matTooltipPosition="above" (click)="goList()"><mat-icon>close</mat-icon></button>
</div> </div>
<div fxFlex.xs="100" fxFlex.sm="100" fxFlex.md="25" fxFlex.lg="25" fxFlex.xl="25" style="position:absolute;z-index:1"> <div fxFlex.xs="100" fxFlex.sm="100" fxFlex.md="25" fxFlex.lg="25" fxFlex.xl="25" style="position:absolute;z-index:1">
<div [style.overflow]="'auto'" [style.height.px]="'500'" *ngIf="pdList.length > 0"> <div [style.overflow]="'auto'" [style.height.px]="'500'" *ngIf="pdList.length > 0">
@ -23,30 +24,37 @@
<input style="border-bottom: 1px solid #dcd9d9;padding-top: 5%;" matInput (keyup)="applyFilter($event.target.value)" placeholder="Search"> <input style="border-bottom: 1px solid #dcd9d9;padding-top: 5%;" matInput (keyup)="applyFilter($event.target.value)" placeholder="Search">
</div> </div>
<mat-card *ngFor="let details of dataSource.connect() | async"> <div *ngFor="let details of dataSource.connect() | async">
<div *ngIf="(details.pd_status=='TRIGGERED' || details.pd_status=='ALLOCATED') && details.fk_pd_type !='3' ">
<mat-card-title *ngIf="details.applicat_details" style="margin-bottom: 0px;"> <mat-card [ngStyle]="{'border-left':'5px solid','border-left-color': getColor(details.fk_pd_type)}">
<div fxLayout="row" fxFlex="100">
<div fxFlex="55"> <mat-card-title *ngIf="details.applicat_details" style="margin-bottom: 0px;">
<span style="font-weight:700">{{details.applicat_details[0].applicant_name}}</span> <br> <div fxLayout="row" fxFlex="100">
<span style="font-size: 13px;" >{{details.lender_full_name}}({{details.lender_applicant_id}})</span><br> <div fxFlex="55">
</div> <span style="font-weight:700">{{details.applicat_details[0].applicant_name}}</span><span style="font-size: 13px;"> ({{details.customer_segment_abbr}})</span> <br>
<div fxFlex="45" style="text-align:right;" *ngIf="details.pd_status!=pdStatusCheck.DRAFT"> <span style="font-size: 13px;" >{{details.lender_full_name}} ({{details.lender_applicant_id}})</span><br>
<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)"><mat-icon>verified_user</mat-icon></button> </div>
<button mat-raised-button mat-button-sm mat-icon-button class=" hover-icon" type="button" matTooltip="Schedule" matTooltipPosition="above" (click)="scheduleDetails(details)"><mat-icon>schedule</mat-icon></button> <div fxFlex="45" style="text-align:right;" *ngIf="details.pd_status!=pdStatusCheck.DRAFT">
</div> <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)"><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)"><mat-icon>schedule</mat-icon></button>
</div>
</div>
</mat-card-title>
<mat-card-content style="padding: 2% 0% 0% 7%;">
<span style="font-size: 13px;" class="hover-icon"><i *ngIf="details.city_name" class="fa-1x fa fa-map-marker">&nbsp;</i>{{details.city_name}}/{{details.state_name}}-{{details.pincode}}</span> <br>
<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>
</mat-card-content>
</mat-card>
</div> </div>
</mat-card-title>
<mat-card-content style="padding: 2% 0% 0% 7%;">
<span style="font-size: 13px;" class="hover-icon"><i *ngIf="details.city_name" class="fa-1x fa fa-map-marker">&nbsp;</i>{{details.city_name}}/{{details.state_name}}-{{details.pincode}}</span> <br> </div>
<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><br>
<span style="font-size: 13px;">{{details.pd_status}} - {{ (details.updatedon)? (details.updatedon | slice:0:10):(details.updatedon) }}</span>
</mat-card-content>
</mat-card>
<mat-list *ngIf="recordStatus"> <mat-list *ngIf="recordStatus">
<mat-list-item> <mat-list-item>
<p mat-line>No Record Found ...</p> <p mat-line>No Record Found ...</p>
@ -70,6 +78,9 @@
</agm-map> </agm-map>
</mat-card> </mat-card>
</div> </div>
<div style="text-align:right;position:absolute;z-index:2;bottom: 0;right: 0;">
<span style="width: 30px; height: 10px; background:#009688;color:#009688">II</span> Full &nbsp; <span style="width: 30px; height: 10px; background:#673ab7;color:#673ab7">II</span> Smart
</div>
</div> </div>
</div> </div>
</div> </div>

View File

@ -46,6 +46,10 @@ pdList:any[] = [];
"COMPLETED" :'COMPLETED', "COMPLETED" :'COMPLETED',
"QC_COMPLETED" :'QC_COMPLETED', "QC_COMPLETED" :'QC_COMPLETED',
}; };
public getColor(type: number): string{
return type == 1 ? "#009688" : "#673ab7" ;
}
constructor(notifier:NotifierService,private route: ActivatedRoute, constructor(notifier:NotifierService,private route: ActivatedRoute,
private router: Router,private _pd: PdTrigerService,private dialog: MatDialog,private _geolocation: GetGeometricLocationService, private ListPdComponent : ListPdComponent) { private router: Router,private _pd: PdTrigerService,private dialog: MatDialog,private _geolocation: GetGeometricLocationService, private ListPdComponent : ListPdComponent) {

View File

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

View File

@ -2,7 +2,7 @@
<mat-card-content> <mat-card-content>
<mat-sidenav-container class="app-inner background-none shadow-none mail-db"> <mat-sidenav-container class="app-inner background-none shadow-none mail-db">
<mat-sidenav #mailnav [mode]="isOver() ? 'over' : 'side'" [opened]="!isOver()" class="mail-sidebar pl-xs pr-xs"> <mat-sidenav #mailnav [mode]="isOver() ? 'over' : 'side'" [opened]="!isOver()" class="mail-sidebar pl-xs pr-xs">
<button _ngcontent-c21="" [disabled]="currentPDStatus !=pdStatusCheck.INPROGRESS || actualQuestions!=answeredQuestions" class="compose-btn mat-warn mat-raised-button mb-1" (click)="changePDStatus(pdStatusCheck.COMPLETED);"> <span>{{currentPDStatus==pdStatusCheck.INPROGRESS ? 'COMPLETE':currentPDStatus }}</span></button> <button _ngcontent-c21="" [disabled]="currentPDStatus !=pdStatusCheck.INPROGRESS || actualQuestions!=answeredQuestions" class="compose-btn mat-warn mat-raised-button mb-1" (click)="changePDStatus(pdStatusCheck.COMPLETED);"> <span>{{currentPDStatus==pdStatusCheck.INPROGRESS ? 'COMPLETE':(currentPDStatus==pdStatusCheck.QC_COMPLETED ? 'QC COMPLETED' : currentPDStatus ) }}</span></button>
<!-- {{ (currentPDStatus==pdStatusCheck.INPROGRESS)? 'COMPLETE':(currentPDStatus) }} --> <!-- {{ (currentPDStatus==pdStatusCheck.INPROGRESS)? 'COMPLETE':(currentPDStatus) }} -->
<mat-expansion-panel *ngFor="let category of categoryList;let catIndex = index; "> <mat-expansion-panel *ngFor="let category of categoryList;let catIndex = index; ">

View File

@ -19,7 +19,8 @@
<span *ngIf="master.pd_allocated_to" style="color:red;text-align:left"><mat-icon color="primary" class="hover-icon" matTooltip="PD Officer" <span *ngIf="master.pd_allocated_to" style="color:red;text-align:left"><mat-icon color="primary" class="hover-icon" matTooltip="PD Officer"
matTooltipPosition="above">person</mat-icon>{{master.pd_allocated_to | titlecase}}</span> &nbsp;&nbsp; matTooltipPosition="above">person</mat-icon>{{master.pd_allocated_to | titlecase}}</span> &nbsp;&nbsp;
<span *ngIf="master.pd_status==pdStatusCheck.SCHEDULED" style="color:red;text-align:left">{{master.pd_status | titlecase}} &nbsp;On&nbsp;{{master.scheduled_on}}</span> <span *ngIf="master.pd_status==pdStatusCheck.SCHEDULED" style="color:red;text-align:left">{{master.pd_status | titlecase}} &nbsp;On&nbsp;{{master.scheduled_on}}</span>
<span *ngIf="master.pd_status!=pdStatusCheck.SCHEDULED" style="color:red;text-align:left">{{master.pd_status | titlecase}}</span> <span *ngIf="master.pd_status!=pdStatusCheck.SCHEDULED && master.pd_status!=pdStatusCheck.QC_COMPLETED " style="color:red;text-align:left">{{master.pd_status | titlecase}}</span>
<span *ngIf="master.pd_status==pdStatusCheck.QC_COMPLETED " style="color:red;text-align:left">QC Completed</span>
</div> </div>

View File

@ -19,6 +19,8 @@ import { MatTooltipModule } from '@angular/material/tooltip';
import { NgxMatSelectSearchModule } from 'ngx-mat-select-search'; import { NgxMatSelectSearchModule } from 'ngx-mat-select-search';
import 'hammerjs'; import 'hammerjs';
import { NotifierModule, NotifierOptions } from 'angular-notifier'; import { NotifierModule, NotifierOptions } from 'angular-notifier';
import { OwlDateTimeModule, OwlNativeDateTimeModule } from 'ng-pick-datetime';
import { AgmCoreModule } from '@agm/core'; import { AgmCoreModule } from '@agm/core';
import { ManagePdRoutingModule } from './manage-pd.routing'; import { ManagePdRoutingModule } from './manage-pd.routing';
import { ListPdComponent } from './list-pd/list-pd.component'; import { ListPdComponent } from './list-pd/list-pd.component';
@ -30,7 +32,6 @@ import { PdAllocationComponent } from '../manage-pd/list-pd/pd-allocation/pd-all
import { SmartPdAllocationComponent } from './list-pd/smart-pd-allocation/smart-pd-allocation.component'; import { SmartPdAllocationComponent } from './list-pd/smart-pd-allocation/smart-pd-allocation.component';
import { PdTrigerService } from '../pd-service/pd-triger.service'; import { PdTrigerService } from '../pd-service/pd-triger.service';
import { GetGeometricLocationService } from '../location-service/get-geometric-location.service'; import { GetGeometricLocationService } from '../location-service/get-geometric-location.service';
import { OwlDateTimeModule, OwlNativeDateTimeModule } from 'ng-pick-datetime';
import { SchedulePdComponent } from './list-pd/schedule-pd/schedule-pd.component'; import { SchedulePdComponent } from './list-pd/schedule-pd/schedule-pd.component';
import { EditPdApplicantComponent } from './list-pd/edit-pd-applicant/edit-pd-applicant.component'; import { EditPdApplicantComponent } from './list-pd/edit-pd-applicant/edit-pd-applicant.component';
import { EditPdMasterComponent } from './list-pd/edit-pd-master/edit-pd-master.component'; import { EditPdMasterComponent } from './list-pd/edit-pd-master/edit-pd-master.component';

View File

@ -2,7 +2,7 @@
<mat-card-content> <mat-card-content>
<mat-sidenav-container class="app-inner background-none shadow-none mail-db"> <mat-sidenav-container class="app-inner background-none shadow-none mail-db">
<mat-sidenav #mailnav [mode]="isOver() ? 'over' : 'side'" [opened]="!isOver()" class="mail-sidebar pl-xs pr-xs"> <mat-sidenav #mailnav [mode]="isOver() ? 'over' : 'side'" [opened]="!isOver()" class="mail-sidebar pl-xs pr-xs">
<button _ngcontent-c21="" [disabled]="currentPDStatus !=pdStatusCheck.COMPLETED || actualQuestions!=answeredQuestions" class="compose-btn mat-warn mat-raised-button mb-1" (click)="changePDStatus(pdStatusCheck.QC_COMPLETED);"> <span>{{currentPDStatus==pdStatusCheck.COMPLETED ? 'QC OK':currentPDStatus }}</span></button> <button _ngcontent-c21="" [disabled]="currentPDStatus !=pdStatusCheck.COMPLETED || actualQuestions!=answeredQuestions" class="compose-btn mat-warn mat-raised-button mb-1" (click)="changePDStatus(pdStatusCheck.QC_COMPLETED);"> <span>{{currentPDStatus==pdStatusCheck.COMPLETED ? 'QC OK':(currentPDStatus==pdStatusCheck.QC_COMPLETED ? 'QC COMPLETED' : currentPDStatus )}}</span></button>
<mat-expansion-panel *ngFor="let category of categoryList;let catIndex = index; "> <mat-expansion-panel *ngFor="let category of categoryList;let catIndex = index; ">
<mat-expansion-panel-header> <mat-expansion-panel-header>

View File

@ -14,8 +14,9 @@
<br> <br>
<span *ngIf="master.pd_allocated_to" style="color:red;text-align:left">{{master.pd_allocated_to | titlecase}}</span> &nbsp;&nbsp; <span *ngIf="master.pd_allocated_to" style="color:red;text-align:left">{{master.pd_allocated_to | titlecase}}</span> &nbsp;&nbsp;
<span *ngIf="master.pd_status==pdStatusCheck.SCHEDULED" style="color:red;text-align:left">{{master.pd_status | titlecase}} &nbsp;On&nbsp;{{master.scheduled_on}}</span> <span *ngIf="master.pd_status==pdStatusCheck.SCHEDULED" style="color:red;text-align:left">{{master.pd_status | titlecase}} &nbsp;On&nbsp;{{master.scheduled_on}}</span>
<span *ngIf="master.pd_status!=pdStatusCheck.SCHEDULED" style="color:red;text-align:left">{{master.pd_status | titlecase}}</span> <span *ngIf="master.pd_status!=pdStatusCheck.SCHEDULED && master.pd_status!=pdStatusCheck.QC_COMPLETED " style="color:red;text-align:left">{{master.pd_status | titlecase}}</span>
</div> <span *ngIf="master.pd_status==pdStatusCheck.QC_COMPLETED " style="color:red;text-align:left">QC Completed</span>
</div>
</div> </div>
<mat-card-content> <mat-card-content>