From b743e9e169e1eb4e118498903d4b154f67db6d98 Mon Sep 17 00:00:00 2001 From: Francesco Mangiacrapa Date: Fri, 19 Jul 2013 12:11:36 +0000 Subject: [PATCH] Completed updated on css and job save errors git-svn-id: http://svn.research-infrastructures.eu/public/d4science/gcube/trunk/portlets/user/speciesdiscovery@79440 82a268e6-3cf1-43bd-a215-b396298e98cf --- .../speciesdiscovery/client/SearchController.java | 8 +++----- .../client/job/SpeciesJobPanel.java | 2 +- .../client/job/occurrence/OccurrenceGridJob.java | 2 +- .../client/job/taxonomy/TaxonomyGridJob.java | 2 +- .../client/resources/Resources.java | 11 +++++++++-- .../client/resources/arrow-down.gif | Bin 0 -> 77 bytes .../resources/{arrow-down.png => arrow-down1.png} | Bin .../resources/{arrow-down2.png => arrow-down3.png} | Bin .../client/resources/arrow-right.gif | Bin 0 -> 79 bytes .../{arrow-right.png => arrow-right1.png} | Bin .../speciesdiscovery/server/asl/SessionUtil.java | 4 ++-- src/main/webapp/SpeciesDiscovery.css | 11 +++++++++-- 12 files changed, 26 insertions(+), 14 deletions(-) create mode 100644 src/main/java/org/gcube/portlets/user/speciesdiscovery/client/resources/arrow-down.gif rename src/main/java/org/gcube/portlets/user/speciesdiscovery/client/resources/{arrow-down.png => arrow-down1.png} (100%) rename src/main/java/org/gcube/portlets/user/speciesdiscovery/client/resources/{arrow-down2.png => arrow-down3.png} (100%) create mode 100644 src/main/java/org/gcube/portlets/user/speciesdiscovery/client/resources/arrow-right.gif rename src/main/java/org/gcube/portlets/user/speciesdiscovery/client/resources/{arrow-right.png => arrow-right1.png} (100%) 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 0000000000000000000000000000000000000000..7e6f30e0d144f4976fd4f08a93d3416139d8da2c GIT binary patch literal 77 zcmZ?wbhEHb