ucap/next-ucap-messenger
3
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

조직도, 통합검색에서 전화 발신시 컨펌 하도록 수정.

Browse Source
This commit is contained in:
leejinho 2020-04-01 13:00:14 +09:00
parent 4051b79c69
commit 4e4aba38da
2 changed files with 78 additions and 72 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
projects/ucap-webmessenger-app/src/app/layouts/messenger/components/main-contents/organization.component.ts
View File

@ -23,7 +23,8 @@ import {
ConfirmDialogData, ConfirmDialogData,
AlertDialogComponent, AlertDialogComponent,
AlertDialogResult, AlertDialogResult,
AlertDialogData AlertDialogData,
StringFormatterPhonePipe
} from '@ucap-webmessenger/ui'; } from '@ucap-webmessenger/ui';
import { SessionStorageService } from '@ucap-webmessenger/web-storage'; import { SessionStorageService } from '@ucap-webmessenger/web-storage';
import { Store, select } from '@ngrx/store'; import { Store, select } from '@ngrx/store';
@ -416,21 +417,23 @@ export class OrganizationComponent implements OnInit, OnDestroy {
calleeNumber = calleeNumber.replace(/\D/g, ''); calleeNumber = calleeNumber.replace(/\D/g, '');
if (!!calleeNumber && calleeNumber.length > 0) { if (!!calleeNumber && calleeNumber.length > 0) {
// const result = await this.dialogService.open< const result = await this.dialogService.open<
// ConfirmDialogComponent, ConfirmDialogComponent,
// ConfirmDialogData, ConfirmDialogData,
// ConfirmDialogResult ConfirmDialogResult
// >(ConfirmDialogComponent, { >(ConfirmDialogComponent, {
// width: '360px', panelClass: 'miniSize-dialog',
// data: { data: {
// title: this.translateService.instant('call.callTo'), title: this.translateService.instant('call.callTo'),
// html: this.translateService.instant('call.callWithNumber', { html: this.translateService.instant('call.callWithNumber', {
// phoneNumber: calleeNumber phoneNumber: `${new StringFormatterPhonePipe().transform(
// }) calleeNumber
// } )}`
// }); })
}
});
// if (!!result && !!result.choice && result.choice) { if (!!result && !!result.choice && result.choice) {
this.callService this.callService
.sendCall({ .sendCall({
userSeq: this.loginRes.userSeq, userSeq: this.loginRes.userSeq,
@ -451,7 +454,7 @@ export class OrganizationComponent implements OnInit, OnDestroy {
catchError(error => of(this.logger.debug(error))) catchError(error => of(this.logger.debug(error)))
) )
.subscribe(); .subscribe();
// } }
} else { } else {
this.dialogService.open< this.dialogService.open<
AlertDialogComponent, AlertDialogComponent,

35
projects/ucap-webmessenger-app/src/app/layouts/messenger/dialogs/search/integrated-search.dialog.component.ts
View File

@ -37,7 +37,8 @@ import {
ConfirmDialogComponent, ConfirmDialogComponent,
ConfirmDialogData, ConfirmDialogData,
ConfirmDialogResult, ConfirmDialogResult,
TranslateService as UCapTranslateService TranslateService as UCapTranslateService,
StringFormatterPhonePipe
} from '@ucap-webmessenger/ui'; } from '@ucap-webmessenger/ui';
import { import {
ProfileDialogComponent, ProfileDialogComponent,
@ -438,21 +439,23 @@ export class IntegratedSearchDialogComponent implements OnInit, OnDestroy {
calleeNumber = calleeNumber.replace(/\D/g, ''); calleeNumber = calleeNumber.replace(/\D/g, '');
if (!!calleeNumber && calleeNumber.length > 0) { if (!!calleeNumber && calleeNumber.length > 0) {
// const result = await this.dialogService.open< const result = await this.dialogService.open<
// ConfirmDialogComponent, ConfirmDialogComponent,
// ConfirmDialogData, ConfirmDialogData,
// ConfirmDialogResult ConfirmDialogResult
// >(ConfirmDialogComponent, { >(ConfirmDialogComponent, {
// width: '360px', panelClass: 'miniSize-dialog',
// data: { data: {
// title: this.translateService.instant('call.callTo'), title: this.translateService.instant('call.callTo'),
// html: this.translateService.instant('call.callWithNumber', { html: this.translateService.instant('call.callWithNumber', {
// phoneNumber: calleeNumber phoneNumber: `${new StringFormatterPhonePipe().transform(
// }) calleeNumber
// } )}`
// }); })
}
});
// if (!!result && !!result.choice && result.choice) { if (!!result && !!result.choice && result.choice) {
this.callService this.callService
.sendCall({ .sendCall({
userSeq: this.loginRes.userSeq, userSeq: this.loginRes.userSeq,
@ -473,7 +476,7 @@ export class IntegratedSearchDialogComponent implements OnInit, OnDestroy {
catchError(error => of(this.logger.debug(error))) catchError(error => of(this.logger.debug(error)))
) )
.subscribe(); .subscribe();
// } }
} else { } else {
this.dialogService.open< this.dialogService.open<
AlertDialogComponent, AlertDialogComponent,