Fix filtri
This commit is contained in:
@@ -351,10 +351,10 @@
|
|||||||
return activities;
|
return activities;
|
||||||
|
|
||||||
return activities.Where(x =>
|
return activities.Where(x =>
|
||||||
(!Filter.Text.IsNullOrEmpty() && x.ActivityDescription != null && x.ActivityDescription.ContainsIgnoreCase(Filter.Text!)) ||
|
(!Filter.Text.IsNullOrEmpty() && x.ActivityDescription != null && x.ActivityDescription.ContainsIgnoreCase(Filter.Text!)) &&
|
||||||
(x.ActivityTypeId != null && !Filter.Type.IsNullOrEmpty() && x.ActivityTypeId.Equals(Filter.Type)) ||
|
(x.ActivityTypeId != null && !Filter.Type.IsNullOrEmpty() && x.ActivityTypeId.Equals(Filter.Type)) &&
|
||||||
(x.ActivityResultId != null && !Filter.Result.IsNullOrEmpty() && x.ActivityResultId.Equals(Filter.Result)) ||
|
(x.ActivityResultId != null && !Filter.Result.IsNullOrEmpty() && x.ActivityResultId.Equals(Filter.Result)) &&
|
||||||
(x.UserName != null && !Filter.User.IsNullOrEmpty() && Filter.User!.Contains(x.UserName)) ||
|
(x.UserName != null && !Filter.User.IsNullOrEmpty() && Filter.User!.Contains(x.UserName)) &&
|
||||||
(Filter.Category != null && x.Category.Equals(Filter.Category))
|
(Filter.Category != null && x.Category.Equals(Filter.Category))
|
||||||
).ToList();
|
).ToList();
|
||||||
}
|
}
|
||||||
|
|||||||
Reference in New Issue
Block a user