Merge pull request #1114 from PlanoramaEvents/development

v3.7.0-rc5
PlanoramaEvents · Jun 28, 2024 · cd51fdd · cd51fdd
2 parents 0daa179 + 13e6cfe
commit cd51fdd
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 12 deletions.
diff --git a/README.md b/README.md
@@ -58,15 +58,7 @@ docker volume create --name=node_modules_sidekiq
 Then to start the dev docker instances use
 
 ```
-docker-compose -f docker-compose-dev.yml up
-```
-
-alternatively use
-```
-rake docker:start
-
-# and to stop them
-rake docker:stop
+docker compose -f docker-compose-dev.yml up
 ```
 
 You will be able to access the running server via http://localhost:3000 and

diff --git a/app/controllers/rce_controller.rb b/app/controllers/rce_controller.rb
@@ -21,7 +21,8 @@ def generate_csv(sessions)
     column_names = [
         'Start date','Start time','End date','End time',
         'Schedule name','Schedule description','Segment name','Segment type',
-        'Tags','Attendance'
+        'Tags','Attendance',
+        'Event type', 'Room'
       ]
 
     CSV.generate do |csv|
@@ -53,7 +54,10 @@ def generate_csv(sessions)
           segmentType,
           # Areas and tags
           "#{session.area_list.sort.join(', ')}, #{session.tag_list&.join(', ')}", # Tags may be new line seperated?
-          'regular'
+          'regular',
+          # If is a stage then it is "hybrid" and we set Event Tyep and the Room name !!!
+          segmentType == "stage" ? 'hybrid' : 'virtual',
+          segmentType == "stage" ? session.room.name : '',
         ]
       end
     end

diff --git a/app/controllers/reports/schedule_reports_controller.rb b/app/controllers/reports/schedule_reports_controller.rb
@@ -236,7 +236,7 @@ def tab_headers
     @session_room_changed.append_row(['Session Title','Original Room', 'New Room'])
     @session_title_changed.append_row(['Original Session Title', 'New Session Title'])
     @session_description_changed.append_row(['Session Title','Original Description', 'New Description'])
-    @session_added.append_row(['Session Title', 'Session Description', 'Format', 'Areas', 'Start Time', 'Room', 'Moderators', 'Participants'])
+    @session_added.append_row(['Session Id', 'Session Title', 'Session Description', 'Format', 'Areas', 'Start Time', 'Room', 'Moderators', 'Participants'])
     @session_removed.append_row(['Session Title'])
 
     @participants_add_drop.append_row(['Session Title', 'Participant Dropped', 'Participant Added'])
@@ -340,6 +340,7 @@ def session_added_row(sheet, change, to)
 
     sheet.append_row(
       [
+        object.id,
         object.title,
         object.description,
         object.format&.name,