From bf0a7228fab99a720c290a5e96012034d4b15178 Mon Sep 17 00:00:00 2001 From: Park Byung Eun Date: Wed, 3 Aug 2022 10:47:05 +0000 Subject: [PATCH] =?UTF-8?q?=EC=97=91=EC=85=80=20=EB=8B=A4=EC=9A=B4?= =?UTF-8?q?=EB=A1=9C=EA=B7=B8=20=ED=8E=98=EC=9D=B4=EC=A7=80=20=EC=88=98?= =?UTF-8?q?=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/app/mock-api/apps/report/excel-log/api.ts | 30 +- .../mock-api/apps/report/excel-log/data.ts | 67 ++-- .../excel-log/components/list.component.html | 344 ++++-------------- .../excel-log/components/list.component.ts | 62 +--- .../report/excel-log/excel-log.module.ts | 4 + .../report/excel-log/models/excel-log.ts | 29 +- 6 files changed, 156 insertions(+), 380 deletions(-) diff --git a/src/app/mock-api/apps/report/excel-log/api.ts b/src/app/mock-api/apps/report/excel-log/api.ts index feae824..d557de1 100644 --- a/src/app/mock-api/apps/report/excel-log/api.ts +++ b/src/app/mock-api/apps/report/excel-log/api.ts @@ -33,8 +33,8 @@ export class ReportExcelLogMockApi { .reply(({ request }) => { // Get available queries const search = request.params.get('search'); - const sort = request.params.get('sort') || 'name'; - const order = request.params.get('order') || 'asc'; + // const sort = request.params.get('sort') || 'name'; + // 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,19 +42,19 @@ export class ReportExcelLogMockApi { let excelLogs: any[] | null = cloneDeep(this._excelLogs); // Sort the excelLogs - if (sort === 'sku' || sort === 'name' || sort === 'active') { - excelLogs.sort((a, b) => { - const fieldA = a[sort].toString().toUpperCase(); - const fieldB = b[sort].toString().toUpperCase(); - return order === 'asc' - ? fieldA.localeCompare(fieldB) - : fieldB.localeCompare(fieldA); - }); - } else { - excelLogs.sort((a, b) => - order === 'asc' ? a[sort] - b[sort] : b[sort] - a[sort] - ); - } + // if (sort === 'sku' || sort === 'name' || sort === 'active') { + // excelLogs.sort((a, b) => { + // const fieldA = a[sort].toString().toUpperCase(); + // const fieldB = b[sort].toString().toUpperCase(); + // return order === 'asc' + // ? fieldA.localeCompare(fieldB) + // : fieldB.localeCompare(fieldA); + // }); + // } else { + // excelLogs.sort((a, b) => + // order === 'asc' ? a[sort] - b[sort] : b[sort] - a[sort] + // ); + // } // If search exists... if (search) { diff --git a/src/app/mock-api/apps/report/excel-log/data.ts b/src/app/mock-api/apps/report/excel-log/data.ts index 57f7aee..a693508 100644 --- a/src/app/mock-api/apps/report/excel-log/data.ts +++ b/src/app/mock-api/apps/report/excel-log/data.ts @@ -2,32 +2,45 @@ export const excelLogs = [ { - 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: '1', + downloadIp: '192.168.1.101', + content: '회원리스트엑셀다운로드', + downloadDate: '2022-01-01 16:42', + }, + { + id: '2', + downloadIp: '192.168.1.101', + content: '루징보고서 엑셀다운로드', + downloadDate: '2022-01-01 16:42', + }, + { + id: '3', + downloadIp: '192.168.1.201', + content: '부본사 정산 엑셀 다운로드', + downloadDate: '2022-01-01 16:42', + }, + { + id: '4', + downloadIp: '192.168.1.121', + content: '회원리스트엑셀다운로드', + downloadDate: '2022-01-01 16:42', + }, + { + id: '5', + downloadIp: '192.168.1.131', + 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', }, ]; diff --git a/src/app/modules/admin/report/excel-log/components/list.component.html b/src/app/modules/admin/report/excel-log/components/list.component.html index 43f4567..261099e 100644 --- a/src/app/modules/admin/report/excel-log/components/list.component.html +++ b/src/app/modules/admin/report/excel-log/components/list.component.html @@ -13,110 +13,59 @@
엑셀다운로그
- - - - - - - 40 - 60 - 80 - 100 - - - - - LV.1 - LV.2 - LV.3 - LV.4 - - - - - 정상 - 대기 - 탈퇴 - 휴면 - 블랙 - 정지 - - - - - 카지노제한 - 슬롯제한 - - - - - 계좌입금 - - - - - 카지노콤프 - 슬롯콤프 - 배팅콤프 - 첫충콤프 - - - + + +
+ + + +
+ +
+
+ + + + + +
+
+ + + + + +
+ - -
@@ -152,179 +100,47 @@ class="flex flex-col flex-auto sm:mb-18 overflow-hidden sm:overflow-y-auto" > - +
- - - - - - - - - - - - - - - - - - - - +
번호
+
다운IP
+ +
내용
+
다운일자
+ - + - + + - + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
@@ -343,11 +159,11 @@ - +
- There are no Excel Download Logs! + There are no data!
diff --git a/src/app/modules/admin/report/excel-log/components/list.component.ts b/src/app/modules/admin/report/excel-log/components/list.component.ts index 133cb9f..a9e91f5 100644 --- a/src/app/modules/admin/report/excel-log/components/list.component.ts +++ b/src/app/modules/admin/report/excel-log/components/list.component.ts @@ -42,18 +42,18 @@ import { Router } from '@angular/router'; /* language=SCSS */ ` .inventory-grid { - grid-template-columns: 60px auto 40px; + grid-template-columns: 50px 300px auto 200px; @screen sm { - grid-template-columns: 60px 60px 60px 60px 60px 60px auto 60px; + grid-template-columns: 50px 300px auto 200px; } @screen md { - grid-template-columns: 60px 60px 60px 60px 60px 60px auto 60px 60px; + grid-template-columns: 50px 300px auto 200px; } @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; excelLogs$!: Observable; - users$!: Observable; isLoading = false; searchInputControl = new FormControl(); selectedExcelLog?: ExcelLog; pagination?: ExcelLogPagination; + __isSearchOpened = false; private _unsubscribeAll: Subject = new Subject(); @@ -113,45 +113,7 @@ export class ListComponent implements OnInit, AfterViewInit, OnDestroy { /** * After view init */ - 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(); - } - } + ngAfterViewInit(): void {} /** * On destroy @@ -166,14 +128,18 @@ export class ListComponent implements OnInit, AfterViewInit, OnDestroy { // @ Public methods // ----------------------------------------------------------------------------------------------------- - viewUserDetail(id: string): void { - let url: string = 'member/user/' + id; - this.router.navigateByUrl(url); - } // ----------------------------------------------------------------------------------------------------- // @ Private methods // ----------------------------------------------------------------------------------------------------- + /** + * toggle the search + * Used in 'bar' + */ + __onClickSearch(): void { + this.__isSearchOpened = !this.__isSearchOpened; + } + /** * Create product */ diff --git a/src/app/modules/admin/report/excel-log/excel-log.module.ts b/src/app/modules/admin/report/excel-log/excel-log.module.ts index 6ef4e58..089a1f9 100644 --- a/src/app/modules/admin/report/excel-log/excel-log.module.ts +++ b/src/app/modules/admin/report/excel-log/excel-log.module.ts @@ -15,6 +15,8 @@ import { MatGridListModule } from '@angular/material/grid-list'; import { MatSlideToggleModule } from '@angular/material/slide-toggle'; import { MatRadioModule } from '@angular/material/radio'; import { MatCheckboxModule } from '@angular/material/checkbox'; +import { MatDatepickerModule } from '@angular/material/datepicker'; +import { MatMomentDateModule } from '@angular/material-moment-adapter'; import { TranslocoModule } from '@ngneat/transloco'; @@ -45,6 +47,8 @@ import { excelLogRoutes } from './excel-log.routing'; MatSlideToggleModule, MatRadioModule, MatCheckboxModule, + MatDatepickerModule, + MatMomentDateModule, ], }) export class ExcelLogModule {} diff --git a/src/app/modules/admin/report/excel-log/models/excel-log.ts b/src/app/modules/admin/report/excel-log/models/excel-log.ts index fc6cb61..f15fa13 100644 --- a/src/app/modules/admin/report/excel-log/models/excel-log.ts +++ b/src/app/modules/admin/report/excel-log/models/excel-log.ts @@ -1,29 +1,6 @@ export interface ExcelLog { 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; + downloadIp?: string; + content?: string; + downloadDate?: string; }