diff --git a/src/app/mock-api/apps/report/comp-log/api.ts b/src/app/mock-api/apps/report/comp-log/api.ts
index 197cef5..c2068b7 100644
--- a/src/app/mock-api/apps/report/comp-log/api.ts
+++ b/src/app/mock-api/apps/report/comp-log/api.ts
@@ -33,7 +33,7 @@ export class ReportCompLogMockApi {
.reply(({ request }) => {
// Get available queries
const search = request.params.get('search');
- const sort = request.params.get('sort') || 'name';
+ const sort = request.params.get('sort') || 'signinId';
const order = request.params.get('order') || 'asc';
const page = parseInt(request.params.get('page') ?? '1', 10);
const size = parseInt(request.params.get('size') ?? '10', 10);
@@ -42,7 +42,7 @@ export class ReportCompLogMockApi {
let compLogs: any[] | null = cloneDeep(this._compLogs);
// Sort the compLogs
- if (sort === 'sku' || sort === 'name' || sort === 'active') {
+ if (sort === 'signinId' || sort === 'nickname' || sort === 'type') {
compLogs.sort((a, b) => {
const fieldA = a[sort].toString().toUpperCase();
const fieldB = b[sort].toString().toUpperCase();
diff --git a/src/app/mock-api/apps/report/comp-log/data.ts b/src/app/mock-api/apps/report/comp-log/data.ts
index f927297..10d2325 100644
--- a/src/app/mock-api/apps/report/comp-log/data.ts
+++ b/src/app/mock-api/apps/report/comp-log/data.ts
@@ -2,32 +2,39 @@
export const compLogs = [
{
- 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: '7eb7c859-1347-4317-96b6-9476a7e2ba3c',
+ idx: 17183,
+ rank: '매장',
+ signinId: 'kgon5',
+ nickname: '매장',
+ rate: 1.5,
+ bettingMoney: 800,
+ beforeComp: 28418.37,
+ changeComp: 12.0,
+ afterComp: 28430.37,
+ type: '적립',
+ compContents: '슬롯콤프',
+ registrationDate: '2022-06-20 11:43:37',
+ memo: '',
+ bettingId: 'test1111',
+ bettingNumber: 5970,
+ },
+ {
+ id: '00b0292f-3d50-4669-a0c4-7a9d85efc98d',
+ idx: 17182,
+ rank: '총판',
+ signinId: 'kgon4',
+ nickname: '총판',
+ rate: 0.3,
+ bettingMoney: 800,
+ beforeComp: 32925.03,
+ changeComp: 2.4,
+ afterComp: 32927.43,
+ type: '적립',
+ compContents: '슬롯콤프',
+ registrationDate: '2022-06-20 11:43:37',
+ memo: '',
+ bettingId: 'test1111',
+ bettingNumber: 5970,
},
];
diff --git a/src/app/modules/admin/report/comp-log/components/list.component.html b/src/app/modules/admin/report/comp-log/components/list.component.html
index 28dcac1..e58806d 100644
--- a/src/app/modules/admin/report/comp-log/components/list.component.html
+++ b/src/app/modules/admin/report/comp-log/components/list.component.html
@@ -10,113 +10,50 @@
-
+
-
-
-
+
+
+ 콤프합계:7,600콤프
+
+
+
+
+
+
+
+
-
-
- 40
- 60
- 80
- 100
-
-
-
-
- LV.1
- LV.2
- LV.3
- LV.4
-
-
-
-
- 정상
- 대기
- 탈퇴
- 휴면
- 블랙
- 정지
-
-
-
-
- 카지노제한
- 슬롯제한
-
-
-
-
- 계좌입금
-
-
-
+
+ 내용
카지노콤프
슬롯콤프
배팅콤프
첫충콤프
+ 매충콤프
-
-
-
+
+
+
-
@@ -157,29 +97,29 @@
-
+
번호
+
+ 아이디
+
+ 닉네임
+
+
등급
요율
-
상부트리
-
관리
-
매장수
-
회원수
-
아이디
-
닉네임
-
예금주
-
연락처
-
정산
-
보유금
-
게임중머니
-
카지노->캐쉬
-
금일콤프
-
총입출
-
로그
-
상태
-
회원수
-
비고
+
배팅금액
+
+ 이전콤프
+
+ 변동콤프
+
+ 이후콤프
+
+
타입
+
내용
+
등록일시
+
메모
+
배팅ID
+
배팅번호
@@ -189,142 +129,41 @@
-
-
+
+ {{ compLog.idx }}
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- {{ compLog.id }}
-
-
-
-
-
+
+ {{ compLog.signinId }}
+
{{ compLog.nickname }}
-
-
- {{ compLog.accountHolder }}
+
+ {{ compLog.rank }}
-
-
- {{ compLog.phoneNumber }}
+
{{ compLog.rate }}%
+
{{ compLog.bettingMoney }}원
+
+ {{ compLog.beforeComp }}P
+
+ {{ compLog.changeComp }}P
+
+ {{ compLog.afterComp }}P
-
-
- {{ compLog.calculateType }}
+
{{ compLog.type }}
+
+ {{ compLog.compContents }}
-
-
- 캐쉬{{ compLog.ownCash }} 콤프{{ compLog.ownComp }} 쿠폰{{
- compLog.ownCoupon
- }}
+
+ {{ compLog.registrationDate }}
-
-
- {{ compLog.gameMoney }}
+
+ {{ compLog.memo }}
-
-
-
-
+
+ {{ compLog.bettingId }}
-
-
- {{ compLog.todayComp }}P
-
-
-
- 입금{{ compLog.totalDeposit }} 출금{{
- compLog.totalWithdraw
- }}
- 차익{{ compLog.balance }}
-
-
-
- 가입{{ compLog.registDate }} 최종{{
- compLog.finalSigninDate
- }}
- IP{{ compLog.ip }}
-
-
-
- {{ compLog.state }}
-
-
-
- {{ compLog.memberCount }}
-
-
-
-
+
+ {{ compLog.bettingNumber }}
@@ -347,7 +186,7 @@
- There are no compLogs!
+ There are no data!
diff --git a/src/app/modules/admin/report/comp-log/components/list.component.ts b/src/app/modules/admin/report/comp-log/components/list.component.ts
index a6c187c..972f3ac 100644
--- a/src/app/modules/admin/report/comp-log/components/list.component.ts
+++ b/src/app/modules/admin/report/comp-log/components/list.component.ts
@@ -42,18 +42,22 @@ import { Router } from '@angular/router';
/* language=SCSS */
`
.inventory-grid {
- grid-template-columns: 60px auto 40px;
+ /* 번호 아이디 등급 요율 배팅금액 콤프 */
+ grid-template-columns: 60px 60px 60px 60px 60px auto;
@screen sm {
- grid-template-columns: 60px 60px 60px 60px 60px 60px auto 60px;
+ /* 번호 아이디 등급 요율 배팅금액 콤프 타입 내용 등록일*/
+ grid-template-columns: 60px 60px 60px 60px 60px auto 60px 60px 60px;
}
@screen md {
- grid-template-columns: 60px 60px 60px 60px 60px 60px auto 60px 60px;
+ /* 번호 아이디 등급 요율 배팅금액 콤프 타입 내용 등록일 메모 */
+ grid-template-columns: 60px 60px 60px 60px 60px auto 60px 60px 60px 60px;
}
@screen lg {
- grid-template-columns: 60px 70px 70px 70px 70px 100px 60px 60px auto 60px 60px 60px 60px;
+ /* 번호 아이디 등급 요율 배팅금액 콤프 타입 내용 등록일 메모 배팅ID 배팅번호 */
+ grid-template-columns: 60px 60px 60px 60px 60px auto 60px 60px 60px 60px 60px 60px;
}
}
`,
@@ -69,6 +73,7 @@ export class ListComponent implements OnInit, AfterViewInit, OnDestroy {
compLogs$!: Observable
;
users$!: Observable;
+ __isSearchOpened = false;
isLoading = false;
searchInputControl = new FormControl();
selectedCompLog?: CompLog;
@@ -117,7 +122,7 @@ export class ListComponent implements OnInit, AfterViewInit, OnDestroy {
if (this._sort && this._paginator) {
// Set the initial sort
this._sort.sort({
- id: 'name',
+ id: 'signinId',
start: 'asc',
disableClear: true,
});
@@ -186,6 +191,14 @@ export class ListComponent implements OnInit, AfterViewInit, OnDestroy {
*/
__toggleDetails(productId: string): void {}
+ /**
+ * toggle the search
+ * Used in 'bar'
+ */
+ __onClickSearch(): void {
+ this.__isSearchOpened = !this.__isSearchOpened;
+ }
+
/**
* Track by function for ngFor loops
*
diff --git a/src/app/modules/admin/report/comp-log/models/comp-log.ts b/src/app/modules/admin/report/comp-log/models/comp-log.ts
index 4e1e7c4..82b3d41 100644
--- a/src/app/modules/admin/report/comp-log/models/comp-log.ts
+++ b/src/app/modules/admin/report/comp-log/models/comp-log.ts
@@ -1,29 +1,18 @@
export interface CompLog {
- id?: string;
- totalPartnerCount?: number;
- totalHoldingMoney?: number;
- totalComp?: number;
- total?: number;
- branchCount?: number;
- divisionCount?: number;
- officeCount?: number;
- storeCount?: number;
- memberCount?: number;
+ id: string;
+ idx?: number;
+ rank?: string;
+ signinId?: string;
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;
- ip?: string;
- state?: string;
- note?: string;
+ rate?: number; // 요율
+ bettingMoney?: number;
+ beforeComp?: number; // 이전콤프
+ changeComp?: number; // 변동콤프
+ afterComp?: number; // 이후콤프
+ type?: string;
+ compContents?: string; // 내용
+ registrationDate?: Date; // 등록일시
+ memo?: string;
+ bettingId?: string; // 배팅ID
+ bettingNumber?: number; // 배팅번호
}