- 캐쉬{{ moneyLog.ownCash }} 콤프{{ moneyLog.ownComp }} 쿠폰{{
- moneyLog.ownCoupon
- }}
+
+ {{ moneyLog.afterMoney }}
-
-
- {{ moneyLog.gameMoney }}
+
+ {{ moneyLog.memo }}
-
-
-
-
-
-
-
- {{ moneyLog.todayComp }}P
-
-
-
- 입금{{ moneyLog.totalDeposit }} 출금{{
- moneyLog.totalWithdraw
- }}
- 차익{{ moneyLog.balance }}
-
-
-
- 가입{{ moneyLog.registDate }} 최종{{
- moneyLog.finalSigninDate
- }}
- IP{{ moneyLog.ip }}
-
-
-
- {{ moneyLog.state }}
-
-
-
- {{ moneyLog.memberCount }}
-
-
-
-
+
+ {{ moneyLog.bettingNumber }}
@@ -347,7 +204,7 @@
- There are no moneyLogs!
+ There are no data!
diff --git a/src/app/modules/admin/report/money-log/components/list.component.ts b/src/app/modules/admin/report/money-log/components/list.component.ts
index ec75941..f6454ca 100644
--- a/src/app/modules/admin/report/money-log/components/list.component.ts
+++ b/src/app/modules/admin/report/money-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 100px auto 60px 60px 60px;
@screen sm {
- grid-template-columns: 60px 60px 60px 60px 60px 60px auto 60px;
+ /* 날짜 아이디 내역 이전 변동 이후 메모 배팅 */
+ grid-template-columns: 60px 100px auto 60px 60px 60px 40px 60px;
}
@screen md {
- grid-template-columns: 60px 60px 60px 60px 60px 60px auto 60px 60px;
+ /* 날짜 아이디 내역 이전 변동 이후 메모 배팅 */
+ grid-template-columns: 60px 100px auto 60px 60px 60px 40px 60px;
}
@screen lg {
- grid-template-columns: 60px 70px 70px 70px 70px 100px 60px 60px auto 60px 60px 60px 60px;
+ /* 날짜 아이디 내역 이전 변동 이후 메모 배팅 */
+ grid-template-columns: 60px 100px auto 60px 60px 60px 40px 60px;
}
}
`,
@@ -69,6 +73,7 @@ export class ListComponent implements OnInit, AfterViewInit, OnDestroy {
moneyLogs$!: Observable
;
users$!: Observable;
+ __isSearchOpened = false;
isLoading = false;
searchInputControl = new FormControl();
selectedMoneyLog?: MoneyLog;
@@ -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/money-log/models/money-log.ts b/src/app/modules/admin/report/money-log/models/money-log.ts
index f7b25f6..f7929ae 100644
--- a/src/app/modules/admin/report/money-log/models/money-log.ts
+++ b/src/app/modules/admin/report/money-log/models/money-log.ts
@@ -1,29 +1,12 @@
export interface MoneyLog {
- id?: string;
- totalPartnerCount?: number;
- totalHoldingMoney?: number;
- totalComp?: number;
- total?: number;
- branchCount?: number;
- divisionCount?: number;
- officeCount?: number;
- storeCount?: number;
- memberCount?: number;
+ id: string;
+ finalSigninDate?: Date;
+ 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;
+ history?: string;
+ beforeMoney?: number;
+ changeMoney?: number;
+ afterMoney?: number;
+ memo?: string;
+ bettingNumber?: number;
}
diff --git a/src/app/modules/admin/report/money-log/money-log.module.ts b/src/app/modules/admin/report/money-log/money-log.module.ts
index b2a9bf5..747306f 100644
--- a/src/app/modules/admin/report/money-log/money-log.module.ts
+++ b/src/app/modules/admin/report/money-log/money-log.module.ts
@@ -12,9 +12,7 @@ import { MatSortModule } from '@angular/material/sort';
import { MatSelectModule } from '@angular/material/select';
import { MatTooltipModule } from '@angular/material/tooltip';
import { MatGridListModule } from '@angular/material/grid-list';
-import { MatSlideToggleModule } from '@angular/material/slide-toggle';
-import { MatRadioModule } from '@angular/material/radio';
-import { MatCheckboxModule } from '@angular/material/checkbox';
+import { MatDatepickerModule } from '@angular/material/datepicker';
import { TranslocoModule } from '@ngneat/transloco';
@@ -42,9 +40,7 @@ import { moneyLogRoutes } from './money-log.routing';
MatSelectModule,
MatTooltipModule,
MatGridListModule,
- MatSlideToggleModule,
- MatRadioModule,
- MatCheckboxModule,
+ MatDatepickerModule,
],
})
export class MoneyLogModule {}