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

Day zoomlevel shows different column style for project non workable days

Browse source 
In company view default calendar is shown

FEA: ItEr67S06WaterMarkProjectCalendar
This commit is contained in:
Lorenzo Tilve 2011-01-04 12:30:22 +01:00
parent 70aa231264
commit 6e2614839f
3 changed files with 25 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
ganttzk/src/main/java/org/zkoss/ganttz/timetracker/zoom/DetailItem.java
View file

@ -175,10 +175,7 @@ public final class DetailItem {
}
public void markBankHoliday() {
int dayOfWeek = getStartDate().dayOfWeek().get();
if ((dayOfWeek == 6) || (dayOfWeek == 7)) {
setBankHoliday(true);
}
setBankHoliday(true);
}
}

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

@ -19,6 +19,8 @@
*/
package org.navalplanner.web.planner.order;
import org.navalplanner.business.calendars.entities.BaseCalendar;
import org.navalplanner.business.common.Registry;
import org.zkoss.ganttz.timetracker.zoom.DetailItem;
import org.zkoss.ganttz.timetracker.zoom.IDetailItemModificator;
import org.zkoss.ganttz.timetracker.zoom.ZoomLevel;
@ -28,10 +30,25 @@ import org.zkoss.ganttz.timetracker.zoom.ZoomLevel;
*/
public final class BankHolidaysMarker implements
IDetailItemModificator {
BaseCalendar calendar;
public BankHolidaysMarker() {
this.calendar = Registry.getConfigurationDAO().getConfiguration()
.getDefaultCalendar();
}
public BankHolidaysMarker(BaseCalendar calendar) {
this.calendar = calendar;
}
@Override
public DetailItem applyModificationsTo(DetailItem item, ZoomLevel z) {
if (z == ZoomLevel.DETAIL_FIVE) {
item.markBankHoliday();
if (z == ZoomLevel.DETAIL_FIVE && calendar != null) {
if (calendar.getWorkableTimeAt(item.getStartDate().toLocalDate())
.isZero()) {
item.markBankHoliday();
}
}
return item;
}

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

@ -94,8 +94,8 @@ import org.navalplanner.web.planner.calendar.ICalendarAllocationCommand;
import org.navalplanner.web.planner.chart.Chart;
import org.navalplanner.web.planner.chart.ChartFiller;
import org.navalplanner.web.planner.chart.EarnedValueChartFiller;
import org.navalplanner.web.planner.chart.EarnedValueChartFiller.EarnedValueType;
import org.navalplanner.web.planner.chart.IChartFiller;
import org.navalplanner.web.planner.chart.EarnedValueChartFiller.EarnedValueType;
import org.navalplanner.web.planner.consolidations.AdvanceConsolidationController;
import org.navalplanner.web.planner.consolidations.IAdvanceConsolidationCommand;
import org.navalplanner.web.planner.milestone.IAddMilestoneCommand;
@ -568,10 +568,12 @@ public abstract class OrderPlanningModel implements IOrderPlanningModel {
PlannerConfiguration<TaskElement> configuration) {
if (orderReloaded.getDeadline() != null) {
configuration.setSecondLevelModificators(SeveralModificators
.create(new BankHolidaysMarker(),
.create(new BankHolidaysMarker(orderReloaded
.getCalendar()),
createDeadlineShower(orderReloaded.getDeadline())));
} else {
configuration.setSecondLevelModificators(new BankHolidaysMarker());
configuration.setSecondLevelModificators(new BankHolidaysMarker(
orderReloaded.getCalendar()));
}
}