Skip to content

Commit

Permalink
Merge pull request #4597 from norrismei/fix-distributions-labels
Browse files Browse the repository at this point in the history
Fix distributions labels
  • Loading branch information
cielf authored Aug 21, 2024
2 parents c2782e7 + 2334ca9 commit 88281d6
Showing 1 changed file with 8 additions and 8 deletions.
16 changes: 8 additions & 8 deletions app/views/distributions/index.html.erb
Original file line number Diff line number Diff line change
Expand Up @@ -38,17 +38,17 @@
<div class="row">
<% if @items.present? %>
<div class="form-group col-lg-2 col-md-2 col-sm-6 col-xs-12">
<%= filter_select(label: "Filter by item", scope: :by_item_id, collection: @items, selected: @selected_item) %>
<%= filter_select(label: "Filter by Item", scope: :by_item_id, collection: @items, selected: @selected_item) %>
</div>
<% end %>
<% if @item_categories.present? %>
<div class="form-group col-lg-2 col-md-2 col-sm-6 col-xs-12">
<%= filter_select(label: "Filter by item category", scope: :by_item_category_id, collection: @item_categories, selected: @selected_item_category) %>
<%= filter_select(label: "Filter by Item Category", scope: :by_item_category_id, collection: @item_categories, selected: @selected_item_category) %>
</div>
<% end %>
<% if @partners.present? %>
<div class="form-group col-lg-2 col-md-2 col-sm-6 col-xs-12">
<%= filter_select(scope: :by_partner, collection: @partners, selected: @selected_partner) %>
<%= filter_select(label: "Filter by Partner", scope: :by_partner, collection: @partners, selected: @selected_partner) %>
</div>
<% end %>
<% if @storage_locations.present? %>
Expand All @@ -60,7 +60,7 @@
<%= filter_select(label: "Filter by Status", scope: :by_state, collection: @statuses, key: :last, value: :first, selected: @selected_status) %>
</div>
<div class="form-group col-lg-3 col-md-3 col-sm-6 col-xs-12">
<%= label_tag "Date Range" %>
<%= label_tag "Date Range", "Date Range" %>
<%= render partial: "shared/date_range_picker", locals: {css_class: "form-control"} %>
</div>
</div><!-- /.row -->
Expand Down Expand Up @@ -99,7 +99,7 @@
<tr>
<th>ID</th>
<th>Partner</th>
<th class="date">Inital Allocation</th>
<th class="date">Initial Allocation</th>
<th class="date">Date of Distribution</th>
<th>Source Inventory</th>
Expand All @@ -109,12 +109,12 @@
<% elsif filter_params[:by_item_category_id].present? %>
<th class="numeric">Total in <%= @item_categories.find { |ic| ic.id == filter_params[:by_item_category_id].to_i }&.name %></th>
<% else %>
<th class="numeric">Total items</th>
<th class="numeric">Total Items</th>
<% end %>
<!-- End Quantity -->
<th class="numeric">Total value</th>
<th>Delivery method</th>
<th class="numeric">Total Value</th>
<th>Delivery Method</th>
<th>Shipping Cost</th>
<th>Comments</th>
<th>State</th>
Expand Down

0 comments on commit 88281d6

Please sign in to comment.