From 4b1d21b4af454224200bdad7ab4947aad0ed317c Mon Sep 17 00:00:00 2001 From: mso7nueh Date: Fri, 8 Aug 2025 13:29:32 +0300 Subject: [PATCH] fix(finances): Issue-186 --- .../consultations/services/consultation_service.dart | 6 ++++-- .../cubit/archive/consultations_archive_state.dart | 2 +- .../consultant_finances/consultant_finances_state.dart | 2 +- .../cubit/user_purchases/user_purchases_state.dart | 2 +- .../presentation/consultant_finances_screen.dart | 4 ++-- 5 files changed, 9 insertions(+), 7 deletions(-) diff --git a/lib/features/consultations/services/consultation_service.dart b/lib/features/consultations/services/consultation_service.dart index f0a89220..a3935d5a 100644 --- a/lib/features/consultations/services/consultation_service.dart +++ b/lib/features/consultations/services/consultation_service.dart @@ -77,7 +77,8 @@ class ConsultationService { final response = await dio.get( '/api/finances/my_finances', queryParameters: { - if (dateComparison != null && date != null) 'filters[end_date]': date, + if (date != null && dateComparison != null) 'filters[start_date][${dateComparison.value}]': date, + 'sort[]': 'start_date:desc', }, ); final data = response.data as Map; @@ -96,7 +97,8 @@ class ConsultationService { final response = await dio.get( '/api/finances/my_purchases', queryParameters: { - if (dateComparison != null && date != null) 'filters[start_date]': date, + if (date != null && dateComparison != null) 'filters[start_date][${dateComparison.value}]': date, + 'sort[]': 'start_date:desc', }, ); final data = response.data as Map; diff --git a/lib/features/finances_and_consultations_archive/cubit/archive/consultations_archive_state.dart b/lib/features/finances_and_consultations_archive/cubit/archive/consultations_archive_state.dart index c54f8073..dfe84a55 100644 --- a/lib/features/finances_and_consultations_archive/cubit/archive/consultations_archive_state.dart +++ b/lib/features/finances_and_consultations_archive/cubit/archive/consultations_archive_state.dart @@ -14,7 +14,7 @@ abstract class ConsultationsArchiveState with _$ConsultationsArchiveState { @Default([]) List consultations, @Default(false) isLoading, @Default(null) String? error, - @Default(null) PeriodFilterStatus? periodFilterStatus, + @Default(PeriodFilterStatus.all) PeriodFilterStatus? periodFilterStatus, @Default(null) ConsultationFilterStatus? consultationFilterStatus, required StatisticModel statisticModel, }) = _ConsultationsArchiveState; diff --git a/lib/features/finances_and_consultations_archive/cubit/consultant_finances/consultant_finances_state.dart b/lib/features/finances_and_consultations_archive/cubit/consultant_finances/consultant_finances_state.dart index fff61e45..4e1123e1 100644 --- a/lib/features/finances_and_consultations_archive/cubit/consultant_finances/consultant_finances_state.dart +++ b/lib/features/finances_and_consultations_archive/cubit/consultant_finances/consultant_finances_state.dart @@ -10,7 +10,7 @@ abstract class ConsultantFinancesState with _$ConsultantFinancesState { @Default([]) List financesModels, @Default(false) isLoading, @Default(null) String? error, - @Default(null) PeriodFilterStatus? periodFilterStatus, + @Default(PeriodFilterStatus.all) PeriodFilterStatus? periodFilterStatus, }) = _ConsultantFinancesState; } diff --git a/lib/features/finances_and_consultations_archive/cubit/user_purchases/user_purchases_state.dart b/lib/features/finances_and_consultations_archive/cubit/user_purchases/user_purchases_state.dart index 7ae22c03..65a53842 100644 --- a/lib/features/finances_and_consultations_archive/cubit/user_purchases/user_purchases_state.dart +++ b/lib/features/finances_and_consultations_archive/cubit/user_purchases/user_purchases_state.dart @@ -10,6 +10,6 @@ abstract class UserPurchasesState with _$UserPurchasesState { @Default([]) List purchasesModels, @Default(false) isLoading, @Default(null) String? error, - @Default(null) PeriodFilterStatus? periodFilterStatus, + @Default(PeriodFilterStatus.all) PeriodFilterStatus? periodFilterStatus, }) = _UserPurchasesState; } diff --git a/lib/features/finances_and_consultations_archive/presentation/consultant_finances_screen.dart b/lib/features/finances_and_consultations_archive/presentation/consultant_finances_screen.dart index 7e731474..085e9fa6 100644 --- a/lib/features/finances_and_consultations_archive/presentation/consultant_finances_screen.dart +++ b/lib/features/finances_and_consultations_archive/presentation/consultant_finances_screen.dart @@ -96,7 +96,7 @@ class _ConsultantFinancesScreenState extends State { if (value == null) return; context.read().setFinancesPeriod(value); }, - value: state.periodFilterStatus ?? PeriodFilterStatus.values.first, + value: state.periodFilterStatus ?? PeriodFilterStatus.all, ), const SizedBox(height: 12), if (state.financesModels.isNotEmpty) @@ -129,7 +129,7 @@ class _ConsultantFinancesScreenState extends State { ); }), Text( - state.financesModels[index].startDate.format('yyyy.MM.dd'), + state.financesModels[index].startDate.format('dd.MM.yy'), style: const TextStyle( color: Color(0xFF6D6F71), height: 1,