From 631497a534bcb1c5b38af240f48689f5319bc5cd Mon Sep 17 00:00:00 2001 From: JUNG YI DAM Date: Wed, 13 Jul 2022 09:35:00 +0000 Subject: [PATCH 1/2] ing.. --- src/app/modules/admin/report/daily/components/list.component.ts | 2 +- .../modules/admin/report/monthly/components/list.component.ts | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) 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 4881464..df1a968 100644 --- a/src/app/modules/admin/report/daily/components/list.component.ts +++ b/src/app/modules/admin/report/daily/components/list.component.ts @@ -36,7 +36,7 @@ import { DailyService } from '../services/daily.service'; import { Router } from '@angular/router'; @Component({ - selector: 'partner-branch-list', + selector: 'daily-list', templateUrl: './list.component.html', styles: [ /* language=SCSS */ 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 8bd7258..a723a1b 100644 --- a/src/app/modules/admin/report/monthly/components/list.component.ts +++ b/src/app/modules/admin/report/monthly/components/list.component.ts @@ -36,7 +36,7 @@ import { MonthlyService } from '../services/monthly.service'; import { Router } from '@angular/router'; @Component({ - selector: 'partner-branch-list', + selector: 'monthly-list', templateUrl: './list.component.html', styles: [ /* language=SCSS */ From a7791e5049d056d39db97eb944b2b6fafa4fb3fc Mon Sep 17 00:00:00 2001 From: JUNG YI DAM Date: Wed, 13 Jul 2022 10:59:19 +0000 Subject: [PATCH 2/2] bug fix --- src/app/mock-api/apps/report/monthly/api.ts | 2 +- src/app/modules/admin/report/daily/services/daily.service.ts | 2 +- .../admin/report/monthly/components/list.component.html | 2 +- .../modules/admin/report/monthly/services/monthly.service.ts | 4 ++-- src/assets/i18n/en.json | 3 ++- src/assets/i18n/ko.json | 3 ++- 6 files changed, 9 insertions(+), 7 deletions(-) diff --git a/src/app/mock-api/apps/report/monthly/api.ts b/src/app/mock-api/apps/report/monthly/api.ts index e7be7ac..121ce68 100644 --- a/src/app/mock-api/apps/report/monthly/api.ts +++ b/src/app/mock-api/apps/report/monthly/api.ts @@ -29,7 +29,7 @@ export class ReportMonthlyMockApi { // @ Monthlys - GET // ----------------------------------------------------------------------------------------------------- this._fuseMockApiService - .onGet('api/apps/report/montyly/monthlys', 300) + .onGet('api/apps/report/monthly/monthlys', 300) .reply(({ request }) => { // Get available queries const search = request.params.get('search'); diff --git a/src/app/modules/admin/report/daily/services/daily.service.ts b/src/app/modules/admin/report/daily/services/daily.service.ts index b92c54a..41d8b93 100644 --- a/src/app/modules/admin/report/daily/services/daily.service.ts +++ b/src/app/modules/admin/report/daily/services/daily.service.ts @@ -84,7 +84,7 @@ export class DailyService { .get<{ pagination: DailyPagination; dailys: Daily[]; - }>('api/apps/repoart/daily/dailys', { + }>('api/apps/report/daily/dailys', { params: { page: '' + page, size: '' + size, diff --git a/src/app/modules/admin/report/monthly/components/list.component.html b/src/app/modules/admin/report/monthly/components/list.component.html index 7238dcb..d7a585b 100644 --- a/src/app/modules/admin/report/monthly/components/list.component.html +++ b/src/app/modules/admin/report/monthly/components/list.component.html @@ -10,7 +10,7 @@ -
월현황
+
월 현황
diff --git a/src/app/modules/admin/report/monthly/services/monthly.service.ts b/src/app/modules/admin/report/monthly/services/monthly.service.ts index 6c5f7fe..ab1046e 100644 --- a/src/app/modules/admin/report/monthly/services/monthly.service.ts +++ b/src/app/modules/admin/report/monthly/services/monthly.service.ts @@ -61,7 +61,7 @@ export class MonthlyService { // ----------------------------------------------------------------------------------------------------- /** - * Get Monthlys + * Get monthlys * * * @param page @@ -135,7 +135,7 @@ export class MonthlyService { take(1), switchMap((monthlys) => this._httpClient - .post('api/apps/report/monthly/product', {}) + .post('api/apps/result/monthly/product', {}) .pipe( map((newMonthly) => { // Update the monthlys with the new product diff --git a/src/assets/i18n/en.json b/src/assets/i18n/en.json index 5b163c3..e9f1f91 100644 --- a/src/assets/i18n/en.json +++ b/src/assets/i18n/en.json @@ -24,5 +24,6 @@ "Evolution": "Evolution", "Slot": "Slot", "Current User": "Current User", - "Daily": "Daily" + "Daily": "Daily", + "Monthly": "Monthly" } diff --git a/src/assets/i18n/ko.json b/src/assets/i18n/ko.json index 9c627b3..0268e98 100644 --- a/src/assets/i18n/ko.json +++ b/src/assets/i18n/ko.json @@ -25,5 +25,6 @@ "Slot": "슬롯배팅리스트", "Current User": "현재접속자 & 쪽지전송", "Basic-Setting": "사이트 기본설정", - "Daily": "일일현황" + "Daily": "일일현황", + "Monthly": "월 현황" }