From 3401a2dea17168779832ca400608a19de7fcb2ed Mon Sep 17 00:00:00 2001 From: JUNG YI DAM Date: Sun, 24 Jul 2022 13:07:36 +0000 Subject: [PATCH] =?UTF-8?q?=EC=BF=A0=ED=8F=B0=EB=B0=9C=ED=96=89=EB=A8=B8?= =?UTF-8?q?=EB=8B=88=EB=A1=9C=EA=B7=B8=20=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../apps/member/coupon-money-log/data.ts | 42 +- .../components/list.component.html | 489 ++++++------------ .../components/list.component.ts | 21 +- .../models/coupon-money-log.ts | 65 ++- 4 files changed, 219 insertions(+), 398 deletions(-) diff --git a/src/app/mock-api/apps/member/coupon-money-log/data.ts b/src/app/mock-api/apps/member/coupon-money-log/data.ts index 3054287..94594ec 100644 --- a/src/app/mock-api/apps/member/coupon-money-log/data.ts +++ b/src/app/mock-api/apps/member/coupon-money-log/data.ts @@ -2,32 +2,20 @@ export const couponMoneyLogs = [ { - 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: 15, + giveCouponId: 'ADMIN', + giveCouponRank: 'ADMIN', + takeCouponId: 'on04', + takeCouponRank: '매장', + giveCouponBeforeMoney: 0, + giveCouponVarianceMoney: -50000, + giveCouponAfterMoney: 0, + takeCouponBeforeMoney: 0, + takeCouponVarianceMoney: 50000, + takeCouponAfterMoney: 50000, + couponContents: '오링쿠폰', + giveCouponRegistrationDate: '2022-06-12 16:22', + takeCouponRegistrationDate: '2022-06-12 16:22', }, ]; diff --git a/src/app/modules/admin/member/coupon-money-log/components/list.component.html b/src/app/modules/admin/member/coupon-money-log/components/list.component.html index a3e101d..0ca9221 100644 --- a/src/app/modules/admin/member/coupon-money-log/components/list.component.html +++ b/src/app/modules/admin/member/coupon-money-log/components/list.component.html @@ -10,351 +10,160 @@ -
쿠폰발행 머니로그
+
쿠폰발행머니로그
- - - - - - - 40 - 60 - 80 - 100 - - - - - LV.1 - LV.2 - LV.3 - LV.4 - - - - - 정상 - 대기 - 탈퇴 - 휴면 - 블랙 - 정지 - - - - - 카지노제한 - 슬롯제한 - - - - - 계좌입금 - - - - - 카지노콤프 - 슬롯콤프 - 배팅콤프 - 첫충콤프 - - - +
- - - - - - - - -
- - - -
- -
- - -
- -
- - - - - - - - - - - - - - - - - - - - -
- - - -
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
- - -
- - - - - - -
- There are no coupon money logs! +
+ +
+ + + + + + +
- +
+ + +
+ +
+ + +
+ +
+
번호
+
비고
+
정보
+ + + + + + +
+ + + +
+
{{ couponMoneyLog.idx }}
+
+ {{ couponMoneyLog.giveCouponRank + }}{{ couponMoneyLog.takeCouponRank }}지급 +
+
+ {{ couponMoneyLog.giveCouponRank + }}{{ couponMoneyLog.giveCouponId }} + + {{ couponMoneyLog.takeCouponRank + }}{{ couponMoneyLog.takeCouponId }} +
+ + + + + + +
+ + +
+ + + + + + +
+ There are no coupon money log! +
+ +
+
diff --git a/src/app/modules/admin/member/coupon-money-log/components/list.component.ts b/src/app/modules/admin/member/coupon-money-log/components/list.component.ts index ade4b29..705472a 100644 --- a/src/app/modules/admin/member/coupon-money-log/components/list.component.ts +++ b/src/app/modules/admin/member/coupon-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: 20px 140px 140px auto 140px; @screen sm { - grid-template-columns: 60px 60px 60px 60px 60px 60px auto 60px; + /* 번호 비고 정보 아이디 이전 변동 */ + grid-template-columns: 20px 140px 140px auto 140px 40px 140px 140px; } @screen md { - grid-template-columns: 60px 60px 60px 60px 60px 60px auto 60px 60px; + /* 번호 비고 정보 아이디 이전 변동 이후 */ + grid-template-columns: 20px 140px 140px auto 140px 40px 140px; } @screen lg { - grid-template-columns: 60px 70px 70px 70px 70px 100px 60px 60px auto 60px 60px 60px 60px; + /* 번호 비고 정보 아이디 이전 변동 이후 내용 등록시간 */ + grid-template-columns: 20px 140px 140px auto 140px 140px 140px 140px 140px; } } `, @@ -69,6 +73,7 @@ export class ListComponent implements OnInit, AfterViewInit, OnDestroy { couponMoneyLogs$!: Observable; users$!: Observable; + __isSearchOpened = false; isLoading = false; searchInputControl = new FormControl(); selectedCouponMoneyLog?: CouponMoneyLog; @@ -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/member/coupon-money-log/models/coupon-money-log.ts b/src/app/modules/admin/member/coupon-money-log/models/coupon-money-log.ts index 5c9023a..fce2454 100644 --- a/src/app/modules/admin/member/coupon-money-log/models/coupon-money-log.ts +++ b/src/app/modules/admin/member/coupon-money-log/models/coupon-money-log.ts @@ -1,29 +1,40 @@ export interface CouponMoneyLog { - 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; - ip?: string; - state?: string; - note?: string; + id: string; + idx?: number; + giveCouponId?: string; // 쿠폰지급 해준 아이디 + giveCouponRank?: string; // 쿠폰지급 해준 등급 + takeCouponId?: string; // 쿠폰지급 받은 아이디 + takeCouponRank?: string; // 쿠폰지급 받은 등급 + useCouponId?: string; // 쿠폰사용 아이디 + useCouponRank?: string; // 쿠폰사용 등급 + retrieveCouponId?: string; // 쿠폰 회수 아이디 + retrieveCouponRank?: string; // 쿠폰 회수 등급 + + giveCouponBeforeMoney?: number; // 지급자의 이전금액 + giveCouponVarianceMoney?: number; // 지급자의 변동금액 + giveCouponAfterMoney?: number; // 지급자의 이후금액 + + takeCouponBeforeMoney?: number; // 받은자의 이전금액 + takeCouponVarianceMoney?: number; // 받은자의 변동금액 + takeCouponAfterMoney?: number; // 받은자의 이후금액 + + useCouponBeforeMoney?: number; // 쿠폰사용자의 이전금액 + useCouponVarianceMoney?: number; // 쿠폰사용자의 변동금액 + useCouponAfterMoney?: number; // 쿠폰사용자의 이후금액 + + retrieveCouponBeforeMoney?: number; // 쿠폰회수자의 이전금액 + retrieveCouponVarianceMoney?: number; // 쿠폰회수자의 변동금액 + retrieveCouponAfterMoney?: number; // 쿠폰회수자의 이후금액 + + couponContents?: string; // 내용 + giveCouponRegistrationDate?: Date; // 지급자의 등록시간 + takeCouponRegistrationDate?: Date; // 받은자의 등록시간 + useCouponRegistrationDate?: Date; // 쿠폰사용자의 등록시간 + retrieveCouponRegistrationDate?: Date; // 쿠폰회수자의 등록시간 } + +// give - take +// 쿠폰지급 - 쿠폰지급 받음 + +// use - retrieve +// 쿠폰사용 - 쿠폰회수