Sineedge/sparqsineedge
5
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

pd allocatin changes

Browse Source
This commit is contained in:
gandhimathi 2018-11-12 15:26:32 +05:30
parent d1ff5dcb83
commit c941efa5ba
4 changed files with 15 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
ng6-seed/src/app/personal-discussion/manage-pd/list-pd/smart-pd-allocation/smart-pd-allocation.component.html
View File

@ -11,9 +11,9 @@
<mat-card-content> <mat-card-content>
<!-- <form [formGroup]="_pdAllocationForm" (submit)="onSubmit()"> --> <!-- <form [formGroup]="_pdAllocationForm" (submit)="onSubmit()"> -->
<div *ngIf="pdExcutiveList.length > 0" > <div *ngIf="pdCentralOfficerList.length > 0" >
<div fxLayout="row wrap" fxFlex="100%"> <div fxLayout="row wrap" fxFlex="100%">
<div fxLayout="row wrap" fxFlex="33.33%" *ngFor="let officer of pdExcutiveList; "> <div fxLayout="row wrap" fxFlex="33.33%" *ngFor="let officer of pdCentralOfficerList; ">
<!-- <p><mat-radio-button [value]="officer" (change)="selectPdOfficer(officer)"></mat-radio-button> <!-- <p><mat-radio-button [value]="officer" (change)="selectPdOfficer(officer)"></mat-radio-button>
{{officer.first_name}} {{officer.first_name}}
</p> </p>
@ -41,7 +41,7 @@
</div> </div>
</div> </div>
</div> </div>
<mat-list *ngIf="pdExcutiveList.length == 0"> <mat-list *ngIf="pdCentralOfficerList.length == 0">
<mat-list-item> <mat-list-item>
<p>No executive available.</p> <p>No executive available.</p>
</mat-list-item> </mat-list-item>
@ -62,9 +62,9 @@
</mat-card-header> </mat-card-header>
<mat-card-content> <mat-card-content>
<div *ngIf="pdCentralOfficerList.length > 0" > <div *ngIf="pdExcutiveList.length > 0" >
<div fxLayout="row wrap" fxFlex="100%"> <div fxLayout="row wrap" fxFlex="100%">
<div fxLayout="row wrap" fxFlex="33.33%" *ngFor="let excutive of pdCentralOfficerList"> <div fxLayout="row wrap" fxFlex="33.33%" *ngFor="let excutive of pdExcutiveList">
<mat-card fxFlex="100%"> <mat-card fxFlex="100%">
<mat-card-content style="text-align:center"> <mat-card-content style="text-align:center">
<mat-radio-button [value]="excutive" (change)="selectExcutiveOfficer(excutive)"></mat-radio-button> <mat-radio-button [value]="excutive" (change)="selectExcutiveOfficer(excutive)"></mat-radio-button>
@ -97,7 +97,7 @@
</mat-list-item> </mat-list-item>
</mat-radio-group> </mat-radio-group>
</mat-list> --> </mat-list> -->
<mat-list *ngIf="pdCentralOfficerList.length == 0"> <mat-list *ngIf="pdExcutiveList.length == 0">
<mat-list-item> <mat-list-item>
<p>No central officer available.</p> <p>No central officer available.</p>
</mat-list-item> </mat-list-item>

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

@ -11,8 +11,8 @@ import { PdTrigerService } from '../../../pd-service/pd-triger.service';
}) })
export class SmartPdAllocationComponent implements OnInit { export class SmartPdAllocationComponent implements OnInit {
public pageTitle: string = "Allocate To Executive"; public pageTitle2: string = "Allocate To Executive";
public pageTitle2: string = "Allocate To Central Officer"; public pageTitle: string = "Allocate To Central Officer";
public _pdAllocationForm: FormGroup; public _pdAllocationForm: FormGroup;
//public pdOfficerList: any = []; //public pdOfficerList: any = [];
public pdCentralOfficerList: any = []; public pdCentralOfficerList: any = [];
@ -70,7 +70,7 @@ export class SmartPdAllocationComponent implements OnInit {
else { else {
let updateData = { let updateData = {
"pd_id":this.data.pd_id, "pd_id":this.data.pd_id,
"fk_pd_allocated_to":pdOfficer.fk_user_id, "central_pd_officer_id":pdOfficer.fk_user_id,
"executive_id":excutiveOfficer.fk_user_id, "executive_id":excutiveOfficer.fk_user_id,
} }
this._pd.updatePdOfficer(updateData).subscribe( this._pd.updatePdOfficer(updateData).subscribe(

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

@ -57,7 +57,7 @@ export class TelePdAllocationComponent implements OnInit {
else { else {
let updateData = { let updateData = {
"pd_id":this.data.pd_id, "pd_id":this.data.pd_id,
"fk_pd_allocated_to":allocateDate.fk_user_id, "central_pd_officer_id":allocateDate.fk_user_id,
} }
this._pd.updatePdOfficer(updateData).subscribe( this._pd.updatePdOfficer(updateData).subscribe(
result => { result => {

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

@ -16,8 +16,11 @@
<!-- <span *ngIf="master.pd_allocated_to" style="color:red;text-align:left" class="fa-1x fa fa-user-secret" matTooltip="PD Officer" <!-- <span *ngIf="master.pd_allocated_to" style="color:red;text-align:left" class="fa-1x fa fa-user-secret" matTooltip="PD Officer"
matTooltipPosition="above"></span> --> matTooltipPosition="above"></span> -->
<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 && master.fk_pd_type==1" 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>
matTooltipPosition="above">person</mat-icon>{{master.pd_allocated_to | titlecase}}</span> &nbsp;&nbsp; <span *ngIf="master.executive_name && master.centralofficer && master.fk_pd_type==2" style="color:red;text-align:left"><mat-icon color="primary" class="hover-icon" matTooltip="PD Officer" matTooltipPosition="above">person</mat-icon>{{master.executive_name | titlecase}}/{{master.centralofficer | titlecase}}</span>
<span *ngIf="master.centralofficer && master.fk_pd_type==3" style="color:red;text-align:left"><mat-icon color="primary" class="hover-icon" matTooltip="PD Officer" matTooltipPosition="above">person</mat-icon>{{master.centralofficer | 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 && master.pd_status!=pdStatusCheck.QC_COMPLETED " 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> <span *ngIf="master.pd_status==pdStatusCheck.QC_COMPLETED " style="color:red;text-align:left">QC Completed</span>