From e82a33b0b931d1bc078f93f02a3bae87dfa926fc Mon Sep 17 00:00:00 2001
From: Michael Fatemi <myfatemi04@gmail.com>
Date: Mon, 11 Jan 2021 18:55:58 -0500
Subject: [PATCH] Fix class council page bug

---
 src/pages/classcouncil.tsx | 16 ++++++++++++----
 1 file changed, 12 insertions(+), 4 deletions(-)

diff --git a/src/pages/classcouncil.tsx b/src/pages/classcouncil.tsx
index bba4411..48660a3 100644
--- a/src/pages/classcouncil.tsx
+++ b/src/pages/classcouncil.tsx
@@ -17,7 +17,7 @@ const roleOrder = [
 
 export default function ClassCouncil() {
 	let members = useQuery<SGA.MemberDocument[]>(
-		`*[_type == 'member' && committee == 'class'] | order (year desc)`
+		`*[_type == 'member' && committee == 'class'] | order year`
 	);
 
 	if (!members) {
@@ -28,18 +28,26 @@ export default function ClassCouncil() {
 	let currentYearMembers: SGA.MemberDocument[] = [];
 	let currentYear = '';
 
+	const saveCurrentYear = () => {
+		// Clear the members of the current year
+		years.push([currentYear, sortCommittee(currentYearMembers, roleOrder)]);
+		currentYearMembers = [];
+	};
+
 	for (let member of members) {
 		if (member.year !== currentYear) {
 			if (currentYear !== '') {
-				// Clear the members of the current year
-				years.push([currentYear, sortCommittee(currentYearMembers, roleOrder)]);
-				currentYearMembers = [];
+				saveCurrentYear();
 			}
 			currentYear = member.year;
 		}
 		currentYearMembers.push(member);
 	}
 
+	if (currentYearMembers.length > 0) {
+		saveCurrentYear();
+	}
+
 	return (
 		<>
 			<Hero heading='Class Council' />