feat: tags for expenses, filters by tags in statistics

This commit is contained in:
2024-11-27 15:49:33 +04:00
parent 48c88cb93a
commit 88ce256850
7 changed files with 271 additions and 36 deletions

View File

@@ -294,8 +294,7 @@ class ProfitStatisticsService(BaseService):
expenses_statistics_service = ExpensesStatisticsService(self.session)
stmt_deals_applied_expenses = expenses_statistics_service.apply_expenses(
self.date_from,
self.date_to,
self.filters,
sub_deals_grouped_by_date
)
@@ -305,6 +304,7 @@ class ProfitStatisticsService(BaseService):
async def _get_data_grouped_by_date(self, request: CommonProfitFilters, is_chart: bool = True):
self.date_from, self.date_to = request.date_range
self.filters = request
sub_deals_dates = self._get_deals_dates(request.deal_status_id)
@@ -345,6 +345,7 @@ class ProfitStatisticsService(BaseService):
def _get_common_table_grouped(self, request: GetProfitTableDataRequest):
self.date_from, self.date_to = request.date_range
self.filters = request
sub_deals_dates = self._get_deals_dates(request.deal_status_id)