[Git][ultreiaio/ird-observe][develop] Suppression en cade des libérations de capture accessoire - See #1768 - Observe-commits

21 Jan 2021


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


Commits:
604da9db by Tony Chemit at 2021-01-21T17:28:11+01:00
Suppression en cade des libérations de capture accessoire - See #1768

Pour le moment, aucun message sur le sujet et aucun traitement.

- - - - -


3 changed files:

- client/datasource/editor/ps/src/main/java/fr/ird/observe/client/datasource/editor/ps/data/observation/SetNonTargetCatchReleaseUIModelStates.java
- client/datasource/editor/ps/src/main/java/fr/ird/observe/client/datasource/editor/ps/data/observation/SetNonTargetCatchReleaseUITableModel.java
- models/persistence/src/main/java/fr/ird/observe/entities/data/ps/observation/SetImpl.java


Changes:

=====================================
client/datasource/editor/ps/src/main/java/fr/ird/observe/client/datasource/editor/ps/data/observation/SetNonTargetCatchReleaseUIModelStates.java
=====================================
@@ -26,7 +26,6 @@ import fr.ird.observe.client.configuration.ClientConfig;
 import fr.ird.observe.client.constants.AcquisitionMode;
 import fr.ird.observe.client.datasource.api.cache.ReferencesCache;
 import fr.ird.observe.client.datasource.api.cache.ReferencesFilterHelper;
-import fr.ird.observe.client.datasource.editor.api.content.data.table.AskToDelete;
 import fr.ird.observe.dto.data.ps.observation.NonTargetCatchReleaseDto;
 import fr.ird.observe.dto.data.ps.observation.SetNonTargetCatchReleaseDto;
 import fr.ird.observe.dto.referential.common.SpeciesGroupDto;
@@ -34,9 +33,7 @@ import fr.ird.observe.dto.referential.common.SpeciesReference;
 import fr.ird.observe.navigation.select.ProjectSelectModel;
 import fr.ird.observe.services.ObserveServicesProvider;
 import io.ultreia.java4all.bean.spi.GenerateJavaBeanDefinition;
-import io.ultreia.java4all.i18n.I18n;
 
-import java.util.List;
 import java.util.Map;
 import java.util.TreeMap;
 
@@ -64,11 +61,12 @@ public class SetNonTargetCatchReleaseUIModelStates extends GeneratedSetNonTarget
         newTableBean.setAcquisitionMode(AcquisitionMode.individual.ordinal());
     }
 
-    @Override
-    public boolean canSave(SetNonTargetCatchReleaseDto originalBean, SetNonTargetCatchReleaseDto bean, List<NonTargetCatchReleaseDto> data) {
-        AskToDelete<SetNonTargetCatchReleaseDto> ask = new AskToDelete<>(
-                SetNonTargetCatchReleaseDto::getRemovedUnsafeSpecies,
-                I18n.n("observe.data.ps.observation.NonTargetCatchRelease.message.will.delete.sub.data"));
-        return ask.needDelete(this.getClientUIContext().getDecoratorService(), originalBean, bean);
-    }
+    //FIXME: #1768
+//    @Override
+//    public boolean canSave(SetNonTargetCatchReleaseDto originalBean, SetNonTargetCatchReleaseDto bean, List<NonTargetCatchReleaseDto> data) {
+//        AskToDelete<SetNonTargetCatchReleaseDto> ask = new AskToDelete<>(
+//                SetNonTargetCatchReleaseDto::getRemovedUnsafeSpecies,
+//                I18n.n("observe.data.ps.observation.NonTargetCatchRelease.message.will.delete.sub.data"));
+//        return ask.needDelete(this.getClientUIContext().getDecoratorService(), originalBean, bean);
+//    }
 }


=====================================
client/datasource/editor/ps/src/main/java/fr/ird/observe/client/datasource/editor/ps/data/observation/SetNonTargetCatchReleaseUITableModel.java
=====================================
@@ -31,8 +31,6 @@ import fr.ird.observe.dto.referential.ps.observation.NonTargetCatchReleaseStatus
 import javax.swing.JTable;
 import java.util.List;
 
-import static io.ultreia.java4all.i18n.I18n.t;
-
 /**
  * Created on 12/4/14.
  *
@@ -81,16 +79,17 @@ public class SetNonTargetCatchReleaseUITableModel extends GeneratedSetNonTargetC
         super.onSelectedRowChanged(ui, editingRow, tableEditBean, previousRowBean, notPersisted, newRow);
     }
 
-    @Override
-    protected String getDeleteExtraMessage(NonTargetCatchReleaseDto bean) {
-        if (bean.isHasSample()) {
-            int count = getBean().getUnsafeSpeciesUsageCount(bean.getSpecies());
-            if (count == 1) {
-                // while deleting this one, this species won't be available on sample
-                return t("observe.data.ps.observation.NonTargetCatchRelease.message.will.delete.sub.data.for.species", bean.getSpecies());
-            }
-        }
-        // No specific message
-        return null;
-    }
+    //FIXME: #1768
+//    @Override
+//    protected String getDeleteExtraMessage(NonTargetCatchReleaseDto bean) {
+//        if (bean.isHasSample()) {
+//            int count = getBean().getUnsafeSpeciesUsageCount(bean.getSpecies());
+//            if (count == 1) {
+//                // while deleting this one, this species won't be available on sample
+//                return t("observe.data.ps.observation.NonTargetCatchRelease.message.will.delete.sub.data.for.species", bean.getSpecies());
+//            }
+//        }
+//        // No specific message
+//        return null;
+//    }
 }


=====================================
models/persistence/src/main/java/fr/ird/observe/entities/data/ps/observation/SetImpl.java
=====================================
@@ -316,7 +316,7 @@ public class SetImpl extends SetAbstract {
         // do normal copy
         super.fromDto(referentialLocale, dto);
         // delete any discarded sample which not using the given species ids
-        //FIXME should we also check in non target catches ???
+        //FIXME: #1768
 //        TargetSample targetSample = getTargetSample(true);
 //        if (targetSample != null) {
 //            List<NonTargetCatchReleaseDto> targetCatch = dto.getNonTargetCatchRelease();



View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/commit/604da9dbffd440196544a25b02...

-- 
View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/commit/604da9dbffd440196544a25b02...
You're receiving this email because of your account on gitlab.com.

    

[Git][ultreiaio/ird-observe][develop] Suppression en cade des libérations de capture accessoire - See #1768

Tony CHEMIT

tags

participants (1)