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

Merge branch 'master' of https://bitbucket.org/sriramv18/sparqsineedge

Browse Source
This commit is contained in:
venbatechnologies@gmail.com 2020-06-30 15:54:07 +05:30
commit 75fcd344d3
11 changed files with 61 additions and 35 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -121,16 +121,18 @@
</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 *ngIf="details.pd_status!='QC_COMPLETED'"> {{details.pd_status}}</span> <span *ngIf="details.pd_status!='QC_COMPLETED'" matTooltip="PD Status" matTooltipPosition="above"> {{details.pd_status}}</span>
<span *ngIf="details.pd_status=='QC_COMPLETED'"> QC COMPLETED</span> <span *ngIf="details.pd_status=='QC_COMPLETED'" matTooltip="PD Status" matTooltipPosition="above"> QC COMPLETED</span>
<br> <br>
<span class="fontsize" *ngIf="details.pd_status!='SCHEDULED' && details.pd_status!='QC_COMPLETED'" [matTooltip]="details.pd_status | titlecase" <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) }} matTooltipPosition="above">{{ (details.updatedon)? (details.updatedon | slice:0:10):(details.updatedon) }}
</span> </span><br>
<span *ngIf="details.fk_pd_type == '2'&& details.vendor_status != null" matTooltip="Vendor Status" matTooltipPosition="above" style="font-size:14px !important;">( {{details.vendor_status}} )</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.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>
</mat-cell> </mat-cell>
</ng-container> </ng-container>
<ng-container matColumnDef="Action"> <ng-container matColumnDef="Action">

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

@ -111,9 +111,10 @@
</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 matTooltip="PD Status" matTooltipPosition="above"> {{details.pd_status}}</span><br>
<span class="fontsize" [matTooltip]="details.pd_status | titlecase" >{{ (details.updatedon)? (details.updatedon | slice:0:10):(details.updatedon) }} <span class="fontsize" [matTooltip]="details.pd_status | titlecase" >{{ (details.updatedon)? (details.updatedon | slice:0:10):(details.updatedon) }}
</span> </span> <br>
<span *ngIf="details.fk_pd_type == '2' && details.vendor_status != null" matTooltip="Vendor Status" matTooltipPosition="above" style="font-size:14px !important;">( {{details.vendor_status}} )</span>
</mat-cell> </mat-cell>
</ng-container> </ng-container>
<ng-container matColumnDef="Action"> <ng-container matColumnDef="Action">

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

@ -108,9 +108,10 @@
</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 matTooltip="PD Status" matTooltipPosition="above"> {{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 class="fontsize" [matTooltip]="details.pd_status | titlecase" matTooltipPosition="above">{{ (details.updatedon)? (details.updatedon | slice:0:10):(details.updatedon) }}
</span> </span> <br>
<span *ngIf="details.fk_pd_type == '2' && details.vendor_status != null" matTooltip="Vendor Status" matTooltipPosition="above" style="font-size:14px !important;">( {{details.vendor_status}} )</span>
</mat-cell> </mat-cell>
</ng-container> </ng-container>
<ng-container matColumnDef="Action"> <ng-container matColumnDef="Action">

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

@ -27,6 +27,7 @@ export class PdAllocationComponent implements OnInit {
private dialogRef: MatDialogRef<PdAllocationComponent>, private dialogRef: MatDialogRef<PdAllocationComponent>,
private _pd: PdTrigerService, private dialog: MatDialog, private _pd: PdTrigerService, private dialog: MatDialog,
@Inject(MAT_DIALOG_DATA) public data: any) { @Inject(MAT_DIALOG_DATA) public data: any) {
console.log(data)
this.notifier=notifier; this.notifier=notifier;
} }
@ -106,17 +107,7 @@ export class PdAllocationComponent implements OnInit {
} }
// pd Vendor officer // pd Vendor officer
viewVendorOfficer(){ viewVendorOfficer(){
const dialogSchedule = this.dialog.open(VendorPdAllocationComponent, { this.dialogRef.close('openvendorallocation');
// data: details,
disableClose: true,
position: { right: '0'},
width:'100%',
// hasBackdrop:false
});
// dialogSchedule.afterClosed()
// .subscribe(dataresult => {
// });
// this.notifier.notify('warning', 'No PD In Hand');
} }

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

@ -110,9 +110,10 @@
</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 > QC COMPLETED</span><br> <span matTooltip="PD Status" matTooltipPosition="above"> QC COMPLETED</span><br>
<span class="fontsize" matTooltip="QC Completed" 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> <br>
<span *ngIf="details.fk_pd_type == '2' && details.vendor_status != null" matTooltip="Vendor Status" matTooltipPosition="above" style="font-size:14px !important;">( {{details.vendor_status}} )</span>
</mat-cell> </mat-cell>
</ng-container> </ng-container>
<ng-container matColumnDef="Action"> <ng-container matColumnDef="Action">

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

@ -108,11 +108,12 @@
</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 matTooltip="PD Status" matTooltipPosition="above"> {{details.pd_status}}</span><br>
<!-- <span class="fontsize">{{ (details.updatedon)? (details.updatedon | slice:0:10):(details.updatedon) }} <!-- <span class="fontsize">{{ (details.updatedon)? (details.updatedon | slice:0:10):(details.updatedon) }}
</span> --> </span> -->
<span class="fontsize">{{details.scheduled_on}} <span class="fontsize">{{details.scheduled_on}}
</span> </span><br>
<span *ngIf="details.fk_pd_type == '2' && details.vendor_status != null" matTooltip="Vendor Status" matTooltipPosition="above" style="font-size:14px !important;">( {{details.vendor_status}} )</span>
</mat-cell> </mat-cell>
</ng-container> </ng-container>

4
ng6-seed/src/app/personal-discussion/manage-pd/list-pd/vendor-pd-allocation/VendorPdAllocationComponent.ts
View File

@ -11,7 +11,7 @@ import { PdTrigerService } from '../../../pd-service/pd-triger.service';
encapsulation: ViewEncapsulation.None encapsulation: ViewEncapsulation.None
}) })
export class VendorPdAllocationComponent implements OnInit { export class VendorPdAllocationComponent implements OnInit {
public pageTitle: string = "Allocation To PD Officer"; public pageTitle: string = "Allocation To Vendor";
public _pdAllocationForm: FormGroup; public _pdAllocationForm: FormGroup;
public pdOfficerList: any = []; public pdOfficerList: any = [];
errorMessage: any; errorMessage: any;
@ -24,6 +24,7 @@ export class VendorPdAllocationComponent implements OnInit {
private dialogRef: MatDialogRef<VendorPdAllocationComponent>, private dialogRef: MatDialogRef<VendorPdAllocationComponent>,
private _pd: PdTrigerService, private dialog: MatDialog, private _pd: PdTrigerService, private dialog: MatDialog,
@Inject(MAT_DIALOG_DATA) public data: any) { @Inject(MAT_DIALOG_DATA) public data: any) {
console.log(data)
this.notifier = notifier; this.notifier = notifier;
} }
@ -58,6 +59,7 @@ export class VendorPdAllocationComponent implements OnInit {
} }
else { else {
let updateData = { let updateData = {
"pd_id":this.data.pd_id,
"pd_agency_id": allocateDetails.entity_id, "pd_agency_id": allocateDetails.entity_id,
"pd_status": "ALLOCATED_TO_PARTNER", "pd_status": "ALLOCATED_TO_PARTNER",
}; };

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

@ -47,7 +47,7 @@
<mat-dialog-actions > <mat-dialog-actions >
<div fxFlex="50" align="left"> <div fxFlex="50" align="left">
<p *ngIf="selectedItem">PD Officer: {{selectedItem.full_name}}</p> <p *ngIf="selectedItem"><span style="color:#e00201 !important;">Vendor:</span> {{selectedItem.full_name}}</p>
</div> </div>
<div fxFlex="50" align="right"> <div fxFlex="50" align="right">
<button mat-raised-button mat-icon-button class="mr-1 mb-1 hover-icon" type="button" (click)="closeAllocationComponent()" matTooltip="Close" matTooltipPosition="below"><mat-icon>close</mat-icon></button> <button mat-raised-button mat-icon-button class="mr-1 mb-1 hover-icon" type="button" (click)="closeAllocationComponent()" matTooltip="Close" matTooltipPosition="below"><mat-icon>close</mat-icon></button>

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

@ -172,9 +172,13 @@
<mat-icon>videocam</mat-icon>&nbsp; <mat-icon>videocam</mat-icon>&nbsp;
<strong>Call</strong> <strong>Call</strong>
</button> </button>
<button mat-raised-button class="mr-1 mb-1" color="primary" style="cursor: not-allowed !important;"> <button *ngIf="master.fk_pd_type == '2' && master.vendor_status != null" mat-raised-button class="mr-1 mb-1" color="primary" matTooltip="Vendor Status" matTooltipPosition="above" style="cursor: not-allowed !important;background-color: #f44336ba !important;">
<strong> {{master.vendor_status}}</strong>
</button>
<button mat-raised-button class="mr-1 mb-1" color="primary" matTooltip="PD Status" matTooltipPosition="above" 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.pd_status==pdStatusCheck.QC_COMPLETED ? 'QC Completed' : master.pd_status==pdStatusCheck.ADD_ON_PENDING ? 'Addon Pending' : master.pd_status | titlecase}}</strong>
</button> </button>
<span *ngIf="userRoleID == 10 || userRoleID == 3"><button *ngIf="roleAccessDetails.trigger && currentPDStatus==pdStatusCheck.DRAFT || currentPDStatus==pdStatusCheck.TRIGGERED || currentPDStatus==pdStatusCheck.ALLOCATED || currentPDStatus==pdStatusCheck.SCHEDULED" 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 *ngIf="userRoleID == 10 || userRoleID == 3"><button *ngIf="roleAccessDetails.trigger && currentPDStatus==pdStatusCheck.DRAFT || currentPDStatus==pdStatusCheck.TRIGGERED || currentPDStatus==pdStatusCheck.ALLOCATED || currentPDStatus==pdStatusCheck.SCHEDULED" 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> <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>
</span> </span>
@ -200,7 +204,8 @@
<div fxLayout="row nowrap"> <div fxLayout="row nowrap">
<div fxFlex="100"> <div fxFlex="100">
<div fxFlex="40" align="left" style="color: #e00201"> <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}} <span matTooltip="PD Status" matTooltipPosition="above">{{master.pd_status==pdStatusCheck.QC_COMPLETED ? 'QC Completed' : master.pd_status==pdStatusCheck.ADD_ON_PENDING ? 'Completed' : master.pd_status | titlecase}}</span> <br>
<span *ngIf="master.fk_pd_type == '2' && master.vendor_status != null" matTooltip="Vendor Status" matTooltipPosition="above" style="font-size:14px !important;">( {{master.vendor_status}} )</span>
</div> </div>
<div fxFlex="60" align="right"> <div fxFlex="60" align="right">
<span><button *ngIf="roleAccessDetails.trigger && 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 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> <span><button *ngIf="roleAccessDetails.trigger && 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 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>
@ -242,7 +247,8 @@
<div *ngIf="master.fk_primary_address_id!=null && addresses.addtional_pd_data.length>0"> <div *ngIf="master.fk_primary_address_id!=null && addresses.addtional_pd_data.length>0">
<div fxLayout="row nowrap"> <div fxLayout="row nowrap">
<div fxFlex="40" align="left" style="color: #e00201"> <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}} <span matTooltip="PD Status" matTooltipPosition="above">{{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}}</span> <br>
<span *ngIf="master.fk_pd_type == '2' && master.vendor_status != null" matTooltip="Vendor Status" matTooltipPosition="above" style="font-size:14px !important;">( {{master.vendor_status}} )</span>
</div> </div>
<div fxFlex="60" align="right"> <div fxFlex="60" align="right">
<span *ngIf="userRoleID == 10 || userRoleID == 3"><button *ngIf="roleAccessDetails.allocate && 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.COMPLETED && addresses.addtional_pd_data[0].pd_status!=pdStatusCheck.ADD_ON_PENDING && 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 == 10 || userRoleID == 3"><button *ngIf="roleAccessDetails.allocate && 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.COMPLETED && addresses.addtional_pd_data[0].pd_status!=pdStatusCheck.ADD_ON_PENDING && 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>

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

@ -22,6 +22,7 @@ import Swal from 'sweetalert2';
import { VideoChatComponent } from 'app/video-chat/video-chat.component'; import { VideoChatComponent } from 'app/video-chat/video-chat.component';
import { MastersComponent } from 'app/settings/masters/masters.component'; import { MastersComponent } from 'app/settings/masters/masters.component';
import { VideoPlayerComponent } from 'app/video-chat/video-player/video-player.component'; import { VideoPlayerComponent } from 'app/video-chat/video-player/video-player.component';
import { VendorPdAllocationComponent } from '../vendor-pd-allocation/VendorPdAllocationComponent';
@Component({ @Component({
selector: 'app-view-pd', selector: 'app-view-pd',
@ -128,6 +129,7 @@ export class ViewPdComponent implements OnInit, OnDestroy {
] ]
}; };
videoplayback: any = {enableBtn:false,url:null}; videoplayback: any = {enableBtn:false,url:null};
openvendorallocation: any;
constructor(notifier: NotifierService, private dialog: MatDialog, private _fb: FormBuilder, constructor(notifier: NotifierService, private dialog: MatDialog, private _fb: FormBuilder,
private _pd: PdTrigerService, private route: ActivatedRoute, private router: Router, private ListPdComponent: ListPdComponent) { private _pd: PdTrigerService, private route: ActivatedRoute, private router: Router, private ListPdComponent: ListPdComponent) {
@ -371,8 +373,27 @@ export class ViewPdComponent implements OnInit, OnDestroy {
}); });
dialogRef.afterClosed() dialogRef.afterClosed()
.subscribe(dataresult => { .subscribe(dataresult => {
console.log(dataresult)
if(dataresult == 'openvendorallocation'){
const dialogSchedule = this.dialog.open(VendorPdAllocationComponent, {
data: pdData,
disableClose: true,
position: { right: '0'},
width:'100%',
// hasBackdrop:false
});
dialogSchedule.afterClosed()
.subscribe(dataresult => {
this.viewPdDetails(this.viewID,this.masterRandomString)
});
// this.notifier.notify('warning', 'No PD In Hand');
}else{
// this.notifier.notify('success', 'Successfully allocated.!'); // this.notifier.notify('success', 'Successfully allocated.!');
this.viewPdDetails(this.viewID,this.masterRandomString) this.viewPdDetails(this.viewID,this.masterRandomString)
}
}); });
} }
// else if (pdData.fk_pd_type == 2) { // else if (pdData.fk_pd_type == 2) {

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

@ -304,7 +304,7 @@ export class PdTrigerService {
} }
// update Vendor // update Vendor
updateVendor(updateData: any): Observable<any> { updateVendor(updateData: any): Observable<any> {
// updateData.fk_updatedby = this._aws.getlocale(); updateData.fk_updatedby = this._aws.getlocale();
// updateData.updatedon = currentdate; // updateData.updatedon = currentdate;
return this._http.post<any>(this.apiUrl + "allocatePD", { "records": updateData }) return this._http.post<any>(this.apiUrl + "allocatePD", { "records": updateData })
.pipe( .pipe(