@@ -55,25 +55,16 @@ module TimesheetCalendarHelper rounded_box_for_number(css_class, &block) end - # TODO sistemare css class in calendario def rounded_box_for(entry, &block) -# puts "fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff" -# p entry -# p @timesheet.time_entries -# array_entry = @timesheet.time_entries.assoc(entry) -# p array_entry -# rarray_entry = @timesheet.time_entries.rassoc(entry) -# p rarray_entry -# puts "fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff" -# if entry[:obj_ref].instance_of?(Project) -# css_class = css_class_for_timesheet_event(entry) -# elsif entry[:obj_ref].instance_of?(Issue) -# css_class = css_class_for_timesheet_event(entry) -# elsif entry[:obj_ref].instance_of?(User) -# css_class = css_class_for_timesheet_event(entry) -# else + if entry.instance_of?(Project) + css_class = css_class_for_timesheet_event(entry.name) + elsif entry.instance_of?(Issue) + css_class = css_class_for_timesheet_event(entry) + elsif entry.instance_of?(User) + css_class = css_class_for_timesheet_event(entry.name) + else css_class = '' -# end + end rounded_box_for_number(css_class, &block) end app/helpers/timesheet_calendar_helper.rb @@ -9,19 +9,19 @@ calendar.events = timesheet.time_entries <tbody> <tr> <% day = calendar.startdt - while day <= calendar.enddt - daily_hours = 0 %> + while day <= calendar.enddt %> <%= "<th>#{day.cweek}</th>" if day.cwday == calendar.first_wday %> <td class="<%= day.month==calendar.month ? 'even' : 'odd' %><%= ' today' if Date.today == day %>"> <p class="day-num"><%= day.day %></p> - <% calendar.events_on(day).sort_by(&:hours).reverse_each do |entry| %> + <% daily_hours = calendar.aggregated_events_of(day, timesheet.sort) do |entry, hours| %> <% rounded_box_for(entry) do %> - <% daily_hours += entry.hours %> - <%= '%.1f' % entry.hours %> + <%= '%.1f' % hours %> <% end -%> <% end %> <div class="clear"></div> - <%= progress_bar(daily_hours/8*100, :legend => "#{'%.1f' % daily_hours} #{l(:field_hours)}", :width => '95%') if daily_hours != 0 %> + <%= progress_bar(daily_hours/8*100, + :legend => "#{'%.1f' % daily_hours} #{l(:field_hours)}", + :width => '95%') if daily_hours != 0 %> </td> <%= '</tr><tr>' if day.cwday==calendar.last_wday and day!=calendar.enddt %> <% day = day + 1 app/views/timesheet/_calendar.rhtml @@ -7,4 +7,15 @@ class TimeEntryCalendar < Redmine::Helpers::Calendar @starting_events_by_days = @events.group_by(&:spent_on) end + # group timelog events of a single day, by event type and + # return total hours spent + def aggregated_events_of(day, entry_type) + daily_hours = 0.0 + events_on(day).group_by(&:"#{entry_type}").each do |entry, values| + hours = values.inject(0.0) {|total, e| total + e.hours} + daily_hours += hours + yield(entry, hours) + end + return daily_hours + end end \ No newline at end of file lib/time_entry_calendar.rb 8c87af0c644b977ccf9362d921f97ffce1c1fc56 Michele Franzin michele.franzin@gmail.com http://github.com/michelefranzin/redmine-timesheet-plugin/commit/27a39169338edc97f0da60f85b3d584b47fc1d4b 27a39169338edc97f0da60f85b3d584b47fc1d4b 2009-07-13T09:05:58-07:00 2009-07-13T09:05:58-07:00 add coloured boxed to calendar view 71ce2dd039471e04b65fdcdfeda3d53ec3fce45e Michele Franzin michele.franzin@gmail.com