gCubeSystem
/
accounting-dashboard
16
0
Fork 0
Code Issues Pull Requests Releases 2 Wiki Activity

ref 18815: Accounting Dashboard Reminiscence 

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

Added detachedres-library
This commit is contained in:
Giancarlo Panichi 2020-04-07 19:00:10 +02:00
parent 4e5c3a9b4b
commit 3e0c975f91
7 changed files with 24 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
.classpath
View File

@ -1,12 +1,12 @@
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<classpath> <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> <attributes>
<attribute name="optional" value="true"/> <attribute name="optional" value="true"/>
<attribute name="maven.pomderived" value="true"/> <attribute name="maven.pomderived" value="true"/>
</attributes> </attributes>
</classpathentry> </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> <attributes>
<attribute name="maven.pomderived" value="true"/> <attribute name="maven.pomderived" value="true"/>
</attributes> </attributes>
@ -50,5 +50,5 @@
</classpathentry> </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.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="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> </classpath>

2
.settings/org.eclipse.wst.common.component
View File

@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?><project-modules id="moduleCoreId" project-version="1.5.0"> <?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="/target/m2e-wtp/web-resources"/>
<wb-resource deploy-path="/" source-path="/src/main/webapp" tag="defaultRootSource"/> <wb-resource deploy-path="/" source-path="/src/main/webapp" tag="defaultRootSource"/>
<wb-resource deploy-path="/WEB-INF/classes" source-path="/src/main/java"/> <wb-resource deploy-path="/WEB-INF/classes" source-path="/src/main/java"/>

2
pom.xml
View File

@ -13,7 +13,7 @@
<modelVersion>4.0.0</modelVersion> <modelVersion>4.0.0</modelVersion>
<groupId>org.gcube.portlets.user</groupId> <groupId>org.gcube.portlets.user</groupId>
<artifactId>accounting-dashboard</artifactId> <artifactId>accounting-dashboard</artifactId>
<version>1.3.0</version> <version>1.2.0</version>
<packaging>war</packaging> <packaging>war</packaging>
<name>accounting-dashboard</name> <name>accounting-dashboard</name>

11
src/main/java/org/gcube/portlets/user/accountingdashboard/client/application/mainarea/filter/FilterAreaView.java
View File

@ -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.data.ScopeData;
import org.gcube.portlets.user.accountingdashboard.shared.options.TreeOptions; 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.ListBox;
import com.github.gwtbootstrap.client.ui.RadioButton;
import com.google.gwt.core.client.GWT; import com.google.gwt.core.client.GWT;
import com.google.gwt.event.dom.client.ChangeEvent; import com.google.gwt.event.dom.client.ChangeEvent;
import com.google.gwt.event.dom.client.ChangeHandler; import com.google.gwt.event.dom.client.ChangeHandler;
@ -67,10 +67,10 @@ public class FilterAreaView extends ViewWithUiHandlers<FilterAreaPresenter>
ListBox monthEnd; ListBox monthEnd;
@UiField(provided = true) @UiField(provided = true)
Button btnShowDetachedREs; RadioButton btnShowDetachedREs;
@UiField(provided = true) @UiField(provided = true)
Button btnHideDetachedREs; RadioButton btnHideDetachedREs;
@UiField(provided = true) @UiField(provided = true)
CellTree scopeTree; CellTree scopeTree;
@ -173,7 +173,7 @@ public class FilterAreaView extends ViewWithUiHandlers<FilterAreaPresenter>
logger.log(Level.FINE, "Configuring buttons DetachedREs"); logger.log(Level.FINE, "Configuring buttons DetachedREs");
btnShowDetachedREs=new Button(); btnShowDetachedREs=new RadioButton("radioDetachedREs");
btnShowDetachedREs.addClickHandler(new ClickHandler() { btnShowDetachedREs.addClickHandler(new ClickHandler() {
@Override @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() { btnHideDetachedREs.addClickHandler(new ClickHandler() {
@Override @Override

16
src/main/java/org/gcube/portlets/user/accountingdashboard/client/application/mainarea/filter/FilterAreaView.ui.xml
View File

@ -17,7 +17,7 @@
<b:Form type="HORIZONTAL" styleName="{res.uiDataCss.uiDataFiltersFormPanel}"> <b:Form type="HORIZONTAL" styleName="{res.uiDataCss.uiDataFiltersFormPanel}">
<b:Fieldset> <b:Fieldset>
<b:ControlGroup> <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:Controls styleName="{res.uiDataCss.uiDataFiltersControls}">
<b:ListBox ui:field="yearStart" width="104px" b:id="yearStart"> <b:ListBox ui:field="yearStart" width="104px" b:id="yearStart">
</b:ListBox> </b:ListBox>
@ -27,7 +27,7 @@
</b:Controls> </b:Controls>
</b:ControlGroup> </b:ControlGroup>
<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:Controls styleName="{res.uiDataCss.uiDataFiltersControls}">
<b:ListBox ui:field="yearEnd" width="104px" b:id="yearEnd"> <b:ListBox ui:field="yearEnd" width="104px" b:id="yearEnd">
</b:ListBox> </b:ListBox>
@ -37,14 +37,14 @@
</b:Controls> </b:Controls>
</b:ControlGroup> </b:ControlGroup>
<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:Controls styleName="{res.uiDataCss.uiDataFiltersControls}">
<b:ButtonGroup toggle="radio"> <!-- <b:ButtonGroup toggle="radio"> -->
<b:Button ui:field="btnShowDetachedREs" text="Show" /> <b:RadioButton ui:field="btnShowDetachedREs" text="Show" />
<b:Button ui:field="btnHideDetachedREs" text="Hide" /> <b:RadioButton ui:field="btnHideDetachedREs" text="Hide" />
</b:ButtonGroup> <!-- </b:ButtonGroup> -->
<b:HelpBlock>Show DetachedREs</b:HelpBlock> <b:HelpBlock>Show Detached REs</b:HelpBlock>
</b:Controls> </b:Controls>
</b:ControlGroup> </b:ControlGroup>

2
src/main/java/org/gcube/portlets/user/accountingdashboard/client/resources/uiData.css
View File

@ -41,7 +41,7 @@
} }
.uiDataFiltersControls { .uiDataFiltersControls {
margin-left: 60px; margin-left: 80px;
} }
.uiDataExploreTree { .uiDataExploreTree {

4
src/main/java/org/gcube/portlets/user/accountingdashboard/shared/options/TreeOptions.java
View File

@ -12,6 +12,10 @@ public class TreeOptions implements Serializable {
private static final long serialVersionUID = 730133583251742872L; private static final long serialVersionUID = 730133583251742872L;
private boolean showDetachedREs = false; private boolean showDetachedREs = false;
public TreeOptions() {
super();
}
public TreeOptions(boolean showDetachedREs) { public TreeOptions(boolean showDetachedREs) {
super(); super();