Minor Updated

git-svn-id: https://svn.d4science.research-infrastructures.eu/gcube/trunk/portlets/user/tabular-data-expression-widget@91917 82a268e6-3cf1-43bd-a215-b396298e98cf
This commit is contained in:
Giancarlo Panichi 2014-02-19 13:53:04 +00:00
parent 6ad0ef6d9a
commit d8b0db0065
3 changed files with 24 additions and 17 deletions

View File

@ -45,7 +45,7 @@ import com.sencha.gxt.widget.core.client.form.TextField;
*/
public class ConditionWidget extends SimpleContainer {
private final ConditionWidget thisCont;
private ConditionWidget thisCont;
protected String HEIGHT = "210px";
protected FieldLabel matchLabel;
protected ToggleGroup groupMatch;

View File

@ -17,8 +17,8 @@ import com.sencha.gxt.widget.core.client.event.HideEvent;
import com.sencha.gxt.widget.core.client.event.HideEvent.HideHandler;
public class MultiColumnFilterDialog extends Window {
protected String WIDTH = "650px";
protected String HEIGHT = "400px";
protected String WIDTH = "640px";
protected String HEIGHT = "480px";
protected C_Expression exp = null;
protected TRId trId;
protected EventBus eventBus;
@ -31,8 +31,13 @@ public class MultiColumnFilterDialog extends Window {
}
protected void create(){
setWidth(WIDTH);
setHeight(HEIGHT);
setHeadingText("Filter");
MultiColumnFilterTabPanel mcfTabPanel=new MultiColumnFilterTabPanel(this, "Filter", eventBus);
add(mcfTabPanel);
show();
}

View File

@ -37,20 +37,22 @@ public class OperationsStore {
static ArrayList<Operation> operationsText = new ArrayList<Operation>() {
private static final long serialVersionUID = -6559885743626876431L;
{
add(new Operation(1,"BEGIN_WITH","The value begin with",C_OperatorType.BEGINS_WITH));
add(new Operation(2,"CONTAINS","The value contains",C_OperatorType.CONTAINS));
add(new Operation(3,"ENDS_WITH","The value end with",C_OperatorType.ENDS_WITH));
add(new Operation(4,"MATCH","The value match",C_OperatorType.MATCH_REGEX));
add(new Operation(5,"NOT_BEGIN_WITH","The value not begin with",C_OperatorType.NOT_BEGINS_WITH));
add(new Operation(6,"NOT_CONTAINS","The value not contains",C_OperatorType.NOT_CONTAINS));
add(new Operation(7,"NOT_ENDS_WITH","The value not end with",C_OperatorType.NOT_ENDS_WITH));
add(new Operation(8,"NOT_MATCH","The value not match",C_OperatorType.NOT_MATCH_REGEX));
add(new Operation(10,"IS_NULL","The value is null",C_OperatorType.IS_NULL));
add(new Operation(11,"IS_NOT_NULL","Thel value is not null",C_OperatorType.IS_NOT_NULL));
add(new Operation(12,"BETWEEN","The value is between",C_OperatorType.BETWEEN));
add(new Operation(13,"NOT_BETWEEN","The value is not between",C_OperatorType.NOT_BETWEEN));
add(new Operation(14,"IN","The value is in",C_OperatorType.IN));
add(new Operation(15,"NOT_IN","The value is not in",C_OperatorType.NOT_IN));
add(new Operation(1,"EQUALS","The value is equal to",C_OperatorType.EQUALS));
add(new Operation(2,"BEGIN_WITH","The value begin with",C_OperatorType.BEGINS_WITH));
add(new Operation(3,"CONTAINS","The value contains",C_OperatorType.CONTAINS));
add(new Operation(4,"ENDS_WITH","The value end with",C_OperatorType.ENDS_WITH));
add(new Operation(5,"MATCH","The value match",C_OperatorType.MATCH_REGEX));
add(new Operation(6,"NOT_EQUALS","The value is not equal to",C_OperatorType.NOT_EQUALS));
add(new Operation(7,"NOT_BEGIN_WITH","The value not begin with",C_OperatorType.NOT_BEGINS_WITH));
add(new Operation(8,"NOT_CONTAINS","The value not contains",C_OperatorType.NOT_CONTAINS));
add(new Operation(9,"NOT_ENDS_WITH","The value not end with",C_OperatorType.NOT_ENDS_WITH));
add(new Operation(10,"NOT_MATCH","The value not match",C_OperatorType.NOT_MATCH_REGEX));
add(new Operation(11,"IS_NULL","The value is null",C_OperatorType.IS_NULL));
add(new Operation(12,"IS_NOT_NULL","Thel value is not null",C_OperatorType.IS_NOT_NULL));
add(new Operation(13,"BETWEEN","The value is between",C_OperatorType.BETWEEN));
add(new Operation(14,"NOT_BETWEEN","The value is not between",C_OperatorType.NOT_BETWEEN));
add(new Operation(15,"IN","The value is in",C_OperatorType.IN));
add(new Operation(16,"NOT_IN","The value is not in",C_OperatorType.NOT_IN));
}};
static ArrayList<Operation> operationsBoolean = new ArrayList<Operation>() {