jro_apps/redmine Commit - r7207:aff6fe1f7a83

1

1

2

<%

2

<%

3

entries = TimeEntry.find(:all,

3

entries = TimeEntry.find(:all,

4

:conditions => ["#{TimeEntry.table_name}.user_id = ? AND #{TimeEntry.table_name}.spent_on BETWEEN ? AND ?", @user.id, Date.today - 6, Date.today],

4

:conditions => ["#{TimeEntry.table_name}.user_id = ? AND #{TimeEntry.table_name}.spent_on BETWEEN ? AND ?", @user.id, Date.today - 6, Date.today],

5

:include => [:activity, :project, {:issue => [:tracker, :status]}],

5

:include => [:activity, :project, {:issue => [:tracker, :status]}],

6

:order => "#{TimeEntry.table_name}.spent_on DESC, #{Project.table_name}.name ASC, #{Tracker.table_name}.position ASC, #{Issue.table_name}.id ASC")

6

:order => "#{TimeEntry.table_name}.spent_on DESC, #{Project.table_name}.name ASC, #{Tracker.table_name}.position ASC, #{Issue.table_name}.id ASC")

7

entries_by_day = entries.group_by(&:spent_on)

7

entries_by_day = entries.group_by(&:spent_on)

8

%>

8

%>

9

10

10

11

11

12

</div>

12

</div>

13

14

<% if entries.any? %>

14

<% if entries.any? %>

15

15

16

16

17

17

18

18

19

19

20

20

21

21

22

</tr></thead>

22

</tr></thead>

23

<tbody>

23

<tbody>

24

<% entries_by_day.keys.sort.reverse.each do |day| %>

24

<% entries_by_day.keys.sort.reverse.each do |day| %>

25

25

26

26

27

27

28

28

29

29

30

</tr>

30

</tr>

31

<% entries_by_day[day].each do |entry| -%>

31

<% entries_by_day[day].each do |entry| -%>

32

32

33

33

34

<td class="subject"><%=h entry.project %> <%= ' - ' + link_to_issue(entry.issue, :truncate => 50) if entry.issue %></td>

34

<td class="subject"><%=h entry.project %> <%= ' - ' + link_to_issue(entry.issue, :truncate => 50) if entry.issue %></td>

35

35

36

36

37

37

38

<% if entry.editable_by?(@user) -%>

38

<% if entry.editable_by?(@user) -%>

39

<%= link_to image_tag('edit.png'), {:controller => 'timelog', :action => 'edit', :id => entry},

39

<%= link_to image_tag('edit.png'), {:controller => 'timelog', :action => 'edit', :id => entry},

40

:title => l(:button_edit) %>

40

:title => l(:button_edit) %>

41

<%= link_to image_tag('delete.png'), {:controller => 'timelog', :action => 'destroy', :id => entry},

41

<%= link_to image_tag('delete.png'), {:controller => 'timelog', :action => 'destroy', :id => entry},

42

:confirm => l(:text_are_you_sure),

42

:confirm => l(:text_are_you_sure),

43

:method => :delete,

43

:method => :delete,

44

:title => l(:button_delete) %>

44

:title => l(:button_delete) %>

45

<% end -%>

45

<% end -%>

46

</td>

46

</td>

47

</tr>

47

</tr>

48

<% end -%>

48

<% end -%>

49

<% end -%>

49

<% end -%>

50

</tbody>

50

</tbody>

51

</table>

51

</table>

52

<% end %>

52

<% end %>

	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

             <h3><%=l(:label_spent_time)%> (<%= l(:label_last_n_days, 7) %>)</h3>
             <%
             entries = TimeEntry.find(:all,
-            				:conditions => ["#{TimeEntry.table_name}.user_id = ? AND #{TimeEntry.table_name}.spent_on BETWEEN ? AND ?", @user.id, Date.today - 6, Date.today],
+                    :conditions => ["#{TimeEntry.table_name}.user_id = ? AND #{TimeEntry.table_name}.spent_on BETWEEN ? AND ?", @user.id, Date.today - 6, Date.today],
-            				:include => [:activity, :project, {:issue => [:tracker, :status]}],
+                    :include => [:activity, :project, {:issue => [:tracker, :status]}],
-            				:order => "#{TimeEntry.table_name}.spent_on DESC, #{Project.table_name}.name ASC, #{Tracker.table_name}.position ASC, #{Issue.table_name}.id ASC")
+                    :order => "#{TimeEntry.table_name}.spent_on DESC, #{Project.table_name}.name ASC, #{Tracker.table_name}.position ASC, #{Issue.table_name}.id ASC")
             entries_by_day = entries.group_by(&:spent_on)
             %>
             <div class="total-hours">
             <p><%= l(:label_total) %>: <%= html_hours("%.2f" % entries.sum(&:hours).to_f) %></p>
             </div>
             <% if entries.any? %>
             <table class="list time-entries">
             <thead><tr>
             <th><%= l(:label_activity) %></th>
             <th><%= l(:label_project) %></th>
             <th><%= l(:field_comments) %></th>
             <th><%= l(:field_hours) %></th>
             <th></th>
             </tr></thead>
             <tbody>
             <% entries_by_day.keys.sort.reverse.each do |day| %>
                 <tr class="odd">
                 <td><strong><%= day == Date.today ? l(:label_today).titleize : format_date(day) %></strong></td>
                 <td colspan="2"></td>
                 <td class="hours"><em><%= html_hours("%.2f" % entries_by_day[day].sum(&:hours).to_f) %></em></td>
                 <td></td>
                 </tr>
                 <% entries_by_day[day].each do |entry| -%>
                 <tr class="time-entry" style="border-bottom: 1px solid #f5f5f5;">
                 <td class="activity"><%=h entry.activity %></td>
                 <td class="subject"><%=h entry.project %> <%= ' - ' + link_to_issue(entry.issue, :truncate => 50) if entry.issue %></td>
                 <td class="comments"><%=h entry.comments %></td>
                 <td class="hours"><%= html_hours("%.2f" % entry.hours) %></td>
                 <td align="center">
                 <% if entry.editable_by?(@user) -%>
                     <%= link_to image_tag('edit.png'), {:controller => 'timelog', :action => 'edit', :id => entry},
                                                        :title => l(:button_edit) %>
                     <%= link_to image_tag('delete.png'), {:controller => 'timelog', :action => 'destroy', :id => entry},
                                                          :confirm => l(:text_are_you_sure),
                                                          :method => :delete,
                                                          :title => l(:button_delete) %>
                 <% end -%>
                 </td>
                 </tr>
                 <% end -%>
             <% end -%>
             </tbody>
             </table>
             <% end %>