gCubeSystem
/
tabular-data-gwt-service
16
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

81: Allow the creation and use of expressions on multi column in TDM portlet 

Task-Url: https://support.d4science.org/issues/81

Updated RuleColumnPlaceHolderDescriptor to support rules on table

git-svn-id: https://svn.d4science.research-infrastructures.eu/gcube/trunk/portlets/user/tabular-data-gwt-service@114837 82a268e6-3cf1-43bd-a215-b396298e98cf
This commit is contained in:
Giancarlo Panichi 2015-05-21 16:00:03 +00:00
parent 1c18b4c38c
commit 11e6f7ba76
2 changed files with 17 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/main/java/org/gcube/portlets/user/td/gwtservice/server/SessionUtil.java
View File

@ -17,6 +17,7 @@ import org.gcube.portal.custom.scopemanager.scopehelper.ScopeHelper;
import org.gcube.portlets.user.td.gwtservice.server.file.CSVFileUploadSession;
import org.gcube.portlets.user.td.gwtservice.server.file.CodelistMappingFileUploadSession;
import org.gcube.portlets.user.td.gwtservice.server.trservice.TRTasksManager;
import org.gcube.portlets.user.td.gwtservice.shared.Constants;
import org.gcube.portlets.user.td.gwtservice.shared.chart.ChartTopRatingSession;
import org.gcube.portlets.user.td.gwtservice.shared.codelisthelper.CodelistMappingSession;
import org.gcube.portlets.user.td.gwtservice.shared.csv.CSVExportSession;
@ -89,8 +90,8 @@ public class SessionUtil {
ASLSession session;
if (username == null) {
logger.warn("no user found in session, use test user");
throw new TDGWTSessionExpiredException("Session Expired!");
/*
/*throw new TDGWTSessionExpiredException("Session Expired!");*/
// Remove comment for Test
username = Constants.DEFAULT_USER;
String scope = Constants.DEFAULT_SCOPE;
@ -99,7 +100,7 @@ public class SessionUtil {
session = SessionManager.getInstance().getASLSession(
httpSession.getId(), username);
session.setScope(scope);
*/
} else {
session = SessionManager.getInstance().getASLSession(
httpSession.getId(), username);

19
src/main/java/org/gcube/portlets/user/td/gwtservice/shared/rule/RuleColumnPlaceHolderDescriptor.java
View File

@ -14,15 +14,18 @@ public class RuleColumnPlaceHolderDescriptor implements Serializable {
private static final long serialVersionUID = -7746819321348425711L;
private String id;
private String label;
private ColumnDataType columnDataType;
public RuleColumnPlaceHolderDescriptor() {
super();
}
public RuleColumnPlaceHolderDescriptor(String id, ColumnDataType columnDataType) {
public RuleColumnPlaceHolderDescriptor(String id, String label,
ColumnDataType columnDataType) {
super();
this.id = id;
this.label = label;
this.columnDataType = columnDataType;
}
@ -34,10 +37,14 @@ public class RuleColumnPlaceHolderDescriptor implements Serializable {
this.id = id;
}
public String getLabel(){
return id;
public String getLabel() {
return label;
}
public void setLabel(String label) {
this.label = label;
}
public ColumnDataType getColumnDataType() {
return columnDataType;
}
@ -48,8 +55,8 @@ public class RuleColumnPlaceHolderDescriptor implements Serializable {
@Override
public String toString() {
return "RuleColumnDescriptor [id=" + id + ", columnDataType="
+ columnDataType + "]";
return "RuleColumnPlaceHolderDescriptor [id=" + id + ", label=" + label
+ ", columnDataType=" + columnDataType + "]";
}
}