Skip to content

Commit d1c27f3

Browse files
Merge pull request #5399 from Tyler-Fanuele/5372AlignmentNudges3
5372 alignment nudges3
2 parents 0195dfb + 2fda2d3 commit d1c27f3

File tree

1 file changed

+15
-14
lines changed

1 file changed

+15
-14
lines changed
Lines changed: 15 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -1,24 +1,25 @@
11
<% num_locations = event.data.storage_locations.length %>
2-
<% event.data.storage_locations.values.each_with_index do |loc, loc_index| %>
3-
<tr style="background-color: #e9e4f3;">
4-
<% if loc_index == 0 %>
5-
<td rowspan="<%= num_locations %>"><%= event.id %></td>
6-
<td rowspan="<%= num_locations %>">Snapshot</td>
7-
<td rowspan="<%= num_locations %>"></td>
8-
<td rowspan="<%= num_locations %>"><%= event.event_time.to_s %></td>
9-
<% end %>
10-
<td colspan="2">
2+
3+
<tr style="background-color: #e9e4f3;">
4+
<td><%= event.user&.name || "No Name Provided" %></td>
5+
<td>Snapshot</td>
6+
<td>&nbsp;</td>
7+
<td><%= event.event_time.to_s %></td>
8+
<td>
9+
<% event.data.storage_locations.values.each_with_index do |loc, loc_index| %>
1110
<%= link_to storage_locs.find { |i| i.id == loc.id}.name, storage_location_path(loc.id) %>
12-
<td>
1311
<% loc.items.values.each do |entry| %>
1412
<% item = items.find { |i| i.id == entry.item_id} %>
1513
<% if item %>
1614
<%= link_to items.find { |i| i.id == entry.item_id}.name, item_path(entry.item_id) %>:
1715
<% else %>
1816
Item <%= entry.item_id %> (deleted)
1917
<% end %>
20-
<%= entry.quantity %><br>
18+
<%= entry.quantity %>
2119
<% end %>
22-
</td>
23-
</tr>
24-
<% end %>
20+
<br>
21+
<% end %>
22+
</td>
23+
<td>&nbsp;</td>
24+
<td>&nbsp;</td>
25+
</tr>

0 commit comments

Comments
 (0)