From 7da2bf403e38f8ed85769482e7096a5d1672ace3 Mon Sep 17 00:00:00 2001 From: Henry Date: Wed, 3 Aug 2022 13:28:55 -0400 Subject: [PATCH 1/5] remove areas from pubs XML --- app/views/xml_templates/schedule.nokogiri | 19 ++++++++++--------- 1 file changed, 10 insertions(+), 9 deletions(-) diff --git a/app/views/xml_templates/schedule.nokogiri b/app/views/xml_templates/schedule.nokogiri index 92cb7e0c4..d9f35b796 100644 --- a/app/views/xml_templates/schedule.nokogiri +++ b/app/views/xml_templates/schedule.nokogiri @@ -2,21 +2,21 @@ # XML template for a collection of sessions # xml.schedule { - # We need a header at the start of the document, so - # before_1st_session needs to be at least 86400 seconds (the + # We need a header at the start of the document, so + # before_1st_session needs to be at least 86400 seconds (the # number of seconds in a day) earlier than the 1st session before_1st_session = @instance.first.start_time - 86401 day = Date.parse(before_1st_session.strftime("%Y-%m-%d")) timeslot = Time.parse(before_1st_session.strftime("%Y-%m-%d %l:%M")) - @instance.each do |session| - # Check if this is the 1st session of the day, in which case, + @instance.each do |session| + # Check if this is the 1st session of the day, in which case, # create a heading. this_day = Date.parse(session.start_time.strftime("%Y-%m-%d")) if this_day > day day = this_day xml.day(session.start_time.strftime("%A")) end - # Check if this is the 1st session at this time, in which case, + # Check if this is the 1st session at this time, in which case, # create a subheading. if session.start_time.utc > timeslot.utc timeslot = session.start_time.utc @@ -25,9 +25,9 @@ xml.schedule { xml.session { xml.id(session.pub_reference_number) xml.title(session.title) - # timeduration, roomareasformat, and participants will each be a - # block-level paragraph with span-level elements. The line - # breaks & spacing will be removed in publications_controller.rb. + # timeduration, roomareasformat, and participants will each be a + # block-level paragraph with span-level elements. The line + # breaks & spacing will be removed in publications_controller.rb. # Otherwise InDesign would render the white space in print. xml.timeduration{ xml.start_time(session.start_time.strftime("%-l:%M")) @@ -35,7 +35,8 @@ xml.schedule { } xml.roomareasformat{ xml.room(session.room.name) - xml.areas(session.area_list.join(", ")) + # Areas are for internal use only, not for the public + # xml.areas(session.area_list.join(", ")) xml.format(session.format.name) } xml.description(session.description) From 90d60b22749f0c59eeee626cbeb42596d7ca85d9 Mon Sep 17 00:00:00 2001 From: dcterman <105614148+dcterman@users.noreply.github.com> Date: Wed, 3 Aug 2022 16:53:59 -0400 Subject: [PATCH 2/5] Livestream, recording exclusion word tweaks Make these descriptive lines consistent with wording of other reports --- app/javascript/reports/reports_screen.vue | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/app/javascript/reports/reports_screen.vue b/app/javascript/reports/reports_screen.vue index 66dcde80e..2eeb786e9 100644 --- a/app/javascript/reports/reports_screen.vue +++ b/app/javascript/reports/reports_screen.vue @@ -92,9 +92,10 @@
  • Participant Recording and Streaming Permissions

    - Description: List of participants with their recording and streaming permissions and exclusions.
    - Fields: Person published names, primary email, attendance type, participant status, permission to stream, exclusions for streaming, permission to record, exclusions to recording, and their schedule.
    - Person data included: Moderators and participants on scheduled sessions. + Description: List of participants with their recording and streaming permissions and exclusions, one line per person
    + Fields: Person name, published name, primary email, attendance type, participant status, permission to stream, exclusions for streaming, permission to record, exclusions to recording, schedule
    + Session data included: all scheduled sessions
    + Person data included: moderators, participants

    • From c1d50ccadffa0a2dab786c81a67a151b69c353dc Mon Sep 17 00:00:00 2001 From: dcterman <105614148+dcterman@users.noreply.github.com> Date: Wed, 3 Aug 2022 17:17:43 -0400 Subject: [PATCH 3/5] Update session_summary.vue --- app/javascript/sessions/session_summary.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/javascript/sessions/session_summary.vue b/app/javascript/sessions/session_summary.vue index a6e9ec30d..f2a1d8573 100644 --- a/app/javascript/sessions/session_summary.vue +++ b/app/javascript/sessions/session_summary.vue @@ -93,7 +93,7 @@ switch v-model="session.streamed" @change="saveSession()" - >Will be live-streamed + >Will be livestreamed From 6ddc3ca60c19d56bbbfd4f7742afafdb9f452ecc Mon Sep 17 00:00:00 2001 From: dcterman <105614148+dcterman@users.noreply.github.com> Date: Wed, 3 Aug 2022 17:19:08 -0400 Subject: [PATCH 4/5] Another instance of live-streamed hyphen removed --- app/javascript/sessions/session_sidebar.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/javascript/sessions/session_sidebar.vue b/app/javascript/sessions/session_sidebar.vue index 76d8c05ee..ca8f1df31 100644 --- a/app/javascript/sessions/session_sidebar.vue +++ b/app/javascript/sessions/session_sidebar.vue @@ -76,7 +76,7 @@ switch v-model="selected.streamed" disabled - >Will be live-streamed + >Will be livestreamed From deb7d1bf671d45dd9c9cf63287e3bc9fabbe6631 Mon Sep 17 00:00:00 2001 From: dcterman <105614148+dcterman@users.noreply.github.com> Date: Wed, 3 Aug 2022 20:24:43 -0400 Subject: [PATCH 5/5] Comment out non-functional admin publish --- app/javascript/schedule/schedule_settings.vue | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/app/javascript/schedule/schedule_settings.vue b/app/javascript/schedule/schedule_settings.vue index fa8386d89..166d1cab2 100644 --- a/app/javascript/schedule/schedule_settings.vue +++ b/app/javascript/schedule/schedule_settings.vue @@ -2,7 +2,6 @@
    -
    Release schedule to participants
    @@ -16,10 +15,9 @@ Reset for Testing THIS DELETES THE SNAPSHOT AND YOU CAN'T EVER GET IT BACK
    -
    -
    + {{SCHEDULE_DRAFT_CONFIRM_MESSAGE}}