From 87dbf53a2f594bba52d7b6f9f6097f359304de2f Mon Sep 17 00:00:00 2001 From: JUNG YI DAM Date: Sun, 14 Aug 2022 15:42:20 +0000 Subject: [PATCH] =?UTF-8?q?id=20=ED=81=B4=EB=A6=AD=EC=9D=B4=EB=B2=A4?= =?UTF-8?q?=ED=8A=B8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../deposit/components/list.component.html | 7 +++- .../bank/deposit/components/list.component.ts | 10 ++++-- .../components/list.component.ts | 2 -- .../components/list.component.ts | 2 -- .../withdraw/components/list.component.html | 7 +++- .../withdraw/components/list.component.ts | 10 ++++-- .../components/list.component.ts | 2 -- .../customer/components/list.component.ts | 2 -- .../message/components/list.component.ts | 2 -- .../powerball/components/list.component.html | 7 +++- .../powerball/components/list.component.ts | 10 ++++-- .../components/list.component.html | 7 +++- .../casino-money/components/list.component.ts | 2 -- .../coupon-log/components/list.component.ts | 6 ++-- .../components/list.component.ts | 6 ++-- .../coupon/components/list.component.ts | 2 -- .../components/list.component.html | 33 ++++++++++++------- .../current-user/components/list.component.ts | 2 -- .../components/list.component.ts | 7 ++-- .../components/list.component.html | 7 +++- .../unconnected/components/list.component.ts | 2 -- .../comp-log/components/list.component.html | 7 +++- .../comp-log/components/list.component.ts | 2 -- .../components/list.component.ts | 6 ++-- .../report/daily/components/list.component.ts | 6 ++-- .../components/list.component.ts | 6 ++-- .../components/list.component.ts | 6 ++-- .../money-log/components/list.component.html | 7 +++- .../money-log/components/list.component.ts | 2 -- .../monthly/components/list.component.ts | 6 ++-- .../payment-log/components/list.component.ts | 6 ++-- .../statistics/components/list.component.ts | 6 ++-- .../today-bet/components/list.component.html | 7 +++- .../today-bet/components/list.component.ts | 2 -- .../components/list.component.html | 5 +++ .../user-session/components/list.component.ts | 2 -- .../basic/components/list.component.ts | 2 -- 37 files changed, 115 insertions(+), 98 deletions(-) diff --git a/src/app/modules/admin/bank/deposit/components/list.component.html b/src/app/modules/admin/bank/deposit/components/list.component.html index 16f2bee..a808ddd 100644 --- a/src/app/modules/admin/bank/deposit/components/list.component.html +++ b/src/app/modules/admin/bank/deposit/components/list.component.html @@ -157,7 +157,12 @@
{{ deposit.highRank }}
- {{ deposit.signinId }} +
+ {{ deposit.signinId }} +

{{ deposit.nickname }}
diff --git a/src/app/modules/admin/bank/deposit/components/list.component.ts b/src/app/modules/admin/bank/deposit/components/list.component.ts index b0f1164..b03c781 100644 --- a/src/app/modules/admin/bank/deposit/components/list.component.ts +++ b/src/app/modules/admin/bank/deposit/components/list.component.ts @@ -29,10 +29,10 @@ import { import { fuseAnimations } from '@fuse/animations'; import { FuseConfirmationService } from '@fuse/services/confirmation'; -import { User } from 'app/modules/admin/member/user/models/user'; import { Deposit } from '../models/deposit'; import { DepositPagination } from '../models/deposit-pagination'; import { DepositService } from '../services/deposit.service'; +import { Router } from '@angular/router'; @Component({ selector: 'deposit-list', @@ -70,7 +70,6 @@ export class ListComponent implements OnInit, AfterViewInit, OnDestroy { @ViewChild(MatSort) private _sort!: MatSort; deposits$!: Observable; - users$!: Observable; __isSearchOpened = false; isLoading = false; @@ -87,7 +86,8 @@ export class ListComponent implements OnInit, AfterViewInit, OnDestroy { private _changeDetectorRef: ChangeDetectorRef, private _fuseConfirmationService: FuseConfirmationService, private _formBuilder: FormBuilder, - private _depositService: DepositService + private _depositService: DepositService, + private router: Router ) {} // ----------------------------------------------------------------------------------------------------- @@ -169,6 +169,10 @@ 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 // ----------------------------------------------------------------------------------------------------- diff --git a/src/app/modules/admin/bank/partner-calculate/components/list.component.ts b/src/app/modules/admin/bank/partner-calculate/components/list.component.ts index a616365..9459770 100644 --- a/src/app/modules/admin/bank/partner-calculate/components/list.component.ts +++ b/src/app/modules/admin/bank/partner-calculate/components/list.component.ts @@ -29,7 +29,6 @@ import { import { fuseAnimations } from '@fuse/animations'; import { FuseConfirmationService } from '@fuse/services/confirmation'; -import { User } from 'app/modules/admin/member/user/models/user'; import { PartnerCalculate } from '../models/partner-calculate'; import { PartnerCalculatePagination } from '../models/partner-calculate-pagination'; import { PartnerCalculateService } from '../services/partner-calculate.service'; @@ -70,7 +69,6 @@ export class ListComponent implements OnInit, AfterViewInit, OnDestroy { @ViewChild(MatSort) private _sort!: MatSort; partnerCalculates$!: Observable; - users$!: Observable; __isSearchOpened = false; isLoading = false; diff --git a/src/app/modules/admin/bank/web-calculate/components/list.component.ts b/src/app/modules/admin/bank/web-calculate/components/list.component.ts index 85f1b0b..c27a0cc 100644 --- a/src/app/modules/admin/bank/web-calculate/components/list.component.ts +++ b/src/app/modules/admin/bank/web-calculate/components/list.component.ts @@ -29,7 +29,6 @@ import { import { fuseAnimations } from '@fuse/animations'; import { FuseConfirmationService } from '@fuse/services/confirmation'; -import { User } from 'app/modules/admin/member/user/models/user'; import { WebCalculate } from '../models/web-calculate'; import { WebCalculatePagination } from '../models/web-calculate-pagination'; import { WebCalculateService } from '../services/web-calculate.service'; @@ -70,7 +69,6 @@ export class ListComponent implements OnInit, AfterViewInit, OnDestroy { @ViewChild(MatSort) private _sort!: MatSort; webCalculates$!: Observable; - users$!: Observable; __isSearchOpened = false; isLoading = false; diff --git a/src/app/modules/admin/bank/withdraw/components/list.component.html b/src/app/modules/admin/bank/withdraw/components/list.component.html index 2bcd148..49e6827 100644 --- a/src/app/modules/admin/bank/withdraw/components/list.component.html +++ b/src/app/modules/admin/bank/withdraw/components/list.component.html @@ -160,7 +160,12 @@
{{ withdraw.highRank }}
- {{ withdraw.signinId }} +
+ {{ withdraw.signinId }} +

{{ withdraw.nickname }}
diff --git a/src/app/modules/admin/bank/withdraw/components/list.component.ts b/src/app/modules/admin/bank/withdraw/components/list.component.ts index 96dfe32..1c4dc47 100644 --- a/src/app/modules/admin/bank/withdraw/components/list.component.ts +++ b/src/app/modules/admin/bank/withdraw/components/list.component.ts @@ -29,10 +29,10 @@ import { import { fuseAnimations } from '@fuse/animations'; import { FuseConfirmationService } from '@fuse/services/confirmation'; -import { User } from 'app/modules/admin/member/user/models/user'; import { Withdraw } from '../models/withdraw'; import { WithdrawPagination } from '../models/withdraw-pagination'; import { WithdrawService } from '../services/withdraw.service'; +import { Router } from '@angular/router'; @Component({ selector: 'withdraw-list', @@ -66,7 +66,6 @@ export class ListComponent implements OnInit, AfterViewInit, OnDestroy { @ViewChild(MatSort) private _sort!: MatSort; withdraws$!: Observable; - users$!: Observable; __isSearchOpened = false; isLoading = false; @@ -83,7 +82,8 @@ export class ListComponent implements OnInit, AfterViewInit, OnDestroy { private _changeDetectorRef: ChangeDetectorRef, private _fuseConfirmationService: FuseConfirmationService, private _formBuilder: FormBuilder, - private _withdrawService: WithdrawService + private _withdrawService: WithdrawService, + private router: Router ) {} // ----------------------------------------------------------------------------------------------------- @@ -165,6 +165,10 @@ 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 // ----------------------------------------------------------------------------------------------------- diff --git a/src/app/modules/admin/board/customer-template/components/list.component.ts b/src/app/modules/admin/board/customer-template/components/list.component.ts index 367f280..08918aa 100644 --- a/src/app/modules/admin/board/customer-template/components/list.component.ts +++ b/src/app/modules/admin/board/customer-template/components/list.component.ts @@ -29,7 +29,6 @@ import { import { fuseAnimations } from '@fuse/animations'; import { FuseConfirmationService } from '@fuse/services/confirmation'; -import { User } from '../../../member/user/models/user'; import { CustomerTemplate } from '../models/ customer-template'; import { CustomerTemplatePagination } from '../models/customer-template-pagination'; import { CustomerTemplateService } from '../services/customer-template.service'; @@ -71,7 +70,6 @@ export class ListComponent implements OnInit, AfterViewInit, OnDestroy { @ViewChild(MatSort) private _sort!: MatSort; customerTemplates$!: Observable; - users$!: Observable; isLoading = false; searchInputControl = new FormControl(); diff --git a/src/app/modules/admin/board/customer/components/list.component.ts b/src/app/modules/admin/board/customer/components/list.component.ts index 60b8024..7557d77 100644 --- a/src/app/modules/admin/board/customer/components/list.component.ts +++ b/src/app/modules/admin/board/customer/components/list.component.ts @@ -29,7 +29,6 @@ import { import { fuseAnimations } from '@fuse/animations'; import { FuseConfirmationService } from '@fuse/services/confirmation'; -import { User } from '../../../member/user/models/user'; import { Customer } from '../models/customer'; import { CustomerPagination } from '../models/customer-pagination'; import { CustomerService } from '../services/customer.service'; @@ -71,7 +70,6 @@ export class ListComponent implements OnInit, AfterViewInit, OnDestroy { @ViewChild(MatSort) private _sort!: MatSort; customers$!: Observable; - users$!: Observable; isLoading = false; searchInputControl = new FormControl(); diff --git a/src/app/modules/admin/board/message/components/list.component.ts b/src/app/modules/admin/board/message/components/list.component.ts index 1332c82..52c0185 100644 --- a/src/app/modules/admin/board/message/components/list.component.ts +++ b/src/app/modules/admin/board/message/components/list.component.ts @@ -29,7 +29,6 @@ import { import { fuseAnimations } from '@fuse/animations'; import { FuseConfirmationService } from '@fuse/services/confirmation'; -import { User } from '../../../member/user/models/user'; import { Message } from '../models/message'; import { MessagePagination } from '../models/message-pagination'; import { MessageService } from '../services/message.service'; @@ -67,7 +66,6 @@ export class ListComponent implements OnInit, AfterViewInit, OnDestroy { @ViewChild(MatSort) private _sort!: MatSort; messages$!: Observable; - users$!: Observable; isLoading = false; searchInputControl = new FormControl(); 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 b8fdd8a..06cf391 100644 --- a/src/app/modules/admin/game/powerball/components/list.component.html +++ b/src/app/modules/admin/game/powerball/components/list.component.html @@ -170,7 +170,12 @@
{{ powerball.idx }}
{{ powerball.bettingType }}
- {{ powerball.signinId }} +
+ {{ powerball.signinId }} +

{{ powerball.nickname }}
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 b8437ba..cd0e4e1 100644 --- a/src/app/modules/admin/game/powerball/components/list.component.ts +++ b/src/app/modules/admin/game/powerball/components/list.component.ts @@ -29,10 +29,10 @@ import { import { fuseAnimations } from '@fuse/animations'; import { FuseConfirmationService } from '@fuse/services/confirmation'; -import { User } from 'app/modules/admin/member/user/models/user'; import { Powerball } from '../models/powerball'; import { PowerballPagination } from '../models/powerball-pagination'; import { PowerballService } from '../services/powerball.service'; +import { Router } from '@angular/router'; @Component({ selector: 'powerball-list', @@ -70,7 +70,6 @@ export class ListComponent implements OnInit, AfterViewInit, OnDestroy { @ViewChild(MatSort) private _sort!: MatSort; powerballs$!: Observable; - users$!: Observable; __isSearchOpened = false; isLoading = false; @@ -87,7 +86,8 @@ export class ListComponent implements OnInit, AfterViewInit, OnDestroy { private _changeDetectorRef: ChangeDetectorRef, private _fuseConfirmationService: FuseConfirmationService, private _formBuilder: FormBuilder, - private _powerballService: PowerballService + private _powerballService: PowerballService, + private router: Router ) {} // ----------------------------------------------------------------------------------------------------- @@ -169,6 +169,10 @@ 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 // ----------------------------------------------------------------------------------------------------- diff --git a/src/app/modules/admin/member/casino-money/components/list.component.html b/src/app/modules/admin/member/casino-money/components/list.component.html index 80d9d39..c9f75e2 100644 --- a/src/app/modules/admin/member/casino-money/components/list.component.html +++ b/src/app/modules/admin/member/casino-money/components/list.component.html @@ -113,7 +113,12 @@ {{ casinoMoney.highRank }}
- {{ casinoMoney.signinId }} +
+ {{ casinoMoney.signinId }} +

{{ casinoMoney.nickname }}
diff --git a/src/app/modules/admin/member/casino-money/components/list.component.ts b/src/app/modules/admin/member/casino-money/components/list.component.ts index 7dc0bbc..e9d7a0a 100644 --- a/src/app/modules/admin/member/casino-money/components/list.component.ts +++ b/src/app/modules/admin/member/casino-money/components/list.component.ts @@ -29,7 +29,6 @@ import { import { fuseAnimations } from '@fuse/animations'; import { FuseConfirmationService } from '@fuse/services/confirmation'; -import { User } from '../../user/models/user'; import { CasinoMoney } from '../models/casino-money'; import { CasinoMoneyPagination } from '../models/casino-money-pagination'; import { CasinoMoneyService } from '../services/casino-money.service'; @@ -71,7 +70,6 @@ export class ListComponent implements OnInit, AfterViewInit, OnDestroy { @ViewChild(MatSort) private _sort!: MatSort; casinoMoneys$!: Observable; - users$!: Observable; __isSearchOpened = false; isLoading = false; diff --git a/src/app/modules/admin/member/coupon-log/components/list.component.ts b/src/app/modules/admin/member/coupon-log/components/list.component.ts index c012cd3..64afaed 100644 --- a/src/app/modules/admin/member/coupon-log/components/list.component.ts +++ b/src/app/modules/admin/member/coupon-log/components/list.component.ts @@ -29,7 +29,6 @@ import { import { fuseAnimations } from '@fuse/animations'; import { FuseConfirmationService } from '@fuse/services/confirmation'; -import { User } from '../../user/models/user'; import { CouponLog } from '../models/coupon-log'; import { CouponLogPagination } from '../models/coupon-log-pagination'; import { CouponLogService } from '../services/coupon-log.service'; @@ -71,7 +70,6 @@ export class ListComponent implements OnInit, AfterViewInit, OnDestroy { @ViewChild(MatSort) private _sort!: MatSort; couponLogs$!: Observable; - users$!: Observable; __isSearchOpened = false; isLoading = false; @@ -171,10 +169,10 @@ export class ListComponent implements OnInit, AfterViewInit, OnDestroy { // @ Public methods // ----------------------------------------------------------------------------------------------------- - viewUserDetail(id: string): void { + /* viewUserDetail(id: string): void { let url: string = 'member/user/' + id; this.router.navigateByUrl(url); - } + } */ // ----------------------------------------------------------------------------------------------------- // @ Private methods // ----------------------------------------------------------------------------------------------------- diff --git a/src/app/modules/admin/member/coupon-money-log/components/list.component.ts b/src/app/modules/admin/member/coupon-money-log/components/list.component.ts index 6f8de3d..0aba103 100644 --- a/src/app/modules/admin/member/coupon-money-log/components/list.component.ts +++ b/src/app/modules/admin/member/coupon-money-log/components/list.component.ts @@ -29,7 +29,6 @@ import { import { fuseAnimations } from '@fuse/animations'; import { FuseConfirmationService } from '@fuse/services/confirmation'; -import { User } from '../../user/models/user'; import { CouponMoneyLog } from '../models/coupon-money-log'; import { CouponMoneyLogPagination } from '../models/coupon-money-log-pagination'; import { CouponMoneyLogService } from '../services/coupon-money-log.service'; @@ -71,7 +70,6 @@ export class ListComponent implements OnInit, AfterViewInit, OnDestroy { @ViewChild(MatSort) private _sort!: MatSort; couponMoneyLogs$!: Observable; - users$!: Observable; __isSearchOpened = false; isLoading = false; @@ -171,10 +169,10 @@ export class ListComponent implements OnInit, AfterViewInit, OnDestroy { // @ Public methods // ----------------------------------------------------------------------------------------------------- - viewUserDetail(id: string): void { + /* viewUserDetail(id: string): void { let url: string = 'member/user/' + id; this.router.navigateByUrl(url); - } + } */ // ----------------------------------------------------------------------------------------------------- // @ Private methods // ----------------------------------------------------------------------------------------------------- diff --git a/src/app/modules/admin/member/coupon/components/list.component.ts b/src/app/modules/admin/member/coupon/components/list.component.ts index 14b5216..f4b45bd 100644 --- a/src/app/modules/admin/member/coupon/components/list.component.ts +++ b/src/app/modules/admin/member/coupon/components/list.component.ts @@ -29,7 +29,6 @@ import { import { fuseAnimations } from '@fuse/animations'; import { FuseConfirmationService } from '@fuse/services/confirmation'; -import { User } from '../../user/models/user'; import { Coupon } from '../models/coupon'; import { CouponPagination } from '../models/coupon-pagination'; import { CouponService } from '../services/coupon.service'; @@ -71,7 +70,6 @@ export class ListComponent implements OnInit, AfterViewInit, OnDestroy { @ViewChild(MatSort) private _sort!: MatSort; coupons$!: Observable; - users$!: Observable; __isSearchOpened = false; isLoading = false; diff --git a/src/app/modules/admin/member/current-user/components/list.component.html b/src/app/modules/admin/member/current-user/components/list.component.html index cecdbfa..7e2348d 100644 --- a/src/app/modules/admin/member/current-user/components/list.component.html +++ b/src/app/modules/admin/member/current-user/components/list.component.html @@ -30,19 +30,28 @@ {{ info.highRank }} - - - 아이디 -
- 닉네임 - - - {{ info.signinId }} -
- {{ info.nickname }} - + + + + 아이디 +
+ 닉네임 + + +
+ {{ info.signinId }} +
+
+ {{ info.nickname }} + +
- diff --git a/src/app/modules/admin/member/current-user/components/list.component.ts b/src/app/modules/admin/member/current-user/components/list.component.ts index 466a6a6..e705f47 100644 --- a/src/app/modules/admin/member/current-user/components/list.component.ts +++ b/src/app/modules/admin/member/current-user/components/list.component.ts @@ -29,7 +29,6 @@ import { import { fuseAnimations } from '@fuse/animations'; import { FuseConfirmationService } from '@fuse/services/confirmation'; -import { User } from '../../user/models/user'; import { CurrentUser } from '../models/current-user'; import { CurrentUserPagination } from '../models/current-user-pagination'; import { CurrentUserService } from '../services/current-user.service'; @@ -74,7 +73,6 @@ export class ListComponent implements OnInit, AfterViewInit, OnDestroy { new MatTableDataSource(); currentUsers$!: Observable; - users$!: Observable; isLoading = false; searchInputControl = new FormControl(); diff --git a/src/app/modules/admin/member/partner-recommendation/components/list.component.ts b/src/app/modules/admin/member/partner-recommendation/components/list.component.ts index a46e1ed..51da2e6 100644 --- a/src/app/modules/admin/member/partner-recommendation/components/list.component.ts +++ b/src/app/modules/admin/member/partner-recommendation/components/list.component.ts @@ -29,8 +29,6 @@ import { import { fuseAnimations } from '@fuse/animations'; import { FuseConfirmationService } from '@fuse/services/confirmation'; -import { User } from '../../user/models/user'; - import { PartnerRecommendation as PartnerRecommendation } from '../models/partner-recommendation'; import { PartnerRecommendationPagination as PartnerRecommendationPagination } from '../models/partner-recommendation-pagination'; import { PartnerRecommendationService as PartnerRecommendationService } from '../services/partner-recommendation.service'; @@ -75,7 +73,6 @@ export class ListComponent implements OnInit, AfterViewInit, OnDestroy { @ViewChild(MatSort) private _sort!: MatSort; partnerRecommendations$!: Observable; - users$!: Observable; __isSearchOpened1 = false; __isSearchOpened2 = false; @@ -178,10 +175,10 @@ export class ListComponent implements OnInit, AfterViewInit, OnDestroy { // @ Public methods // ----------------------------------------------------------------------------------------------------- - viewUserDetail(id: string): void { + /* viewUserDetail(id: string): void { let url: string = 'member/user/' + id; this.router.navigateByUrl(url); - } + } */ // ----------------------------------------------------------------------------------------------------- // @ Private methods // ----------------------------------------------------------------------------------------------------- diff --git a/src/app/modules/admin/member/unconnected/components/list.component.html b/src/app/modules/admin/member/unconnected/components/list.component.html index 80dfbcb..a808524 100644 --- a/src/app/modules/admin/member/unconnected/components/list.component.html +++ b/src/app/modules/admin/member/unconnected/components/list.component.html @@ -205,7 +205,12 @@ {{ unconnected.memberCount }}
- {{ unconnected.signinId }} +
+ {{ unconnected.signinId }} +

{{ unconnected.nickname }}
diff --git a/src/app/modules/admin/member/unconnected/components/list.component.ts b/src/app/modules/admin/member/unconnected/components/list.component.ts index 1b03f79..5a4d6ba 100644 --- a/src/app/modules/admin/member/unconnected/components/list.component.ts +++ b/src/app/modules/admin/member/unconnected/components/list.component.ts @@ -29,7 +29,6 @@ import { import { fuseAnimations } from '@fuse/animations'; import { FuseConfirmationService } from '@fuse/services/confirmation'; -import { User } from '../../user/models/user'; import { Unconnected } from '../models/unconnected'; import { UnconnectedPagination } from '../models/unconnected-pagination'; import { UnconnectedService } from '../services/unconnected.service'; @@ -71,7 +70,6 @@ export class ListComponent implements OnInit, AfterViewInit, OnDestroy { @ViewChild(MatSort) private _sort!: MatSort; unconnecteds$!: Observable; - users$!: Observable; __isSearchOpened = false; isLoading = false; diff --git a/src/app/modules/admin/report/comp-log/components/list.component.html b/src/app/modules/admin/report/comp-log/components/list.component.html index 330f4d6..4ab99e7 100644 --- a/src/app/modules/admin/report/comp-log/components/list.component.html +++ b/src/app/modules/admin/report/comp-log/components/list.component.html @@ -133,7 +133,12 @@ {{ compLog.idx }}
- {{ compLog.signinId }} +
+ {{ compLog.signinId }} +

{{ compLog.nickname }}
diff --git a/src/app/modules/admin/report/comp-log/components/list.component.ts b/src/app/modules/admin/report/comp-log/components/list.component.ts index 3f3720a..fdfefad 100644 --- a/src/app/modules/admin/report/comp-log/components/list.component.ts +++ b/src/app/modules/admin/report/comp-log/components/list.component.ts @@ -29,7 +29,6 @@ import { import { fuseAnimations } from '@fuse/animations'; import { FuseConfirmationService } from '@fuse/services/confirmation'; -import { User } from '../../../member/user/models/user'; import { CompLog } from '../models/comp-log'; import { CompLogPagination } from '../models/comp-log-pagination'; import { CompLogService } from '../services/comp-log.service'; @@ -71,7 +70,6 @@ export class ListComponent implements OnInit, AfterViewInit, OnDestroy { @ViewChild(MatSort) private _sort!: MatSort; compLogs$!: Observable; - users$!: Observable; __isSearchOpened = false; isLoading = false; 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 714bb5a..a3560aa 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 @@ -28,7 +28,6 @@ import { import { fuseAnimations } from '@fuse/animations'; import { FuseConfirmationService } from '@fuse/services/confirmation'; -import { User } from '../../../member/user/models/user'; import { DailyPartner } from '../models/daily-partner'; import { DailyPartnerPagination } from '../models/daily-partner-pagination'; import { DailyPartnerService } from '../services/daily-partner.service'; @@ -70,7 +69,6 @@ export class ListComponent implements OnInit, AfterViewInit, OnDestroy { @ViewChild(MatSort) private _sort!: MatSort; dailyPartners$!: Observable; - users$!: Observable; __isSearchOpened = false; isLoading = false; @@ -170,10 +168,10 @@ export class ListComponent implements OnInit, AfterViewInit, OnDestroy { // @ Public methods // ----------------------------------------------------------------------------------------------------- - viewUserDetail(id: string): void { + /* viewUserDetail(id: string): void { let url: string = 'member/user/' + id; this.router.navigateByUrl(url); - } + } */ // ----------------------------------------------------------------------------------------------------- // @ Private methods // ----------------------------------------------------------------------------------------------------- diff --git a/src/app/modules/admin/report/daily/components/list.component.ts b/src/app/modules/admin/report/daily/components/list.component.ts index 932055e..34aa4bb 100644 --- a/src/app/modules/admin/report/daily/components/list.component.ts +++ b/src/app/modules/admin/report/daily/components/list.component.ts @@ -29,7 +29,6 @@ import { import { fuseAnimations } from '@fuse/animations'; import { FuseConfirmationService } from '@fuse/services/confirmation'; -import { User } from '../../../member/user/models/user'; import { Daily } from '../models/daily'; import { DailyPagination } from '../models/daily-pagination'; import { DailyService } from '../services/daily.service'; @@ -71,7 +70,6 @@ export class ListComponent implements OnInit, AfterViewInit, OnDestroy { @ViewChild(MatSort) private _sort!: MatSort; dailys$!: Observable; - users$!: Observable; __isSearchOpened = false; isLoading = false; @@ -171,10 +169,10 @@ export class ListComponent implements OnInit, AfterViewInit, OnDestroy { // @ Public methods // ----------------------------------------------------------------------------------------------------- - viewUserDetail(id: string): void { + /* viewUserDetail(id: string): void { let url: string = 'member/user/' + id; this.router.navigateByUrl(url); - } + } */ // ----------------------------------------------------------------------------------------------------- // @ Private methods // ----------------------------------------------------------------------------------------------------- diff --git a/src/app/modules/admin/report/duplicated-session/components/list.component.ts b/src/app/modules/admin/report/duplicated-session/components/list.component.ts index a8e7242..ea10cc0 100644 --- a/src/app/modules/admin/report/duplicated-session/components/list.component.ts +++ b/src/app/modules/admin/report/duplicated-session/components/list.component.ts @@ -29,7 +29,6 @@ import { import { fuseAnimations } from '@fuse/animations'; import { FuseConfirmationService } from '@fuse/services/confirmation'; -import { User } from '../../../member/user/models/user'; import { DuplicatedSession } from '../models/duplicated-session'; import { DuplicatedSessionPagination } from '../models/duplicated-session-pagination'; import { DuplicatedSessionService } from '../services/duplicated-session.service'; @@ -67,7 +66,6 @@ export class ListComponent implements OnInit, AfterViewInit, OnDestroy { @ViewChild(MatSort) private _sort!: MatSort; duplicatedSessions$!: Observable; - users$!: Observable; isLoading = false; searchInputControl = new FormControl(); @@ -169,10 +167,10 @@ export class ListComponent implements OnInit, AfterViewInit, OnDestroy { // @ Public methods // ----------------------------------------------------------------------------------------------------- - viewUserDetail(id: string): void { + /* viewUserDetail(id: string): void { let url: string = 'member/user/' + id; this.router.navigateByUrl(url); - } + } */ // ----------------------------------------------------------------------------------------------------- // @ Private methods // ----------------------------------------------------------------------------------------------------- diff --git a/src/app/modules/admin/report/modification-log/components/list.component.ts b/src/app/modules/admin/report/modification-log/components/list.component.ts index dcd3701..05689ca 100644 --- a/src/app/modules/admin/report/modification-log/components/list.component.ts +++ b/src/app/modules/admin/report/modification-log/components/list.component.ts @@ -29,7 +29,6 @@ import { import { fuseAnimations } from '@fuse/animations'; import { FuseConfirmationService } from '@fuse/services/confirmation'; -import { User } from '../../../member/user/models/user'; import { ModificationLog } from '../models/modification-log'; import { ModificationLogPagination } from '../models/modification-log-pagination'; import { ModificationLogService } from '../services/modification-log.service'; @@ -71,7 +70,6 @@ export class ListComponent implements OnInit, AfterViewInit, OnDestroy { @ViewChild(MatSort) private _sort!: MatSort; modificationLogs$!: Observable; - users$!: Observable; __isSearchOpened = false; isLoading = false; @@ -171,10 +169,10 @@ export class ListComponent implements OnInit, AfterViewInit, OnDestroy { // @ Public methods // ----------------------------------------------------------------------------------------------------- - viewUserDetail(id: string): void { + /* viewUserDetail(id: string): void { let url: string = 'member/user/' + id; this.router.navigateByUrl(url); - } + } */ // ----------------------------------------------------------------------------------------------------- // @ Private methods // ----------------------------------------------------------------------------------------------------- diff --git a/src/app/modules/admin/report/money-log/components/list.component.html b/src/app/modules/admin/report/money-log/components/list.component.html index 576943b..c74f559 100644 --- a/src/app/modules/admin/report/money-log/components/list.component.html +++ b/src/app/modules/admin/report/money-log/components/list.component.html @@ -119,7 +119,12 @@ >
{{ moneyLog.finalSigninDate }}
- {{ moneyLog.signinId }} +
+ {{ moneyLog.signinId }} +

{{ moneyLog.nickname }}
diff --git a/src/app/modules/admin/report/money-log/components/list.component.ts b/src/app/modules/admin/report/money-log/components/list.component.ts index 6aee7df..b298b68 100644 --- a/src/app/modules/admin/report/money-log/components/list.component.ts +++ b/src/app/modules/admin/report/money-log/components/list.component.ts @@ -29,7 +29,6 @@ import { import { fuseAnimations } from '@fuse/animations'; import { FuseConfirmationService } from '@fuse/services/confirmation'; -import { User } from '../../../member/user/models/user'; import { MoneyLog } from '../models/money-log'; import { MoneyLogPagination } from '../models/money-log-pagination'; import { MoneyLogService } from '../services/money-log.service'; @@ -71,7 +70,6 @@ export class ListComponent implements OnInit, AfterViewInit, OnDestroy { @ViewChild(MatSort) private _sort!: MatSort; moneyLogs$!: Observable; - users$!: Observable; __isSearchOpened = false; isLoading = false; diff --git a/src/app/modules/admin/report/monthly/components/list.component.ts b/src/app/modules/admin/report/monthly/components/list.component.ts index f635a89..6c37bf7 100644 --- a/src/app/modules/admin/report/monthly/components/list.component.ts +++ b/src/app/modules/admin/report/monthly/components/list.component.ts @@ -29,7 +29,6 @@ import { import { fuseAnimations } from '@fuse/animations'; import { FuseConfirmationService } from '@fuse/services/confirmation'; -import { User } from '../../../member/user/models/user'; import { Monthly } from '../models/monthly'; import { MonthlyPagination } from '../models/monthly-pagination'; import { MonthlyService } from '../services/monthly.service'; @@ -67,7 +66,6 @@ export class ListComponent implements OnInit, AfterViewInit, OnDestroy { @ViewChild(MatSort) private _sort!: MatSort; monthlys$!: Observable; - users$!: Observable; isLoading = false; searchInputControl = new FormControl(); @@ -166,10 +164,10 @@ export class ListComponent implements OnInit, AfterViewInit, OnDestroy { // @ Public methods // ----------------------------------------------------------------------------------------------------- - viewUserDetail(id: string): void { + /* viewUserDetail(id: string): void { let url: string = 'member/user/' + id; this.router.navigateByUrl(url); - } + } */ // ----------------------------------------------------------------------------------------------------- // @ Private methods // ----------------------------------------------------------------------------------------------------- diff --git a/src/app/modules/admin/report/payment-log/components/list.component.ts b/src/app/modules/admin/report/payment-log/components/list.component.ts index e6a9d7c..2d338b2 100644 --- a/src/app/modules/admin/report/payment-log/components/list.component.ts +++ b/src/app/modules/admin/report/payment-log/components/list.component.ts @@ -29,7 +29,6 @@ import { import { fuseAnimations } from '@fuse/animations'; import { FuseConfirmationService } from '@fuse/services/confirmation'; -import { User } from '../../../member/user/models/user'; import { PaymentLog } from '../models/payment-log'; import { PaymentLogPagination } from '../models/payment-log-pagination'; import { PaymentLogService } from '../services/payment-log.service'; @@ -71,7 +70,6 @@ export class ListComponent implements OnInit, AfterViewInit, OnDestroy { @ViewChild(MatSort) private _sort!: MatSort; paymentLogs$!: Observable; - users$!: Observable; __isSearchOpened = false; isLoading = false; @@ -171,10 +169,10 @@ export class ListComponent implements OnInit, AfterViewInit, OnDestroy { // @ Public methods // ----------------------------------------------------------------------------------------------------- - viewUserDetail(id: string): void { + /* viewUserDetail(id: string): void { let url: string = 'member/user/' + id; this.router.navigateByUrl(url); - } + } */ // ----------------------------------------------------------------------------------------------------- // @ Private methods // ----------------------------------------------------------------------------------------------------- diff --git a/src/app/modules/admin/report/statistics/components/list.component.ts b/src/app/modules/admin/report/statistics/components/list.component.ts index b3b4c2b..c0ab46d 100644 --- a/src/app/modules/admin/report/statistics/components/list.component.ts +++ b/src/app/modules/admin/report/statistics/components/list.component.ts @@ -29,7 +29,6 @@ import { import { fuseAnimations } from '@fuse/animations'; import { FuseConfirmationService } from '@fuse/services/confirmation'; -import { User } from '../../../member/user/models/user'; import { Statistics } from '../models/statistics'; import { StatisticsPagination } from '../models/statistics-pagination'; import { StatisticsService } from '../services/statistics.service'; @@ -71,7 +70,6 @@ export class ListComponent implements OnInit, AfterViewInit, OnDestroy { @ViewChild(MatSort) private _sort!: MatSort; statistics$!: Observable; - users$!: Observable; __isSearchOpened = false; isLoading = false; @@ -171,10 +169,10 @@ export class ListComponent implements OnInit, AfterViewInit, OnDestroy { // @ Public methods // ----------------------------------------------------------------------------------------------------- - viewUserDetail(id: string): void { + /* viewUserDetail(id: string): void { let url: string = 'member/user/' + id; this.router.navigateByUrl(url); - } + } */ // ----------------------------------------------------------------------------------------------------- // @ Private methods // ----------------------------------------------------------------------------------------------------- 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 e27ad39..68090ab 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 @@ -186,7 +186,12 @@ class="today-bet-grid grid items-center gap-4 py-3 px-6 md:px-8 border-b" >
- {{ todayBet.signinId }} +
+ {{ todayBet.signinId }} +

{{ todayBet.nickname }}
diff --git a/src/app/modules/admin/report/today-bet/components/list.component.ts b/src/app/modules/admin/report/today-bet/components/list.component.ts index bbcbcfd..dd30dad 100644 --- a/src/app/modules/admin/report/today-bet/components/list.component.ts +++ b/src/app/modules/admin/report/today-bet/components/list.component.ts @@ -29,7 +29,6 @@ import { import { fuseAnimations } from '@fuse/animations'; import { FuseConfirmationService } from '@fuse/services/confirmation'; -import { User } from '../../../member/user/models/user'; import { TodayBet } from '../models/today-bet'; import { TodayBetPagination } from '../models/today-bet-pagination'; import { TodayBetService } from '../services/today-bet.service'; @@ -71,7 +70,6 @@ export class ListComponent implements OnInit, AfterViewInit, OnDestroy { @ViewChild(MatSort) private _sort!: MatSort; todayBets$!: Observable; - users$!: Observable; __isSearchOpened = false; isLoading = false; diff --git a/src/app/modules/admin/report/user-session/components/list.component.html b/src/app/modules/admin/report/user-session/components/list.component.html index e667762..0d87fa4 100644 --- a/src/app/modules/admin/report/user-session/components/list.component.html +++ b/src/app/modules/admin/report/user-session/components/list.component.html @@ -140,7 +140,12 @@ diff --git a/src/app/modules/admin/report/user-session/components/list.component.ts b/src/app/modules/admin/report/user-session/components/list.component.ts index 6778a0c..d1070b7 100644 --- a/src/app/modules/admin/report/user-session/components/list.component.ts +++ b/src/app/modules/admin/report/user-session/components/list.component.ts @@ -29,7 +29,6 @@ import { import { fuseAnimations } from '@fuse/animations'; import { FuseConfirmationService } from '@fuse/services/confirmation'; -import { User } from '../../../member/user/models/user'; import { UserSession } from '../models/user-session'; import { UserSessionPagination } from '../models/user-session-pagination'; import { UserSessionService } from '../services/user-session.service'; @@ -67,7 +66,6 @@ export class ListComponent implements OnInit, AfterViewInit, OnDestroy { @ViewChild(MatSort) private _sort!: MatSort; userSessions$!: Observable; - users$!: Observable; isLoading = false; searchInputControl = new FormControl(); diff --git a/src/app/modules/admin/settings/basic/components/list.component.ts b/src/app/modules/admin/settings/basic/components/list.component.ts index fb8caa5..7946ea4 100644 --- a/src/app/modules/admin/settings/basic/components/list.component.ts +++ b/src/app/modules/admin/settings/basic/components/list.component.ts @@ -32,7 +32,6 @@ import { FuseConfirmationService } from '@fuse/services/confirmation'; import { BasicSetting } from '../models/basic-setting'; import { BasicService } from '../services/basic.service'; import { CurrentUser } from 'app/modules/admin/member/current-user/models/current-user'; -import { User } from 'app/modules/admin/member/user/models/user'; import { MatTableDataSource } from '@angular/material/table'; @Component({ @@ -67,7 +66,6 @@ export class ListComponent implements OnInit, AfterViewInit, OnDestroy { @ViewChild(MatSort) private _sort!: MatSort; currentUsers$!: Observable; - users$!: Observable; siteSettingTableColumns: string[] = ['info', 'description', 'updateBtn'];