From 412ac0aeeb8e754906d8a83d3387b7141d542418 Mon Sep 17 00:00:00 2001
From: mso7nueh <mso7nueh@mail.ru>
Date: Fri, 8 Aug 2025 13:43:04 +0300
Subject: [PATCH] fix(archive_of_consultatons): Issue-331

---
 .../consultations/services/consultation_service.dart     | 1 +
 .../cubit/archive/consultations_archive_cubit.dart       | 9 ++-------
 .../presentation/consultations_archive_screen.dart       | 2 +-
 3 files changed, 4 insertions(+), 8 deletions(-)

diff --git a/lib/features/consultations/services/consultation_service.dart b/lib/features/consultations/services/consultation_service.dart
index a3935d5a..8f09e4a1 100644
--- a/lib/features/consultations/services/consultation_service.dart
+++ b/lib/features/consultations/services/consultation_service.dart
@@ -50,6 +50,7 @@ class ConsultationService {
           else if (state != null && stateComparison != null)
             'filters[last_state][${stateComparison.value}]': state,
           if (dateComparison != null && date != null) 'filters[start_date][${dateComparison.value}]': date,
+          'sort[]': 'created_at:desc',
         },
       );
       return ConsultationPaginationModel.fromJson(response.data);
diff --git a/lib/features/finances_and_consultations_archive/cubit/archive/consultations_archive_cubit.dart b/lib/features/finances_and_consultations_archive/cubit/archive/consultations_archive_cubit.dart
index dd6c713e..a2f6daf0 100644
--- a/lib/features/finances_and_consultations_archive/cubit/archive/consultations_archive_cubit.dart
+++ b/lib/features/finances_and_consultations_archive/cubit/archive/consultations_archive_cubit.dart
@@ -31,9 +31,7 @@ class ConsultationsArchiveCubit extends Cubit<ConsultationsArchiveState> {
         dateComparison: state.periodFilterStatus == PeriodFilterStatus.all ? null : FiltersComparisonEnum.greaterThanOrEqual,
         stateComparison: state.consultationFilterStatus == ConsultationFilterStatus.all
             ? null
-            : state.consultationFilterStatus == ConsultationFilterStatus.inProgress
-                ? FiltersComparisonEnum.notInArray
-                : FiltersComparisonEnum.equal,
+            : FiltersComparisonEnum.equal,
       );
       emit(state.copyWith(consultations: consultations, isLoading: false));
     } catch (e) {
@@ -67,20 +65,17 @@ class ConsultationsArchiveCubit extends Cubit<ConsultationsArchiveState> {
 enum ConsultationFilterStatus {
   all,
   canceled,
-  finished,
-  inProgress;
+  finished;
 
   String get name => switch (this) {
         ConsultationFilterStatus.all => 'Все консультации',
         ConsultationFilterStatus.canceled => 'Отменён',
         ConsultationFilterStatus.finished => 'Завершён',
-        ConsultationFilterStatus.inProgress => 'В процессе',
       };
 
   String? get value => switch (this) {
         ConsultationFilterStatus.all => null,
         ConsultationFilterStatus.canceled => 'canceled_by_the_initiator',
         ConsultationFilterStatus.finished => 'charge_was_collected',
-        ConsultationFilterStatus.inProgress => 'active',
       };
 }
diff --git a/lib/features/finances_and_consultations_archive/presentation/consultations_archive_screen.dart b/lib/features/finances_and_consultations_archive/presentation/consultations_archive_screen.dart
index ec2d4900..c356e9fb 100644
--- a/lib/features/finances_and_consultations_archive/presentation/consultations_archive_screen.dart
+++ b/lib/features/finances_and_consultations_archive/presentation/consultations_archive_screen.dart
@@ -195,7 +195,7 @@ class _ConsultationsArchiveScreenState extends State<ConsultationsArchiveScreen>
                                                       ),
                                                     ),
                                                     Text(
-                                                      state.consultations[index].startDate.format('yyyy.MM.dd'),
+                                                      state.consultations[index].startDate.format('dd.MM.yy'),
                                                       style: const TextStyle(
                                                         color: Color(0xFF6D6F71),
                                                         height: 1,