diff --git a/src/main/java/org/gcube/portlets/user/speciesdiscovery/client/advancedsearch/AdvancedSearchPanelManager.java b/src/main/java/org/gcube/portlets/user/speciesdiscovery/client/advancedsearch/AdvancedSearchPanelManager.java index 8434e59..bb6d742 100644 --- a/src/main/java/org/gcube/portlets/user/speciesdiscovery/client/advancedsearch/AdvancedSearchPanelManager.java +++ b/src/main/java/org/gcube/portlets/user/speciesdiscovery/client/advancedsearch/AdvancedSearchPanelManager.java @@ -19,7 +19,7 @@ import com.extjs.gxt.ui.client.widget.layout.CardLayout; * */ public class AdvancedSearchPanelManager extends ContentPanel implements AdvancedSearchInterface{ - + private static AdvancedSearchPanelManager instance; private BoundsFilter boundsFilter; private DateFilter dateFilter; @@ -40,7 +40,7 @@ public class AdvancedSearchPanelManager extends ContentPanel implements Advanced } private AdvancedSearchPanelManager(){ - + boundsFilter = new BoundsFilter(); dateFilter = new DateFilter(); regionFilter = new RegionFilter(); @@ -48,7 +48,7 @@ public class AdvancedSearchPanelManager extends ContentPanel implements Advanced synonymsFilter = new SynonymsFilter(); unfoldFilter = new UnfoldFilter(); // classificationFilter = new ClassificationFilter(); - + init(); // listAdvacedPanels.add(classificationFilter.getName()); listAdvacedPanels.add(dataSourceFilter.getName()); @@ -61,30 +61,26 @@ public class AdvancedSearchPanelManager extends ContentPanel implements Advanced } private void init() { - + setLayout(cardLayout); setHeaderVisible(false); - - setSize(925, 90); - - + setSize(925, 95); setBodyBorder(false); - + add(boundsFilter.getPanel()); add(dateFilter.getPanel()); add(dataSourceFilter.getPanel()); add(regionFilter.getPanel()); add(synonymsFilter.getPanel()); add(unfoldFilter.getPanel()); - cardLayout.setActiveItem(boundsFilter.getPanel()); } - + public List getListAdvancedSearchPanels(){ - return listAdvacedPanels; + return listAdvacedPanels; } - + public void setActivePanel(String name){ if(name.equals(AdvancedSearchPanelEnum.BOUNDS.getLabel())) cardLayout.setActiveItem(boundsFilter.getPanel()); @@ -101,13 +97,13 @@ public class AdvancedSearchPanelManager extends ContentPanel implements Advanced // else if(name.equals(AdvancedSearchPanelEnum.CLASSIFICATION.getLabel())) // cardLayout.setActiveItem(classificationFilter.getPanel()); } - - + + public ContentPanel getPanel(){ return this; } - - + + public NumberField getUpperBoundLatitudeField() { return boundsFilter.getUpperBoundLatitudeField(); } @@ -123,7 +119,7 @@ public class AdvancedSearchPanelManager extends ContentPanel implements Advanced public NumberField getLowerBoundLongitudeField() { return boundsFilter.getLowerBoundLongitudeField(); } - + public DateField getFromDate() { return dateFilter.getFromDate(); } @@ -136,29 +132,29 @@ public class AdvancedSearchPanelManager extends ContentPanel implements Advanced dataSourceFilter.loadDataSource(result); synonymsFilter.loadDataSource(result); unfoldFilter.loadDataSource(result); - + listDataSources = new HashMap(); - + //fill hash for(DataSourceModel dsm: result){ listDataSources.put(dsm.getId(), dsm); } - + setAvailableInfoAdvancedFilters(result); - + } - + private void setAvailableInfoAdvancedFilters(List result) { - + for(DataSourceModel dsm: result){ for (DataSourceCapability dsc : dsm.getListCapabilities()) { ArrayList properties = dsc.getListFilters(); - + for (SpeciesCapability capabilityEnum : properties) { - + // System.out.println("capability " + capabilityEnum.toString()); - + if(capabilityEnum.equals(SpeciesCapability.FROMDATE)) dateFilter.addAvailablePlugInfo(dsm, SpeciesCapability.FROMDATE); else if(capabilityEnum.equals(SpeciesCapability.LOWERBOUND)) @@ -174,20 +170,20 @@ public class AdvancedSearchPanelManager extends ContentPanel implements Advanced } } } - - + + } - + public void setCurrentCapability(SpeciesCapability capability){ - + this.currentSelectedCapability = capability; - + this.capabilityChange(); - + } - + public void setVisibleAllPanel(boolean bool){ - + boundsFilter.getPanel().setVisible(bool); dateFilter.getPanel().setVisible(bool); dataSourceFilter.getPanel().setVisible(bool); @@ -195,51 +191,51 @@ public class AdvancedSearchPanelManager extends ContentPanel implements Advanced synonymsFilter.getPanel().setVisible(bool); unfoldFilter.getPanel().setVisible(bool); // classificationFilter.getPanel().setVisible(bool); - + } private void capabilityChange() { - + // dataSourceFilter.disableAllCheck(); dataSourceFilter.enableCheckByCapability(this.currentSelectedCapability); - + } public List getCheckedDataSources() { return dataSourceFilter.getCheckedGroupList(); - + } - + public List getCheckedDataSourceForSynonyms() { return synonymsFilter.getCheckedGroupList(); - + } - + public HashMap findDataSourceByCapability(SpeciesCapability capability) { - + if(capability.getName().compareTo(SpeciesCapability.RESULTITEM.getName())==0){ return dataSourceFilter.getHashMapDataSourceOccurrences(); } else if(capability.getName().compareTo(SpeciesCapability.TAXONOMYITEM.getName())==0){ - + return dataSourceFilter.getHashMapDataSourceClassification(); } - + return null; } - - + + public DataSourceModel findDataSourceByCapabilityAndName(SpeciesCapability capability, String dataSourceName) { - + HashMap hashDataSource = findDataSourceByCapability(capability); - + if(hashDataSource!=null) return hashDataSource.get(dataSourceName); - + return null; } - - + + public SpeciesCapability getCurrentSelectedCapability() { return currentSelectedCapability; @@ -248,11 +244,11 @@ public class AdvancedSearchPanelManager extends ContentPanel implements Advanced public List getCheckedDataSourceForUnfold() { return unfoldFilter.getCheckedGroupList(); } - + public void disableFilterForSearchType(SearchType type){ - + switch (type) { - + case BY_COMMON_NAME: unfoldFilter.activeChecks(false); break; @@ -261,7 +257,7 @@ public class AdvancedSearchPanelManager extends ContentPanel implements Advanced unfoldFilter.activeChecks(true); break; } - + } - + }