From b0e5604bec889fc231dd540d3b18c00972922e18 Mon Sep 17 00:00:00 2001 From: JUNG YI DAM Date: Sun, 24 Jul 2022 13:57:45 +0000 Subject: [PATCH] =?UTF-8?q?=EC=BF=A0=ED=8F=B0=EB=B0=9C=ED=96=89=EB=A1=9C?= =?UTF-8?q?=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 --- .../mock-api/apps/member/coupon-log/api.ts | 6 +- .../mock-api/apps/member/coupon-log/data.ts | 37 +- src/app/mock-api/apps/member/coupon/data.ts | 4 +- .../coupon-log/components/list.component.html | 461 +++++------------- .../coupon-log/components/list.component.ts | 21 +- .../member/coupon-log/models/coupon-log.ts | 37 +- .../coupon/components/list.component.html | 10 +- .../coupon/components/list.component.ts | 8 + .../admin/member/coupon/models/coupon.ts | 13 +- 9 files changed, 195 insertions(+), 402 deletions(-) diff --git a/src/app/mock-api/apps/member/coupon-log/api.ts b/src/app/mock-api/apps/member/coupon-log/api.ts index f8007af..41e1dd2 100644 --- a/src/app/mock-api/apps/member/coupon-log/api.ts +++ b/src/app/mock-api/apps/member/coupon-log/api.ts @@ -42,7 +42,11 @@ export class MemberCouponLogMockApi { let couponLogs: any[] | null = cloneDeep(this._couponLogs); // Sort the couponLogs - if (sort === 'sku' || sort === 'name' || sort === 'active') { + if ( + sort === 'issuedCouponId' || + sort === 'couponGroupNumber' || + sort === 'couponTitle' + ) { couponLogs.sort((a, b) => { const fieldA = a[sort].toString().toUpperCase(); const fieldB = b[sort].toString().toUpperCase(); diff --git a/src/app/mock-api/apps/member/coupon-log/data.ts b/src/app/mock-api/apps/member/coupon-log/data.ts index 9adbb02..d5ddb6f 100644 --- a/src/app/mock-api/apps/member/coupon-log/data.ts +++ b/src/app/mock-api/apps/member/coupon-log/data.ts @@ -2,32 +2,15 @@ export const couponLogs = [ { - 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: 4, + issuedCouponId: 'on04', + couponGroupNumber: 'Y071294JYS9AIYL4', + couponTitle: '쿠폰테스트', + issuedCouponMoney: 50000, + couponContents: '파트너페이지에서 쿠폰생성', + issuedCouponDate: '2022-06-12 16:22', + couponBeforeMoney: 50000, + couponAfterMoney: 0, }, ]; diff --git a/src/app/mock-api/apps/member/coupon/data.ts b/src/app/mock-api/apps/member/coupon/data.ts index d767bcb..128b828 100644 --- a/src/app/mock-api/apps/member/coupon/data.ts +++ b/src/app/mock-api/apps/member/coupon/data.ts @@ -5,8 +5,8 @@ export const coupons = [ id: '7eb7c859-1347-4317-96b6-9476a7e2ba3c', issuedCouponId: 'on04', issuedCouponNickname: 'on04', - receiveCouponId: 'onon6', - receiveCouponNickname: '가가가', + takeCouponId: 'onon6', + tkaeCouponNickname: '가가가', couponGroupNumber: '6L03ER50103AZOVS', couponSerialNumber: '3GWL2T6RQJ4WJLRTQMBIRFEO', issuedCoupons: '1/1', diff --git a/src/app/modules/admin/member/coupon-log/components/list.component.html b/src/app/modules/admin/member/coupon-log/components/list.component.html index 0a5803a..ec137c9 100644 --- a/src/app/modules/admin/member/coupon-log/components/list.component.html +++ b/src/app/modules/admin/member/coupon-log/components/list.component.html @@ -10,348 +10,135 @@ -
쿠폰발행 로그
+
쿠폰발행로그
- - - - - - - 40 - 60 - 80 - 100 - - - - - LV.1 - LV.2 - LV.3 - LV.4 - - - - - 정상 - 대기 - 탈퇴 - 휴면 - 블랙 - 정지 - - - - - 카지노제한 - 슬롯제한 - - - - - 계좌입금 - - - - - 카지노콤프 - 슬롯콤프 - 배팅콤프 - 첫충콤프 - - - +
- - - - - - - - -
- - - -
- -
- - -
- -
- - - - - - - - - - - - - - - - - - - - -
- - - -
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
- - -
- - - - - - -
- There are no coupon logs! +
+ +
+ + + + + + +
- +
+ + +
+ +
+ + +
+ +
+
번호
+
발행아이디
+
쿠폰그룹번호
+ + + + + + +
+ + + +
+
{{ couponLog.idx }}
+
+ {{ couponLog.issuedCouponId }} +
+
+ {{ couponLog.couponGroupNumber }} +
+ + + + + + +
+ + +
+ + + + + + +
+ There are no coupon log! +
+ +
+
diff --git a/src/app/modules/admin/member/coupon-log/components/list.component.ts b/src/app/modules/admin/member/coupon-log/components/list.component.ts index 04e9364..f630fc2 100644 --- a/src/app/modules/admin/member/coupon-log/components/list.component.ts +++ b/src/app/modules/admin/member/coupon-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: 40px 140px auto 140px 140px; @screen sm { - grid-template-columns: 60px 60px 60px 60px 60px 60px auto 60px; + /* 번호 발행 그룹 제목 이전 발행 */ + grid-template-columns: 40px 140px auto 140px 140px 140px; } @screen md { - grid-template-columns: 60px 60px 60px 60px 60px 60px auto 60px 60px; + /* 번호 발행 그룹 제목 이전 발행 이후 내용 */ + grid-template-columns: 40px 140px auto 140px 140px 140px 40px 140px; } @screen lg { - grid-template-columns: 60px 70px 70px 70px 70px 100px 60px 60px auto 60px 60px 60px 60px; + /* 번호 발행 그룹 제목 이전 발행 이후 내용 시간*/ + grid-template-columns: 40px 140px auto 140px 140px 140px 40px 200px 140px; } } `, @@ -69,6 +73,7 @@ export class ListComponent implements OnInit, AfterViewInit, OnDestroy { couponLogs$!: Observable; users$!: Observable; + __isSearchOpened = false; isLoading = false; searchInputControl = new FormControl(); selectedCouponLog?: CouponLog; @@ -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-log/models/coupon-log.ts b/src/app/modules/admin/member/coupon-log/models/coupon-log.ts index cc36309..7b217b6 100644 --- a/src/app/modules/admin/member/coupon-log/models/coupon-log.ts +++ b/src/app/modules/admin/member/coupon-log/models/coupon-log.ts @@ -1,29 +1,12 @@ export interface CouponLog { - 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; + issuedCouponId?: string; + couponGroupNumber?: string; + couponTitle?: string; + issuedCouponMoney?: number; + couponContents?: string; + issuedCouponDate?: Date; + couponBeforeMoney?: number; // 쿠폰이전금액 + couponAfterMoney?: number; // 쿠폰이후금액 } diff --git a/src/app/modules/admin/member/coupon/components/list.component.html b/src/app/modules/admin/member/coupon/components/list.component.html index 0e07a8d..791a8f6 100644 --- a/src/app/modules/admin/member/coupon/components/list.component.html +++ b/src/app/modules/admin/member/coupon/components/list.component.html @@ -13,7 +13,13 @@
쿠폰발행리스트
+
+