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

Recalculates the load ratios on changing the filtering dates and incorporates interface validations in the filtering dates dateboxes

Browse source 
FEA: ItEr77S10ResourceAllocationLoadInformation
This commit is contained in:
Javier Moran Rua 2012-10-13 17:36:40 +02:00 • committed by Manuel Rego Casasnovas
parent 7ae2ee1e4e
commit d7ed3aa149
4 changed files with 71 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
libreplan-webapp/src/main/java/org/libreplan/web/common/components/NewAllocationSelector.java
View file

@ -168,11 +168,11 @@ public class NewAllocationSelector extends AllocationSelector {
}
public void setEndFilteringDate(Date d) {
selectorController.setEndFilteringDate(d);
getController().setEndFilteringDate(d);
}
public void setStartFilteringDate(Date d) {
selectorController.setStartFilteringDate(d);
getController().setStartFilteringDate(d);
}
}

1
libreplan-webapp/src/main/java/org/libreplan/web/planner/allocation/ResourceAllocationController.java
View file

@ -691,5 +691,4 @@ public class ResourceAllocationController extends GenericForwardComposer {
|| formBinder.isTaskUpdatedFromTimesheets();
}
}

68
libreplan-webapp/src/main/java/org/libreplan/web/resources/search/NewAllocationSelectorController.java
View file

@ -21,6 +21,8 @@
package org.libreplan.web.resources.search;
import static org.libreplan.web.I18nHelper._;
import java.math.BigDecimal;
import java.util.ArrayList;
import java.util.Arrays;
@ -48,10 +50,12 @@ import org.libreplan.web.common.components.ResourceAllocationBehaviour;
import org.libreplan.web.planner.allocation.INewAllocationsAdder;
import org.zkoss.lang.Objects;
import org.zkoss.zk.ui.Component;
import org.zkoss.zk.ui.WrongValueException;
import org.zkoss.zk.ui.event.Event;
import org.zkoss.zk.ui.event.EventListener;
import org.zkoss.zk.ui.event.Events;
import org.zkoss.zk.ui.event.InputEvent;
import org.zkoss.zul.Constraint;
import org.zkoss.zul.Datebox;
import org.zkoss.zul.Label;
import org.zkoss.zul.Listbox;
@ -98,7 +102,6 @@ public class NewAllocationSelectorController extends
private ResourceAllocationBehaviour behaviour;
public NewAllocationSelectorController(ResourceAllocationBehaviour behaviour) {
this.behaviour = behaviour;
}
@ -114,6 +117,23 @@ public class NewAllocationSelectorController extends
initializeCriteriaTree();
initializeListboxResources();
initializeAllocationTypeSelector();
initializeFilteringDates();
}
private void initializeFilteringDates() {
// Start and end filtering dates are initialized here because
// they cannot be empty and must have always a value. The
// task start date and task end date are not available at the first
// rendering. Thus, the current date and current date + 1 day are used
// as the value to initialize the components although will
// never be visible by the user.
Date initDate = new Date();
setStartFilteringDate(initDate);
setEndFilteringDate(LocalDate.fromDateFields(initDate).plusDays(1)
.toDateTimeAtStartOfDay().toDate());
startDateLoadRatiosDatebox
.setConstraint(checkConstraintFilteringDate());
endDateLoadRatiosDatebox.setConstraint(checkConstraintFilteringDate());
}
private void initializeCriteriaTree() {
@ -238,8 +258,7 @@ public class NewAllocationSelectorController extends
.fromDateFields(startDateLoadRatiosDatebox
.getValue()),
LocalDate.fromDateFields(endDateLoadRatiosDatebox
.getValue()),
scenarioManager.getCurrent());
.getValue()), scenarioManager.getCurrent());
result.add(new ResourceWithItsLoadRatios(each, t));
}
@ -648,4 +667,47 @@ public class NewAllocationSelectorController extends
public void setStartFilteringDate(Date d) {
startDateLoadRatiosDatebox.setValue(d);
}
public void updateLoadRatios() {
searchResources("", getSelectedCriterions());
}
public Constraint checkConstraintFilteringDate() {
return new Constraint() {
@Override
public void validate(Component comp, Object value) throws WrongValueException {
if (value == null) {
if (comp.getId().equals("startDateLoadRatiosDatebox")) {
throw new WrongValueException(comp,
_("Start filtering date cannot be empty"));
} else if (comp.getId().equals("endDateLoadRatiosDatebox")) {
throw new WrongValueException(comp,
_("End filtering date cannot be empty"));
}
}
Date startDate = null;
if (comp.getId().equals("startDateLoadRatiosDatebox")) {
startDate = (Date) value;
} else {
startDate = (Date) startDateLoadRatiosDatebox.getRawValue();
}
Date endDate = null;
if (comp.getId().equals("endDateLoadRatiosDatebox")) {
endDate = (Date) value;
} else {
endDate = (Date) endDateLoadRatiosDatebox.getRawValue();
}
if ((startDate != null) && (endDate != null)) {
if ((startDate.after(endDate))
|| (startDate.equals(endDate))) {
throw new WrongValueException(comp,_("Start filtering date must be before than end filtering date"));
}
}
}
};
}
}

6
libreplan-webapp/src/main/webapp/resources/search/allocation_selector.zul
View file

@ -54,11 +54,13 @@
<rows>
<row>
<label value="${i18n:_('Start date')}:"/>
<datebox id="startDateLoadRatiosDatebox"/>
<datebox id="startDateLoadRatiosDatebox"
onChange="selectorController.updateLoadRatios()"/>
</row>
<row>
<label value="${i18n:_('End date')}:"/>
<datebox id="endDateLoadRatiosDatebox"/>
<datebox id="endDateLoadRatiosDatebox"
onChange="selectorController.updateLoadRatios()"/>
</row>
</rows>
</grid>