Minor Updated
git-svn-id: https://svn.d4science.research-infrastructures.eu/gcube/trunk/portlets/user/tabular-data-column-widget@92648 82a268e6-3cf1-43bd-a215-b396298e98cf
This commit is contained in:
parent
cb18a109d2
commit
48d9660c53
|
|
@ -34,6 +34,8 @@ import com.google.gwt.event.logical.shared.SelectionHandler;
|
|||
import com.google.gwt.user.client.rpc.AsyncCallback;
|
||||
import com.google.web.bindery.event.shared.EventBus;
|
||||
import com.sencha.gxt.cell.core.client.form.ComboBoxCell.TriggerAction;
|
||||
import com.sencha.gxt.core.client.IdentityValueProvider;
|
||||
import com.sencha.gxt.core.client.ValueProvider;
|
||||
import com.sencha.gxt.core.client.util.Margins;
|
||||
import com.sencha.gxt.data.client.loader.RpcProxy;
|
||||
import com.sencha.gxt.data.shared.LabelProvider;
|
||||
|
|
@ -45,6 +47,7 @@ import com.sencha.gxt.data.shared.loader.ListLoadResultBean;
|
|||
import com.sencha.gxt.data.shared.loader.ListLoader;
|
||||
import com.sencha.gxt.data.shared.loader.LoadResultListStoreBinding;
|
||||
import com.sencha.gxt.widget.core.client.FramedPanel;
|
||||
import com.sencha.gxt.widget.core.client.ListView;
|
||||
import com.sencha.gxt.widget.core.client.box.AlertMessageBox;
|
||||
import com.sencha.gxt.widget.core.client.button.TextButton;
|
||||
import com.sencha.gxt.widget.core.client.container.VerticalLayoutContainer;
|
||||
|
|
@ -81,23 +84,23 @@ public class ChangeColumnTypePanel extends FramedPanel implements
|
|||
protected ColumnData column;
|
||||
protected ComboBox<ColumnData> comboColumn = null;
|
||||
protected ComboBox<ColumnTypeCodeElement> comboColumnTypeCode = null;
|
||||
|
||||
|
||||
protected ComboBox<ColumnDataTypeElement> comboMeasureType = null;
|
||||
protected FieldLabel comboMeasureTypeLabel;
|
||||
|
||||
|
||||
protected ComboBox<ColumnDataTypeElement> comboAttributeType = null;
|
||||
protected FieldLabel comboAttributeTypeLabel;
|
||||
|
||||
|
||||
protected ComboBox<TabResource> comboDimensionType = null;
|
||||
protected FieldLabel comboDimensionTypeLabel;
|
||||
|
||||
|
||||
protected ComboBox<ColumnData> comboColumnReferenceType = null;
|
||||
protected FieldLabel comboColumnReferenceTypeLabel;
|
||||
protected FieldLabel comboColumnReferenceTypeLabel;
|
||||
protected ListStore<ColumnData> storeComboColumnReferenceType;
|
||||
|
||||
|
||||
protected ComboBox<TimeDimensionTypeElement> comboTimeDimensionType = null;
|
||||
protected FieldLabel comboTimeDimensionTypeLabel;
|
||||
|
||||
|
||||
protected ListLoader<ListLoadConfig, ListLoadResult<ColumnData>> loader;
|
||||
|
||||
protected TextButton change;
|
||||
|
|
@ -207,7 +210,6 @@ public class ChangeColumnTypePanel extends FramedPanel implements
|
|||
comboMeasureType.setTriggerAction(TriggerAction.ALL);
|
||||
|
||||
comboMeasureTypeLabel = new FieldLabel(comboMeasureType, "Measure Type");
|
||||
|
||||
|
||||
// comboAttributeType
|
||||
ColumnDataTypeProperties propsAttributeType = GWT
|
||||
|
|
@ -229,7 +231,6 @@ public class ChangeColumnTypePanel extends FramedPanel implements
|
|||
|
||||
comboAttributeTypeLabel = new FieldLabel(comboAttributeType,
|
||||
"Attribute Type");
|
||||
|
||||
|
||||
// comboDimensionType
|
||||
TabResourceProperties propsDimensionType = GWT
|
||||
|
|
@ -249,16 +250,13 @@ public class ChangeColumnTypePanel extends FramedPanel implements
|
|||
comboDimensionType.setTriggerAction(TriggerAction.ALL);
|
||||
|
||||
comboDimensionTypeLabel = new FieldLabel(comboDimensionType, "Codelist");
|
||||
|
||||
|
||||
// ColumnReferenceType
|
||||
ColumnDataProperties propsColumnReferenceType = GWT
|
||||
.create(ColumnDataProperties.class);
|
||||
storeComboColumnReferenceType = new ListStore<ColumnData>(
|
||||
propsColumnReferenceType.id());
|
||||
|
||||
|
||||
|
||||
|
||||
comboColumnReferenceType = new ComboBox<ColumnData>(
|
||||
storeComboColumnReferenceType, propsColumnReferenceType.label());
|
||||
Log.trace("ComboColumnReferenceType created");
|
||||
|
|
@ -272,15 +270,19 @@ public class ChangeColumnTypePanel extends FramedPanel implements
|
|||
|
||||
comboColumnReferenceTypeLabel = new FieldLabel(
|
||||
comboColumnReferenceType, "Column");
|
||||
|
||||
|
||||
// comboTimeDimensionType
|
||||
TimeDimensionTypeProperties propsTimeDimensionType = GWT
|
||||
.create(TimeDimensionTypeProperties.class);
|
||||
ListStore<TimeDimensionTypeElement> storeComboTimeDimensionType = new ListStore<TimeDimensionTypeElement>(
|
||||
propsTimeDimensionType.id());
|
||||
storeComboTimeDimensionType.addAll(TimeDimensionTypeStore.getTimeDimensionType());
|
||||
|
||||
storeComboTimeDimensionType.addAll(TimeDimensionTypeStore
|
||||
.getTimeDimensionType());
|
||||
/*
|
||||
ListView<TimeDimensionTypeElement, String> view = new ListView<TimeDimensionTypeElement, String>(
|
||||
storeComboTimeDimensionType, new IdentityValueProvider<TimeDimensionTypeElement>());
|
||||
view.setWidth("150px");
|
||||
*/
|
||||
comboTimeDimensionType = new ComboBox<TimeDimensionTypeElement>(
|
||||
storeComboTimeDimensionType, propsTimeDimensionType.label());
|
||||
Log.trace("ComboTimeDimensionType created");
|
||||
|
|
@ -291,9 +293,10 @@ public class ChangeColumnTypePanel extends FramedPanel implements
|
|||
comboTimeDimensionType.setWidth(191);
|
||||
comboTimeDimensionType.setTypeAhead(true);
|
||||
comboTimeDimensionType.setTriggerAction(TriggerAction.ALL);
|
||||
comboTimeDimensionTypeLabel = new FieldLabel(comboTimeDimensionType, "Time Type");
|
||||
|
||||
|
||||
|
||||
comboTimeDimensionTypeLabel = new FieldLabel(comboTimeDimensionType,
|
||||
"Time Type");
|
||||
|
||||
// Change
|
||||
change = new TextButton("Change");
|
||||
SelectHandler changeHandler = new SelectHandler() {
|
||||
|
|
@ -307,23 +310,28 @@ public class ChangeColumnTypePanel extends FramedPanel implements
|
|||
|
||||
VerticalLayoutContainer v = new VerticalLayoutContainer();
|
||||
v.add(new FieldLabel(comboColumn, "Column"), new VerticalLayoutData(1,
|
||||
-1,new Margins(1)));
|
||||
-1, new Margins(1)));
|
||||
v.add(new FieldLabel(comboColumnTypeCode, "Column Type"),
|
||||
new VerticalLayoutData(1, -1,new Margins(1)));
|
||||
v.add(comboMeasureTypeLabel, new VerticalLayoutData(1, -1,new Margins(1)));
|
||||
v.add(comboAttributeTypeLabel, new VerticalLayoutData(1, -1,new Margins(1)));
|
||||
v.add(comboDimensionTypeLabel, new VerticalLayoutData(1, -1,new Margins(1)));
|
||||
v.add(comboColumnReferenceTypeLabel, new VerticalLayoutData(1, -1,new Margins(1)));
|
||||
v.add(comboTimeDimensionTypeLabel, new VerticalLayoutData(1, -1,new Margins(1)));
|
||||
new VerticalLayoutData(1, -1, new Margins(1)));
|
||||
v.add(comboMeasureTypeLabel, new VerticalLayoutData(1, -1, new Margins(
|
||||
1)));
|
||||
v.add(comboAttributeTypeLabel, new VerticalLayoutData(1, -1,
|
||||
new Margins(1)));
|
||||
v.add(comboDimensionTypeLabel, new VerticalLayoutData(1, -1,
|
||||
new Margins(1)));
|
||||
v.add(comboColumnReferenceTypeLabel, new VerticalLayoutData(1, -1,
|
||||
new Margins(1)));
|
||||
v.add(comboTimeDimensionTypeLabel, new VerticalLayoutData(1, -1,
|
||||
new Margins(1)));
|
||||
v.add(change, new VerticalLayoutData(-1, -1, new Margins(10, 0, 10, 0)));
|
||||
add(v, new VerticalLayoutData(-1, -1, new Margins(0)));
|
||||
|
||||
|
||||
comboMeasureTypeLabel.setVisible(false);
|
||||
comboAttributeTypeLabel.setVisible(false);
|
||||
comboDimensionTypeLabel.setVisible(false);
|
||||
comboColumnReferenceTypeLabel.setVisible(false);
|
||||
comboTimeDimensionTypeLabel.setVisible(false);
|
||||
|
||||
|
||||
// addButton();
|
||||
}
|
||||
|
||||
|
|
@ -452,8 +460,7 @@ public class ChangeColumnTypePanel extends FramedPanel implements
|
|||
});
|
||||
|
||||
}
|
||||
|
||||
|
||||
|
||||
protected void addHandlersForComboTimeDimensionType(
|
||||
final LabelProvider<TimeDimensionTypeElement> labelProvider) {
|
||||
comboTimeDimensionType
|
||||
|
|
@ -476,7 +483,6 @@ public class ChangeColumnTypePanel extends FramedPanel implements
|
|||
|
||||
});
|
||||
}
|
||||
|
||||
|
||||
protected void updateColumnType(ColumnTypeCode type) {
|
||||
Log.debug("Update ColumnTypeCode " + type.toString());
|
||||
|
|
@ -527,7 +533,7 @@ public class ChangeColumnTypePanel extends FramedPanel implements
|
|||
protected void updateAttributeType(ColumnDataType type) {
|
||||
|
||||
}
|
||||
|
||||
|
||||
protected void updateTimeDimensionType(TimeDimensionType type) {
|
||||
|
||||
}
|
||||
|
|
@ -600,18 +606,18 @@ public class ChangeColumnTypePanel extends FramedPanel implements
|
|||
comboAttributeType.setValue(ColumnDataTypeStore
|
||||
.selectedAttributeElement(cd.getDataTypeName()));
|
||||
} else {
|
||||
//TODO Add TimeDimension and Dimension information to ColumnData
|
||||
// TODO Add TimeDimension and Dimension information to
|
||||
// ColumnData
|
||||
/*
|
||||
if (type == ColumnTypeCode.TIMEDIMENSION) {
|
||||
changeColumnTypeSession.setColumnDataType(ColumnDataTypeStore
|
||||
.selectedAttribute(cd.getDataTypeName()));
|
||||
comboTimeDimensionType.setValue(TimeDimensionTypeStore
|
||||
.selectedAttributeElement(cd.getDataTypeName()));
|
||||
} else {
|
||||
* if (type == ColumnTypeCode.TIMEDIMENSION) {
|
||||
* changeColumnTypeSession.setColumnDataType(ColumnDataTypeStore
|
||||
* .selectedAttribute(cd.getDataTypeName()));
|
||||
* comboTimeDimensionType.setValue(TimeDimensionTypeStore
|
||||
* .selectedAttributeElement(cd.getDataTypeName())); } else {
|
||||
*
|
||||
* }
|
||||
*/
|
||||
|
||||
}
|
||||
*/
|
||||
|
||||
}
|
||||
|
||||
}
|
||||
|
|
@ -635,8 +641,7 @@ public class ChangeColumnTypePanel extends FramedPanel implements
|
|||
switch (type) {
|
||||
case MEASURE:
|
||||
changeColumnTypeSession.setColumnTypeCodeTarget(type);
|
||||
columnDataTypeElement = comboMeasureType
|
||||
.getCurrentValue();
|
||||
columnDataTypeElement = comboMeasureType.getCurrentValue();
|
||||
if (columnDataTypeElement != null) {
|
||||
ColumnDataType dataType = columnDataTypeElement
|
||||
.getType();
|
||||
|
|
@ -706,10 +711,12 @@ public class ChangeColumnTypePanel extends FramedPanel implements
|
|||
TimeDimensionType timeDimensionType = timeDimensionTypeElement
|
||||
.getType();
|
||||
if (timeDimensionType != null) {
|
||||
changeColumnTypeSession.setTimeDimensionType(timeDimensionType);
|
||||
changeColumnTypeSession
|
||||
.setTimeDimensionType(timeDimensionType);
|
||||
callChangeColumnType();
|
||||
} else {
|
||||
alert("Attention", "Time Dimension type not selected!");
|
||||
alert("Attention",
|
||||
"Time Dimension type not selected!");
|
||||
}
|
||||
|
||||
} else {
|
||||
|
|
@ -728,7 +735,6 @@ public class ChangeColumnTypePanel extends FramedPanel implements
|
|||
}
|
||||
}
|
||||
|
||||
|
||||
private void callChangeColumnType() {
|
||||
TDGWTServiceAsync.INSTANCE.startChangeColumnType(
|
||||
changeColumnTypeSession, new AsyncCallback<Void>() {
|
||||
|
|
@ -789,7 +795,8 @@ public class ChangeColumnTypePanel extends FramedPanel implements
|
|||
}
|
||||
|
||||
protected void retriveColumnData(TabResource tabResource) {
|
||||
TDGWTServiceAsync.INSTANCE.getColumnsForDimension(tabResource.getTrId(),
|
||||
TDGWTServiceAsync.INSTANCE.getColumnsForDimension(
|
||||
tabResource.getTrId(),
|
||||
new AsyncCallback<ArrayList<ColumnData>>() {
|
||||
|
||||
@Override
|
||||
|
|
@ -807,8 +814,7 @@ public class ChangeColumnTypePanel extends FramedPanel implements
|
|||
storeComboColumnReferenceType.addAll(result);
|
||||
storeComboColumnReferenceType.commitChanges();
|
||||
comboColumnReferenceTypeLabel.setVisible(true);
|
||||
|
||||
|
||||
|
||||
}
|
||||
});
|
||||
|
||||
|
|
|
|||
Loading…
Reference in New Issue