From bbac2d2e28ec9b0d18a6a9f9ce95aec805a38c0d Mon Sep 17 00:00:00 2001 From: Henry Date: Tue, 23 Aug 2022 18:49:18 -0400 Subject: [PATCH 1/5] PLAN-752 fix the email col --- app/controllers/reports/program_ops_reports_controller.rb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/app/controllers/reports/program_ops_reports_controller.rb b/app/controllers/reports/program_ops_reports_controller.rb index 4ad1e7e18..e44e469b3 100644 --- a/app/controllers/reports/program_ops_reports_controller.rb +++ b/app/controllers/reports/program_ops_reports_controller.rb @@ -89,7 +89,7 @@ def session_minors filename: "SessionAndMinors-#{Time.now.strftime('%m-%d-%Y')}.xlsx", disposition: 'attachment' end - + def user_privileges authorize Person, policy_class: Reports::ProgramOpsReportPolicy @@ -111,7 +111,7 @@ def user_privileges people.each do |person| worksheet.append_row( [ - person.primary_email, + person.primary_email&.email, person.published_name, person.convention_roles.collect{|r| r.role}.join(', '), person.current_sign_in_at ? FastExcel.date_num(person.current_sign_in_at, person.current_sign_in_at.in_time_zone.utc_offset) : nil, From 2a9fcbc6e8efb85591c6c7c3f0dd7046f1ab3410 Mon Sep 17 00:00:00 2001 From: Henry Date: Tue, 23 Aug 2022 20:50:21 -0400 Subject: [PATCH 2/5] PLAN-755 fix error with area in audit --- app/models/session_area.rb | 3 ++- app/services/change_service.rb | 1 + 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/app/models/session_area.rb b/app/models/session_area.rb index 305ba59d6..7d6384df4 100644 --- a/app/models/session_area.rb +++ b/app/models/session_area.rb @@ -7,5 +7,6 @@ class SessionArea < ApplicationRecord accepts_nested_attributes_for :area - has_paper_trail versions: { class_name: 'Audit::SessionVersion' }, ignore: [:updated_at, :created_at, :lock_version] + # We do not really need to audo this + # has_paper_trail versions: { class_name: 'Audit::SessionVersion' }, ignore: [:updated_at, :created_at, :lock_version] end diff --git a/app/services/change_service.rb b/app/services/change_service.rb index cdd2bc6a9..cd9c57944 100644 --- a/app/services/change_service.rb +++ b/app/services/change_service.rb @@ -65,6 +65,7 @@ def self.assignments_as_of(session_id:, to:) def self.assignments_for(session_id:, role_id:, to:) audits = Audit::SessionVersion .where_object(session_id: session_id) + .where(item_type: 'SessionAssignment') .where("created_at <= ?", to) .order("created_at desc") grouped_audits = audits.group_by {|a| a.item_id} From 7ba5c7d59d32b3809578381a49d03812015e2803 Mon Sep 17 00:00:00 2001 From: dcterman <105614148+dcterman@users.noreply.github.com> Date: Tue, 23 Aug 2022 20:59:17 -0400 Subject: [PATCH 3/5] PLAN-751 and PLAN-754 fix wording reports Menu and descriptions: --title of User Privileges for staff --add S to Session and Minors --Room Signs has separate columns for mods & participants --Mismatched Sessions: person with "in person" att type is only incompatible with "virtual" session (not hybrid) --extra word Sessions in Mismatched Sessions report --- app/javascript/reports/reports_screen.vue | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/app/javascript/reports/reports_screen.vue b/app/javascript/reports/reports_screen.vue index 4f1eac4ba..fe408fb82 100644 --- a/app/javascript/reports/reports_screen.vue +++ b/app/javascript/reports/reports_screen.vue @@ -118,12 +118,12 @@

  • - Participants with Mismatching Sessions Session Environments and Attendance Types + Participants with Mismatching Session Environments and Attendance Types

    Description: Participants whose attendance type does not match the session environment for sessions they are assigned to, one line per participant and session
    Fields: Published name, primary email, attendance type, participant status, session title, session room, session start time, session environment
    Session data included: all scheduled sessions
    - Person data included: moderators and participants with attendance type of "virtual" assigned to session with environment of "hybrid" or "in person", or with attendance type of "in person" assigned to session with environment of "hybrid" or "virtual" + Person data included: moderators and participants with attendance type of "virtual" assigned to session with environment of "hybrid" or "in person", or with attendance type of "in person" assigned to session with environment of "virtual"

    • @@ -350,7 +350,7 @@

  • - Session and Minors + Sessions and Minors

    Description: Minors participation and attendee age restrictions, one line per session
    Fields: Session title, session description, session start time, session room, attendee age restriction, minors participation
    @@ -361,7 +361,7 @@ Room Sign Data for Mail Merge

    Description: Room sign data for mail merge, one line per room and day of week
    - Fields: Room, day of week, sessions (title, start time, description, participant list with moderators)
    + Fields: Room, day of week, sessions (title, start time, description, moderators, participants)
    Session data included: all published sessions
    Person data included: moderators, participants

    @@ -386,7 +386,7 @@
    •  
    - Participants and Do Not Assign With + User Privileges User Privileges

    Description: Login (primary email) listing, one line per person
    From 1565ccccf98f6828de29d55a66e8eb69d22a989f Mon Sep 17 00:00:00 2001 From: dcterman <105614148+dcterman@users.noreply.github.com> Date: Tue, 23 Aug 2022 21:03:30 -0400 Subject: [PATCH 4/5] Correct spelling of ops report download files Download files for User Privileges and Sessions Requiring Signups have typos. --- app/controllers/reports/program_ops_reports_controller.rb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/app/controllers/reports/program_ops_reports_controller.rb b/app/controllers/reports/program_ops_reports_controller.rb index 4ad1e7e18..3bc785187 100644 --- a/app/controllers/reports/program_ops_reports_controller.rb +++ b/app/controllers/reports/program_ops_reports_controller.rb @@ -122,7 +122,7 @@ def user_privileges end send_data workbook.read_string, - filename: "UserPrivlages-#{Time.now.strftime('%m-%d-%Y')}.xlsx", + filename: "UserPrivileges-#{Time.now.strftime('%m-%d-%Y')}.xlsx", disposition: 'attachment' end @@ -224,7 +224,7 @@ def sign_up_sessions end send_data workbook.read_string, - filename: "SessionRequoringSignup-#{Time.now.strftime('%m-%d-%Y')}.xlsx", + filename: "SessionRequiringSignup-#{Time.now.strftime('%m-%d-%Y')}.xlsx", disposition: 'attachment' end From 5f0d3109c7c973505acdb75b1ef6772f665e99cf Mon Sep 17 00:00:00 2001 From: Gail Terman Date: Tue, 23 Aug 2022 21:09:41 -0400 Subject: [PATCH 5/5] PLAN-664 remove empty parens from no pronouns --- app/controllers/reports/program_ops_reports_controller.rb | 4 ++-- app/javascript/reports/reports_screen.vue | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/app/controllers/reports/program_ops_reports_controller.rb b/app/controllers/reports/program_ops_reports_controller.rb index e44e469b3..f34e4a579 100644 --- a/app/controllers/reports/program_ops_reports_controller.rb +++ b/app/controllers/reports/program_ops_reports_controller.rb @@ -256,8 +256,8 @@ def table_tents pa.person.published_name, session.description, session.participant_notes, - session.published_session_assignments.role(moderator).collect{|p| "#{p.person.published_name} (#{p.person.pronouns})" }.join(",\n"), - session.published_session_assignments.role(participant).collect{|p| "#{p.person.published_name} (#{p.person.pronouns})" }.join(",\n") + session.published_session_assignments.role(moderator).collect{|p| "#{p.person.published_name}#{p.person.pronouns && !p.person.pronouns.empty? ? ' (' + p.person.pronouns + ')' : ''}" }.join(",\n"), + session.published_session_assignments.role(participant).collect{|p| "#{p.person.published_name}#{p.person.pronouns && !p.person.pronouns.empty? ? ' (' + p.person.pronouns + ')' : ''}" }.join(",\n") ] end end diff --git a/app/javascript/reports/reports_screen.vue b/app/javascript/reports/reports_screen.vue index 4f1eac4ba..aa327e3d1 100644 --- a/app/javascript/reports/reports_screen.vue +++ b/app/javascript/reports/reports_screen.vue @@ -379,7 +379,7 @@ Participant Emails and Virtual Sessions

    Description: List of emails for moderators and participants of published sessions, with indicator about whether they are assigned to any session(s) of environment virtual, one line per participant
    - Fields: Published name, name, whether person is assigned to a virtual session (y∕n), primary email, other emails
    + Fields: Published name, name, whether person is assigned to a virtual session (y ∕ n), primary email, other emails
    Session data included: all published sessions
    Person data included: moderators and participants