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

Merge branch 'master' of https://git.loafle.net/ucap-web/next-ucap-messenger

Browse Source
This commit is contained in:
richard-loafle 2020-01-29 11:45:19 +09:00
commit 468262cf43
5 changed files with 129 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
projects/ucap-webmessenger-app/src/app/layouts/messenger/components/left-sidenav/organization.component.ts
View File

@ -305,16 +305,6 @@ export class OrganizationComponent
// 검색 결과 처리.
this.searchUserInfos = searchUserInfos;
this.selectedDepartmentProcessing = false;
// 검색 결과에 따른 프레즌스 조회.
const userSeqList: number[] = [];
if (userSeqList.length > 0) {
this.store.dispatch(
StatusStore.bulkInfo({
divCd: 'orgSrch',
userSeqs: this.searchUserInfos.map(user => user.seq)
})
);
}
if (!!this.cvsvDeptSearchUser) {
this.cvsvDeptSearchUser.scrollToOffset(0);

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

@ -1,4 +1,6 @@
<ucap-integrated-search
[sessionVerinfo]="sessionVerinfo"
[presence]="presence$ | async"
[searchWord]="!!data.keyword ? data.keyword : ''"
[searchingProcessing]="searchingProcessing"
[searchUserInfos]="searchUserInfos"

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

@ -1,9 +1,10 @@
import { Component, OnInit, Inject, OnDestroy } from '@angular/core';
import { MatDialogRef, MAT_DIALOG_DATA, PageEvent } from '@angular/material';
import { KEY_LOGIN_RES_INFO } from '@app/types';
import { KEY_LOGIN_RES_INFO, KEY_VER_INFO } from '@app/types';
import { SessionStorageService } from '@ucap-webmessenger/web-storage';
import { Store } from '@ngrx/store';
import { Store, select } from '@ngrx/store';
import * as AppStore from '@app/store';
import * as StatusStore from '@app/store/messenger/status';
import {
UserInfoSS,
@ -16,12 +17,14 @@ import {
} from '@ucap-webmessenger/protocol-query';
import { LoginResponse } from '@ucap-webmessenger/protocol-authentication';
import { map, catchError } from 'rxjs/operators';
import { Subscription, of } from 'rxjs';
import { Subscription, of, Observable } from 'rxjs';
import { EnvironmentsInfo, KEY_ENVIRONMENTS_INFO } from '@app/types';
import { NGXLogger } from 'ngx-logger';
import { NativeService, UCAP_NATIVE_SERVICE } from '@ucap-webmessenger/native';
import { environment } from '../../../../../environments/environment';
import { TranslateService } from '@ngx-translate/core';
import { StatusBulkInfo } from '@ucap-webmessenger/protocol-status';
import { VersionInfo2Response } from '@ucap-webmessenger/api-public';
export interface IntegratedSearchDialogData {
keyword: string;
@ -36,8 +39,10 @@ export interface IntegratedSearchDialogResult {}
})
export class IntegratedSearchDialogComponent implements OnInit, OnDestroy {
loginRes: LoginResponse;
sessionVerinfo: VersionInfo2Response;
environmentsInfo: EnvironmentsInfo;
presence$: Observable<StatusBulkInfo[]>;
searchSubscription: Subscription;
searchUserInfos: UserInfoSS[] = [];
searchingProcessing = false;
@ -65,10 +70,17 @@ export class IntegratedSearchDialogComponent implements OnInit, OnDestroy {
this.environmentsInfo = this.sessionStorageService.get<EnvironmentsInfo>(
KEY_ENVIRONMENTS_INFO
);
this.sessionVerinfo = this.sessionStorageService.get<VersionInfo2Response>(
KEY_VER_INFO
);
}
ngOnInit() {
this.onSearch(this.data.keyword);
this.presence$ = this.store.pipe(
select(AppStore.MessengerSelector.StatusSelector.selectAllStatusBulkInfo)
);
}
onSearch(searchWord: string) {
@ -109,8 +121,7 @@ export class IntegratedSearchDialogComponent implements OnInit, OnDestroy {
this.searchingProcessing = false;
// 검색 결과에 따른 프레즌스 조회.
const userSeqList: number[] = [];
if (userSeqList.length > 0) {
if (searchUserInfos.length > 0) {
this.store.dispatch(
StatusStore.bulkInfo({
divCd: 'INT_SRCH',

12
projects/ucap-webmessenger-ui/src/lib/components/integrated-search.component.html
View File

@ -39,7 +39,17 @@
</th>
<td mat-cell *matCellDef="let element">
<div class="profile">
{{ element.name }}
{{ getPresence(element, PresenceType.PC) }} /
{{ getPresence(element, PresenceType.MOBILE) }} /
{{ getWorkstatus(element) }} /
<img
class="thumbnail"
ucapImage
[base]="profileImageRoot"
[path]="element.profileImageFile"
[default]="'assets/images/img_nophoto_50.png'"
(click)="onClickOpenProfile($event, element.seq)"
/>
</div>
</td>
</ng-container>

102
projects/ucap-webmessenger-ui/src/lib/components/integrated-search.component.ts
View File

@ -10,7 +10,22 @@ import {
} from '@angular/core';
import { ucapAnimations } from '../animations';
import { UserInfoSS } from '@ucap-webmessenger/protocol-query';
import { MatPaginator, PageEvent, MatTabLabel } from '@angular/material';
import { MatPaginator, PageEvent } from '@angular/material';
import {
StatusBulkInfo,
WorkStatusType
} from '@ucap-webmessenger/protocol-status';
import { StatusCode } from '@ucap-webmessenger/core';
import { VersionInfo2Response } from '@ucap-webmessenger/api-public';
export enum PresenceType {
PC = 'pc',
MOBILE = 'mobile',
CONFERENCE = 'conference',
MOBILE_CONFERENCE = 'mobileConference',
PHONE = 'phone',
IMESSENER = 'imessenger'
}
@Component({
selector: 'ucap-integrated-search',
@ -19,6 +34,12 @@ import { MatPaginator, PageEvent, MatTabLabel } from '@angular/material';
animations: ucapAnimations
})
export class IntegratedSearchComponent implements OnInit {
@Input()
profileImageRoot?: string;
@Input()
sessionVerinfo: VersionInfo2Response;
@Input()
presence?: StatusBulkInfo[] = [];
@Input()
searchWord?: string;
@Input()
@ -36,6 +57,8 @@ export class IntegratedSearchComponent implements OnInit {
search = new EventEmitter<string>();
@Output()
changePage = new EventEmitter<PageEvent>();
@Output()
openProfile = new EventEmitter<number>();
@ViewChild(MatPaginator, { static: true }) paginator: MatPaginator;
displayedColumns: string[] = [
@ -58,12 +81,17 @@ export class IntegratedSearchComponent implements OnInit {
resizableFnMousemove: () => void;
resizableFnMouseup: () => void;
PresenceType = PresenceType;
constructor(
private changeDetectorRef: ChangeDetectorRef,
private renderer: Renderer2
) {}
ngOnInit() {}
ngOnInit() {
this.profileImageRoot =
this.profileImageRoot || this.sessionVerinfo.profileRoot;
}
onSearch(keyword: string) {
this.search.emit(keyword);
@ -73,6 +101,76 @@ export class IntegratedSearchComponent implements OnInit {
this.changePage.emit(event);
}
getPresence(userInfo: UserInfoSS, type: PresenceType): string {
const presences = this.presence.filter(p => p.userSeq === userInfo.seq);
let status: string;
let rtnClass = '';
if (!!presences && presences.length > 0) {
const presence = presences[0];
switch (type) {
case PresenceType.PC:
status = !!presence ? presence.pcStatus : undefined;
break;
case PresenceType.MOBILE:
status = !!presence ? presence.mobileStatus : undefined;
break;
}
if (!!status) {
switch (status) {
case StatusCode.OnLine:
rtnClass = type + 'On';
break;
case StatusCode.Away:
rtnClass = type + 'Out';
break;
case StatusCode.Busy:
rtnClass = type + 'Other';
break;
default:
rtnClass = type + 'Off';
break;
}
}
} else {
rtnClass = type + 'Off';
}
return rtnClass;
}
getWorkstatus(userInfo: UserInfoSS): string {
let workstatus = '';
if (!!userInfo && !!userInfo.workstatus) {
switch (userInfo.workstatus) {
case WorkStatusType.VacationAM:
workstatus = '오전';
break;
case WorkStatusType.VacationPM:
workstatus = '오후';
break;
case WorkStatusType.VacationAll:
workstatus = '휴가';
break;
case WorkStatusType.LeaveOfAbsence:
workstatus = '휴직';
break;
case WorkStatusType.LongtermRefresh:
workstatus = '장기';
break;
}
}
return workstatus;
}
onClickOpenProfile(event: MouseEvent, userSeq: number) {
event.preventDefault();
event.stopPropagation();
this.openProfile.emit(userSeq);
}
resizeTable(event: any, column: any) {
this.start = event.target;
this.pressed = true;