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

[Bug #792] Fix bug

Browse source 
If the first level loaded is not the five the calendar was not loaded
at all. Now it's always ensured that it's loaded.

FEA: ItEr67S04BugFixing
This commit is contained in:
Óscar González Fernández 2011-01-05 16:03:07 +01:00
parent 75a69ede67
commit 23aac9824f
5 changed files with 19 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
navalplanner-webapp/src/main/java/org/navalplanner/web/limitingresources/LimitingResourcesController.java
View file

@ -204,7 +204,7 @@ public class LimitingResourcesController extends GenericForwardComposer {
return timeTracker = new TimeTracker(limitingResourceQueueModel return timeTracker = new TimeTracker(limitingResourceQueueModel
.getViewInterval(), ZoomLevel.DETAIL_THREE, .getViewInterval(), ZoomLevel.DETAIL_THREE,
SeveralModificators.create(), SeveralModificators.create(),
SeveralModificators.create(new BankHolidaysMarker(getDefaultCalendar())),parent); SeveralModificators.create(BankHolidaysMarker.create(getDefaultCalendar())),parent);
} }
private BaseCalendar getDefaultCalendar() { private BaseCalendar getDefaultCalendar() {

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

@ -288,8 +288,7 @@ public abstract class CompanyPlanningModel implements ICompanyPlanningModel {
OrderPlanningModel.configureInitialZoomLevelFor(planner, OrderPlanningModel.configureInitialZoomLevelFor(planner,
defaultZoomLevel); defaultZoomLevel);
configuration.setSecondLevelModificators(new BankHolidaysMarker( configuration.setSecondLevelModificators(BankHolidaysMarker.create(getDefaultCalendar()));
getDefaultCalendar()));
planner.setConfiguration(configuration); planner.setConfiguration(configuration);
if(expandPlanningViewChart) { if(expandPlanningViewChart) {

20
navalplanner-webapp/src/main/java/org/navalplanner/web/planner/order/BankHolidaysMarker.java
View file

@ -23,6 +23,7 @@ import org.apache.commons.lang.Validate;
import org.navalplanner.business.calendars.entities.BaseCalendar; import org.navalplanner.business.calendars.entities.BaseCalendar;
import org.navalplanner.business.calendars.entities.ICalendar; import org.navalplanner.business.calendars.entities.ICalendar;
import org.navalplanner.business.workingday.IntraDayDate.PartialDay; import org.navalplanner.business.workingday.IntraDayDate.PartialDay;
import org.navalplanner.web.calendars.BaseCalendarModel;
import org.zkoss.ganttz.timetracker.zoom.DetailItem; import org.zkoss.ganttz.timetracker.zoom.DetailItem;
import org.zkoss.ganttz.timetracker.zoom.IDetailItemModificator; import org.zkoss.ganttz.timetracker.zoom.IDetailItemModificator;
import org.zkoss.ganttz.timetracker.zoom.ZoomLevel; import org.zkoss.ganttz.timetracker.zoom.ZoomLevel;
@ -33,14 +34,21 @@ import org.zkoss.ganttz.timetracker.zoom.ZoomLevel;
public final class BankHolidaysMarker implements public final class BankHolidaysMarker implements
IDetailItemModificator { IDetailItemModificator {
private final ICalendar calendar; public static BankHolidaysMarker create(BaseCalendar calendar) {
BaseCalendarModel.forceLoadBaseCalendar(calendar);
public BankHolidaysMarker(ICalendar calendar) { return new BankHolidaysMarker(calendar);
Validate.notNull(calendar);
this.calendar = calendar;
} }
public BankHolidaysMarker(BaseCalendar calendar) { private final ICalendar calendar;
/**
* <strong>Important: </strong>Make sure that the provided calendar has all
* its associated data loaded.
*
* @param calendar
*/
public BankHolidaysMarker(ICalendar calendar) {
Validate.notNull(calendar);
this.calendar = calendar; this.calendar = calendar;
} }

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

@ -568,12 +568,11 @@ public abstract class OrderPlanningModel implements IOrderPlanningModel {
PlannerConfiguration<TaskElement> configuration) { PlannerConfiguration<TaskElement> configuration) {
if (orderReloaded.getDeadline() != null) { if (orderReloaded.getDeadline() != null) {
configuration.setSecondLevelModificators(SeveralModificators configuration.setSecondLevelModificators(SeveralModificators
.create(new BankHolidaysMarker(orderReloaded .create(BankHolidaysMarker.create(orderReloaded
.getCalendar()), .getCalendar()),
createDeadlineShower(orderReloaded.getDeadline()))); createDeadlineShower(orderReloaded.getDeadline())));
} else { } else {
configuration.setSecondLevelModificators(new BankHolidaysMarker( configuration.setSecondLevelModificators(BankHolidaysMarker.create(orderReloaded.getCalendar()));
orderReloaded.getCalendar()));
} }
} }

2
navalplanner-webapp/src/main/java/org/navalplanner/web/resourceload/ResourceLoadController.java
View file

@ -268,7 +268,7 @@ public class ResourceLoadController implements Composer {
private BankHolidaysMarker createBankHolidaysMarker() { private BankHolidaysMarker createBankHolidaysMarker() {
BaseCalendar defaultCalendar = configurationDAO.getConfiguration() BaseCalendar defaultCalendar = configurationDAO.getConfiguration()
.getDefaultCalendar(); .getDefaultCalendar();
return new BankHolidaysMarker(defaultCalendar); return BankHolidaysMarker.create(defaultCalendar);
} }
private void buildResourcesLoadPanel() { private void buildResourcesLoadPanel() {