diff --git a/src/app/mock-api/apps/report/sessionin-overlap/api.ts b/src/app/mock-api/apps/report/sessionin-overlap/api.ts
index b7b73f0..ef4d177 100644
--- a/src/app/mock-api/apps/report/sessionin-overlap/api.ts
+++ b/src/app/mock-api/apps/report/sessionin-overlap/api.ts
@@ -44,7 +44,7 @@ export class ReportSessioninOverlapMockApi {
);
// Sort the sessioninOverlaps
- if (sort === 'sku' || sort === 'name' || sort === 'active') {
+ if (sort === 'overlapCount') {
sessioninOverlaps.sort((a, b) => {
const fieldA = a[sort].toString().toUpperCase();
const fieldB = b[sort].toString().toUpperCase();
diff --git a/src/app/mock-api/apps/report/sessionin-overlap/data.ts b/src/app/mock-api/apps/report/sessionin-overlap/data.ts
index f1f2c01..1dc5f38 100644
--- a/src/app/mock-api/apps/report/sessionin-overlap/data.ts
+++ b/src/app/mock-api/apps/report/sessionin-overlap/data.ts
@@ -2,32 +2,157 @@
export const sessioninOverlaps = [
{
- id: 'on00',
- totalPartnerCount: '5',
- totalHoldingMoney: 303675,
- totalComp: 108933,
- total: 412608,
- branchCount: 1,
- divisionCount: 1,
- officeCount: 1,
- storeCount: 1,
- memberCount: 1,
- nickname: 'on00',
- accountHolder: '11',
- phoneNumber: '010-1111-1111',
- calculateType: '롤링',
- ownCash: 50000,
- ownComp: 1711,
- ownCoupon: 50000,
- gameMoney: 0,
- todayComp: 0,
- totalDeposit: 0,
- totalWithdraw: 0,
- balance: 0,
- registDate: '2022-06-12 15:38',
- finalSigninDate: '',
- ip: '',
- state: '정상',
- note: '',
+ id: '1',
+ overlapCount: '3',
+ ip: '192.181.111.11',
+ users: [
+ {
+ id: '7eb7c859-1347-4317-96b6-9476a7e2ba3c',
+ signinId: 'lala1',
+ nickname: '라라1',
+ },
+ {
+ id: '00b0292f-3d50-4669-a0c4-7a9d85efc98d',
+ signinId: 'onon6',
+ nickname: 'kakao',
+ },
+ {
+ id: 'b899ec30-b85a-40ab-bb1f-18a596d5c6de',
+ signinId: 'on04',
+ nickname: '라크라',
+ },
+ ],
+ },
+ {
+ id: '2',
+ overlapCount: '3',
+ ip: '212.181.111.11',
+ users: [
+ {
+ id: '7eb7c859-1347-4317-96b6-9476a7e2ba3c',
+ signinId: 'lala1',
+ nickname: '라라1',
+ },
+ {
+ id: '00b0292f-3d50-4669-a0c4-7a9d85efc98d',
+ signinId: 'onon6',
+ nickname: 'kakao',
+ },
+ {
+ id: 'b899ec30-b85a-40ab-bb1f-18a596d5c6de',
+ signinId: 'on04',
+ nickname: '라크라',
+ },
+ ],
+ },
+ {
+ id: '3',
+ overlapCount: '3',
+ ip: '192.181.111.11',
+ users: [
+ {
+ id: '7eb7c859-1347-4317-96b6-9476a7e2ba3c',
+ signinId: 'lala1',
+ nickname: '라라1',
+ },
+ {
+ id: '00b0292f-3d50-4669-a0c4-7a9d85efc98d',
+ signinId: 'onon6',
+ nickname: 'kakao',
+ },
+ {
+ id: 'b899ec30-b85a-40ab-bb1f-18a596d5c6de',
+ signinId: 'on04',
+ nickname: '라크라',
+ },
+ ],
+ },
+ {
+ id: '4',
+ overlapCount: '3',
+ ip: '192.181.111.11',
+ users: [
+ {
+ id: '7eb7c859-1347-4317-96b6-9476a7e2ba3c',
+ signinId: 'lala1',
+ nickname: '라라1',
+ },
+ {
+ id: '00b0292f-3d50-4669-a0c4-7a9d85efc98d',
+ signinId: 'onon6',
+ nickname: 'kakao',
+ },
+ {
+ id: 'b899ec30-b85a-40ab-bb1f-18a596d5c6de',
+ signinId: 'on04',
+ nickname: '라크라',
+ },
+ ],
+ },
+ {
+ id: '5',
+ overlapCount: '3',
+ ip: '192.181.111.11',
+ users: [
+ {
+ id: '7eb7c859-1347-4317-96b6-9476a7e2ba3c',
+ signinId: 'lala1',
+ nickname: '라라1',
+ },
+ {
+ id: '00b0292f-3d50-4669-a0c4-7a9d85efc98d',
+ signinId: 'onon6',
+ nickname: 'kakao',
+ },
+ {
+ id: 'b899ec30-b85a-40ab-bb1f-18a596d5c6de',
+ signinId: 'on04',
+ nickname: '라크라',
+ },
+ ],
+ },
+ {
+ id: '6',
+ overlapCount: '3',
+ ip: '192.181.111.11',
+ users: [
+ {
+ id: '7eb7c859-1347-4317-96b6-9476a7e2ba3c',
+ signinId: 'lala1',
+ nickname: '라라1',
+ },
+ {
+ id: '00b0292f-3d50-4669-a0c4-7a9d85efc98d',
+ signinId: 'onon6',
+ nickname: 'kakao',
+ },
+ {
+ id: 'b899ec30-b85a-40ab-bb1f-18a596d5c6de',
+ signinId: 'on04',
+ nickname: '라크라',
+ },
+ ],
+ },
+ {
+ id: '7',
+ overlapCount: '3',
+ ip: '192.181.111.11',
+ users: [
+ {
+ id: '7eb7c859-1347-4317-96b6-9476a7e2ba3c',
+ signinId: 'lala1',
+ nickname: '라라1',
+ },
+ {
+ id: '00b0292f-3d50-4669-a0c4-7a9d85efc98d',
+ signinId: 'onon6',
+ nickname: 'kakao',
+ },
+ {
+ id: 'b899ec30-b85a-40ab-bb1f-18a596d5c6de',
+ signinId: 'on04',
+ nickname: '라크라',
+ },
+ ],
},
];
diff --git a/src/app/modules/admin/report/sessionin-overlap/components/list.component.html b/src/app/modules/admin/report/sessionin-overlap/components/list.component.html
index 6e2c6dc..c4c7556 100644
--- a/src/app/modules/admin/report/sessionin-overlap/components/list.component.html
+++ b/src/app/modules/admin/report/sessionin-overlap/components/list.component.html
@@ -13,110 +13,25 @@
-
-
-
-
-
-
- 40
- 60
- 80
- 100
-
-
-
-
- LV.1
- LV.2
- LV.3
- LV.4
-
-
-
-
- 정상
- 대기
- 탈퇴
- 휴면
- 블랙
- 정지
-
-
-
-
- 카지노제한
- 슬롯제한
-
-
-
-
- 계좌입금
-
-
-
-
- 카지노콤프
- 슬롯콤프
- 배팅콤프
- 첫충콤프
-
-
-
+
+
+
+
+
+
+
+
+
+
-
-
@@ -152,36 +66,16 @@
class="flex flex-col flex-auto sm:mb-18 overflow-hidden sm:overflow-y-auto"
>
- 0; else noSessioninOverlap"
- >
+ 0; else noUser">
-
-
요율
-
상부트리
-
관리
-
매장수
-
회원수
-
아이디
-
닉네임
-
예금주
-
연락처
-
정산
-
보유금
-
게임중머니
-
카지노->캐쉬
-
금일콤프
-
총입출
-
로그
-
상태
-
회원수
-
비고
+
CNT
+
IP
+
+
아이디
-
-
+
+
+ {{ info.overlapCount }}
-
-
-
-
-
-
-
+
+
+ {{ info.ip }}
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
-
- {{ sessioninOverlap.id }}
-
+ |
+ {{ user.nickname }}
-
-
-
- {{ sessioninOverlap.nickname }}
-
-
-
- {{ sessioninOverlap.accountHolder }}
-
-
-
- {{ sessioninOverlap.phoneNumber }}
-
-
-
- {{ sessioninOverlap.calculateType }}
-
-
-
- 캐쉬{{ sessioninOverlap.ownCash }} 콤프{{
- sessioninOverlap.ownComp
- }}
- 쿠폰{{ sessioninOverlap.ownCoupon }}
-
-
-
- {{ sessioninOverlap.gameMoney }}
-
-
-
-
-
-
-
-
- {{ sessioninOverlap.todayComp }}P
-
-
-
- 입금{{ sessioninOverlap.totalDeposit }} 출금{{
- sessioninOverlap.totalWithdraw
- }}
- 차익{{ sessioninOverlap.balance }}
-
-
-
- 가입{{ sessioninOverlap.registDate }} 최종{{
- sessioninOverlap.finalSigninDate
- }}
- IP{{ sessioninOverlap.ip }}
-
-
-
- {{ sessioninOverlap.state }}
-
-
-
- {{ sessioninOverlap.memberCount }}
-
-
-
-
@@ -351,11 +130,11 @@
-
+
- There are no sessionin overlaps!
+ There are no data!
diff --git a/src/app/modules/admin/report/sessionin-overlap/components/list.component.ts b/src/app/modules/admin/report/sessionin-overlap/components/list.component.ts
index cedf22f..5829838 100644
--- a/src/app/modules/admin/report/sessionin-overlap/components/list.component.ts
+++ b/src/app/modules/admin/report/sessionin-overlap/components/list.component.ts
@@ -41,19 +41,19 @@ import { Router } from '@angular/router';
styles: [
/* language=SCSS */
`
- .inventory-grid {
- grid-template-columns: 60px auto 40px;
+ .sessionin-overlap-grid {
+ grid-template-columns: 60px 200px auto;
@screen sm {
- grid-template-columns: 60px 60px 60px 60px 60px 60px auto 60px;
+ grid-template-columns: 60px 200px auto;
}
@screen md {
- grid-template-columns: 60px 60px 60px 60px 60px 60px auto 60px 60px;
+ grid-template-columns: 60px 200px auto;
}
@screen lg {
- grid-template-columns: 60px 70px 70px 70px 70px 100px 60px 60px auto 60px 60px 60px 60px;
+ grid-template-columns: 60px 200px auto;
}
}
`,
@@ -74,6 +74,8 @@ export class ListComponent implements OnInit, AfterViewInit, OnDestroy {
selectedSessioninOverlap?: SessioninOverlap;
pagination?: SessioninOverlapPagination;
+ __isSearchOpened = false;
+
private _unsubscribeAll: Subject
= new Subject();
/**
@@ -174,6 +176,13 @@ export class ListComponent implements OnInit, AfterViewInit, OnDestroy {
// @ Private methods
// -----------------------------------------------------------------------------------------------------
+ /**
+ * toggle the search
+ * Used in 'bar'
+ */
+ __onClickSearch(): void {
+ this.__isSearchOpened = !this.__isSearchOpened;
+ }
/**
* Create product
*/
diff --git a/src/app/modules/admin/report/sessionin-overlap/models/sessionin-overlap.ts b/src/app/modules/admin/report/sessionin-overlap/models/sessionin-overlap.ts
index 574f138..c97557b 100644
--- a/src/app/modules/admin/report/sessionin-overlap/models/sessionin-overlap.ts
+++ b/src/app/modules/admin/report/sessionin-overlap/models/sessionin-overlap.ts
@@ -1,29 +1,6 @@
export interface SessioninOverlap {
id?: string;
- totalPartnerCount?: number;
- totalHoldingMoney?: number;
- totalComp?: number;
- total?: number;
- branchCount?: number;
- divisionCount?: number;
- officeCount?: number;
- storeCount?: number;
- memberCount?: number;
- nickname?: string;
- accountHolder?: string;
- phoneNumber?: string;
- calculateType?: string;
- ownCash?: number;
- ownComp?: number;
- ownCoupon?: number;
- gameMoney?: number;
- todayComp?: number;
- totalDeposit?: number;
- totalWithdraw?: number;
- balance?: number;
- registDate?: string;
- finalSigninDate?: string;
+ overlapCount?: string;
ip?: string;
- state?: string;
- note?: string;
+ users?: any[];
}