productions

work-design · Sep 8, 2024 · cb67e29 · cb67e29
1 parent 7ce60bc
commit cb67e29
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 3 deletions.
diff --git a/app/controllers/factory/admin/component_parts_controller.rb b/app/controllers/factory/admin/component_parts_controller.rb
@@ -5,7 +5,8 @@ class Admin::ComponentPartsController < Admin::BaseController
     before_action :set_new_component_part, only: [:new, :create]
 
     def index
-      @component_parts = @component.component_parts.order(part_id: :asc).page(params[:page])
+      @component_parts = @component.component_parts.order(part_id: :asc)
+      @productions = @component.part_taxon.productions.where.not(id: @component_parts.pluck(:part_id)).includes(:product)
     end
 
     private

diff --git a/app/views/factory/admin/component_parts/_index/_product_tr.html.erb b/app/views/factory/admin/component_parts/_index/_product_tr.html.erb
@@ -8,4 +8,3 @@
     </div>
   </td>
 </tr>
-<%= render partial: 'production', layout: 'production_tr', collection: model.productions, as: :model %>
diff --git a/app/views/factory/admin/component_parts/index.html.erb b/app/views/factory/admin/component_parts/index.html.erb
@@ -11,5 +11,8 @@
 <% end %>
 
 <%= render layout: 'product_table' do %>
-  <%= render partial: 'product_tbody', layout: 'product_tr', collection: @component.part_taxon.products, as: :model %>
+  <% @productions.group_by(&:product).each do |product, productions| %>
+    <%= render partial: 'product_tbody', layout: 'product_tr', locals: { model: product } %>
+    <%= render partial: 'production', layout: 'production_tr', collection: productions, as: :model %>
+  <% end %>
 <% end %>
-Original file line number
+Diff line change
@@ Expand Up / @@ -8,4 +8,3 @@ @@
         </div>
       </td>
     </tr>
-    <%= render partial: 'production', layout: 'production_tr', collection: model.productions, as: :model %>