Revision cfe33fb8
Added by Andreas Kohlbecker over 2 years ago
| src/main/java/eu/etaxonomy/cdm/vaadin/view/registration/ListPresenter.java | ||
|---|---|---|
| 147 | 147 |
// prepare the filters |
| 148 | 148 |
RegistrationSearchFilter filter = loadFilterFromView(); |
| 149 | 149 |
if(textFieldOverride != null && textFieldOverride == getView().getIdentifierFilter()){
|
| 150 |
filter.identifierPattern = alternativeText;
|
|
| 150 |
filter.setIdentifierPattern(alternativeText);
|
|
| 151 | 151 |
} |
| 152 | 152 |
|
| 153 | 153 |
if(textFieldOverride != null && textFieldOverride == getView().getTaxonNameFilter()){
|
| 154 |
filter.namePattern = alternativeText;
|
|
| 154 |
filter.setNamePattern(alternativeText);
|
|
| 155 | 155 |
} |
| 156 | 156 |
if(textFieldOverride != null && textFieldOverride == getView().getReferenceFilter()){
|
| 157 |
filter.referencePattern = alternativeText;
|
|
| 157 |
filter.setReferencePattern(alternativeText);
|
|
| 158 | 158 |
} |
| 159 | 159 |
|
| 160 |
if(filter.typeStatus.isEmpty()){
|
|
| 161 |
filter.typeStatus = null; |
|
| 162 |
} else {
|
|
| 163 |
if(filter.typeStatus.contains(TypeDesignationStatusFilter.NULL_ELEMENT)){
|
|
| 164 |
Set<TypeDesignationStatusFilter> tmpSet = new HashSet<>(); |
|
| 165 |
tmpSet.addAll(filter.typeStatus); |
|
| 166 |
tmpSet.remove(TypeDesignationStatusFilter.NULL_ELEMENT); |
|
| 167 |
tmpSet.add(null); |
|
| 168 |
filter.typeStatus = tmpSet; |
|
| 169 |
} |
|
| 160 |
|
|
| 161 |
if(filter.getTypeStatus().contains(TypeDesignationStatusFilter.NULL_ELEMENT)){
|
|
| 162 |
Set<TypeDesignationStatusFilter> tmpSet = new HashSet<>(); |
|
| 163 |
tmpSet.addAll(filter.getTypeStatus()); |
|
| 164 |
tmpSet.remove(TypeDesignationStatusFilter.NULL_ELEMENT); |
|
| 165 |
tmpSet.add(null); |
|
| 166 |
filter.setTypeStatus(tmpSet); |
|
| 170 | 167 |
} |
| 171 | 168 |
|
| 169 |
|
|
| 172 | 170 |
if(getView().getViewMode().equals(ListView.Mode.inProgress)){
|
| 173 |
filter.registrationStatus = inProgressStatus;
|
|
| 171 |
filter.setRegistrationStatus(inProgressStatus);
|
|
| 174 | 172 |
} |
| 175 | 173 |
|
| 176 |
List<UUID> typeDesignationStatus = null; |
|
| 177 |
if(filter.typeStatus != null){
|
|
| 178 |
typeDesignationStatus = new ArrayList<>(TypeDesignationStatusFilter.toTypeDesignationStatusUuids(filter.typeStatus)); |
|
| 179 |
} |
|
| 174 |
List<UUID> typeDesignationStatus = new ArrayList<>(TypeDesignationStatusFilter.toTypeDesignationStatusUuids(filter.getTypeStatus())); |
|
| 180 | 175 |
|
| 181 | 176 |
Pager<RegistrationDTO> dtoPager = getWorkingSetService().pageDTOs( |
| 182 |
filter.submitter != null ? filter.submitter.getUuid() : null,
|
|
| 183 |
filter.registrationStatus != null ? new ArrayList<>(filter.registrationStatus): null,
|
|
| 184 |
StringUtils.trimToNull(filter.identifierPattern),
|
|
| 185 |
StringUtils.trimToNull(filter.namePattern),
|
|
| 186 |
StringUtils.trimToNull(filter.referencePattern),
|
|
| 177 |
filter.getSubmitter() != null ? filter.getSubmitter().getUuid() : null,
|
|
| 178 |
filter.getRegistrationStatus() != null ? new ArrayList<>(filter.getRegistrationStatus()): null,
|
|
| 179 |
StringUtils.trimToNull(filter.getIdentifierPattern()),
|
|
| 180 |
StringUtils.trimToNull(filter.getNamePattern()),
|
|
| 181 |
StringUtils.trimToNull(filter.getReferencePattern()),
|
|
| 187 | 182 |
typeDesignationStatus, |
| 188 | 183 |
pageSize, |
| 189 | 184 |
pageIndex, |
| ... | ... | |
| 257 | 252 |
/** |
| 258 | 253 |
* |
| 259 | 254 |
*/ |
| 255 |
@SuppressWarnings("unchecked")
|
|
| 260 | 256 |
public RegistrationSearchFilter loadFilterFromView() {
|
| 261 | 257 |
|
| 262 | 258 |
|
| 263 | 259 |
RegistrationSearchFilter filter = new RegistrationSearchFilter(); |
| 264 |
filter.identifierPattern = getView().getIdentifierFilter().getValue();
|
|
| 265 |
filter.namePattern = getView().getTaxonNameFilter().getValue();
|
|
| 260 |
filter.setIdentifierPattern(getView().getIdentifierFilter().getValue());
|
|
| 261 |
filter.setNamePattern(getView().getTaxonNameFilter().getValue());
|
|
| 266 | 262 |
if(getView().getSubmitterFilter() != null){
|
| 267 | 263 |
Object o = getView().getSubmitterFilter().getValue(); |
| 268 | 264 |
if(o != null){
|
| 269 |
filter.submitter = (User)o;
|
|
| 265 |
filter.setSubmitter((User)o);
|
|
| 270 | 266 |
} |
| 271 | 267 |
} else {
|
| 272 | 268 |
Authentication authentication = currentSecurityContext().getAuthentication(); |
| 273 | 269 |
if(authentication != null && authentication.getPrincipal() != null && authentication.getPrincipal() instanceof User){
|
| 274 |
filter.submitter = (User) authentication.getPrincipal();
|
|
| 270 |
filter.setSubmitter((User) authentication.getPrincipal());
|
|
| 275 | 271 |
} |
| 276 | 272 |
} |
| 277 |
filter.typeStatus = (Set<TypeDesignationStatusFilter>) getView().getStatusTypeFilter().getValue(); |
|
| 278 |
EnumSet<RegistrationStatus> registrationStatusFilter = null; |
|
| 273 |
if(getView().getStatusTypeFilter().getValue() != null) {
|
|
| 274 |
filter.setTypeStatus((Set<TypeDesignationStatusFilter>) getView().getStatusTypeFilter().getValue()); |
|
| 275 |
} |
|
| 279 | 276 |
Object o = getView().getRegistrationStatusFilter().getValue(); |
| 280 | 277 |
if(o != null){
|
| 281 |
filter.registrationStatus = EnumSet.of((RegistrationStatus)o);
|
|
| 278 |
filter.setRegistrationStatus(EnumSet.of((RegistrationStatus)o));
|
|
| 282 | 279 |
} |
| 283 | 280 |
return filter; |
| 284 | 281 |
} |
| 285 | 282 |
|
| 286 | 283 |
|
| 287 |
/** |
|
| 288 |
* |
|
| 289 |
*/ |
|
| 290 | 284 |
private void loadSearchFilterFromSession() {
|
| 291 | 285 |
Object o = UI.getCurrent().getSession().getAttribute(REGISTRATION_LIST_PRESENTER_SEARCH_FILTER); |
| 292 | 286 |
if(o != null){
|
| 293 | 287 |
RegistrationSearchFilter filter = (RegistrationSearchFilter)o; |
| 294 |
getView().getIdentifierFilter().setValue(filter.identifierPattern);
|
|
| 295 |
getView().getTaxonNameFilter().setValue(filter.namePattern);
|
|
| 288 |
getView().getIdentifierFilter().setValue(filter.getIdentifierPattern());
|
|
| 289 |
getView().getTaxonNameFilter().setValue(filter.getNamePattern());
|
|
| 296 | 290 |
if(getView().getSubmitterFilter() != null){
|
| 297 |
getView().getSubmitterFilter().setValue(filter.submitter);
|
|
| 291 |
getView().getSubmitterFilter().setValue(filter.getSubmitter());
|
|
| 298 | 292 |
} |
| 299 |
setSelectValue(getView().getStatusTypeFilter(), filter.typeStatus);
|
|
| 300 |
setSelectValue(getView().getRegistrationStatusFilter(), filter.registrationStatus);
|
|
| 293 |
setSelectValue(getView().getStatusTypeFilter(), filter.getTypeStatus());
|
|
| 294 |
setSelectValue(getView().getRegistrationStatusFilter(), filter.getRegistrationStatus());
|
|
| 301 | 295 |
} |
| 302 | 296 |
|
| 303 | 297 |
} |
Also available in: Unified diff
fix #9892 solving broken height of type status mutiselect and turning RegistrationSearchFilter into proper java bean