Fix bug of log_time entry

Author: spike008t

app/views/issues/_list.rthml

@@ -0,0 +1,41 @@
+<% content_for :header_tags do %>
+    <%= stylesheet_link_tag 'advanced_issues.css', :plugin => 'redmine_advanced_issues' %>
+<% end %>
+
+<% form_tag({}) do -%>	
+<%= hidden_field_tag 'back_url', url_for(params) %>
+<div class="autoscroll">
+<table class="list issues">
+    <thead><tr>
+        <th class="checkbox hide-when-print"><%= link_to image_tag('toggle_check.png'), {}, :onclick => 'toggleIssuesSelection(Element.up(this, "form")); return false;',
+                                                           :title => "#{l(:button_check_all)}/#{l(:button_uncheck_all)}" %>
+        </th>
+		<%= sort_header_tag('id', :caption => '#', :default_order => 'desc') %>
+        <% query.columns.each do |column| %>
+          <%= column_header(column) %>
+        <% end %>
+	</tr></thead>
+	<% previous_group = false %>
+	<tbody>
+	<% issue_list(issues) do |issue, level| -%>
+  <% if @query.grouped? && (group = @query.group_by_column.value(issue)) != previous_group %>
+    <% reset_cycle %>
+    <tr class="group open">
+    	<td colspan="<%= query.columns.size + 2 %>">
+    		<span class="expander" onclick="toggleRowGroup(this); return false;">&nbsp;</span>
+      	<%= group.blank? ? 'None' : column_content(@query.group_by_column, issue) %> <span class="count">(<%= @issue_count_by_group[group] %>)</span>
+        <%= link_to_function("#{l(:button_collapse_all)}/#{l(:button_expand_all)}", "toggleAllRowGroups(this)", :class => 'toggle-all') %>
+    	</td>
+		</tr>
+		<% previous_group = group %>
+  <% end %>
+	<tr id="issue-<%= issue.id %>" class="hascontextmenu <%= cycle('odd', 'even') %> <%= issue.css_classes %> <%= level > 0 ? "idnt idnt-#{level}" : nil %>">
+	  <td class="checkbox hide-when-print"><%= check_box_tag("ids[]", issue.id, false, :id => nil) %></td>
+		<td class="id"><%= link_to issue.id, :controller => 'issues', :action => 'show', :id => issue %></td>
+        <% query.columns.each do |column| %><%= content_tag 'td', column_content(column, issue), :class => column.css_classes %><% end %>
+	</tr>
+	<% end -%>
+	</tbody>
+</table>
+</div>
+<% end -%>

app/views/issues/_list_simple.rhtml

@@ -0,0 +1,33 @@
+<% content_for :header_tags do %>
+    <%= stylesheet_link_tag 'advanced_issues.css', :plugin => 'redmine_advanced_issues' %>
+<% end %>
+
+<% if issues && issues.any? %>
+<% form_tag({}) do %>
+	<table class="list issues">		
+		<thead><tr>
+		<th>#</th>
+		<th><%=l(:field_project)%></th>
+		<th><%=l(:field_tracker)%></th>
+		<th><%=l(:field_subject)%></th>
+		</tr></thead>
+		<tbody>	
+		<% for issue in issues %>
+		<tr id="issue-<%= issue.id %>" class="hascontextmenu <%= cycle('odd', 'even') %> <%= issue.css_classes %>">
+			<td class="id">
+			  <%= check_box_tag("ids[]", issue.id, false, :style => 'display:none;') %>
+				<%= link_to issue.id, :controller => 'issues', :action => 'show', :id => issue %>
+			</td>
+			<td class="project"><%= link_to_project(issue.project) %></td>
+			<td class="tracker"><%=h issue.tracker %></td>
+			<td class="subject">
+        <%= link_to h(truncate(issue.subject, :length => 60)), :controller => 'issues', :action => 'show', :id => issue %> (<%=h issue.status %>)
+      </td>
+		</tr>
+		<% end %>
+		</tbody>
+	</table>
+<% end %>
+<% else %>
+	<p class="nodata"><%= l(:label_no_data) %></p>
+<% end %>

init.rb

@@ -39,7 +39,7 @@
 This is a plugin for Redmine, that add some advanced stuffs.
 Spent time columns, unit time customize
 '
-  version '0.0.3'
+  version '0.0.4'
   url 'http://blog.spikie.info/'
   author_url 'http://blog.spikie.info'
 
@@ -53,7 +53,7 @@
              'days_in_week' => '5',
              'char_for_week' => 'w',
 
-             'weeks_in_month' => '21',
+             'weeks_in_month' => '4',
              'char_for_month' => 'm',
 
              'months_in_year' => '12',

lib/hooks/controller_issues_edit_before_save_hook.rb

@@ -24,7 +24,6 @@ class ControllerIssuesEditBeforeSaveHook < Redmine::Hook::ViewListener
     def controller_issues_edit_before_save(context={})
 
       if context[:params] && context[:params][:issue] && context[:params][:issue][:estimated_hours].present?
-
         value = context[:params][:issue][:estimated_hours]
         time_unit = ""
 
@@ -38,10 +37,26 @@ def controller_issues_edit_before_save(context={})
             context[:issue][:estimated_hours] = RedmineAdvancedIssues::TimeManagement.calculateHours value.to_f, time_unit
         end #if
 
-      return ''
+      end #if
+
+      if context[:time_entry] && context[:time_entry][:hours].present?
+        value = context[:time_entry][:hours]
+        time_unit = ""
+
+        if value.to_s =~ /^([0-9]+)\s*[a-z]{1}$/
+          time_unit = RedmineAdvancedIssues::TimeManagement.getUnitTimeFromChar value.to_s[-1, 1]
+        else
+          time_unit = Setting.plugin_redmine_advanced_issues['default_unit']
+        end #if
+
+        if !time_unit.empty?
+            context[:time_entry][:hours] = RedmineAdvancedIssues::TimeManagement.calculateHours value.to_f, time_unit
+        end #if
 
       end #if
 
+	  return ''
+
     end #controller_issues_edit_before_save
 
     alias_method :controller_issues_new_before_save, :controller_issues_edit_before_save

lib/redmine_advanced_issues/patches/issue_patch.rb

@@ -31,6 +31,7 @@ def self.included(base) # :nodoc:
         base.class_eval do
           unloadable
 		  alias_method_chain :css_classes, :more_css
+		  #alias_method_chain :save_issue_with_child_records, :time_entry_record
         end #base.class_eval
 
       end #self.include(base)
@@ -61,7 +62,7 @@ def has_risk?
 		# khim: Returns true if the issue will be late...
 		# khim: ((time_estimated - worked_time) / 7.5) > due_date - Date.today
 		def miss_time?
-		  !due_date.nil? && ((estimated_hours.to_f - spent_hours.to_f) / 7.5) > (due_date - Date.today)
+		  !due_date.nil? && ((estimated_hours.to_f - spent_hours.to_f) / Setting.plugin_redmine_advanced_issues['hours_in_day'].to_f) > (due_date - Date.today)
 		end
 
         def estimated_days
@@ -129,6 +130,17 @@ def css_classes_with_more_css
 			s << ' over_estimated' if spent_time_over_estimated?
 			return s
 		  end #css_classes
+		  
+		  ## 
+		  # 
+		  ##
+		  def save_issue_with_child_records_with_time_entry_record(params, existing_time_entry=nil)
+			if params[:time_entry] && params[:time_entry][:hours].present?
+			  params[:time_entry][:hours] = RedmineAdvancedIssues::TimeManagement.calculate params[:time_entry][:hours], Setting.plugin_redmine_advanced_issues['default_unit']
+			end
+			save_issue_with_child_records_without_time_entry_record(params, existing_time_entry)
+		  end #save_issue_with_child_records_with_time_entry_record
+		  
       end #InstanceMethods
 
     end #IssuePatch

lib/redmine_advanced_issues/patches/query_patch.rb

@@ -45,7 +45,7 @@ def available_columns_with_spent_hours
 
 			columns << QueryColumn.new(:divergent_hours, 
 				:caption => :label_divergent_hours, 
-				:sortable => "((select sum(hours) from #{TimeEntry.table_name} where #{TimeEntry.table_name}.issue_id = #{Issue.table_name}.id) - (IF(#{Issue.table_name}.estimated_hours IS NULL,0,#{Issue.table_name}.estimated_hours) * #{Issue.table_name}.done_ratio / 100s))"
+				:sortable => "((select sum(hours) from #{TimeEntry.table_name} where #{TimeEntry.table_name}.issue_id = #{Issue.table_name}.id) - (IF(#{Issue.table_name}.estimated_hours IS NULL,0,#{Issue.table_name}.estimated_hours) * #{Issue.table_name}.done_ratio / 100))"
 			) unless columns.detect { |c| c.name == :divergent_hours }
 
 

lib/redmine_advanced_issues/patches/time_entry_patch.rb

@@ -45,20 +45,7 @@ def time
 
         #TODO: refactoring
         def default_unit_time
-          case Setting.plugin_redmine_advanced_issues['default_unit']
-            when 'hours'
-              return l(:hours)
-            when 'days'
-              return l(:days)
-            when 'weeks'
-              return l(:weeks)
-            when 'months'
-              return l(:months)
-            when 'years'
-              return l(:years)
-            else
-              return l(:hours)
-          end #case
+		  return RedmineAdvancedIssues::TimeManagement.getDefaultTimeUnit(Setting.plugin_redmine_advanced_issues['default_unit'])
         end #default_unit_time
       end #InstanceMethods
     end #TimeEntryPatch