From 62d8d7e76e870830d1187bd9873777fb70d5fc60 Mon Sep 17 00:00:00 2001 From: Annika Stein Date: Mon, 4 Mar 2024 12:08:28 +0100 Subject: [PATCH] Add created_at to registration export csv (#9011) * Add created_at to registration export csv * Change spec factory and test case for csv registration export * typo, ooops --- WcaOnRails/app/views/registrations/export.csv.erb | 3 ++- WcaOnRails/spec/factories/registrations.rb | 1 + WcaOnRails/spec/views/registrations/export.csv.erb_spec.rb | 5 +++-- 3 files changed, 6 insertions(+), 3 deletions(-) diff --git a/WcaOnRails/app/views/registrations/export.csv.erb b/WcaOnRails/app/views/registrations/export.csv.erb index 77f61458433..65a764b5a8e 100644 --- a/WcaOnRails/app/views/registrations/export.csv.erb +++ b/WcaOnRails/app/views/registrations/export.csv.erb @@ -1,5 +1,5 @@ <% require 'csv' %> -<% headers = ["Status", "Name", "Country", "WCA ID", "Birth Date", "Gender" ] + @competition.events.map(&:id) + [ "Email", "Guests", "IP" ] %> +<% headers = ["Status", "Name", "Country", "WCA ID", "Birth Date", "Gender" ] + @competition.events.map(&:id) + [ "Email", "Guests", "IP", "Registration Date Time (UTC)" ] %> <%= CSV.generate_line(headers).html_safe -%> <% @registrations.each do |registration| %> <%= CSV.generate_line([ @@ -13,5 +13,6 @@ registration.email, registration.guests, registration.ip, + registration.created_at, ]).html_safe -%> <% end %> diff --git a/WcaOnRails/spec/factories/registrations.rb b/WcaOnRails/spec/factories/registrations.rb index 96a874a3083..58158ea7c64 100644 --- a/WcaOnRails/spec/factories/registrations.rb +++ b/WcaOnRails/spec/factories/registrations.rb @@ -6,6 +6,7 @@ association :user, factory: [:user, :wca_id] guests { 10 } comments { "" } + created_at { Time.now } administrative_notes { "" } transient do events { competition.events } diff --git a/WcaOnRails/spec/views/registrations/export.csv.erb_spec.rb b/WcaOnRails/spec/views/registrations/export.csv.erb_spec.rb index e01f62ba936..f77519ffec6 100644 --- a/WcaOnRails/spec/views/registrations/export.csv.erb_spec.rb +++ b/WcaOnRails/spec/views/registrations/export.csv.erb_spec.rb @@ -17,6 +17,7 @@ :registration, competition: competition, accepted_at: Time.now, + created_at: Time.utc(2014, 3, 14, 15, 16, 17), user: user, competition_events: [competition.competition_events.find_by!(event_id: "333")], guests: 1, @@ -29,7 +30,7 @@ assign(:registrations, competition.registrations) render - expect(rendered).to eq "Status,Name,Country,WCA ID,Birth Date,Gender,333,333oh,Email,Guests,IP\na,Bob,USA,,1990-01-01,m,1,0,bob@bob.com,1,\"\"\n" + expect(rendered).to eq "Status,Name,Country,WCA ID,Birth Date,Gender,333,333oh,Email,Guests,IP,Registration Date Time (UTC)\na,Bob,USA,,1990-01-01,m,1,0,bob@bob.com,1,\"\",2014-03-14 15:16:17 UTC\n" end it "renders null (missing) gender as empty string" do @@ -39,6 +40,6 @@ assign(:registrations, competition.registrations) render - expect(rendered).to eq "Status,Name,Country,WCA ID,Birth Date,Gender,333,333oh,Email,Guests,IP\na,Bob,USA,,1990-01-01,,1,0,bob@bob.com,1,\"\"\n" + expect(rendered).to eq "Status,Name,Country,WCA ID,Birth Date,Gender,333,333oh,Email,Guests,IP,Registration Date Time (UTC)\na,Bob,USA,,1990-01-01,,1,0,bob@bob.com,1,\"\",2014-03-14 15:16:17 UTC\n" end end