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

Rename method to reflect better meaning

Browse source 
FEA: ItEr68OTS05IntroducionLimiteSobreasignacionCalendarios
This commit is contained in:
Óscar González Fernández 2011-01-18 16:31:38 +01:00
parent 458eefae12
commit 8b80e15ad6
8 changed files with 23 additions and 22 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -338,7 +338,7 @@ public class BaseCalendar extends IntegrationEntity implements ICalendar {
private boolean isOverAssignable(LocalDate localDate) {
CalendarException exceptionDay = getExceptionDay(localDate);
if (exceptionDay != null) {
return exceptionDay.getType().isOverAssignable();
return exceptionDay.getType().isOverAssignableWithoutLimit();
}
return true;
}
@ -1021,7 +1021,7 @@ public class BaseCalendar extends IntegrationEntity implements ICalendar {
private boolean canWorkAt(CalendarException each) {
return !each.getDuration().isZero()
|| each.getType().isOverAssignable();
|| each.getType().isOverAssignableWithoutLimit();
}
@Override

2
navalplanner-business/src/main/java/org/navalplanner/business/calendars/entities/CalendarData.java
View file

@ -115,7 +115,7 @@ public class CalendarData extends IntegrationEntity {
if (duration == null) {
return null;
}
return Capacity.create(duration).overAssignable(true);
return Capacity.create(duration).overAssignableWithoutLimit(true);
}
public EffortDuration getDurationAt(Days day) {

10
navalplanner-business/src/main/java/org/navalplanner/business/calendars/entities/CalendarExceptionType.java
View file

@ -84,7 +84,7 @@ public class CalendarExceptionType extends IntegrationEntity {
this.name = name;
this.color = color;
this.capacity = Capacity.zero();
this.capacity = this.capacity.overAssignable(!BooleanUtils
this.capacity = this.capacity.overAssignableWithoutLimit(!BooleanUtils
.isTrue(notOverAssignable));
}
@ -117,17 +117,17 @@ public class CalendarExceptionType extends IntegrationEntity {
/**
* @return If more hours can be assigned on this day.
*/
public boolean isOverAssignable() {
return capacity.isOverAssignable();
public boolean isOverAssignableWithoutLimit() {
return capacity.isOverAssignableWithoutLimit();
}
public void setOverAssignable(Boolean overAssignable) {
this.capacity = capacity.overAssignable(BooleanUtils
this.capacity = capacity.overAssignableWithoutLimit(BooleanUtils
.isTrue(overAssignable));
}
public String getOverAssignableStr() {
return isOverAssignable() ? _("Yes") : _("No");
return isOverAssignableWithoutLimit() ? _("Yes") : _("No");
}
public EffortDuration getDuration() {

7
navalplanner-business/src/main/java/org/navalplanner/business/calendars/entities/Capacity.java
View file

@ -75,7 +75,7 @@ public class Capacity {
return allowedExtraEffort;
}
public boolean isOverAssignable() {
public boolean isOverAssignableWithoutLimit() {
return allowedExtraEffort == null;
}
@ -87,8 +87,9 @@ public class Capacity {
return new Capacity(standardEffort, allowedExtraEffort);
}
public Capacity overAssignable(boolean overAssignable) {
if (overAssignable) {
public Capacity overAssignableWithoutLimit(
boolean overAssignableWithoutLimit) {
if (overAssignableWithoutLimit) {
return new Capacity(standardEffort, null);
} else {
return new Capacity(standardEffort,

10
navalplanner-business/src/test/java/org/navalplanner/business/test/calendars/entities/CapacityTest.java
View file

@ -44,9 +44,9 @@ public class CapacityTest {
}
@Test
public void ifOnlyTheStandardCapacitySpecifiedIsOverAssignable() {
public void ifOnlyTheStandardCapacitySpecifiedIsOverAssignableWithoutLimit() {
Capacity capacity = Capacity.create(hours(8));
assertTrue(capacity.isOverAssignable());
assertTrue(capacity.isOverAssignableWithoutLimit());
}
@Test
@ -56,9 +56,9 @@ public class CapacityTest {
}
@Test
public void ifHasAllowedExtraEffortItsNotOverassignable() {
public void ifHasAllowedExtraEffortItsNotOverassignableWithoutLimit() {
Capacity capacity = Capacity.create(hours(8)).extraEffort(hours(0));
assertFalse(capacity.isOverAssignable());
assertFalse(capacity.isOverAssignableWithoutLimit());
}
@Test
@ -75,7 +75,7 @@ public class CapacityTest {
@Test
public void aZeroCapacityIsNotOverAssignable() {
assertFalse(Capacity.zero().isOverAssignable());
assertFalse(Capacity.zero().isOverAssignableWithoutLimit());
}
@Test

8
navalplanner-webapp/src/main/java/org/navalplanner/web/common/components/CapacityPicker.java
View file

@ -103,13 +103,13 @@ public class CapacityPicker {
@Override
public Boolean get() {
return currentCapacity.isOverAssignable();
return currentCapacity.isOverAssignableWithoutLimit();
}
}, new Setter<Boolean>() {
@Override
public void set(Boolean value) {
updateCapacity(currentCapacity.overAssignable(BooleanUtils
updateCapacity(currentCapacity.overAssignableWithoutLimit(BooleanUtils
.isTrue(value)));
updateExtraEffortDisability(extraEffortPicker);
}
@ -120,7 +120,7 @@ public class CapacityPicker {
private void updateExtraEffortDisability(
EffortDurationPicker extraHoursPicker) {
extraHoursPicker.setDisabled(currentCapacity.isOverAssignable());
extraHoursPicker.setDisabled(currentCapacity.isOverAssignableWithoutLimit());
}
private void updateCapacity(Capacity newCapacity) {
@ -136,7 +136,7 @@ public class CapacityPicker {
public void setValue(Capacity capacity) {
overAssignableWithoutLimitCheckbox.setChecked(capacity
.isOverAssignable());
.isOverAssignableWithoutLimit());
standardEffortPicker.setValue(capacity.getStandardEffort());
extraEffortPicker.setValue(capacity.getAllowedExtraEffort());
currentCapacity = capacity;

2
navalplanner-webapp/src/main/java/org/navalplanner/ws/calendarexceptiontypes/impl/CalendarExceptionTypeConverter.java
View file

@ -41,7 +41,7 @@ public final class CalendarExceptionTypeConverter {
int seconds = (duration != null) ? duration.getSeconds() : 0;
return new CalendarExceptionTypeDTO(calendarExceptionType.getCode(),
calendarExceptionType.getName(), calendarExceptionType
.getColor(), calendarExceptionType.isOverAssignable(),
.getColor(), calendarExceptionType.isOverAssignableWithoutLimit(),
seconds);
}

2
navalplanner-webapp/src/test/java/org/navalplanner/web/test/ws/calendarexceptiontypes/api/CalendarExceptionTypeServiceTest.java
View file

@ -101,7 +101,7 @@ public class CalendarExceptionTypeServiceTest {
assertThat(calendarExceptionTypeDTO.color,
equalTo(calendarExceptionType.getColor()));
assertThat(calendarExceptionTypeDTO.overAssignable,
equalTo(calendarExceptionType.isOverAssignable()));
equalTo(calendarExceptionType.isOverAssignableWithoutLimit()));
}
}