jro_apps/redmine Commit - r1304:467f74510e44

Time report can be done at issue level (closes #970) + timelog views xhtml validation....

Jean-Philippe Lang -

r1304:467f74510e44

parent child

Context file:

r1304:467f74510e44

Collapse all files

app/controllers/timelog_controller.rb +5 -2

                                                       :label => :label_tracker},
                                          'activity' => {:sql => "#{TimeEntry.table_name}.activity_id",
                                                        :klass => Enumeration,
-                                                       :label => :label_activity}
+                                                       :label => :label_activity},
+                                         'issue' => {:sql => "#{TimeEntry.table_name}.issue_id",
+                                                     :klass => Issue,
+                                                     :label => :label_issue}
                                        }
                 @criterias = params[:criterias] || []
                 render_404
               end
-              # Retreive the date range based on predefined ranges or specific from/to param dates
+              # Retrieves the date range based on predefined ranges or specific from/to param dates
               def retrieve_date_range
                 @free_period = false
                 @from, @to = nil, nil

app/models/issue.rb +4 0

                   yield
                 end
               end
+              def to_s
+                "#{tracker} ##{id}: #{subject}"
+              end
             end

app/views/timelog/_list.rhtml +3 -1

             <table class="list time-entries">
             <thead>
+            <tr>
             <%= sort_header_tag('spent_on', :caption => l(:label_date), :default_order => 'desc') %>
             <%= sort_header_tag('user_id', :caption => l(:label_member)) %>
             <%= sort_header_tag('activity_id', :caption => l(:label_activity)) %>
             <th><%= l(:field_comments) %></th>
             <%= sort_header_tag('hours', :caption => l(:field_hours)) %>
             <th></th>
+            </tr>
             </thead>
             <tbody>
             <% entries.each do |entry| -%>
             </td>
             </tr>
             <% end -%>
-            </tbdoy>
+            </tbody>
             </table>

app/views/timelog/details.rhtml +2 0

             <span><%= link_to 'CSV', params.merge(:format => 'csv'), :class => 'csv' %></span>
             </p>
             <% end %>
+            <% html_title l(:label_spent_time), l(:label_details) %>

app/views/timelog/report.rhtml +8 -5

             <% form_remote_tag(:url => {}, :update => 'content') do %>
               <% @criterias.each do |criteria| %>
-                <%= hidden_field_tag 'criterias[]', criteria %>
+                <%= hidden_field_tag 'criterias[]', criteria, :id => nil %>
               <% end %>
               <%= hidden_field_tag 'project_id', params[:project_id] %>
               <%= render :partial => 'date_range' %>
-              </p>
-              </fieldset>
               <p><%= l(:label_details) %>: <%= select_tag 'columns', options_for_select([[l(:label_year), 'year'],
                                                                                         [l(:label_month), 'month'],
                                                                                         [l(:label_week), 'week']], @columns),
               <%= l(:button_add) %>: <%= select_tag('criterias[]', options_for_select([[]] + (@available_criterias.keys - @criterias).collect{|k| [l(@available_criterias[k][:label]), k]}),
                                                                       :onchange => "this.form.onsubmit();",
                                                                       :style => 'width: 200px',
+                                                                      :id => nil,
                                                                       :disabled => (@criterias.length >= 3)) %>
                  <%= link_to_remote l(:button_clear), {:url => {:project_id => @project, :date_from => @date_from, :date_to => @date_to, :period => @columns}, :update => 'content'},
                                                       :class => 'icon icon-reload' %></p>
             <thead>
             <tr>
             <% @criterias.each do |criteria| %>
-              <th width="15%"><%= l(@available_criterias[criteria][:label]) %></th>
+              <th><%= l(@available_criterias[criteria][:label]) %></th>
             <% end %>
             <% @periods.each do |period| %>
-              <th width="<%= ((100 - @criterias.length * 15 - 15 ) / @periods.length).to_i %>%"><%= period %></th>
+              <th class="period" width="<%= (40 / @periods.length).to_i %>%"><%= period %></th>
             <% end %>
             </tr>
             </thead>
             </table>
             <% end %>
             <% end %>
+            <% html_title l(:label_spent_time), l(:label_report) %>

public/stylesheets/application.css +1 -1

             div#version-summary fieldset { margin-bottom: 1em; }
             div#version-summary .total-hours { text-align: right; }
-            table#time-report td.hours { text-align: right; padding-right: 0.5em; }
+            table#time-report td.hours, table#time-report th.period { text-align: right; padding-right: 0.5em; }
             table#time-report tbody tr { font-style: italic; color: #777; }
             table#time-report tbody tr.last-level { font-style: normal; color: #555; }
             table#time-report tbody tr.total { font-style: normal; font-weight: bold; color: #555; background-color:#EEEEEE; }

test/functional/timelog_controller_test.rb +1 -1

               end
               def test_report_all_time
-                get :report, :project_id => 1, :criterias => ['project']
+                get :report, :project_id => 1, :criterias => ['project', 'issue']
                 assert_response :success
                 assert_template 'report'
                 assert_not_nil assigns(:total_hours)

General Comments 0

Write
Preview

You need to be logged in to leave comments. Login now

No TODOs yet

	Site-wide shortcuts
/	Use quick search box
g h	Goto home page
g g	Goto my private gists page
g G	Goto my public gists page
g 0-9	Goto bookmarked items from 0-9
n r	New repository page
n g	New gist page

	Repositories
g s	Goto summary page
g c	Goto changelog page
g f	Goto files page
g F	Goto files page with file search activated
g p	Goto pull requests page
g o	Goto repository settings
g O	Goto repository access permissions settings
t s	Toggle sidebar on some pages