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@114889 82a268e6-3cf1-43bd-a215-b396298e98cf

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

@@ -5,6 +5,8 @@ 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.widgetcommonevent.shared.TRId;
+import org.gcube.portlets.user.td.wizardwidget.client.WizardListener;
 
 import com.allen_sauer.gwt.log.client.Log;
 import com.google.gwt.core.client.EntryPoint;
@@ -31,6 +33,32 @@ public class RuleWidgetEntry implements EntryPoint {
 		try {
 			CreateRuleOnTableWizard createRuleOnTableWizard = new CreateRuleOnTableWizard(
 					eventBus);
+			createRuleOnTableWizard.addListener(new WizardListener() {
+				
+				@Override
+				public void putInBackground() {
+					Log.debug("Putted In Background");
+					
+				}
+				
+				@Override
+				public void failed(String title, String message, String details,
+						Throwable throwable) {
+					Log.debug("Failed");
+					
+				}
+				
+				@Override
+				public void completed(TRId id) {
+					Log.debug("Completed");
+					
+				}
+				
+				@Override
+				public void aborted() {
+					Log.debug("Aborted");
+				}
+			});
 			createRuleOnTableWizard.show();
 		} catch (Throwable e) {
 			e.printStackTrace();

src/main/java/org/gcube/portlets/user/td/rulewidget/client/multicolumn/CreateRuleOnTableDefinitionCard.java

@@ -372,9 +372,9 @@ public class CreateRuleOnTableDefinitionCard extends WizardCard {
 					tdRuleTableType);
 			getWizardWindow().addCard(createRuleOnTableExpressionCard);
 			getWizardWindow().nextCard();
-
 		} catch (Exception e) {
 			Log.error("sayNextCard :" + e.getLocalizedMessage());
+			e.printStackTrace();
 		}
 	}
 	

src/main/java/org/gcube/portlets/user/td/rulewidget/client/multicolumn/CreateRuleOnTableExpressionCard.java

@@ -1,60 +1,23 @@
 package org.gcube.portlets.user.td.rulewidget.client.multicolumn;
 
-import java.util.ArrayList;
+import java.util.Date;
 
-import org.gcube.portlets.user.td.expressionwidget.client.properties.RuleColumnPlaceHolderDescriptorProperties;
-import org.gcube.portlets.user.td.gwtservice.shared.rule.RuleColumnPlaceHolderDescriptor;
+import org.gcube.portlets.user.td.expressionwidget.client.MultiColumnExpressionPanel;
+import org.gcube.portlets.user.td.expressionwidget.client.exception.MultiColumnExpressionPanelException;
+import org.gcube.portlets.user.td.gwtservice.shared.rule.RuleScopeType;
+import org.gcube.portlets.user.td.gwtservice.shared.rule.description.RuleDescriptionData;
 import org.gcube.portlets.user.td.gwtservice.shared.rule.type.TDRuleTableType;
-import org.gcube.portlets.user.td.rulewidget.client.resources.ResourceBundle;
-import org.gcube.portlets.user.td.widgetcommonevent.shared.tr.column.ColumnDataType;
 import org.gcube.portlets.user.td.wizardwidget.client.WizardCard;
-import org.gcube.portlets.user.td.wizardwidget.client.util.UtilsGXT3;
 
 import com.allen_sauer.gwt.log.client.Log;
-import com.google.gwt.core.client.GWT;
-import com.google.gwt.editor.client.Editor.Path;
+import com.google.gwt.i18n.client.DateTimeFormat;
 import com.google.gwt.user.client.Command;
-import com.sencha.gxt.cell.core.client.ButtonCell.IconAlign;
-import com.sencha.gxt.cell.core.client.form.ComboBoxCell.TriggerAction;
-import com.sencha.gxt.core.client.Style.SelectionMode;
-import com.sencha.gxt.core.client.util.Margins;
 import com.sencha.gxt.core.client.util.Padding;
-import com.sencha.gxt.data.shared.LabelProvider;
-import com.sencha.gxt.data.shared.ListStore;
-import com.sencha.gxt.data.shared.ModelKeyProvider;
-import com.sencha.gxt.data.shared.PropertyAccess;
-import com.sencha.gxt.dnd.core.client.DND.Feedback;
-import com.sencha.gxt.dnd.core.client.DndDragStartEvent;
-import com.sencha.gxt.dnd.core.client.DndDragStartEvent.DndDragStartHandler;
-import com.sencha.gxt.dnd.core.client.GridDragSource;
-import com.sencha.gxt.dnd.core.client.GridDropTarget;
 import com.sencha.gxt.widget.core.client.box.AlertMessageBox;
-import com.sencha.gxt.widget.core.client.button.ButtonBar;
-import com.sencha.gxt.widget.core.client.button.TextButton;
 import com.sencha.gxt.widget.core.client.container.MarginData;
-import com.sencha.gxt.widget.core.client.container.VerticalLayoutContainer;
-import com.sencha.gxt.widget.core.client.container.VerticalLayoutContainer.VerticalLayoutData;
-import com.sencha.gxt.widget.core.client.event.BeforeStartEditEvent;
-import com.sencha.gxt.widget.core.client.event.BeforeStartEditEvent.BeforeStartEditHandler;
-import com.sencha.gxt.widget.core.client.event.CancelEditEvent;
-import com.sencha.gxt.widget.core.client.event.CancelEditEvent.CancelEditHandler;
-import com.sencha.gxt.widget.core.client.event.CompleteEditEvent;
-import com.sencha.gxt.widget.core.client.event.CompleteEditEvent.CompleteEditHandler;
 import com.sencha.gxt.widget.core.client.event.HideEvent;
 import com.sencha.gxt.widget.core.client.event.HideEvent.HideHandler;
-import com.sencha.gxt.widget.core.client.event.SelectEvent;
-import com.sencha.gxt.widget.core.client.event.SelectEvent.SelectHandler;
-import com.sencha.gxt.widget.core.client.form.ComboBox;
 import com.sencha.gxt.widget.core.client.form.FormPanel;
-import com.sencha.gxt.widget.core.client.form.TextField;
-import com.sencha.gxt.widget.core.client.form.validator.EmptyValidator;
-import com.sencha.gxt.widget.core.client.grid.ColumnConfig;
-import com.sencha.gxt.widget.core.client.grid.ColumnModel;
-import com.sencha.gxt.widget.core.client.grid.Grid;
-import com.sencha.gxt.widget.core.client.grid.Grid.GridCell;
-import com.sencha.gxt.widget.core.client.grid.GridSelectionModel;
-import com.sencha.gxt.widget.core.client.grid.editing.GridRowEditing;
-import com.sencha.gxt.widget.core.client.toolbar.ToolBar;
 
 /**
  * 
@@ -63,9 +26,11 @@ import com.sencha.gxt.widget.core.client.toolbar.ToolBar;
  * 
  */
 public class CreateRuleOnTableExpressionCard extends WizardCard {
-	
+	private DateTimeFormat sdf = DateTimeFormat.getFormat("yyyy-MM-dd HH:mm:ss"); 
 	private CreateRuleOnTableExpressionCard thisCard;
 	private TDRuleTableType tdRuleTableType;
+	private RuleDescriptionData ruleDescriptionData;
+	private MultiColumnExpressionPanel multiColumnExpressionPanel;
 	
 	public CreateRuleOnTableExpressionCard(TDRuleTableType tdRuleTableType) {
 		super("Create Expression",
@@ -81,12 +46,15 @@ public class CreateRuleOnTableExpressionCard extends WizardCard {
 		FormPanel panel = new FormPanel();
 		panel.setLabelWidth(90);
 		panel.getElement().setPadding(new Padding(5));
-
-		VerticalLayoutContainer v = new VerticalLayoutContainer();
-		panel.add(v);
 		
-		//v.add(toolBar, new VerticalLayoutData(1, -1, new Margins(0)));
-
+		ruleDescriptionData=new RuleDescriptionData(0, null, null,sdf.format(new Date()),null, null,RuleScopeType.TABLE, null, tdRuleTableType);
+		try {
+			multiColumnExpressionPanel = new MultiColumnExpressionPanel(null, ruleDescriptionData);
+			panel.add(multiColumnExpressionPanel);
+		} catch (Throwable e) {
+			showErrorAndHide("Error", e.getLocalizedMessage(), e.getLocalizedMessage(), e);
+		}
+		
 		return panel;
 	}
 
@@ -130,41 +98,44 @@ public class CreateRuleOnTableExpressionCard extends WizardCard {
 
 			public void onHide(HideEvent event) {
 				getWizardWindow().setEnableNextButton(true);
-				getWizardWindow().setEnableBackButton(false);
+				getWizardWindow().setEnableBackButton(true);
 
 			}
 		};
 
-		/*if (store == null || store.size() <= 0) {
+		try {
+			if(multiColumnExpressionPanel!=null){
+				ruleDescriptionData = multiColumnExpressionPanel.getRuleOnTable();
+			} else {
+				showErrorAndHide("Error","Error creating rule on table!", "", new Exception("Error creating rule on table!"));
+				return;
+			}
+		} catch (MultiColumnExpressionPanelException e) {
 			AlertMessageBox d = new AlertMessageBox("Attention",
-					"Add at least one column");
+					e.getLocalizedMessage());
 			d.addHideHandler(hideHandler);
 			d.setModal(false);
 			d.show();
 			return;
 		}
-
-		tdRuleTableType = new TDRuleTableType(
-				new ArrayList<RuleColumnPlaceHolderDescriptor>(store.getAll()));
-		*/
 		goNext();
 	}
 
 	protected void goNext(){
-		/*try {
-			ChartTopRatingSession chartTopRatingSession = new ChartTopRatingSession();
-			chartTopRatingSession.setTrId(chartSession.getTrId());
-			TopRatingColumnSelectionCard topRatingColumnSelectionCard = new TopRatingColumnSelectionCard(
-					chartSession, chartTopRatingSession);
-			getWizardWindow().addCard(topRatingColumnSelectionCard);
+		try {
+			CreateRuleOnTableOperationInProgressCard createRuleOnTableExpressionCard = new CreateRuleOnTableOperationInProgressCard(
+					ruleDescriptionData);
+			getWizardWindow().addCard(createRuleOnTableExpressionCard);
 			getWizardWindow().nextCard();
 
 		} catch (Exception e) {
 			Log.error("sayNextCard :" + e.getLocalizedMessage());
-		}*/
+		}
 	}
 	
 	
+	
+	
 
 	@Override
 	public void dispose() {

src/main/java/org/gcube/portlets/user/td/rulewidget/client/multicolumn/CreateRuleOnTableOperationInProgressCard.java

@@ -0,0 +1,161 @@
+/**
+ * 
+ */
+package org.gcube.portlets.user.td.rulewidget.client.multicolumn;
+
+import org.gcube.portlets.user.td.expressionwidget.client.rpc.ExpressionServiceAsync;
+import org.gcube.portlets.user.td.gwtservice.shared.exception.TDGWTIsLockedException;
+import org.gcube.portlets.user.td.gwtservice.shared.exception.TDGWTSessionExpiredException;
+import org.gcube.portlets.user.td.gwtservice.shared.rule.description.RuleDescriptionData;
+import org.gcube.portlets.user.td.widgetcommonevent.client.event.SessionExpiredEvent;
+import org.gcube.portlets.user.td.widgetcommonevent.client.type.SessionExpiredType;
+import org.gcube.portlets.user.td.wizardwidget.client.WizardCard;
+import org.gcube.portlets.user.td.wizardwidget.client.util.UtilsGXT3;
+
+import com.allen_sauer.gwt.log.client.Log;
+import com.google.gwt.safehtml.shared.SafeHtmlBuilder;
+import com.google.gwt.user.client.Command;
+import com.google.gwt.user.client.rpc.AsyncCallback;
+import com.google.gwt.user.client.ui.FlexTable;
+import com.sencha.gxt.core.client.util.Margins;
+import com.sencha.gxt.widget.core.client.FramedPanel;
+import com.sencha.gxt.widget.core.client.container.BoxLayoutContainer.BoxLayoutData;
+import com.sencha.gxt.widget.core.client.container.HtmlLayoutContainer;
+import com.sencha.gxt.widget.core.client.container.MarginData;
+import com.sencha.gxt.widget.core.client.container.VBoxLayoutContainer;
+import com.sencha.gxt.widget.core.client.container.VBoxLayoutContainer.VBoxLayoutAlign;
+
+/**
+ * 
+ * @author "Giancarlo Panichi" <a
+ *         href="mailto:g.panichi@isti.cnr.it">g.panichi@isti.cnr.it</a>
+ * 
+ */
+public class CreateRuleOnTableOperationInProgressCard extends WizardCard {
+
+	protected CreateRuleOnTableOperationInProgressCard thisCard;
+	protected RuleDescriptionData ruleDescriptionData;
+	protected HtmlLayoutContainer resultField;
+
+	public CreateRuleOnTableOperationInProgressCard(
+			RuleDescriptionData ruleDescriptionData) {
+		super("Save Rule On Table", "");
+
+		this.ruleDescriptionData = ruleDescriptionData;
+		thisCard = this;
+
+		VBoxLayoutContainer operationInProgressPanel = new VBoxLayoutContainer();
+		operationInProgressPanel.setVBoxLayoutAlign(VBoxLayoutAlign.CENTER);
+
+		final FlexTable description = new FlexTable();
+		// FlexCellFormatter cellFormatter = description.getFlexCellFormatter();
+		description.setCellSpacing(10);
+		description.setCellPadding(4);
+		description.setBorderWidth(0);
+
+		// display:block;vertical-align:text-top;
+		description.setHTML(0, 0,
+				"<span style=\"font-weight:bold;\";>Rule Name: </span>");
+		description.setText(0, 1, ruleDescriptionData.getName());
+		description.setHTML(1, 0,
+				"<span style=\"font-weight:bold;\";>Rule Description: </span>");
+		description.setText(1, 1, ruleDescriptionData.getDescription());
+
+		FramedPanel summary = new FramedPanel();
+		summary.setHeadingText("Rule On Table");
+		summary.setWidth(400);
+		summary.add(description);
+		operationInProgressPanel.add(summary, new BoxLayoutData(new Margins(20,
+				5, 10, 5)));
+
+		resultField = new HtmlLayoutContainer("<div></div>");
+
+		operationInProgressPanel.add(resultField, new BoxLayoutData(
+				new Margins(10, 5, 10, 5)));
+
+		setCenterWidget(operationInProgressPanel, new MarginData(0));
+		resultField.setVisible(false);
+
+	}
+
+	public void saveRuleOnTable() {
+		ExpressionServiceAsync.INSTANCE.saveRule(ruleDescriptionData,
+				new AsyncCallback<String>() {
+
+					@Override
+					public void onSuccess(String ruleId) {
+						Log.debug("Saved Rule: " + ruleId);
+						operationComplete();
+						
+						UtilsGXT3.info("Save Rule", "The rule is saved!");
+
+					}
+
+					@Override
+					public void onFailure(Throwable caught) {
+						if (caught instanceof TDGWTSessionExpiredException) {
+							getEventBus()
+									.fireEvent(
+											new SessionExpiredEvent(
+													SessionExpiredType.EXPIREDONSERVER));
+						} else {
+							if (caught instanceof TDGWTIsLockedException) {
+								Log.error(caught.getLocalizedMessage());
+								showErrorAndHide("Error",
+										"Error saving rule on table",
+										caught.getLocalizedMessage(), caught);
+							} else {
+								showErrorAndHide("Error",
+										"Error saving rule on table: ",
+										caught.getLocalizedMessage(), caught);
+
+							}
+						}
+
+					}
+				});
+
+	}
+
+	@Override
+	public void setup() {
+		getWizardWindow().setEnableBackButton(false);
+		setBackButtonVisible(false);
+		getWizardWindow().setEnableNextButton(false);
+		getWizardWindow().setNextButtonToFinish();
+		saveRuleOnTable();
+	}
+
+
+
+	public void operationComplete() {
+		SafeHtmlBuilder safeHtmlBuilder = new SafeHtmlBuilder();
+		safeHtmlBuilder
+				.appendHtmlConstant("<div style='text-align:center;font-size:large;font-weight:bold; color:#009900;'>Operation Completed</div>");
+		resultField.setHTML(safeHtmlBuilder.toSafeHtml());
+		resultField.setVisible(true);
+
+		Command sayComplete = new Command() {
+			public void execute() {
+				try {
+					getWizardWindow().close(false);
+
+					getWizardWindow().fireCompleted(null);
+
+				} catch (Exception e) {
+					Log.error("fire Complete :" + e.getLocalizedMessage());
+				}
+			}
+		};
+
+		getWizardWindow().setNextButtonCommand(sayComplete);
+
+		setNextButtonVisible(true);
+		getWizardWindow().setEnableNextButton(true);
+
+		forceLayout();
+
+	}
+
+	
+}

src/main/java/org/gcube/portlets/user/td/rulewidget/client/multicolumn/CreateRuleOnTableWizard.java

@@ -2,6 +2,7 @@ package org.gcube.portlets.user.td.rulewidget.client.multicolumn;
 
 
 
+import org.gcube.portlets.user.td.rulewidget.client.resources.ResourceBundle;
 import org.gcube.portlets.user.td.wizardwidget.client.WizardWindow;
 
 import com.allen_sauer.gwt.log.client.Log;
@@ -16,7 +17,8 @@ import com.google.web.bindery.event.shared.EventBus;
  *
  */
 public class CreateRuleOnTableWizard  extends WizardWindow  {
-	
+	private static final String WIZARDWIDTH = "950px";
+	private static final String WIZARDHEIGHT = "512px";
 	
 	/**
 	 * 
@@ -26,6 +28,9 @@ public class CreateRuleOnTableWizard  extends WizardWindow  {
 	public CreateRuleOnTableWizard(EventBus eventBus)	{
 		super("Create Rule On Table",eventBus);
 		Log.debug("CreateRuleOnMultiColumnWizard");
+		setWidth(WIZARDWIDTH);
+		setHeight(WIZARDHEIGHT);
+		getHeader().setIcon(ResourceBundle.INSTANCE.ruleTableAdd());
 		create();
 	}
 	

src/main/java/org/gcube/portlets/user/td/rulewidget/client/resources/ResourceBundle.java

@@ -115,6 +115,19 @@ public interface ResourceBundle extends ClientBundle {
 	@Source("rule-column-detach_32.png")
 	ImageResource ruleColumnDetach32();
 	
+	@Source("rule-table-add.png")
+	ImageResource ruleTableAdd();
+	
+	@Source("rule-table-add_32.png")
+	ImageResource ruleTableAdd32();
+	
+	@Source("rule-table-apply.png")
+	ImageResource ruleTableApply();
+	
+	@Source("rule-table-apply_32.png")
+	ImageResource ruleTableApply32();
+	
+	
 	@Source("rule-tabularresource.png")
 	ImageResource ruleTabularResource();
 	

src/main/resources/org/gcube/portlets/user/td/rulewidget/RuleWidget.gwt.xml

@@ -39,18 +39,20 @@
 		values="en" /> <extend-property name="locale" values="it" /> <extend-property 
 		name="locale" values="es" /> <set-property name="locale" value="en, it, es" 
 		/> <set-property-fallback name="locale" value="en" /> -->
-
-	<!-- <set-property name="log_ConsoleLogger" value="ENABLED" />
+	
+	<!-- 
+	<set-property name="log_ConsoleLogger" value="ENABLED" />
 	<set-property name="log_DivLogger" value="ENABLED" />
 	<set-property name="log_GWTLogger" value="ENABLED" />
 	<set-property name="log_SystemLogger" value="ENABLED" /> -->
 	<!-- Not in GWT 2.6 <set-property name="log_FirebugLogger" value="ENABLED" 
 		/> -->
-
+		
+		
 	<set-property name="log_ConsoleLogger" value="DISABLED" /> <set-property 
 		name="log_DivLogger" value="DISABLED" /> <set-property name="log_GWTLogger" 
 		value="DISABLED" /> <set-property name="log_SystemLogger" value="DISABLED" 
-		/> 
+		/>
 	<!-- Not in GWT 2.6 <set-property name="log_FirebugLogger" value="DISABLED" 
 		/> -->