diff --git a/src/app/mock-api/apps/game/powerball/api.ts b/src/app/mock-api/apps/game/powerball/api.ts
index 4c8e8a8..cd22360 100644
--- a/src/app/mock-api/apps/game/powerball/api.ts
+++ b/src/app/mock-api/apps/game/powerball/api.ts
@@ -33,7 +33,7 @@ export class GamePowerballMockApi {
.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 GamePowerballMockApi {
let powerballs: any[] | null = cloneDeep(this._powerballs);
// Sort the powerballs
- if (sort === 'sku' || sort === 'name' || sort === 'active') {
+ if (sort === 'signinId' || sort === 'nickname' || sort === 'result') {
powerballs.sort((a, b) => {
const fieldA = a[sort].toString().toUpperCase();
const fieldB = b[sort].toString().toUpperCase();
diff --git a/src/app/mock-api/apps/game/powerball/data.ts b/src/app/mock-api/apps/game/powerball/data.ts
index 03203dc..9b69008 100644
--- a/src/app/mock-api/apps/game/powerball/data.ts
+++ b/src/app/mock-api/apps/game/powerball/data.ts
@@ -2,15 +2,10 @@
export const powerballs = [
{
- id: 'dsa01233',
- startDate: '2022-01-01 00:00',
- finishDate: '2022-06-21 23:59',
- totalBetting: 800000,
- winningMoney: 390000,
- proceedingMoney: 0,
- calculate: 410000,
- index: '4',
- way: '단식',
+ id: '7eb7c859-1347-4317-96b6-9476a7e2ba3c',
+ signinId: 'dsa01233',
+ idx: '4',
+ bettingType: '단식',
rank: '회원',
nickname: '아메리카노',
bettingProgress: '1166031회 일반볼 오버',
@@ -20,4 +15,46 @@ export const powerballs = [
bettingTime: '2022-04-24 22:36',
result: '실패',
},
+ {
+ id: '00b0292f-3d50-4669-a0c4-7a9d85efc98d',
+ signinId: 'dsa01233',
+ idx: '3',
+ bettingType: '단식',
+ rank: '회원',
+ nickname: '아메리카노',
+ bettingProgress: '1166030회 파워볼 오버',
+ odds: 1.95,
+ bettingMoney: 200000,
+ hitMoney: 390000,
+ bettingTime: '2022-04-24 22:30',
+ result: '실패',
+ },
+ {
+ id: 'b899ec30-b85a-40ab-bb1f-18a596d5c6de',
+ signinId: 'dsa01233',
+ idx: '2',
+ bettingType: '단식',
+ rank: '회원',
+ nickname: '아메리카노',
+ bettingProgress: '1166029회 파워볼 오버',
+ odds: 1.95,
+ bettingMoney: 200000,
+ hitMoney: 390000,
+ bettingTime: '2022-04-24 22:28',
+ result: '적중',
+ },
+ {
+ id: '8fcce528-d878-4cc8-99f7-bd3451ed5405',
+ signinId: 'dsa01233',
+ idx: '1',
+ bettingType: '단식',
+ rank: '회원',
+ nickname: '아메리카노',
+ bettingProgress: '1166028회 일반볼 오버',
+ odds: 1.95,
+ bettingMoney: 200000,
+ hitMoney: 390000,
+ bettingTime: '2022-04-24 22:23',
+ result: '실패',
+ },
];
diff --git a/src/app/modules/admin/game/powerball/components/list.component.html b/src/app/modules/admin/game/powerball/components/list.component.html
index fa9d0dd..75f78f1 100644
--- a/src/app/modules/admin/game/powerball/components/list.component.html
+++ b/src/app/modules/admin/game/powerball/components/list.component.html
@@ -10,65 +10,78 @@
-
+
-
-
+
+
+ 2022-01-01 00:00~
+ 2022-06-21 23:59
+ 까지의 총 베팅금액:800,000원
+ 당첨금액:390,000원
+ 진행중금액:0원
+ 정산:410,000원
+
+
+
+
+
+
+
+
+
+
+
+
+
-
+
+
+ 40
+ 60
+ 80
+ 100
+
+
+
파워볼
카지노
슬롯
-
+
전체
단폴
조합
-
-
- 리스트수
- 40
- 60
- 80
- 100
-
-
-
+
- 전체금액
100-50만미만
50만-100만미만
100만-200만이하
300만초과
-
+
진행목록
당첨
@@ -79,7 +92,7 @@
전체목록
-
+
아이디
닉네임
@@ -89,7 +102,8 @@
-
+
@@ -128,38 +143,21 @@
-
-
번호
-
구분
-
등급
-
아이디
-
- 배팅진행내역
+
번호
+
구분
+
+ 아이디
+
+ 닉네임
-
배당률
-
배팅액
-
배당적중금
-
배팅시간
-
결과
-
취소/삭제 여부
-
+
등급
+
배당율
+
베팅액
+
배당적중금
+
베팅시간
+
결과
+
취소/삭제여부
@@ -169,163 +167,53 @@
-
-
- {{ powerball.index }}
+
{{ powerball.idx }}
+
{{ powerball.bettingType }}
+
+ {{ powerball.signinId }}
+
+ {{ powerball.nickname }}
-
-
- LV.{{ powerball.way }}
+
+ {{ powerball.rank }}
-
-
-
-
-
-
-
-
-
- {{ powerball.id }}
- ({{ powerball.nickname }})
-
-
-
-
-
-
- {{ powerball.bettingProgress }}
-
-
-
-
+
{{ powerball.odds }}
-
-
-
- {{ powerball.bettingMoney }}원
+
+ {{ powerball.bettingMoney }}
-
-
-
- {{ powerball.hitMoney }}원
+
+ {{ powerball.hitMoney }}
-
-
-
+
{{ powerball.bettingTime }}
-
-
-
+
{{ powerball.result }}
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
@@ -347,7 +235,7 @@
- There are no powerball!
+ There are no Data!
diff --git a/src/app/modules/admin/game/powerball/components/list.component.ts b/src/app/modules/admin/game/powerball/components/list.component.ts
index fd01f57..7d97406 100644
--- a/src/app/modules/admin/game/powerball/components/list.component.ts
+++ b/src/app/modules/admin/game/powerball/components/list.component.ts
@@ -41,18 +41,22 @@ import { PowerballService } from '../services/powerball.service';
/* language=SCSS */
`
.inventory-grid {
- grid-template-columns: 60px auto 40px;
+ /* 번호 구분 아이디 등급 배당율 */
+ grid-template-columns: 20px 40px auto 40px 40px;
@screen sm {
- grid-template-columns: 60px auto 60px 72px;
+ /* 번호 구분 아이디 등급 배당율 배팅액 */
+ grid-template-columns: 20px 40px auto 40px 40px 100px;
}
@screen md {
- grid-template-columns: 60px 60px auto 112px 72px;
+ /* 번호 구분 아이디 등급 배당율 배팅액 적중 시간*/
+ grid-template-columns: 20px 40px auto 40px 40px 100px 140px 140px;
}
@screen lg {
- grid-template-columns: 60px 60px auto 112px 96px 96px 72px;
+ /* 번호 구분 아이디 등급 배당율 배팅액 적중 시간 결과 취소 */
+ grid-template-columns: 20px 40px auto 40px 40px 100px 140px 140px 140px 140px;
}
}
`,
@@ -68,6 +72,7 @@ export class ListComponent implements OnInit, AfterViewInit, OnDestroy {
powerballs$!: Observable
;
users$!: Observable;
+ __isSearchOpened = false;
isLoading = false;
searchInputControl = new FormControl();
selectedPowerball?: Powerball;
@@ -180,6 +185,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/game/powerball/models/powerball.ts b/src/app/modules/admin/game/powerball/models/powerball.ts
index 9964f0f..794eee9 100644
--- a/src/app/modules/admin/game/powerball/models/powerball.ts
+++ b/src/app/modules/admin/game/powerball/models/powerball.ts
@@ -1,19 +1,14 @@
export interface Powerball {
- id?: string;
+ id: string;
+ idx?: number;
+ signinId?: string;
nickname?: string;
- startDate?: string;
- finishDate?: string;
- totalBetting?: string;
- totalWinning?: number;
- proceedingMoney?: number;
- calculate?: number;
- index?: string;
- way?: string;
- rank?: string;
+ bettingType?: string; // 구분(단폴 or 다폴)
bettingProgress?: string;
odds?: number;
+ rank?: string;
bettingMoney?: number;
hitMoney?: number;
- bettingTime?: string;
+ bettingTime?: Date;
result?: string;
}