Merge branch 'feature/BETERAN-BACKEND-APP-BROWSER-init' of https://gitlab.loafle.net/bet/beteran-backend-app-browser into feature/BETERAN-BACKEND-APP-BROWSER-init
This commit is contained in:
commit
20d3b021dd
|
@ -29,7 +29,7 @@ export class ReportMonthlyMockApi {
|
||||||
// @ Monthlys - GET
|
// @ Monthlys - GET
|
||||||
// -----------------------------------------------------------------------------------------------------
|
// -----------------------------------------------------------------------------------------------------
|
||||||
this._fuseMockApiService
|
this._fuseMockApiService
|
||||||
.onGet('api/apps/report/montyly/monthlys', 300)
|
.onGet('api/apps/report/monthly/monthlys', 300)
|
||||||
.reply(({ request }) => {
|
.reply(({ request }) => {
|
||||||
// Get available queries
|
// Get available queries
|
||||||
const search = request.params.get('search');
|
const search = request.params.get('search');
|
||||||
|
|
|
@ -36,7 +36,7 @@ import { DailyService } from '../services/daily.service';
|
||||||
import { Router } from '@angular/router';
|
import { Router } from '@angular/router';
|
||||||
|
|
||||||
@Component({
|
@Component({
|
||||||
selector: 'partner-branch-list',
|
selector: 'daily-list',
|
||||||
templateUrl: './list.component.html',
|
templateUrl: './list.component.html',
|
||||||
styles: [
|
styles: [
|
||||||
/* language=SCSS */
|
/* language=SCSS */
|
||||||
|
|
|
@ -84,7 +84,7 @@ export class DailyService {
|
||||||
.get<{
|
.get<{
|
||||||
pagination: DailyPagination;
|
pagination: DailyPagination;
|
||||||
dailys: Daily[];
|
dailys: Daily[];
|
||||||
}>('api/apps/repoart/daily/dailys', {
|
}>('api/apps/report/daily/dailys', {
|
||||||
params: {
|
params: {
|
||||||
page: '' + page,
|
page: '' + page,
|
||||||
size: '' + size,
|
size: '' + size,
|
||||||
|
|
|
@ -10,7 +10,7 @@
|
||||||
<mat-progress-bar [mode]="'indeterminate'"></mat-progress-bar>
|
<mat-progress-bar [mode]="'indeterminate'"></mat-progress-bar>
|
||||||
</div>
|
</div>
|
||||||
<!-- Title -->
|
<!-- Title -->
|
||||||
<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 -->
|
<!-- Memo -->
|
||||||
|
|
|
@ -36,7 +36,7 @@ import { MonthlyService } from '../services/monthly.service';
|
||||||
import { Router } from '@angular/router';
|
import { Router } from '@angular/router';
|
||||||
|
|
||||||
@Component({
|
@Component({
|
||||||
selector: 'partner-branch-list',
|
selector: 'monthly-list',
|
||||||
templateUrl: './list.component.html',
|
templateUrl: './list.component.html',
|
||||||
styles: [
|
styles: [
|
||||||
/* language=SCSS */
|
/* language=SCSS */
|
||||||
|
|
|
@ -61,7 +61,7 @@ export class MonthlyService {
|
||||||
// -----------------------------------------------------------------------------------------------------
|
// -----------------------------------------------------------------------------------------------------
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Get Monthlys
|
* Get monthlys
|
||||||
*
|
*
|
||||||
*
|
*
|
||||||
* @param page
|
* @param page
|
||||||
|
@ -135,7 +135,7 @@ export class MonthlyService {
|
||||||
take(1),
|
take(1),
|
||||||
switchMap((monthlys) =>
|
switchMap((monthlys) =>
|
||||||
this._httpClient
|
this._httpClient
|
||||||
.post<Monthly>('api/apps/report/monthly/product', {})
|
.post<Monthly>('api/apps/result/monthly/product', {})
|
||||||
.pipe(
|
.pipe(
|
||||||
map((newMonthly) => {
|
map((newMonthly) => {
|
||||||
// Update the monthlys with the new product
|
// Update the monthlys with the new product
|
||||||
|
|
|
@ -24,5 +24,6 @@
|
||||||
"Evolution": "Evolution",
|
"Evolution": "Evolution",
|
||||||
"Slot": "Slot",
|
"Slot": "Slot",
|
||||||
"Current User": "Current User",
|
"Current User": "Current User",
|
||||||
"Daily": "Daily"
|
"Daily": "Daily",
|
||||||
|
"Monthly": "Monthly"
|
||||||
}
|
}
|
||||||
|
|
|
@ -25,5 +25,6 @@
|
||||||
"Slot": "슬롯배팅리스트",
|
"Slot": "슬롯배팅리스트",
|
||||||
"Current User": "현재접속자 & 쪽지전송",
|
"Current User": "현재접속자 & 쪽지전송",
|
||||||
"Basic-Setting": "사이트 기본설정",
|
"Basic-Setting": "사이트 기본설정",
|
||||||
"Daily": "일일현황"
|
"Daily": "일일현황",
|
||||||
|
"Monthly": "월 현황"
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in New Issue
Block a user