Fix bugs on install. Right now that work with the actual version of redmine.

Fix bug:
	- Add methods "has_risk" and "miss_time"
	- modify some templates/labels because that doesn't show up nicely
Done:
	- Add label "[RISK]" to an issue where's a risk of overdue

Author: spike008t

CHANGELOG

@@ -1,5 +1,12 @@
 Changelog:
 
+09/18/2011 - v.0.0.3 : 
+- Fix bugs : 
+	- add methods "has_risk" and "miss_time"
+	- modify some templates/labels because that doesn't show the label up
+- Done:
+	- Modify show template and add label "[RISK]" to the issue where's a risk of overdue
+
 
 15/07/2011 - v.0.0.2 : 
 - Cr�ation initiale du projet

README.rdoc

@@ -4,3 +4,9 @@ This plugin add some stuffs into issues.
 
 # Change time unit for time tracking (day, week...)
 
+TODO:
+
+# Write some test!
+# Refactoring some stuffs
+# Add more flexibility on time unit selection (per project and global)
+# Select the good time unit for more visibility

app/views/issues/_edit.rhtml

@@ -20,12 +20,11 @@
         <% fields_for :time_entry, @time_entry, { :builder => TabularFormBuilder, :lang => current_language} do |time_entry| %>
         <div class="splitcontentleft">
 
-
-<p>
-  <label for="time_entry_hours"><%= l(:field_time_entry_hours) %></label>
-  <%= text_field_tag 'time_entry[hours]', @time_entry.time, :size => 6 %> <%= l(:field_estimated_default, :unit => @time_entry.default_unit_time) %>
-</p>
-
+		<p>
+		  <label for="time_entry_hours"><%= l(:field_time_entry_hours) %></label>
+		  <%= text_field_tag 'time_entry[hours]', @time_entry.time, :size => 6 %> 
+		  <%= l(:field_estimated_default, :unit => @time_entry.default_unit_time) %>
+		</p>
 
         </div>
         <div class="splitcontentright">

app/views/issues/show.rhtml

@@ -1,69 +1,66 @@
 <%= render :partial => 'action_menu' %>
 
-<h2><%= issue_heading(@issue) %> <%= " - Attention il y a un risque!" if @issue.has_risk? %></h2>
+<h2><%= l(:label_warning_risk) if @issue.has_risk? %> <%= issue_heading(@issue) %></h2>
 
 <div class="<%= @issue.css_classes %> details">
-        <%= avatar(@issue.author, :size => "50") %>
-      
-<div class="subject">      
-<%= render_issue_subject_with_tree(@issue) %>
-</div>
+	<%= avatar(@issue.author, :size => "50") %>
+	<div class="subject">      
+		<%= render_issue_subject_with_tree(@issue) %>
+		</div>
 
         <p class="author">
-        <%= authoring @issue.created_on, @issue.author %>.
-        <% if @issue.created_on != @issue.updated_on %>
-        <%= l(:label_updated_time, time_tag(@issue.updated_on)) %>.
-        <% end %>
-
+			<%= authoring @issue.created_on, @issue.author %>.
+			<% if @issue.created_on != @issue.updated_on %>
+				<%= l(:label_updated_time, time_tag(@issue.updated_on)) %>.
+			<% end %>
         </p>
 
-
-<table class="attributes">
-<tr>
-    <th class="status"><%=l(:field_status)%>:</th><td class="status"><%= @issue.status.name %></td>
-    <th class="start-date"><%=l(:field_start_date)%>:</th><td class="start-date"><%= format_date(@issue.start_date) %></td>
-</tr>
-<tr>
-    <th class="priority"><%=l(:field_priority)%>:</th><td class="priority"><%= @issue.priority.name %></td>
-    <th class="due-date"><%=l(:field_due_date)%>:</th><td class="due-date"><%= format_date(@issue.due_date) %></td>
-</tr>
-<tr>
-    <th class="assigned-to"><%=l(:field_assigned_to)%>:</th><td class="assigned-to"><%= avatar(@issue.assigned_to, :size => "14") %><%= @issue.assigned_to ? link_to_user(@issue.assigned_to) : "-" %></td>
-    <th class="progress"><%=l(:field_done_ratio)%>:</th><td class="progress"><%= progress_bar @issue.done_ratio, :width => '80px', :legend => "#{@issue.done_ratio}%" %></td>
-</tr>
-<tr>
-    <th class="category"><%=l(:field_category)%>:</th><td class="category"><%=h @issue.category ? @issue.category.name : "-" %></td>
-    <% if User.current.allowed_to?(:view_time_entries, @project) %>
-    <th class="spent-time"><%=l(:label_spent_time)%>:</th>
-    <td class="spent-time">
-      <% if @issue.spent_hours > 0 %>
-        <%= l(:label_estimated, {:value => "%.2f" % @issue.spent_time, :unit => @issue.default_unit_time }) %>
-        (<%= link_to l_hours(@issue.spent_hours), {:controller => 'timelog', :action => 'index', :project_id => @project, :issue_id => @issue} %>)
-      <% end #if %>
-    </td>
-    <% end %>
-</tr>
-<tr>
-    <th class="fixed-version"><%=l(:field_fixed_version)%>:</th>
-    <td class="fixed-version"><%= @issue.fixed_version ? link_to_version(@issue.fixed_version) : "-" %></td>
-    <% if @issue.estimated_hours %>
-    <th class="estimated-hours"><%=l(:field_estimated_hours)%>:</th>
-    <td class="estimated-hours"><%= l(:label_estimated, {:value =>@issue.estimated_time, :unit => @issue.default_unit_time } ) %>
-	(<%= l_hours(@issue.estimated_hours) %>)</td>
-    <% end %>
-</tr>
-<%= render_custom_fields_rows(@issue) %>
-<%= call_hook(:view_issues_show_details_bottom, :issue => @issue) %>
-</table>
-
-<% if @issue.description? || @issue.attachments.any? -%>
-<hr />
-<% if @issue.description? %>
-	<div class="contextual">
-	<%= link_to_remote_if_authorized(l(:button_quote), { :url => {:controller => 'journals', :action => 'new', :id => @issue} }, :class => 'icon icon-comment') %>
-	</div>
+		<table class="attributes">
+			<tr>
+				<th class="status"><%=l(:field_status)%>:</th><td class="status"><%= @issue.status.name %></td>
+				<th class="start-date"><%=l(:field_start_date)%>:</th><td class="start-date"><%= format_date(@issue.start_date) %></td>
+			</tr>
+			<tr>
+				<th class="priority"><%=l(:field_priority)%>:</th><td class="priority"><%= @issue.priority.name %></td>
+				<th class="due-date"><%=l(:field_due_date)%>:</th><td class="due-date"><%= format_date(@issue.due_date) %></td>
+			</tr>
+			<tr>
+				<th class="assigned-to"><%=l(:field_assigned_to)%>:</th><td class="assigned-to"><%= avatar(@issue.assigned_to, :size => "14") %><%= @issue.assigned_to ? link_to_user(@issue.assigned_to) : "-" %></td>
+				<th class="progress"><%=l(:field_done_ratio)%>:</th><td class="progress"><%= progress_bar @issue.done_ratio, :width => '80px', :legend => "#{@issue.done_ratio}%" %></td>
+			</tr>
+			<tr>
+				<th class="category"><%=l(:field_category)%>:</th><td class="category"><%=h @issue.category ? @issue.category.name : "-" %></td>
+				<% if User.current.allowed_to?(:view_time_entries, @project) %>
+				<th class="spent-time"><%=l(:label_spent_time)%>:</th>
+				<td class="spent-time">
+				  <% if @issue.spent_hours > 0 %>
+					<%= l(:label_estimated, {:value => "%.2f" % @issue.spent_time, :unit => @issue.default_unit_time }) %>
+					(<%= link_to l_hours(@issue.spent_hours), {:controller => 'timelog', :action => 'index', :project_id => @project, :issue_id => @issue} %>)
+				  <% end #if %>
+				</td>
+				<% end %>
+			</tr>
+			<tr>
+				<th class="fixed-version"><%=l(:field_fixed_version)%>:</th>
+				<td class="fixed-version"><%= @issue.fixed_version ? link_to_version(@issue.fixed_version) : "-" %></td>
+				<% if @issue.estimated_hours %>
+					<th class="estimated-hours"><%=l(:field_estimated_hours)%>:</th>
+					<td class="estimated-hours"><%= l(:label_estimated, {:value =>@issue.estimated_time, :unit => @issue.default_unit_time } ) %>
+					(<%= l_hours(@issue.estimated_hours) %>)</td>
+				<% end %>
+			</tr>
+			<%= render_custom_fields_rows(@issue) %>
+			<%= call_hook(:view_issues_show_details_bottom, :issue => @issue) %>
+		</table>
+
+		<% if @issue.description? || @issue.attachments.any? -%>
+		<hr />
+		<% if @issue.description? %>
+			<div class="contextual">
+				<%= link_to_remote_if_authorized(l(:button_quote), { :url => {:controller => 'journals', :action => 'new', :id => @issue} }, :class => 'icon icon-comment') %>
+			</div>
 	
-	<p><strong><%=l(:field_description)%></strong></p>
+		<p><strong><%=l(:field_description)%></strong></p>
 	<div class="wiki">
 	<%= textilizable @issue, :description, :attachments => @issue.attachments %>
 	</div>

config/locales/en.yml

@@ -28,16 +28,18 @@ en:
   year: "year"
 
   field_estimated_time: "Hours by default"
-  field_estimated_default: "%{{unit}} by default"
+  field_estimated_default: "%{unit} by default"
   field_time_entry_hours: "Time spent"
 
   label_settings_unit_default: "Default time unit"
-  label_estimated: "{{value}} {{unit}}"
+  label_estimated: "%{value} %{unit}"
 
   label_calculated_spent_hours: Calculated spent hours
   label_divergent_hours: Divergent hours
   label_remaining_hours: Remaining hours
   label_spent_hours: Spent hours
 
   label_divergent_time: Divergent time
-  label_remaining_time: Remaining time
+  label_remaining_time: Remaining time
+  
+  label_warning_risk: [RISK]

config/locales/fr.yml

@@ -41,3 +41,5 @@ fr:
 
   label_divergent_time: Temps dépassé
   label_remaining_time: Temps restant
+
+  label_warning_risk: [RISQUE]

init.rb

@@ -22,7 +22,7 @@
 This is a plugin for Redmine, that add some advanced stuffs.
 Spent time columns, unit time customize
 '
-  version '0.0.2'
+  version '0.0.3'
   url 'http://blog.spikie.info/'
   author_url 'http://blog.spikie.info'
 
@@ -31,16 +31,16 @@
 
   settings(:default => {
              'hours_in_day' => '7.4',
-             'char_for_day' => 'j',
+             'char_for_day' => 'd',
 
              'days_in_week' => '5',
-             'char_for_week' => 's',
+             'char_for_week' => 'w',
 
-             'days_in_month' => '21',
+             'weeks_in_month' => '21',
              'char_for_month' => 'm',
 
              'months_in_year' => '12',
-             'char_for_year' => 'a',
+             'char_for_year' => 'y',
 
              'default_unit' => 'hours',
 

lib/redmine_advanced_issues/patches/issue_patch.rb

@@ -35,9 +35,16 @@ def spent_time_over_estimated?
           !spent_hours.nil? && !estimated_hours.nil? && spent_hours > estimated_hours
         end #spent_time_over_estimated?
 
+		# if the issue has some risk for an overdue
         def has_risk?
           (spent_time_over_estimated? || miss_time? || behind_schedule?) && !closed?
         end #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)
+		end
 
         def estimated_days
           if !estimated_hours.nil? && !Setting.plugin_redmine_advanced_issues['hours_in_day'].nil?
@@ -51,20 +58,18 @@ def estimated_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
+			return RedmineAdvancedIssues::TimeManagement.getDefaultTimeUnit(Setting.plugin_redmine_advanced_issues['default_unit'])
+#          case Setting.plugin_redmine_advanced_issues['default_unit']
+#            when 'days'
+#              return l(:days)
+#            when 'weeks'
+#              return l(:weeks)
+#            when 'months'
+#              return l(:months)
+#            when 'years'
+#              return l(:years)
+#            end
+#            return l(:hours)
           end #default_unit_time
 
           def spent_time

lib/redmine_advanced_issues/time_management.rb

@@ -51,6 +51,10 @@ def TimeManagement.calculate(value, unit_time)
 
     def TimeManagement.calculateHours(value, unit_time)
 
+		if value.nil?
+			return nil
+		end
+
       value = value.to_f
 
       return value if unit_time == 'hours'
@@ -94,6 +98,20 @@ def TimeManagement.getUnitTimeFromChar(char)
       end #case
     end #def
 
+	def TimeManagement.getDefaultTimeUnit(unit)
+		case unit
+		when 'days'
+		  return I18n.t(:days)
+		when 'weeks'
+		  return I18n.t(:weeks)
+		when 'months'
+		  return I18n.t(:months)
+		when 'years'
+		  return I18n.t(:years)
+		end
+		return I18n.t(:hours)
+	end #def 
+	
   end #class
 
 end #module