에볼루션배팅리스트 수정

This commit is contained in:
이담 정 2022-07-26 02:01:41 +00:00
parent 12ff578d4c
commit b3a792506b
8 changed files with 161 additions and 273 deletions

View File

@ -2,6 +2,7 @@
export const casinos = [
{
id: '7eb7c859-1347-4317-96b6-9476a7e2ba3c',
highRank: '[매장]kgon5',
gameId: 'ks1_1007',
siteId: 'aa100',
@ -17,7 +18,7 @@ export const casinos = [
bettingInfo1: 'Banker',
bettingInfo2: 8000,
bettingInfo3: 0,
compY: 'Y',
comp: 'Y',
mainofficeName: 'kgon1',
mainofficePercent: '1.00',
mainofficePoint: '10.00',

View File

@ -33,7 +33,7 @@ export class GameEvolutionMockApi {
.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 GameEvolutionMockApi {
let evolutions: any[] | null = cloneDeep(this._evolutions);
// Sort the evolutions
if (sort === 'sku' || sort === 'name' || sort === 'active') {
if (sort === 'signinId' || sort === 'nickname' || sort === 'gameId') {
evolutions.sort((a, b) => {
const fieldA = a[sort].toString().toUpperCase();
const fieldB = b[sort].toString().toUpperCase();

View File

@ -2,41 +2,24 @@
export const evolutions = [
{
startDate: '2022-06-01 00:00',
finishDate: '2022-06-21 23:59',
availableBetting: 11545000,
bettingMoney: 11811000,
winningMoney: 11405200,
cancel: 0,
betWinCancel: 405800,
mainofficeRolling: 58114,
branchRolling: 34514,
divisionRolling: 23058,
officeRolling: 22982,
storeRolling: 11787,
memberRolling: 80295,
totalrolling: 230750,
id: '7eb7c859-1347-4317-96b6-9476a7e2ba3c',
signinId: 'aa100',
highRank: '[매장]kgon5',
gameId: 'ks1_1007',
id: 'aa100',
nickname: 'aa100',
gameName: '에볼류션 카지노',
gameInfo1: 'Speed Baccarat J',
gameInfo2: '',
gameInfo3: '62ae9bdd396a5971c3921033',
form: '',
betting: 8000,
profitLoss: -8000,
beforeWinning: 69831,
winning: 0,
afterWinning: 69831,
beforeBetting: 77831,
afterBetting: 69831,
finalMoney: 69831,
bettingInfo1: 'Banker',
bettingInfo2: 8000,
bettingInfo3: 0,
data: '데이터확인',
comp: 'Y',
mainofficeName: 'kgon1',
mainofficePercent: '0.50',
@ -57,6 +40,6 @@ export const evolutions = [
memberPercent: '0.70',
memberPoint: '56.00',
bettingTime: '2022-06-19 12:44:33',
registrationTime: '2022-06-19 12:47:02',
registrationDate: '2022-06-19 12:47:02',
},
];

View File

@ -218,7 +218,7 @@
</button>
</div>
<div class="hidden md:block">
{{ casino.compY }}
{{ casino.comp }}
</div>
<div class="hidden lg:block">
본사{{ casino.mainofficeName }}({{
@ -226,8 +226,8 @@
}}%&nbsp;:&nbsp;{{ casino.mainofficePoint }}P)
<hr style="margin: 7px 0px" />
대본{{ casino.branchName }}({{
casino.beforeWinning
}}%&nbsp;:&nbsp;{{ casino.beforeWinning }}P)
casino.branchPercent
}}%&nbsp;:&nbsp;{{ casino.branchPoint }}P)
<hr style="margin: 7px 0px" />
부본{{ casino.divisionName }}({{
casino.divisionPercent

View File

@ -15,7 +15,7 @@ export interface Casino {
bettingInfo1?: string;
bettingInfo2?: number;
bettingInfo3?: number;
compY?: string;
comp?: string;
mainofficeName?: string;
mainofficePercent?: number;
mainofficePoint?: number;

View File

@ -10,40 +10,67 @@
<mat-progress-bar [mode]="'indeterminate'"></mat-progress-bar>
</div>
<!-- Title -->
<div class="text-4xl font-extrabold tracking-tight">Evolution</div>
<div class="text-4xl font-extrabold tracking-tight">에볼루션배팅리스트</div>
<!-- Actions -->
<div class="flex shrink-0 items-center mt-6 sm:mt-0 sm:ml-4">
<!-- Memo -->
<!-- <mat-form-field>
<ng-container *ngIf="evolutions$ | async as evolutions">
<ng-container *ngFor="let evolution of evolutions; trackBy: __trackByFn">
<div
class="inventory-grid grid items-center gap-4 py-3 px-6 md:px-8 border-b"
>
<fieldset>
{{ evolution.startDate }}~{{ evolution.finishDate }}까지의 총
유효배팅:{{ evolution.availableBetting }}원, 배팅금액:{{
evolution.bettingMoney
}}원, 당첨:{{ evolution.winning }}원, 취소:{{ evolution.cancel }}원,
배팅-당첨-취소:{{ evolution.betWinCancel }}원, 본사롤링:{{
evolution.mainofficeRolling
}}원, 대본롤링:{{ evolution.branchRolling }}원, 부본롤링:{{
evolution.divisionRolling
}}원, 총판롤링:{{ evolution.officeRolling }}원, 매장롤링:{{
evolution.storeRolling
}}원, 회원롤링:{{ evolution.memberRolling }}원, 롤링합계:{{
evolution.totalrolling
}}원
</fieldset>
</div>
</ng-container>
</ng-container>
</mat-form-field> -->
<!-- Search -->
<div>
<span style="color: blue">2022-01-01 00:00</span><span>~</span>
<span style="color: blue">2022-06-21 23:59</span>
<span
>까지의 총 유효배팅:<span style="color: red">12,440,000</span></span
>&nbsp;&nbsp;
<span>배팅금액:<span style="color: red">12,751,000</span></span
>&nbsp;&nbsp;
<span>당첨:<span style="color: red">12,199,950</span></span
>&nbsp;&nbsp;
<span>취소:<span style="color: red">10,000</span></span>&nbsp;&nbsp;
<span>배팅-당첨-취소:<span style="color: red">542,050</span></span
>&nbsp;&nbsp;
<span>본사롤링:<span style="color: red">60,202</span></span
>&nbsp;&nbsp;
<span>대본롤링:<span style="color: red">36,390</span></span
>&nbsp;&nbsp;
<span>부본롤링:<span style="color: red">24,828</span></span
>&nbsp;&nbsp;
<span>총판롤링:<span style="color: red">24,752</span></span
>&nbsp;&nbsp;
<span>매장롤링:<span style="color: red">13,451</span></span
>&nbsp;&nbsp;
<span>회원롤링:<span style="color: red">81,037</span></span
>&nbsp;&nbsp;
<span>롤링합계:<span style="color: red">240,660</span></span>
</div>
<button mat-icon-button (click)="__onClickSearch()">
<mat-icon [svgIcon]="'heroicons_outline:search'"></mat-icon>
</button>
</div>
</div>
<!-- Memo -->
<div
class="relative flex flex-col sm:flex-row flex-0 sm:items-center sm:justify-between py-4 px-6 md:px-8 border-b"
>
<!-- <mat-form-field
class="bet-mat-form-field-wrapper-mb-0 mr-2"
style="width: 100%"
>
<textarea matInput cdkTextareaAutosize cdkAutosizeMinRows="2"></textarea>
</mat-form-field>
<button mat-flat-button [color]="'primary'">메모저장</button> -->
</div>
<!-- Search -->
<div
*ngIf="__isSearchOpened"
class="relative flex flex-col sm:flex-row flex-0 sm:items-center sm:justify-between py-4 px-6 md:px-8 border-b"
>
<!-- Actions -->
<div fxLayout="row wrap" class="items-center mt-6 sm:mt-0 sm:ml-0">
<!-- SelectBox -->
<mat-form-field>
<mat-select placeholder="전체금액">
<mat-option value="">전체금액</mat-option>
<mat-form-field fxFlex class="bet-mat-form-field-wrapper-mb-0 mr-2">
<mat-select placeholder="전체">
<mat-option value="">전체</mat-option>
<mat-option value="">배팅100만미만</mat-option>
<mat-option value="">배팅100-300만</mat-option>
<mat-option value="">배팅300-500만</mat-option>
@ -51,8 +78,8 @@
<mat-option value="">당첨1000만초과</mat-option>
</mat-select>
</mat-form-field>
<mat-form-field>
<mat-select placeholder="검색">
<mat-form-field fxFlex class="bet-mat-form-field-wrapper-mb-0 mr-2">
<mat-select placeholder="검색항목">
<mat-option value="">아이디</mat-option>
<mat-option value="">게임아이디</mat-option>
<mat-option value="">닉네임</mat-option>
@ -61,7 +88,8 @@
</mat-form-field>
<!-- Search -->
<mat-form-field
class="fuse-mat-dense fuse-mat-no-subscript fuse-mat-rounded min-w-64"
fxFlex
class="fuse-mat-rounded min-w-64 bet-mat-form-field-wrapper-mb-0 mr-2"
>
<mat-icon
class="icon-size-5"
@ -72,18 +100,19 @@
matInput
[formControl]="searchInputControl"
[autocomplete]="'off'"
[placeholder]="'Search'"
[placeholder]="'Search user'"
/>
</mat-form-field>
<!-- Search button -->
<!-- Add user button -->
<button
class="ml-4"
fxFlex
mat-flat-button
style="position: fixed; margin-top: 4px"
[color]="'primary'"
(click)="__createProduct()"
>
<!-- <mat-icon [svgIcon]="'heroicons_outline:plus'"></mat-icon> -->
<span class="ml-2 mr-1">검색하기</span>
<mat-icon [svgIcon]="'heroicons_outline:search'"></mat-icon>
<span class="ml-2 mr-1">Search</span>
</button>
</div>
</div>
@ -100,33 +129,21 @@
<!-- Header -->
<div
class="inventory-grid z-10 sticky top-0 grid gap-4 py-4 px-6 md:px-8 shadow text-md font-semibold text-secondary bg-gray-50 dark:bg-black dark:bg-opacity-5"
matSort
matSortDisableClear
>
<div></div>
<div class="hidden sm:block">상위</div>
<div class="hidden sm:block">유저</div>
<div class="hidden sm:block">게임</div>
<div class="hidden sm:block">형식</div>
<div>상부</div>
<div>유저</div>
<div>게임</div>
<div class="hidden sm:block">금액</div>
<div class="hidden sm:block">최종금액</div>
<div class="hidden sm:block">배팅</div>
<div class="hidden sm:block">데이터</div>
<div class="hidden sm:block">콤프</div>
<div class="hidden sm:block">롤링</div>
<div class="hidden sm:block">배팅시간 등록시간</div>
<!-- <div class="hidden md:block" [mat-sort-header]="'sku'">SKU</div>
<div [mat-sort-header]="'name'">Name</div>
<div class="hidden sm:block" [mat-sort-header]="'price'">
Price
<div class="hidden md:block">배팅</div>
<div class="hidden md:block">데이터</div>
<div class="hidden md:block">콤프</div>
<div class="hidden lg:block">롤링</div>
<div class="hidden lg:block">
배팅시간
<hr style="margin: 7px 0px" />
등록시간
</div>
<div class="hidden lg:block" [mat-sort-header]="'stock'">
Stock
</div>
<div class="hidden lg:block" [mat-sort-header]="'active'">
Active
</div>
<div class="hidden sm:block">Details</div> -->
</div>
<!-- Rows -->
<ng-container *ngIf="evolutions$ | async as evolutions">
@ -136,191 +153,86 @@
<div
class="inventory-grid grid items-center gap-4 py-3 px-6 md:px-8 border-b"
>
<!-- highRank -->
<div class="hidden sm:block truncate">
<button mat-flat-button [color]="'primary'">
{{ evolution.highRank }}
</button>
<div>{{ evolution.highRank }}</div>
<div>
게임ID{{ evolution.gameId }}
<hr style="margin: 7px 0px" />
사이트ID{{ evolution.signinId }}
<hr style="margin: 7px 0px" />
닉네임{{ evolution.nickname }}
</div>
<!-- userInfo -->
<div class="hidden sm:block truncate">
{{ evolution.gameId }}
{{ evolution.id }}
{{ evolution.nickname }}
</div>
<!-- game -->
<div class="hidden sm:block truncate">
<button mat-flat-button [color]="'primary'">
{{ evolution.gameName }}
</button>
<div>
{{ evolution.gameName }}
<hr style="margin: 7px 0px" />
{{ evolution.gameInfo1 }}
<hr style="margin: 7px 0px" />
{{ evolution.gameInfo2 }}
<hr style="margin: 7px 0px" />
{{ evolution.gameInfo3 }}
</div>
<!-- form -->
<!-- <div class="hidden sm:block truncate">
{{ evolution.form }}
</div> -->
<!-- money -->
<div class="hidden sm:block truncate">
배팅{{ evolution.betting }} 당첨{{
evolution.winning
}}
<div class="hidden sm:block">
배팅{{ evolution.betting }}
<hr style="margin: 7px 0px" />
당첨{{ evolution.winning }}
<hr style="margin: 7px 0px" />
손익{{ evolution.profitLoss }}
</div>
<!-- finalMoney -->
<div class="hidden sm:block truncate">
배팅 전{{ evolution.beforeBetting }} 배팅 후{{
evolution.afterBetting
}}
<div class="hidden sm:block">
배팅전{{ evolution.beforeBetting }}
<hr style="margin: 7px 0px" />
배팅후{{ evolution.afterBetting }}
<hr style="margin: 7px 0px" />
최종금액{{ evolution.finalMoney }}
</div>
<!-- betting -->
<div class="hidden sm:block truncate">
<div class="hidden md:block">
{{ evolution.bettingInfo1 }}
<hr style="margin: 7px 0px" />
{{ evolution.bettingInfo2 }}
<hr style="margin: 7px 0px" />
{{ evolution.bettingInfo3 }}
</div>
<!-- data -->
<div class="hidden sm:block truncate">
<button mat-flat-button [color]="'primary'">
{{ evolution.data }}
<div class="hidden md:block">
<button
mat-flat-button
class="bet-mat-small-8"
[color]="'warn'"
>
데이터확인
</button>
</div>
<!-- comp -->
<div class="hidden sm:block truncate">
<div class="hidden md:block">
{{ evolution.comp }}
</div>
<!-- rolling -->
<div class="hidden sm:block truncate">
본사:{{ evolution.mainofficeName }}({{
<div class="hidden lg:block">
본사{{ evolution.mainofficeName }}({{
evolution.mainofficePercent
}}%,{{ evolution.mainofficePoint }}P) 대본:{{
evolution.branchName
}}({{ evolution.branchPercent }}%,{{
evolution.branchPoint
}}P) 부본:{{ evolution.divisionName }}({{
}}%&nbsp;:&nbsp;{{ evolution.mainofficePoint }}P)
<hr style="margin: 7px 0px" />
대본{{ evolution.branchName }}({{
evolution.branchPercent
}}%&nbsp;:&nbsp;{{ evolution.branchPoint }}P)
<hr style="margin: 7px 0px" />
부본{{ evolution.divisionName }}({{
evolution.divisionPercent
}}%,{{ evolution.divisionPoint }}P) 총판:{{
evolution.officeName
}}({{ evolution.officePercent }}%,{{
evolution.officePoint
}}P) 매장:{{ evolution.storeName }}({{
}}%&nbsp;:&nbsp;{{ evolution.divisionPoint }}P)
<hr style="margin: 7px 0px" />
총판{{ evolution.officeName }}({{
evolution.officePercent
}}%&nbsp;:&nbsp;{{ evolution.officePoint }}P)
<hr style="margin: 7px 0px" />
매장{{ evolution.storeName }}({{
evolution.storePercent
}}%,{{ evolution.storePoint }}P) 회원:{{
evolution.memberName
}}({{ evolution.memberPercent }}%,{{
evolution.memberPoint
}}P)
}}%&nbsp;:&nbsp;{{ evolution.storePoint }}P)
<hr style="margin: 7px 0px" />
회원{{ evolution.memberName }}({{
evolution.memberPercent
}}%&nbsp;:&nbsp;{{ evolution.memberPoint }}P)
</div>
<!-- bettingTime -->
<div class="hidden sm:block truncate">
<div class="hidden lg:block">
{{ evolution.bettingTime }}
{{ evolution.registrationTime }}
<hr style="margin: 7px 0px" />
{{ evolution.registrationDate }}
</div>
<!-- Image -->
<!-- <div class="flex items-center">
<div
class="relative flex flex-0 items-center justify-center w-12 h-12 mr-6 rounded overflow-hidden border"
>
<img
class="w-8"
*ngIf="user.thumbnail"
[alt]="'Product thumbnail image'"
[src]="user.thumbnail"
/>
<div
class="flex items-center justify-center w-full h-full text-xs font-semibold leading-none text-center uppercase"
*ngIf="!user.thumbnail"
>
NO THUMB
</div>
</div>
</div> -->
<!-- SKU -->
<!-- <div class="hidden md:block truncate">
{{ user.sku }}
</div> -->
<!-- Name -->
<!-- <div class="truncate">
{{ user.name }}
</div> -->
<!-- Price -->
<!-- <div class="hidden sm:block">
{{ user.price | currency: "USD":"symbol":"1.2-2" }}
</div> -->
<!-- Stock -->
<!-- <div class="hidden lg:flex items-center">
<div class="min-w-4">{{ user.stock }}</div> -->
<!-- Low stock -->
<!-- <div
class="flex items-end ml-2 w-1 h-4 bg-red-200 rounded overflow-hidden"
*ngIf="user.stock < 20"
>
<div class="flex w-full h-1/3 bg-red-600"></div>
</div> -->
<!-- Medium stock -->
<!-- <div
class="flex items-end ml-2 w-1 h-4 bg-orange-200 rounded overflow-hidden"
*ngIf="user.stock >= 20 && user.stock < 30"
>
<div class="flex w-full h-2/4 bg-orange-400"></div>
</div> -->
<!-- High stock -->
<!-- <div
class="flex items-end ml-2 w-1 h-4 bg-green-100 rounded overflow-hidden"
*ngIf="user.stock >= 30"
>
<div class="flex w-full h-full bg-green-400"></div>
</div>
</div> -->
<!-- Active -->
<!-- <div class="hidden lg:block">
<ng-container *ngIf="user.active">
<mat-icon
class="text-green-400 icon-size-5"
[svgIcon]="'heroicons_solid:check'"
></mat-icon>
</ng-container>
<ng-container *ngIf="!user.active">
<mat-icon
class="text-gray-400 icon-size-5"
[svgIcon]="'heroicons_solid:x'"
></mat-icon>
</ng-container>
</div> -->
<!-- Details button -->
<!-- <div>
<button
class="min-w-10 min-h-7 h-7 px-2 leading-6"
mat-stroked-button
(click)="__toggleDetails(user.id)"
>
<mat-icon
class="icon-size-5"
[svgIcon]="
selectedUser?.id === user.id
? 'heroicons_solid:chevron-up'
: 'heroicons_solid:chevron-down'
"
></mat-icon>
</button>
</div> -->
</div>
</ng-container>
</ng-container>
@ -342,7 +254,7 @@
<div
class="p-8 sm:p-16 border-t text-4xl font-semibold tracking-tight text-center"
>
There are no evolution!
There are no data!
</div>
</ng-template>
</div>

View File

@ -66,6 +66,7 @@ export class ListComponent implements OnInit, AfterViewInit, OnDestroy {
evolutions$!: Observable<Evolution[] | undefined>;
__isSearchOpened = false;
isLoading = false;
searchInputControl = new FormControl();
selectedEvolution?: Evolution;
@ -178,6 +179,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
*

View File

@ -1,19 +1,6 @@
export interface Evolution {
id?: string;
startDate?: string;
finishDate?: string;
availableBetting?: number;
bettingMoney?: number;
winningMoney?: number;
cancel?: number;
betWinCancel?: number;
mainofficeRolling?: number;
branchRolling?: number;
divisionRolling?: number;
officeRolling?: number;
storeRolling?: number;
memberRolling?: number;
totalrolling?: number;
id: string;
signinId?: string;
highRank?: string;
gameId?: string;
nickname?: string;
@ -21,19 +8,15 @@ export interface Evolution {
gameInfo1?: string;
gameInfo2?: string;
gameInfo3?: string;
form?: string;
betting?: number;
profitLoss?: number;
beforeWinning?: number;
winning?: number;
afterWinning?: number;
beforeBetting?: number;
profitLoss?: number;
afterBetting?: number;
beforeBetting?: number;
finalMoney?: number;
bettingInfo1?: string;
bettingInfo2?: number;
bettingInfo3?: number;
data?: string;
comp?: string;
mainofficeName?: string;
mainofficePercent?: number;
@ -54,5 +37,5 @@ export interface Evolution {
memberPercent?: number;
memberPoint?: number;
bettingTime?: string;
registrationTime?: string;
registrationDate?: string;
}