gCubeSystem
/
tabular-data-unionwizard-widget
15
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Minor Updated 

git-svn-id: https://svn.d4science.research-infrastructures.eu/gcube/trunk/portlets/user/tabular-data-unionwizard-widget@98811 82a268e6-3cf1-43bd-a215-b396298e98cf
This commit is contained in:
Giancarlo Panichi 2014-07-18 16:34:11 +00:00 committed by Giancarlo Panichi
parent 55fdb548b7
commit ade55f98eb
3 changed files with 20 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/main/java/org/gcube/portlets/user/td/unionwizardwidget/client/ColumnMappingCard.java
View File

@ -55,13 +55,9 @@ public class ColumnMappingCard extends WizardCard {
}; };
getWizardWindow().setPreviousButtonCommand(sayPreviousCard); getWizardWindow().setPreviousButtonCommand(sayPreviousCard);
getWizardWindow().setEnableNextButton(false); getWizardWindow().setEnableNextButton(true);
getWizardWindow().setEnableBackButton(true); getWizardWindow().setEnableBackButton(true);
} }
protected void setMapping() { protected void setMapping() {

28
src/main/java/org/gcube/portlets/user/td/unionwizardwidget/client/ColumnMappingPanel.java
View File

@ -28,8 +28,6 @@ import com.sencha.gxt.core.client.dom.ScrollSupport.ScrollMode;
import com.sencha.gxt.core.client.util.Margins; import com.sencha.gxt.core.client.util.Margins;
import com.sencha.gxt.data.shared.ListStore; import com.sencha.gxt.data.shared.ListStore;
import com.sencha.gxt.widget.core.client.ContentPanel; import com.sencha.gxt.widget.core.client.ContentPanel;
import com.sencha.gxt.widget.core.client.Resizable;
import com.sencha.gxt.widget.core.client.Resizable.Dir;
import com.sencha.gxt.widget.core.client.container.BoxLayoutContainer.BoxLayoutData; import com.sencha.gxt.widget.core.client.container.BoxLayoutContainer.BoxLayoutData;
import com.sencha.gxt.widget.core.client.container.BoxLayoutContainer.BoxLayoutPack; import com.sencha.gxt.widget.core.client.container.BoxLayoutContainer.BoxLayoutPack;
import com.sencha.gxt.widget.core.client.container.HBoxLayoutContainer; import com.sencha.gxt.widget.core.client.container.HBoxLayoutContainer;
@ -49,7 +47,7 @@ import com.sencha.gxt.widget.core.client.form.FieldLabel;
*/ */
public class ColumnMappingPanel extends ContentPanel { public class ColumnMappingPanel extends ContentPanel {
private static final String COMBOWIDTH = "120px"; private static final String COMBOWIDTH = "200px";
//private static final String COLUMNLABELWIDTH = "120px"; //private static final String COLUMNLABELWIDTH = "120px";
protected ResourceBundle res; protected ResourceBundle res;
protected ColumnMappingCard parent; protected ColumnMappingCard parent;
@ -85,8 +83,9 @@ public class ColumnMappingPanel extends ContentPanel {
protected void init() { protected void init() {
setHeaderVisible(false); setHeaderVisible(false);
new Resizable(this, Dir.E, Dir.SE, Dir.S); //new Resizable(this, Dir.E, Dir.SE, Dir.S);
//Important: fixed rendering of widgets
forceLayoutOnResize = true;
} }
protected void create() { protected void create() {
@ -96,25 +95,25 @@ public class ColumnMappingPanel extends ContentPanel {
vert = new VerticalLayoutContainer(); vert = new VerticalLayoutContainer();
vert.setScrollMode(ScrollMode.AUTO); vert.setScrollMode(ScrollMode.AUTO);
vert.setAdjustForScroll(true); vert.setAdjustForScroll(true);
container.add(vert);
setColumnMap(); setColumnMap();
container.add(vert);
container.forceLayout();
/*FieldLabel columnLabel = new FieldLabel(null, "Column Label"); /*FieldLabel columnLabel = new FieldLabel(null, "Column Label");
columnLabel.getElement().applyStyles("font-weight:bold"); columnLabel.getElement().applyStyles("font-weight:bold");
columnLabel.setWidth(COLUMNLABELWIDTH);*/ columnLabel.setWidth(COLUMNLABELWIDTH);
columnLabel.setLabelSeparator("");*/
FieldLabel sourceColumnLabel = new FieldLabel(null, "Column"); FieldLabel sourceColumnLabel = new FieldLabel(null, "Column");
sourceColumnLabel.getElement().applyStyles("font-weight:bold"); sourceColumnLabel.getElement().applyStyles("font-weight:bold");
sourceColumnLabel.setWidth(COMBOWIDTH); sourceColumnLabel.setWidth(COMBOWIDTH);
sourceColumnLabel.setLabelSeparator("");
String unionTRLabel=parent.unionSession.getUnionTabularResource().getName(); String unionTRLabel=parent.unionSession.getUnionTabularResource().getName();
FieldLabel unionColumnLabel = new FieldLabel(null, unionTRLabel); FieldLabel unionColumnLabel = new FieldLabel(null, unionTRLabel);
unionColumnLabel.getElement().applyStyles("font-weight:bold"); unionColumnLabel.getElement().applyStyles("font-weight:bold");
unionColumnLabel.setWidth(COMBOWIDTH); unionColumnLabel.setWidth(COMBOWIDTH);
unionColumnLabel.setLabelSeparator("");
final HBoxLayoutContainer horiz = new HBoxLayoutContainer(); final HBoxLayoutContainer horiz = new HBoxLayoutContainer();
horiz.setHBoxLayoutAlign(HBoxLayoutAlign.MIDDLE); horiz.setHBoxLayoutAlign(HBoxLayoutAlign.MIDDLE);
@ -127,8 +126,11 @@ public class ColumnMappingPanel extends ContentPanel {
VerticalLayoutContainer vPanel = new VerticalLayoutContainer(); VerticalLayoutContainer vPanel = new VerticalLayoutContainer();
vPanel.add(horiz, new VerticalLayoutData(1, -1, new Margins(1))); vPanel.setScrollMode(ScrollMode.AUTO);
vPanel.add(container, new VerticalLayoutData(1, -1)); vPanel.setAdjustForScroll(true);
vPanel.add(horiz, new VerticalLayoutData(1, -1, new Margins(1,1,1,10)));
vPanel.add(container, new VerticalLayoutData(1, -1, new Margins(1,1,1,10)));
add(vPanel); add(vPanel);
forceLayout(); forceLayout();
@ -394,7 +396,7 @@ public class ColumnMappingPanel extends ContentPanel {
} }
}); });
btnDel.setVisible(false); btnDel.setVisible(true);
comboSourceColumn comboSourceColumn
.addSelectionHandler(new SelectionHandler<ColumnData>() { .addSelectionHandler(new SelectionHandler<ColumnData>() {

6
src/main/java/org/gcube/portlets/user/td/unionwizardwidget/client/TabResourcesSelectionPanel.java
View File

@ -36,17 +36,15 @@ import com.sencha.gxt.data.shared.loader.ListLoadResultBean;
import com.sencha.gxt.data.shared.loader.ListLoader; import com.sencha.gxt.data.shared.loader.ListLoader;
import com.sencha.gxt.data.shared.loader.LoadResultListStoreBinding; import com.sencha.gxt.data.shared.loader.LoadResultListStoreBinding;
import com.sencha.gxt.widget.core.client.ContentPanel; import com.sencha.gxt.widget.core.client.ContentPanel;
import com.sencha.gxt.widget.core.client.Resizable;
import com.sencha.gxt.widget.core.client.Dialog.PredefinedButton; import com.sencha.gxt.widget.core.client.Dialog.PredefinedButton;
import com.sencha.gxt.widget.core.client.Resizable.Dir;
import com.sencha.gxt.widget.core.client.box.AlertMessageBox; import com.sencha.gxt.widget.core.client.box.AlertMessageBox;
import com.sencha.gxt.widget.core.client.box.ConfirmMessageBox; import com.sencha.gxt.widget.core.client.box.ConfirmMessageBox;
import com.sencha.gxt.widget.core.client.button.TextButton; import com.sencha.gxt.widget.core.client.button.TextButton;
import com.sencha.gxt.widget.core.client.container.VerticalLayoutContainer; 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.container.VerticalLayoutContainer.VerticalLayoutData;
import com.sencha.gxt.widget.core.client.event.HideEvent; import com.sencha.gxt.widget.core.client.event.HideEvent;
import com.sencha.gxt.widget.core.client.event.SelectEvent;
import com.sencha.gxt.widget.core.client.event.HideEvent.HideHandler; 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.event.SelectEvent.SelectHandler;
import com.sencha.gxt.widget.core.client.form.TextField; import com.sencha.gxt.widget.core.client.form.TextField;
import com.sencha.gxt.widget.core.client.grid.CheckBoxSelectionModel; import com.sencha.gxt.widget.core.client.grid.CheckBoxSelectionModel;
@ -109,7 +107,7 @@ public class TabResourcesSelectionPanel extends ContentPanel implements
protected void init() { protected void init() {
setHeaderVisible(false); setHeaderVisible(false);
new Resizable(this, Dir.E, Dir.SE, Dir.S); //new Resizable(this, Dir.E, Dir.SE, Dir.S);
} }