From 58b2922d874254393dd235cc3d6e4efc1857538b Mon Sep 17 00:00:00 2001 From: JUNG YI DAM Date: Wed, 20 Jul 2022 09:24:34 +0000 Subject: [PATCH 1/2] =?UTF-8?q?=EA=B8=88=EC=9D=BC=EB=B0=B0=ED=8C=85?= =?UTF-8?q?=EC=9E=90=EB=AA=A9=EB=A1=9D=EB=A6=AC=EC=8A=A4=ED=8A=B8=20page?= =?UTF-8?q?=20=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../components/list.component.ts | 14 ++- .../today-bet/components/list.component.html | 90 +++++++++++++++++++ .../today-bet/components/list.component.ts | 15 +++- .../report/today-bet/today-bet.module.ts | 6 ++ 4 files changed, 120 insertions(+), 5 deletions(-) diff --git a/src/app/modules/admin/report/daily-partner/components/list.component.ts b/src/app/modules/admin/report/daily-partner/components/list.component.ts index f13b4de..aa499ab 100644 --- a/src/app/modules/admin/report/daily-partner/components/list.component.ts +++ b/src/app/modules/admin/report/daily-partner/components/list.component.ts @@ -102,6 +102,7 @@ export class ListComponent implements OnInit, AfterViewInit, OnDestroy { private _unsubscribeAll: Subject = new Subject(); roles: any[]; + roles2: any[]; /** * Constructor @@ -132,6 +133,16 @@ export class ListComponent implements OnInit, AfterViewInit, OnDestroy { value: '슬롯', }, ]; + this.roles2 = [ + { + label: '회원아이디', + value: '전체', + }, + { + label: '닉네임', + value: '파워볼', + }, + ]; } // ----------------------------------------------------------------------------------------------------- @@ -157,9 +168,6 @@ export class ListComponent implements OnInit, AfterViewInit, OnDestroy { console.log(dailyPartners); this._changeDetectorRef.markForCheck(); }); - - // Get the products - this.dailyPartners$ = this._dailyPartnerService.dailyPartners$; } /** diff --git a/src/app/modules/admin/report/today-bet/components/list.component.html b/src/app/modules/admin/report/today-bet/components/list.component.html index def13ca..a3f0820 100644 --- a/src/app/modules/admin/report/today-bet/components/list.component.html +++ b/src/app/modules/admin/report/today-bet/components/list.component.html @@ -9,6 +9,96 @@
금일배팅자목록
+
+ + +
+ +
+ + + + {{ + roleSelect.value | titlecase + }} + + + +
{{ role.label }}
+
+
+
+
+
+ +
+ + + + + +
+ +
+ + + + + +
+ +
+ + + + {{ + roleSelect.value | titlecase + }} + + + +
{{ role.label }}
+
+
+
+
+
+
+
= new Subject(); - roles: any[]; + roles1: any[]; + roles2: any[]; /** * Constructor @@ -115,7 +116,7 @@ export class ListComponent implements OnInit, AfterViewInit, OnDestroy { private _todayBetService: TodayBetService, private router: Router ) { - this.roles = [ + this.roles1 = [ { label: '전체', value: '전체', @@ -133,6 +134,16 @@ export class ListComponent implements OnInit, AfterViewInit, OnDestroy { value: '슬롯', }, ]; + this.roles2 = [ + { + label: '회원아이디', + value: '회원아이디', + }, + { + label: '닉네임', + value: '닉네임', + }, + ]; } // ----------------------------------------------------------------------------------------------------- diff --git a/src/app/modules/admin/report/today-bet/today-bet.module.ts b/src/app/modules/admin/report/today-bet/today-bet.module.ts index 7c0f7b1..7de511f 100644 --- a/src/app/modules/admin/report/today-bet/today-bet.module.ts +++ b/src/app/modules/admin/report/today-bet/today-bet.module.ts @@ -16,6 +16,9 @@ import { MatSlideToggleModule } from '@angular/material/slide-toggle'; import { MatRadioModule } from '@angular/material/radio'; import { MatCheckboxModule } from '@angular/material/checkbox'; import { MatTableModule } from '@angular/material/table'; +import { MatDatepickerModule } from '@angular/material/datepicker'; +import { MatMomentDateModule } from '@angular/material-moment-adapter'; +import { MatDividerModule } from '@angular/material/divider'; import { TranslocoModule } from '@ngneat/transloco'; @@ -47,6 +50,9 @@ import { todayBetRoutes } from './today-bet.routing'; MatRadioModule, MatCheckboxModule, MatTableModule, + MatDatepickerModule, + MatDividerModule, + MatMomentDateModule, ], }) export class TodayBetModule {} From b5d2ee3523a148a46afcb86e2dc85f623055feb2 Mon Sep 17 00:00:00 2001 From: JUNG YI DAM Date: Wed, 20 Jul 2022 09:25:14 +0000 Subject: [PATCH 2/2] =?UTF-8?q?=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../admin/report/daily-partner/components/list.component.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/app/modules/admin/report/daily-partner/components/list.component.html b/src/app/modules/admin/report/daily-partner/components/list.component.html index 1d17847..4e72342 100644 --- a/src/app/modules/admin/report/daily-partner/components/list.component.html +++ b/src/app/modules/admin/report/daily-partner/components/list.component.html @@ -37,7 +37,7 @@ - +