Merge pull request #5241 from shiltemann/events-updates

Events framework updates

_layouts/event.html

@@ -15,10 +15,12 @@
       <h1>{{ event.title }}</h1>
       <p>
         {% if event.async %}Asynchronous, {% endif %}
-        {% if event.location.name == "Online" %}
+        {% if event.mode == "online" %}
         Virtual course
-        {% else %}
+        {% elsif event.mode == "onsite" %}
         In-person course
+        {% else %}
+        Hybrid course
         {% endif %}
       </p>
     </hgroup>

bin/schema-event.yaml

@@ -189,10 +189,11 @@ mapping:
             `true` for an asynchronous event. If this is true, we will not display any value for `time`s in the columns of the program
     mode:
         type: str
+        required: true
         enum:
             - online
             - onsite
-            - blended
+            - hybrid
         description: |
             The mode of the event. For some reason the schema.org markup for this provides three separate axes (online/onsite/blended, synchronous/asynchronous, and full-time/part-time), but we're just going to use the first axis because there is no way to represent choices from each axis. Why, schema.org why‽ If you want to record async/sync please do so in the separate attribute, and we will not record full/part time.
     registration:
@@ -206,6 +207,9 @@ mapping:
           deadline:
             required: true
             type: date
+          open:
+            required: false
+            type: bool
     feedback:
         description: |
             Link to the feedback form

bin/validate-other.rb

@@ -6,7 +6,7 @@
 require './bin/gtn'
 
 # Any error messages
-
+ec = 0
 learning_pathway_SCHEMA_UNSAFE = YAML.load_file('bin/schema-learning-pathway.yaml')
 learning_pathway_SCHEMA = automagic_loading(learning_pathway_SCHEMA_UNSAFE)
 
@@ -47,6 +47,7 @@ def validate_document(document, validator)
     # Otherwise, print errors and exit non-zero
     puts "\e[48;5;09m#{file}  has errors\e[m"
     errs.each { |x| puts "  #{x}" }
+    ec = 1
   end
 end
 
@@ -82,4 +83,5 @@ def validate_document(document, validator)
     puts "\e[48;5;09m#{file}  has errors\e[m"
     errs.each { |x| puts "  #{x}" }
   end
+  exit ec
 end

events/2024-04-01-example-event.md

@@ -23,7 +23,7 @@ cost: free # Or, e.g. 150 EUR
 audience: This event is intended for PhD students interested in Genomics. A basic knowledge in R is useful but not required.
 contact_email: [email protected]
 async: false # if asynchronous, we will not display the time columns on the program
-mode: online # In-person
+mode: online # online, onsite, or hybrid
 
 registration:
   link: https://example.org

events/2024-07-22-freiburg-july.md

@@ -8,13 +8,13 @@ description: |
     This course introduces scientists to the data analysis platform Galaxy. The course is a beginner course; no programming skills are required.
 
 date_start: 2024-07-22
-date_end: 2024-07-26 
+date_end: 2024-07-26
 
-cost: free 
+cost: free
 audience: Scientists with no or little Galaxy experience who want to analyse sequencing data.
 contact_email: [email protected]
-# async: false 
-mode: In-person
+# async: false
+mode: onsite
 
 registration:
   link: https://docs.google.com/forms/d/e/1FAIpQLSeGHShGhMvFvK0Jf3TNn0xgSMVboabWiTPfP2s3L1iDM0qTzA/viewform
@@ -47,14 +47,14 @@ infrastructure:
 program:
   - section: "Galaxy Freiburg workshop"  # section title is optional
     description: |
-      Next, you see the schedule for the full week. We will do at least one coffee break in the morning, one in the afternoon, and 1h lunch break around noon. 
+      Next, you see the schedule for the full week. We will do at least one coffee break in the morning, one in the afternoon, and 1h lunch break around noon.
     tutorials:
       - type: custom
         name: "Monday "
         time: "09:15 - 16:00"
         description: Introduction and Quality control
       - name: galaxy-intro-peaks2genes
-        topic: introduction  
+        topic: introduction
       - name: quality-control
         topic: sequence-analysis
       - type: custom

events/galaxy-academy-2024.md

@@ -17,8 +17,9 @@ date_end: 2024-10-11
 cost: free
 audience: Everyone who would like to get to know Galaxy and learn bioinformatics data analysis, whether you want to master a specific analysis or learn a new skill.
 contact_email: [email protected]
-async: true
 
+async: true
+mode: online
 
 contributions:
     organisers:

learning-pathways/fair-training.md

@@ -5,6 +5,7 @@ title: FAIR Data Management
 description: |
   The FAIR data management training learning pathway teaches you how to organise, describe, and store research data according to the FAIR principles (Findable, Accessible, Interoperable, Reusable).
 tags: [fair, dmp, data management, data stewardship]
+type: use
 
 editorial_board:
   - simleo