diff --git a/app/src/components/SelectorSetting/AllCourse.jsx b/app/src/components/SelectorSetting/AllCourse.jsx index c7e91fc..3622793 100644 --- a/app/src/components/SelectorSetting/AllCourse.jsx +++ b/app/src/components/SelectorSetting/AllCourse.jsx @@ -153,7 +153,8 @@ class AllCourse extends Component { applyTextFilter = (course, filterName, filter) => { // console.log(filter); const courseValue = course[courseDataNameMap[filterName]]?.toLowerCase(); - const filterLogic = filter.filterLogic === undefined ? 'include' : filter.filterLogic; // equal, include, exclude + const filterLogic = + filter.filterLogic === undefined ? 'include' : filter.filterLogic; // equal, include, exclude // 使用逗號或空格分割每個組 const filterGroups = filter.value.toLowerCase().split(/[,,]/); @@ -184,7 +185,8 @@ class AllCourse extends Component { */ applyTimeFilter = (course, filterName, filter) => { // 檢查是否包含或排除 - const filterLogic = filter.filterLogic === undefined ? 'include' : filter.filterLogic; + const filterLogic = + filter.filterLogic === undefined ? 'include' : filter.filterLogic; if (filterName === '星期') { if (filterLogic !== 'equal') { @@ -193,15 +195,13 @@ class AllCourse extends Component { return filter[day] && course[day]; }); return filterLogic === 'include' ? daysMatched : !daysMatched; - } - else { + } else { // 檢查是否有所有天匹配 const daysMatched = courseDayName.every((day) => { return (filter[day] === true) === (course[day] !== ''); }); return daysMatched; } - } if (filterName === '節次') { @@ -218,11 +218,15 @@ class AllCourse extends Component { } }); return filterLogic === 'include' ? periodsMatched : !periodsMatched; - } - else { + } else { // 檢查是否有所有節次匹配 let periodsMatched = true; - let filterPeriods = Object.keys(filter).filter((key) => key !== 'active' && key !== 'filterLogic' && filter[key]).sort().join(''); + let filterPeriods = Object.keys(filter) + .filter( + (key) => key !== 'active' && key !== 'filterLogic' && filter[key], + ) + .sort() + .join(''); // console.log(filterPeriods); courseDayName.forEach((day) => { if (course[day]) { diff --git a/app/src/components/SelectorSetting/AllCourse/ListInformation/AdvancedFilter/FilterRow.jsx b/app/src/components/SelectorSetting/AllCourse/ListInformation/AdvancedFilter/FilterRow.jsx index 28ba200..6e6e4ca 100644 --- a/app/src/components/SelectorSetting/AllCourse/ListInformation/AdvancedFilter/FilterRow.jsx +++ b/app/src/components/SelectorSetting/AllCourse/ListInformation/AdvancedFilter/FilterRow.jsx @@ -133,7 +133,8 @@ class FilterRow extends Component { // 創建一個新的選中狀態對象,將所有選項設為選中 const selected = { active: this.props.advancedFilters[filterName]?.active ?? false, - filterLogic: this.props.advancedFilters[filterName]?.filterLogic ?? 'include', + filterLogic: + this.props.advancedFilters[filterName]?.filterLogic ?? 'include', }; this.props.filterOptions[filterName].options.forEach((option) => { selected[option] = true; @@ -159,7 +160,8 @@ class FilterRow extends Component { ...this.props.advancedFilters, [filterName]: { active: this.props.advancedFilters[filterName]?.active ?? false, - filterLogic: this.props.advancedFilters[filterName]?.filterLogic ?? 'include', + filterLogic: + this.props.advancedFilters[filterName]?.filterLogic ?? 'include', }, }; @@ -261,7 +263,9 @@ class FilterRow extends Component { { Object.keys(selected).filter( (key) => - key !== 'active' && key !== 'filterLogic' && selected[key], + key !== 'active' && + key !== 'filterLogic' && + selected[key], ).length }{' '} 項 diff --git a/app/src/components/SelectorSetting/CourseDetective/ListInformation.jsx b/app/src/components/SelectorSetting/CourseDetective/ListInformation.jsx index d2eef55..d1307d9 100644 --- a/app/src/components/SelectorSetting/CourseDetective/ListInformation.jsx +++ b/app/src/components/SelectorSetting/CourseDetective/ListInformation.jsx @@ -65,7 +65,7 @@ function ListInformation({ const handleCloseOrderElement = () => setShow(false); const handleToggleOrderElement = () => setShow(!show); - + // const handleShowSelectedCourses = () => { // setDisplayConflictCourses(prevState => !prevState); // }; diff --git a/app/src/components/TermofUse.jsx b/app/src/components/TermofUse.jsx index aa47b7b..6823915 100644 --- a/app/src/components/TermofUse.jsx +++ b/app/src/components/TermofUse.jsx @@ -63,9 +63,7 @@ class TermofUse extends Component { - - testestestestsestsetsetsetset - + testestestestsestsetsetsetset