From 3e0c975f914bc0a3bf773f0738e25ccbc95b11e7 Mon Sep 17 00:00:00 2001
From: Giancarlo Panichi <Giancarlo Panichi@panichipc>
Date: Tue, 7 Apr 2020 19:00:10 +0200
Subject: [PATCH] ref 18815: Accounting Dashboard Reminiscence

https://support.d4science.org/issues/18815

Added detachedres-library
---
 .classpath                                       |  6 +++---
 .settings/org.eclipse.wst.common.component       |  2 +-
 pom.xml                                          |  2 +-
 .../mainarea/filter/FilterAreaView.java          | 11 ++++++-----
 .../mainarea/filter/FilterAreaView.ui.xml        | 16 ++++++++--------
 .../client/resources/uiData.css                  |  2 +-
 .../shared/options/TreeOptions.java              |  4 ++++
 7 files changed, 24 insertions(+), 19 deletions(-)

diff --git a/.classpath b/.classpath
index 38083dc..5c0febd 100644
--- a/.classpath
+++ b/.classpath
@@ -1,12 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <classpath>
-	<classpathentry including="**/*.java" kind="src" output="target/accounting-dashboard-1.3.0/WEB-INF/classes" path="src/main/java">
+	<classpathentry including="**/*.java" kind="src" output="target/accounting-dashboard-1.2.0/WEB-INF/classes" path="src/main/java">
 		<attributes>
 			<attribute name="optional" value="true"/>
 			<attribute name="maven.pomderived" value="true"/>
 		</attributes>
 	</classpathentry>
-	<classpathentry excluding="**" kind="src" output="target/accounting-dashboard-1.3.0/WEB-INF/classes" path="src/main/resources">
+	<classpathentry excluding="**" kind="src" output="target/accounting-dashboard-1.2.0/WEB-INF/classes" path="src/main/resources">
 		<attributes>
 			<attribute name="maven.pomderived" value="true"/>
 		</attributes>
@@ -50,5 +50,5 @@
 	</classpathentry>
 	<classpathentry kind="lib" path="/home/giancarlo/gwt/gwt-2.8.2/validation-api-1.0.0.GA.jar" sourcepath="/home/giancarlo/gwt/gwt-2.8.2/validation-api-1.0.0.GA-sources.jar"/>
 	<classpathentry kind="lib" path="/home/giancarlo/gwt/gwt-2.8.2/validation-api-1.0.0.GA-sources.jar"/>
-	<classpathentry kind="output" path="target/accounting-dashboard-1.3.0/WEB-INF/classes"/>
+	<classpathentry kind="output" path="target/accounting-dashboard-1.2.0/WEB-INF/classes"/>
 </classpath>
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 @@
 <?xml version="1.0" encoding="UTF-8"?><project-modules id="moduleCoreId" project-version="1.5.0">
-    <wb-module deploy-name="accounting-dashboard-1.3.0">
+    <wb-module deploy-name="accounting-dashboard-1.2.0">
         <wb-resource deploy-path="/" source-path="/target/m2e-wtp/web-resources"/>
         <wb-resource deploy-path="/" source-path="/src/main/webapp" tag="defaultRootSource"/>
         <wb-resource deploy-path="/WEB-INF/classes" source-path="/src/main/java"/>
diff --git a/pom.xml b/pom.xml
index d83ea4b..5c90dc4 100644
--- a/pom.xml
+++ b/pom.xml
@@ -13,7 +13,7 @@
 	<modelVersion>4.0.0</modelVersion>
 	<groupId>org.gcube.portlets.user</groupId>
 	<artifactId>accounting-dashboard</artifactId>
-	<version>1.3.0</version>
+	<version>1.2.0</version>
 	<packaging>war</packaging>
 
 	<name>accounting-dashboard</name>
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<FilterAreaPresenter>
 	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<FilterAreaPresenter>
 
 		
 		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<FilterAreaPresenter>
 			}
 		});
 		
-		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 @@
 			<b:Form type="HORIZONTAL" styleName="{res.uiDataCss.uiDataFiltersFormPanel}">
 				<b:Fieldset>
 					<b:ControlGroup>
-						<b:ControlLabel width="50px" for="fromPeriod">From:</b:ControlLabel>
+						<b:ControlLabel width="70px" for="fromPeriod">From:</b:ControlLabel>
 						<b:Controls styleName="{res.uiDataCss.uiDataFiltersControls}">
 							<b:ListBox ui:field="yearStart" width="104px" b:id="yearStart">
 							</b:ListBox>
@@ -27,7 +27,7 @@
 						</b:Controls>
 					</b:ControlGroup>
 					<b:ControlGroup>
-						<b:ControlLabel width="50px" for="endPeriod">To:</b:ControlLabel>
+						<b:ControlLabel width="70px" for="endPeriod">To:</b:ControlLabel>
 						<b:Controls styleName="{res.uiDataCss.uiDataFiltersControls}">
 							<b:ListBox ui:field="yearEnd" width="104px" b:id="yearEnd">
 							</b:ListBox>
@@ -37,14 +37,14 @@
 						</b:Controls>
 					</b:ControlGroup>
 					<b:ControlGroup>
-						<b:ControlLabel width="50px" for="detachedREs">DetachedREs:</b:ControlLabel>
+						<b:ControlLabel width="70px" for="detachedREs">Detached:</b:ControlLabel>
 						<b:Controls styleName="{res.uiDataCss.uiDataFiltersControls}">
-							<b:ButtonGroup toggle="radio">
-								<b:Button ui:field="btnShowDetachedREs" text="Show" />
-								<b:Button ui:field="btnHideDetachedREs" text="Hide" />
-							</b:ButtonGroup>
+							<!-- <b:ButtonGroup toggle="radio"> -->
+							<b:RadioButton ui:field="btnShowDetachedREs" text="Show" />
+							<b:RadioButton ui:field="btnHideDetachedREs" text="Hide" />
+							<!-- </b:ButtonGroup> -->
 
-							<b:HelpBlock>Show DetachedREs</b:HelpBlock>
+							<b:HelpBlock>Show Detached REs</b:HelpBlock>
 						</b:Controls>
 					</b:ControlGroup>
 
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();