Tony CHEMIT pushed to branch develop at ultreiaio / ird-observe

Commits:

6 changed files:

Changes:

  • client-core/src/main/java/fr/ird/observe/client/datasource/editor/content/data/ps/observation/NonTargetSampleUIHandler.java
    ... ... @@ -21,7 +21,6 @@
    21 21 
      */
    22 22 
     package fr.ird.observe.client.datasource.editor.content.data.ps.observation;
    23 23
    24 
    -import com.google.common.collect.Lists;
    25 24 
     import fr.ird.observe.client.constants.AcquisitionMode;
    26 25 
     import fr.ird.observe.client.datasource.editor.content.data.table.ContentTableModel;
    27 26 
     import fr.ird.observe.client.datasource.editor.content.data.table.ContentTableUILayoutFocusTraversalPolicy;
    ... ... @@ -50,7 +49,7 @@ import javax.swing.JTable;
    50 49 
     import javax.swing.table.DefaultTableCellRenderer;
    51 50 
     import java.awt.Component;
    52 51 
     import java.awt.Container;
    53 
    -import java.util.Collection;
    52 
    +import java.util.Collections;
    54 53 
     import java.util.LinkedList;
    55 54 
     import java.util.List;
    56 55 
     import java.util.Optional;
    ... ... @@ -81,12 +80,12 @@ public class NonTargetSampleUIHandler extends AbstractSampleUIHandler<NonTargetS
    81 80 
             super.afterInit(ui);
    82 81 
         }
    83 82
    84 
    -    @Override
    85 
    -    protected void onOpenBeforeOpenModel() {
    86 
    -        super.onOpenBeforeOpenModel();
    87 
    -        // We can't add filter since it uses the model.form, so add them now
    88 
    -        onAfterInitAddReferentialFilters(getModel().getReferenceCache());
    89 
    -    }
    83 
    +//    @Override
    84 
    +//    protected void onOpenBeforeOpenModel() {
    85 
    +//        super.onOpenBeforeOpenModel();
    86 
    +//        // We can't add filter since it uses the model.form, so add them now
    87 
    +//        onAfterInitAddReferentialFilters(getModel().getReferenceCache());
    88 
    +//    }
    90 89
    91 90 
         @Override
    92 91 
         protected ContentTableUILayoutFocusTraversalPolicy<NonTargetSampleUI> createFocusTraversalPolicy() {
    ... ... @@ -113,9 +112,6 @@ public class NonTargetSampleUIHandler extends AbstractSampleUIHandler<NonTargetS
    113 112
    114 113 
         @Override
    115 114 
         protected void onAfterInitAddReferentialFilters(ContentUIReferenceCache referenceCache) {
    116 
    -        if (getModel().getForm() == null) {
    117 
    -            return;
    118 
    -        }
    119 115 
             referenceCache.addReferentialFilter(NonTargetLengthDto.PROPERTY_SPECIES, newSpeciesList());
    120 116 
             referenceCache.addReferentialFilter(NonTargetLengthDto.PROPERTY_SPECIES_FATE, newSpeciesFateList());
    121 117 
         }
    ... ... @@ -129,8 +125,8 @@ public class NonTargetSampleUIHandler extends AbstractSampleUIHandler<NonTargetS
    129 125
    130 126 
         private ReferentialReferencesFilter<SpeciesFateDto, SpeciesFateReference> newSpeciesFateList() {
    131 127 
             return incomingReferences -> {
    132 
    -            Collection<SpeciesFateReference> speciesFate = getModel().getForm().getObject().getSpeciesFate();
    133 
    -            return new LinkedList<>(speciesFate);
    128 
    +            ReferentialDtoReferenceSet<SpeciesFateReference> speciesFateSet = getPsObservationNonTargetSampleService().getSampleSpeciesFate(getModel().getSelectedId());
    129 
    +            return new LinkedList<>(speciesFateSet.toSet());
    134 130 
             };
    135 131 
         }
    136 132
    ... ... @@ -211,7 +207,6 @@ public class NonTargetSampleUIHandler extends AbstractSampleUIHandler<NonTargetS
    211 207
    212 208 
         }
    213 209
    214 
    -    @SuppressWarnings("unchecked")
    215 210 
         @Override
    216 211 
         protected void onSelectedRowChanged(int editingRow, NonTargetLengthDto bean, boolean create) {
    217 212 
             ContentTableModel<NonTargetSampleDto, NonTargetLengthDto> model = getTableModel();
    ... ... @@ -247,7 +242,7 @@ public class NonTargetSampleUIHandler extends AbstractSampleUIHandler<NonTargetS
    247 242 
                 AcquisitionMode enumValue = AcquisitionMode.valueOf(acquisitionMode);
    248 243 
                 ui.getAcquisitionModeGroup().setSelectedValue(null);
    249 244 
                 ui.getAcquisitionModeGroup().setSelectedValue(enumValue);
    250 
    -            availableEspeces = Lists.newArrayList(species);
    245 
    +            availableEspeces = Collections.singletonList(species);
    251 246 
                 sizeMeasureType = Optional.ofNullable(bean.getSizeMeasureType());
    252 247 
             }
    253 248

  • client-datasource-editor/src/main/java/fr/ird/observe/client/datasource/editor/content/data/table/ContentTableUI.jaxx
    ... ... @@ -150,7 +150,7 @@ public abstract SwingValidator<C> getValidatorTable();
    150 150 
             </cell>
    151 151 
           </row>
    152 152 
           <row>
    153 
    -        <cell>
    153 
    +        <cell fill="both">
    154 154 
               <Table id='extraZone' decorator='boxed'/>
    155 155 
             </cell>
    156 156 
           </row>

  • dto/src/main/models/Observe-20-data-ps-observation.model
    ... ... @@ -102,7 +102,6 @@ lengthMeasureMethod {*:0..1} fr.ird.observe.dto.referential.common.LengthMeasure
    102 102
    103 103 
     data.ps.observation.NonTargetSample > data.Commentable | form=data.ps.observation.NonTargetLength
    104 104 
     nonTargetLength + {*} data.ps.observation.NonTargetLength | ordered
    105 
    -speciesFate {*:*} fr.ird.observe.dto.referential.ps.common.SpeciesFateReference
    106 105
    107 106 
     data.ps.observation.ObjectObservedSpecies > data.Data | references=speciesLabel,speciesStatusLabel,count
    108 107 
     count + {*:1} Integer

  • server-core/src/main/filtered-resources/mapping
    ... ... @@ -230,6 +230,7 @@ GET /api/v1/data/ps/observation/NonTargetCatchService/loadForm
    230 230 
     POST   /api/v1/data/ps/observation/NonTargetCatchService/save                                                                        v1.data.ps.observation.NonTargetCatchServiceRestApi.save
    231 231 
     GET    /api/v1/data/ps/observation/NonTargetSampleService/canUseNonTargetSample                                                      v1.data.ps.observation.NonTargetSampleServiceRestApi.canUseNonTargetSample
    232 232 
     GET    /api/v1/data/ps/observation/NonTargetSampleService/getSampleSpecies                                                           v1.data.ps.observation.NonTargetSampleServiceRestApi.getSampleSpecies
    233 
    +GET    /api/v1/data/ps/observation/NonTargetSampleService/getSampleSpeciesFate                                                       v1.data.ps.observation.NonTargetSampleServiceRestApi.getSampleSpeciesFate
    233 234 
     GET    /api/v1/data/ps/observation/NonTargetSampleService/loadForm                                                                   v1.data.ps.observation.NonTargetSampleServiceRestApi.loadForm
    234 235 
     POST   /api/v1/data/ps/observation/NonTargetSampleService/save                                                                       v1.data.ps.observation.NonTargetSampleServiceRestApi.save
    235 236 
     GET    /api/v1/data/ps/observation/ObjectObservedSpeciesService/loadForm                                                             v1.data.ps.observation.ObjectObservedSpeciesServiceRestApi.loadForm

  • services-local/src/main/java/fr/ird/observe/services/local/service/data/ps/observation/NonTargetSampleServiceLocal.java
    ... ... @@ -32,11 +32,9 @@ import fr.ird.observe.dto.result.SaveResultDto;
    32 32 
     import fr.ird.observe.entities.data.ps.observation.NonTargetCatch;
    33 33 
     import fr.ird.observe.entities.data.ps.observation.NonTargetSample;
    34 34 
     import fr.ird.observe.entities.data.ps.observation.Set;
    35 
    -import fr.ird.observe.entities.referential.ps.common.SpeciesFate;
    36 35 
     import fr.ird.observe.services.local.service.ObserveServiceLocal;
    37 36 
     import fr.ird.observe.services.service.data.ps.observation.NonTargetSampleService;
    38 37
    39 
    -import java.util.List;
    40 38 
     import java.util.stream.Collectors;
    41 39
    42 40 
     /**
    ... ... @@ -54,14 +52,7 @@ public class NonTargetSampleServiceLocal extends ObserveServiceLocal implements
    54 52 
         public Form<NonTargetSampleDto> loadForm(String setSeineId) {
    55 53 
             Set set = DATA_PS_OBSERVATION_SET_SPI.loadEntity(getTopiaPersistenceContext(), setSeineId);
    56 54 
             NonTargetSample nonTargetSample = getNonTargetSample(set);
    57 
    -        Form<NonTargetSampleDto> form = DATA_PS_OBSERVATION_NON_TARGET_SAMPLE_SPI.entityToForm(nonTargetSample, getReferentialLocale());
    58 
    -        List<SpeciesFate> entities = set.getNonTargetCatch().stream()
    59 
    -                .map(NonTargetCatch::getSpeciesFate)
    60 
    -                .distinct()
    61 
    -                .collect(Collectors.toList());
    62 
    -        ReferentialDtoReferenceSet<SpeciesFateReference> references = REFERENTIAL_PS_COMMON_SPECIES_FATE_SPI.toReferenceSet(entities, getReferentialLocale(), null);
    63 
    -        form.getObject().setSpeciesFate(references.toSet());
    64 
    -        return form;
    55 
    +        return DATA_PS_OBSERVATION_NON_TARGET_SAMPLE_SPI.entityToForm(nonTargetSample, getReferentialLocale());
    65 56 
         }
    66 57
    67 58 
         @Override
    ... ... @@ -74,6 +65,16 @@ public class NonTargetSampleServiceLocal extends ObserveServiceLocal implements
    74 65 
                                                                  getReferentialLocale(), null);
    75 66 
         }
    76 67
    68 
    +    @Override
    69 
    +    public ReferentialDtoReferenceSet<SpeciesFateReference> getSampleSpeciesFate(String setSeineId) {
    70 
    +        Set set = DATA_PS_OBSERVATION_SET_SPI.loadEntity(getTopiaPersistenceContext(), setSeineId);
    71 
    +        return REFERENTIAL_PS_COMMON_SPECIES_FATE_SPI.toReferenceSet(set.getNonTargetCatch().stream()
    72 
    +                                                                     .map(NonTargetCatch::getSpeciesFate)
    73 
    +                                                                     .distinct()
    74 
    +                                                                     .collect(Collectors.toList()),
    75 
    +                                                             getReferentialLocale(), null);
    76 
    +    }
    77 
    +
    77 78 
         @Override
    78 79 
         public SaveResultDto save(String setSeineId, NonTargetSampleDto dto) {
    79 80 
             Set set = DATA_PS_OBSERVATION_SET_SPI.loadEntity(getTopiaPersistenceContext(), setSeineId);

  • services/src/main/java/fr/ird/observe/services/service/data/ps/observation/NonTargetSampleService.java
    ... ... @@ -26,6 +26,7 @@ import fr.ird.observe.dto.data.ps.observation.NonTargetSampleDto;
    26 26 
     import fr.ird.observe.dto.form.Form;
    27 27 
     import fr.ird.observe.dto.reference.ReferentialDtoReferenceSet;
    28 28 
     import fr.ird.observe.dto.referential.common.SpeciesReference;
    29 
    +import fr.ird.observe.dto.referential.ps.common.SpeciesFateReference;
    29 30 
     import fr.ird.observe.dto.result.SaveResultDto;
    30 31 
     import fr.ird.observe.services.service.ObserveService;
    31 32 
     import fr.ird.observe.services.spi.ReadDataPermission;
    ... ... @@ -51,6 +52,10 @@ public interface NonTargetSampleService extends ObserveService {
    51 52 
         @ReadDataPermission
    52 53 
         ReferentialDtoReferenceSet<SpeciesReference> getSampleSpecies(String setSeineId);
    53 54
    55 
    +    @Get
    56 
    +    @ReadDataPermission
    57 
    +    ReferentialDtoReferenceSet<SpeciesFateReference> getSampleSpeciesFate(String setSeineId);
    58 
    +
    54 59 
         @Write
    55 60 
         @WriteDataPermission
    56 61 
         @Post

    • —
    View it on GitLab.
    You're receiving this email because of your account on gitlab.com. If you'd like to receive fewer emails, you can adjust your notification settings.