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

bugfix :: 필터오류 수정, 필터 drop 영역 타이틀 위로 안올라 가게 고정.

Browse Source
This commit is contained in:
leejinho 2020-03-31 13:18:43 +09:00
parent 5afa223c17
commit 30843f2de9
4 changed files with 24 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -30,6 +30,7 @@
<mat-label>{{ 'search.fieldCompany' | translate }}</mat-label>
<mat-select
#filterCompany
disableOptionCentering="true"
[formControl]="fcCompany"
multiple
(openedChange)="onOpenedChange($event)"
@ -57,6 +58,7 @@
<mat-label>{{ 'search.fieldGrade' | translate }}</mat-label>
<mat-select
#filterGrade
disableOptionCentering="true"
[formControl]="fcGrade"
multiple
(openedChange)="onOpenedChange($event)"
@ -84,6 +86,7 @@
<mat-label>{{ 'search.fieldWorkPlace' | translate }}</mat-label>
<mat-select
#filterWorkPlace
disableOptionCentering="true"
[formControl]="fcWorkPlace"
multiple
(openedChange)="onOpenedChange($event)"
@ -111,6 +114,7 @@
<mat-label>{{ 'presence.label' | translate }}</mat-label>
<mat-select
#filterPresence
disableOptionCentering="true"
[formControl]="fcPresence"
multiple
(openedChange)="onOpenedChange($event)"

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

@ -641,10 +641,10 @@ export class OrganizationComponent implements OnInit, OnDestroy {
let isMulti = false;
if (!!companies && companies.length > 0) {
isMulti = true;
const data = !!isMulti
const data = !isMulti
? this.originDepartmentUserInfoList
: this.departmentUserInfoList;
isMulti = true;
this.departmentUserInfoList = data.filter(userInfo => {
if (
@ -658,10 +658,10 @@ export class OrganizationComponent implements OnInit, OnDestroy {
});
}
if (!!grades && grades.length > 0) {
isMulti = true;
const data = !!isMulti
const data = !isMulti
? this.originDepartmentUserInfoList
: this.departmentUserInfoList;
isMulti = true;
this.departmentUserInfoList = data.filter(userInfo => {
if (
@ -685,10 +685,10 @@ export class OrganizationComponent implements OnInit, OnDestroy {
});
}
if (!!workplaces && workplaces.length > 0) {
isMulti = true;
const data = !!isMulti
const data = !isMulti
? this.originDepartmentUserInfoList
: this.departmentUserInfoList;
isMulti = true;
this.departmentUserInfoList = data.filter(userInfo => {
if (
@ -702,10 +702,10 @@ export class OrganizationComponent implements OnInit, OnDestroy {
});
}
if (!!presences && presences.length > 0) {
isMulti = true;
const data = !!isMulti
const data = !isMulti
? this.originDepartmentUserInfoList
: this.departmentUserInfoList;
isMulti = true;
this.departmentUserInfoList = data.filter(userInfo => {
const userPresences = this.presenceSubject.value.filter(

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

@ -50,6 +50,7 @@
<mat-label>{{ 'search.fieldCompany' | translate }}</mat-label>
<mat-select
#filterCompany
disableOptionCentering="true"
[formControl]="fcCompany"
multiple
(openedChange)="onOpenedChange($event)"
@ -78,6 +79,7 @@
<mat-label>{{ 'search.fieldGrade' | translate }}</mat-label>
<mat-select
#filterGrade
disableOptionCentering="true"
[formControl]="fcGrade"
multiple
(openedChange)="onOpenedChange($event)"
@ -106,6 +108,7 @@
<mat-label>{{ 'search.fieldWorkPlace' | translate }}</mat-label>
<mat-select
#filterWorkPlace
disableOptionCentering="true"
[formControl]="fcWorkPlace"
multiple
(openedChange)="onOpenedChange($event)"
@ -134,6 +137,7 @@
<mat-label>{{ 'presence.label' | translate }}</mat-label>
<mat-select
#filterPresence
disableOptionCentering="true"
[formControl]="fcPresence"
multiple
(openedChange)="onOpenedChange($event)"

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

@ -643,10 +643,10 @@ export class IntegratedSearchDialogComponent implements OnInit, OnDestroy {
let isMulti = false;
if (!!companies && companies.length > 0) {
isMulti = true;
const data = !!isMulti
const data = !isMulti
? this.originDepartmentUserInfoList
: this.departmentUserInfoList;
isMulti = true;
this.departmentUserInfoList = data.filter(userInfo => {
if (
@ -660,10 +660,10 @@ export class IntegratedSearchDialogComponent implements OnInit, OnDestroy {
});
}
if (!!grades && grades.length > 0) {
isMulti = true;
const data = !!isMulti
const data = !isMulti
? this.originDepartmentUserInfoList
: this.departmentUserInfoList;
isMulti = true;
this.departmentUserInfoList = data.filter(userInfo => {
if (
@ -687,10 +687,10 @@ export class IntegratedSearchDialogComponent implements OnInit, OnDestroy {
});
}
if (!!workplaces && workplaces.length > 0) {
isMulti = true;
const data = !!isMulti
const data = !isMulti
? this.originDepartmentUserInfoList
: this.departmentUserInfoList;
isMulti = true;
this.departmentUserInfoList = data.filter(userInfo => {
if (
@ -704,10 +704,10 @@ export class IntegratedSearchDialogComponent implements OnInit, OnDestroy {
});
}
if (!!presences && presences.length > 0) {
isMulti = true;
const data = !!isMulti
const data = !isMulti
? this.originDepartmentUserInfoList
: this.departmentUserInfoList;
isMulti = true;
this.departmentUserInfoList = data.filter(userInfo => {
const userPresences = this.presenceSubject.value.filter(