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

Show duration instead of hours below calendar

Browse source 
FEA: ItEr60S19TimeUnitDataType
This commit is contained in:
Óscar González Fernández 2010-08-23 22:15:36 +02:00
parent 6a7c6d8689
commit f76e93815a
5 changed files with 18 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
navalplanner-business/src/main/java/org/navalplanner/business/calendars/entities/BaseCalendar.java
View file

@ -300,10 +300,10 @@ public class BaseCalendar extends IntegrationEntity implements IWorkHours {
* calendar restrictions.
*/
public Integer getCapacityAt(LocalDate date) {
return roundToHours(getWorkableHours(date));
return roundToHours(getWorkableTimeAt(date));
}
private EffortDuration getWorkableHours(LocalDate date) {
public EffortDuration getWorkableTimeAt(LocalDate date) {
if (!isActive(date)) {
return EffortDuration.zero();
}
@ -908,7 +908,7 @@ public class BaseCalendar extends IntegrationEntity implements IWorkHours {
@Override
public Integer toHours(LocalDate day, ResourcesPerDay resourcesPerDay) {
final EffortDuration workableHours = getWorkableHours(day);
final EffortDuration workableHours = getWorkableTimeAt(day);
return roundToHours(limitOverAssignability(day,
resourcesPerDay.asDurationGivenWorkingDayOf(workableHours),
workableHours));

4
navalplanner-webapp/src/main/java/org/navalplanner/web/calendars/BaseCalendarEditionController.java
View file

@ -452,8 +452,8 @@ public abstract class BaseCalendarEditionController extends
}
}
public Integer getHoursOfDay() {
return baseCalendarModel.getHoursOfDay();
public String getWorkableTime() {
return asString(baseCalendarModel.getWorkableTime());
}
public void createException() {

9
navalplanner-webapp/src/main/java/org/navalplanner/web/calendars/BaseCalendarModel.java
View file

@ -237,6 +237,15 @@ public class BaseCalendarModel implements IBaseCalendarModel {
return getBaseCalendar().getWorkableHours(selectedDate);
}
@Override
public EffortDuration getWorkableTime() {
if (getBaseCalendar() == null) {
return null;
}
return getBaseCalendar().getWorkableTimeAt(
LocalDate.fromDateFields(selectedDate));
}
@Override
public DayType getTypeOfDay() {
if (getBaseCalendar() == null) {

2
navalplanner-webapp/src/main/java/org/navalplanner/web/calendars/IBaseCalendarModel.java
View file

@ -110,6 +110,8 @@ public interface IBaseCalendarModel {
Integer getHoursOfDay();
EffortDuration getWorkableTime();
void createException(CalendarExceptionType type, Date startDate,
Date endDate, Integer hours);

4
navalplanner-webapp/src/main/webapp/calendars/_edition.zul
View file

@ -64,8 +64,8 @@
</hbox>
<hbox>
<label value="${i18n:_('Hours of day')}" />
<label value="@{calendarController.editionController.hoursOfDay}" />
<label value="${i18n:_('Workable time')}" />
<label value="@{calendarController.editionController.workableTime}" />
</hbox>
</vbox>