diff --git a/app/controllers/reports/program_ops_reports_controller.rb b/app/controllers/reports/program_ops_reports_controller.rb index 4ad1e7e18..9305f5107 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, @@ -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 @@ -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..f15088be5 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

    @@ -379,14 +379,14 @@ 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

    •  
    - Participants and Do Not Assign With + User Privileges User Privileges

    Description: Login (primary email) listing, one line per person
    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}