diff --git a/.classpath b/.classpath
index 38083dc..5c0febd 100644
--- a/.classpath
+++ b/.classpath
@@ -1,12 +1,12 @@
-
+
-
+
@@ -50,5 +50,5 @@
-
+
diff --git a/.settings/org.eclipse.wst.common.component b/.settings/org.eclipse.wst.common.component
index 6d41532..822ca16 100644
--- a/.settings/org.eclipse.wst.common.component
+++ b/.settings/org.eclipse.wst.common.component
@@ -1,5 +1,5 @@
-
+
diff --git a/pom.xml b/pom.xml
index d83ea4b..5c90dc4 100644
--- a/pom.xml
+++ b/pom.xml
@@ -13,7 +13,7 @@
4.0.0
org.gcube.portlets.user
accounting-dashboard
- 1.3.0
+ 1.2.0
war
accounting-dashboard
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 a200cae..d5dc7e0 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
@@ -16,8 +16,8 @@ import org.gcube.portlets.user.accountingdashboard.shared.data.RequestReportData
import org.gcube.portlets.user.accountingdashboard.shared.data.ScopeData;
import org.gcube.portlets.user.accountingdashboard.shared.options.TreeOptions;
-import com.github.gwtbootstrap.client.ui.Button;
import com.github.gwtbootstrap.client.ui.ListBox;
+import com.github.gwtbootstrap.client.ui.RadioButton;
import com.google.gwt.core.client.GWT;
import com.google.gwt.event.dom.client.ChangeEvent;
import com.google.gwt.event.dom.client.ChangeHandler;
@@ -67,10 +67,10 @@ public class FilterAreaView extends ViewWithUiHandlers
ListBox monthEnd;
@UiField(provided = true)
- Button btnShowDetachedREs;
+ RadioButton btnShowDetachedREs;
@UiField(provided = true)
- Button btnHideDetachedREs;
+ RadioButton btnHideDetachedREs;
@UiField(provided = true)
CellTree scopeTree;
@@ -173,7 +173,7 @@ public class FilterAreaView extends ViewWithUiHandlers
logger.log(Level.FINE, "Configuring buttons DetachedREs");
- btnShowDetachedREs=new Button();
+ btnShowDetachedREs=new RadioButton("radioDetachedREs");
btnShowDetachedREs.addClickHandler(new ClickHandler() {
@Override
@@ -183,7 +183,8 @@ public class FilterAreaView extends ViewWithUiHandlers
}
});
- btnHideDetachedREs=new Button();
+ btnHideDetachedREs=new RadioButton("radioDetachedREs");
+ btnHideDetachedREs.setValue(true);
btnHideDetachedREs.addClickHandler(new ClickHandler() {
@Override
diff --git a/src/main/java/org/gcube/portlets/user/accountingdashboard/client/application/mainarea/filter/FilterAreaView.ui.xml b/src/main/java/org/gcube/portlets/user/accountingdashboard/client/application/mainarea/filter/FilterAreaView.ui.xml
index 4a661da..55f27eb 100644
--- a/src/main/java/org/gcube/portlets/user/accountingdashboard/client/application/mainarea/filter/FilterAreaView.ui.xml
+++ b/src/main/java/org/gcube/portlets/user/accountingdashboard/client/application/mainarea/filter/FilterAreaView.ui.xml
@@ -17,7 +17,7 @@
- From:
+ From:
@@ -27,7 +27,7 @@
- To:
+ To:
@@ -37,14 +37,14 @@
- DetachedREs:
+ Detached:
-
-
-
-
+
+
+
+
- Show DetachedREs
+ Show Detached REs
diff --git a/src/main/java/org/gcube/portlets/user/accountingdashboard/client/resources/uiData.css b/src/main/java/org/gcube/portlets/user/accountingdashboard/client/resources/uiData.css
index bff001c..9a8f084 100644
--- a/src/main/java/org/gcube/portlets/user/accountingdashboard/client/resources/uiData.css
+++ b/src/main/java/org/gcube/portlets/user/accountingdashboard/client/resources/uiData.css
@@ -41,7 +41,7 @@
}
.uiDataFiltersControls {
- margin-left: 60px;
+ margin-left: 80px;
}
.uiDataExploreTree {
diff --git a/src/main/java/org/gcube/portlets/user/accountingdashboard/shared/options/TreeOptions.java b/src/main/java/org/gcube/portlets/user/accountingdashboard/shared/options/TreeOptions.java
index dad03bd..5bed26e 100644
--- a/src/main/java/org/gcube/portlets/user/accountingdashboard/shared/options/TreeOptions.java
+++ b/src/main/java/org/gcube/portlets/user/accountingdashboard/shared/options/TreeOptions.java
@@ -12,6 +12,10 @@ public class TreeOptions implements Serializable {
private static final long serialVersionUID = 730133583251742872L;
private boolean showDetachedREs = false;
+
+ public TreeOptions() {
+ super();
+ }
public TreeOptions(boolean showDetachedREs) {
super();