엑셀 다운로그 페이지 수정

This commit is contained in:
Park Byung Eun 2022-08-03 10:47:05 +00:00
parent 5aab6cd3a8
commit bf0a7228fa
6 changed files with 156 additions and 380 deletions

View File

@ -33,8 +33,8 @@ export class ReportExcelLogMockApi {
.reply(({ request }) => { .reply(({ request }) => {
// Get available queries // Get available queries
const search = request.params.get('search'); const search = request.params.get('search');
const sort = request.params.get('sort') || 'name'; // const sort = request.params.get('sort') || 'name';
const order = request.params.get('order') || 'asc'; // const order = request.params.get('order') || 'asc';
const page = parseInt(request.params.get('page') ?? '1', 10); const page = parseInt(request.params.get('page') ?? '1', 10);
const size = parseInt(request.params.get('size') ?? '10', 10); const size = parseInt(request.params.get('size') ?? '10', 10);
@ -42,19 +42,19 @@ export class ReportExcelLogMockApi {
let excelLogs: any[] | null = cloneDeep(this._excelLogs); let excelLogs: any[] | null = cloneDeep(this._excelLogs);
// Sort the excelLogs // Sort the excelLogs
if (sort === 'sku' || sort === 'name' || sort === 'active') { // if (sort === 'sku' || sort === 'name' || sort === 'active') {
excelLogs.sort((a, b) => { // excelLogs.sort((a, b) => {
const fieldA = a[sort].toString().toUpperCase(); // const fieldA = a[sort].toString().toUpperCase();
const fieldB = b[sort].toString().toUpperCase(); // const fieldB = b[sort].toString().toUpperCase();
return order === 'asc' // return order === 'asc'
? fieldA.localeCompare(fieldB) // ? fieldA.localeCompare(fieldB)
: fieldB.localeCompare(fieldA); // : fieldB.localeCompare(fieldA);
}); // });
} else { // } else {
excelLogs.sort((a, b) => // excelLogs.sort((a, b) =>
order === 'asc' ? a[sort] - b[sort] : b[sort] - a[sort] // order === 'asc' ? a[sort] - b[sort] : b[sort] - a[sort]
); // );
} // }
// If search exists... // If search exists...
if (search) { if (search) {

View File

@ -2,32 +2,45 @@
export const excelLogs = [ export const excelLogs = [
{ {
id: 'on00', id: '1',
totalPartnerCount: '5', downloadIp: '192.168.1.101',
totalHoldingMoney: 303675, content: '회원리스트엑셀다운로드',
totalComp: 108933, downloadDate: '2022-01-01 16:42',
total: 412608, },
branchCount: 1, {
divisionCount: 1, id: '2',
officeCount: 1, downloadIp: '192.168.1.101',
storeCount: 1, content: '루징보고서 엑셀다운로드',
memberCount: 1, downloadDate: '2022-01-01 16:42',
nickname: 'on00', },
accountHolder: '11', {
phoneNumber: '010-1111-1111', id: '3',
calculateType: '롤링', downloadIp: '192.168.1.201',
ownCash: 50000, content: '부본사 정산 엑셀 다운로드',
ownComp: 1711, downloadDate: '2022-01-01 16:42',
ownCoupon: 50000, },
gameMoney: 0, {
todayComp: 0, id: '4',
totalDeposit: 0, downloadIp: '192.168.1.121',
totalWithdraw: 0, content: '회원리스트엑셀다운로드',
balance: 0, downloadDate: '2022-01-01 16:42',
registDate: '2022-06-12 15:38', },
finalSigninDate: '', {
ip: '', id: '5',
state: '정상', downloadIp: '192.168.1.131',
note: '', content: '회원리스트엑셀다운로드',
downloadDate: '2022-01-01 16:42',
},
{
id: '6',
downloadIp: '192.168.1.181',
content: '회원리스트엑셀다운로드',
downloadDate: '2022-01-01 16:42',
},
{
id: '7',
downloadIp: '192.168.1.101',
content: '회원리스트엑셀다운로드',
downloadDate: '2022-01-01 16:42',
}, },
]; ];

View File

@ -13,110 +13,59 @@
<div class="text-4xl font-extrabold tracking-tight">엑셀다운로그</div> <div class="text-4xl font-extrabold tracking-tight">엑셀다운로그</div>
<!-- Actions --> <!-- Actions -->
<div class="flex shrink-0 items-center mt-6 sm:mt-0 sm:ml-4"> <div class="flex shrink-0 items-center mt-6 sm:mt-0 sm:ml-4">
<!-- Memo -->
<!-- <mat-form-field>
<ng-container *ngIf="excelLogs$ | async as excelLogs">
<ng-container
*ngFor="let excelLog of excelLogs; trackBy: __trackByFn"
>
<div
class="inventory-grid grid items-center gap-4 py-3 px-6 md:px-8 border-b"
>
<fieldset>
총 파트너수:{{ excelLog.totalPartnerCount }} 총 보유머니:{{
excelLog.totalHoldingexcel
}}
총 콤프:{{ excelLog.totalComp }} 총 합계:{{
excelLog.total
}}
</fieldset>
</div>
</ng-container>
</ng-container>
</mat-form-field> -->
<!-- SelectBox -->
<mat-form-field>
<mat-select placeholder="리스트수">
<mat-option value="40">40</mat-option>
<mat-option value="60">60</mat-option>
<mat-option value="80">80</mat-option>
<mat-option value="100">100</mat-option>
</mat-select>
</mat-form-field>
<mat-form-field>
<mat-select placeholder="레벨">
<mat-option value="level1">LV.1</mat-option>
<mat-option value="level2">LV.2</mat-option>
<mat-option value="level3">LV.3</mat-option>
<mat-option value="level4">LV.4</mat-option>
</mat-select>
</mat-form-field>
<mat-form-field>
<mat-select placeholder="상태">
<mat-option value="">정상</mat-option>
<mat-option value="">대기</mat-option>
<mat-option value="">탈퇴</mat-option>
<mat-option value="">휴면</mat-option>
<mat-option value="">블랙</mat-option>
<mat-option value="">정지</mat-option>
</mat-select>
</mat-form-field>
<mat-form-field>
<mat-select placeholder="제한">
<mat-option value="">카지노제한</mat-option>
<mat-option value="">슬롯제한</mat-option>
</mat-select>
</mat-form-field>
<mat-form-field>
<mat-select placeholder="입금">
<mat-option value="">계좌입금</mat-option>
</mat-select>
</mat-form-field>
<mat-form-field>
<mat-select placeholder="내용">
<mat-option value="">카지노콤프</mat-option>
<mat-option value="">슬롯콤프</mat-option>
<mat-option value="">배팅콤프</mat-option>
<mat-option value="">첫충콤프</mat-option>
</mat-select>
</mat-form-field>
<!-- <mat-form-field>
<mat-select placeholder="입금">
<mat-option value="">계좌입금</mat-option>
</mat-select>
</mat-form-field>
<mat-form-field>
<mat-select placeholder="아이디">
<mat-option value="">아이디</mat-option>
<mat-option value="">닉네임</mat-option>
<mat-option value="">이름</mat-option>
<mat-option value="">사이트</mat-option>
<mat-option value="">파트너수동지급</mat-option>
</mat-select>
</mat-form-field>
<mat-form-field>
<mat-select placeholder="가입일 정렬">
<mat-option value="">가입일 정렬</mat-option>
<mat-option value="">아이디 정렬</mat-option>
<mat-option value="">닉네임 정렬</mat-option>
<mat-option value="">캐쉬 정렬</mat-option>
<mat-option value="">콤프 정렬</mat-option>
<mat-option value="">쿠폰 정렬</mat-option>
<mat-option value="">입금 정렬</mat-option>
<mat-option value="">출금 정렬</mat-option>
<mat-option value="">차익 정렬</mat-option>
</mat-select>
</mat-form-field>
<mat-form-field>
<mat-select placeholder="내림차순">
<mat-option value="">내림차순</mat-option>
<mat-option value="">오름차순</mat-option>
</mat-select>
</mat-form-field> -->
<!-- Search --> <!-- Search -->
<button mat-icon-button (click)="__onClickSearch()">
<mat-icon [svgIcon]="'heroicons_outline:search'"></mat-icon>
</button>
</div>
</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">
<div class="col-span-2 sm:col-span-1">
<mat-form-field <mat-form-field
class="fuse-mat-dense fuse-mat-no-subscript fuse-mat-rounded min-w-64" class="fuse-mat-no-subscript w-full"
[floatLabel]="'always'"
>
<input
matInput
[matDatepicker]="picker1"
[placeholder]="'Choose a date'"
/>
<mat-datepicker-toggle
matSuffix
[for]="picker1"
></mat-datepicker-toggle>
<mat-datepicker #picker1></mat-datepicker>
</mat-form-field>
</div>
<div class="col-span-2 sm:col-span-1">
<mat-form-field
class="fuse-mat-no-subscript w-full"
[floatLabel]="'always'"
>
<input
matInput
[matDatepicker]="picker2"
[placeholder]="'Choose a date'"
/>
<mat-datepicker-toggle
matSuffix
[for]="picker2"
></mat-datepicker-toggle>
<mat-datepicker #picker2></mat-datepicker>
</mat-form-field>
</div>
<!-- Search button -->
<mat-form-field
fxFlex
class="fuse-mat-rounded min-w-64 bet-mat-form-field-wrapper-mb-0 mr-2"
> >
<mat-icon <mat-icon
class="icon-size-5" class="icon-size-5"
@ -127,21 +76,20 @@
matInput matInput
[formControl]="searchInputControl" [formControl]="searchInputControl"
[autocomplete]="'off'" [autocomplete]="'off'"
[placeholder]="'Search'" [placeholder]="'Search user'"
/> />
</mat-form-field> </mat-form-field>
<!-- Add user button --> <!-- Add user button -->
<button <button
class="ml-4" fxFlex
mat-flat-button mat-flat-button
style="position: fixed; margin-top: 4px"
[color]="'primary'" [color]="'primary'"
(click)="__createProduct()" (click)="__createProduct()"
> >
<!-- <mat-icon [svgIcon]="'heroicons_outline:plus'"></mat-icon> --> <mat-icon [svgIcon]="'heroicons_outline:search'"></mat-icon>
<span class="ml-2 mr-1">검색하기</span> <span class="ml-2 mr-1">Search</span>
</button> </button>
<button>엑셀저장</button>
<button>카지노머니확인</button>
</div> </div>
</div> </div>
@ -152,179 +100,47 @@
class="flex flex-col flex-auto sm:mb-18 overflow-hidden sm:overflow-y-auto" class="flex flex-col flex-auto sm:mb-18 overflow-hidden sm:overflow-y-auto"
> >
<ng-container *ngIf="excelLogs$ | async as excelLogs"> <ng-container *ngIf="excelLogs$ | async as excelLogs">
<ng-container *ngIf="excelLogs.length > 0; else noExcelLog"> <ng-container *ngIf="excelLogs.length > 0; else noUser">
<div class="grid"> <div class="grid">
<!-- Header --> <!-- Header -->
<div <div
class="inventory-grid z-10 sticky top-0 grid gap-4 py-4 px-6 md:px-8shadow text-md font-semibold text-secondary bg-gray-50 dark:bg-black dark:bg-opacity-5" class="inventory-grid z-10 sticky top-0 grid gap-4 py-4 px-6 md:px-8shadow text-md font-semibold text-secondary bg-gray-50 dark:bg-black dark:bg-opacity-5"
matSort
matSortDisableClear
> >
<div class="hidden sm:block"><mat-checkbox></mat-checkbox></div> <div>번호</div>
<div class="hidden sm:block">요율</div> <div>다운IP</div>
<div class="hidden sm:block">상부트리</div>
<div class="hidden sm:block">관리</div> <div>내용</div>
<div class="hidden sm:block">매장수</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 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 sm:block">비고</div>
</div> </div>
<!-- Rows --> <!-- Rows -->
<ng-container *ngIf="excelLogs$ | async as excelLogs"> <ng-container *ngIf="excelLogs$ | async as excelLogs">
<ng-container <ng-container
*ngFor="let excelLog of excelLogs; trackBy: __trackByFn" *ngFor="
let excelLog of excelLogs;
let i = index;
trackBy: __trackByFn
"
> >
<div <div
class="inventory-grid grid items-center gap-4 py-3 px-6 md:px-8 border-b" class="inventory-grid grid items-center gap-4 py-3 px-6 md:px-8 border-b"
> >
<!-- 번호 -->
<div class="hidden sm:block truncate"> <div class="hidden sm:block truncate">
<mat-checkbox></mat-checkbox> {{ i + 1 }}
</div> </div>
<!-- rate --> <!-- 다음 IP -->
<div class="hidden sm:block truncate"> <div class="hidden sm:block truncate">
<button {{ excelLog.downloadIp }}
mat-button </div>
color="primary"
matTooltip="요율확인 <!-- 내용 -->
카지노-바카라: 0%
카지노-룰렛: 0%
카지노-드레곤타이거: 0%
카지노-그외: 0%
슬롯: 0%
카지노루징: 0%
슬롯루징: 0%"
>
요율
</button>
<div class="hidden sm:block truncate"> <div class="hidden sm:block truncate">
<!-- 관리 --> {{ excelLog.content }}
<button mat-flat-button [color]="'primary'">
<mat-form-field>
<mat-select placeholder="관리">
<mat-option value="">보유금지급/회수</mat-option>
<mat-option value="">수수료설정</mat-option>
<mat-option value="">콤프지급/회수</mat-option>
<mat-option value="">쿠폰머니지급/회수</mat-option>
<mat-option value="">쪽지보내기</mat-option>
<mat-option value="">베팅리스트</mat-option>
<mat-option value="">강제로그아웃</mat-option>
</mat-select>
</mat-form-field>
</button>
</div> </div>
</div>
<!-- 매장수 --> <!-- 다운일자 -->
<div class="hidden sm:block truncate"> <div class="hidden sm:block truncate">
<button mat-flat-button [color]="'primary'"> {{ excelLog.downloadDate }}
{{ excelLog.branchCount }}
</button>
<button mat-flat-button [color]="'primary'">
{{ excelLog.divisionCount }}
</button>
<button mat-flat-button [color]="'primary'">
{{ excelLog.officeCount }}
</button>
<button mat-flat-button [color]="'primary'">
{{ excelLog.storeCount }}
</button>
</div>
<!-- 회원수 -->
<div class="hidden sm:block truncate">
<button mat-flat-button [color]="'primary'">
{{ excelLog.memberCount }}
</button>
</div>
<!-- id -->
<ng-container *ngIf="users$ | async as users">
<ng-container
*ngFor="let user of users; trackBy: __trackByFn"
>
<div
class="hidden sm:block truncate"
(click)="viewUserDetail(user.id!)"
>
{{ excelLog.id }}
</div>
</ng-container>
</ng-container>
<!-- nickname -->
<div class="hidden sm:block truncate">
{{ excelLog.nickname }}
</div>
<!-- accountHolder -->
<div class="hidden sm:block truncate">
{{ excelLog.accountHolder }}
</div>
<!-- 연락처 -->
<div class="hidden sm:block truncate">
{{ excelLog.phoneNumber }}
</div>
<!-- 정산 -->
<div class="hidden sm:block truncate">
{{ excelLog.calculateType }}
</div>
<!-- 보유금 -->
<div class="hidden sm:block truncate">
캐쉬{{ excelLog.ownCash }} 콤프{{ excelLog.ownComp }} 쿠폰{{
excelLog.ownCoupon
}}
</div>
<!-- gameMoney -->
<div class="hidden sm:block truncate">
{{ excelLog.gameMoney }}
</div>
<!-- casinoCash -->
<div class="hidden sm:block truncate">
<button mat-flat-button [color]="'primary'">
게임머니확인
</button>
<button mat-flat-button [color]="'primary'">
게임머니회수
</button>
</div>
<!-- todayComp -->
<div class="hidden sm:block truncate">
{{ excelLog.todayComp }}P
</div>
<!-- 총입출 -->
<div class="hidden sm:block truncate">
입금{{ excelLog.totalDeposit }} 출금{{
excelLog.totalWithdraw
}}
차익{{ excelLog.balance }}
</div>
<!-- log -->
<div class="hidden sm:block truncate">
가입{{ excelLog.registDate }} 최종{{
excelLog.finalSigninDate
}}
IP{{ excelLog.ip }}
</div>
<!-- state -->
<div class="hidden sm:block truncate">
{{ excelLog.state }}
</div>
<!-- 회원수 -->
<div class="hidden sm:block truncate">
{{ excelLog.memberCount }}
</div>
<!-- 비고 -->
<div class="hidden sm:block truncate">
<button mat-flat-button [color]="'primary'">
{{ excelLog.note }}
</button>
</div> </div>
</div> </div>
</ng-container> </ng-container>
@ -343,11 +159,11 @@
</ng-container> </ng-container>
</ng-container> </ng-container>
<ng-template #noExcelLog> <ng-template #noUser>
<div <div
class="p-8 sm:p-16 border-t text-4xl font-semibold tracking-tight text-center" class="p-8 sm:p-16 border-t text-4xl font-semibold tracking-tight text-center"
> >
There are no Excel Download Logs! There are no data!
</div> </div>
</ng-template> </ng-template>
</div> </div>

View File

@ -42,18 +42,18 @@ import { Router } from '@angular/router';
/* language=SCSS */ /* language=SCSS */
` `
.inventory-grid { .inventory-grid {
grid-template-columns: 60px auto 40px; grid-template-columns: 50px 300px auto 200px;
@screen sm { @screen sm {
grid-template-columns: 60px 60px 60px 60px 60px 60px auto 60px; grid-template-columns: 50px 300px auto 200px;
} }
@screen md { @screen md {
grid-template-columns: 60px 60px 60px 60px 60px 60px auto 60px 60px; grid-template-columns: 50px 300px auto 200px;
} }
@screen lg { @screen lg {
grid-template-columns: 60px 70px 70px 70px 70px 100px 60px 60px auto 60px 60px 60px 60px; grid-template-columns: 50px 300px auto 200px;
} }
} }
`, `,
@ -67,12 +67,12 @@ export class ListComponent implements OnInit, AfterViewInit, OnDestroy {
@ViewChild(MatSort) private _sort!: MatSort; @ViewChild(MatSort) private _sort!: MatSort;
excelLogs$!: Observable<ExcelLog[] | undefined>; excelLogs$!: Observable<ExcelLog[] | undefined>;
users$!: Observable<User[] | undefined>;
isLoading = false; isLoading = false;
searchInputControl = new FormControl(); searchInputControl = new FormControl();
selectedExcelLog?: ExcelLog; selectedExcelLog?: ExcelLog;
pagination?: ExcelLogPagination; pagination?: ExcelLogPagination;
__isSearchOpened = false;
private _unsubscribeAll: Subject<any> = new Subject<any>(); private _unsubscribeAll: Subject<any> = new Subject<any>();
@ -113,45 +113,7 @@ export class ListComponent implements OnInit, AfterViewInit, OnDestroy {
/** /**
* After view init * After view init
*/ */
ngAfterViewInit(): void { ngAfterViewInit(): void {}
if (this._sort && this._paginator) {
// Set the initial sort
this._sort.sort({
id: 'name',
start: 'asc',
disableClear: true,
});
// Mark for check
this._changeDetectorRef.markForCheck();
// If the excelLog changes the sort order...
this._sort.sortChange
.pipe(takeUntil(this._unsubscribeAll))
.subscribe(() => {
// Reset back to the first page
this._paginator.pageIndex = 0;
});
// Get products if sort or page changes
merge(this._sort.sortChange, this._paginator.page)
.pipe(
switchMap(() => {
this.isLoading = true;
return this._excelLogService.getExcelLogs(
this._paginator.pageIndex,
this._paginator.pageSize,
this._sort.active,
this._sort.direction
);
}),
map(() => {
this.isLoading = false;
})
)
.subscribe();
}
}
/** /**
* On destroy * On destroy
@ -166,14 +128,18 @@ export class ListComponent implements OnInit, AfterViewInit, OnDestroy {
// @ Public methods // @ Public methods
// ----------------------------------------------------------------------------------------------------- // -----------------------------------------------------------------------------------------------------
viewUserDetail(id: string): void {
let url: string = 'member/user/' + id;
this.router.navigateByUrl(url);
}
// ----------------------------------------------------------------------------------------------------- // -----------------------------------------------------------------------------------------------------
// @ Private methods // @ Private methods
// ----------------------------------------------------------------------------------------------------- // -----------------------------------------------------------------------------------------------------
/**
* toggle the search
* Used in 'bar'
*/
__onClickSearch(): void {
this.__isSearchOpened = !this.__isSearchOpened;
}
/** /**
* Create product * Create product
*/ */

View File

@ -15,6 +15,8 @@ import { MatGridListModule } from '@angular/material/grid-list';
import { MatSlideToggleModule } from '@angular/material/slide-toggle'; import { MatSlideToggleModule } from '@angular/material/slide-toggle';
import { MatRadioModule } from '@angular/material/radio'; import { MatRadioModule } from '@angular/material/radio';
import { MatCheckboxModule } from '@angular/material/checkbox'; import { MatCheckboxModule } from '@angular/material/checkbox';
import { MatDatepickerModule } from '@angular/material/datepicker';
import { MatMomentDateModule } from '@angular/material-moment-adapter';
import { TranslocoModule } from '@ngneat/transloco'; import { TranslocoModule } from '@ngneat/transloco';
@ -45,6 +47,8 @@ import { excelLogRoutes } from './excel-log.routing';
MatSlideToggleModule, MatSlideToggleModule,
MatRadioModule, MatRadioModule,
MatCheckboxModule, MatCheckboxModule,
MatDatepickerModule,
MatMomentDateModule,
], ],
}) })
export class ExcelLogModule {} export class ExcelLogModule {}

View File

@ -1,29 +1,6 @@
export interface ExcelLog { export interface ExcelLog {
id?: string; id?: string;
totalPartnerCount?: number; downloadIp?: string;
totalHoldingMoney?: number; content?: string;
totalComp?: number; downloadDate?: string;
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;
} }