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

Bug #1343: Show default filtering dates on company view.

Browse source 
They are calculated by default as the start and end dates of the first and last
open projects, but the user had no feedback on which were those dates.

FEA: ItEr76S04BugFixing
This commit is contained in:
Jacobo Aragunde Pérez 2012-02-02 19:25:13 +01:00
parent 64f5d2665b
commit 3db00dffff
1 changed files with 7 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
libreplan-webapp/src/main/java/org/libreplan/web/planner/company/CompanyPlanningController.java
View file

@ -286,7 +286,13 @@ public class CompanyPlanningController implements Composer {
Boolean includeOrderElements = checkIncludeOrderElements.isChecked();
if (listFilters.isEmpty() && startDate == null && finishDate == null) {
return model.getDefaultPredicate(includeOrderElements);
IPredicate predicate = model.getDefaultPredicate(includeOrderElements);
//show filter dates calculated by default on screen
filterStartDate.setValue(model.getFilterStartDate().
toDateMidnight().toDate());
filterFinishDate.setValue(model.getFilterFinishDate().
toDateMidnight().toDate());
return predicate;
}
return new TaskGroupPredicate(listFilters, startDate, finishDate,
includeOrderElements);