From 1f6a66e13c4fc024aa6c99e277aa4abc6b890695 Mon Sep 17 00:00:00 2001 From: Norris Mei Date: Thu, 15 Aug 2024 21:21:01 -0700 Subject: [PATCH 1/4] Fix typo --- app/views/distributions/index.html.erb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/views/distributions/index.html.erb b/app/views/distributions/index.html.erb index 6466784bd1..fa99743927 100644 --- a/app/views/distributions/index.html.erb +++ b/app/views/distributions/index.html.erb @@ -99,7 +99,7 @@ ID Partner - Inital Allocation + Initial Allocation Date of Distribution Source Inventory From b7c8a5541ba09727a34e3d6dda84faa6cfee0c23 Mon Sep 17 00:00:00 2001 From: Norris Mei Date: Thu, 15 Aug 2024 21:22:37 -0700 Subject: [PATCH 2/4] Update state to status --- app/views/distributions/index.html.erb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/views/distributions/index.html.erb b/app/views/distributions/index.html.erb index fa99743927..0dc9b285c2 100644 --- a/app/views/distributions/index.html.erb +++ b/app/views/distributions/index.html.erb @@ -117,7 +117,7 @@ Delivery method Shipping Cost Comments - State + Status Actions From 310f623a1e3098358bfa24a0c69f1cba281ca527 Mon Sep 17 00:00:00 2001 From: Norris Mei Date: Thu, 15 Aug 2024 21:35:11 -0700 Subject: [PATCH 3/4] Make capitalization consistent --- app/views/distributions/index.html.erb | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/app/views/distributions/index.html.erb b/app/views/distributions/index.html.erb index 0dc9b285c2..42da475824 100644 --- a/app/views/distributions/index.html.erb +++ b/app/views/distributions/index.html.erb @@ -38,17 +38,17 @@
<% if @items.present? %>
- <%= 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) %>
<% end %> <% if @item_categories.present? %>
- <%= 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) %>
<% end %> <% if @partners.present? %>
- <%= filter_select(scope: :by_partner, collection: @partners, selected: @selected_partner) %> + <%= filter_select(label: "Filter by Partner", scope: :by_partner, collection: @partners, selected: @selected_partner) %>
<% end %> <% if @storage_locations.present? %> @@ -60,7 +60,7 @@ <%= filter_select(label: "Filter by Status", scope: :by_state, collection: @statuses, key: :last, value: :first, selected: @selected_status) %>
- <%= label_tag "Date Range" %> + <%= label_tag "Date Range", "Date Range" %> <%= render partial: "shared/date_range_picker", locals: {css_class: "form-control"} %>
@@ -109,12 +109,12 @@ <% elsif filter_params[:by_item_category_id].present? %> Total in <%= @item_categories.find { |ic| ic.id == filter_params[:by_item_category_id].to_i }&.name %> <% else %> - Total items + Total Items <% end %> - Total value - Delivery method + Total Value + Delivery Method Shipping Cost Comments Status From 7cba987b6715fd6bf37602b28b09e978ae26d62e Mon Sep 17 00:00:00 2001 From: Norris Mei Date: Fri, 16 Aug 2024 20:17:03 -0700 Subject: [PATCH 4/4] Revert status back to state --- app/views/distributions/index.html.erb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/views/distributions/index.html.erb b/app/views/distributions/index.html.erb index 42da475824..d0b7a55b96 100644 --- a/app/views/distributions/index.html.erb +++ b/app/views/distributions/index.html.erb @@ -117,7 +117,7 @@ Delivery Method Shipping Cost Comments - Status + State Actions