Merge branch 'master' of https://bitbucket.org/sriramv18/sparqsineedge
This commit is contained in:
commit
98b6ebd82a
@ -0,0 +1,12 @@
|
|||||||
|
<h2 mat-dialog-title>{{dialoge_title_content}}</h2>
|
||||||
|
<mat-dialog-content>
|
||||||
|
<div fxFlex="100" align="center">
|
||||||
|
<p>
|
||||||
|
{{dialoge_content}}
|
||||||
|
</p>
|
||||||
|
</div>
|
||||||
|
</mat-dialog-content>
|
||||||
|
<mat-dialog-actions align="end">
|
||||||
|
<button mat-raised-button color="primary" (click)="changePDStatus()"><strong>Yes</strong></button>
|
||||||
|
<button mat-raised-button mat-dialog-close><strong>No</strong></button>
|
||||||
|
</mat-dialog-actions>
|
||||||
@ -0,0 +1,25 @@
|
|||||||
|
import { async, ComponentFixture, TestBed } from '@angular/core/testing';
|
||||||
|
|
||||||
|
import { PdStatusChangeDialogueComponent } from './pd-status-change-dialogue.component';
|
||||||
|
|
||||||
|
describe('PdStatusChangeDialogueComponent', () => {
|
||||||
|
let component: PdStatusChangeDialogueComponent;
|
||||||
|
let fixture: ComponentFixture<PdStatusChangeDialogueComponent>;
|
||||||
|
|
||||||
|
beforeEach(async(() => {
|
||||||
|
TestBed.configureTestingModule({
|
||||||
|
declarations: [ PdStatusChangeDialogueComponent ]
|
||||||
|
})
|
||||||
|
.compileComponents();
|
||||||
|
}));
|
||||||
|
|
||||||
|
beforeEach(() => {
|
||||||
|
fixture = TestBed.createComponent(PdStatusChangeDialogueComponent);
|
||||||
|
component = fixture.componentInstance;
|
||||||
|
fixture.detectChanges();
|
||||||
|
});
|
||||||
|
|
||||||
|
it('should create', () => {
|
||||||
|
expect(component).toBeTruthy();
|
||||||
|
});
|
||||||
|
});
|
||||||
@ -0,0 +1,46 @@
|
|||||||
|
import { Component, OnInit, ViewChild , Input, Inject} from '@angular/core';
|
||||||
|
import { NotifierService } from "angular-notifier";
|
||||||
|
import {MatDialog,MatDialogRef,MAT_DIALOG_DATA } from '@angular/material';
|
||||||
|
import { PdTrigerService } from '../../../pd-service/pd-triger.service';
|
||||||
|
|
||||||
|
@Component({
|
||||||
|
selector: 'app-pd-status-change-dialogue',
|
||||||
|
templateUrl: './pd-status-change-dialogue.component.html',
|
||||||
|
styleUrls: ['./pd-status-change-dialogue.component.scss']
|
||||||
|
})
|
||||||
|
export class PdStatusChangeDialogueComponent implements OnInit {
|
||||||
|
|
||||||
|
conformation: Boolean = false;
|
||||||
|
private notifier: NotifierService;
|
||||||
|
dialoge_title_content: string;
|
||||||
|
dialoge_content: string;
|
||||||
|
|
||||||
|
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 Discussions' : this.data.pd_status=='COMPLETED' ? 'Complete Discussions' : 'Change Discussions';
|
||||||
|
this.dialoge_content =this.data.pd_status=='INPROGRESS' ? 'Are you starting the Discussions ?' : this.data.pd_status=='COMPLETED' ? 'Please confirm you are completing the Discussions and forwarding for Quality Check ?' : 'Change Discussions';
|
||||||
|
}
|
||||||
|
|
||||||
|
ngOnInit() {
|
||||||
|
}
|
||||||
|
changePDStatus(): void {
|
||||||
|
let update_status = {
|
||||||
|
"pd_id":this.data.pdid,
|
||||||
|
};
|
||||||
|
this.pd.editPdMasterDetails(update_status, this.data.pd_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');
|
||||||
|
}
|
||||||
|
else {
|
||||||
|
this.dialogRef.close({update_status:false});
|
||||||
|
this.notifier.notify('warning', 'Something Wents Wrong Try Again.!');
|
||||||
|
}
|
||||||
|
}, error => {
|
||||||
|
this.dialogRef.close({update_status:false});
|
||||||
|
this.notifier.notify('warning', 'Something Wents Wrong Try Again.!');
|
||||||
|
});
|
||||||
|
}
|
||||||
|
|
||||||
|
}
|
||||||
@ -30,7 +30,7 @@
|
|||||||
</div>
|
</div>
|
||||||
</mat-card-content>
|
</mat-card-content>
|
||||||
<mat-card-actions align="end">
|
<mat-card-actions align="end">
|
||||||
<button matTooltip="Complete Question" matTooltipPosition="above" [disabled]="actualQuestions==0 || actualQuestions!=answeredQuestions || currentPDStatus===false" mat-raised-button color="primary" (click)="changePDStatus(pdStatusCheck.COMPLETED);"><span>{{currentPDStatus === true ? 'COMPLETE':'COMPLETED' }}</span></button>
|
<button matTooltip="Complete Question" matTooltipPosition="above" [disabled]="actualQuestions==0 || actualQuestions!=answeredQuestions || currentPDStatus===false" mat-raised-button color="primary" (click)="pdStatusDialogue(pdStatusCheck.COMPLETED);"><span>{{currentPDStatus === true ? 'COMPLETE':'COMPLETED' }}</span></button>
|
||||||
</mat-card-actions>
|
</mat-card-actions>
|
||||||
</mat-card>
|
</mat-card>
|
||||||
<notifier-container></notifier-container>
|
<notifier-container></notifier-container>
|
||||||
|
|||||||
@ -28,7 +28,7 @@ import {NeighbourHoodComponent} from './forms/neighbour-hood/neighbour-hood.comp
|
|||||||
import {FinalRemarksComponent} from './forms/final-remarks/final-remarks.component';
|
import {FinalRemarksComponent} from './forms/final-remarks/final-remarks.component';
|
||||||
import { BusinessInfoGroupComponent } from './forms/business-info-group/business-info-group.component';
|
import { BusinessInfoGroupComponent } from './forms/business-info-group/business-info-group.component';
|
||||||
import { BusinessAssetsInfoComponent } from './forms/business-assets-info/business-assets-info.component';
|
import { BusinessAssetsInfoComponent } from './forms/business-assets-info/business-assets-info.component';
|
||||||
|
import { PdStatusChangeDialogueComponent } from './../pd-status-change-dialogue/pd-status-change-dialogue.component';
|
||||||
@Component({
|
@Component({
|
||||||
selector: 'app-start-pd',
|
selector: 'app-start-pd',
|
||||||
templateUrl: './start-pd.component.html',
|
templateUrl: './start-pd.component.html',
|
||||||
@ -83,13 +83,8 @@ export class StartPdComponent implements OnInit, OnDestroy {
|
|||||||
// Ps.initialize(elemSidebar, { wheelSpeed: 2, suppressScrollX: true });
|
// Ps.initialize(elemSidebar, { wheelSpeed: 2, suppressScrollX: true });
|
||||||
// Ps.initialize(elemContent, { wheelSpeed: 2, suppressScrollX: true });
|
// Ps.initialize(elemContent, { wheelSpeed: 2, suppressScrollX: true });
|
||||||
}
|
}
|
||||||
|
this.loadTemplates(this.startPD,1);
|
||||||
this.loadTemplates(this.startPD);
|
|
||||||
}
|
}
|
||||||
// start
|
|
||||||
|
|
||||||
|
|
||||||
// end
|
|
||||||
|
|
||||||
isMac(): boolean {
|
isMac(): boolean {
|
||||||
let bool = false;
|
let bool = false;
|
||||||
@ -103,7 +98,9 @@ export class StartPdComponent implements OnInit, OnDestroy {
|
|||||||
return window.matchMedia(`(max-width: 960px)`).matches;
|
return window.matchMedia(`(max-width: 960px)`).matches;
|
||||||
}
|
}
|
||||||
|
|
||||||
loadTemplates(startID:string){
|
|
||||||
|
// load templates details
|
||||||
|
loadTemplates(startID:string,type:number){
|
||||||
this._pd.loadPDTemplates(startID).subscribe(
|
this._pd.loadPDTemplates(startID).subscribe(
|
||||||
data => {
|
data => {
|
||||||
if (data.status == 200) {
|
if (data.status == 200) {
|
||||||
@ -117,9 +114,10 @@ export class StartPdComponent implements OnInit, OnDestroy {
|
|||||||
this.actualQuestions = this.categoryFormButtons.length;
|
this.actualQuestions = this.categoryFormButtons.length;
|
||||||
let getAnsweredFormsCount = this.categoryFormButtons.filter(item=>item.isAnswered===true);
|
let getAnsweredFormsCount = this.categoryFormButtons.filter(item=>item.isAnswered===true);
|
||||||
this.answeredQuestions = getAnsweredFormsCount.length;
|
this.answeredQuestions = getAnsweredFormsCount.length;
|
||||||
this.pdFullDetails = data.records
|
this.pdFullDetails = data.records;
|
||||||
|
if(type==1 && data.records.pdmaster_details.pd_status=='SCHEDULED') {
|
||||||
|
this.pdStatusDialogue(this.pdStatusCheck.INPROGRESS)
|
||||||
|
}
|
||||||
}
|
}
|
||||||
else{
|
else{
|
||||||
this.pdMasterList = "";
|
this.pdMasterList = "";
|
||||||
@ -132,26 +130,22 @@ export class StartPdComponent implements OnInit, OnDestroy {
|
|||||||
});
|
});
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// load pd status change dialogue
|
||||||
|
pdStatusDialogue(status: string): void {
|
||||||
//change pd status
|
const dialogRef = this.dialog.open(PdStatusChangeDialogueComponent, {
|
||||||
changePDStatus(status: string) {
|
data: { pdid: this.startPD, pd_status: status },
|
||||||
|
disableClose: true,
|
||||||
let update_array = {
|
minWidth:'30%',
|
||||||
"pd_id": this.startPD
|
maxWidth:'40%',
|
||||||
}
|
});
|
||||||
this._pd.editPdMasterDetails(update_array, status).subscribe(result => {
|
dialogRef.afterClosed()
|
||||||
if (result.status == 200) {
|
.subscribe(dataresult => {
|
||||||
this.currentPDStatus = false;
|
if(dataresult.update_status==true){
|
||||||
this.notifier.notify('success', 'PD Completed.');
|
this.loadTemplates(this.startPD,2);
|
||||||
}
|
}
|
||||||
else {
|
|
||||||
this.notifier.notify('warning', 'Something Wents Wrong Try Again.!');
|
|
||||||
}
|
|
||||||
}, error => {
|
|
||||||
this.notifier.notify('warning', 'Something Wents Wrong Try Again.!');
|
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
|
|
||||||
// start
|
// start
|
||||||
// direct form based questions
|
// direct form based questions
|
||||||
OnSelectDirectForms(details: any) {
|
OnSelectDirectForms(details: any) {
|
||||||
@ -168,7 +162,7 @@ export class StartPdComponent implements OnInit, OnDestroy {
|
|||||||
dialogRef.afterClosed()
|
dialogRef.afterClosed()
|
||||||
.subscribe(dataresult => {
|
.subscribe(dataresult => {
|
||||||
// this.notifier.notify('success', 'Successfully allocated.!');
|
// this.notifier.notify('success', 'Successfully allocated.!');
|
||||||
this.loadTemplates(this.startPD);
|
this.loadTemplates(this.startPD,2);
|
||||||
});
|
});
|
||||||
}else
|
}else
|
||||||
if(this.selectedFormsCategory.form_id==2){
|
if(this.selectedFormsCategory.form_id==2){
|
||||||
@ -181,7 +175,7 @@ export class StartPdComponent implements OnInit, OnDestroy {
|
|||||||
dialogRef.afterClosed()
|
dialogRef.afterClosed()
|
||||||
.subscribe(dataresult => {
|
.subscribe(dataresult => {
|
||||||
// this.notifier.notify('success', 'Successfully allocated.!');
|
// this.notifier.notify('success', 'Successfully allocated.!');
|
||||||
this.loadTemplates(this.startPD);
|
this.loadTemplates(this.startPD,2);
|
||||||
});
|
});
|
||||||
}else
|
}else
|
||||||
if(this.selectedFormsCategory.form_id==3){
|
if(this.selectedFormsCategory.form_id==3){
|
||||||
@ -194,7 +188,7 @@ export class StartPdComponent implements OnInit, OnDestroy {
|
|||||||
dialogRef.afterClosed()
|
dialogRef.afterClosed()
|
||||||
.subscribe(dataresult => {
|
.subscribe(dataresult => {
|
||||||
// this.notifier.notify('success', 'Successfully allocated.!');
|
// this.notifier.notify('success', 'Successfully allocated.!');
|
||||||
this.loadTemplates(this.startPD);
|
this.loadTemplates(this.startPD,2);
|
||||||
});
|
});
|
||||||
}else
|
}else
|
||||||
if(this.selectedFormsCategory.form_id==4){
|
if(this.selectedFormsCategory.form_id==4){
|
||||||
@ -207,7 +201,7 @@ export class StartPdComponent implements OnInit, OnDestroy {
|
|||||||
dialogRef.afterClosed()
|
dialogRef.afterClosed()
|
||||||
.subscribe(dataresult => {
|
.subscribe(dataresult => {
|
||||||
// this.notifier.notify('success', 'Successfully allocated.!');
|
// this.notifier.notify('success', 'Successfully allocated.!');
|
||||||
this.loadTemplates(this.startPD);
|
this.loadTemplates(this.startPD,2);
|
||||||
});
|
});
|
||||||
}else
|
}else
|
||||||
if(this.selectedFormsCategory.form_id==5){
|
if(this.selectedFormsCategory.form_id==5){
|
||||||
@ -220,7 +214,7 @@ export class StartPdComponent implements OnInit, OnDestroy {
|
|||||||
dialogRef.afterClosed()
|
dialogRef.afterClosed()
|
||||||
.subscribe(dataresult => {
|
.subscribe(dataresult => {
|
||||||
// this.notifier.notify('success', 'Successfully allocated.!');
|
// this.notifier.notify('success', 'Successfully allocated.!');
|
||||||
this.loadTemplates(this.startPD);
|
this.loadTemplates(this.startPD,2);
|
||||||
});
|
});
|
||||||
}else
|
}else
|
||||||
if(this.selectedFormsCategory.form_id==6){
|
if(this.selectedFormsCategory.form_id==6){
|
||||||
@ -233,7 +227,7 @@ export class StartPdComponent implements OnInit, OnDestroy {
|
|||||||
dialogRef.afterClosed()
|
dialogRef.afterClosed()
|
||||||
.subscribe(dataresult => {
|
.subscribe(dataresult => {
|
||||||
// this.notifier.notify('success', 'Successfully allocated.!');
|
// this.notifier.notify('success', 'Successfully allocated.!');
|
||||||
this.loadTemplates(this.startPD);
|
this.loadTemplates(this.startPD,2);
|
||||||
});
|
});
|
||||||
}else
|
}else
|
||||||
if(this.selectedFormsCategory.form_id==7){
|
if(this.selectedFormsCategory.form_id==7){
|
||||||
@ -246,7 +240,7 @@ export class StartPdComponent implements OnInit, OnDestroy {
|
|||||||
dialogRef.afterClosed()
|
dialogRef.afterClosed()
|
||||||
.subscribe(dataresult => {
|
.subscribe(dataresult => {
|
||||||
// this.notifier.notify('success', 'Successfully allocated.!');
|
// this.notifier.notify('success', 'Successfully allocated.!');
|
||||||
this.loadTemplates(this.startPD);
|
this.loadTemplates(this.startPD,2);
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
@ -260,7 +254,7 @@ export class StartPdComponent implements OnInit, OnDestroy {
|
|||||||
dialogRef.afterClosed()
|
dialogRef.afterClosed()
|
||||||
.subscribe(dataresult => {
|
.subscribe(dataresult => {
|
||||||
// this.notifier.notify('success', 'Successfully allocated.!');
|
// this.notifier.notify('success', 'Successfully allocated.!');
|
||||||
this.loadTemplates(this.startPD);
|
this.loadTemplates(this.startPD,2);
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
@ -274,7 +268,7 @@ export class StartPdComponent implements OnInit, OnDestroy {
|
|||||||
dialogRef.afterClosed()
|
dialogRef.afterClosed()
|
||||||
.subscribe(dataresult => {
|
.subscribe(dataresult => {
|
||||||
// this.notifier.notify('success', 'Successfully allocated.!');
|
// this.notifier.notify('success', 'Successfully allocated.!');
|
||||||
this.loadTemplates(this.startPD);
|
this.loadTemplates(this.startPD,2);
|
||||||
});
|
});
|
||||||
}else
|
}else
|
||||||
if(this.selectedFormsCategory.form_id==10){
|
if(this.selectedFormsCategory.form_id==10){
|
||||||
@ -287,7 +281,7 @@ export class StartPdComponent implements OnInit, OnDestroy {
|
|||||||
dialogRef.afterClosed()
|
dialogRef.afterClosed()
|
||||||
.subscribe(dataresult => {
|
.subscribe(dataresult => {
|
||||||
// this.notifier.notify('success', 'Successfully allocated.!');
|
// this.notifier.notify('success', 'Successfully allocated.!');
|
||||||
this.loadTemplates(this.startPD);
|
this.loadTemplates(this.startPD,2);
|
||||||
});
|
});
|
||||||
}else
|
}else
|
||||||
if(this.selectedFormsCategory.form_id==11){
|
if(this.selectedFormsCategory.form_id==11){
|
||||||
@ -300,7 +294,7 @@ export class StartPdComponent implements OnInit, OnDestroy {
|
|||||||
dialogRef.afterClosed()
|
dialogRef.afterClosed()
|
||||||
.subscribe(dataresult => {
|
.subscribe(dataresult => {
|
||||||
// this.notifier.notify('success', 'Successfully allocated.!');
|
// this.notifier.notify('success', 'Successfully allocated.!');
|
||||||
this.loadTemplates(this.startPD);
|
this.loadTemplates(this.startPD,2);
|
||||||
});
|
});
|
||||||
}else
|
}else
|
||||||
if(this.selectedFormsCategory.form_id==12){
|
if(this.selectedFormsCategory.form_id==12){
|
||||||
@ -313,7 +307,7 @@ export class StartPdComponent implements OnInit, OnDestroy {
|
|||||||
dialogRef.afterClosed()
|
dialogRef.afterClosed()
|
||||||
.subscribe(dataresult => {
|
.subscribe(dataresult => {
|
||||||
// this.notifier.notify('success', 'Successfully allocated.!');
|
// this.notifier.notify('success', 'Successfully allocated.!');
|
||||||
this.loadTemplates(this.startPD);
|
this.loadTemplates(this.startPD,2);
|
||||||
});
|
});
|
||||||
}else
|
}else
|
||||||
if(this.selectedFormsCategory.form_id==13){
|
if(this.selectedFormsCategory.form_id==13){
|
||||||
@ -326,7 +320,7 @@ export class StartPdComponent implements OnInit, OnDestroy {
|
|||||||
dialogRef.afterClosed()
|
dialogRef.afterClosed()
|
||||||
.subscribe(dataresult => {
|
.subscribe(dataresult => {
|
||||||
// this.notifier.notify('success', 'Successfully allocated.!');
|
// this.notifier.notify('success', 'Successfully allocated.!');
|
||||||
this.loadTemplates(this.startPD);
|
this.loadTemplates(this.startPD,2);
|
||||||
});
|
});
|
||||||
}else
|
}else
|
||||||
if(this.selectedFormsCategory.form_id==14){
|
if(this.selectedFormsCategory.form_id==14){
|
||||||
@ -339,7 +333,7 @@ export class StartPdComponent implements OnInit, OnDestroy {
|
|||||||
dialogRef.afterClosed()
|
dialogRef.afterClosed()
|
||||||
.subscribe(dataresult => {
|
.subscribe(dataresult => {
|
||||||
// this.notifier.notify('success', 'Successfully allocated.!');
|
// this.notifier.notify('success', 'Successfully allocated.!');
|
||||||
this.loadTemplates(this.startPD);
|
this.loadTemplates(this.startPD,2);
|
||||||
});
|
});
|
||||||
}else
|
}else
|
||||||
if(this.selectedFormsCategory.form_id==15){
|
if(this.selectedFormsCategory.form_id==15){
|
||||||
@ -352,7 +346,7 @@ export class StartPdComponent implements OnInit, OnDestroy {
|
|||||||
dialogRef.afterClosed()
|
dialogRef.afterClosed()
|
||||||
.subscribe(dataresult => {
|
.subscribe(dataresult => {
|
||||||
// this.notifier.notify('success', 'Successfully allocated.!');
|
// this.notifier.notify('success', 'Successfully allocated.!');
|
||||||
this.loadTemplates(this.startPD);
|
this.loadTemplates(this.startPD,2);
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
@ -366,7 +360,7 @@ export class StartPdComponent implements OnInit, OnDestroy {
|
|||||||
dialogRef.afterClosed()
|
dialogRef.afterClosed()
|
||||||
.subscribe(dataresult => {
|
.subscribe(dataresult => {
|
||||||
// this.notifier.notify('success', 'Successfully allocated.!');
|
// this.notifier.notify('success', 'Successfully allocated.!');
|
||||||
this.loadTemplates(this.startPD);
|
this.loadTemplates(this.startPD,2);
|
||||||
});
|
});
|
||||||
}else
|
}else
|
||||||
if(this.selectedFormsCategory.form_id==17){
|
if(this.selectedFormsCategory.form_id==17){
|
||||||
@ -379,7 +373,7 @@ export class StartPdComponent implements OnInit, OnDestroy {
|
|||||||
dialogRef.afterClosed()
|
dialogRef.afterClosed()
|
||||||
.subscribe(dataresult => {
|
.subscribe(dataresult => {
|
||||||
// this.notifier.notify('success', 'Successfully allocated.!');
|
// this.notifier.notify('success', 'Successfully allocated.!');
|
||||||
this.loadTemplates(this.startPD);
|
this.loadTemplates(this.startPD,2);
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
else if(this.selectedFormsCategory.form_id==18){
|
else if(this.selectedFormsCategory.form_id==18){
|
||||||
@ -392,7 +386,7 @@ export class StartPdComponent implements OnInit, OnDestroy {
|
|||||||
generaldialogRef.afterClosed()
|
generaldialogRef.afterClosed()
|
||||||
.subscribe(dataresult => {
|
.subscribe(dataresult => {
|
||||||
// this.notifier.notify('success', 'Successfully allocated.!');
|
// this.notifier.notify('success', 'Successfully allocated.!');
|
||||||
this.loadTemplates(this.startPD);
|
this.loadTemplates(this.startPD,2);
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
else if(this.selectedFormsCategory.form_id==19){
|
else if(this.selectedFormsCategory.form_id==19){
|
||||||
@ -405,7 +399,7 @@ export class StartPdComponent implements OnInit, OnDestroy {
|
|||||||
generaldialogRef.afterClosed()
|
generaldialogRef.afterClosed()
|
||||||
.subscribe(dataresult => {
|
.subscribe(dataresult => {
|
||||||
// this.notifier.notify('success', 'Successfully allocated.!');
|
// this.notifier.notify('success', 'Successfully allocated.!');
|
||||||
this.loadTemplates(this.startPD);
|
this.loadTemplates(this.startPD,2);
|
||||||
});
|
});
|
||||||
}else if(this.selectedFormsCategory.form_id==20){
|
}else if(this.selectedFormsCategory.form_id==20){
|
||||||
const generaldialogRef = this.dialog.open(FinalRemarksComponent, {
|
const generaldialogRef = this.dialog.open(FinalRemarksComponent, {
|
||||||
@ -417,7 +411,7 @@ export class StartPdComponent implements OnInit, OnDestroy {
|
|||||||
generaldialogRef.afterClosed()
|
generaldialogRef.afterClosed()
|
||||||
.subscribe(dataresult => {
|
.subscribe(dataresult => {
|
||||||
// this.notifier.notify('success', 'Successfully allocated.!');
|
// this.notifier.notify('success', 'Successfully allocated.!');
|
||||||
this.loadTemplates(this.startPD);
|
this.loadTemplates(this.startPD,2);
|
||||||
});
|
});
|
||||||
}else
|
}else
|
||||||
if(this.selectedFormsCategory.form_id==22){
|
if(this.selectedFormsCategory.form_id==22){
|
||||||
@ -430,7 +424,7 @@ export class StartPdComponent implements OnInit, OnDestroy {
|
|||||||
dialogRef.afterClosed()
|
dialogRef.afterClosed()
|
||||||
.subscribe(dataresult => {
|
.subscribe(dataresult => {
|
||||||
// this.notifier.notify('success', 'Successfully allocated.!');
|
// this.notifier.notify('success', 'Successfully allocated.!');
|
||||||
this.loadTemplates(this.startPD);
|
this.loadTemplates(this.startPD,2);
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@ -93,9 +93,9 @@
|
|||||||
</div>
|
</div>
|
||||||
<div fxLayout="row">
|
<div fxLayout="row">
|
||||||
<div fxFlex.xs="100" fxFlex.sm="100" fxFlex.md="100" fxFlex.lg="100" fxFlex.xl="100" class="profile-center">
|
<div fxFlex.xs="100" fxFlex.sm="100" fxFlex.md="100" fxFlex.lg="100" fxFlex.xl="100" class="profile-center">
|
||||||
<div fxFlex="10">
|
<div fxFlex="10" appPdLocatedMapView [value]="master">
|
||||||
<!-- <span><i class="fa-1x fa fa-map-marker" style="width: 37px;padding: 8px 9px 8px 9px;border-bottom: 2px solid red;"></i></span> -->
|
<!-- <span><i class="fa-1x fa fa-map-marker" style="width: 37px;padding: 8px 9px 8px 9px;border-bottom: 2px solid red;"></i></span> -->
|
||||||
<span><i class="fa-1x fa fa-map-marker" style="width: 37px;padding: 8px 9px 8px 9px;border-bottom: 2px solid red;" (click)="Maponclick(master)" matTooltip="Map View" matTooltipPosition="left"></i></span>
|
<span><i class="fa-1x fa fa-map-marker" style="width: 37px;padding: 8px 9px 8px 9px;border-bottom: 2px solid red;"></i></span>
|
||||||
</div>
|
</div>
|
||||||
<div fxFlex="90">
|
<div fxFlex="90">
|
||||||
<span *ngIf="master.state_name" class="hover-icon"> {{master.addressline1}},<br> {{master.city_name}},<br>{{master.state_name}}-{{master.pincode_id == 1 ? master.other_pincode : master.pincode }} </span>
|
<span *ngIf="master.state_name" class="hover-icon"> {{master.addressline1}},<br> {{master.city_name}},<br>{{master.state_name}}-{{master.pincode_id == 1 ? master.other_pincode : master.pincode }} </span>
|
||||||
|
|||||||
@ -108,6 +108,10 @@ import { ManageHouseHoldComponent } from './list-pd/start-pd/forms/assessed-inco
|
|||||||
import { ManageOtherBusinessIncomeComponent } from './list-pd/start-pd/forms/assessed-income/AI-diologue/manage-other-business-income/manage-other-business-income.component';
|
import { ManageOtherBusinessIncomeComponent } from './list-pd/start-pd/forms/assessed-income/AI-diologue/manage-other-business-income/manage-other-business-income.component';
|
||||||
import { GrossProfitCalculationComponent } from './list-pd/start-pd/forms/assessed-income/gross-profit-calculation/gross-profit-calculation.component';
|
import { GrossProfitCalculationComponent } from './list-pd/start-pd/forms/assessed-income/gross-profit-calculation/gross-profit-calculation.component';
|
||||||
import { ManageDailySalesComponent } from './list-pd/start-pd/forms/assessed-income/AI-diologue/manage-daily-sales/manage-daily-sales.component';
|
import { ManageDailySalesComponent } from './list-pd/start-pd/forms/assessed-income/AI-diologue/manage-daily-sales/manage-daily-sales.component';
|
||||||
|
import { PdStatusChangeDialogueComponent } from './list-pd/pd-status-change-dialogue/pd-status-change-dialogue.component';
|
||||||
|
import { PdLocatedMapViewDirective } from './../pd-directive/pd-located-map-view.directive';
|
||||||
|
import { ViewLocationComponent } from './../pd-directive/view-location/view-location.component';
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Custom angular notifier options
|
* Custom angular notifier options
|
||||||
*/
|
*/
|
||||||
@ -153,143 +157,8 @@ const pdCustomNotifierOptions: NotifierOptions = {
|
|||||||
};
|
};
|
||||||
|
|
||||||
@NgModule({
|
@NgModule({
|
||||||
// <<<<<<< HEAD
|
declarations: [RentalInfoComponent, TelePdAllocationComponent, FinancialInfoComponent, BusinessInfoComponent, EmploymentInfoComponent, StockComponent, BankingDetailsComponent, ListPdComponent, FamilyDetailsComponent, AddressComponent, ManagePdComponent, MapPdViewComponent, AddPdComponent, ViewPdComponent, PdAllocationComponent, SmartPdAllocationComponent, SchedulePdComponent, EditPdApplicantComponent, EditPdMasterComponent, StartPdComponent, InprogressPdComponent, AllPdComponent, ScheduledPdComponent, CompletedPdComponent, QcCompletedPdComponent, ClientInfoComponent, CurrentLoanComponent, AssetsInfoComponent, LoanDetailsComponent, OtherIncomeComponent, SupplierInfoComponent, PersonalInfoComponent, LenderRepresentativeComponent, PdReportComponent, AssessedIncomeComponent, AllocationViewMoreComponent, PdRequirementComponent, GeneralInfoComponent, ModelEditPdReportComponent, OtherApplicantDetailsComponent, NeighbourHoodComponent, DialogChangeCurrentVenrsion, FinalRemarksComponent, BusinessOtherFamilyMemberComponent, QcReviewComponent, BusinessInfoGroupComponent, SearchRelationPipe, DeleteRecordsCountPipe, BusinessAssetsInfoComponent, BusinessBankingDetailsComponent, SalesDetailsComponent, DailySalesDetailsComponent, SalesCalculationComponent, ManageSalesComponent, PurchaseDetailsComponent, BusinessExpenseDetailsComponent, HouseHoldDetailsComponent, OtherBusinessIncomeDetailsComponent, ManagePurchaseComponent, ManageBusinesExpenseComponent, ManageHouseHoldComponent, ManageOtherBusinessIncomeComponent, GrossProfitCalculationComponent, ManageDailySalesComponent, PdStatusChangeDialogueComponent, PdLocatedMapViewDirective, ViewLocationComponent],
|
||||||
// imports: [
|
imports: [
|
||||||
// CommonModule,
|
|
||||||
// ManagePdRoutingModule,
|
|
||||||
// NotifierModule.withConfig(pdCustomNotifierOptions),
|
|
||||||
// MatCardModule,
|
|
||||||
// MatIconModule,
|
|
||||||
// MatInputModule,
|
|
||||||
// MatRadioModule,
|
|
||||||
// MatTableModule,
|
|
||||||
// MatPaginatorModule,
|
|
||||||
// MatButtonModule,
|
|
||||||
// MatProgressBarModule,
|
|
||||||
// MatToolbarModule,
|
|
||||||
// FlexLayoutModule,
|
|
||||||
// NgxDatatableModule,
|
|
||||||
// FormsModule,MatSlideToggleModule,
|
|
||||||
// MatSelectModule, MatListModule,MatGridListModule, MatTabsModule, MatBadgeModule, MatCheckboxModule,MatStepperModule,MatSidenavModule ,MatMenuModule, MatButtonToggleModule,
|
|
||||||
// ReactiveFormsModule,
|
|
||||||
// FileUploadModule,
|
|
||||||
// TreeModule,
|
|
||||||
// MatDatepickerModule,
|
|
||||||
// MatDialogModule,MatSortModule,
|
|
||||||
// NgxMatSelectSearchModule,MatTooltipModule, MatExpansionModule,
|
|
||||||
// AgmCoreModule.forRoot({apiKey: 'AIzaSyBtdO5k6CRntAMJCF-H5uZjTCoSGX95cdk'}),OwlDateTimeModule,
|
|
||||||
// OwlNativeDateTimeModule,
|
|
||||||
// ],
|
|
||||||
// declarations: [RentalInfoComponent,
|
|
||||||
// TelePdAllocationComponent,
|
|
||||||
// FinancialInfoComponent,
|
|
||||||
// BusinessInfoComponent,
|
|
||||||
// EmploymentInfoComponent,
|
|
||||||
// StockComponent,
|
|
||||||
// BankingDetailsComponent,
|
|
||||||
// ListPdComponent,
|
|
||||||
// FamilyDetailsComponent,
|
|
||||||
// AddressComponent,
|
|
||||||
// ManagePdComponent,
|
|
||||||
// MapPdViewComponent,
|
|
||||||
// AddPdComponent,
|
|
||||||
// ViewPdComponent,
|
|
||||||
// PdAllocationComponent,
|
|
||||||
// SmartPdAllocationComponent,
|
|
||||||
// SchedulePdComponent,
|
|
||||||
// EditPdApplicantComponent,
|
|
||||||
// EditPdMasterComponent,
|
|
||||||
// StartPdComponent,
|
|
||||||
// InprogressPdComponent,
|
|
||||||
// AllPdComponent,
|
|
||||||
// ScheduledPdComponent,
|
|
||||||
// CompletedPdComponent,
|
|
||||||
// QcCompletedPdComponent,
|
|
||||||
// ClientInfoComponent,
|
|
||||||
// CurrentLoanComponent,
|
|
||||||
// AssetsInfoComponent,
|
|
||||||
// LoanDetailsComponent,
|
|
||||||
// OtherIncomeComponent,
|
|
||||||
// SupplierInfoComponent,
|
|
||||||
// PersonalInfoComponent,
|
|
||||||
// LenderRepresentativeComponent,
|
|
||||||
// PdReportComponent,
|
|
||||||
// AssessedIncomeComponent,
|
|
||||||
// AllocationViewMoreComponent],
|
|
||||||
|
|
||||||
// exports: [PdAllocationComponent,
|
|
||||||
// SmartPdAllocationComponent,
|
|
||||||
// TelePdAllocationComponent,
|
|
||||||
// SchedulePdComponent,
|
|
||||||
// EditPdApplicantComponent,
|
|
||||||
// EditPdMasterComponent,
|
|
||||||
// StartPdComponent,
|
|
||||||
// CompletedPdComponent,
|
|
||||||
// QcCompletedPdComponent,
|
|
||||||
// AllocationViewMoreComponent],
|
|
||||||
|
|
||||||
// providers: [PdTrigerService,
|
|
||||||
// GetGeometricLocationService],
|
|
||||||
|
|
||||||
// entryComponents: [PdAllocationComponent,
|
|
||||||
// SmartPdAllocationComponent,
|
|
||||||
// SchedulePdComponent,
|
|
||||||
// EditPdApplicantComponent,
|
|
||||||
// EditPdMasterComponent,
|
|
||||||
// TelePdAllocationComponent,
|
|
||||||
// AllocationViewMoreComponent,
|
|
||||||
|
|
||||||
// PersonalInfoComponent,
|
|
||||||
// ClientInfoComponent,
|
|
||||||
// SupplierInfoComponent,
|
|
||||||
// CurrentLoanComponent,
|
|
||||||
// LoanDetailsComponent,
|
|
||||||
// OtherIncomeComponent,
|
|
||||||
// AssetsInfoComponent,
|
|
||||||
// AddressComponent,
|
|
||||||
// FamilyDetailsComponent,
|
|
||||||
// BankingDetailsComponent,
|
|
||||||
// StockComponent,
|
|
||||||
// EmploymentInfoComponent,
|
|
||||||
// BusinessInfoComponent,
|
|
||||||
// FinancialInfoComponent,
|
|
||||||
// LenderRepresentativeComponent,
|
|
||||||
// RentalInfoComponent,
|
|
||||||
// AssessedIncomeComponent],
|
|
||||||
// =======
|
|
||||||
// imports: [
|
|
||||||
// CommonModule,
|
|
||||||
// ManagePdRoutingModule,
|
|
||||||
// NotifierModule.withConfig(pdCustomNotifierOptions),
|
|
||||||
// MatCardModule,
|
|
||||||
// MatIconModule,
|
|
||||||
// MatInputModule,
|
|
||||||
// MatRadioModule,
|
|
||||||
// MatTableModule,
|
|
||||||
// MatPaginatorModule,
|
|
||||||
// MatButtonModule,
|
|
||||||
// MatProgressBarModule,
|
|
||||||
// MatAutocompleteModule,
|
|
||||||
// MatToolbarModule,
|
|
||||||
// FlexLayoutModule,
|
|
||||||
// NgxDatatableModule,
|
|
||||||
// FormsModule,
|
|
||||||
// MatSlideToggleModule,
|
|
||||||
// MatSelectModule, MatListModule, MatGridListModule, MatTabsModule, MatBadgeModule, MatCheckboxModule, MatStepperModule, MatSidenavModule, MatMenuModule, MatButtonToggleModule,
|
|
||||||
// ReactiveFormsModule,
|
|
||||||
// FileUploadModule,
|
|
||||||
// TreeModule,
|
|
||||||
// MatDialogModule, MatSortModule,
|
|
||||||
// NgxMatSelectSearchModule, MatTooltipModule, MatExpansionModule,
|
|
||||||
// AgmCoreModule.forRoot({apiKey: 'AIzaSyBtdO5k6CRntAMJCF-H5uZjTCoSGX95cdk'}), OwlDateTimeModule,
|
|
||||||
// OwlNativeDateTimeModule,
|
|
||||||
// ],
|
|
||||||
declarations: [RentalInfoComponent, TelePdAllocationComponent, FinancialInfoComponent, BusinessInfoComponent, EmploymentInfoComponent, StockComponent, BankingDetailsComponent, ListPdComponent, FamilyDetailsComponent, AddressComponent, ManagePdComponent, MapPdViewComponent, AddPdComponent, ViewPdComponent, PdAllocationComponent, SmartPdAllocationComponent, SchedulePdComponent, EditPdApplicantComponent, EditPdMasterComponent, StartPdComponent, InprogressPdComponent, AllPdComponent, ScheduledPdComponent, CompletedPdComponent, QcCompletedPdComponent, ClientInfoComponent, CurrentLoanComponent, AssetsInfoComponent, LoanDetailsComponent, OtherIncomeComponent, SupplierInfoComponent, PersonalInfoComponent, LenderRepresentativeComponent, PdReportComponent, AssessedIncomeComponent, AllocationViewMoreComponent, PdRequirementComponent, GeneralInfoComponent, ModelEditPdReportComponent, OtherApplicantDetailsComponent, NeighbourHoodComponent, DialogChangeCurrentVenrsion, FinalRemarksComponent, BusinessOtherFamilyMemberComponent, QcReviewComponent, BusinessInfoGroupComponent, SearchRelationPipe, DeleteRecordsCountPipe, BusinessAssetsInfoComponent, BusinessBankingDetailsComponent, SalesDetailsComponent, DailySalesDetailsComponent, SalesCalculationComponent, ManageSalesComponent, PurchaseDetailsComponent, BusinessExpenseDetailsComponent, HouseHoldDetailsComponent, OtherBusinessIncomeDetailsComponent, ManagePurchaseComponent, ManageBusinesExpenseComponent, ManageHouseHoldComponent, ManageOtherBusinessIncomeComponent, GrossProfitCalculationComponent, ManageDailySalesComponent],
|
|
||||||
|
|
||||||
// exports: [PdAllocationComponent, SmartPdAllocationComponent, SchedulePdComponent, EditPdApplicantComponent, EditPdMasterComponent, StartPdComponent, CompletedPdComponent, QcCompletedPdComponent],
|
|
||||||
// providers: [PdTrigerService, GetGeometricLocationService],
|
|
||||||
// entryComponents: [PdAllocationComponent, SmartPdAllocationComponent, SchedulePdComponent, EditPdApplicantComponent, EditPdMasterComponent],
|
|
||||||
imports: [
|
|
||||||
CommonModule,
|
CommonModule,
|
||||||
ManagePdRoutingModule,
|
ManagePdRoutingModule,
|
||||||
NgxViewerModule,
|
NgxViewerModule,
|
||||||
@ -321,14 +190,13 @@ const pdCustomNotifierOptions: NotifierOptions = {
|
|||||||
AgmCoreModule.forRoot({apiKey: 'AIzaSyBtdO5k6CRntAMJCF-H5uZjTCoSGX95cdk'}),OwlDateTimeModule,
|
AgmCoreModule.forRoot({apiKey: 'AIzaSyBtdO5k6CRntAMJCF-H5uZjTCoSGX95cdk'}),OwlDateTimeModule,
|
||||||
OwlNativeDateTimeModule,
|
OwlNativeDateTimeModule,
|
||||||
],
|
],
|
||||||
// declarations: [ListPdComponent, ManagePdComponent, MapPdViewComponent, AddPdComponent, ViewPdComponent, PdAllocationComponent, SmartPdAllocationComponent, SchedulePdComponent, EditPdApplicantComponent, EditPdMasterComponent, StartPdComponent, InprogressPdComponent, AllPdComponent, ScheduledPdComponent, CompletedPdComponent, QcCompletedPdComponent, ClientInfoComponent, SupplierInfoComponent, PersonalInfoComponent, AssetsInfoComponent],
|
exports: [PdAllocationComponent, SmartPdAllocationComponent, TelePdAllocationComponent, SchedulePdComponent, EditPdApplicantComponent, EditPdMasterComponent, StartPdComponent, CompletedPdComponent, QcCompletedPdComponent, ClientInfoComponent, SupplierInfoComponent, PersonalInfoComponent, CurrentLoanComponent, LoanDetailsComponent, OtherIncomeComponent, AssetsInfoComponent, AddressComponent, FamilyDetailsComponent, BankingDetailsComponent, StockComponent, EmploymentInfoComponent, BusinessInfoComponent, FinancialInfoComponent, LenderRepresentativeComponent,RentalInfoComponent, AssessedIncomeComponent, AllocationViewMoreComponent, GeneralInfoComponent, PdRequirementComponent, OtherApplicantDetailsComponent, NeighbourHoodComponent, BusinessOtherFamilyMemberComponent, BusinessInfoGroupComponent,DailySalesDetailsComponent, SalesCalculationComponent, PurchaseDetailsComponent, BusinessExpenseDetailsComponent, HouseHoldDetailsComponent, OtherBusinessIncomeDetailsComponent, ManageSalesComponent, ManagePurchaseComponent, ManageBusinesExpenseComponent, ManageHouseHoldComponent, ManageOtherBusinessIncomeComponent, GrossProfitCalculationComponent, ManageDailySalesComponent, PdStatusChangeDialogueComponent, ViewLocationComponent],
|
||||||
exports: [PdAllocationComponent, SmartPdAllocationComponent, TelePdAllocationComponent, SchedulePdComponent, EditPdApplicantComponent, EditPdMasterComponent, StartPdComponent, CompletedPdComponent, QcCompletedPdComponent, ClientInfoComponent, SupplierInfoComponent, PersonalInfoComponent, CurrentLoanComponent, LoanDetailsComponent, OtherIncomeComponent, AssetsInfoComponent, AddressComponent, FamilyDetailsComponent, BankingDetailsComponent, StockComponent, EmploymentInfoComponent, BusinessInfoComponent, FinancialInfoComponent, LenderRepresentativeComponent,RentalInfoComponent, AssessedIncomeComponent, AllocationViewMoreComponent, GeneralInfoComponent, PdRequirementComponent, OtherApplicantDetailsComponent, NeighbourHoodComponent, BusinessOtherFamilyMemberComponent, BusinessInfoGroupComponent,DailySalesDetailsComponent, SalesCalculationComponent, PurchaseDetailsComponent, BusinessExpenseDetailsComponent, HouseHoldDetailsComponent, OtherBusinessIncomeDetailsComponent, ManageSalesComponent, ManagePurchaseComponent, ManageBusinesExpenseComponent, ManageHouseHoldComponent, ManageOtherBusinessIncomeComponent, GrossProfitCalculationComponent, ManageDailySalesComponent],
|
|
||||||
providers: [PdTrigerService, GetGeometricLocationService,{provide: MAT_DATE_LOCALE, useValue: 'en-GB'},
|
providers: [PdTrigerService, GetGeometricLocationService,{provide: MAT_DATE_LOCALE, useValue: 'en-GB'},
|
||||||
{provide: DateAdapter, useClass: MomentDateAdapter, deps: [MAT_DATE_LOCALE]},
|
{provide: DateAdapter, useClass: MomentDateAdapter, deps: [MAT_DATE_LOCALE]},
|
||||||
{provide: MAT_DATE_FORMATS, useValue: MAT_MOMENT_DATE_FORMATS}],
|
{provide: MAT_DATE_FORMATS, useValue: MAT_MOMENT_DATE_FORMATS}, PdLocatedMapViewDirective],
|
||||||
|
|
||||||
entryComponents: [PdAllocationComponent, SmartPdAllocationComponent, SchedulePdComponent, EditPdApplicantComponent, EditPdMasterComponent, TelePdAllocationComponent, AllocationViewMoreComponent, PersonalInfoComponent,BusinessAssetsInfoComponent,
|
entryComponents: [PdAllocationComponent, SmartPdAllocationComponent, SchedulePdComponent, EditPdApplicantComponent, EditPdMasterComponent, TelePdAllocationComponent, AllocationViewMoreComponent, PersonalInfoComponent,BusinessAssetsInfoComponent,
|
||||||
ClientInfoComponent, SupplierInfoComponent, CurrentLoanComponent, LoanDetailsComponent, OtherIncomeComponent, AssetsInfoComponent, AddressComponent, FamilyDetailsComponent, BankingDetailsComponent, StockComponent, EmploymentInfoComponent, BusinessInfoComponent, FinancialInfoComponent, LenderRepresentativeComponent,RentalInfoComponent, AssessedIncomeComponent, GeneralInfoComponent, PdRequirementComponent, ModelEditPdReportComponent, OtherApplicantDetailsComponent, NeighbourHoodComponent, DialogChangeCurrentVenrsion, FinalRemarksComponent, BusinessOtherFamilyMemberComponent, QcReviewComponent, BusinessInfoGroupComponent,BusinessBankingDetailsComponent, ManageSalesComponent, ManagePurchaseComponent, ManageBusinesExpenseComponent, ManageHouseHoldComponent, ManageOtherBusinessIncomeComponent, ManageDailySalesComponent],
|
ClientInfoComponent, SupplierInfoComponent, CurrentLoanComponent, LoanDetailsComponent, OtherIncomeComponent, AssetsInfoComponent, AddressComponent, FamilyDetailsComponent, BankingDetailsComponent, StockComponent, EmploymentInfoComponent, BusinessInfoComponent, FinancialInfoComponent, LenderRepresentativeComponent,RentalInfoComponent, AssessedIncomeComponent, GeneralInfoComponent, PdRequirementComponent, ModelEditPdReportComponent, OtherApplicantDetailsComponent, NeighbourHoodComponent, DialogChangeCurrentVenrsion, FinalRemarksComponent, BusinessOtherFamilyMemberComponent, QcReviewComponent, BusinessInfoGroupComponent,BusinessBankingDetailsComponent, ManageSalesComponent, ManagePurchaseComponent, ManageBusinesExpenseComponent, ManageHouseHoldComponent, ManageOtherBusinessIncomeComponent, ManageDailySalesComponent,PdStatusChangeDialogueComponent, ViewLocationComponent],
|
||||||
|
|
||||||
})
|
})
|
||||||
export class ManagePdModule {
|
export class ManagePdModule {
|
||||||
|
|||||||
@ -0,0 +1,48 @@
|
|||||||
|
import { Directive, OnInit, ElementRef, Renderer2 ,HostListener,HostBinding,Input} from '@angular/core';
|
||||||
|
import { MatDialog,MatDialogRef,MAT_DIALOG_DATA } from '@angular/material';
|
||||||
|
import { GetGeometricLocationService } from './../location-service/get-geometric-location.service';
|
||||||
|
import { ViewLocationComponent } from './../pd-directive/view-location/view-location.component';
|
||||||
|
|
||||||
|
@Directive({
|
||||||
|
selector: '[appPdLocatedMapView]'
|
||||||
|
})
|
||||||
|
export class PdLocatedMapViewDirective {
|
||||||
|
|
||||||
|
@Input() value:any;
|
||||||
|
@HostBinding('style.cursor') evPoint : string = 'none';
|
||||||
|
lat : String;
|
||||||
|
lang: String;
|
||||||
|
constructor(private elm : ElementRef , private render:Renderer2,private dialog: MatDialog, private _geolocation: GetGeometricLocationService) { }
|
||||||
|
ngOnInit()
|
||||||
|
{
|
||||||
|
}
|
||||||
|
|
||||||
|
@HostListener('mouseenter') mouseover(event: Event){
|
||||||
|
this.evPoint = 'pointer';
|
||||||
|
}
|
||||||
|
|
||||||
|
@HostListener('click') onclick(event: Event)
|
||||||
|
{
|
||||||
|
if(this.value.addressline1 && this.value.pincode && this.value.state_name && this.value.city_name){
|
||||||
|
this._geolocation.findLocations(this.value.addressline1,this.value.pincode,this.value.state_name,this.value.city_name)
|
||||||
|
.subscribe(response => {
|
||||||
|
if (response.status == 'OK') {
|
||||||
|
this.lat = response.results[0].geometry.location.lat;
|
||||||
|
this.lang = response.results[0].geometry.location.lng;
|
||||||
|
const dialogRef = this.dialog.open(ViewLocationComponent, {
|
||||||
|
data: {"lat": this.lat, "lang":this.lang},
|
||||||
|
disableClose: false,
|
||||||
|
minWidth:'30%',
|
||||||
|
maxWidth:'30%',
|
||||||
|
});
|
||||||
|
}
|
||||||
|
});
|
||||||
|
}
|
||||||
|
|
||||||
|
}
|
||||||
|
@HostListener('mouseleave') mouseleave(event: Event)
|
||||||
|
{
|
||||||
|
this.evPoint = 'none';
|
||||||
|
}
|
||||||
|
|
||||||
|
}
|
||||||
@ -0,0 +1,26 @@
|
|||||||
|
<h2 mat-dialog-title>
|
||||||
|
<div fxFlex="70" align="left">
|
||||||
|
PD Location
|
||||||
|
</div>
|
||||||
|
<div fxFlex="30" align="end">
|
||||||
|
<button class="mr-1 mb-1" mat-mini-fab color="primary" type="button" mat-dialog-close><mat-icon>close</mat-icon></button>
|
||||||
|
</div>
|
||||||
|
</h2>
|
||||||
|
<mat-dialog-content>
|
||||||
|
<div fxLayout="row wrap">
|
||||||
|
<div fxFlex.xs="100" fxFlex.sm="100" fxFlex.md="100" fxFlex.lg="100" fxFlex.xl="100">
|
||||||
|
<mat-card>
|
||||||
|
<mat-card-content>
|
||||||
|
<agm-map [latitude]="data.lat" [longitude]="data.lang">
|
||||||
|
<agm-marker [latitude]="data.lat" [longitude]="data.lang"></agm-marker>
|
||||||
|
</agm-map>
|
||||||
|
</mat-card-content>
|
||||||
|
</mat-card>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
</mat-dialog-content>
|
||||||
|
<!-- <mat-dialog-actions align="end">
|
||||||
|
<button mat-raised-button mat-icon-button class="mr-1 mb-1 hover-icon" type="button" matTooltip="Close" matTooltipPosition="above" mat-dialog-close><mat-icon>close</mat-icon></button>
|
||||||
|
</mat-dialog-actions> -->
|
||||||
|
|
||||||
|
|
||||||
@ -0,0 +1,48 @@
|
|||||||
|
@import "../../../../assets/styles/scss/material.variables";
|
||||||
|
|
||||||
|
:host {
|
||||||
|
margin-left: -5px;
|
||||||
|
margin-right: -5px;
|
||||||
|
margin-top: -5px;
|
||||||
|
display: block;
|
||||||
|
height: 100%;
|
||||||
|
}
|
||||||
|
.sebm-google-map-container {
|
||||||
|
width: 100%;
|
||||||
|
height: 350px;
|
||||||
|
display: flex;
|
||||||
|
}
|
||||||
|
|
||||||
|
$mat-toolbar-height-desktop: 64px !default;
|
||||||
|
$mat-toolbar-height-mobile-portrait: 56px !default;
|
||||||
|
$mat-toolbar-height-mobile-landscape: 48px !default;
|
||||||
|
|
||||||
|
.mat-card-top {
|
||||||
|
margin-top: -($mat-toolbar-height-desktop);
|
||||||
|
}
|
||||||
|
::ng-deep .mat-dialog-container{
|
||||||
|
overflow: hidden;
|
||||||
|
}
|
||||||
|
|
||||||
|
@media ($mat-xsmall) and (orientation: portrait) {
|
||||||
|
.mat-card-top {
|
||||||
|
margin-top: -($mat-toolbar-height-mobile-portrait);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
@media ($mat-small) and (orientation: landscape) {
|
||||||
|
.mat-card-top {
|
||||||
|
margin-top: -($mat-toolbar-height-mobile-landscape);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
::-webkit-scrollbar {
|
||||||
|
width: 0px; /* remove scrollbar space */
|
||||||
|
background: transparent; /* optional: just make scrollbar invisible */
|
||||||
|
}
|
||||||
|
/* optional: show position indicator in red */
|
||||||
|
::-webkit-scrollbar-thumb {
|
||||||
|
background: #FF0000;
|
||||||
|
}
|
||||||
|
::ng-deep .body-container{
|
||||||
|
padding:0px !important;
|
||||||
|
}
|
||||||
@ -0,0 +1,25 @@
|
|||||||
|
import { async, ComponentFixture, TestBed } from '@angular/core/testing';
|
||||||
|
|
||||||
|
import { ViewLocationComponent } from './view-location.component';
|
||||||
|
|
||||||
|
describe('ViewLocationComponent', () => {
|
||||||
|
let component: ViewLocationComponent;
|
||||||
|
let fixture: ComponentFixture<ViewLocationComponent>;
|
||||||
|
|
||||||
|
beforeEach(async(() => {
|
||||||
|
TestBed.configureTestingModule({
|
||||||
|
declarations: [ ViewLocationComponent ]
|
||||||
|
})
|
||||||
|
.compileComponents();
|
||||||
|
}));
|
||||||
|
|
||||||
|
beforeEach(() => {
|
||||||
|
fixture = TestBed.createComponent(ViewLocationComponent);
|
||||||
|
component = fixture.componentInstance;
|
||||||
|
fixture.detectChanges();
|
||||||
|
});
|
||||||
|
|
||||||
|
it('should create', () => {
|
||||||
|
expect(component).toBeTruthy();
|
||||||
|
});
|
||||||
|
});
|
||||||
@ -0,0 +1,17 @@
|
|||||||
|
import { Component, OnInit, Input, Output, Inject } from '@angular/core';
|
||||||
|
import { MatDialog, MatDialogRef, MAT_DIALOG_DATA , DialogPosition} from '@angular/material';
|
||||||
|
|
||||||
|
@Component({
|
||||||
|
selector: 'app-view-location',
|
||||||
|
templateUrl: './view-location.component.html',
|
||||||
|
styleUrls: ['./view-location.component.scss']
|
||||||
|
})
|
||||||
|
export class ViewLocationComponent implements OnInit {
|
||||||
|
|
||||||
|
constructor(@Inject(MAT_DIALOG_DATA) public data: any, private dialogRef: MatDialogRef<ViewLocationComponent>) { }
|
||||||
|
|
||||||
|
ngOnInit() {
|
||||||
|
console.log(this.data);
|
||||||
|
}
|
||||||
|
|
||||||
|
}
|
||||||
Loading…
Reference in New Issue
Block a user