diff --git a/src/main/java/org/gcube/portlets/user/accountingdashboard/client/application/mainarea/filter/FilterAreaView.java b/src/main/java/org/gcube/portlets/user/accountingdashboard/client/application/mainarea/filter/FilterAreaView.java index 25a1cda..0483866 100644 --- a/src/main/java/org/gcube/portlets/user/accountingdashboard/client/application/mainarea/filter/FilterAreaView.java +++ b/src/main/java/org/gcube/portlets/user/accountingdashboard/client/application/mainarea/filter/FilterAreaView.java @@ -96,7 +96,14 @@ public class FilterAreaView extends ViewWithUiHandlers yearStart.addItem(String.valueOf(i)); yearEnd.addItem(String.valueOf(i)); } - yearStart.setSelectedValue(String.valueOf(year)); + + String yearStartDefaultValue; + if(year==2015){ + yearStartDefaultValue="2015"; + } else { + yearStartDefaultValue=String.valueOf(year-1); + } + yearStart.setSelectedValue(yearStartDefaultValue); yearEnd.setSelectedValue(String.valueOf(year)); yearStart.addChangeHandler(new ChangeHandler() { @@ -133,7 +140,7 @@ public class FilterAreaView extends ViewWithUiHandlers String currentMonth = DateTimeFormat.getFormat(PredefinedFormat.MONTH).format(now); - monthStart.setSelectedValue(months[0]); + monthStart.setSelectedValue(currentMonth); monthEnd.setSelectedValue(currentMonth); monthStart.addChangeHandler(new ChangeHandler() {