From 3162bf9f6037c93ed8d46bfd13e20531664384ad Mon Sep 17 00:00:00 2001 From: Jeremy Martin Date: Mon, 24 Jun 2024 09:00:16 -0400 Subject: [PATCH 1/3] im comitted --- README.md | 10 +--------- 1 file changed, 1 insertion(+), 9 deletions(-) diff --git a/README.md b/README.md index 2bd4807d7..0ee99c020 100644 --- 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 From a541f3ad6b302a4532c1220300cf81d76de2bf93 Mon Sep 17 00:00:00 2001 From: Henry Date: Fri, 28 Jun 2024 08:58:02 -0400 Subject: [PATCH 2/3] Add UUID for sessions added --- app/controllers/reports/schedule_reports_controller.rb | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/app/controllers/reports/schedule_reports_controller.rb b/app/controllers/reports/schedule_reports_controller.rb index d7a0a6cf9..1135aafcf 100644 --- 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, From e3080540ed73ea2e1226d39bdc6cec4adc8ad4cc Mon Sep 17 00:00:00 2001 From: Henry Date: Fri, 28 Jun 2024 13:33:10 -0400 Subject: [PATCH 3/3] Need event type and stage/room for room to appear on the RCE schedule !!!! --- app/controllers/rce_controller.rb | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/app/controllers/rce_controller.rb b/app/controllers/rce_controller.rb index 8f6cafbce..386eb9c26 100644 --- 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