RenJuan/TASKPM
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

ItEr32S12CUAsignacionGrupoRecursosAPlanificacionItEr31S15: Creating package for load chart

Browse source
This commit is contained in:
Óscar González Fernández 2009-10-27 11:57:06 +01:00
parent 19e65c1650
commit 4d03e1d9e8
5 changed files with 15 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
navalplanner-webapp/src/main/java/org/navalplanner/web/planner/CompanyPlanningModel.java
View file

@ -45,6 +45,8 @@ import org.navalplanner.business.planner.entities.TaskGroup;
import org.navalplanner.business.planner.entities.TaskMilestone;
import org.navalplanner.business.resources.daos.IResourceDAO;
import org.navalplanner.business.resources.entities.Resource;
import org.navalplanner.web.planner.loadchart.LoadChart;
import org.navalplanner.web.planner.loadchart.LoadChartFiller;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.beans.factory.config.BeanDefinition;
import org.springframework.context.annotation.Scope;
@ -360,7 +362,8 @@ public abstract class CompanyPlanningModel implements ICompanyPlanningModel {
*/
private SortedMap<LocalDate, Integer> calculateHoursAdditionByDay(
List<DayAssignment> dayAssignments) {
return new DefaultDayAssignmentCalculator().calculate(dayAssignments);
return new DefaultDayAssignmentCalculator()
.calculate(dayAssignments);
}
}

2
navalplanner-webapp/src/main/java/org/navalplanner/web/planner/OrderPlanningModel.java
View file

@ -50,6 +50,8 @@ import org.navalplanner.web.planner.ITaskElementAdapter.IOnMoveListener;
import org.navalplanner.web.planner.allocation.ResourceAllocationController;
import org.navalplanner.web.planner.calendar.CalendarAllocationController;
import org.navalplanner.web.planner.calendar.ICalendarAllocationCommand;
import org.navalplanner.web.planner.loadchart.LoadChart;
import org.navalplanner.web.planner.loadchart.LoadChartFiller;
import org.navalplanner.web.planner.milestone.IAddMilestoneCommand;
import org.navalplanner.web.planner.splitting.IMergeTaskCommand;
import org.navalplanner.web.planner.splitting.ISplitTaskCommand;

2
navalplanner-webapp/src/main/java/org/navalplanner/web/planner/ILoadChartFiller.java → navalplanner-webapp/src/main/java/org/navalplanner/web/planner/loadchart/ILoadChartFiller.java
View file

@ -18,7 +18,7 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
package org.navalplanner.web.planner;
package org.navalplanner.web.planner.loadchart;
import org.zkforge.timeplot.Timeplot;
import org.zkoss.ganttz.timetracker.zoom.ZoomLevel;

4
navalplanner-webapp/src/main/java/org/navalplanner/web/planner/LoadChart.java → navalplanner-webapp/src/main/java/org/navalplanner/web/planner/loadchart/LoadChart.java
View file

@ -17,7 +17,7 @@
* You should have received a copy of the GNU Affero General Public License
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
package org.navalplanner.web.planner;
package org.navalplanner.web.planner.loadchart;
import org.apache.commons.lang.Validate;
import org.zkforge.timeplot.Timeplot;
@ -43,7 +43,7 @@ public class LoadChart {
this.timeTracker = timeTracker;
}
void fillChart() {
public void fillChart() {
filler.fillChart(timeplot, timeTracker.getRealInterval(), timeTracker.getHorizontalSize());
}

8
navalplanner-webapp/src/main/java/org/navalplanner/web/planner/LoadChartFiller.java → navalplanner-webapp/src/main/java/org/navalplanner/web/planner/loadchart/LoadChartFiller.java
View file

@ -18,7 +18,7 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
package org.navalplanner.web.planner;
package org.navalplanner.web.planner.loadchart;
import java.io.IOException;
import java.io.PrintWriter;
@ -51,7 +51,8 @@ import org.zkoss.zk.ui.Executions;
public abstract class LoadChartFiller implements ILoadChartFiller {
protected abstract class HoursByDayCalculator<T> {
SortedMap<LocalDate, Integer> calculate(Collection<? extends T> elements) {
public SortedMap<LocalDate, Integer> calculate(
Collection<? extends T> elements) {
SortedMap<LocalDate, Integer> result = new TreeMap<LocalDate, Integer>();
if (elements.isEmpty()) {
return result;
@ -80,6 +81,9 @@ public abstract class LoadChartFiller implements ILoadChartFiller {
protected class DefaultDayAssignmentCalculator extends
HoursByDayCalculator<DayAssignment> {
public DefaultDayAssignmentCalculator() {
}
@Override
protected LocalDate getDayFor(DayAssignment element) {
return element.getDay();