diff --git a/src/main/java/org/gcube/portlets/user/speciesdiscovery/client/SearchController.java b/src/main/java/org/gcube/portlets/user/speciesdiscovery/client/SearchController.java index 51c5107..6058b38 100644 --- a/src/main/java/org/gcube/portlets/user/speciesdiscovery/client/SearchController.java +++ b/src/main/java/org/gcube/portlets/user/speciesdiscovery/client/SearchController.java @@ -1014,7 +1014,7 @@ public class SearchController { Info.display("Saving in progress", "..."); - SpeciesDiscovery.taxonomySearchService.saveTaxonomyJob(jobTaxonomyModel.getIdentifier(), destinationFolder.getId(), name, scientificName, dataSourceName, new AsyncCallback() { + SpeciesDiscovery.taxonomySearchService.saveTaxonomyJobError(jobTaxonomyModel.getIdentifier(), destinationFolder.getId(), name, scientificName, dataSourceName, new AsyncCallback() { @Override public void onSuccess(Boolean result) { @@ -1144,13 +1144,11 @@ public class SearchController { private void saveOccurrenceJobError() { - WorkspaceLightTreeSavePopup popup = new WorkspaceLightTreeSavePopup("Select where to save the Occurrence points", true, fileName); + WorkspaceLightTreeSavePopup popup = new WorkspaceLightTreeSavePopup("Select where to save the error file", true, fileName); popup.setModal(false); popup.setSelectableTypes(ItemType.FOLDER, ItemType.ROOT); popup.center(); - - popup.addPopupHandler(new PopupHandler() { public void onPopup(PopupEvent event) { @@ -1160,7 +1158,7 @@ public class SearchController { Info.display("Saving in progress", "..."); - SpeciesDiscovery.taxonomySearchService.saveOccurrenceJob(jobOccurrencesModel, destinationFolder.getId(), name, scientificName, dataSources, new AsyncCallback() { + SpeciesDiscovery.taxonomySearchService.saveOccurrenceJobError(jobOccurrencesModel, destinationFolder.getId(), name, scientificName, dataSources, new AsyncCallback() { @Override public void onSuccess(Boolean result) { diff --git a/src/main/java/org/gcube/portlets/user/speciesdiscovery/client/job/SpeciesJobPanel.java b/src/main/java/org/gcube/portlets/user/speciesdiscovery/client/job/SpeciesJobPanel.java index 643e2f1..ecf4da3 100644 --- a/src/main/java/org/gcube/portlets/user/speciesdiscovery/client/job/SpeciesJobPanel.java +++ b/src/main/java/org/gcube/portlets/user/speciesdiscovery/client/job/SpeciesJobPanel.java @@ -57,7 +57,7 @@ public class SpeciesJobPanel extends ContentPanel{ lastQuery = new TextField(); lastQuery.setReadOnly(true); - lastQuery.setWidth(350); + lastQuery.setWidth(400); lastQuery.setValue(EMPTY); toolbar.add(new FillToolItem()); toolbar.add(txtLastQuery); diff --git a/src/main/java/org/gcube/portlets/user/speciesdiscovery/client/job/occurrence/OccurrenceGridJob.java b/src/main/java/org/gcube/portlets/user/speciesdiscovery/client/job/occurrence/OccurrenceGridJob.java index f6bcfda..6e03432 100644 --- a/src/main/java/org/gcube/portlets/user/speciesdiscovery/client/job/occurrence/OccurrenceGridJob.java +++ b/src/main/java/org/gcube/portlets/user/speciesdiscovery/client/job/occurrence/OccurrenceGridJob.java @@ -401,7 +401,7 @@ public class OccurrenceGridJob extends ContentPanel{ String load = baseModelData.get(JobOccurrencesModel.STATUS).toString(); - if(load.compareTo(DownloadState.COMPLETED.toString())==0 || load.compareTo(DownloadState.SAVED.toString())==0 ){ + if(load.compareTo(DownloadState.COMPLETED.toString())==0 || load.compareTo(DownloadState.SAVED.toString())==0 || load.compareTo(DownloadState.FAILED.toString())==0){ String jobIdentifier = baseModelData.get(JobOccurrencesModel.JOBINDENTIFIER); String scientificName = baseModelData.get(JobOccurrencesModel.SCIENTIFICNAME); diff --git a/src/main/java/org/gcube/portlets/user/speciesdiscovery/client/job/taxonomy/TaxonomyGridJob.java b/src/main/java/org/gcube/portlets/user/speciesdiscovery/client/job/taxonomy/TaxonomyGridJob.java index 3fd6403..e19213c 100644 --- a/src/main/java/org/gcube/portlets/user/speciesdiscovery/client/job/taxonomy/TaxonomyGridJob.java +++ b/src/main/java/org/gcube/portlets/user/speciesdiscovery/client/job/taxonomy/TaxonomyGridJob.java @@ -415,7 +415,7 @@ public class TaxonomyGridJob extends ContentPanel{ String load = baseModelData.get(JobTaxonomyModel.STATUS).toString(); - if(load.compareTo(DownloadState.COMPLETED.toString())==0 || load.compareTo(DownloadState.SAVED.toString())==0 ){ + if(load.compareTo(DownloadState.COMPLETED.toString())==0 || load.compareTo(DownloadState.SAVED.toString())==0 || load.compareTo(DownloadState.FAILED.toString())==0){ String jobIdentifier = baseModelData.get(JobTaxonomyModel.JOBINDENTIFIER); String scientificName = baseModelData.get(JobTaxonomyModel.SCIENTIFICNAME); diff --git a/src/main/java/org/gcube/portlets/user/speciesdiscovery/client/resources/Resources.java b/src/main/java/org/gcube/portlets/user/speciesdiscovery/client/resources/Resources.java index 312c5ed..18fc4fc 100644 --- a/src/main/java/org/gcube/portlets/user/speciesdiscovery/client/resources/Resources.java +++ b/src/main/java/org/gcube/portlets/user/speciesdiscovery/client/resources/Resources.java @@ -52,12 +52,19 @@ public interface Resources extends ClientBundle { @Source("gis_products.png") ImageResource getGisProducts(); - @Source("arrow-down.png") +// @Source("arrow-down.png") +// ImageResource getArrowDown(); +// +// @Source("arrow-right.png") +// ImageResource getArrowRight(); + + @Source("arrow-down.gif") ImageResource getArrowDown(); - @Source("arrow-right.png") + @Source("arrow-right.gif") ImageResource getArrowRight(); + @Source("arrow-turn.png") ImageResource getArrowTurn(); diff --git a/src/main/java/org/gcube/portlets/user/speciesdiscovery/client/resources/arrow-down.gif b/src/main/java/org/gcube/portlets/user/speciesdiscovery/client/resources/arrow-down.gif new file mode 100644 index 0000000..7e6f30e Binary files /dev/null and b/src/main/java/org/gcube/portlets/user/speciesdiscovery/client/resources/arrow-down.gif differ diff --git a/src/main/java/org/gcube/portlets/user/speciesdiscovery/client/resources/arrow-down.png b/src/main/java/org/gcube/portlets/user/speciesdiscovery/client/resources/arrow-down1.png similarity index 100% rename from src/main/java/org/gcube/portlets/user/speciesdiscovery/client/resources/arrow-down.png rename to src/main/java/org/gcube/portlets/user/speciesdiscovery/client/resources/arrow-down1.png diff --git a/src/main/java/org/gcube/portlets/user/speciesdiscovery/client/resources/arrow-down2.png b/src/main/java/org/gcube/portlets/user/speciesdiscovery/client/resources/arrow-down3.png similarity index 100% rename from src/main/java/org/gcube/portlets/user/speciesdiscovery/client/resources/arrow-down2.png rename to src/main/java/org/gcube/portlets/user/speciesdiscovery/client/resources/arrow-down3.png diff --git a/src/main/java/org/gcube/portlets/user/speciesdiscovery/client/resources/arrow-right.gif b/src/main/java/org/gcube/portlets/user/speciesdiscovery/client/resources/arrow-right.gif new file mode 100644 index 0000000..3c8d4db Binary files /dev/null and b/src/main/java/org/gcube/portlets/user/speciesdiscovery/client/resources/arrow-right.gif differ diff --git a/src/main/java/org/gcube/portlets/user/speciesdiscovery/client/resources/arrow-right.png b/src/main/java/org/gcube/portlets/user/speciesdiscovery/client/resources/arrow-right1.png similarity index 100% rename from src/main/java/org/gcube/portlets/user/speciesdiscovery/client/resources/arrow-right.png rename to src/main/java/org/gcube/portlets/user/speciesdiscovery/client/resources/arrow-right1.png diff --git a/src/main/java/org/gcube/portlets/user/speciesdiscovery/server/asl/SessionUtil.java b/src/main/java/org/gcube/portlets/user/speciesdiscovery/server/asl/SessionUtil.java index a20ff1a..d6d3e67 100644 --- a/src/main/java/org/gcube/portlets/user/speciesdiscovery/server/asl/SessionUtil.java +++ b/src/main/java/org/gcube/portlets/user/speciesdiscovery/server/asl/SessionUtil.java @@ -102,9 +102,9 @@ public class SessionUtil { //for test only // user = "test.user"; - user = "lucio.lelii"; -// user = "pasquale.pagano"; // user = "lucio.lelii"; +// user = "pasquale.pagano"; + user = "francesco.mangiacrapa"; String scope = "/gcube/devsec"; //Development // String scope = "/d4science.research-infrastructures.eu/gCubeApps/BiodiversityResearchEnvironment"; //Production diff --git a/src/main/webapp/SpeciesDiscovery.css b/src/main/webapp/SpeciesDiscovery.css index 7509f75..c9f3063 100644 --- a/src/main/webapp/SpeciesDiscovery.css +++ b/src/main/webapp/SpeciesDiscovery.css @@ -74,15 +74,22 @@ table { background-color: transparent !important; background: none !important; background-image: none !important; - padding: 0px !important; +/* padding: 0px !important; */ color: #4784C3 !important; /*color: #000 !important;*/ font-size: 10px; - width: 105px !important; +/* width: 105px !important; */ /*font-family: Serif, "Times New Roman", Georgia;*/ /*color: black;*/ /*font-weight: bold;*/ text-decoration: underline !important; } + +/* the position of the icon is setted with -5px of margin in horizontal*/ +.button-hyperlink .x-btn-image { +/* background-position: -3px, 0px !important; */ +/* margin-right: 5px !important; */ +} + /* remove images */ .button-hyperlink .x-btn-tl,.button-hyperlink.x-btn-tr,.button-hyperlink .x-btn-tc,.button-hyperlink .x-btn-ml,.button-hyperlink .x-btn-mr,.button-hyperlink .x-btn-mc,.button-hyperlink .x-btn-bl,.button-hyperlink .x-btn-br,.button-hyperlink .x-btn-bc {