From a6d5bff1fb6bf414d8e42cff65f7eee871ae4ad2 Mon Sep 17 00:00:00 2001 From: Sarah <83782422+Louis-htmlcss@users.noreply.github.com> Date: Tue, 22 Oct 2024 23:01:21 +0200 Subject: [PATCH] Update search bar to support searching for both assignments and subjects * Modify `groupedHomework` logic to include subject-based filtering * Add subject-based filtering in the search logic * Normalize subject strings for comparison --- src/views/account/Homeworks/Homeworks.tsx | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/src/views/account/Homeworks/Homeworks.tsx b/src/views/account/Homeworks/Homeworks.tsx index ab4119b9..b5660580 100644 --- a/src/views/account/Homeworks/Homeworks.tsx +++ b/src/views/account/Homeworks/Homeworks.tsx @@ -162,7 +162,9 @@ const WeekView = ({ route, navigation }) => { if (searchTerms.length > 0) { acc[day] = acc[day].filter(homework => { const content = homework.content.toLowerCase().trim().normalize("NFD").replace(/[\u0300-\u036f]/g, ""); - return content.includes(searchTerms.toLowerCase().trim().normalize("NFD").replace(/[\u0300-\u036f]/g, "")); + const subject = homework.subject.toLowerCase().trim().normalize("NFD").replace(/[\u0300-\u036f]/g, ""); + return content.includes(searchTerms.toLowerCase().trim().normalize("NFD").replace(/[\u0300-\u036f]/g, "")) || + subject.includes(searchTerms.toLowerCase().trim().normalize("NFD").replace(/[\u0300-\u036f]/g, "")); }); } @@ -704,4 +706,4 @@ const styles = StyleSheet.create({ }, }); -export default WeekView; \ No newline at end of file +export default WeekView;