allocated and scheduled done

This commit is contained in:
sriram-at-840620226347 2020-06-23 19:27:27 +05:30
parent 2e38443b48
commit f64d8cd6d8
235 changed files with 296 additions and 52 deletions

0
README.md Normal file → Executable file
View File

0
ng6-seed/e2e/app.e2e-spec.ts Normal file → Executable file
View File

0
ng6-seed/e2e/app.po.ts Normal file → Executable file
View File

0
ng6-seed/e2e/tsconfig.e2e.json Normal file → Executable file
View File

0
ng6-seed/karma.conf.js Normal file → Executable file
View File

0
ng6-seed/prepros-6.config Normal file → Executable file
View File

0
ng6-seed/protractor.conf.js Normal file → Executable file
View File

0
ng6-seed/src/app/dashboard/charts.data.ts Normal file → Executable file
View File

View File

View File

View File

View File

0
ng6-seed/src/app/layouts/role-menu-items.pipe.spec.ts Normal file → Executable file
View File

0
ng6-seed/src/app/layouts/role-menu-items.pipe.ts Normal file → Executable file
View File

View File

@ -18,16 +18,16 @@
<div fxLayout="row wrap">
<div fxFlex.xs="100" fxFlex.sm="100" fxFlex.md="30" fxFlex.lg="30" fxFlex.xl="30">
<mat-radio-button color="primary" [value]="officer" (change)="selectedItem = $event.value">
{{officer.first_name}}
{{officer.officer_name}}
</mat-radio-button>
</div>
<div fxFlex.xs="100" fxFlex.sm="100" fxFlex.md="30" fxFlex.lg="30" fxFlex.xl="30">
<span>{{officer.mobile_no}}</span>
</div>
<div fxFlex.xs="100" fxFlex.sm="100" fxFlex.md="40" fxFlex.lg="40" fxFlex.xl="40">
<!-- <div fxFlex.xs="100" fxFlex.sm="100" fxFlex.md="40" fxFlex.lg="40" fxFlex.xl="40">
<span class="view_more" (click)="viewMoreDetails(officer)" matTooltip="View More" matTooltipPosition="right">PD in hand - {{officer.count}}</span>
</div>
</div> -->
</div>
</div>

View File

@ -3,7 +3,7 @@ import { MatDialog, MatDialogRef, MAT_DIALOG_DATA , DialogPosition} from '@angul
import { FormBuilder, FormGroup, Validators, FormControl, FormArray } from '@angular/forms';
import { NotifierService } from 'angular-notifier';
import { PdTrigerService } from '../../../pd-service/pd-triger.service';
import { AllocationViewMoreComponent } from './../allocation-view-more/allocation-view-more.component';
// import { AllocationViewMoreComponent } from './../allocation-view-more/allocation-view-more.component';
@Component({
selector: 'app-pd-allocation',
@ -31,7 +31,7 @@ export class PdAllocationComponent implements OnInit {
ngOnInit() {
this.isDisabled=true;
this.getPDOfficerList(this.data.pd_id);
this.getPDOfficerList();
// this._pdAllocationForm = this._fb.group({
// pd_primary_id: [null],
@ -43,11 +43,13 @@ export class PdAllocationComponent implements OnInit {
// get readForm() { return this._pdAllocationForm.controls; }
// pd officer list
getPDOfficerList(pdID:string){
this._pd.getPdOfficerList(pdID).subscribe(
getPDOfficerList(){
let LocalSetEntity : string = localStorage.getItem('LocalSetEntity');
this._pd.getPdOfficerList(LocalSetEntity).subscribe(
data => {
if (data.status == 200) {
this.pdOfficerList= data.records.pdofficers.filter(item => item.fk_pd_type_id == 1);
this.pdOfficerList= data.records;
}
}, error => this.errorMessage = <any> error);
@ -61,7 +63,8 @@ export class PdAllocationComponent implements OnInit {
else {
let updateData = {
"pd_id":this.data.pd_id,
"fk_pd_allocated_to":allocateDetails.fk_user_id,
"fk_pd_allocated_to":allocateDetails.userid,
"vendor_status":"ALLOCATED",
}
this._pd.updatePdOfficer(updateData).subscribe(
result => {
@ -85,22 +88,22 @@ export class PdAllocationComponent implements OnInit {
this.dialogRef.close();
}
// pd officer view more
viewMoreDetails(details:any){
if(Number(details.count) > 0) {
const dialogSchedule = this.dialog.open(AllocationViewMoreComponent, {
data: details,
disableClose: true,
position: { right: '0'},
width:'100%',
// hasBackdrop:false
});
// dialogSchedule.afterClosed()
// .subscribe(dataresult => {
// });
}
else {
this.notifier.notify('warning', 'No PD In Hand');
// viewMoreDetails(details:any){
// if(Number(details.count) > 0) {
// const dialogSchedule = this.dialog.open(AllocationViewMoreComponent, {
// data: details,
// disableClose: true,
// position: { right: '0'},
// width:'100%',
// // hasBackdrop:false
// });
// // dialogSchedule.afterClosed()
// // .subscribe(dataresult => {
// // });
// }
// else {
// this.notifier.notify('warning', 'No PD In Hand');
}
}
// }
// }
}

View File

@ -0,0 +1,39 @@
<mat-card-title style="background-color: #e00201;color: #fff;padding: 18px;">
Schedule PD
</mat-card-title>
<div style="max-height: 480px; width: 550px;">
<div class="column" fxFlex.xs="70" fxFlex.sm="70" fxFlex.md="70" fxFlex.lg="70" fxFlex.xl="70">
<owl-date-time-inline [min]="min" [(ngModel)]="selectedMoment"></owl-date-time-inline>
</div>
<div class="column" fxFlex.xs="70" fxFlex.sm="70" fxFlex.md="70" fxFlex.lg="70" fxFlex.xl="70">
<mat-list style="margin-top: 60%;">
<mat-list-item>
<strong>{{selectedMoment | date: 'dd/MM/yyyy'}}</strong>
</mat-list-item>
<mat-list-item>
<strong>{{selectedMoment | date:'h:mm a'}}</strong>
</mat-list-item>
<!-- <mat-list-item>
<mat-form-field>
<mat-select placeholder="Time" [formControl]="scheduleControl" required>
<mat-option *ngFor="let times of timeDetails" [value]="times.objectValue">
{{times.name}}
</mat-option>
</mat-select>
<mat-error *ngIf="scheduleControl.hasError('required')">Please Choose Time</mat-error>
</mat-form-field>
</mat-list-item> -->
</mat-list>
<mat-list style="padding-top: 15%;">
<mat-list-item>
<button mat-raised-button mat-icon-button class="mr-1 mb-1 hover-icon" matTooltip="Close" matTooltipPosition="below" type="button" (click)="closeScheduleComponent()"><mat-icon>close</mat-icon></button>
<button mat-raised-button mat-icon-button class="mr-1 mb-1 hover-icon" type="button" matTooltip="Schedule" matTooltipPosition="below" (click)="upatePDSchedule(selectedMoment)"><mat-icon>save</mat-icon></button>
</mat-list-item>
</mat-list>
</div>
</div>
<notifier-container></notifier-container>

View File

@ -0,0 +1,25 @@
import { async, ComponentFixture, TestBed } from '@angular/core/testing';
import { SchedulePdComponent } from './schedule-pd.component';
describe('SchedulePdComponent', () => {
let component: SchedulePdComponent;
let fixture: ComponentFixture<SchedulePdComponent>;
beforeEach(async(() => {
TestBed.configureTestingModule({
declarations: [ SchedulePdComponent ]
})
.compileComponents();
}));
beforeEach(() => {
fixture = TestBed.createComponent(SchedulePdComponent);
component = fixture.componentInstance;
fixture.detectChanges();
});
it('should create', () => {
expect(component).toBeTruthy();
});
});

View File

@ -0,0 +1,113 @@
import { Component, OnInit, Inject, Pipe, PipeTransform, OnDestroy } from '@angular/core';
import { MatDialogRef, MAT_DIALOG_DATA } from '@angular/material';
import { FormBuilder, FormGroup, Validators, FormControl, FormArray } from '@angular/forms';
import { NotifierService } from 'angular-notifier';
import { PdTrigerService } from '../../../pd-service/pd-triger.service';
import { DatePipe } from '@angular/common';
export interface Timeslot {
id: string;
name: string;
objectValue: string
}
@Component({
selector: 'app-schedule-pd',
templateUrl: './schedule-pd.component.html',
styleUrls: ['./schedule-pd.component.scss']
})
export class SchedulePdComponent implements OnInit, OnDestroy {
public pageTitle: string = "PD Schedule";
pipe = new DatePipe('en-US');
public selectedMoment = new Date();
errorMessage: any;
notifier : NotifierService;
//scheduleControl = new FormControl('', [Validators.required]);
// timeDetails: Timeslot[] = [
// {id: '1', name: '06:00 AM', objectValue:'06:00:00'},
// {id: '2', name: '06:30 AM', objectValue:'06:30:00'},
// {id: '3', name: '07:00 AM', objectValue:'07:00:00'},
// {id: '4', name: '07:30 AM', objectValue:'07:30:00'},
// {id: '5', name: '08:00 AM', objectValue:'08:00:00'},
// {id: '6', name: '08:30 AM', objectValue:'08:30:00'},
// {id: '7', name: '09:00 AM', objectValue:'09:00:00'},
// {id: '8', name: '09:30 AM', objectValue:'09:30:00'},
// {id: '9', name: '10:00 AM', objectValue:'10:00:00'},
// {id: '10', name: '10:30 AM', objectValue:'10:30:00'},
// {id: '11', name: '11:00 AM', objectValue:'11:00:00'},
// {id: '12', name: '11:30 AM', objectValue:'11:30:00'},
// {id: '13', name: '12:00 PM', objectValue:'12:00:00'},
// {id: '14', name: '12:30 PM', objectValue:'12:30:00'},
// {id: '15', name: '01:00 PM', objectValue:'13:00:00'},
// {id: '16', name: '01:30 PM', objectValue:'13:30:00'},
// {id: '17', name: '02:00 PM', objectValue:'14:00:00'},
// {id: '18', name: '02:30 PM', objectValue:'14:30:00'},
// {id: '19', name: '03:00 PM', objectValue:'15:00:00'},
// {id: '20', name: '03:30 PM', objectValue:'15:30:00'},
// {id: '21', name: '04:00 PM', objectValue:'16:00:00'},
// {id: '22', name: '04:30 PM', objectValue:'16:30:00'},
// {id: '23', name: '05.00 PM', objectValue:'17:00:00'},
// {id: '24', name: '05:30 PM', objectValue:'17:30:00'},
// {id: '25', name: '06:00 PM', objectValue:'18:00:00'},
// {id: '26', name: '06:30 PM', objectValue:'18:30:00'},
// {id: '27', name: '07:00 PM', objectValue:'19:00:00'},
// {id: '28', name: '07:30 PM', objectValue:'19:30:00'},
// {id: '29', name: '08:00 PM', objectValue:'20:00:00'},
// ];
public min = new Date();
validateTime:any;
constructor(notifier: NotifierService, private dialogRef: MatDialogRef<SchedulePdComponent>,
private _pd: PdTrigerService,
@Inject(MAT_DIALOG_DATA) public data: any) {
this.notifier=notifier;
}
ngOnInit() {
this.validateTime = setInterval(() => {
let currentTime:any = new Date();
currentTime = currentTime.getFullYear()+'-'+currentTime.getMonth()+'-'+currentTime.getDay()+'-'+currentTime.getHours()+'-'+currentTime.getMinutes();
let existTime:any = this.selectedMoment.getFullYear()+'-'+this.selectedMoment.getMonth()+'-'+this.selectedMoment.getDay() +'-'+this.selectedMoment.getHours()+'-'+this.selectedMoment.getMinutes();
if(existTime < currentTime) {
this.selectedMoment = new Date();
this.min = new Date();
}
},1000);
}
// close pd schedule pop up
closeScheduleComponent(): void {
this.dialogRef.close();
}
// update pd schedule
upatePDSchedule(date:any){
let myFormattedDate = this.pipe.transform(date, 'yyyy-MM-dd HH:mm');
let updateData = {
"fk_pd_id":this.data.pd_id,
"schedule_time":myFormattedDate,
"app_client":"3",
}
this._pd.updateSchedule(updateData).subscribe(
result => {
if (result.status == 200) {
this.notifier.notify('success', 'PD Scheduled.!');
this.dialogRef.close();
}
else {
this.notifier.notify('warning', 'Something Went Wrong Try Again.!');
this.errorMessage = "Something Went Wrong Try Again.!";
}
}, error => {
this.notifier.notify('error', 'Something Went Wrong Try Again.! \t\"' + (error.error_type == 2 ? error.error_status + ' ( ' + error.error_text + ' ) ' : ' ( ' + error.error_text + ' ) ') +'\" Error Occur.!');
this.errorMessage = "Some Thing Went Wrong Try Again.!";
this.dialogRef.close();
});
}
ngOnDestroy(): void {
clearInterval(this.validateTime);
}
}

View File

@ -154,15 +154,16 @@
{{master.pd_status==pdStatusCheck.QC_COMPLETED ? 'QC Completed' : master.pd_status==pdStatusCheck.ADD_ON_PENDING ? 'Completed' : master.pd_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>
<button 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><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> -->
<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><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>
</div>
</div>
</div>
<div fxLayout="row nowrap">
<div fxFlex="100">
<div fxFlex="40" align="left" style="color: #e00201">
<div *ngIf="master.pd_allocated_to && master.fk_pd_type==1">
<div *ngIf="master.pd_allocated_to">
{{master.pd_allocated_to | titlecase}}
</div>
<div *ngIf="master.executive_name && master.centralofficer && master.fk_pd_type==2">
@ -194,8 +195,8 @@
{{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}}
</div>
<div fxFlex="60" align="right">
<span *ngIf="VendorRoleID == 21"><button 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="VendorRoleID == 21"><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><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> -->
</div>
</div>

View File

@ -5,11 +5,10 @@ import { MatDialog } from '@angular/material';
import { DatePipe } from '@angular/common';
import { NotifierService } from 'angular-notifier';
import { PdTrigerService } from '../../../pd-service/pd-triger.service';
// import { PdAllocationComponent } from '../pd-allocation/pd-allocation.component';
import { PdAllocationComponent } from '../pd-allocation/pd-allocation.component';
import { SmartPdAllocationComponent } from '../smart-pd-allocation/smart-pd-allocation.component';
import { TelePdAllocationComponent } from './../tele-pd-allocation/tele-pd-allocation.component';
import { ListPdComponent } from '../list-pd.component';
// import { SchedulePdComponent } from '../schedule-pd/schedule-pd.component';
import { ListPdComponent } from '../list-pd.component';
import { EditPdApplicantComponent } from '../edit-pd-applicant/edit-pd-applicant.component';
import { EditPdMasterComponent } from '../edit-pd-master/edit-pd-master.component';
import { PdRequirementComponent } from '../pd-requirement/pd-requirement.component';
@ -18,6 +17,7 @@ import { InitiateAdditionalPdComponent } from './../initiate-additional-pd/initi
/**sweet alert */
import Swal from 'sweetalert2';
import { SchedulePdComponent } from '../schedule-pd/schedule-pd.component';
@Component({
selector: 'app-view-pd',
@ -286,10 +286,72 @@ export class ViewPdComponent implements OnInit, OnDestroy {
this.viewPdDetails(this.viewID)
});
}
// pd allocation to
// pd schedule details
scheduleDetails(pdData: any,childData: any) {
pdData.pd_id = childData.assigned_pd;
const dialogSchedule = this.dialog.open(SchedulePdComponent, {
data: pdData,
disableClose: true
});
dialogSchedule.afterClosed()
.subscribe(dataresult => {
// this.notifier.notify('success', 'Successfully allocated.!');
this.viewPdDetails(this.viewID)
});
}
// pd allocation to
pdAllocationTo(pdData: any,childData: any) {
pdData.pd_id = childData.assigned_pd;
if (pdData.fk_pd_type == 1 || pdData.fk_pd_type == 3 || pdData.fk_pd_type == 2) {
const dialogRef = this.dialog.open(PdAllocationComponent, {
data: pdData,
position: { right: '0' },
width: '80%',
disableClose: true
});
dialogRef.afterClosed()
.subscribe(dataresult => {
// this.notifier.notify('success', 'Successfully allocated.!');
this.viewPdDetails(this.viewID)
});
}
// else if (pdData.fk_pd_type == 2) {
// const dialogRef = this.dialog.open(SmartPdAllocationComponent, {
// data: pdData,
// position: { right: '0' },
// width: '80%',
// disableClose: true
// });
// dialogRef.afterClosed()
// .subscribe(dataresult => {
// // this.notifier.notify('success', 'Successfully allocated.!');
// this.viewPdDetails(this.viewID)
// });
// }
// Tele pd treated as full pd in allocation process
// else if (pdData.fk_pd_type == 3) {
// const dialogRef = this.dialog.open(TelePdAllocationComponent, {
// data: pdData,
// position: { right: '0' },
// width: '80%',
// disableClose: true,
// });
// dialogRef.afterClosed()
// .subscribe(dataresult => {
// // this.notifier.notify('success', 'Successfully allocated.!');
// this.viewPdDetails(this.viewID,this.masterRandomString)
// });
// }
}
// start pd

View File

@ -39,11 +39,11 @@ import {ManagePdComponent} from './manage-pd.component';
import {MapPdViewComponent} from './list-pd/map-pd-view/map-pd-view.component';
import {AddPdComponent} from '../manage-pd/list-pd/add-pd/add-pd.component';
import {ViewPdComponent} from '../manage-pd/list-pd/view-pd/view-pd.component';
// import {PdAllocationComponent} from '../manage-pd/list-pd/pd-allocation/pd-allocation.component';
import {PdAllocationComponent} from '../manage-pd/list-pd/pd-allocation/pd-allocation.component';
import {SmartPdAllocationComponent} from './list-pd/smart-pd-allocation/smart-pd-allocation.component';
import {PdTrigerService} from '../pd-service/pd-triger.service';
import {GetGeometricLocationService} from '../location-service/get-geometric-location.service';
// 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 {EditPdMasterComponent} from './list-pd/edit-pd-master/edit-pd-master.component';
// import {StartPdComponent} from './list-pd/start-pd/start-pd.component';
@ -169,7 +169,7 @@ const pdCustomNotifierOptions: NotifierOptions = {
};
@NgModule({
declarations: [TelePdAllocationComponent, ListPdComponent, ManagePdComponent, MapPdViewComponent, AddPdComponent, ViewPdComponent, SmartPdAllocationComponent, EditPdApplicantComponent, EditPdMasterComponent, InprogressPdComponent, AllPdComponent, ScheduledPdComponent, CompletedPdComponent, QcCompletedPdComponent, PdReportComponent, PdRequirementComponent, ModelEditPdReportComponent, DialogChangeCurrentVenrsion, QcReviewComponent, SearchRelationPipe, RupeeCurrencyFormatPipe, NumberToWordsPipe, DeleteRecordsCountPipe, PdLocatedMapViewDirective, ViewLocationComponent, GetAnswerableFormsPipe,PdStatusChangeDialogueComponent,InitiateAdditionalPdComponent],
declarations: [SchedulePdComponent,PdAllocationComponent,TelePdAllocationComponent, ListPdComponent, ManagePdComponent, MapPdViewComponent, AddPdComponent, ViewPdComponent, SmartPdAllocationComponent, EditPdApplicantComponent, EditPdMasterComponent, InprogressPdComponent, AllPdComponent, ScheduledPdComponent, CompletedPdComponent, QcCompletedPdComponent, PdReportComponent, PdRequirementComponent, ModelEditPdReportComponent, DialogChangeCurrentVenrsion, QcReviewComponent, SearchRelationPipe, RupeeCurrencyFormatPipe, NumberToWordsPipe, DeleteRecordsCountPipe, PdLocatedMapViewDirective, ViewLocationComponent, GetAnswerableFormsPipe,PdStatusChangeDialogueComponent,InitiateAdditionalPdComponent],
imports: [
CommonModule,
ManagePdRoutingModule,
@ -204,12 +204,12 @@ const pdCustomNotifierOptions: NotifierOptions = {
AngularSplitModule.forRoot()
],
exports: [PdLocatedMapViewDirective, SmartPdAllocationComponent, TelePdAllocationComponent ,EditPdApplicantComponent, EditPdMasterComponent, CompletedPdComponent, QcCompletedPdComponent, PdRequirementComponent, ViewLocationComponent,PdStatusChangeDialogueComponent,InitiateAdditionalPdComponent],
exports: [SchedulePdComponent,PdAllocationComponent,PdLocatedMapViewDirective, SmartPdAllocationComponent, TelePdAllocationComponent ,EditPdApplicantComponent, EditPdMasterComponent, CompletedPdComponent, QcCompletedPdComponent, PdRequirementComponent, ViewLocationComponent,PdStatusChangeDialogueComponent,InitiateAdditionalPdComponent],
providers: [PdTrigerService, GetGeometricLocationService,{provide: MAT_DATE_LOCALE, useValue: 'en-GB'},
{provide: DateAdapter, useClass: MomentDateAdapter, deps: [MAT_DATE_LOCALE]},
{provide: MAT_DATE_FORMATS, useValue: MAT_MOMENT_DATE_FORMATS}, PdLocatedMapViewDirective],
entryComponents: [SmartPdAllocationComponent, EditPdApplicantComponent, EditPdMasterComponent, TelePdAllocationComponent, PdRequirementComponent, ModelEditPdReportComponent, DialogChangeCurrentVenrsion, QcReviewComponent, ViewLocationComponent,PdStatusChangeDialogueComponent,InitiateAdditionalPdComponent],
entryComponents: [SchedulePdComponent,PdAllocationComponent,SmartPdAllocationComponent, EditPdApplicantComponent, EditPdMasterComponent, TelePdAllocationComponent, PdRequirementComponent, ModelEditPdReportComponent, DialogChangeCurrentVenrsion, QcReviewComponent, ViewLocationComponent,PdStatusChangeDialogueComponent,InitiateAdditionalPdComponent],
})
export class ManagePdModule {
}

View File

View File

@ -269,8 +269,9 @@ export class PdTrigerService {
}
// get pd allocation to details
getPdOfficerList(pdID: string): Observable<any> {
return this._http.post<any>(this.apiUrl + "getListPDOfficers", { "pdid": pdID })
getPdOfficerList(LocalSetEntity): Observable<any> {
console.log('vendor id',LocalSetEntity);
return this._http.get<any>(this.apiUrl + 'getListVendorPDOfficers/'+LocalSetEntity)
.pipe(
catchError(this.handleError('operation', []))
)
@ -280,21 +281,21 @@ export class PdTrigerService {
updatePdOfficer(updateData: any): Observable<any> {
updateData.fk_updatedby = this._aws.getlocale();
// updateData.updatedon = currentdate;
return this._http.post<any>(this.apiUrl + "allocatePD", { "records": updateData })
return this._http.post<any>(this.apiUrl + "updateVendorStatus", { "records": updateData })
.pipe(
catchError(this.handleError('operation', []))
)
}
// update pd schedule
// updateSchedule(updateData: any): Observable<any> {
// updateData.fk_scheduled_by = this._aws.getlocale();
// // updateData.createdon = currentdate;
// return this._http.post<any>(this.apiUrl + "schdulePD", { "records": updateData })
// .pipe(
// catchError(this.handleError('operation', []))
// )
// }
updateSchedule(updateData: any): Observable<any> {
updateData.fk_scheduled_by = this._aws.getlocale();
// updateData.createdon = currentdate;
return this._http.post<any>(this.apiUrl + "schdulePD", { "records": updateData })
.pipe(
catchError(this.handleError('operation', []))
)
}
//load pd template details
loadPDTemplates(pdId: string): Observable<any> {

0
ng6-seed/src/app/reports/pd-mis/pd-mis.component.html Normal file → Executable file
View File

0
ng6-seed/src/app/reports/pd-mis/pd-mis.component.scss Normal file → Executable file
View File

View File

0
ng6-seed/src/app/reports/pd-mis/pd-mis.component.ts Normal file → Executable file
View File

0
ng6-seed/src/app/reports/reports-routing.module.ts Normal file → Executable file
View File

0
ng6-seed/src/app/reports/reports.module.spec.ts Normal file → Executable file
View File

0
ng6-seed/src/app/reports/reports.module.ts Normal file → Executable file
View File

0
ng6-seed/src/app/reports/reports.service.spec.ts Normal file → Executable file
View File

0
ng6-seed/src/app/reports/reports.service.ts Normal file → Executable file
View File

View File

View File

View File

0
ng6-seed/src/app/sales-pd/sales-pd.component.html Normal file → Executable file
View File

0
ng6-seed/src/app/sales-pd/sales-pd.component.scss Normal file → Executable file
View File

0
ng6-seed/src/app/sales-pd/sales-pd.component.spec.ts Normal file → Executable file
View File

0
ng6-seed/src/app/sales-pd/sales-pd.component.ts Normal file → Executable file
View File

0
ng6-seed/src/app/sales-pd/sales-pd.service.spec.ts Normal file → Executable file
View File

0
ng6-seed/src/app/sales-pd/sales-pd.service.ts Normal file → Executable file
View File

View File

View File

View File

0
ng6-seed/src/assets/.gitkeep Normal file → Executable file
View File

0
ng6-seed/src/assets/cropper/cropper.css Normal file → Executable file
View File

0
ng6-seed/src/assets/cropper/cropper.js Normal file → Executable file
View File

View File

View File

Before

Width:  |  Height:  |  Size: 106 KiB

After

Width:  |  Height:  |  Size: 106 KiB

View File

View File

0
ng6-seed/src/assets/glyphicons/glyphicons.css Normal file → Executable file
View File

0
ng6-seed/src/assets/i18n/en.json Normal file → Executable file
View File

0
ng6-seed/src/assets/i18n/fr.json Normal file → Executable file
View File

0
ng6-seed/src/assets/images/1.jpg Normal file → Executable file
View File

Before

Width:  |  Height:  |  Size: 78 KiB

After

Width:  |  Height:  |  Size: 78 KiB

0
ng6-seed/src/assets/images/2.jpg Normal file → Executable file
View File

Before

Width:  |  Height:  |  Size: 102 KiB

After

Width:  |  Height:  |  Size: 102 KiB

0
ng6-seed/src/assets/images/3.jpg Normal file → Executable file
View File

Before

Width:  |  Height:  |  Size: 58 KiB

After

Width:  |  Height:  |  Size: 58 KiB

0
ng6-seed/src/assets/images/4.jpg Normal file → Executable file
View File

Before

Width:  |  Height:  |  Size: 70 KiB

After

Width:  |  Height:  |  Size: 70 KiB

0
ng6-seed/src/assets/images/PD.jpeg Normal file → Executable file
View File

Before

Width:  |  Height:  |  Size: 40 KiB

After

Width:  |  Height:  |  Size: 40 KiB

0
ng6-seed/src/assets/images/about.jpg Normal file → Executable file
View File

Before

Width:  |  Height:  |  Size: 137 KiB

After

Width:  |  Height:  |  Size: 137 KiB

0
ng6-seed/src/assets/images/avatar.jpg Normal file → Executable file
View File

Before

Width:  |  Height:  |  Size: 8.2 KiB

After

Width:  |  Height:  |  Size: 8.2 KiB

0
ng6-seed/src/assets/images/bg-1.jpg Normal file → Executable file
View File

Before

Width:  |  Height:  |  Size: 23 KiB

After

Width:  |  Height:  |  Size: 23 KiB

0
ng6-seed/src/assets/images/bg-2.jpg Normal file → Executable file
View File

Before

Width:  |  Height:  |  Size: 20 KiB

After

Width:  |  Height:  |  Size: 20 KiB

0
ng6-seed/src/assets/images/bg-3.jpg Normal file → Executable file
View File

Before

Width:  |  Height:  |  Size: 26 KiB

After

Width:  |  Height:  |  Size: 26 KiB

0
ng6-seed/src/assets/images/bg-4.jpg Normal file → Executable file
View File

Before

Width:  |  Height:  |  Size: 40 KiB

After

Width:  |  Height:  |  Size: 40 KiB

0
ng6-seed/src/assets/images/bg-5.jpg Normal file → Executable file
View File

Before

Width:  |  Height:  |  Size: 62 KiB

After

Width:  |  Height:  |  Size: 62 KiB

0
ng6-seed/src/assets/images/blog-1.jpg Normal file → Executable file
View File

Before

Width:  |  Height:  |  Size: 134 KiB

After

Width:  |  Height:  |  Size: 134 KiB

0
ng6-seed/src/assets/images/blog-2.jpg Normal file → Executable file
View File

Before

Width:  |  Height:  |  Size: 323 KiB

After

Width:  |  Height:  |  Size: 323 KiB

0
ng6-seed/src/assets/images/contact.jpg Normal file → Executable file
View File

Before

Width:  |  Height:  |  Size: 714 KiB

After

Width:  |  Height:  |  Size: 714 KiB

0
ng6-seed/src/assets/images/coridoor.jpg Normal file → Executable file
View File

Before

Width:  |  Height:  |  Size: 194 KiB

After

Width:  |  Height:  |  Size: 194 KiB

0
ng6-seed/src/assets/images/curve.jpg Normal file → Executable file
View File

Before

Width:  |  Height:  |  Size: 257 KiB

After

Width:  |  Height:  |  Size: 257 KiB

Some files were not shown because too many files have changed in this diff Show More