gCubeSystem
/
tabular-data-rule-widget
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 Create Rule on Table Wizard 

git-svn-id: https://svn.d4science.research-infrastructures.eu/gcube/trunk/portlets/user/tabular-data-rule-widget@114901 82a268e6-3cf1-43bd-a215-b396298e98cf
This commit is contained in:
Giancarlo Panichi 2015-05-26 12:43:00 +00:00 committed by Giancarlo Panichi
parent ab431a8275
commit 70fd65a970
5 changed files with 27 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/main/java/org/gcube/portlets/user/td/rulewidget/client/RuleWidgetEntry.java
View File

@ -4,7 +4,7 @@ import org.gcube.portlets.user.td.expressionwidget.client.utils.UtilsGXT3;
import org.gcube.portlets.user.td.gwtservice.client.rpc.TDGWTServiceAsync;
import org.gcube.portlets.user.td.gwtservice.shared.exception.TDGWTSessionExpiredException;
import org.gcube.portlets.user.td.gwtservice.shared.user.UserInfo;
import org.gcube.portlets.user.td.rulewidget.client.multicolumn.CreateRuleOnTableWizard;
import org.gcube.portlets.user.td.rulewidget.client.multicolumn.RuleOnTableNewWizard;
import org.gcube.portlets.user.td.widgetcommonevent.shared.TRId;
import org.gcube.portlets.user.td.wizardwidget.client.WizardListener;
@ -31,7 +31,7 @@ public class RuleWidgetEntry implements EntryPoint {
EventBus eventBus = new SimpleEventBus();
// TRId trId=new TRId("86",TabResourceType.STANDARD, "1159");
try {
CreateRuleOnTableWizard createRuleOnTableWizard = new CreateRuleOnTableWizard(
RuleOnTableNewWizard createRuleOnTableWizard = new RuleOnTableNewWizard(
eventBus);
createRuleOnTableWizard.addListener(new WizardListener() {

16
src/main/java/org/gcube/portlets/user/td/rulewidget/client/multicolumn/CreateRuleOnTableDefinitionCard.java → src/main/java/org/gcube/portlets/user/td/rulewidget/client/multicolumn/RuleOnTableNewDefinitionCard.java
View File

@ -62,7 +62,7 @@ import com.sencha.gxt.widget.core.client.toolbar.ToolBar;
* href="mailto:g.panichi@isti.cnr.it">g.panichi@isti.cnr.it</a>
*
*/
public class CreateRuleOnTableDefinitionCard extends WizardCard {
public class RuleOnTableNewDefinitionCard extends WizardCard {
public interface DataTypePropertiesCombo extends
PropertyAccess<ColumnDataType> {
@ -75,13 +75,13 @@ public class CreateRuleOnTableDefinitionCard extends WizardCard {
}
private static int seq;
private CreateRuleOnTableDefinitionCard thisCard;
private RuleOnTableNewDefinitionCard thisCard;
private TDRuleTableType tdRuleTableType;
private Grid<RuleColumnPlaceHolderDescriptor> grid;
private ListStore<RuleColumnPlaceHolderDescriptor> store;
private boolean addStatus;
public CreateRuleOnTableDefinitionCard() {
public RuleOnTableNewDefinitionCard() {
super("Columns Definition",
"N.B. Use drag and drop in order to change the position of the columns");
this.thisCard = this;
@ -289,7 +289,7 @@ public class CreateRuleOnTableDefinitionCard extends WizardCard {
setEnableNextButton(true);
} catch (Throwable e) {
Log.error("Error in CreateRuleOnTableDefinitionCard: "
Log.error("Error in RuleOnTableNewDefinitionCard: "
+ e.getLocalizedMessage());
e.printStackTrace();
}
@ -308,11 +308,11 @@ public class CreateRuleOnTableDefinitionCard extends WizardCard {
@Override
public void setup() {
Log.debug("CreateRuleOnTableDefinitionCard Setup");
Log.debug("RuleOnTableNewDefinitionCard Setup");
Command sayNextCard = new Command() {
public void execute() {
Log.debug("CreateRuleOnTableDefinitionCard Call sayNextCard");
Log.debug("RuleOnTableNewDefinitionCard Call sayNextCard");
checkData();
}
@ -323,7 +323,7 @@ public class CreateRuleOnTableDefinitionCard extends WizardCard {
try {
getWizardWindow().previousCard();
getWizardWindow().removeCard(thisCard);
Log.info("Remove CreateRuleOnTableDefinitionCard");
Log.info("Remove RuleOnTableNewDefinitionCard");
} catch (Exception e) {
Log.error("sayPreviousCard :" + e.getLocalizedMessage());
}
@ -368,7 +368,7 @@ public class CreateRuleOnTableDefinitionCard extends WizardCard {
protected void goNext(){
try {
CreateRuleOnTableExpressionCard createRuleOnTableExpressionCard = new CreateRuleOnTableExpressionCard(
RuleOnTableNewExpressionCard createRuleOnTableExpressionCard = new RuleOnTableNewExpressionCard(
tdRuleTableType);
getWizardWindow().addCard(createRuleOnTableExpressionCard);
getWizardWindow().nextCard();

16
src/main/java/org/gcube/portlets/user/td/rulewidget/client/multicolumn/CreateRuleOnTableExpressionCard.java → src/main/java/org/gcube/portlets/user/td/rulewidget/client/multicolumn/RuleOnTableNewExpressionCard.java
View File

@ -25,14 +25,14 @@ import com.sencha.gxt.widget.core.client.form.FormPanel;
* href="mailto:g.panichi@isti.cnr.it">g.panichi@isti.cnr.it</a>
*
*/
public class CreateRuleOnTableExpressionCard extends WizardCard {
public class RuleOnTableNewExpressionCard extends WizardCard {
private DateTimeFormat sdf = DateTimeFormat.getFormat("yyyy-MM-dd HH:mm:ss");
private CreateRuleOnTableExpressionCard thisCard;
private RuleOnTableNewExpressionCard thisCard;
private TDRuleTableType tdRuleTableType;
private RuleDescriptionData ruleDescriptionData;
private MultiColumnExpressionPanel multiColumnExpressionPanel;
public CreateRuleOnTableExpressionCard(TDRuleTableType tdRuleTableType) {
public RuleOnTableNewExpressionCard(TDRuleTableType tdRuleTableType) {
super("Create Expression",
"");
this.thisCard = this;
@ -60,11 +60,11 @@ public class CreateRuleOnTableExpressionCard extends WizardCard {
@Override
public void setup() {
Log.debug("CreateRuleOnTableExpressionCard Setup");
Log.debug("RuleOnTableNewExpressionCard Setup");
Command sayNextCard = new Command() {
public void execute() {
Log.debug("CreateRuleOnTableExpressionCard Call sayNextCard");
Log.debug("RuleOnTableNewExpressionCard Call sayNextCard");
checkData();
}
@ -75,7 +75,7 @@ public class CreateRuleOnTableExpressionCard extends WizardCard {
try {
getWizardWindow().previousCard();
getWizardWindow().removeCard(thisCard);
Log.info("Remove CreateRuleOnTableExpressionCard");
Log.info("Remove RuleOnTableNewExpressionCard");
} catch (Exception e) {
Log.error("sayPreviousCard :" + e.getLocalizedMessage());
}
@ -123,9 +123,9 @@ public class CreateRuleOnTableExpressionCard extends WizardCard {
protected void goNext(){
try {
CreateRuleOnTableOperationInProgressCard createRuleOnTableExpressionCard = new CreateRuleOnTableOperationInProgressCard(
RuleOnTableNewOperationInProgressCard RuleOnTableNewExpressionCard = new RuleOnTableNewOperationInProgressCard(
ruleDescriptionData);
getWizardWindow().addCard(createRuleOnTableExpressionCard);
getWizardWindow().addCard(RuleOnTableNewExpressionCard);
getWizardWindow().nextCard();
} catch (Exception e) {

8
src/main/java/org/gcube/portlets/user/td/rulewidget/client/multicolumn/CreateRuleOnTableOperationInProgressCard.java → src/main/java/org/gcube/portlets/user/td/rulewidget/client/multicolumn/RuleOnTableNewOperationInProgressCard.java
View File

@ -31,15 +31,15 @@ import com.sencha.gxt.widget.core.client.container.VBoxLayoutContainer.VBoxLayou
* href="mailto:g.panichi@isti.cnr.it">g.panichi@isti.cnr.it</a>
*
*/
public class CreateRuleOnTableOperationInProgressCard extends WizardCard {
public class RuleOnTableNewOperationInProgressCard extends WizardCard {
protected CreateRuleOnTableOperationInProgressCard thisCard;
protected RuleOnTableNewOperationInProgressCard thisCard;
protected RuleDescriptionData ruleDescriptionData;
protected HtmlLayoutContainer resultField;
public CreateRuleOnTableOperationInProgressCard(
public RuleOnTableNewOperationInProgressCard(
RuleDescriptionData ruleDescriptionData) {
super("Save Rule On Table", "");
super("Save", "");
this.ruleDescriptionData = ruleDescriptionData;
thisCard = this;

10
src/main/java/org/gcube/portlets/user/td/rulewidget/client/multicolumn/CreateRuleOnTableWizard.java → src/main/java/org/gcube/portlets/user/td/rulewidget/client/multicolumn/RuleOnTableNewWizard.java
View File

@ -16,7 +16,7 @@ import com.google.web.bindery.event.shared.EventBus;
* email: <a href="mailto:g.panichi@isti.cnr.it">g.panichi@isti.cnr.it</a>
*
*/
public class CreateRuleOnTableWizard extends WizardWindow {
public class RuleOnTableNewWizard extends WizardWindow {
private static final String WIZARDWIDTH = "950px";
private static final String WIZARDHEIGHT = "512px";
@ -25,9 +25,9 @@ public class CreateRuleOnTableWizard extends WizardWindow {
* @param title
* @param eventBus
*/
public CreateRuleOnTableWizard(EventBus eventBus) {
super("Create Rule On Table",eventBus);
Log.debug("CreateRuleOnMultiColumnWizard");
public RuleOnTableNewWizard(EventBus eventBus) {
super("New Rule On Table",eventBus);
Log.debug("RuleOnTableNewWizard");
setWidth(WIZARDWIDTH);
setHeight(WIZARDHEIGHT);
getHeader().setIcon(ResourceBundle.INSTANCE.ruleTableAdd());
@ -36,7 +36,7 @@ public class CreateRuleOnTableWizard extends WizardWindow {
private void create() {
CreateRuleOnTableDefinitionCard createRuleOnTableDefinitionCard=new CreateRuleOnTableDefinitionCard();
RuleOnTableNewDefinitionCard createRuleOnTableDefinitionCard=new RuleOnTableNewDefinitionCard();
addCard(createRuleOnTableDefinitionCard);
createRuleOnTableDefinitionCard.setup();
show();