diff --git a/lib/view_models/tenders_view_model.dart b/lib/view_models/tenders_view_model.dart index c092e88..97c9b0f 100644 --- a/lib/view_models/tenders_view_model.dart +++ b/lib/view_models/tenders_view_model.dart @@ -94,13 +94,7 @@ class TendersViewModel with ChangeNotifier { // Clear data when status changes _clearAllData(); selectedSort = sort; - if (sort == TendersStrings.lessBudget) { - sortBy = 'estimated_value'; - sortOrder = 'asc'; - } else if (sort == TendersStrings.moreBudget) { - sortBy = 'estimated_value'; - sortOrder = 'desc'; - } else if (sort == TendersStrings.minimumTime) { + if (sort == TendersStrings.minimumTime) { sortBy = 'submission_deadline'; sortOrder = 'asc'; } else if (sort == TendersStrings.mostOfTheTime) { diff --git a/lib/views/detail/strings/tender_details_strings.dart b/lib/views/detail/strings/tender_details_strings.dart index 53c02b5..e4c5a6e 100644 --- a/lib/views/detail/strings/tender_details_strings.dart +++ b/lib/views/detail/strings/tender_details_strings.dart @@ -17,6 +17,7 @@ class TenderDetailsStrings { static const String tenderNoExperience = 'No experience in e-platform development'; static const String tenderSubmitButton = 'Submit'; + static const String tenderAcceptButton = 'Accept'; static const String tenderRejectButton = 'Reject'; static const String tenderClientExample = 'Procurement Notice Procurement Notice'; diff --git a/lib/views/detail/widgets/tender_detail_action.dart b/lib/views/detail/widgets/tender_detail_action.dart index e97d3bd..1d04aa8 100644 --- a/lib/views/detail/widgets/tender_detail_action.dart +++ b/lib/views/detail/widgets/tender_detail_action.dart @@ -47,7 +47,7 @@ class TenderDetailActions extends StatelessWidget { ) : BaseButton( isEnabled: true, - text: TenderDetailsStrings.tenderSubmitButton, + text: TenderDetailsStrings.tenderAcceptButton, backgroundColor: AppColors.primary30, textColor: AppColors.mainBlue, onPressed: () { @@ -161,7 +161,7 @@ class TenderDetailActions extends StatelessWidget { return viewModel.isSubmitApprovalLoading ? BaseButton( isEnabled: true, - text: TenderDetailsStrings.tenderSubmitButton, + text: TenderDetailsStrings.tenderAcceptButton, backgroundColor: AppColors.lightBlue, textColor: AppColors.mainBlue, onPressed: () {}, @@ -169,7 +169,7 @@ class TenderDetailActions extends StatelessWidget { ) : BaseButton( isEnabled: true, - text: TenderDetailsStrings.tenderSubmitButton, + text: TenderDetailsStrings.tenderAcceptButton, backgroundColor: AppColors.lightBlue, textColor: AppColors.mainBlue, onPressed: () { diff --git a/lib/views/tenders/pages/d_tenders_page.dart b/lib/views/tenders/pages/d_tenders_page.dart index 173cf44..30664a7 100644 --- a/lib/views/tenders/pages/d_tenders_page.dart +++ b/lib/views/tenders/pages/d_tenders_page.dart @@ -75,7 +75,7 @@ class _DesktopTendersPageState extends State { if (tenders.isEmpty) { return const Center(child: Text(CommonStrings.noData)); } - + return Column( children: [ Expanded( @@ -210,7 +210,7 @@ class _ActionButtons extends StatelessWidget { ), ); }, - text: 'Filter', + text: TendersStrings.filter, icon: AssetsManager.filter, iconColor: AppColors.textBlue, backgroundColor: AppColors.primary2, @@ -221,7 +221,7 @@ class _ActionButtons extends StatelessWidget { width: 178.0.w(), isEnabled: true, onPressed: () { - showDialog( + showDialog( context: context, builder: (_) => Dialog( @@ -236,7 +236,7 @@ class _ActionButtons extends StatelessWidget { ), ); }, - text: 'Sort', + text: TendersStrings.sort, icon: AssetsManager.sort, iconColor: AppColors.textBlue, backgroundColor: AppColors.primary2, diff --git a/lib/views/tenders/strings/tenders_strings.dart b/lib/views/tenders/strings/tenders_strings.dart index 5745dba..73aa43c 100644 --- a/lib/views/tenders/strings/tenders_strings.dart +++ b/lib/views/tenders/strings/tenders_strings.dart @@ -25,6 +25,4 @@ class TendersStrings { static const String sort = 'Sort'; static const String mostOfTheTime = 'Most of the time'; static const String minimumTime = 'Minimum time'; - static const String lessBudget = 'Less budget'; - static const String moreBudget = 'More budget'; } diff --git a/lib/views/tenders/widgets/tenders_sort_dialog.dart b/lib/views/tenders/widgets/tenders_sort_dialog.dart index 2dc757b..c5ffe88 100644 --- a/lib/views/tenders/widgets/tenders_sort_dialog.dart +++ b/lib/views/tenders/widgets/tenders_sort_dialog.dart @@ -55,8 +55,6 @@ class TendersSortDialog extends StatelessWidget { ...[ TendersStrings.minimumTime, TendersStrings.mostOfTheTime, - TendersStrings.lessBudget, - TendersStrings.moreBudget, ].map((status) { return RadioListTile( value: status,