diff --git a/CONTRIBUTORS.yaml b/CONTRIBUTORS.yaml index 4cc4b73a7bb440..e47ea50279e0bb 100644 --- a/CONTRIBUTORS.yaml +++ b/CONTRIBUTORS.yaml @@ -297,6 +297,8 @@ bgruening: bazante1: name: Bazante Sanders joined: 2020-12 + affiliations: + - avans-atgm BasileGoussard: name: Basile Goussard @@ -495,6 +497,8 @@ dirowa: joined: 2021-10 linkedin: Donny Vrins email: D.vrins@live.nl + former_affiliations: + - avans-atgm dlalgroup: name: Dennis Lal group @@ -746,8 +750,14 @@ hexylena: fediverse_flavor: akkoma affiliations: - gallantries + - by-covid - erasmusmc + - elixir-europe + - elixir-converge + former_affiliations: + - deNBI - avans-atgm + - uni-freiburg contact_for_training: false location: country: NL @@ -803,6 +813,8 @@ ilveroluca: name: Luca Pireddu joined: 2023-04 orcid: 0000-0002-4663-5613 + affiliations: + - by-covid IrelCM: name: Irelka Colina @@ -999,6 +1011,8 @@ kikkomep: joined: 2023-04 orcid: 0000-0002-5207-0030 elixir_node: it + affiliations: + - by-covid KlemensFroehlich: name: Klemens Fröhlich @@ -1448,6 +1462,8 @@ pauldg: joined: 2023-04 elixir_node: be orcid: 0000-0002-8940-4946 + affiliations: + - by-covid paulzierep: name: Paul Zierep @@ -1656,6 +1672,8 @@ simleo: joined: 2023-04 elixir_node: it orcid: 0000-0001-8271-5429 + affiliations: + - by-covid slegras: name: Stéphanie Legras @@ -1697,6 +1715,8 @@ stain: lon: -2.233631283105614 fediverse: https://scholar.social/@soilandreyes fediverse_flavor: mastodon + affiliations: + - by-covid stephanierobin: name: Stéphanie Robin @@ -1881,6 +1901,7 @@ wm75: fediverse: https://scholar.social/@zerodivision fediverse_flavor: mastodon affiliations: + - by-covid - uni-freiburg xiliu: diff --git a/_includes/contributor-list.html b/_includes/contributor-list.html index 86d74a96a330bd..d70791f74da975 100644 --- a/_includes/contributor-list.html +++ b/_includes/contributor-list.html @@ -1,6 +1,11 @@ {%- if include.contributors -%} {%- capture people -%} -{% for id in include.contributors %}{{ include.sep }}{% if include.badge %}{% include _includes/contributor-badge.html id=id %}{% else %}{% assign name = contributors[id].name | default: id -%}{{ name -}}{% endif %}{%- endfor -%} +{%- if include.shuffle -%} + {%- assign zz_contributors = include.contributors | shuffle -%} +{%- else -%} + {%- assign zz_contributors = include.contributors -%} +{%- endif -%} +{% for id in zz_contributors %}{{ include.sep }}{% if include.badge %}{% include _includes/contributor-badge.html id=id %}{% else %}{% assign name = contributors[id].name | default: id -%}{{ name -}}{% endif %}{%- endfor -%} {%- if include.newcontributors -%}{{ include.sep }}{% if include.badge %}{% include _includes/contributor-badge.html id='newcontributors' %}{% endif %}{% endif %} {%- endcapture -%} {%- endif -%} diff --git a/_layouts/contributor_index.html b/_layouts/contributor_index.html index 5f5536fe0e57ed..596fe496d47206 100644 --- a/_layouts/contributor_index.html +++ b/_layouts/contributor_index.html @@ -53,21 +53,35 @@

Affiliations

{% endif %} + {% assign former_affil_count = entity.former_affiliations | size %} + {% if former_affil_count > 0 %} +

Former Affiliations

+
+ {% include _includes/contributor-list.html contributors=entity.former_affiliations badge=true %} +
+ {% endif %} + {% assign member_count = entity.members | size %} {% if member_count > 0 %}

Members

These individuals have noted that they are affiliated in some way with this organisation. This list is non-exhaustive.

- {% include _includes/contributor-list.html contributors=entity.members badge=true %} + {% include _includes/contributor-list.html contributors=entity.members badge=true shuffle=true %} +
+ {% endif %} + + {% assign former_member_count = entity.former_members | size %} + {% if former_member_count > 0 %} +

Former Members

+

These individuals have noted that they previously were affiliated in some way with this organisation. This list is non-exhaustive.

+
+ {% include _includes/contributor-list.html contributors=entity.former_members badge=true shuffle=true %}
{% endif %}

Contributions

{% if entity.funder %} - {% if entity.url %} - {{ entity.url }} - {% endif %} {{ entity.funding_statement | markdownify }} {% endif %} @@ -194,6 +208,10 @@

External Links

{% endif %} + {% if entity.url %} + Website: {{ entity.url }} + {% endif %} + {% if entity.funding_id %} Grant ID: {% if entity.funding_system %} diff --git a/_plugins/gtn.rb b/_plugins/gtn.rb index e2646086aae235..5ba8ae7b3708d7 100644 --- a/_plugins/gtn.rb +++ b/_plugins/gtn.rb @@ -406,6 +406,10 @@ def get_topic(page) page['path'].split('/')[1] end + def shuffle(array) + array.shuffle + end + def get_og_desc(site, page); end def get_og_title(site, page, reverse) @@ -524,6 +528,24 @@ def group_icons(icons) end end end + + if contributor.key?('former_affiliations') + contributor['former_affiliations'].each do |affiliation| + if site.data['organisations'].key?(affiliation) + if !site.data['organisations'][affiliation].key?('former_members') + site.data['organisations'][affiliation]['former_members'] = [] + end + + site.data['organisations'][affiliation]['former_members'] << name + elsif site.data['funders'].key?(affiliation) + if !site.data['funders'][affiliation].key?('former_members') + site.data['funders'][affiliation]['former_members'] = [] + end + + site.data['funders'][affiliation]['former_members'] << name + end + end + end end end diff --git a/bin/schema-contributors.yaml b/bin/schema-contributors.yaml index 7870cf37776d64..b65da13b218fcc 100644 --- a/bin/schema-contributors.yaml +++ b/bin/schema-contributors.yaml @@ -102,6 +102,15 @@ mapping: enum: - ORGANISATIONS - FUNDERS + former_affiliations: + type: seq + description: "A set of organisations you were previously affiliated with" + sequence: + - type: str + required: true + enum: + - ORGANISATIONS + - FUNDERS elixir_node: type: str enum: diff --git a/learning-pathways/data-driven-biology.md b/learning-pathways/data-driven-biology.md index 9b0891dfb83ff1..e3f6005ae6f9bc 100644 --- a/learning-pathways/data-driven-biology.md +++ b/learning-pathways/data-driven-biology.md @@ -3,6 +3,7 @@ layout: learning-pathway cover-image: /assets/images/genomics_intro.png cover-image-alt: "Genomics intro" tags: [introduction, real-course] +type: use editorial_board: - nekrut