Fixes #5 Time format

Adds the option in settings for i18n format.

Author: travis

app/views/settings/_spent_time_settings.html.erb

@@ -9,6 +9,23 @@
       </td>
     </tr>
 
+    <tr>
+      <th><%= t('plugin_spent_time_in_issue.time_format') %></th>
+      <td>
+        <input type="radio" name="settings[time_format]" value="decimal"
+                     <%= "checked='true'" unless settings['time_format'].eql? "human" %>
+                     required />
+        <%= t('plugin_spent_time_in_issue.time_format_decimal') %>
+         <br />
+
+        <input type="radio" name="settings[time_format]" value="human"
+                     <%= "checked='true'" if settings['time_format'].eql? "human" %>
+                     required/>
+
+        <%= t('plugin_spent_time_in_issue.time_format_human') %>
+      </td>
+    </tr>
+
     <tr>
       <th> <%= t("plugin_spent_time_in_issue.display_cols") %> </th>
       <td>
@@ -20,11 +37,6 @@
       </td>
     <tr>
 
-    <tr>
-      <td colspan=2>
-        <span id="settingsfeedback"></span>
-      </td>
-    </tr>
   </tbody>
 </table>
 

app/views/spent_time/_report.html.erb

@@ -1,4 +1,5 @@
 <% if User.current.allowed_to?(:view_time_entries, @project) and @issue.time_entries.present? %>
+
   <hr />
   <p><strong><%= t('plugin_spent_time_in_issue.timeEntries') %></strong> <%= link_to "#{t "plugin_spent_time_in_issue.seeAllCount", count: @issue.time_entries.count}", project_issue_time_entries_path( @project , @issue ) if @issue.time_entries.count > Setting.plugin_redmine_spent_time_in_issue_description['spent_time_max_display'].to_i %> </p>
 
@@ -12,8 +13,36 @@
       <% @issue.time_entries.last( Setting.plugin_redmine_spent_time_in_issue_description['spent_time_max_display'].to_i ).each do |entry| %>
         <tr>
           <%= content_tag(:td, entry.spent_on.strftime("%m/%d/%Y") ) if Setting.plugin_redmine_spent_time_in_issue_description['display_columns'].include? 'spentOn'  %>
-          <%= content_tag(:td, link_to_user( entry.user )) if Setting.plugin_redmine_spent_time_in_issue_description['display_columns'].include? 'user'   %>
-          <%= content_tag(:td, entry.hours ) if Setting.plugin_redmine_spent_time_in_issue_description['display_columns'].include? 'hours'  %>
+          <%= content_tag(:td, link_to_user( entry.user )) if Setting.plugin_redmine_spent_time_in_issue_description['display_columns'].include? 'user' %>
+          <% if Setting.plugin_redmine_spent_time_in_issue_description['display_columns'].include? 'hours'
+
+               if Setting.plugin_redmine_spent_time_in_issue_description['time_format'].eql? "human"
+                 hours = entry.hours.to_i
+                 minutes = entry.hours * 60
+                 minutes = (minutes - hours * 60 ).to_i
+
+                 time_spent = ""
+
+                 if hours == 1
+                   time_spent = t('plugin_spent_time_in_issue.datetime.hours.one')
+                 elsif hours > 1
+                   time_spent = t('plugin_spent_time_in_issue.datetime.hours.other', hours: hours )
+                 end
+
+                 if minutes == 1
+                   time_spent << " " << t('plugin_spent_time_in_issue.datetime.minutes.one')
+                 elsif minutes > 1
+                   time_spent << " " << t('plugin_spent_time_in_issue.datetime.minutes.other', minutes: minutes )
+                 end
+               else
+                 time_spent = entry.hours
+               end
+
+             %>
+
+           <%= content_tag(:td, time_spent ) %>
+
+          <% end %>
           <%= content_tag(:td, entry.comments ) if Setting.plugin_redmine_spent_time_in_issue_description['display_columns'].include? 'comments'  %>
           <%= content_tag(:td, entry.activity ) if Setting.plugin_redmine_spent_time_in_issue_description['display_columns'].include? 'activity'  %>
         </tr>

config/locales/en.yml

@@ -3,6 +3,16 @@ en:
         timeEntries: Time Entries
         spentOn: Spent on
         max_display: Time Entries Maximum Display
+        time_format: Time Format
+        time_format_decimal: Decimal ( 1.5 )
+        time_format_human: Human Readable ( 1hr ) 
+        datetime:
+          hours:
+            one: 1 hour
+            other: %{hours} hours
+          minutes:
+            one: 1 minute
+            other: %{minutes} minutes
         user: User
         hours: Hours
         comments: Comments

config/locales/fr.yml

@@ -3,6 +3,16 @@ fr:
         timeEntries: Temps passé
         spentOn: Date
         max_display: Nombre maximum d'entrées affichées
+        time_format: Time Format
+        time_format_decimal: Decimal ( 1.5 )
+        time_format_human: Human Readable ( 1hr ) 
+        datetime:
+          hours:
+            one: 1 hour
+            other: %{hours} hours
+          minutes:
+            one: 1 minute
+            other: %{minutes} minutes
         user: Utilisateur
         hours: Nombre d'heures
         comments: Commentaires

init.rb

@@ -10,7 +10,8 @@
   version '1.3'
   url 'https://github.com/TravisSpangle/redmine_spent_time_in_issue_description'
   settings( :default => { 'spent_time_max_display'  => 5,
-                          'display_columns' => ["spentOn", "user", "hours", "comments"]
+                          'display_columns' => ["spentOn", "user", "hours", "comments"],
+                          'time_format' => 'decimal'
                         },
                         :partial => 'settings/spent_time_settings' )
 end