Skip to content

Add an oldest item column to overdue items report #2190

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
jim merged 1 commit into from
Jun 24, 2026
+15 −2
Merged

Add an oldest item column to overdue items report #2190

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 5 additions & 0 deletions Gemfile.lock
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -229,6 +229,7 @@ GEM
net-http-persistent (>= 4.0.4, < 5)
faraday-retry (2.3.2)
faraday (~> 2.0)
ffi (1.17.3-aarch64-linux-gnu)
ffi (1.17.3-arm64-darwin)
ffi (1.17.3-x86_64-darwin)
ffi (1.17.3-x86_64-linux-gnu)
Expand Down Expand Up @@ -363,6 +364,8 @@ GEM
net-smtp (0.5.1)
net-protocol
nio4r (2.7.5)
nokogiri (1.19.3-aarch64-linux-gnu)
racc (~> 1.4)
nokogiri (1.19.3-arm64-darwin)
racc (~> 1.4)
nokogiri (1.19.3-x86_64-darwin)
Expand Down Expand Up @@ -400,6 +403,7 @@ GEM
parser (3.3.10.1)
ast (~> 2.4.1)
racc
pg (1.6.3-aarch64-linux)
pg (1.6.3-arm64-darwin)
pg (1.6.3-x86_64-darwin)
pg (1.6.3-x86_64-linux)
Expand Down Expand Up @@ -618,6 +622,7 @@ GEM
zlib (3.2.3)

PLATFORMS
aarch64-linux
arm64-darwin-22
arm64-darwin-23
arm64-darwin-24
Expand Down
5 changes: 3 additions & 2 deletions app/controllers/admin/reports/members_with_overdue_loans_controller.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,15 +42,16 @@ def build_query

def build_csv(members)
CSV.generate(headers: true) do |csv|
csv << %w[preferred_name full_name email phone_number overdue_tools]
csv << %w[preferred_name full_name email phone_number overdue_tools oldest_item_due_date]

members.find_each do |member|
csv << [
member.preferred_name,
member.full_name,
member.user.email,
member.phone_number,
member.overdue_loans.map { |loan| "#{loan.item.name} (#{time_ago_in_words(loan.due_at)})" }.join(", ")
member.overdue_loans.map { |loan| "#{loan.item.name} (#{time_ago_in_words(loan.due_at)})" }.join(", "),
member.overdue_loan_min.to_fs(:short_date)
]
end
end
Expand Down
4 changes: 4 additions & 0 deletions app/views/admin/reports/members_with_overdue_loans/index.html.erb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,7 @@
<th>Overdue Tools</th>
<th>Email</th>
<th>Phone</th>
<th>Oldest Item Due Date</th>
</tr>
<% @members.each do |member| %>
<tr>
Expand All @@ -45,6 +46,9 @@
<td>
<%= format_phone_number(member.phone_number) %>
</td>
<td>
<%= member.overdue_loan_min.to_fs(:short_date) %>
</td>
</tr>
<% end %>
</table>
Expand Down
3 changes: 3 additions & 0 deletions test/system/admin/reports/members_with_overdue_items_test.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,6 +44,9 @@ class AdminMembersWithOverdueItemsTest < ApplicationSystemTestCase
assert_text loan.item.name
assert_text time_ago_in_words(loan.due_at)
end

oldest_due_at = member.overdue_loans.map(&:due_at).min
assert_text oldest_due_at.to_fs(:short_date)
end
assert_equal 3, all("tr").size # 2 for members, 1 for the header
end
Expand Down
Loading