diff --git a/app/controllers/submission_events_controller.rb b/app/controllers/submission_events_controller.rb index 044b9319..e493bd95 100644 --- a/app/controllers/submission_events_controller.rb +++ b/app/controllers/submission_events_controller.rb @@ -24,9 +24,10 @@ class SubmissionEventsController < ApplicationController # rubocop:disable Metrics def index submitters = @submission.submitters + submitters_uuids = (@submission.template_submitters || @submission.template.submitters).pluck('uuid') - @events_data = @submission.submission_events.sort_by(&:event_timestamp).map do |event| + @events_data = @submission.submission_events.order(:event_timestamp).map do |event| submitter = submitters.find { |e| e.id == event.submitter_id } submitter_name = if event.event_type.include?('sms') || event.event_type.include?('phone') diff --git a/app/views/submission_events/index.html.erb b/app/views/submission_events/index.html.erb index 00392cbf..31f184fe 100644 --- a/app/views/submission_events/index.html.erb +++ b/app/views/submission_events/index.html.erb @@ -1,15 +1,15 @@ -<% event_colors = %w[bg-red-200 bg-sky-200 bg-emerald-200 bg-yellow-300 bg-purple-200 bg-pink-200 bg-cyan-200 bg-orange-200 bg-lime-200 bg-indigo-200] %> +<% event_colors = %w[bg-red-200 bg-sky-200 bg-emerald-200 bg-yellow-200 bg-purple-200 bg-pink-200 bg-cyan-200 bg-orange-200 bg-lime-200 bg-indigo-200] %> <%= render 'shared/turbo_modal_large', title: t('event_log') do %>
+
<%= l(@submission.created_at.in_time_zone(current_account.timezone), format: :long, locale: current_account.locale) %>
-+
<% if @submission.source == 'invite' %> <%= t('submission_created_by_email_invite_html', email: @submission.created_by_user.email) %> <% elsif @submission.created_by_user %> @@ -21,14 +21,14 @@
+
<%= l(row[:timestamp], format: :long, locale: current_account.locale) %>
-+
<%= row[:text] %>