Merge pull request #80 from acmauth/newGradesPage

changes and fixes

Author: neron-png

src/lib/components/courses/courseInfo.svelte

@@ -152,7 +152,11 @@
 
 				<ion-item lines ="full">
 					<ion-label>Εξάμηνο</ion-label>
+					{#if course.semester <= 24}
 					<ion-text slot="end">{course.semester}ο</ion-text>
+					{:else}
+					<ion-text slot="end">{course.season}</ion-text>
+					{/if}
 				</ion-item>
 				<ion-item lines ="full">
 					<ion-label>Περίοδος</ion-label>
@@ -231,6 +235,7 @@
 				</ion-item>
 			</ion-list>
 		{/if}
+	
 		<canvas id="gradeChart" />
 	</ion-card-content>
 	</ion-card>

src/lib/components/grades/chips.svelte

@@ -7,8 +7,6 @@
 	 * @param {string} semId
 	 */
 	function handleClick(semId: string) {
-
-		
 			semesterId = semId;
 			const element = document.getElementById(semesterId);
 			if (element) {
@@ -23,15 +21,18 @@
 	
 	
 
+
+
 </script>
 
 
 <div class="chipsrow">
 
+
 	{#each Object.entries(coursesBySemester) as [id, courses]}
 	    <!-- svelte-ignore a11y-click-events-have-key-events -->
 	    <!-- svelte-ignore a11y-no-static-element-interactions -->
-		{#if courses[id-1].semester.id <= 24}
+		{#if courses[0].semester.id <= 24}
 	    <ion-chip on:click={handleClick(id)} color="primary">
 	        <ion-label>{id}ο εξάμηνο</ion-label>
 	    </ion-chip>
@@ -43,6 +44,8 @@
 	{/each}
 
 
+
+
 </div>	
 
 

src/lib/components/grades/statsCard.svelte

@@ -91,13 +91,12 @@
 
 
 
-	onMount(() => {
+	 onMount(async () => {
+       await gatherData();
+    });
 
-		gatherData();
 
-	});
-
-	afterUpdate(() => {
+	afterUpdate( () => {
 		if (chart) {
 			chart.destroy();
 		}
@@ -148,8 +147,8 @@
 	}
 
 	});
-
 	
+
 </script>
 
 {#if !searchQuery.length}
@@ -187,8 +186,11 @@
 				</ion-text>
 			</ion-item>
 
-			
-			<canvas id="gradeChart"></canvas>
+
+			<canvas id="gradeChart" />
+
+
+
 
 			<!-- svelte-ignore a11y-no-static-element-interactions -->
 			<!-- svelte-ignore a11y-click-events-have-key-events -->

src/lib/components/personalInfo/infoItem.svelte

@@ -139,7 +139,7 @@
 	}
 
 	ion-icon {
-		color: var(--ion-color-primary);
+		color: var(--app-color-primary-dark);
 	}
 
 

src/lib/components/personalInfo/settings.svelte

@@ -28,12 +28,13 @@
 			<ion-label class="ion-padding-start">FAQ</ion-label>
 			<ion-icon size="small" icon={allIonicIcons.chevronForwardCircle} />
 		</ion-item>
+
 
 		<!-- svelte-ignore a11y-click-events-have-key-events -->
 		<!-- svelte-ignore a11y-no-static-element-interactions -->
 		<ion-item button lines="none" on:click={logOut}>
 			<ion-icon color="danger" size="small" icon={allIonicIcons.exit} />
-
+			
 			<ion-label color="danger" class="ion-padding-start">Αποσύνδεση</ion-label>
 			<ion-icon color="danger" size="small" icon={allIonicIcons.chevronForwardCircle} />
 
@@ -47,8 +48,9 @@
 
 	<style>
 
-		ion-icon {
-		color: var(--ion-color-primary);
-		}
+	ion-icon {
+		color: var(--app-color-primary-dark);
+	}
 
 	</style>
+ 

src/routes/courses/[courseId]/+page.svelte

@@ -33,10 +33,6 @@
 		gradesCount: {}
 	};
 
-	let gradeData = [];
-	let grades = [0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10];
-	let maximum = 0;
-	let chart;
 	let result;
 
 	// Extract courseCode from the URL
@@ -47,6 +43,7 @@
 		// Fetch course information
 		result = await courseInformation(courseCode);
 		if (result) {
+			
 			// Assign values from the result to course
 		course.title = result.courseTitle;
 		course.code = courseCode;

src/routes/pages/grades/+page.svelte

@@ -26,11 +26,15 @@
 	};
 
 
+	// Variables regarding grades and subjects
 	let searchQuery = '';
 	let subjects = 0;
 	let passedSubjects = 0;
 	let coursesBySemester = {};
 	let subjectsJSON: number | null | undefined;
+
+
+
 	/**
 	 * @type {string}
 	 */
@@ -41,10 +45,12 @@
 	 */
 	
 
+	 // Search
 	function handleChange(event: { target: { value: string; }; }) {
 		searchQuery = event.target.value;
 	}
 
+	// Flipper toggle
 	function flip() {
 		$flipped = !$flipped;
 	}
@@ -84,6 +90,8 @@
 		 return semesters;
 	}
 
+	
+
 	async function gatherData() {
 		subjects = (await neoUniversisGet('students/me/courses?$top=-1',{lifetime: 600})).value;
 
@@ -120,6 +128,8 @@
 }
 
 
+//Stats
+
 
 
 </script>
@@ -132,8 +142,9 @@
 
       <ion-searchbar class="searchbar" debounce={500} on:ionInput={handleChange} inputmode="text" show-clear-button="always" placeholder="Αναζήτηση Μαθημάτων"></ion-searchbar>
 
-      
-      <Chips coursesBySemester={coursesBySemester} semesterId={semesterId} />
+      {#if Object.entries(coursesBySemester).length > 1}
+      	<Chips coursesBySemester={coursesBySemester} semesterId={semesterId} />
+	  {/if}
     </ion-toolbar>
   </ion-header>
 
@@ -144,6 +155,7 @@
 		<GradesSkeleton/>
 	{:then}
 	<!-- Show content after loading is completed -->
+
 	<Flipper reactToHeight bind:flipped={$flipped}>
         <Stats flip={flip} searchQuery = {searchQuery} subjects={subjects} passedSubjects={passedSubjects} subjectsJSON = {subjectsJSON} slot="front" />
         <Card flip={flip} slot="back"/>