Skip to content

views: Items#show: Use <DL/> for item info #4

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
awilfox merged 1 commit into from
Dec 2, 2025
Merged

views: Items#show: Use <DL/> for item info #4

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
66 changes: 29 additions & 37 deletions app/views/items/show.html.erb
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,55 +1,47 @@
<h1>Item history</h1>

<h2>Current values</h2>
<div class="form-group row">
<h5 class="col-2">Date found</h5>
<div class="col-4"><%= @item.date_found.strftime('%m/%d/%Y') %></div>
</div>
<div class="form-group row">
<h5 class="col-2">Time found</h5>
<div class="col-4"><%= @item.datetime_found&.strftime('%l:%M %P') || 'None' %></div>
</div>

<div class="form-group row">
<h5 class="col-2">Found by</h5>
<div class="col-4"><%= @item.found_by || 'No one' %></div>
</div>
<dl class="row">
<dt class="col-2">Date found</dt>
<dd class="col-4"><%= @item.date_found.strftime('%m/%d/%Y') %></dd>

<div class="form-group row">
<h5 class="col-2">Item location</h5>
<div class="col-4"><%= @item.location %></div>
</div>
<dt class="col-2">Time found</dt>
<dd class="col-4"><%= @item.datetime_found&.strftime('%l:%M %P') || 'None' %></dd>

<div class="form-group row">
<h5 class="col-2">Type of item</h5>
<div class="col-4"><%= @item.item_type %></div>
</div>
<dt class="col-2">Found by</dt>
<dd class="col-4"><%= @item.found_by || 'No one' %></dd>

<div class="form-group row">
<h5 class="col-2">Item description</h5>
<div class="col-4"><%= @item.description %></div>
</div>
<dt class="col-2">Item location</dt>
<dd class="col-4"><%= @item.location %></dd>

<div class="form-group row">
<h5 class="col-2">Item image</h5>
<dt class="col-2">Type of item</dt>
<dd class="col-4"><%= @item.item_type %></dd>

<dt class="col-2">Item description</dt>
<dd class="col-4"><%= @item.description %></dd>

<dt class="col-2">Item image</dt>
<dd class="col-4">
<% if @item.image.attached? %>
<img class="preview_image" alt="image of item" src="<%= (url_for(@item.image)) %>">
<% else %>
<div class="col-4">No image</div>
No image
<% end %>
</div>
<div class="form-group row">
<h5 class="col-2">Last updated by</h5>
<div class="col-4"><%= @item.updated_by || 'None' %></div>
</div>
<div class="form-group row">
<h5 class="col-2">Last updated</h5>
</dd>

<dt class="col-2">Last updated by</dt>
<dd class="col-4"><%= @item.updated_by || 'None' %></dd>

<dt class="col-2">Last updated</dt>
<dd class="col-4">
<% if @item.updated_at != @item.created_at %>
<div class="col-4"><%= @item.updated_at.in_time_zone.strftime('%m/%d/%Y %l:%M %P') %></div>
<%= @item.updated_at.in_time_zone.strftime('%m/%d/%Y %l:%M %P') %>
<% else %>
<div class="col-4">None</div>
None
<% end %>
</div>
</dd>
</dl>

<h2>Change history</h2>
<table class="table mt-5">
Expand Down
2 changes: 1 addition & 1 deletion spec/views/items/show.html.erb_spec.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -70,7 +70,7 @@

it 'renders that the item has not been updated' do
render
expect(rendered).to have_content "Last updated\n None"
expect(rendered).to have_content(/Last updated\s+None/i)
end
end
end