+
+
+
+
+
+
+ 루징 관리
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 기본데이터생성
+
+
+
-
-
- There are no loosing datas!
+
+
+
+
+ 번호
+
+
+ {{ i + 1 }}
+
+
+
+
+
+
+ 시작일
+
+
+ {{ info.startDate }}
+
+
+
+
+
+ 종료일
+
+
+ {{ info.endDate }}
+
+
+
+
+
+
+
+ 기본데이터
+
+
+ {{
+ info.defaultCount
+ }}
+
+
+
+
+
+ 상세보기
+
+
+
+
+
+
+ 루징데이터
+
+
+ {{
+ info.loosingCount
+ }}
+
+
+
+
+
+ 상세보기
+
+
+
+
+
+ 삭제
+
+
+ 삭제
+
+
+
+
+
+
diff --git a/src/app/modules/admin/report/loosing/components/list.component.ts b/src/app/modules/admin/report/loosing/components/list.component.ts
index 1d0addc..6b885d6 100644
--- a/src/app/modules/admin/report/loosing/components/list.component.ts
+++ b/src/app/modules/admin/report/loosing/components/list.component.ts
@@ -8,32 +8,23 @@ import {
ViewChild,
ViewEncapsulation,
} from '@angular/core';
-import {
- FormBuilder,
- FormControl,
- FormGroup,
- Validators,
-} from '@angular/forms';
-import { MatCheckboxChange } from '@angular/material/checkbox';
+import { FormBuilder, FormGroup } from '@angular/forms';
+
import { MatPaginator } from '@angular/material/paginator';
import { MatSort } from '@angular/material/sort';
-import {
- debounceTime,
- map,
- merge,
- Observable,
- Subject,
- switchMap,
- takeUntil,
-} from 'rxjs';
+import { map, merge, Observable, Subject, switchMap, takeUntil } from 'rxjs';
import { fuseAnimations } from '@fuse/animations';
import { FuseConfirmationService } from '@fuse/services/confirmation';
-import { User } from '../../../member/user/models/user';
import { Loosing } from '../models/loosing';
-import { LoosingPagination } from '../models/loosing-pagination';
+
import { LoosingService } from '../services/loosing.service';
-import { Router } from '@angular/router';
+import {
+ NavigationBehaviorOptions,
+ NavigationExtras,
+ Router,
+} from '@angular/router';
+import { MatTableDataSource } from '@angular/material/table';
@Component({
selector: 'loosing-list',
@@ -45,15 +36,15 @@ import { Router } from '@angular/router';
grid-template-columns: 60px auto 40px;
@screen sm {
- grid-template-columns: 60px 60px 60px 60px 60px 60px auto 60px;
+ grid-template-columns: 40px 70px 70px 70px 70px 100px;
}
@screen md {
- grid-template-columns: 60px 60px 60px 60px 60px 60px auto 60px 60px;
+ grid-template-columns: 40px 70px 70px 70px 70px 100px;
}
@screen lg {
- grid-template-columns: 60px 70px 70px 70px 70px 100px 60px 60px auto 60px 60px 60px 60px;
+ grid-template-columns: 40px 70px 70px 70px 70px 100px;
}
}
`,
@@ -67,15 +58,35 @@ export class ListComponent implements OnInit, AfterViewInit, OnDestroy {
@ViewChild(MatSort) private _sort!: MatSort;
loosings$!: Observable
;
- users$!: Observable;
isLoading = false;
- searchInputControl = new FormControl();
- selectedLoosing?: Loosing;
- pagination?: LoosingPagination;
+
+ loosingDataSource: MatTableDataSource = new MatTableDataSource();
private _unsubscribeAll: Subject = new Subject();
+ headerTableColumns: string[] = [
+ 'index',
+ 'startDate',
+ 'endDate',
+ 'defaultDataTotalCount',
+ 'loosingDataTotalCount',
+ 'removeBtn',
+ ];
+
+ displayedTableColumns: string[] = [
+ 'index',
+ 'startDate',
+ 'endDate',
+ 'defaultDataTotalCount',
+ 'defaultDataViewBtn',
+ 'loosingDataTotalCount',
+ 'loosingDataViewBtn',
+ 'removeBtn',
+ ];
+
+ configForm!: FormGroup;
+
/**
* Constructor
*/
@@ -95,63 +106,46 @@ export class ListComponent implements OnInit, AfterViewInit, OnDestroy {
* On init
*/
ngOnInit(): void {
- // Get the pagination
- this._loosingService.pagination$
+ this.configForm = this._formBuilder.group({
+ title: '알림',
+ message:
+ '정말로 삭제하시겠습니까? 삭제! ',
+ icon: this._formBuilder.group({
+ show: true,
+ name: 'heroicons_outline:exclamation',
+ color: 'warn',
+ }),
+ actions: this._formBuilder.group({
+ confirm: this._formBuilder.group({
+ show: true,
+ label: '삭제',
+ color: 'warn',
+ }),
+ cancel: this._formBuilder.group({
+ show: true,
+ label: '취소',
+ }),
+ }),
+ dismissible: true,
+ });
+ // Get the products
+ this._loosingService.loosings$
.pipe(takeUntil(this._unsubscribeAll))
- .subscribe((pagination: LoosingPagination | undefined) => {
- // Update the pagination
- this.pagination = pagination;
+ .subscribe((loosings: Loosing[] | undefined) => {
+ if (!loosings) {
+ return;
+ }
+ this.loosingDataSource.data = loosings;
// Mark for check
this._changeDetectorRef.markForCheck();
});
-
- // Get the products
- this.loosings$ = this._loosingService.loosings$;
}
/**
* 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 loosing 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._loosingService.getLoosings(
- this._paginator.pageIndex,
- this._paginator.pageSize,
- this._sort.active,
- this._sort.direction
- );
- }),
- map(() => {
- this.isLoading = false;
- })
- )
- .subscribe();
- }
- }
+ ngAfterViewInit(): void {}
/**
* On destroy
@@ -166,14 +160,42 @@ 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
// -----------------------------------------------------------------------------------------------------
+ __viewLoosingDetail(loosing: Loosing, type: string): void {
+ let url: string = '';
+
+ if (type === '1') {
+ url = 'report/loosing/01/' + loosing.id + `?type=${type}`;
+ } else {
+ url = 'report/loosing/02/' + loosing.id + `?type=${type}`;
+ }
+
+ let extras: NavigationBehaviorOptions = {
+ state: {
+ viewType: type,
+ startDate: loosing.startDate,
+ endDate: loosing.endDate,
+ },
+ };
+ this.router.navigateByUrl(url, extras);
+ }
+
+ __onClickRemoveBtn(event: MouseEvent, id: string): void {
+ // Open the dialog and save the reference of it
+ const dialogRef = this._fuseConfirmationService.open(this.configForm.value);
+
+ // Subscribe to afterClosed from the dialog reference
+ dialogRef.afterClosed().subscribe((result) => {
+ console.log(result);
+ });
+ }
/**
* Create product
*/
diff --git a/src/app/modules/admin/report/loosing/components/view-01.component.html b/src/app/modules/admin/report/loosing/components/view-01.component.html
new file mode 100644
index 0000000..d92352f
--- /dev/null
+++ b/src/app/modules/admin/report/loosing/components/view-01.component.html
@@ -0,0 +1,291 @@
+
+
+
+
+
+
+
+ 루징 관리
+
+
+
+
+
+
+
+
+
+ 목록으로
+
+
+ 루징데이터보기
+
+
+
+
+
+
+
+
+
+
+ {{ info.signinId }}
+
+
+
+
+
+ 아이디
+
+
+
+
+
+
+
+ {{ info.code }}
+
+
+
+
+
+ 코드
+
+
+
+
+
+
+ 베팅
+
+
+ {{ info.casinoReport.betMoneny }}
+
+
+
+
+
+
+ 당첨
+
+ {{
+ info.casinoReport.betWinMoneny
+ }}
+
+
+
+
+
+ 윈로스
+
+ {{
+ info.casinoReport.betWinLossMoneny
+ }}
+
+
+
+
+
+ 롤링
+
+
+ {{ info.casinoReport.rollingMoney }}
+
+
+
+
+
+
+ 루징요율
+
+ {{
+ info.casinoReport.loosingRate
+ }}
+
+
+
+
+ 본인
+
+ {{
+ info.casinoReport.meMoney
+ }}
+
+
+
+
+
+
+
+
+ 베팅
+
+
+
+ {{ info.slotReport.betMoneny }}
+
+
+
+
+
+
+ 당첨
+
+ {{
+ info.slotReport.betWinMoneny
+ }}
+
+
+
+
+
+ 윈로스
+
+ {{
+ info.slotReport.betWinLossMoneny
+ }}
+
+
+
+
+
+ 롤링
+
+
+ {{ info.slotReport.rollingMoney }}
+
+
+
+
+
+
+ 루징요율
+
+ {{
+ info.slotReport.loosingRate
+ }}
+
+
+
+
+ 본인
+
+ {{
+ info.slotReport.meMoney
+ }}
+
+
+
+
+
+
+
+
+
+ 카지노루징
+
+
+
+
+
+
+ 슬롯루징
+
+
+
+
+
+
+
+
+
+
= new MatTableDataSource();
private _unsubscribeAll: Subject = new Subject();
+ displayedTableColumns: string[] = [
+ 'userId',
+ 'userCode',
+ 'casinoBet',
+ 'casinoWin',
+ 'casinoWinLoss',
+ 'casinoRolling',
+ 'casinoLoosing',
+ 'casinoSelf',
+ 'slotBet',
+ 'slotWin',
+ 'slotWinLoss',
+ 'slotRolling',
+ 'slotLoosing',
+ 'slotSelf',
+ ];
+
/**
* Constructor
*/
constructor(
private _changeDetectorRef: ChangeDetectorRef,
private _fuseConfirmationService: FuseConfirmationService,
- private _formBuilder: FormBuilder,
- private _userService: UserService
+ private _loosingService: LoosingService,
+ private _router: Router
) {}
// -----------------------------------------------------------------------------------------------------
@@ -88,53 +94,18 @@ export class ViewComponent implements OnInit, AfterViewInit, OnDestroy {
* On init
*/
ngOnInit(): void {
- this.selectedProductForm = this._formBuilder.group({
- id: [''],
- signinId: [{ value: '', disabled: true }],
- signinPw: [{ value: '' }],
- exchangePw: [''],
- description: [''],
- tags: [[]],
- nickname: [{ value: '', disabled: true }],
- ownCash: [''],
- phoneNumber: [''],
- level: [''],
- status: [''],
- isExcahngeMoney: [''],
- bankname: [''],
- accountNumber: [''],
- accountHolder: [''],
- comp: [''],
- coupon: [''],
- recommender: [{ value: '', disabled: true }],
- changeSite: [''],
- recommendCount: [''],
- hodingGameMoney: [{ value: '0', disabled: true }],
- memo: [''],
- bacaraRate: [],
- rulletRate: [],
- dragonRate: [],
- etcRate: [],
- slotRate: [],
- casinoRusingRate: [],
- slotRusingRate: [],
- });
-
- // Get the User
- this._userService.user$
+ // Get the products
+ this._loosingService.loosing$
.pipe(takeUntil(this._unsubscribeAll))
- .subscribe((user: User | undefined) => {
- if (!user) {
+ .subscribe((loosingReport: LoosingReport[] | undefined) => {
+ if (!loosingReport) {
return;
}
- this.selectedUser = user;
- this.selectedProductForm.patchValue(user);
+ this.loosingDataSource.data = loosingReport;
// Mark for check
this._changeDetectorRef.markForCheck();
});
-
- /* this.user$ = this._userService.user$; */
}
/**
@@ -155,6 +126,10 @@ export class ViewComponent implements OnInit, AfterViewInit, OnDestroy {
// @ Public methods
// -----------------------------------------------------------------------------------------------------
+ /* viewUserDetail(id: string): void {
+ let url: string = 'member/user/' + id;
+ this.router.navigateByUrl(url);
+ } */
// -----------------------------------------------------------------------------------------------------
// @ Private methods
// -----------------------------------------------------------------------------------------------------
@@ -164,6 +139,14 @@ export class ViewComponent implements OnInit, AfterViewInit, OnDestroy {
*/
__createProduct(): void {}
+ __onClickPrev(event: MouseEvent): void {
+ this._router.navigateByUrl('/report/loosing');
+ }
+
+ __onClickNext(event: MouseEvent): void {
+ this._router.navigateByUrl('/report/loosing/02/loosing_1?type=2');
+ }
+
/**
* Toggle product details
*
diff --git a/src/app/modules/admin/report/loosing/components/view-02.component.html b/src/app/modules/admin/report/loosing/components/view-02.component.html
new file mode 100644
index 0000000..175d12f
--- /dev/null
+++ b/src/app/modules/admin/report/loosing/components/view-02.component.html
@@ -0,0 +1,314 @@
+
+
+
+
+
+
+
+ 루징데이터
+
+
+
+
+
+
+
+
+
+ 목록으로
+
+
+ 이전페이지
+
+
+ 엑셀저장
+
+
+
+
+
+
+
+
+
+
+ {{ info.signinId }}
+
+
+
+
+
+ 아이디
+
+
+
+
+
+
+
+ {{ info.code }}
+
+
+
+
+
+ 코드
+
+
+
+
+
+
+ 윈로스
+
+ {{
+ info.casinoReport.betWinLossMoneny
+ }}
+
+
+
+
+ 롤링
+
+
+ {{ info.casinoReport.rollingMoney }}
+
+
+
+
+
+ 손익
+
+
+ {{ info.casinoReport.profitLossMoney }}
+
+
+
+
+
+ 루징요율
+
+ {{
+ info.casinoReport.loosingRate
+ }}
+
+
+
+
+ 본인
+
+ {{
+ info.casinoReport.meMoney
+ }}
+
+
+
+
+
+ 하부
+
+ {{
+ info.casinoReport.bottomMoney
+ }}
+
+
+
+
+ 실정산금
+
+ {{
+ info.casinoReport.calculateMoney
+ }}
+
+
+
+
+
+
+
+
+ 윈로스
+
+ {{
+ info.slotReport.betWinLossMoneny
+ }}
+
+
+
+
+ 롤링
+
+
+ {{ info.slotReport.rollingMoney }}
+
+
+
+
+
+ 손익
+
+
+ {{ info.slotReport.profitLossMoney }}
+
+
+
+
+
+ 루징요율
+
+ {{
+ info.slotReport.loosingRate
+ }}
+
+
+
+
+ 본인
+
+ {{
+ info.slotReport.meMoney
+ }}
+
+
+
+
+
+ 하부
+
+ {{
+ info.slotReport.bottomMoney
+ }}
+
+
+
+
+ 실정산금
+
+ {{
+ info.slotReport.calculateMoney
+ }}
+
+
+
+
+
+
+
+
+
+
+ {{
+ info.totalCalculate
+ }}
+
+
+
+
+ 총실정산금
+
+
+
+
+
+
+ 카지노루징
+
+
+
+
+
+
+ 슬롯루징
+
+
+
+
+
+
+
+
+
+
;
+
+ isLoading = false;
+
+ loosingDataSource: MatTableDataSource = new MatTableDataSource();
+
+ private _unsubscribeAll: Subject = new Subject();
+
+ displayedTableColumns: string[] = [
+ 'userId',
+ 'userCode',
+ 'casinoWinLoss',
+ 'casinoRolling',
+ 'casinoProfitLoss',
+ 'casinoLoosing',
+ 'casinoSelf',
+ 'casinoBottom',
+ 'casinoCalculate',
+ 'slotWinLoss',
+ 'slotRolling',
+ 'slotSelf',
+ 'slotProfitLoss',
+ 'slotLoosing',
+ 'slotBottom',
+ 'slotCalculate',
+ 'totalCalculate',
+ ];
+
+ /**
+ * Constructor
+ */
+ constructor(
+ private _changeDetectorRef: ChangeDetectorRef,
+ private _fuseConfirmationService: FuseConfirmationService,
+ private _loosingService: LoosingService,
+ private _router: Router
+ ) {}
+
+ // -----------------------------------------------------------------------------------------------------
+ // @ Lifecycle hooks
+ // -----------------------------------------------------------------------------------------------------
+
+ /**
+ * On init
+ */
+ ngOnInit(): void {
+ // Get the products
+ this._loosingService.loosing$
+ .pipe(takeUntil(this._unsubscribeAll))
+ .subscribe((loosingReport: LoosingReport[] | undefined) => {
+ if (!loosingReport) {
+ return;
+ }
+
+ this.loosingDataSource.data = loosingReport;
+ // Mark for check
+ this._changeDetectorRef.markForCheck();
+ });
+ }
+
+ /**
+ * After view init
+ */
+ ngAfterViewInit(): void {}
+
+ /**
+ * On destroy
+ */
+ ngOnDestroy(): void {
+ // Unsubscribe from all subscriptions
+ this._unsubscribeAll.next(null);
+ this._unsubscribeAll.complete();
+ }
+
+ // -----------------------------------------------------------------------------------------------------
+ // @ Public methods
+ // -----------------------------------------------------------------------------------------------------
+
+ /* viewUserDetail(id: string): void {
+ let url: string = 'member/user/' + id;
+ this.router.navigateByUrl(url);
+ } */
+ // -----------------------------------------------------------------------------------------------------
+ // @ Private methods
+ // -----------------------------------------------------------------------------------------------------
+
+ /**
+ * Create product
+ */
+ __createProduct(): void {}
+
+ __onClickPrev(event: MouseEvent): void {
+ this._router.navigateByUrl('/report/loosing');
+ }
+
+ /**
+ * Toggle product details
+ *
+ * @param productId
+ */
+ __toggleDetails(productId: string): void {}
+
+ /**
+ * Track by function for ngFor loops
+ *
+ * @param index
+ * @param item
+ */
+ __trackByFn(index: number, item: any): any {
+ return item.id || index;
+ }
+}
diff --git a/src/app/modules/admin/report/loosing/loosing.module.ts b/src/app/modules/admin/report/loosing/loosing.module.ts
index c4c6d07..09fe6c9 100644
--- a/src/app/modules/admin/report/loosing/loosing.module.ts
+++ b/src/app/modules/admin/report/loosing/loosing.module.ts
@@ -15,6 +15,9 @@ 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 { MatTableModule } from '@angular/material/table';
import { TranslocoModule } from '@ngneat/transloco';
@@ -45,6 +48,9 @@ import { loosingRoutes } from './loosing.routing';
MatSlideToggleModule,
MatRadioModule,
MatCheckboxModule,
+ MatDatepickerModule,
+ MatMomentDateModule,
+ MatTableModule,
],
})
export class LoosingModule {}
diff --git a/src/app/modules/admin/report/loosing/loosing.routing.ts b/src/app/modules/admin/report/loosing/loosing.routing.ts
index c20ec61..15b6c78 100644
--- a/src/app/modules/admin/report/loosing/loosing.routing.ts
+++ b/src/app/modules/admin/report/loosing/loosing.routing.ts
@@ -1,10 +1,13 @@
import { Route } from '@angular/router';
import { ListComponent } from './components/list.component';
-import { ViewComponent } from '../../member/user/components/view.component';
+import { View01Component } from './components/view-01.component';
+import { View02Component } from './components/view-02.component';
-import { LoosingsResolver } from './resolvers/loosing.resolver';
-import { UserResolver } from '../../member/user/resolvers/user.resolver';
+import {
+ LoosingsResolver,
+ LoosingResolver,
+} from './resolvers/loosing.resolver';
export const loosingRoutes: Route[] = [
{
@@ -15,10 +18,17 @@ export const loosingRoutes: Route[] = [
},
},
{
- path: ':id',
- component: ViewComponent,
+ path: '01/:id',
+ component: View01Component,
resolve: {
- users: UserResolver,
+ loosing: LoosingResolver,
+ },
+ },
+ {
+ path: '02/:id',
+ component: View02Component,
+ resolve: {
+ loosing: LoosingResolver,
},
},
];
diff --git a/src/app/modules/admin/report/loosing/models/bet-calculate.ts b/src/app/modules/admin/report/loosing/models/bet-calculate.ts
new file mode 100644
index 0000000..6d472ce
--- /dev/null
+++ b/src/app/modules/admin/report/loosing/models/bet-calculate.ts
@@ -0,0 +1,17 @@
+export interface BetCalculate {
+ id: string;
+ betMoneny?: string;
+ betTieMoneny?: string;
+ betCancelMoneny?: string;
+ validMoneny?: string;
+ betWinMoneny?: string;
+ betWinLossMoneny?: string;
+ rollingMoney?: string;
+ rollingBottomMoney?: string;
+ rollingMeMoney?: string;
+ loosingRate?: string;
+ meMoney?: string;
+ profitLossMoney?: string;
+ bottomMoney?: string;
+ calculateMoney?: string;
+}
diff --git a/src/app/modules/admin/report/loosing/models/loosing-report.ts b/src/app/modules/admin/report/loosing/models/loosing-report.ts
new file mode 100644
index 0000000..9175136
--- /dev/null
+++ b/src/app/modules/admin/report/loosing/models/loosing-report.ts
@@ -0,0 +1,13 @@
+import { BetCalculate } from './bet-calculate';
+
+export interface LoosingReport {
+ id: string;
+ parentId: string;
+ signinId?: string;
+ code?: string;
+ depth?: number;
+ rank?: string;
+ totalCalculate?: string;
+ casinoCalculate?: BetCalculate;
+ slotCalculate?: BetCalculate;
+}
diff --git a/src/app/modules/admin/report/loosing/models/loosing.ts b/src/app/modules/admin/report/loosing/models/loosing.ts
index 6432397..09a6724 100644
--- a/src/app/modules/admin/report/loosing/models/loosing.ts
+++ b/src/app/modules/admin/report/loosing/models/loosing.ts
@@ -1,29 +1,7 @@
export interface Loosing {
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;
+ signinId?: string;
+ startDate?: string;
+ endDate?: string;
registDate?: string;
- finalSigninDate?: string;
- ip?: string;
- state?: string;
- note?: string;
}
diff --git a/src/app/modules/admin/report/loosing/resolvers/loosing.resolver.ts b/src/app/modules/admin/report/loosing/resolvers/loosing.resolver.ts
index c1a0d3d..e702848 100644
--- a/src/app/modules/admin/report/loosing/resolvers/loosing.resolver.ts
+++ b/src/app/modules/admin/report/loosing/resolvers/loosing.resolver.ts
@@ -9,6 +9,7 @@ import { catchError, Observable, throwError } from 'rxjs';
import { Loosing } from '../models/loosing';
import { LoosingPagination } from '../models/loosing-pagination';
+import { LoosingReport } from '../models/loosing-report';
import { LoosingService } from '../services/loosing.service';
@Injectable({
@@ -36,23 +37,28 @@ export class LoosingResolver implements Resolve {
resolve(
route: ActivatedRouteSnapshot,
state: RouterStateSnapshot
- ): Observable {
- return this._loosingService.getLoosingById(route.paramMap.get('id')).pipe(
- // Error here means the requested product is not available
- catchError((error) => {
- // Log the error
- console.error(error);
+ ): Observable {
+ return this._loosingService
+ .getLoosingById(
+ route.paramMap.get('id') as string,
+ state.root.queryParamMap.get('type') as string
+ )
+ .pipe(
+ // Error here means the requested product is not available
+ catchError((error) => {
+ // Log the error
+ console.error(error);
- // Get the parent url
- const parentUrl = state.url.split('/').slice(0, -1).join('/');
+ // Get the parent url
+ const parentUrl = state.url.split('/').slice(0, -1).join('/');
- // Navigate to there
- this._router.navigateByUrl(parentUrl);
+ // Navigate to there
+ this._router.navigateByUrl(parentUrl);
- // Throw an error
- return throwError(error);
- })
- );
+ // Throw an error
+ return throwError(error);
+ })
+ );
}
}
diff --git a/src/app/modules/admin/report/loosing/services/loosing.service.ts b/src/app/modules/admin/report/loosing/services/loosing.service.ts
index 8bd9d1e..5781088 100644
--- a/src/app/modules/admin/report/loosing/services/loosing.service.ts
+++ b/src/app/modules/admin/report/loosing/services/loosing.service.ts
@@ -14,6 +14,7 @@ import {
import { Loosing } from '../models/loosing';
import { LoosingPagination } from '../models/loosing-pagination';
+import { LoosingReport } from '../models/loosing-report';
@Injectable({
providedIn: 'root',
@@ -23,7 +24,9 @@ export class LoosingService {
private __pagination = new BehaviorSubject(
undefined
);
- private __loosing = new BehaviorSubject(undefined);
+ private __loosing = new BehaviorSubject(
+ undefined
+ );
private __loosings = new BehaviorSubject(undefined);
/**
@@ -45,7 +48,7 @@ export class LoosingService {
/**
* Getter for loosing
*/
- get loosing$(): Observable {
+ get loosing$(): Observable {
return this.__loosing.asObservable();
}
@@ -104,27 +107,19 @@ export class LoosingService {
/**
* Get product by id
*/
- getLoosingById(id: string | null): Observable {
- return this.__loosings.pipe(
- take(1),
- map((loosings) => {
- // Find the product
- const loosing = loosings?.find((item) => item.id === id) || undefined;
-
- // Update the product
- this.__loosing.next(loosing);
-
- // Return the product
- return loosing;
- }),
- switchMap((product) => {
- if (!product) {
- return throwError('Could not found product with id of ' + id + '!');
- }
-
- return of(product);
+ getLoosingById(
+ id: string = '1',
+ type: string = '1'
+ ): Observable {
+ return this._httpClient
+ .get('api/apps/report/loosing/loosing', {
+ params: { id, type },
})
- );
+ .pipe(
+ tap((response: LoosingReport[]) => {
+ this.__loosing.next(response);
+ })
+ );
}
/**
diff --git a/src/app/modules/admin/report/modification-log/components/list.component.html b/src/app/modules/admin/report/modification-log/components/list.component.html
index 10d018c..51522fc 100644
--- a/src/app/modules/admin/report/modification-log/components/list.component.html
+++ b/src/app/modules/admin/report/modification-log/components/list.component.html
@@ -13,110 +13,31 @@
-
-
-
+
+
+
+
+