From e9fc9c647522a3d4722c940cd7b18d4185d43bb1 Mon Sep 17 00:00:00 2001
From: cryptogopher <git6453hub@michalczyk.pro>
Date: Thu, 22 Aug 2019 01:12:37 +0200
Subject: [PATCH] Completed UnitsController#import and Unit index view

---
 app/controllers/units_controller.rb | 12 +++++++-----
 app/views/units/index.html.erb      | 30 +++++++++++++++++++++++++++--
 config/locales/en.yml               |  2 ++
 config/routes.rb                    |  2 +-
 db/migrate/001_create_units.rb      |  1 -
 init.rb                             | 10 ++++++++--
 lib/body_tracking/project_patch.rb  |  8 ++++++++
 7 files changed, 54 insertions(+), 11 deletions(-)
 create mode 100644 lib/body_tracking/project_patch.rb

diff --git a/app/controllers/units_controller.rb b/app/controllers/units_controller.rb
index ac78ff7..eab0563 100644
--- a/app/controllers/units_controller.rb
+++ b/app/controllers/units_controller.rb
@@ -1,13 +1,10 @@
 class UnitsController < ApplicationController
-  before_action :find_project, only: [:new, :index, :create, :import]
+  before_action :find_project, only: [:index, :create, :import]
   before_action :authorize
 
-  def new
-    @unit = Unit.new
-  end
-
   def index
     @unit = Unit.new
+    @units = @project.units
   end
 
   def create
@@ -17,6 +14,11 @@ class UnitsController < ApplicationController
   end
 
   def import
+    defaults = Unit.where(project: nil).pluck(:name, :shortname)
+    missing = defaults - Unit.where(project: @project).pluck(:name, :shortname)
+    @project.units.create(missing.map { |n, s| {name: n, shortname: s} })
+
+    redirect_to project_units_url(@project)
   end
 
   private
diff --git a/app/views/units/index.html.erb b/app/views/units/index.html.erb
index 540c6ad..61f7d3f 100644
--- a/app/views/units/index.html.erb
+++ b/app/views/units/index.html.erb
@@ -3,9 +3,11 @@
 <% end %>
 
 <div class="contextual">
-  <% if @project && User.current.allowed_to?(:manage_units, @project) %>
+  <% if User.current.allowed_to?(:manage_units, @project) %>
     <%= link_to t(".heading_new_unit"), '#', :class => 'icon icon-add',
-      :onclick => 'showAndScrollTo("add-unit", "unit_name"); return false;' %>
+      :onclick => 'showAndScrollTo("add-unit", "unit_shortname"); return false;' %>
+    <%= link_to t(".heading_import"), import_project_units_path(@project), method: :post,
+      :class => 'icon icon-duplicate' %>
   <% end %>
 </div>
 
@@ -23,3 +25,27 @@
 </div>
 
 <h2><%= t ".heading" %></h2>
+<% if @units.any? %>
+  <table class="list">
+    <thead>
+      <tr>
+        <th><%= l(:field_shortname) %></th>
+        <th><%= l(:field_name) %></th>
+        <th style="width:15%"><%= l(:field_action) %></th>
+      </tr>
+    </thead>
+    <tbody>
+      <% @units.each do |u| %>
+        <tr id="unit-<%= u.id %>" class="unit">
+          <td class="shortname"><%= u.shortname %></td>
+          <td class="unitname"><%= u.name %></td>
+          <td>
+            <%= delete_link unit_path(u), :remote => true %>
+          </td>
+        </tr>
+      <% end %>
+    </tbody>
+  </table>
+<% else %>
+  <p class="nodata"><%= l(:label_no_data) %></p>
+<% end %>
diff --git a/config/locales/en.yml b/config/locales/en.yml
index 48bcbe2..1d1926e 100644
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@@ -2,6 +2,7 @@
 en:
   body_trackers_menu_caption: 'Body trackers'
   field_shortname: 'Short name'
+  field_action: 'Action'
   body_trackers:
     index:
       heading: 'Summary'
@@ -14,3 +15,4 @@ en:
     index:
       heading: 'Units'
       heading_new_unit: 'New unit'
+      heading_import: 'Import'
diff --git a/config/routes.rb b/config/routes.rb
index 61e26b2..4b13a3a 100644
--- a/config/routes.rb
+++ b/config/routes.rb
@@ -4,7 +4,7 @@
 resources :projects do
   shallow do
     resources :body_trackers, :only => [:index]
-    resources :units, :only => [:new, :index, :create, :destroy] do
+    resources :units, :only => [:index, :create, :destroy] do
       post 'import', on: :collection
     end
   end
diff --git a/db/migrate/001_create_units.rb b/db/migrate/001_create_units.rb
index ba81eb1..9ddc44b 100644
--- a/db/migrate/001_create_units.rb
+++ b/db/migrate/001_create_units.rb
@@ -8,7 +8,6 @@ class CreateUnits < ActiveRecord::Migration
 
     reversible do |dir|
       dir.up do
-        Unit.create project: nil, shortname: "", name: "count"
         Unit.create project: nil, shortname: "%", name: "percent"
         Unit.create project: nil, shortname: "g", name: "gram"
         Unit.create project: nil, shortname: "kg", name: "kilogram"
diff --git a/init.rb b/init.rb
index 31053a1..a628e05 100644
--- a/init.rb
+++ b/init.rb
@@ -1,3 +1,7 @@
+(Rails::VERSION::MAJOR < 5 ? ActionDispatch : ActiveSupport)::Reloader.to_prepare do
+  Project.include BodyTracking::ProjectPatch
+end
+
 Redmine::Plugin.register :body_tracking do
   name 'Body tracking plugin'
   author 'cryptogopher'
@@ -7,8 +11,10 @@ Redmine::Plugin.register :body_tracking do
   author_url 'https://github.com/cryptogopher'
 
   project_module :body_tracking do
-    permission :view_body_trackers, {:body_trackers => [:index], :units => [:index]}, read: true
-    permission :manage_units, {:units => [:new, :create, :destroy]}, require: :loggedin
+    permission :view_body_trackers, {:body_trackers => [:index], :units => [:index]},
+      read: true
+    permission :manage_units, {:units => [:create, :destroy, :import]},
+      require: :loggedin
   end
 
   menu :project_menu, :body_trackers, {:controller => 'body_trackers', :action => 'index'},
diff --git a/lib/body_tracking/project_patch.rb b/lib/body_tracking/project_patch.rb
new file mode 100644
index 0000000..d7bc621
--- /dev/null
+++ b/lib/body_tracking/project_patch.rb
@@ -0,0 +1,8 @@
+module BodyTracking
+  module ProjectPatch
+    Project.class_eval do
+      has_many :units, dependent: :destroy
+    end
+  end
+end
+