Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

update officers page and add committee heads #568

Merged
merged 2 commits into from
Dec 24, 2019
Merged

update officers page and add committee heads #568

merged 2 commits into from
Dec 24, 2019

Conversation

cg505
Copy link
Member

@cg505 cg505 commented Dec 12, 2019

This updates the officers page to include recent elections. It also adds committee heads to the officers page. I didn't add committee heads to the "previous officers" section, because I wasn't sure how to do it (and we don't have any official historical committee heads). We should think about if we want to do this and if so how.

Ideally this can be merged when the new terms take effect on December 21.

@cg505
Copy link
Member Author

cg505 commented Dec 12, 2019

This is how it looks:
Screenshot_2019-12-12 Officers – Open Computing Facility

@64bitpandas
Copy link
Member

There's a typo in the date for ethanhs- should be /19 for the year right?

@emmatyping
Copy link
Member

There's a typo in the date for ethanhs- should be /19 for the year right?

Ha. I'll never reveal my time traveling secrets!

@cg505
Copy link
Member Author

cg505 commented Dec 13, 2019

@64bitpandas good catch, fixed

Copy link
Member

@kpengboy kpengboy left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thanks for doing this!

@@ -80,6 +80,26 @@ <h4>
the OCF lab and other services. They are elected by the Board of
Directors at the end of each semester.
</p>
{% if current_term.heads|length > 0 %}
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Is it possible to just say {% if current_term.heads %}?

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Not totally sure, but this is following the pattern of lines 36 and 65. I'll try to test it.

@@ -24,12 +25,17 @@ def Term(
sms: List[Any],
dgms: Optional[List[Any]] = None,
dsms: Optional[List[Any]] = None,
heads: Optional[List[Tuple[str, List[Any]]]] = None,
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Ideally we'd make the Anys more specific. Perhaps this can wait until we can use Python 3.7 data classes.

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This will get refactored anyways, assuming someone works on ocf/etc#3

@cg505 cg505 merged commit 129f407 into master Dec 24, 2019
@cg505 cg505 deleted the officers-update branch December 24, 2019 00:16
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

9 participants