Merge pull request #48 from acmauth/gradesPage

added settings
acmauth · Feb 17, 2024 · ca18499 · ca18499
2 parents 6090f6b + 9dab05d
commit ca18499
Show file tree

Hide file tree

Showing 10 changed files with 219 additions and 72 deletions.
diff --git a/package.json b/package.json
@@ -50,6 +50,7 @@
 		"cross-fetch": "^4.0.0",
 		"fetch-cookie": "^2.1.0",
 		"flowbite-svelte": "^0.44.19",
+		"fuse.js": "^7.0.0",
 		"ionic-svelte": "^0.5.82",
 		"ionicons": "^7.2.1",
 		"isomorphic-fetch": "^3.0.0",

diff --git a/src/lib/components/courses/courseInfo.svelte b/src/lib/components/courses/courseInfo.svelte
@@ -122,8 +122,8 @@
 	<ion-card>
 		<ion-card-header>
 			<ion-card-title>{course.title}</ion-card-title>
-			<ion-card-subtitle>{course.code}</ion-card-subtitle>
-			<ion-card-subtitle>{course.courseType}</ion-card-subtitle>
+			<ion-card-subtitle># {course.code}</ion-card-subtitle>
+			<ion-card-subtitle>Τύπος: {course.courseType}</ion-card-subtitle>
 		</ion-card-header>
 
 		<!-- Checking if there is a grade and displays the corresponding color depending if you passed or not -->
@@ -142,20 +142,20 @@
 
 			<ion-list>
 
-				<ion-item>
+				<ion-item lines ="full">
 					<ion-label>ECTS</ion-label>
 					<ion-text slot="end">{course.ects}</ion-text>
 				</ion-item>
 
-				<ion-item>
+				<ion-item lines ="full">
 					<ion-label>Εξάμηνο</ion-label>
 					<ion-text slot="end">{course.semester}ο</ion-text>
 				</ion-item>
-				<ion-item>
+				<ion-item lines ="full">
 					<ion-label>Περίοδος</ion-label>
 					<ion-text slot="end">{course.season}</ion-text>
 				</ion-item>
-				<ion-item>
+				<ion-item lines ="full">
 					<ion-label >Εβδομαδιαίες ώρες</ion-label>
 					<ion-text slot="end">{course.weeklyHours}</ion-text>
 				</ion-item>
@@ -183,33 +183,34 @@
 				<ion-card-subtitle>-</ion-card-subtitle>
 			{/if}
 		</ion-card-header>
+		<ion-card-content>
 		{#if stats.grade}
 			<ion-list>
-				<ion-item>
+				<ion-item lines ="full">
 					<ion-label>Βαθμολογημένοι</ion-label>
 					<ion-text slot="end">{stats.totalStudents}</ion-text>
 				</ion-item>
-				<ion-item>
+				<ion-item lines ="full">
 					<ion-label>Φοιτητές με ίδιο βαθμό</ion-label>
 					<ion-text slot="end">{stats.studentsLikeMe}</ion-text>
 				</ion-item>
-				<ion-item>
+				<ion-item lines ="full">
 					<ion-label>Φοιτητές με καλύτερο βαθμό</ion-label>
 					<ion-text slot="end">{stats.studentsBetterThanMe}</ion-text>
 				</ion-item>
-				<ion-item>
+				<ion-item lines ="full">
 					<ion-label>Φοιτητές με χειρότερο βαθμό</ion-label>
 					<ion-text slot="end">{stats.studentsWorseThanMe}</ion-text>
 				</ion-item>
-				<ion-item>
+				<ion-item lines ="full">
 					<ion-label>Φοιτητές που πέρασαν</ion-label>
 					<ion-text slot="end">{stats.passedCount}</ion-text>
 				</ion-item>
-				<ion-item>
+				<ion-item lines ="full">
 					<ion-label>Φοιτητές που κόπηκαν</ion-label>
 					<ion-text slot="end">{stats.failedCount}</ion-text>
 				</ion-item>
-				<ion-item>
+				<ion-item lines ="full">
 					<ion-label>Μέσος όρος</ion-label>
 					<ion-text slot="end">{stats.averageGrade}</ion-text>
 				</ion-item>
@@ -227,6 +228,7 @@
 				</ion-item>
 			</ion-list>
 		{/if}
+	</ion-card-content>
 	</ion-card>
 
 	<canvas id="gradeChart" />
@@ -248,6 +250,11 @@
 		box-shadow: none;
 	}
 
+	ion-accordion-group {
+	margin-top: 0.2rem;
+
+}
+
 
   
 

diff --git a/src/lib/components/grades/gradeCard.svelte b/src/lib/components/grades/gradeCard.svelte
@@ -11,49 +11,51 @@
 	<ion-card-header>
 
   <ion-card-title><b>{semesterId}ο Εξάμηνο</b></ion-card-title>
+
 		{#if semesterAverage}
 		<ion-card-subtitle>Μ.Ο Εξαμήνου: {semesterAverage}</ion-card-subtitle>
 		{:else}
 		<ion-card-subtitle>Μ.Ο Εξαμήνου: -</ion-card-subtitle>
 		{/if}
+
 	</ion-card-header>
 
 	<ion-card-content>
 		<ion-list lines="none">
-			{#each filteredSubjects as course}
-					<ion-label class="ion-padding-start">{course.course}</ion-label>
-
+			{#each filteredSubjects as course,index}
+
 					<ion-item href={`/courses/${course.course}`}>
 						<ion-label class="ion-text-wrap title">{course.courseTitle}</ion-label>
 						{#if course.grade !== null}
 							{#if course.grade * 10 >= 5}
-								<ion-text class="ion-padding-start" color="success">
+								<ion-text class="ion-padding-start success">
 									<h2>{course.formattedGrade}</h2>
 								</ion-text>
 							{:else}
-								<ion-text class="ion-padding-start" color="danger">
+								<ion-text class="ion-padding-start danger">
 									<h2>{course.formattedGrade}</h2>
 								</ion-text>
 							{/if}
-						{:else}
-							<ion-text class="ion-padding-start" color="danger">
-								<h2><b>-</b></h2>
-							</ion-text>
+
+
 						{/if}
 					</ion-item>
 					{#if course.examPeriod !== null}
 						<ion-label class="ion-padding-start examPeriod">
 							{#if course.examPeriod && course.gradeYear}
 								{course.examPeriod.name} {course.gradeYear.name}
 							{:else}
-								-
+								ΔΗΛΩΜΕΝΟ
 							{/if}
 						</ion-label>
 
 					{:else}
 						<ion-label class="ion-padding-start examPeriod">-</ion-label>
 					{/if}
-					<span class="line"></span>
+					{#if index !== filteredSubjects.length - 1}
+						<span class="line"></span>
+					{/if}
+
 
 
 			{/each}
@@ -65,10 +67,7 @@
 
 <style>
 
-.scroll {
-	display: block;
-	height: 35px;
-}
+
 
 ion-item { --min-height: 0; }
 
@@ -77,7 +76,20 @@ ion-label {
 	margin: 0.3rem 0rem;
 }
 
+ion-card-subtitle {
+	color: var(--app-color-primary-dark);
+	
+}
+
+h2 {
+	font-size: 1.5rem;
+	font-weight: bold;
+}
 
+.scroll {
+	display: block;
+	height: 35px;
+}
 
 .line {
 	display: block;
@@ -89,6 +101,18 @@ ion-label {
 	margin-top: 1rem;
 }
 
+.success {
+	color: var(--app-color-green-dark);
+}
+
+.danger {
+	color: var(--app-color-orange-dark);
+}
+
+.examPeriod{
+	font-size: 0.8rem;
+}
+
 
 
 

diff --git a/src/lib/components/grades/grades.svelte b/src/lib/components/grades/grades.svelte
@@ -4,12 +4,20 @@
 	import Card from './gradeCard.svelte';
 	import { coursesPerSemester } from '$lib/functions/coursePerSemester/coursesPerSemester';
 	import { averagesPerSemester } from '$lib/functions/gradeAverages/averagesPerSemester';
-  
+	import Fuse from 'fuse.js';
+
 	export let searchQuery;
 	export let semesterId;
   
 	let courseBySemester = writable([]);
 	let filteredSubjects = writable([]);
+
+	const fuseOptions = {
+	  keys: ['course', 'courseTitle'],
+	  threshold: 0.3,
+	};
+
+
   
 	// Get the courses per semester and the average per semester
 	async function gatherGrades() {
@@ -42,16 +50,18 @@
 	  if (searchQuery.length === 0) {
 		filteredSubjects.set(courses);
 	  } else {
-		const filtered = courses.map((semester) => {
-		  return {
-			...semester,
-			courses: semester.courses.filter(
-			  (course) =>
-				course.courseTitle.toLowerCase().includes(searchQuery.toLowerCase()) ||
-				course.course.toLowerCase().includes(searchQuery.toLowerCase())
-			),
-		  };
-		});
+		const subjects = courses.reduce((acc, curr) => acc.concat(curr.courses), []);
+	    const fuse = new Fuse(subjects, fuseOptions);
+	    const searchResults = fuse.search(searchQuery);
+
+	    const filtered = courses.map((semester) => {
+	        return {
+	            ...semester,
+	            courses: searchResults.filter(result =>
+	                semester.courses.some(course => course.course === result.item.course)
+	            ).map(result => result.item),
+	        };
+	    });
 		filteredSubjects.set(filtered);
 	  }