diff --git a/src/main/java/org/gcube/datacatalogue/grsf_manage_widget/client/view/FormEntryModel.java b/src/main/java/org/gcube/datacatalogue/grsf_manage_widget/client/view/FormEntryModel.java index d4b26af..389b5e9 100644 --- a/src/main/java/org/gcube/datacatalogue/grsf_manage_widget/client/view/FormEntryModel.java +++ b/src/main/java/org/gcube/datacatalogue/grsf_manage_widget/client/view/FormEntryModel.java @@ -30,7 +30,7 @@ public class FormEntryModel extends Composite{ public FormEntryModel(String label, String value) { initWidget(uiBinder.createAndBindUi(this)); - labelEntry.add(new HTML("Item " + label + ":")); + labelEntry.add(new HTML(" " + label.substring(0, 1).toUpperCase() + label.substring(1) + ":")); entryValue.setText(value); } diff --git a/src/main/java/org/gcube/datacatalogue/grsf_manage_widget/client/view/ManageProductWidget.java b/src/main/java/org/gcube/datacatalogue/grsf_manage_widget/client/view/ManageProductWidget.java index 098b255..02ae8f3 100644 --- a/src/main/java/org/gcube/datacatalogue/grsf_manage_widget/client/view/ManageProductWidget.java +++ b/src/main/java/org/gcube/datacatalogue/grsf_manage_widget/client/view/ManageProductWidget.java @@ -79,6 +79,9 @@ public class ManageProductWidget extends Composite{ @UiField TextArea annotationArea; + + @UiField + TextArea descriptionTextArea; @UiField Button cancelButton; @@ -170,6 +173,7 @@ public class ManageProductWidget extends Composite{ // productSemanticId.setText(bean.getSemanticId()); // productShortTitle.setText(bean.getShortTitle()); // productSource.setText(bean.getSource()); + descriptionTextArea.setText(bean.getDescription()); // check if we need to show more if(bean.getExtrasIfAvailable() != null && !bean.getExtrasIfAvailable().isEmpty()) diff --git a/src/main/java/org/gcube/datacatalogue/grsf_manage_widget/client/view/ManageProductWidget.ui.xml b/src/main/java/org/gcube/datacatalogue/grsf_manage_widget/client/view/ManageProductWidget.ui.xml index 753661c..377f5ee 100644 --- a/src/main/java/org/gcube/datacatalogue/grsf_manage_widget/client/view/ManageProductWidget.ui.xml +++ b/src/main/java/org/gcube/datacatalogue/grsf_manage_widget/client/view/ManageProductWidget.ui.xml @@ -24,19 +24,30 @@ width="100%"> - - Item title: + + Title: + + + Description: + + + + + + - Item GRSF Type: + GRSF Type: - Item Current Status: + Current Status: - Item New Status: + New Status: extrasIfAvailable; + private String description; // info that could change private GRSFStatus currentStatus; @@ -35,26 +36,34 @@ public class ManageProductBean implements Serializable{ * @param knowledgeBaseIdentifier * @param grsfType * @param extrasIfAvailable + * @param description * @param currentStatus * @param newStatus * @param annotation */ public ManageProductBean(String itemTitle, String catalogueIdentifier, String knowledgeBaseIdentifier, String grsfType, - Map extrasIfAvailable, GRSFStatus currentStatus, - GRSFStatus newStatus, String annotation) { + Map extrasIfAvailable, String description, + GRSFStatus currentStatus, GRSFStatus newStatus, String annotation) { super(); this.itemTitle = itemTitle; this.catalogueIdentifier = catalogueIdentifier; this.knowledgeBaseIdentifier = knowledgeBaseIdentifier; this.grsfType = grsfType; this.extrasIfAvailable = extrasIfAvailable; + this.description = description; this.currentStatus = currentStatus; this.newStatus = newStatus; this.annotation = annotation; } + public String getDescription() { + return description; + } + public void setDescription(String description) { + this.description = description; + } public String getCatalogueIdentifier() { return catalogueIdentifier; @@ -125,9 +134,8 @@ public class ManageProductBean implements Serializable{ + ", catalogueIdentifier=" + catalogueIdentifier + ", knowledgeBaseIdentifier=" + knowledgeBaseIdentifier + ", grsfType=" + grsfType + ", extrasIfAvailable=" - + extrasIfAvailable + ", currentStatus=" + currentStatus - + ", newStatus=" + newStatus + ", annotation=" + annotation - + "]"; + + extrasIfAvailable + ", description=" + description + + ", currentStatus=" + currentStatus + ", newStatus=" + + newStatus + ", annotation=" + annotation + "]"; } - }