Merge branch 'main' of github.com:jkluge/Find-My-Next-Course into reviews-db

Author: jkluge

my-app/firebase.js

@@ -57,7 +57,6 @@ export function connectToFirebase(model) {
 	const options = JSON.parse(localStorage.getItem("filterOptions"));
 	if (options) {
 		model.setFilterOptions(options);
-		console.log("Restore options from local storage");
 	}
 
 	// automaticaly save filter options to local storage whenever they change
@@ -264,7 +263,6 @@ export async function uploadDepartmentsAndLocations(departments, locations) {
 		const departmentsRef = ref(db, "departments");
 		try {
 			await set(departmentsRef, departments);
-			console.log("Uploaded Departments");
 		} catch (error) {
 			console.error("Failed to upload departments:", error);
 			return false;
@@ -274,7 +272,6 @@ export async function uploadDepartmentsAndLocations(departments, locations) {
 		const locationsRef = ref(db, "locations");
 		try {
 			await set(locationsRef, locations);
-			console.log("Uploaded Locations");
 		} catch (error) {
 			console.error("Failed to upload locations:", error);
 			return false;
@@ -347,7 +344,6 @@ async function loadCoursesFromCacheOrFirebase(model) {
 		});
 
 		if (cachedTimestamp === firebaseTimestamp) {
-			console.log("Using cached courses from IndexedDB...");
 			const courseTx = db.transaction("courses", "readonly");
 			const courseStore = courseTx.objectStore("courses");
 			const getAllReq = courseStore.getAll();
@@ -367,7 +363,6 @@ async function loadCoursesFromCacheOrFirebase(model) {
 	}
 
 	// fallback: fetch from Firebase
-	console.log("Fetching courses from Firebase...");
 	const courses = await fetchAllCourses();
 	model.setCourses(courses);
 	saveCoursesToCache(courses, firebaseTimestamp);
@@ -394,13 +389,9 @@ export async function addReviewForCourse(courseCode, review) {
 	try {
 		const reviewsRef = ref(db, `reviews/${courseCode}/${review.uid}`);
 		await set(reviewsRef, review);
-		const updateCourseAvgRating = httpsCallable(
-			functions,
-			"updateCourseAvgRating"
-		);
-		const result = await updateCourseAvgRating({ courseCode });
-
-		console.log("Average rating updated:", result.data.avgRating);
+		const updateCourseAvgRating = httpsCallable(functions, 'updateCourseAvgRating');
+   		const result = await updateCourseAvgRating({ courseCode });
+		
 	} catch (error) {
 		console.error(
 			"Error when adding a course to firebase or updating the average:",

my-app/src/model.js

@@ -244,9 +244,9 @@ export const model = {
 		console.log(level);
 	},
 
-	updateDepartmentFilter(department) {
-		this.filterOptions.department = department;
-	},
+    updateLevelFilter(level) {
+        this.filterOptions.level = level;
+    },
 
 	updateLanguageFilter(languages) {
 		this.filterOptions.language = languages;
@@ -316,45 +316,89 @@ export const model = {
 		);
 		return fields;
 	},
-	async getAverageRating(courseCode, option) {
-		const reviews = await getReviewsForCourse(courseCode);
-		if (!reviews || reviews.length === 0) return null;
-
-		let validReviews = 0;
-		let total = 0;
-
-		switch (option) {
-			case "avg":
-				reviews.forEach((review) => {
-					if (typeof review.overallRating === "number") {
-						total += review.overallRating;
-						validReviews++;
-					}
-				});
-				break;
-			case "diff":
-				reviews.forEach((review) => {
-					if (typeof review.difficultyRating === "number") {
-						total += review.difficultyRating;
-						validReviews++;
-					}
-				});
-				break;
-			case "prof":
-				reviews.forEach((review) => {
-					if (typeof review.professorRating === "number") {
-						total += review.professorRating;
-						validReviews++;
-					}
-				});
-				break;
-			default:
-				return null;
-		}
-
-		if (validReviews === 0) return null;
-		return (total / validReviews).toFixed(1);
-	},
+    setApplyTranscriptFilter(transcriptFilterState) {
+        this.filterOptions.applyTranscriptFilter = transcriptFilterState;
+    },
+    setApplyLevelFilter(levelFilterState) {
+        this.filterOptions.applyLevelFilter = levelFilterState;
+    },
+    setApplyLanguageFilter(languageFilterState) {
+        this.filterOptions.applyLanguageFilter = languageFilterState;
+    },
+    setApplyLocationFilter(locationFilterState) {
+        this.filterOptions.applyLocationFilter = locationFilterState;
+    },
+    setApplyCreditsFilter(creditsFilterState) {
+        this.filterOptions.applyCreditsFilter = creditsFilterState;
+    },
+    setApplyDepartmentFilter(departmentFilterState) {
+        this.filterOptions.applyDepartmentFilter = departmentFilterState;
+    },
+    setApplyPeriodFilter(periodfilterState) {
+        this.filterOptions.applyPeriodFilter = periodfilterState;
+    },
+    //for better display we would like the departments in a structured format based on school 
+    formatDepartments() {
+        const grouped = this?.departments.reduce((acc, item) => {
+            const [school, department] = item.split("/");
+            if (!acc[school]) {
+                acc[school] = [];
+            }
+            acc[school].push(department?.trim());
+            return acc;
+        }, {});
+        const sortedGrouped = Object.keys(grouped)
+            .sort()
+            .reduce((acc, key) => {
+                acc[key] = grouped[key].sort();
+                return acc;
+            }, {});
+        const fields = Object.entries(sortedGrouped).map(([school, departments], index) => ({
+            id: index + 1,
+            label: school,
+            subItems: departments,
+        }));
+        return fields;
+    },
+    async getAverageRating(courseCode, option) {
+        const reviews = await getReviewsForCourse(courseCode);
+        if (!reviews || reviews.length === 0) return null;
+        
+        let validReviews = 0;
+        let total = 0;
+    
+        switch (option) {
+            case "avg":
+                reviews.forEach(review => {
+                    if (typeof review.overallRating === 'number') {
+                        total += review.overallRating;
+                        validReviews++;
+                    }
+                });
+                break;
+            case "diff":
+                reviews.forEach(review => {
+                    if (typeof review.difficultyRating === 'number') {
+                        total += review.difficultyRating;
+                        validReviews++;
+                    }
+                });
+                break;
+            case "prof":
+                reviews.forEach(review => {
+                    if (typeof review.professorRating === 'number') {
+                        total += review.professorRating;
+                        validReviews++;
+                    }
+                });
+                break;
+            default:
+                return null;
+        }
+    
+        if (validReviews === 0) return null;
+        return (total / validReviews).toFixed(1);
+    },
 
 	setPopupOpen(isOpen) {
 		if (!isOpen) {