sms 보내기 수정.

1. 팝업 형식 수정,
2. 개인사번 파라미터 처리.
This commit is contained in:
leejinho 2020-02-13 13:58:27 +09:00
parent 099927d441
commit ed210cc6f9
7 changed files with 19 additions and 28 deletions

View File

@ -260,8 +260,8 @@ export class LeftSideComponent implements OnInit, OnDestroy {
onClickSendClickToCall(calleeNumber: string) { onClickSendClickToCall(calleeNumber: string) {
this.sendCall.emit(calleeNumber); this.sendCall.emit(calleeNumber);
} }
onClickSendSms(calleeNumber: string) { onClickSendSms(employeeNum: string) {
this.sendSms.emit(calleeNumber); this.sendSms.emit(employeeNum);
} }
setFabInitial(type: string) { setFabInitial(type: string) {

View File

@ -735,7 +735,7 @@ export class OrganizationComponent
break; break;
case 'SEND_SMS': case 'SEND_SMS':
{ {
this.sendSms.emit(userInfo.hpNumber); this.sendSms.emit(userInfo.employeeNum);
} }
break; break;
} }

View File

@ -289,7 +289,7 @@ export class ProfileDialogComponent implements OnInit, OnDestroy {
} }
} }
onClickSendSms(calleeNumber: string) { onClickSendSms(employeeNum: string) {
const smsUtil = new SmsUtils( const smsUtil = new SmsUtils(
this.sessionStorageService, this.sessionStorageService,
this.nativeService this.nativeService
@ -308,22 +308,7 @@ export class ProfileDialogComponent implements OnInit, OnDestroy {
return false; return false;
} }
calleeNumber = calleeNumber.replace(/\D/g, ''); smsUtil.openSendSms(this.loginRes.tokenString, employeeNum);
smsUtil.openSendSms(this.loginRes.tokenString, [calleeNumber]);
// if (!!calleeNumber && calleeNumber.length > 0) {
// smsUtil.openSendSms(this.loginRes.tokenString, [calleeNumber]);
// } else {
// // this.dialogService.open<
// // AlertDialogComponent,
// // AlertDialogData,
// // AlertDialogResult
// // >(AlertDialogComponent, {
// // data: {
// // title: '',
// // html: `상대방 번호가 없어 전화를 걸 수 없습니다.`
// // }
// // });
// }
} }
onClickToggleFavorit(param: { userInfo: UserInfoSS; isFavorit: boolean }) { onClickToggleFavorit(param: { userInfo: UserInfoSS; isFavorit: boolean }) {

View File

@ -425,7 +425,7 @@ export class MainPageComponent implements OnInit, OnDestroy {
} }
} }
openSms(calleeNumber: string) { openSms(employeeNum: string) {
const smsUtil = new SmsUtils( const smsUtil = new SmsUtils(
this.sessionStorageService, this.sessionStorageService,
this.nativeService this.nativeService
@ -445,8 +445,7 @@ export class MainPageComponent implements OnInit, OnDestroy {
return false; return false;
} }
calleeNumber = calleeNumber.replace(/\D/g, ''); smsUtil.openSendSms(this.loginRes.tokenString, employeeNum);
smsUtil.openSendSms(this.loginRes.tokenString, [calleeNumber]);
} }
onCloseRightDrawer() { onCloseRightDrawer() {

View File

@ -35,9 +35,14 @@ export class SmsUtils {
} }
} }
openSendSms(token: string, calleeNumber?: string[]) { openSendSms(token: string, employeeNum?: string) {
const url = this.url.replace(/(\(%USER_TOKEN%\))/g, token); const url = this.url.replace(/(\(%USER_TOKEN%\))/g, token);
this.nativeService.openDefaultBrowser(url); // this.nativeService.openDefaultBrowser(url);
open(
url + `&ruser=${employeeNum},`, // ruser 파라미터에 ','가 마지막에 꼭 붙어야 한다.
'DaesangSMS',
'frame=true,menubar=no,location=no,resizable=yes,scrollbars=yes,status=no,width=685,height=700'
);
} }
} }

View File

@ -56,10 +56,12 @@
<mat-card-title> <mat-card-title>
<span class="name">{{ userInfo | ucapTranslate: 'name' }}</span> <span class="name">{{ userInfo | ucapTranslate: 'name' }}</span>
<span class="number">{{ userInfo.employeeNum }}</span> <span class="number">{{ userInfo.employeeNum | slice: 2 }}</span>
</mat-card-title> </mat-card-title>
<mat-card-subtitle> <mat-card-subtitle>
<span class="company">{{ userInfo.companyName | ucapStringEmptycheck }}</span> <span class="company">{{
userInfo.companyName | ucapStringEmptycheck
}}</span>
<span class="deptName">{{ userInfo | ucapTranslate: 'deptName' }}</span> <span class="deptName">{{ userInfo | ucapTranslate: 'deptName' }}</span>
<span class="grade">{{ userInfo | ucapTranslate: 'grade' }}</span> <span class="grade">{{ userInfo | ucapTranslate: 'grade' }}</span>
</mat-card-subtitle> </mat-card-subtitle>

View File

@ -100,7 +100,7 @@ export class ProfileComponent implements OnInit {
} }
onClickSMS() { onClickSMS() {
this.sendSms.emit(this.userInfo.hpNumber); this.sendSms.emit(this.userInfo.employeeNum);
} }
onClickVideoConference() {} onClickVideoConference() {}