If you appear in this archive and wish for your data to be removed or amended, please send us an email!
-{% assign committees = site.data.committee | sort %}
-{% for committees in committees reversed %}
- {% assign committee = committees[1] %}
- {% assign empty_list = true %}
- {% for member in committee.people %}
- {% if member.end-date %}
- {% assign empty_list = false %}
- {% break %}
- {% endif %}
- {% endfor %}
- {% unless empty_list %}
-
- {% for person in committee.people %}
- {% if person.end-date %}
-
-
-
-
{{ person.name }}
- {% if person.pronouns %}
-
- {{person.pronouns}}
-
- {% endif %}
-
- {% if committee.prefix %}{{committee.prefix}}{% endif %}
- {{ person.role }}
- {% if committee.postfix %}{{committee.postfix}}{% endif %}
- {% if person.flags %}
- {% for flag in person.flags %}
- {% if site.data.committee-flags.flags[flag] %}
- {{ site.data.committee-flags.flags[flag].text }}
- {% endif %}
- {% endfor %}
- {% endif %}
- |
- {{ person.start-date | date: "%b %Y" }} -
- {{ person.end-date | date: "%b %Y" | default: "Present" }}
-
-
- {{ person.bio }}
-
-
-
+{% assign archived_people = "" | split: "" %}
+{% assign archived_roles = "" | split: "" %}
+{% for person in site.data.committee["committee-members"] %}
+ {% assign person_archived_roles = person.roles | where_exp: "r", "r['end-date']" %}
+ {% for role in person_archived_roles %}
+ {% assign archived_people = archived_people | push: person %}
+ {% assign archived_roles = archived_roles | push: role %}
+ {% endfor %}
+{% endfor %}
+
+
+{% assign sorted_archive_years = archived_roles | map: "academic_year" | uniq | sort | reverse %}
+{% assign priority_roles = "President, Vice-President, Treasurer, Secretary" | split: ", " %}
+
+{% for year in sorted_archive_years %}
+
{{ year }}
+
+ {% assign display_index = 0 %}
+
+
+ {% for target_role in priority_roles %}
+ {% for role in archived_roles %}
+ {% if role.academic_year == year and role.role == target_role %}
+ {% assign display_index = display_index | plus: 1 %}
+ {% assign person = archived_people[forloop.index0] %}
+ {% include committee-card.html person=person role=role display_index=display_index %}
{% endif %}
{% endfor %}
- {% endunless %}
+ {% endfor %}
+
+
+ {% for role in archived_roles %}
+ {% if role.academic_year == year %}
+ {% unless priority_roles contains role.role %}
+ {% assign display_index = display_index | plus: 1 %}
+ {% assign person = archived_people[forloop.index0] %}
+ {% include committee-card.html person=person role=role display_index=display_index %}
+ {% endunless %}
+ {% endif %}
+ {% endfor %}
+
{% endfor %}
diff --git a/committee.html b/committee.html
index f0319b2c..13a3d66d 100644
--- a/committee.html
+++ b/committee.html
@@ -20,61 +20,66 @@
Committee
You can also find all of the agendas from our committee meetings here.
-
- {% for committees in site.data.committee %}
- {% assign committee = committees[1] %}
- {% if committee.current %}
- {% assign current_committee = committee %}
- {% assign count = current_committee.people.size %}
- {% for member in current_committee.people %}
- {% if member.end-date %}
- {% assign count = count | minus:1 %}
- {% endif %}
- {% endfor %}
- {% endif %}
- {% endfor %}
- Currently {{ count }} elected members for {{ current_committee.academic_year }}:
+{% assign current_academic_year = site.data.committee.current_academic_year %}
+
+
+{% assign active_people = "" | split: "" %}
+{% assign active_roles = "" | split: "" %}
+{% for person in site.data.committee["committee-members"] %}
+ {% assign person_active_roles = person.roles | where_exp: "r", "r.academic_year == current_academic_year and r['end-date'] == nil" %}
+ {% for role in person_active_roles %}
+ {% assign active_people = active_people | push: person %}
+ {% assign active_roles = active_roles | push: role %}
+ {% endfor %}
+{% endfor %}
+
+{% assign active_member_names = active_people | map: "name" | uniq %}
+
+
+ Currently {{ active_member_names.size }} elected members for {{ current_academic_year }}:
+
- {% for committees in site.data.committee %}
- {% assign committee = committees[1] %}
- {% for person in committee.people %}
- {% unless person.end-date %}
-
-
-
-
{{ person.name }}
-
{{ person.discordtag }}
- {% if person.pronouns %}
-
- {{person.pronouns}}
-
- {% endif %}
-
- {% if committee.prefix %}{{committee.prefix}}{% endif %}
- {{ person.role }}
- {% if committee.postfix %}{{committee.postfix}}{% endif %}
- {% if person.flags %}
- {% for flag in person.flags %}
- {% if site.data.committee-flags.flags[flag] %}
- {{ site.data.committee-flags.flags[flag].text }}
- {% endif %}
- {% endfor %}
- {% endif %}
- |
- {{ person.start-date | date: "%b %Y" }} -
- {{ person.end-date | date: "%b %Y" | default: "Present" }}
-
-
- {{ person.bio }}
-
-
-
- {% endunless %}
+
+
+ {% assign priority_roles = "President, Vice-President, Treasurer, Secretary" | split: ", " %}
+ {% assign display_index = 0 %}
+
+
+ {% for target_role in priority_roles %}
+ {% for role in active_roles %}
+ {% if role.role == target_role %}
+ {% assign display_index = display_index | plus: 1 %}
+ {% assign person = active_people[forloop.index0] %}
+ {% include committee-card.html person=person role=role display_index=display_index %}
+ {% endif %}
{% endfor %}
{% endfor %}
+
+
+ {% for role in active_roles %}
+ {% unless priority_roles contains role.role %}
+ {% assign display_index = display_index | plus: 1 %}
+ {% assign person = active_people[forloop.index0] %}
+ {% include committee-card.html person=person role=role display_index=display_index %}
+ {% endunless %}
+ {% endfor %}
+