Tony CHEMIT pushed to branch develop-7.x at ultreiaio / ird-observe
Commits:
-
aaae338b
by tchemit at 2019-07-24T16:38:15Z
2 changed files:
- client-core/src/main/java/fr/ird/observe/client/ui/content/data/seine/TargetCatchUIHandler.java
- client-core/src/main/java/fr/ird/observe/client/ui/content/data/seine/TargetDiscardCatchUIHandler.java
Changes:
| ... | ... | @@ -41,19 +41,22 @@ import fr.ird.observe.dto.referential.SpeciesReference; |
| 41 | 41 |
import fr.ird.observe.dto.referential.seine.WeightCategoryHelper;
|
| 42 | 42 |
import fr.ird.observe.dto.referential.seine.WeightCategoryReference;
|
| 43 | 43 |
import fr.ird.observe.dto.result.SaveResultDto;
|
| 44 |
-import org.apache.logging.log4j.Logger;
|
|
| 45 | 44 |
import org.apache.logging.log4j.LogManager;
|
| 45 |
+import org.apache.logging.log4j.Logger;
|
|
| 46 | 46 |
import org.nuiton.decorator.Decorator;
|
| 47 | 47 |
import org.nuiton.jaxx.runtime.spi.UIHandler;
|
| 48 | 48 |
import org.nuiton.jaxx.widgets.select.BeanFilterableComboBox;
|
| 49 | 49 |
|
| 50 |
-import javax.swing.*;
|
|
| 50 |
+import javax.swing.JComponent;
|
|
| 51 |
+import javax.swing.JOptionPane;
|
|
| 52 |
+import javax.swing.JTable;
|
|
| 51 | 53 |
import javax.swing.table.DefaultTableCellRenderer;
|
| 52 | 54 |
import java.awt.Component;
|
| 53 | 55 |
import java.awt.Container;
|
| 54 | 56 |
import java.util.Collections;
|
| 55 | 57 |
import java.util.List;
|
| 56 | 58 |
import java.util.Set;
|
| 59 |
+import java.util.stream.Collectors;
|
|
| 57 | 60 |
|
| 58 | 61 |
import static io.ultreia.java4all.i18n.I18n.n;
|
| 59 | 62 |
import static io.ultreia.java4all.i18n.I18n.t;
|
| ... | ... | @@ -72,9 +75,11 @@ public class TargetCatchUIHandler extends ContentTableUIHandler<SetSeineTargetCa |
| 72 | 75 |
addReferentialFilter(TargetCatchDto.PROPERTY_SPECIES, (ReferentialReferencesFilter<SpeciesDto, SpeciesReference>) incomingReferences -> {
|
| 73 | 76 |
String speciesListId = ObserveSwingApplicationContext.get().getConfig().getSpeciesListSeineTargetCatchId();
|
| 74 | 77 |
|
| 78 |
+ Set<String> usedSpeciesId = getDataSource().getReferentialReferenceSet(WeightCategoryReference.class).toSet().stream().map(WeightCategoryReference::getSpeciesId).collect(Collectors.toSet());
|
|
| 75 | 79 |
String tripSeineId = getDataContext().getSelectedTripSeineId();
|
| 76 |
- List<SpeciesReference> result = getTripSeineService().getSpeciesByListAndTrip(tripSeineId, speciesListId).toList();
|
|
| 77 |
- return DtoReferenceCollection.filterEnabled(result);
|
|
| 80 |
+ List<SpeciesReference> allSpecies = getTripSeineService().getSpeciesByListAndTrip(tripSeineId, speciesListId).toList();
|
|
| 81 |
+ List<SpeciesReference> speciesWithCategory = allSpecies.stream().filter(s -> usedSpeciesId.contains(s.getId())).collect(Collectors.toList());
|
|
| 82 |
+ return DtoReferenceCollection.filterEnabled(speciesWithCategory);
|
|
| 78 | 83 |
});
|
| 79 | 84 |
}
|
| 80 | 85 |
|
| ... | ... | @@ -58,6 +58,7 @@ import java.util.Collections; |
| 58 | 58 |
import java.util.List;
|
| 59 | 59 |
import java.util.Optional;
|
| 60 | 60 |
import java.util.Set;
|
| 61 |
+import java.util.stream.Collectors;
|
|
| 61 | 62 |
|
| 62 | 63 |
import static io.ultreia.java4all.i18n.I18n.n;
|
| 63 | 64 |
import static io.ultreia.java4all.i18n.I18n.t;
|
| ... | ... | @@ -78,9 +79,11 @@ public class TargetDiscardCatchUIHandler extends ContentTableUIHandler<SetSeineT |
| 78 | 79 |
addReferentialFilter(TargetCatchDto.PROPERTY_SPECIES, (ReferentialReferencesFilter<SpeciesDto, SpeciesReference>) incomingReferences -> {
|
| 79 | 80 |
String speciesListId = ObserveSwingApplicationContext.get().getConfig().getSpeciesListSeineTargetCatchId();
|
| 80 | 81 |
|
| 82 |
+ Set<String> usedSpeciesId = getDataSource().getReferentialReferenceSet(WeightCategoryReference.class).toSet().stream().map(WeightCategoryReference::getSpeciesId).collect(Collectors.toSet());
|
|
| 81 | 83 |
String tripSeineId = getDataContext().getSelectedTripSeineId();
|
| 82 |
- List<SpeciesReference> result = getTripSeineService().getSpeciesByListAndTrip(tripSeineId, speciesListId).toList();
|
|
| 83 |
- return DtoReferenceCollection.filterEnabled(result);
|
|
| 84 |
+ List<SpeciesReference> allSpecies = getTripSeineService().getSpeciesByListAndTrip(tripSeineId, speciesListId).toList();
|
|
| 85 |
+ List<SpeciesReference> speciesWithCategory = allSpecies.stream().filter(s -> usedSpeciesId.contains(s.getId())).collect(Collectors.toList());
|
|
| 86 |
+ return DtoReferenceCollection.filterEnabled(speciesWithCategory);
|
|
| 84 | 87 |
});
|
| 85 | 88 |
}
|
| 86 | 89 |
|