gCubeSystem
/
tabular-data-expression-widget
14
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Updated Filter 

git-svn-id: https://svn.d4science.research-infrastructures.eu/gcube/trunk/portlets/user/tabular-data-expression-widget@113670 82a268e6-3cf1-43bd-a215-b396298e98cf
This commit is contained in:
Giancarlo Panichi 2015-03-20 10:07:41 +00:00
parent d1683cd8ff
commit da2dc8beeb
2 changed files with 12 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/main/java/org/gcube/portlets/user/td/expressionwidget/client/ColumnExpressionPanel.java
View File

@ -309,6 +309,10 @@ public class ColumnExpressionPanel extends FramedPanel {
}
});
if(column==null){
btnApply.disable();
}
btnClose = new TextButton("Close");
btnClose.setIcon(ExpressionResources.INSTANCE.close());
@ -387,8 +391,11 @@ public class ColumnExpressionPanel extends FramedPanel {
if (event.getSelectedItem() != null) {
ColumnData col = event.getSelectedItem();
Log.debug("Col selected:" + col.toString());
btnApply.enable();
conditionWidget.update(col);
} else {
btnApply.disable();
conditionWidget.update(null);
}
}

6
src/main/java/org/gcube/portlets/user/td/expressionwidget/client/ConditionWidget.java
View File

@ -721,7 +721,7 @@ public class ConditionWidget extends SimpleContainer {
C_Expression expression=null;
if(column==null){
return expression;
throw new ConditionTypeMapException("No column selected!");
}
DateTimeFormat sdf = DateTimeFormat.getFormat("yyyy-MM-dd");
@ -735,6 +735,10 @@ public class ConditionWidget extends SimpleContainer {
.getItemByItemId(itemIdCombo);
Log.debug("combo: " + comboOp.getCurrentValue());
if(comboOp.getCurrentValue()==null){
throw new ConditionTypeMapException("Fill all conditions!");
}
if (column.getDataTypeName().compareTo(
ColumnDataType.Date.toString()) == 0) {
firstArgDate = (DateField) horiz