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 08:00:34 +09:00
parent 732b680b1c
commit 7643281e77
2 changed files with 70 additions and 70 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -418,42 +418,42 @@ 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', // width: '360px',
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: 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,
deviceType: this.environmentsInfo.deviceType, deviceType: this.environmentsInfo.deviceType,
tokenKey: this.loginRes.tokenString, tokenKey: this.loginRes.tokenString,
calleeNumber calleeNumber
}) })
.pipe( .pipe(
take(1), take(1),
map(res => { map(res => {
if (res.responseCode === PromptMessageStatusCode.Success) { if (res.responseCode === PromptMessageStatusCode.Success) {
this.logger.debug('SUCCESS'); this.logger.debug('SUCCESS');
this.logger.debug(res); this.logger.debug(res);
} else { } else {
this.logger.error(res); this.logger.error(res);
} }
}), }),
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,

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

@ -438,42 +438,42 @@ 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', // width: '360px',
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: 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,
deviceType: this.environmentsInfo.deviceType, deviceType: this.environmentsInfo.deviceType,
tokenKey: this.loginRes.tokenString, tokenKey: this.loginRes.tokenString,
calleeNumber calleeNumber
}) })
.pipe( .pipe(
take(1), take(1),
map(res => { map(res => {
if (res.responseCode === PromptMessageStatusCode.Success) { if (res.responseCode === PromptMessageStatusCode.Success) {
this.logger.debug('SUCCESS'); this.logger.debug('SUCCESS');
this.logger.debug(res); this.logger.debug(res);
} else { } else {
this.logger.error(res); this.logger.error(res);
} }
}), }),
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,