From 26968a4db29aa73d69708092a2dfdec2961f0f81 Mon Sep 17 00:00:00 2001 From: "giancarlo.panichi" Date: Thu, 19 Jul 2018 17:17:57 +0000 Subject: [PATCH] ref 12119:AccountingDashboard - Create a new Accounting Dashboard https://support.d4science.org/issues/12119 Updated the date range in the default case git-svn-id: https://svn.d4science.research-infrastructures.eu/gcube/trunk/portlets/user/accounting-dashboard@169862 82a268e6-3cf1-43bd-a215-b396298e98cf --- .../application/mainarea/filter/FilterAreaView.java | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) 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() {