Project

General

Profile

« Previous | Next » 

Revision c609114c

Added by Andreas Kohlbecker almost 5 years ago

fix #8345 adding filter text field for publications in RegistrationListView

View differences:

src/main/java/eu/etaxonomy/cdm/vaadin/view/registration/ListPresenter.java
38 38 
import eu.etaxonomy.cdm.model.common.Language;
39 39 
import eu.etaxonomy.cdm.model.common.User;
40 40 
import eu.etaxonomy.cdm.model.name.RegistrationStatus;
41 
import eu.etaxonomy.cdm.model.name.TypeDesignationStatusBase;
42 41 
import eu.etaxonomy.cdm.model.reference.Reference;
43 42 
import eu.etaxonomy.cdm.service.CdmBeanItemContainerFactory;
44 43 
import eu.etaxonomy.cdm.vaadin.component.registration.RegistrationItem;
......
158 157 
        if(textFieldOverride != null && textFieldOverride == getView().getTaxonNameFilter()){
159 158 
            filter.namePattern = alternativeText;
160 159 
        }
160 
        if(textFieldOverride != null && textFieldOverride == getView().getReferenceFilter()){
161 
            filter.referencePattern = alternativeText;
162 
        }
161 163 

  		




  162
  164
  
    
       if(filter.typeStatus.isEmpty()){


  		




  163
  165
  
    
           filter.typeStatus = null;


  		




  ......




  175
  177
  
    
            filter.registrationStatus = inProgressStatus;


  		




  176
  178
  
    
        }


  		




  177
  179
  
    

  		




  178
  
  
    
        Set<TypeDesignationStatusBase> typeDesignationStatus = null;


  		




  
  180
  
    
        List<UUID> typeDesignationStatus = null;


  		




  179
  181
  
    
        if(filter.typeStatus != null){


  		




  180
  
  
    
            typeDesignationStatus = TypeDesignationStatusFilter.toTypeDesignationStatus(filter.typeStatus);


  		




  
  182
  
    
            typeDesignationStatus = new ArrayList(TypeDesignationStatusFilter.toTypeDesignationStatusUuids(filter.typeStatus));


  		




  181
  183
  
    
        }


  		




  182
  184
  
    

  		




  183
  185
  
    
        Pager<RegistrationDTO> dtoPager = getWorkingSetService().pageDTOs(


  		




  184
  
  
    
                filter.submitter,


  		




  185
  
  
    
                filter.registrationStatus,


  		




  
  186
  
    
                filter.submitter != null ? filter.submitter.getUuid() : null,


  		




  
  187
  
    
                filter.registrationStatus != null ? new ArrayList(filter.registrationStatus): null,


  		




  186
  188
  
    
                StringUtils.trimToNull(filter.identifierPattern),


  		




  187
  189
  
    
                StringUtils.trimToNull(filter.namePattern),


  		




  
  190
  
    
                StringUtils.trimToNull(filter.referencePattern),


  		




  188
  191
  
    
                typeDesignationStatus,


  		




  189
  192
  
    
                pageSize,


  		




  190
  193
  
    
                pageIndex,


  		












  

    
      src/main/java/eu/etaxonomy/cdm/vaadin/view/registration/ListViewBean.java
    
  





  124
  124
  
    
        statusTypeFilter.addValueChangeListener(e -> updateResults(null, null));


  		




  125
  125
  
    
        statusTypeFilter.setDescription("Strg + Click to unselect");


  		




  126
  126
  
    

  		




  127
  
  
    
        toolBar.addComponents(identifierFilter, taxonNameFilter, statusTypeFilter);


  		




  
  127
  
    
        toolBar.addComponents(identifierFilter, taxonNameFilter, referenceFilter, statusTypeFilter);


  		




  128
  128
  
    
        int textChangeTimeOut = 200;


  		




  129
  129
  
    
        identifierFilter.addTextChangeListener(e -> updateResults(identifierFilter, e.getText()));


  		




  130
  130
  
    
        identifierFilter.setTextChangeTimeout(textChangeTimeOut);


  		




  131
  
  
    
        taxonNameFilter.addTextChangeListener(e -> updateResults(taxonNameFilter, e.getText()));


  		




  132
  131
  
    
        identifierFilter.setTextChangeTimeout(textChangeTimeOut);


  		




  
  132
  
    
        taxonNameFilter.addTextChangeListener(e -> updateResults(taxonNameFilter, e.getText()));


  		




  
  133
  
    
        referenceFilter.addTextChangeListener(e -> updateResults(referenceFilter, e.getText()));


  		




  133
  134
  
    

  		




  134
  135
  
    
        toolBar.setSpacing(true);


  		




  135
  136
  
    
        toolBar.iterator().forEachRemaining( c -> c.addStyleName(ValoTheme.LABEL_TINY));


  		












  

    
      src/main/java/eu/etaxonomy/cdm/vaadin/view/registration/RegistrationSearchFilter.java
    
  





  17
  17
  
    
class RegistrationSearchFilter {


  		




  18
  18
  
    
    String identifierPattern;


  		




  19
  19
  
    
    String namePattern;


  		




  
  20
  
    
    String referencePattern;


  		




  20
  21
  
    
    User submitter;


  		




  21
  22
  
    
    Set<TypeDesignationStatusFilter> typeStatus;


  		




  22
  23
  
    
    Set<RegistrationStatus> registrationStatus;


  		












  

    
      src/main/webapp/VAADIN/fonts/README.md
    
  





  1
  1
  
    
## Sub folders:


  		




  2
  2
  
    

  		




  3
  
  
    
*  workspace: svn files for all icons, also those wich are currently not used.


  		




  
  3
  
    
*  workspace: svg files for all icons, also those wich are currently not used.


  		




  4
  4
  
    
* fontset: the icons which are actually contained in the fontset, contains symlinks to the svg files in ./workspace


  		




  5
  5
  
    
 


  		




  6
  6
  
    
## Licence:


  		












Also available in:  Unified diff