Merge pull request #1545 from YaleSTC/1499_clean_up_1337

[1499] Clean up #1337

app/controllers/categories_controller.rb

@@ -27,6 +27,14 @@ def index
   end
 
   def show
+    respond_to do |format|
+      format.html
+      format.zip do
+        models = @category.equipment_models
+        items = EquipmentItem.where(equipment_model_id: models.all.map(&:id))
+        download_equipment_data(cats: [@category], models: models, items: items)
+      end
+    end
   end
 
   def new

app/controllers/equipment_items_controller.rb

@@ -1,3 +1,4 @@
+# rubocop:disable Metrics/ClassLength
 class EquipmentItemsController < ApplicationController
   load_and_authorize_resource
   decorates_assigned :equipment_item
@@ -7,6 +8,7 @@ class EquipmentItemsController < ApplicationController
   before_action :set_equipment_model_if_possible, only: [:index, :new]
 
   include ActivationHelper
+  include CsvExport
   include Calendarable
 
   # ---------- before filter methods ---------- #
@@ -29,6 +31,10 @@ def index
     else
       @equipment_items = EquipmentItem.send(method)
     end
+    respond_to do |format|
+      format.html
+      format.zip { download_equipment_data }
+    end
   end
 
   def show

app/controllers/equipment_models_controller.rb

@@ -10,6 +10,7 @@ class EquipmentModelsController < ApplicationController
   before_action :set_category_if_possible, only: [:index, :new]
 
   include ActivationHelper
+  include CsvExport
   include Calendarable
 
   # --------- before filter methods --------- #

app/views/categories/index.html.erb

@@ -22,7 +22,7 @@
       <td><%= intify category.max_checkout_length %></td>
       <td><%= category.sort_order %></td>
       <% if can? :manage, Category %>
-       <td><%= link_to "Edit", edit_category_path(category), :class => "btn btn-default" %></td>
+       <td><%= link_to "Edit", edit_category_path(category), class:  "btn btn-default" %></td>
        <td><%= category.decorate.make_deactivate_btn %></td>
       <% end %>
     </tr>
@@ -32,12 +32,12 @@
 <hr />
 
 <% if can? :manage, Category %>
-  <%= link_to "New Category", new_category_path, :class => "btn btn-primary" %>
-  <%= link_to "Import Categories", equip_import_page_path, :class => "btn btn-default" %>
-  <%= link_to "Export Equipment Data", categories_path(format: 'zip'), :class => "btn btn-default" %>
+  <%= link_to "New Category", new_category_path, class:  "btn btn-primary" %>
+  <%= link_to "Import Categories", equip_import_page_path, class:  "btn btn-default" %>
+  <%= link_to "Export Equipment Data", categories_path(format: 'zip'), class:  "btn btn-default" %>
 <% end %>
 <% if params[:show_deleted] %>
-  <%= link_to "Hide Old Categories from List", categories_path, :class => "btn btn-default" %>
+  <%= link_to "Hide Old Categories from List", categories_path, class:  "btn btn-default" %>
 <% else %>
-  <%= link_to "Show Old Categories in List", categories_path(:show_deleted => true), :class => "btn btn-default" %>
+  <%= link_to "Show Old Categories in List", categories_path(:show_deleted => true), class:  "btn btn-default" %>
 <% end %>

app/views/categories/show.html.erb

@@ -58,5 +58,6 @@
   <%= link_to "#{@category.name} Reservations Calendar", calendar_category_path(@category), class: 'btn btn-default' %>
   <%= link_to "Edit Category", edit_category_path(@category), class: 'btn btn-default' %>
   <%= category.make_deactivate_btn %>
+  <%= link_to "Export Category Data", category_path(@category, format: 'zip'), class: 'btn btn-default' %>
   <%= link_to "View All Categories", categories_path, class: 'btn btn-default' %>
 <% end %>

app/views/equipment_items/index.html.erb

@@ -31,7 +31,7 @@
       </td>
 
       <% if can? :manage, EquipmentItem %>
-        <td><%= link_to "Edit", edit_equipment_item_path(equipment_item), :class => "btn btn-default" %></td>
+        <td><%= link_to "Edit", edit_equipment_item_path(equipment_item), class:  "btn btn-default" %></td>
         <td><%= equipment_item.decorate.make_deactivate_btn %></td>
       <% end %>
     </tr>
@@ -48,7 +48,7 @@
   <% else %>
     <%= link_to "New Equipment Item", new_equipment_item_path, class: 'btn btn-primary' %>
     <%= link_to "Import Equipment Item", equip_import_page_path, class: 'btn btn-default' %>
-    <%= link_to "Export Equipment Data", categories_path(format: 'zip'), :class => "btn btn-default" %>
+    <%= link_to "Export Equipment Data", equipment_items_path(format: 'zip'), class: "btn btn-default" %> 
   <% end %>
 
   <% if params[:show_deleted] %>

app/views/equipment_models/index.html.erb

@@ -5,27 +5,29 @@
 <hr>
 <% if can? :manage, EquipmentModel %>
   <% if @category %>
-    <%= link_to "New #{@category.name.singularize}", new_category_equipment_model_path(@category), :class => 'btn btn-primary' %>
+    <%= link_to "New #{@category.name.singularize}", new_category_equipment_model_path(@category), class:  'btn btn-primary' %>
     <%= link_to "#{@category.name} Reservations Calendar", calendar_category_path(@category), class: 'btn btn-default' %>
-    <%= link_to "View All Equipment Models", equipment_models_path, :class => 'btn btn-default' %>
+    <%= link_to "View All Equipment Models", equipment_models_path, class:  'btn btn-default' %>
+    <%= link_to "Import Equipment Models", equip_import_page_path, class:  "btn btn-default" %>
+    <%= link_to "Export Equipment Data", category_path(@category, format: 'zip'), class:  "btn btn-default" %>
   <% else %>
-    <%= link_to "New Equipment Model", new_equipment_model_path, :class => "btn btn-primary" %>
-    <%= link_to "Import Equipment Models", equip_import_page_path, :class => "btn btn-default" %>
-    <%= link_to "Export Equipment Data", categories_path(format: 'zip'), :class => "btn btn-default" %>
+    <%= link_to "New Equipment Model", new_equipment_model_path, class:  "btn btn-primary" %>
+    <%= link_to "Import Equipment Models", equip_import_page_path, class:  "btn btn-default" %>
+    <%= link_to "Export Equipment Data", equipment_models_path(format: 'zip'), class:  "btn btn-default" %>
   <% end %>
   <% if params[:show_deleted] %>
     <% if (@category.nil?) %>
-      <%= link_to "Hide Deactivated Models", equipment_models_path, :class => "btn btn-default" %>
+      <%= link_to "Hide Deactivated Models", equipment_models_path, class:  "btn btn-default" %>
     <% else %>
-      <%= link_to "Hide Deactivated Models", category_equipment_models_path(@category), :class => "btn btn-default" %>
+      <%= link_to "Hide Deactivated Models", category_equipment_models_path(@category), class:  "btn btn-default" %>
     <% end %>
   <% else %>
     <% if (@category.nil?) %>
-      <%= link_to "Show Deactivated Models", equipment_models_path(show_deleted: true), :class => "btn btn-default" %>
+      <%= link_to "Show Deactivated Models", equipment_models_path(show_deleted: true), class:  "btn btn-default" %>
     <% else %>
-      <%= link_to "Show Deactivated Models", category_equipment_models_path(@category, show_deleted: true), :class => "btn btn-default" %>
+      <%= link_to "Show Deactivated Models", category_equipment_models_path(@category, show_deleted: true), class:  "btn btn-default" %>
     <% end %>
   <% end %>
 <% else %>
-  <%= link_to "Return to Catalog", catalog_path, :class => 'btn btn-default' %>
+  <%= link_to "Return to Catalog", catalog_path, class:  'btn btn-default' %>
 <% end %>

config/routes.rb

@@ -23,8 +23,7 @@
   resources :documents,
             :requirements
 
-  resources :equipment_items, except: [:index],
-                              concerns: [:deactivatable, :calendarable]
+  resources :equipment_items, concerns: [:deactivatable, :calendarable]
 
   resources :announcements, except: [:show]
 

lib/csv_export.rb

@@ -59,15 +59,13 @@ def download_zip(tables, filename)
   end
 
   # NOTE: this method depends on ActionController
-  def download_equipment_data
-    categories = [Category.all, %w(name max_per_user max_checkout_length
-                                   max_renewal_times max_renewal_length
-                                   renewal_days_before_due sort_order)]
-    models = [EquipmentModel.all, %w(category name description late_fee
-                                     replacement_fee max_per_user
-                                     max_renewal_length)]
-    items = [EquipmentItem.all, %w(equipment_model name serial)]
-    download_zip([categories, models, items],
-                 "EquipmentData_#{Time.zone.now.to_s(:number)}")
+  def download_equipment_data(cats: Category.all, models: EquipmentModel.all,
+                              items: EquipmentItem.all)
+    c = [cats, %w(name max_per_user max_checkout_length max_renewal_times
+                  max_renewal_length renewal_days_before_due sort_order)]
+    m = [models, %w(category name description late_fee replacement_fee
+                    max_per_user max_renewal_length)]
+    i = [items, %w(equipment_model name serial)]
+    download_zip([c, m, i], "EquipmentData_#{Time.zone.now.to_s(:number)}")
   end
 end