Feature/groupselect

.gitignore

@@ -23,3 +23,4 @@
 /tmp/test/*
 /vendor/rails
 *.rbc
+/nbproject

README.markdown

@@ -1,12 +1,53 @@
-### D-Noise Workload Redmine Plugin ala FINE
+### Workload-Plugin for Redmine
 
-A quick set of mods to the basic Workload plugin, which include
+A complete rewrite of the original workload-plugin from Rafael Calleja. The
+plugin calculates how much work each user would have to do per day in order
+to hit the deadlines for all his issues.
 
-* localized into english (config/locales/en.yml)
-* layout modifications
-* de-logo-fied (not that we don't like the logos, but we like our pages to look like other Redmine pages)
-* default to no users selected when you first land on the page (to reduce load times)
+To be able to do this calculation, the issues start date, due date and
+estimated time must be filled in. Issues that have not filled in one of
+these fields will be shown in the overview, but the workload resulting from
+these issues will be ignored.
 
-#### To Do
+#### Installation
 
-* Look at implementing Redmine Group selector to view workload by Department/Group
+The plugin is tested with redmine 3.0.1.
+
+To install it, simply clone it into the plugins-directory. Execute
+
+    git clone https://github.com/JostBaron/redmine_workload.git redmine_workload
+
+in your plugins directory. Then restart your redmine. There is no need for
+database migration, as this plugin does not change anything in the database.
+
+#### Configuration
+
+There are two places where this plugin might be configured:
+
+1. In the plugin settings, available in the administration area under "plugins".
+2. In the Roles-section of the administration area, the plugin adds a new
+  permission "view workload data in own projects". When this permission is given
+  to a user in a project, he might see the workload of all the members of that
+  project.
+
+#### Permissions
+
+The plugin shows the workload as follows:
+
+* An anonymous user can't see any workload.
+* An admin user can see the workload of everyone.
+* Any normal user can see the following workload:
+
+  - He may always see his own workload.
+  - He may see the workload of every user that is member of a project for which
+    he has the permission "view workload data in own projects" (see above).
+  - When showing the issues that contribute to the workload, only issues visible
+    to the current user are shown. Invisible issues are only summarized.
+
+#### ToDo
+
+* Make it possible to display the workload starting with another day than the
+start of a month.
+* Improve performance - requests still take up to 5 seconds.
+* Add legend (again).
+* Use nicer colors for workload indications.

app/controllers/work_load_controller.rb

@@ -1,3 +1,4 @@
+# -*- encoding : utf-8 -*-
 class WorkLoadController < ApplicationController
 
   unloadable
@@ -6,60 +7,70 @@ class WorkLoadController < ApplicationController
   helper :issues
   helper :projects
   helper :queries
+  helper :workload_filters
 
   include QueriesHelper
 
-  before_filter :authorize_global, :except => [:show]
-  before_filter :authorize_global, :only   => [:show]
-
   def show
-
-    @fecha_actual = ( !params[:fecha_actual].nil? && params[:fecha_actual].respond_to?(:to_date)  ) ? params[:fecha_actual].gsub('/', '-').to_date.strftime("%Y-%m-%d") : DateTime.now.strftime("%Y-%m-%d")
+    workloadParameters = params[:workload] || {}
 
-    if ( params[:month].nil? ||   params[:months].nil? ||  params[:year].nil?   ) then
-      params[:month] = DateTime.now.month
-      params[:months] = 2
-      params[:year] = DateTime.now.year
-    end
+    @first_day = sanitizeDateParameter(workloadParameters[:first_day],  Date::today - 10)
+    @last_day  = sanitizeDateParameter(workloadParameters[:last_day],   Date::today + 50)
+    @today     = sanitizeDateParameter(workloadParameters[:start_date], Date::today)
 
-    params[:show_issues] = ( params[:show_issues].nil? ) ? "0" : params[:show_issues]
+	  # if @today ("select as today") is before @first_day take @today as @first_day
+	  @first_day = [@today, @first_day].min
+
+    # Make sure that last_day is at most 12 months after first_day to prevent
+    # long running times
+    @last_day = [(@first_day >> 12) - 1, @last_day].min
+    @timeSpanToDisplay = @first_day..@last_day
 
-    @gantt = Redmine::Helpers::Gantt.new(params)
+    initalizeUsers(workloadParameters)       
 
-    retrieve_query
-    @gantt.query = @query if @query.valid? 
+    @issuesForWorkload = ListUser::getOpenIssuesForUsers(@usersToDisplay)
+    @monthsToRender = ListUser::getMonthsInTimespan(@timeSpanToDisplay)
+    @workloadData   = ListUser::getHoursPerUserIssueAndDay(@issuesForWorkload, @timeSpanToDisplay, @today)
+  end
 
-    @usuarios   = (!params[:usuarios_id].nil?) ?  User.find_all_by_id(params[:usuarios_id]) : User.active
-    @utils      = ListingUser.new(IssueStatus.find_all_by_is_closed(false, :select => 'id').map(&:id))
-    @total_days = @utils.tools.distance_of_time_in_days(@gantt.date_from, @gantt.date_to)
 
-    @dias_hasta_el_lunes = (( 7 - @gantt.date_from.cwday ) + 1)
-    @lunes               = @gantt.date_from.to_date
 
-    @dias_hasta_el_lunes.times do
-		@lunes = @lunes.next
-	end
+private
+
+  def initalizeUsers(workloadParameters)
+    @groupsToDisplay=Group.all.sort_by { |n| n[:lastname] }
+
+    groupIds = workloadParameters[:groups].kind_of?(Array) ? workloadParameters[:groups] : []
+    groupIds.map! { |x| x.to_i }
+
+    # Find selected groups:
+    @selectedGroups =Group.where(:id => groupIds)
+
+    @selectedGroups = @selectedGroups & @groupsToDisplay
+
+    @usersToDisplay=ListUser::getUsersOfGroups(@selectedGroups)
+
+    # Get list of users that are allowed to be displayed by this user sort by lastname
+    @usersAllowedToDisplay = ListUser::getUsersAllowedToDisplay().sort_by { |u| u[:lastname] }
 
-    @num_semanas = (@total_days / 7).round
+    userIds = workloadParameters[:users].kind_of?(Array) ? workloadParameters[:users] : []
+    userIds.map! { |x| x.to_i }
 
-    current_date = @gantt.date_from
-    final_date   = @gantt.date_to
-    @barras_days = []
-    while ( current_date.to_time < final_date.to_time ) do
-      @barras_days.push( 16 * @utils.tools.distance_of_time_in_days( @gantt.date_from.to_date.strftime("%Y-%m-%d"), current_date.to_date.end_of_month.strftime("%Y-%m-%d") ) )
-      current_date = current_date.to_date.end_of_month + 1
-    end
+    # Get list of users that should be displayed.    
+    @usersToDisplay += User.where(:id => userIds)
 
+    # Intersect the list with the list of users that are allowed to be displayed.
+    @usersToDisplay = @usersToDisplay & @usersAllowedToDisplay 
+
   end
+
 
-#########
-protected
-#########
+  def sanitizeDateParameter(parameter, default)
 
-  def is_user_logged_in
-    if !User.current.logged?
-      render_403
+    if (parameter.respond_to?(:to_date)) then
+      return parameter.to_date
+    else
+      return default
     end
   end
-
 end

app/helpers/workload_filters_helper.rb

@@ -0,0 +1,31 @@
+# -*- encoding : utf-8 -*-
+module WorkloadFiltersHelper
+  def get_option_tags_for_userselection(usersToShow, selectedUsers)
+
+    result = '';
+
+    usersToShow.each do |user|
+      selected = selectedUsers.include?(user) ? 'selected="selected"' : ''
+
+      result += "<option value=\"#{h(user.id)}\" #{selected}>#{h(user.firstname)} #{h(user.lastname)} (#{h(user.name)})</option>"
+    end
+
+    return result.html_safe
+  end
+
+  def get_option_tags_for_groupselection(groupsToShow, selectedGroups)
+
+    result = '';
+
+    groupsToShow.each do |group|            
+
+      selected = selectedGroups.include?(group) ? 'selected="selected"' : ''
+
+     result += "<option value=\"#{h(group.id)}\" #{selected}>#{h(group.lastname)}</option>"
+
+    end
+
+
+    return result.html_safe
+  end  
+end

app/views/settings/_workload_settings.erb

@@ -0,0 +1,119 @@
+<%
+# This file provides configuration options for the workload plugin.
+%>
+
+<h2><%=  l(:workload_settings_general_workdays) %></h2>
+
+<p><%= l(:workload_settings_general_workdays_explanation) %></p>
+
+<p>
+  <label><%= l(:workload_settings_general_workdays_monday) %></label>
+  <input type="hidden"
+         name="settings[general_workday_monday]"
+         value=""
+  >
+  <input type="checkbox"
+         name="settings[general_workday_monday]"
+         value="checked"
+         <%= "checked" if settings['general_workday_monday'] != '' %>
+  >
+</p>
+<p>
+  <label><%= l(:workload_settings_general_workdays_tuesday) %></label>
+  <input type="hidden"
+         name="settings[general_workday_tuesday]"
+         value=""
+  >
+  <input type="checkbox"
+         name="settings[general_workday_tuesday]"
+         value="checked"
+         <%= "checked" if settings['general_workday_tuesday'] != '' %>
+  >
+</p>
+<p>
+  <label><%= l(:workload_settings_general_workdays_wednesday) %></label>
+  <input type="hidden"
+         name="settings[general_workday_wednesday]"
+         value=""
+  >
+  <input type="checkbox"
+         name="settings[general_workday_wednesday]"
+         value="checked"
+         <%= "checked" if settings['general_workday_wednesday'] != '' %>
+  >
+</p>
+<p>
+  <label><%= l(:workload_settings_general_workdays_thursday) %></label>
+  <input type="hidden"
+         name="settings[general_workday_thursday]"
+         value=""
+  >
+  <input type="checkbox"
+         name="settings[general_workday_thursday]"
+         value="checked"
+         <%= "checked" if settings['general_workday_thursday'] != '' %>
+  >
+</p>
+<p>
+  <label><%= l(:workload_settings_general_workdays_friday) %></label>
+  <input type="hidden"
+         name="settings[general_workday_friday]"
+         value=""
+  >
+  <input type="checkbox"
+         name="settings[general_workday_friday]"
+         value="checked"
+         <%= "checked" if settings['general_workday_friday'] != '' %>
+  >
+</p>
+<p>
+  <label><%= l(:workload_settings_general_workdays_saturday) %></label>
+  <input type="hidden"
+         name="settings[general_workday_saturday]"
+         value=""
+  >
+  <input type="checkbox"
+         name="settings[general_workday_saturday]"
+         value="checked"
+         <%= "checked" if settings['general_workday_saturday'] != '' %>
+  >
+</p>
+<p>
+  <label><%= l(:workload_settings_general_workdays_sunday) %></label>
+  <input type="hidden"
+         name="settings[general_workday_sunday]"
+         value=""
+  >
+  <input type="checkbox"
+         name="settings[general_workday_sunday]"
+         value="checked"
+         <%= "checked" if settings['general_workday_sunday'] != '' %>
+  >
+</p>
+
+<h2><%=  l(:workload_settings_hours) %></h2>
+
+<p>
+  <%= l(:workload_settings_leastdailyworkload) %>
+</p>
+<p>
+  <label><%= l(:workload_settings_hours_low_min) %></label>
+  <input type="text"
+         name="settings[threshold_lowload_min]"
+         value="<%= settings['threshold_lowload_min'] %>"
+  >
+</p>
+<p>
+  <label><%= l(:workload_settings_hours_normal_min) %></label>
+  <input type="text"
+         name="settings[threshold_normalload_min]"
+         value="<%= settings['threshold_normalload_min'] %>"
+  >
+</p>
+<p>
+  <label><%= l(:workload_settings_hours_high_min) %></label>
+  <input type="text"
+         name="settings[threshold_highload_min]"
+         value="<%= settings['threshold_highload_min'] %>"
+  >
+</p>