eduvia/workavia-mail-front
11
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

TF-1043 Fix advanced search not working correctly

Browse Source
This commit is contained in:
dab246
2022-10-06 16:21:48 +07:00
committed by Dat H. Pham
parent 09f5e3458e
commit 0787f63b51
5 changed files with 15 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files
lib/features/mailbox_dashboard/presentation/controller/advanced_filter_controller.dart
+7 -3
View File
@@ -151,7 +151,11 @@ class AdvancedFilterController extends BaseController {
void applyAdvancedSearchFilter(BuildContext context) {
_updateFilterEmailFromAdvancedSearchView();
searchController.isAdvancedSearchHasApply.value = _checkAdvancedSearchHasApply();
searchController.isAdvancedSearchHasApply.value = isAdvancedSearchHasApplied;
if (!isAdvancedSearchHasApplied) {
final newSearchEmailFilter = searchController.searchEmailFilter.value.clearBeforeDate();
searchController.searchEmailFilter.value = newSearchEmailFilter;
}
searchController.isAdvancedSearchViewOpen.toggle();
_mailboxDashBoardController.searchEmail(
context, StringConvert.writeNullToEmpty(searchEmailFilter.text?.value));
@@ -220,14 +224,14 @@ class AdvancedFilterController extends BaseController {
}
}
bool _checkAdvancedSearchHasApply() {
bool get isAdvancedSearchHasApplied {
return searchEmailFilter.from.isNotEmpty ||
searchEmailFilter.to.isNotEmpty ||
subjectFilterInputController.text.isNotEmpty ||
hasKeyWordFilterInputController.text.isNotEmpty ||
notKeyWordFilterInputController.text.isNotEmpty ||
searchEmailFilter.emailReceiveTimeType != EmailReceiveTimeType.allTime ||
searchEmailFilter.mailbox != _mailboxDashBoardController.selectedMailbox.value ||
searchEmailFilter.mailbox != PresentationMailbox.unifiedMailbox ||
hasAttachment.isTrue;
}