rushilwiz/tj-sga-website-react
1
0
Fork 0
mirror of https://github.com/tjsga/tj-sga-website-react.git synced 2025-04-09 22:50:17 -04:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fix class council page bug

Browse Source
This commit is contained in:
Michael Fatemi 2021-01-11 18:55:58 -05:00
parent ca66eb23c8
commit e82a33b0b9
1 changed files with 12 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
src/pages/classcouncil.tsx
View File

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