diff --git a/src/model/report/TrendsParameter.ts b/src/model/report/TrendsParameter.ts index 1ef3620..2861aea 100644 --- a/src/model/report/TrendsParameter.ts +++ b/src/model/report/TrendsParameter.ts @@ -3,4 +3,6 @@ export type TrendsParameter = { endDate: Date; selectedCapitalsourceIds?: Array; selectedEtfIds?: Array; + capitalsourcesActive: boolean; + etfsActive: boolean; }; diff --git a/src/service/ReportService.ts b/src/service/ReportService.ts index 0ff3cf6..abfc2ac 100644 --- a/src/service/ReportService.ts +++ b/src/service/ReportService.ts @@ -107,6 +107,9 @@ class ReportService extends AbstractService { selectedCapitalsourceIds: showTrendsFormResponse.settingTrendCapitalsourceIds, selectedEtfIds: showTrendsFormResponse.settingTrendEtfIds, + capitalsourcesActive: + showTrendsFormResponse.settingTrendCapitalsourcesActive ?? true, + etfsActive: showTrendsFormResponse.settingTrendEtfsActive ?? true, }; return trendsTransporter; @@ -119,6 +122,9 @@ class ReportService extends AbstractService { request.endDate = getISOStringDate(trendsParameter.endDate); request.capitalSourceIds = trendsParameter.selectedCapitalsourceIds; request.etfIds = trendsParameter.selectedEtfIds; + request.settingTrendCapitalsourcesActive = + trendsParameter.capitalsourcesActive; + request.settingTrendEtfsActive = trendsParameter.etfsActive; const response = await this.api.showTrendsGraph(request); diff --git a/src/views/reports/ShowTrends.vue b/src/views/reports/ShowTrends.vue index 65a5fec..d6a1ea9 100644 --- a/src/views/reports/ShowTrends.vue +++ b/src/views/reports/ShowTrends.vue @@ -35,17 +35,31 @@
+
+
+ + +
+
+
+
- + +
+
+ +
-