Added Normalize

git-svn-id: https://svn.d4science.research-infrastructures.eu/gcube/trunk/portlets/user/tabular-data-portlet@98345 82a268e6-3cf1-43bd-a215-b396298e98cf
This commit is contained in:
Giancarlo Panichi 2014-07-03 10:07:09 +00:00
parent 2be1fee801
commit 12fb07fd9b
4 changed files with 26 additions and 3 deletions

View File

@ -4,6 +4,9 @@
<wb-resource deploy-path="/" source-path="/src/main/webapp" tag="defaultRootSource"/>
<wb-resource deploy-path="/WEB-INF/classes" source-path="/src/main/java"/>
<wb-resource deploy-path="/WEB-INF/classes" source-path="/src/main/resources"/>
<dependent-module archiveName="tabular-data-expression-widget-1.2.0-SNAPSHOT.jar" deploy-path="/WEB-INF/lib" handle="module:/resource/tabular-data-expression-widget/tabular-data-expression-widget">
<dependency-type>uses</dependency-type>
</dependent-module>
<dependent-module archiveName="tabular-data-widgetx-tdx-source-1.3.0-SNAPSHOT.jar" deploy-path="/WEB-INF/lib" handle="module:/resource/tabular-data-widgetx-tdx-source/tabular-data-widgetx-tdx-source">
<dependency-type>uses</dependency-type>
</dependent-module>

View File

@ -511,6 +511,7 @@ public class TabularDataController {
case DENORMALIZE:
break;
case NORMALIZE:
openNormalize();
break;
case EXTRACTCODELIST:
openExtractCodelistWizard();
@ -1005,6 +1006,25 @@ public class TabularDataController {
}
}
protected void openNormalize() {
openNormalize(null);
}
protected void openNormalize(String columnName) {
Log.debug("Request Open Normalize Tab");
if (trId != null) {
WidgetRequestEvent e = new WidgetRequestEvent(
WidgetRequestType.NORAMLIZEPANEL);
e.setTrId(trId);
e.setColumnName(columnName);
eventBus.fireEvent(e);
} else {
Log.error("TRId is null");
UtilsGXT3.alert("Error", "No current tabular resource present");
}
}
protected void cloneTabularResource() {
CloneTabularResource cloneTR = new CloneTabularResource(trId, eventBus);
cloneTR.cloneTR();

View File

@ -38,10 +38,9 @@ public class CurationToolBar {
protected TextButton duplicateDetectionButton;
protected TextButton rulesButton;
protected TextButton normalizeButton;
protected TextButton manageRulesButton;
protected TextButton applyTemplateButton;
protected TextButton normalizeButton;
protected TextButton denormalizeButton;
protected TextButton changeColumnLabelButton;
protected TextButton columnTypeButton;
@ -452,10 +451,10 @@ public class CurationToolBar {
case TABLECURATION:
duplicateDetectionButton.enable();
rulesButton.disable();
normalizeButton.disable();
manageRulesButton.disable();
applyTemplateButton.enable();
denormalizeButton.disable();
normalizeButton.enable();
changeColumnLabelButton.enable();
columnTypeButton.enable();
tableTypeButton.enable();

View File

@ -5,6 +5,7 @@
<Change>Added Column Mapping</Change>
<Change>Added context menu to Validations</Change>
<Change>Added Security Exception</Change>
<Change>Added Normalize</Change>
<Change>Updated Extract Codelist</Change>
<Change>Updated Codelist Mapping Import</Change>
<Change>Updated informations properties</Change>