mazyar/tm_app
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request 'fixed rest of the bugs' (#193) from bug_fix into main

Browse Source 
Reviewed-on: https://repo.ravanertebat.com/TM/tm_app/pulls/193
This commit is contained in:
a.ghabeli
2025-09-30 12:38:26 +03:30
parent 87bdc13689 92c759b6c6
commit bfc236edc6
6 changed files with 9 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files
lib/view_models/tenders_view_model.dart
+1 -7
View File
@@ -94,13 +94,7 @@ class TendersViewModel with ChangeNotifier {
// Clear data when status changes // Clear data when status changes
_clearAllData(); _clearAllData();
selectedSort = sort; selectedSort = sort;
if (sort == TendersStrings.lessBudget) { if (sort == TendersStrings.minimumTime) {
sortBy = 'estimated_value';
sortOrder = 'asc';
} else if (sort == TendersStrings.moreBudget) {
sortBy = 'estimated_value';
sortOrder = 'desc';
} else if (sort == TendersStrings.minimumTime) {
sortBy = 'submission_deadline'; sortBy = 'submission_deadline';
sortOrder = 'asc'; sortOrder = 'asc';
} else if (sort == TendersStrings.mostOfTheTime) { } else if (sort == TendersStrings.mostOfTheTime) {
lib/views/detail/strings/tender_details_strings.dart
+1
View File
@@ -17,6 +17,7 @@ class TenderDetailsStrings {
static const String tenderNoExperience = static const String tenderNoExperience =
'No experience in e-platform development'; 'No experience in e-platform development';
static const String tenderSubmitButton = 'Submit'; static const String tenderSubmitButton = 'Submit';
static const String tenderAcceptButton = 'Accept';
static const String tenderRejectButton = 'Reject'; static const String tenderRejectButton = 'Reject';
static const String tenderClientExample = static const String tenderClientExample =
'Procurement Notice Procurement Notice'; 'Procurement Notice Procurement Notice';
lib/views/detail/widgets/tender_detail_action.dart
+3 -3
View File
@@ -47,7 +47,7 @@ class TenderDetailActions extends StatelessWidget {
) )
: BaseButton( : BaseButton(
isEnabled: true, isEnabled: true,
text: TenderDetailsStrings.tenderSubmitButton, text: TenderDetailsStrings.tenderAcceptButton,
backgroundColor: AppColors.primary30, backgroundColor: AppColors.primary30,
textColor: AppColors.mainBlue, textColor: AppColors.mainBlue,
onPressed: () { onPressed: () {
@@ -161,7 +161,7 @@ class TenderDetailActions extends StatelessWidget {
return viewModel.isSubmitApprovalLoading return viewModel.isSubmitApprovalLoading
? BaseButton( ? BaseButton(
isEnabled: true, isEnabled: true,
text: TenderDetailsStrings.tenderSubmitButton, text: TenderDetailsStrings.tenderAcceptButton,
backgroundColor: AppColors.lightBlue, backgroundColor: AppColors.lightBlue,
textColor: AppColors.mainBlue, textColor: AppColors.mainBlue,
onPressed: () {}, onPressed: () {},
@@ -169,7 +169,7 @@ class TenderDetailActions extends StatelessWidget {
) )
: BaseButton( : BaseButton(
isEnabled: true, isEnabled: true,
text: TenderDetailsStrings.tenderSubmitButton, text: TenderDetailsStrings.tenderAcceptButton,
backgroundColor: AppColors.lightBlue, backgroundColor: AppColors.lightBlue,
textColor: AppColors.mainBlue, textColor: AppColors.mainBlue,
onPressed: () { onPressed: () {
lib/views/tenders/pages/d_tenders_page.dart
+2 -2
View File
@@ -210,7 +210,7 @@ class _ActionButtons extends StatelessWidget {
), ),
); );
}, },
text: 'Filter', text: TendersStrings.filter,
icon: AssetsManager.filter, icon: AssetsManager.filter,
iconColor: AppColors.textBlue, iconColor: AppColors.textBlue,
backgroundColor: AppColors.primary2, backgroundColor: AppColors.primary2,
@@ -236,7 +236,7 @@ class _ActionButtons extends StatelessWidget {
), ),
); );
}, },
text: 'Sort', text: TendersStrings.sort,
icon: AssetsManager.sort, icon: AssetsManager.sort,
iconColor: AppColors.textBlue, iconColor: AppColors.textBlue,
backgroundColor: AppColors.primary2, backgroundColor: AppColors.primary2,
lib/views/tenders/strings/tenders_strings.dart
-2
View File
@@ -25,6 +25,4 @@ class TendersStrings {
static const String sort = 'Sort'; static const String sort = 'Sort';
static const String mostOfTheTime = 'Most of the time'; static const String mostOfTheTime = 'Most of the time';
static const String minimumTime = 'Minimum time'; static const String minimumTime = 'Minimum time';
static const String lessBudget = 'Less budget';
static const String moreBudget = 'More budget';
} }
lib/views/tenders/widgets/tenders_sort_dialog.dart
-2
View File
@@ -55,8 +55,6 @@ class TendersSortDialog extends StatelessWidget {
...[ ...[
TendersStrings.minimumTime, TendersStrings.minimumTime,
TendersStrings.mostOfTheTime, TendersStrings.mostOfTheTime,
TendersStrings.lessBudget,
TendersStrings.moreBudget,
].map((status) { ].map((status) {
return RadioListTile( return RadioListTile(
value: status, value: status,