Merge pull request #117 from onozaty/116-add-total-hours

onozaty · web-flow · commit 75632eac1cc2 · 2024-01-06T21:50:37.000+09:00
#116 Add total estimated hours and total spent hours for the issue to ViewCustomize.context.
diff --git a/README.ja.md b/README.ja.md
@@ -132,6 +132,8 @@ ViewCustomize = {
     "issue": {
       "id": 1,
       "author": {"id": 2, "name": "John Smith"},
+      "totalEstimatedHours": 10.0,
+      "totalSpentHours": 11.5,
       "lastUpdatedBy": {"id": 1, "name": "Redmine Admin"}
     }
   }
diff --git a/README.md b/README.md
@@ -137,6 +137,8 @@ ViewCustomize = {
     "issue": {
       "id": 1,
       "author": {"id": 2, "name": "John Smith"},
+      "totalEstimatedHours": 10.0,
+      "totalSpentHours": 11.5,
       "lastUpdatedBy": {"id": 1, "name": "Redmine Admin"}
     }
   }
diff --git a/init.rb b/init.rb
@@ -3,7 +3,7 @@
   name 'View Customize plugin'
   author 'onozaty'
   description 'View Customize plugin for Redmine'
-  version '3.4.1'
+  version '3.5.0'
   url 'https://github.com/onozaty/redmine-view-customize'
   author_url 'https://github.com/onozaty'
 
diff --git a/lib/redmine_view_customize/view_hook.rb b/lib/redmine_view_customize/view_hook.rb
@@ -32,7 +32,9 @@ def view_issues_show_details_bottom(context={})
         "author" => {
           "id" => context[:issue].author.id,
           "name" => context[:issue].author.name
-        }
+        },
+        "totalEstimatedHours" => context[:issue].total_estimated_hours,
+        "totalSpentHours" => context[:issue].total_spent_hours
       }
 
       if context[:issue].last_updated_by.present?
diff --git a/test/unit/view_customize_view_hook_test.rb b/test/unit/view_customize_view_hook_test.rb
@@ -3,7 +3,7 @@
 
 class ViewCustomizeViewHookTest < ActiveSupport::TestCase
   fixtures :projects, :users, :email_addresses, :user_preferences, :members, :member_roles, :roles,
-           :issues, :journals, :custom_fields, :custom_fields_projects, :custom_values,
+           :issues, :journals, :custom_fields, :custom_fields_projects, :custom_values, :time_entries,
            :view_customizes
 
   class Request
@@ -170,7 +170,7 @@ def test_view_issues_show_details_bottom
 
 <script type=\"text/javascript\">
 //<![CDATA[
-ViewCustomize.context.issue = {\"id\":4,\"author\":{\"id\":2,\"name\":\"John Smith\"}};
+ViewCustomize.context.issue = {\"id\":4,\"author\":{\"id\":2,\"name\":\"John Smith\"},\"totalEstimatedHours\":null,\"totalSpentHours\":0.0};
 //]]>
 </script>
 <!-- view customize id:8 -->
@@ -193,7 +193,7 @@ def test_view_issues_show_details_bottom_with_journals
 
 <script type=\"text/javascript\">
 //<![CDATA[
-ViewCustomize.context.issue = {\"id\":6,\"author\":{\"id\":2,\"name\":\"John Smith\"},\"lastUpdatedBy\":{\"id\":1,\"name\":\"Redmine Admin\"}};
+ViewCustomize.context.issue = {\"id\":6,\"author\":{\"id\":2,\"name\":\"John Smith\"},\"totalEstimatedHours\":null,\"totalSpentHours\":0.0,\"lastUpdatedBy\":{\"id\":1,\"name\":\"Redmine Admin\"}};
 //]]>
 </script>
 <!-- view customize id:8 -->
@@ -207,4 +207,27 @@ def test_view_issues_show_details_bottom_with_journals
 
   end
 
+  def test_view_issues_show_details_bottom_with_time_entries
+
+    User.current = User.find(1)
+    issue = Issue.find(1)
+
+    expected = <<HTML
+
+<script type=\"text/javascript\">
+//<![CDATA[
+ViewCustomize.context.issue = {\"id\":1,\"author\":{\"id\":2,\"name\":\"John Smith\"},\"totalEstimatedHours\":200.0,\"totalSpentHours\":154.25,\"lastUpdatedBy\":{\"id\":2,\"name\":\"John Smith\"}};
+//]]>
+</script>
+<!-- view customize id:8 -->
+<style type=\"text/css\">
+code_008
+</style>
+HTML
+
+    html = @hook.view_issues_show_details_bottom({:request => Request.new("/issues/1"), :issue => issue, :project => @project_onlinestore})
+    assert_equal expected, html
+
+  end
+
 end

Original file line number	Diff line number	Diff line change
`@@ -132,6 +132,8 @@ ViewCustomize = {`
`132`	`132`	`"issue": {`
`133`	`133`	`"id": 1,`
`134`	`134`	`"author": {"id": 2, "name": "John Smith"},`
	`135`	`+ "totalEstimatedHours": 10.0,`
	`136`	`+ "totalSpentHours": 11.5,`
`135`	`137`	`"lastUpdatedBy": {"id": 1, "name": "Redmine Admin"}`
`136`	`138`	`}`
`137`	`139`	`}`
Original file line number	Diff line number	Diff line change
`@@ -137,6 +137,8 @@ ViewCustomize = {`
`137`	`137`	`"issue": {`
`138`	`138`	`"id": 1,`
`139`	`139`	`"author": {"id": 2, "name": "John Smith"},`
	`140`	`+ "totalEstimatedHours": 10.0,`
	`141`	`+ "totalSpentHours": 11.5,`
`140`	`142`	`"lastUpdatedBy": {"id": 1, "name": "Redmine Admin"}`
`141`	`143`	`}`
`142`	`144`	`}`