Tony CHEMIT pushed to branch develop-7.x at ultreiaio / ird-observe
Commits:
13 changed files:
- client-core/src/main/i18n/getters/java.getter
- client-core/src/main/java/fr/ird/observe/client/ui/admin/consolidate/ConsolidateUIHandler.java
- client-core/src/main/java/fr/ird/observe/client/ui/content/data/seine/AbstractSampleUIHandler.java
- client-core/src/main/java/fr/ird/observe/client/ui/content/data/seine/NonTargetSampleUI.jaxx
- client-core/src/main/java/fr/ird/observe/client/ui/content/data/seine/NonTargetSampleUI.jcss
- client-core/src/main/java/fr/ird/observe/client/ui/content/data/seine/TargetSampleUI.jaxx
- client-core/src/main/java/fr/ird/observe/client/ui/storage/tabs/StorageTabUI.jaxx
- client-core/src/main/java/fr/ird/observe/client/ui/storage/tabs/StorageTabUIHandler.java
- observe-i18n/src/main/i18n/translations/observe_en_GB.properties
- observe-i18n/src/main/i18n/translations/observe_es_ES.properties
- observe-i18n/src/main/i18n/translations/observe_fr_FR.properties
- services-local/src/main/java/fr/ird/observe/services/local/service/actions/consolidate/ConsolidateDataServiceLocal.java
- services-local/src/main/java/fr/ird/observe/services/local/service/actions/consolidate/ConsolidationActivitySeineDataContext.java
Changes:
| ... | ... | @@ -502,6 +502,10 @@ observe.common.RouteDto.message.no.active.found |
| 502 | 502 |
observe.common.RouteDto.message.no.active.found.for.other.trip
|
| 503 | 503 |
observe.common.RouteDto.message.not.open
|
| 504 | 504 |
observe.common.RouteDto.message.updating
|
| 505 |
+observe.common.Sample.length.computed.tip
|
|
| 506 |
+observe.common.Sample.length.observed.tip
|
|
| 507 |
+observe.common.Sample.weight.computed.tip
|
|
| 508 |
+observe.common.Sample.weight.observed.tip
|
|
| 505 | 509 |
observe.common.SchoolEstimateDto.table.meanWeight
|
| 506 | 510 |
observe.common.SchoolEstimateDto.table.meanWeight.tip
|
| 507 | 511 |
observe.common.SchoolEstimateDto.table.speciesThon
|
| ... | ... | @@ -33,8 +33,8 @@ import fr.ird.observe.services.service.actions.consolidate.ConsolidateDataServic |
| 33 | 33 |
import fr.ird.observe.services.service.actions.consolidate.ConsolidateTripSeineDataRequest;
|
| 34 | 34 |
import fr.ird.observe.services.service.actions.consolidate.ConsolidateTripSeineDataResult;
|
| 35 | 35 |
import fr.ird.observe.services.service.actions.consolidate.set.ConsolidateActivitySeineDataResult;
|
| 36 |
-import org.apache.logging.log4j.Logger;
|
|
| 37 | 36 |
import org.apache.logging.log4j.LogManager;
|
| 37 |
+import org.apache.logging.log4j.Logger;
|
|
| 38 | 38 |
import org.nuiton.jaxx.runtime.spi.UIHandler;
|
| 39 | 39 |
import org.nuiton.jaxx.runtime.swing.wizard.ext.WizardState;
|
| 40 | 40 |
|
| ... | ... | @@ -109,11 +109,11 @@ public class ConsolidateUIHandler extends AdminTabUIHandler<ConsolidateUI> imple |
| 109 | 109 |
|
| 110 | 110 |
String tripSeineLabel = result.getTripSeineLabel();
|
| 111 | 111 |
|
| 112 |
- sendMessage(t("observe.actions.consolidate.message.trip", tripSeineLabel));
|
|
| 112 |
+ sendMessage(t("observe.actions.consolidate.message.trip", result.getTripSeineId(), tripSeineLabel));
|
|
| 113 | 113 |
|
| 114 | 114 |
for (ConsolidateActivitySeineDataResult activitySeineDataResult : result.getConsolidateActivitySeineDataResults()) {
|
| 115 | 115 |
|
| 116 |
- sendMessage(t("observe.actions.consolidate.message.activity", activitySeineDataResult.getActivitySeineLabel()));
|
|
| 116 |
+ sendMessage(t("observe.actions.consolidate.message.activity", activitySeineDataResult.getActivitySeineId(), activitySeineDataResult.getActivitySeineLabel()));
|
|
| 117 | 117 |
|
| 118 | 118 |
}
|
| 119 | 119 |
resultsBuilder.add(result);
|
| ... | ... | @@ -32,13 +32,15 @@ import fr.ird.observe.dto.data.seine.NonTargetLengthDto; |
| 32 | 32 |
import fr.ird.observe.dto.data.seine.TargetLengthDto;
|
| 33 | 33 |
import fr.ird.observe.dto.referential.SizeMeasureTypeReference;
|
| 34 | 34 |
import fr.ird.observe.dto.referential.SpeciesReference;
|
| 35 |
-import org.apache.logging.log4j.Logger;
|
|
| 36 | 35 |
import org.apache.logging.log4j.LogManager;
|
| 36 |
+import org.apache.logging.log4j.Logger;
|
|
| 37 | 37 |
|
| 38 | 38 |
import java.beans.PropertyChangeListener;
|
| 39 | 39 |
import java.util.List;
|
| 40 | 40 |
import java.util.Optional;
|
| 41 | 41 |
|
| 42 |
+import static io.ultreia.java4all.i18n.I18n.n;
|
|
| 43 |
+ |
|
| 42 | 44 |
/**
|
| 43 | 45 |
* Created on 31/10/16.
|
| 44 | 46 |
*
|
| ... | ... | @@ -47,6 +49,11 @@ import java.util.Optional; |
| 47 | 49 |
*/
|
| 48 | 50 |
public abstract class AbstractSampleUIHandler<E extends IdDto, D extends IdDto, U extends ContentTableUI<E, D, U>> extends ContentTableUIHandler<E, D, U> {
|
| 49 | 51 |
|
| 52 |
+ public static final String POIDS_COMPUTED_TIP = n("observe.common.Sample.weight.computed.tip");
|
|
| 53 |
+ public static final String POIDS_OBSERVED_TIP = n("observe.common.Sample.weight.observed.tip");
|
|
| 54 |
+ public static final String LONGUEUR_COMPUTED_TIP = n("observe.common.Sample.length.computed.tip");
|
|
| 55 |
+ public static final String LONGUEUR_OBSERVED_TIP = n("observe.common.Sample.length.observed.tip");
|
|
| 56 |
+ |
|
| 50 | 57 |
protected final Logger log = LogManager.getLogger(getClass());
|
| 51 | 58 |
/**
|
| 52 | 59 |
* Ecoute les modifications de la propriété {@link TargetLengthDto#getWeight()},
|
| ... | ... | @@ -83,22 +83,14 @@ |
| 83 | 83 |
|
| 84 | 84 |
<script><![CDATA[
|
| 85 | 85 |
|
| 86 |
-public static final String POIDS_COMPUTED_TIP = n("observe.common.Sample.weight.computed.tip");
|
|
| 87 |
-public static final String POIDS_OBSERVED_TIP = n("observe.common.Sample.weight.observed.tip");
|
|
| 88 |
-public static final String LONGUEUR_COMPUTED_TIP = n("observe.common.Sample.length.computed.tip");
|
|
| 89 |
-public static final String LONGUEUR_OBSERVED_TIP = n("observe.common.Sample.length.observed.tip");
|
|
| 90 |
- |
|
| 91 | 86 |
public String getWeightDataTip(boolean computed) {
|
| 92 |
- return computed ? t(POIDS_COMPUTED_TIP) : t(POIDS_OBSERVED_TIP);
|
|
| 87 |
+ return computed ? t(NonTargetSampleUIHandler.POIDS_COMPUTED_TIP) : t(NonTargetSampleUIHandler.POIDS_OBSERVED_TIP);
|
|
| 93 | 88 |
}
|
| 94 | 89 |
|
| 95 | 90 |
public String getLengthDataTip(boolean computed) {
|
| 96 |
- return computed ? t(LONGUEUR_COMPUTED_TIP) : t(LONGUEUR_OBSERVED_TIP);
|
|
| 91 |
+ return computed ? t(NonTargetSampleUIHandler.LONGUEUR_COMPUTED_TIP) : t(NonTargetSampleUIHandler.LONGUEUR_OBSERVED_TIP);
|
|
| 97 | 92 |
}
|
| 98 | 93 |
|
| 99 |
-public String getSpeciesFauneTypeTaille(SpeciesReference species) {
|
|
| 100 |
- return species == null ? t("observe.message.no.species.selected") : species.getSizeMeasureTypeId();
|
|
| 101 |
-}
|
|
| 102 | 94 |
]]>
|
| 103 | 95 |
</script>
|
| 104 | 96 |
|
| ... | ... | @@ -40,16 +40,6 @@ |
| 40 | 40 |
_resetTablePropertyName:{NonTargetLengthDto.PROPERTY_PICTURES_REFERENCES};
|
| 41 | 41 |
}
|
| 42 | 42 |
|
| 43 |
-#speciesTypeTailleLabel {
|
|
| 44 |
- actionIcon:"information";
|
|
| 45 |
- text:"observe.common.lengthMeasureType";
|
|
| 46 |
-}
|
|
| 47 |
- |
|
| 48 |
-#speciesTypeTaille {
|
|
| 49 |
- font-weight:"bold";
|
|
| 50 |
- text:{getSpeciesFauneTypeTaille(tableEditBean.getSpecies())};
|
|
| 51 |
-}
|
|
| 52 |
- |
|
| 53 | 43 |
#comment {
|
| 54 | 44 |
model:{getBean()};
|
| 55 | 45 |
}
|
| ... | ... | @@ -79,20 +79,15 @@ |
| 79 | 79 |
|
| 80 | 80 |
<script><![CDATA[
|
| 81 | 81 |
|
| 82 |
-public static final String POIDS_COMPUTED_TIP = n("observe.common.Sample.weight.computed.tip");
|
|
| 83 |
-public static final String POIDS_OBSERVED_TIP = n("observe.common.Sample.weight.observed.tip");
|
|
| 84 |
-public static final String LONGUEUR_COMPUTED_TIP = n("observe.common.Sample.length.computed.tip");
|
|
| 85 |
-public static final String LONGUEUR_OBSERVED_TIP = n("observe.common.Sample.length.observed.tip");
|
|
| 86 |
- |
|
| 87 | 82 |
@Override
|
| 88 | 83 |
public abstract TargetSampleUIHandler getHandler();
|
| 89 | 84 |
|
| 90 | 85 |
public String getWeightDataTip(boolean computed) {
|
| 91 |
- return computed ? t(POIDS_COMPUTED_TIP) : t(POIDS_OBSERVED_TIP);
|
|
| 86 |
+ return computed ? t(TargetSampleUIHandler.POIDS_COMPUTED_TIP) : t(TargetSampleUIHandler.POIDS_OBSERVED_TIP);
|
|
| 92 | 87 |
}
|
| 93 | 88 |
|
| 94 | 89 |
public String getLengthDataTip(boolean computed) {
|
| 95 |
- return computed ? t(LONGUEUR_COMPUTED_TIP) : t(LONGUEUR_OBSERVED_TIP);
|
|
| 90 |
+ return computed ? t(TargetSampleUIHandler.LONGUEUR_COMPUTED_TIP) : t(TargetSampleUIHandler.LONGUEUR_OBSERVED_TIP);
|
|
| 96 | 91 |
}
|
| 97 | 92 |
]]>
|
| 98 | 93 |
</script>
|
| ... | ... | @@ -64,13 +64,7 @@ protected void setDescriptionText(String text) { |
| 64 | 64 |
}
|
| 65 | 65 |
|
| 66 | 66 |
protected String getProgressString(int currentStep, int nbStep) {
|
| 67 |
- StorageStep step = getStep();
|
|
| 68 |
- String txt = "";
|
|
| 69 |
- if (step != null) {
|
|
| 70 |
- txt = n("observe.storage.step.label");
|
|
| 71 |
- txt = t(txt, currentStep + 1, nbStep, I18nEnumHelper.getLabel(step));
|
|
| 72 |
- }
|
|
| 73 |
- return txt;
|
|
| 67 |
+ return getProgressString(currentStep, nbStep, getStep());
|
|
| 74 | 68 |
}
|
| 75 | 69 |
]]>
|
| 76 | 70 |
</script>
|
| ... | ... | @@ -23,12 +23,15 @@ package fr.ird.observe.client.ui.storage.tabs; |
| 23 | 23 |
|
| 24 | 24 |
import fr.ird.observe.client.ObserveSwingApplicationContext;
|
| 25 | 25 |
import fr.ird.observe.client.ObserveTextGenerator;
|
| 26 |
+import fr.ird.observe.client.ui.storage.StorageStep;
|
|
| 26 | 27 |
import fr.ird.observe.client.ui.storage.StorageUIModel;
|
| 28 |
+import fr.ird.observe.dto.I18nEnumHelper;
|
|
| 27 | 29 |
import fr.ird.observe.services.configuration.ObserveDataSourceInformation;
|
| 28 | 30 |
import org.nuiton.jaxx.runtime.JAXXObject;
|
| 29 | 31 |
|
| 30 | 32 |
import javax.swing.JLabel;
|
| 31 | 33 |
|
| 34 |
+import static io.ultreia.java4all.i18n.I18n.n;
|
|
| 32 | 35 |
import static io.ultreia.java4all.i18n.I18n.t;
|
| 33 | 36 |
|
| 34 | 37 |
/**
|
| ... | ... | @@ -80,4 +83,12 @@ public class StorageTabUIHandler<U extends JAXXObject> { |
| 80 | 83 |
this.ui = ui;
|
| 81 | 84 |
}
|
| 82 | 85 |
|
| 86 |
+ protected String getProgressString(int currentStep, int nbStep,StorageStep step) {
|
|
| 87 |
+ String txt = "";
|
|
| 88 |
+ if (step != null) {
|
|
| 89 |
+ txt = n("observe.storage.step.label");
|
|
| 90 |
+ txt = t(txt, currentStep + 1, nbStep, I18nEnumHelper.getLabel(step));
|
|
| 91 |
+ }
|
|
| 92 |
+ return txt;
|
|
| 93 |
+ }
|
|
| 83 | 94 |
}
|
| ... | ... | @@ -149,11 +149,11 @@ observe.action.translate.tip=Translate application |
| 149 | 149 |
observe.action.validate.config.generateReport=Generate validation report
|
| 150 | 150 |
observe.actions.consolidate=Consolidate data
|
| 151 | 151 |
observe.actions.consolidate.description=Consolidate observed data
|
| 152 |
-observe.actions.consolidate.message.activity=Computed data for activity %1$s
|
|
| 152 |
+observe.actions.consolidate.message.activity=Computed data for activity [%s] %s
|
|
| 153 | 153 |
observe.actions.consolidate.message.noChanges=No data modified.
|
| 154 | 154 |
observe.actions.consolidate.message.operation.done=Consolidate operation done in %1$s.
|
| 155 | 155 |
observe.actions.consolidate.message.save.changes=Save modified %1$s trip(s).
|
| 156 |
-observe.actions.consolidate.message.trip=Data consolidate for trip %1$s
|
|
| 156 |
+observe.actions.consolidate.message.trip=Data consolidate for trip [%s] %s
|
|
| 157 | 157 |
observe.actions.consolidate.start.trip=Start consolidate data on trip %s / %s (%s)
|
| 158 | 158 |
observe.actions.consolidate.title=Consolidate data
|
| 159 | 159 |
observe.actions.consolidate.title.tip=Consolidate observed data
|
| ... | ... | @@ -1072,7 +1072,11 @@ observe.common.RouteDto.titles=Routes |
| 1072 | 1072 |
observe.common.RouteDto.type=Route
|
| 1073 | 1073 |
observe.common.RouteDto.types=Routes
|
| 1074 | 1074 |
observe.common.Sample.action.resetDefaultSizeMeasureType.tip=Use default size measure type
|
| 1075 |
+observe.common.Sample.length.computed.tip=Length was computed
|
|
| 1076 |
+observe.common.Sample.length.observed.tip=Length was observed
|
|
| 1075 | 1077 |
observe.common.Sample.weight=Individual weight (kg)
|
| 1078 |
+observe.common.Sample.weight.computed.tip=Weight was computed (%s)
|
|
| 1079 |
+observe.common.Sample.weight.observed.tip=Weight was observed
|
|
| 1076 | 1080 |
observe.common.SchoolEstimateDto.action.create=Insert this estimate
|
| 1077 | 1081 |
observe.common.SchoolEstimateDto.action.create.tip=Insert this estimate
|
| 1078 | 1082 |
observe.common.SchoolEstimateDto.meanWeight=Mean weight
|
| ... | ... | @@ -149,11 +149,11 @@ observe.action.translate.tip=Traducir la aplicación |
| 149 | 149 |
observe.action.validate.config.generateReport=Generar un informe de verificación
|
| 150 | 150 |
observe.actions.consolidate=Calcular los datos
|
| 151 | 151 |
observe.actions.consolidate.description=Calcular los datos que no fueron observados
|
| 152 |
-observe.actions.consolidate.message.activity=Datos calculados para la actividad %1$s
|
|
| 152 |
+observe.actions.consolidate.message.activity=Datos calculados para la actividad [%s] %s
|
|
| 153 | 153 |
observe.actions.consolidate.message.noChanges=No se han modificado los datos
|
| 154 | 154 |
observe.actions.consolidate.message.operation.done=Operación de cálculo de datos terminada en %1$s
|
| 155 | 155 |
observe.actions.consolidate.message.save.changes=Guardar las modificaciones de la(s) %1$s marea(s) modificada(s)
|
| 156 |
-observe.actions.consolidate.message.trip=Datos calculados para la marea %1$s
|
|
| 156 |
+observe.actions.consolidate.message.trip=Datos calculados para la marea [%s] %s
|
|
| 157 | 157 |
observe.actions.consolidate.start.trip=Iniciar la consolidación de datos de la marea %s / %s (%s)
|
| 158 | 158 |
observe.actions.consolidate.title=Consolidar los datos observados
|
| 159 | 159 |
observe.actions.consolidate.title.tip=Consolidar los datos observados
|
| ... | ... | @@ -1072,7 +1072,11 @@ observe.common.RouteDto.titles=Rutas |
| 1072 | 1072 |
observe.common.RouteDto.type=Ruta
|
| 1073 | 1073 |
observe.common.RouteDto.types=Rutas
|
| 1074 | 1074 |
observe.common.Sample.action.resetDefaultSizeMeasureType.tip=Utilizar el tipo de medida por defecto
|
| 1075 |
+observe.common.Sample.length.computed.tip=Longitud calculada
|
|
| 1076 |
+observe.common.Sample.length.observed.tip=Longitud observada
|
|
| 1075 | 1077 |
observe.common.Sample.weight=Peso del ejemplar (en Kg)
|
| 1078 |
+observe.common.Sample.weight.computed.tip=Peso calculado
|
|
| 1079 |
+observe.common.Sample.weight.observed.tip=Peso observado
|
|
| 1076 | 1080 |
observe.common.SchoolEstimateDto.action.create=Insertar la estimación
|
| 1077 | 1081 |
observe.common.SchoolEstimateDto.action.create.tip=Insertar la nueva estimación en la tabla
|
| 1078 | 1082 |
observe.common.SchoolEstimateDto.meanWeight=Peso medio (en Kg)
|
| ... | ... | @@ -149,11 +149,11 @@ observe.action.translate.tip=Traduire l'application |
| 149 | 149 |
observe.action.validate.config.generateReport=Générer un rapport de validation
|
| 150 | 150 |
observe.actions.consolidate=Calculer les données
|
| 151 | 151 |
observe.actions.consolidate.description=Calculer les données non observées
|
| 152 |
-observe.actions.consolidate.message.activity=Données calculées pour l'activité %1$s
|
|
| 152 |
+observe.actions.consolidate.message.activity=Données calculées pour l'activité [%s] %s
|
|
| 153 | 153 |
observe.actions.consolidate.message.noChanges=Aucune donnée modifiée.
|
| 154 | 154 |
observe.actions.consolidate.message.operation.done=Opération de calcul des données terminée à %1$s.
|
| 155 | 155 |
observe.actions.consolidate.message.save.changes=Sauvegarde des modifications sur la(es) %1$s marée(s) modifiée(s).
|
| 156 |
-observe.actions.consolidate.message.trip=Données calculées pour la marée %1$s
|
|
| 156 |
+observe.actions.consolidate.message.trip=Données calculées pour la marée [%s] %s.
|
|
| 157 | 157 |
observe.actions.consolidate.start.trip=Démarrage de la consolidation pour la marée %s / %s (%s)
|
| 158 | 158 |
observe.actions.consolidate.title=Consolider les données observateur
|
| 159 | 159 |
observe.actions.consolidate.title.tip=Consolider les données observateur
|
| ... | ... | @@ -1072,7 +1072,11 @@ observe.common.RouteDto.titles=Routes |
| 1072 | 1072 |
observe.common.RouteDto.type=Route
|
| 1073 | 1073 |
observe.common.RouteDto.types=Routes
|
| 1074 | 1074 |
observe.common.Sample.action.resetDefaultSizeMeasureType.tip=Utiliser le type de mensuration par défaut
|
| 1075 |
+observe.common.Sample.length.computed.tip=La longueur a été calculée
|
|
| 1076 |
+observe.common.Sample.length.observed.tip=La longueur a été observée
|
|
| 1075 | 1077 |
observe.common.Sample.weight=Poids ind. (en Kg)
|
| 1078 |
+observe.common.Sample.weight.computed.tip=Le poids a été calculé
|
|
| 1079 |
+observe.common.Sample.weight.observed.tip=Le poids a été observé
|
|
| 1076 | 1080 |
observe.common.SchoolEstimateDto.action.create=Insérer cette estimation
|
| 1077 | 1081 |
observe.common.SchoolEstimateDto.action.create.tip=Insérer la nouvelle estimation dans la table
|
| 1078 | 1082 |
observe.common.SchoolEstimateDto.meanWeight=Poids moyen (en Kg)
|
| ... | ... | @@ -65,8 +65,8 @@ import fr.ird.observe.services.service.actions.consolidate.dcp.SimplifiedObjectT |
| 65 | 65 |
import fr.ird.observe.services.service.actions.consolidate.set.ConsolidateActivitySeineDataResult;
|
| 66 | 66 |
import fr.ird.observe.spi.DbModelHelper;
|
| 67 | 67 |
import org.apache.commons.collections4.CollectionUtils;
|
| 68 |
-import org.apache.logging.log4j.Logger;
|
|
| 69 | 68 |
import org.apache.logging.log4j.LogManager;
|
| 69 |
+import org.apache.logging.log4j.Logger;
|
|
| 70 | 70 |
import org.nuiton.util.beans.BeanMonitor;
|
| 71 | 71 |
|
| 72 | 72 |
import java.util.Collection;
|
| ... | ... | @@ -148,10 +148,10 @@ public class ConsolidateDataServiceLocal extends ObserveServiceLocal implements |
| 148 | 148 |
@Override
|
| 149 | 149 |
public ConsolidateTripSeineDataResult consolidateTripSeine(ConsolidateTripSeineDataRequest request) {
|
| 150 | 150 |
ReferentialLocale referenceLocale = serviceContext.getReferentialLocale();
|
| 151 |
- boolean failIfLenghtWeightParameterNotFound = request.isFailIfLengthWeightParameterNotFound();
|
|
| 151 |
+ boolean failIfLengthWeightParameterNotFound = request.isFailIfLengthWeightParameterNotFound();
|
|
| 152 | 152 |
boolean failIfLengthLengthParameterNotFound = request.isFailIfLengthLengthParameterNotFound();
|
| 153 | 153 |
|
| 154 |
- Optional<ConsolidateTripSeineDataResult> consolidateTripSeineDataResult = consolidateTripSeine(referenceLocale, request.getTripSeineId(), failIfLenghtWeightParameterNotFound,failIfLengthLengthParameterNotFound );
|
|
| 154 |
+ Optional<ConsolidateTripSeineDataResult> consolidateTripSeineDataResult = consolidateTripSeine(referenceLocale, request.getTripSeineId(), failIfLengthWeightParameterNotFound,failIfLengthLengthParameterNotFound );
|
|
| 155 | 155 |
return consolidateTripSeineDataResult.orElse(null);
|
| 156 | 156 |
}
|
| 157 | 157 |
|
| ... | ... | @@ -174,6 +174,8 @@ public class ConsolidateDataServiceLocal extends ObserveServiceLocal implements |
| 174 | 174 |
|
| 175 | 175 |
private Optional<ConsolidateTripSeineDataResult> consolidateTripSeine(ReferentialLocale referenceLocale, String tripSeineId, boolean failIfLengthWeightParameterNotFound, boolean failIfLengthLengthParameterNotFound) {
|
| 176 | 176 |
|
| 177 |
+ log.info(String.format("Start consolidate trip: %s", tripSeineId));
|
|
| 178 |
+ |
|
| 177 | 179 |
TripSeine tripSeine = TRIP_SEINE_SPI.loadEntity(getTopiaPersistenceContext(), tripSeineId);
|
| 178 | 180 |
|
| 179 | 181 |
BeanMonitor targetLengthMonitor = new BeanMonitor(
|
| ... | ... | @@ -211,19 +213,23 @@ public class ConsolidateDataServiceLocal extends ObserveServiceLocal implements |
| 211 | 213 |
|
| 212 | 214 |
DataEntityDtoBinderSupport<FloatingObjectDto, FloatingObject> floatingObjectBinder = DbModelHelper.fromDataDto(FloatingObjectDto.class).toEntityBinder();
|
| 213 | 215 |
DataEntityDtoBinderSupport<FloatingObjectPartDto, FloatingObjectPart> floatingObjectPartBinder = DbModelHelper.fromDataDto(FloatingObjectPartDto.class).toEntityBinder();
|
| 214 |
- |
|
| 216 |
+ int routeIndex = 0;
|
|
| 217 |
+ int routeMax = tripSeine.sizeRoute();
|
|
| 215 | 218 |
for (Route route : tripSeine.getRoute()) {
|
| 216 | 219 |
|
| 220 |
+ String routePrefix =String.format("Route [%s/%s] ", ++routeIndex, routeMax);
|
|
| 221 |
+ log.info(String.format("%s Start consolidate route: %s", routePrefix, route.getTopiaId()));
|
|
| 222 |
+ int activityIndex = 0;
|
|
| 223 |
+ int activityMax = route.sizeActivitySeine();
|
|
| 217 | 224 |
for (ActivitySeine activitySeine : route.getActivitySeine()) {
|
| 218 | 225 |
|
| 226 |
+ String activityPrefix =String.format("%s - Activity [%s/%s] ", routePrefix, ++activityIndex, activityMax);
|
|
| 227 |
+ |
|
| 219 | 228 |
if (!activitySeine.isSetOperation() && !activitySeine.isDCPOperation()) {
|
| 220 |
- if (log.isDebugEnabled()) {
|
|
| 221 |
- log.debug("No set nor dcp on activity " + activitySeine);
|
|
| 222 |
- }
|
|
| 229 |
+ log.info(String.format("%s Skip activity (No set nor dcp): %s", activityPrefix, activitySeine.getTopiaId()));
|
|
| 223 | 230 |
continue;
|
| 224 | 231 |
}
|
| 225 | 232 |
|
| 226 |
- |
|
| 227 | 233 |
ConsolidateActivitySeineDataResultBuilder resultBuilder = new ConsolidateActivitySeineDataResultBuilder(applicationLocale, referenceLocale, activitySeine.getTopiaId(), ActivitySeines.decorate(referenceLocale.ordinal(), activitySeine));
|
| 228 | 234 |
|
| 229 | 235 |
ConsolidationActivitySeineDataContext activityContext = new ConsolidationActivitySeineDataContext();
|
| ... | ... | @@ -241,17 +247,21 @@ public class ConsolidateDataServiceLocal extends ObserveServiceLocal implements |
| 241 | 247 |
activityContext.floatingObjectConsolidateEngine = floatingObjectConsolidateEngine;
|
| 242 | 248 |
activityContext.floatingObjectBinder = floatingObjectBinder;
|
| 243 | 249 |
activityContext.floatingObjectPartBinder = floatingObjectPartBinder;
|
| 250 |
+ activityContext.activityPrefix = activityPrefix;
|
|
| 244 | 251 |
|
| 245 |
- consolidateActivitySeine(activityContext);
|
|
| 252 |
+ try {
|
|
| 253 |
+ consolidateActivitySeine(activityContext);
|
|
| 254 |
+ } catch (Exception e) {
|
|
| 255 |
+ log.error(String.format("%s Could not consolidate trip: %s, route: %s - activity: %s", activityPrefix, tripSeineId, route.getTopiaId(), activitySeine.getTopiaId()), e);
|
|
| 256 |
+ throw e;
|
|
| 257 |
+ }
|
|
| 246 | 258 |
|
| 247 | 259 |
Optional<ConsolidateActivitySeineDataResult> optionalConsolidateActivitySeineDataResult = resultBuilder.build();
|
| 248 | 260 |
if (optionalConsolidateActivitySeineDataResult.isPresent()) {
|
| 249 | 261 |
|
| 250 | 262 |
// Des modifications ont été enregistrées sur l'activité
|
| 251 | 263 |
ConsolidateActivitySeineDataResult consolidateActivitySeineDataResult = optionalConsolidateActivitySeineDataResult.get();
|
| 252 |
- if (log.isInfoEnabled()) {
|
|
| 253 |
- log.info("Found some modifications on activity: " + consolidateActivitySeineDataResult.getActivitySeineLabel());
|
|
| 254 |
- }
|
|
| 264 |
+ log.info(String.format("%s Found some modifications on activity: %s - %s", activityPrefix, activitySeine.getTopiaId(), consolidateActivitySeineDataResult.getActivitySeineLabel()));
|
|
| 255 | 265 |
activitiesResultBuilder.add(consolidateActivitySeineDataResult);
|
| 256 | 266 |
|
| 257 | 267 |
}
|
| ... | ... | @@ -270,9 +280,7 @@ public class ConsolidateDataServiceLocal extends ObserveServiceLocal implements |
| 270 | 280 |
|
| 271 | 281 |
consolidateTripSeineDataResult = new ConsolidateTripSeineDataResult(tripSeineId, TripSeines.decorate(referenceLocale.ordinal(), tripSeine), consolidateActivitySeineDataResults);
|
| 272 | 282 |
|
| 273 |
- if (log.isInfoEnabled()) {
|
|
| 274 |
- log.info("Found some modifications on trip: " + consolidateTripSeineDataResult.getTripSeineLabel());
|
|
| 275 |
- }
|
|
| 283 |
+ log.info(String.format("Found some modifications on trip: %s - %s", tripSeineId, consolidateTripSeineDataResult.getTripSeineLabel()));
|
|
| 276 | 284 |
}
|
| 277 | 285 |
return Optional.ofNullable(consolidateTripSeineDataResult);
|
| 278 | 286 |
|
| ... | ... | @@ -282,9 +290,7 @@ public class ConsolidateDataServiceLocal extends ObserveServiceLocal implements |
| 282 | 290 |
|
| 283 | 291 |
ActivitySeine activity = activityContext.activity;
|
| 284 | 292 |
|
| 285 |
- if (log.isDebugEnabled()) {
|
|
| 286 |
- log.debug("Start consolidate activity: " + activity.getTopiaId());
|
|
| 287 |
- }
|
|
| 293 |
+ log.info(String.format("%s Start consolidate activity: %s", activityContext.activityPrefix, activity.getTopiaId()));
|
|
| 288 | 294 |
|
| 289 | 295 |
if (activity.isFloatingObjectNotEmpty()) {
|
| 290 | 296 |
|
| ... | ... | @@ -295,9 +301,7 @@ public class ConsolidateDataServiceLocal extends ObserveServiceLocal implements |
| 295 | 301 |
SetSeine setSeine = activity.getSetSeine();
|
| 296 | 302 |
|
| 297 | 303 |
if (setSeine == null) {
|
| 298 |
- if (log.isInfoEnabled()) {
|
|
| 299 |
- log.info("No set found for activity: " + activity.getTopiaId());
|
|
| 300 |
- }
|
|
| 304 |
+ log.debug(String.format("%s No set found for activity: %s", activityContext.activityPrefix, activity.getTopiaId()));
|
|
| 301 | 305 |
return;
|
| 302 | 306 |
}
|
| 303 | 307 |
SchoolType oldSchoolType = setSeine.getSchoolType();
|
| ... | ... | @@ -314,7 +318,7 @@ public class ConsolidateDataServiceLocal extends ObserveServiceLocal implements |
| 314 | 318 |
|
| 315 | 319 |
// des echantillons thons trouves
|
| 316 | 320 |
for (TargetSample targetSample : setSeine.getTargetSample()) {
|
| 317 |
- if (!targetSample.isTargetLengthEmpty()) {
|
|
| 321 |
+ if (targetSample.isTargetLengthNotEmpty()) {
|
|
| 318 | 322 |
for (TargetLength targetLength : targetSample.getTargetLength()) {
|
| 319 | 323 |
|
| 320 | 324 |
activityContext.watchTargetLength(targetLength);
|
| ... | ... | @@ -336,7 +340,7 @@ public class ConsolidateDataServiceLocal extends ObserveServiceLocal implements |
| 336 | 340 |
// des echantillons faunes trouves
|
| 337 | 341 |
for (NonTargetSample nonTargetSample : setSeine.getNonTargetSample()) {
|
| 338 | 342 |
|
| 339 |
- if (!nonTargetSample.isNonTargetLengthEmpty()) {
|
|
| 343 |
+ if (nonTargetSample.isNonTargetLengthNotEmpty()) {
|
|
| 340 | 344 |
for (NonTargetLength nonTargetLength : nonTargetSample.getNonTargetLength()) {
|
| 341 | 345 |
|
| 342 | 346 |
activityContext.watchNonTargetLenght(nonTargetLength);
|
| ... | ... | @@ -655,6 +659,11 @@ public class ConsolidateDataServiceLocal extends ObserveServiceLocal implements |
| 655 | 659 |
|
| 656 | 660 |
// recherche du parametrage adequate
|
| 657 | 661 |
SizeMeasureType inputSizeMeasureType = lengthWeightComputable.getSizeMeasureType();
|
| 662 |
+ //FIXME https://gitlab.com/ultreiaio/ird-observe/issues/1217
|
|
| 663 |
+ if (inputSizeMeasureType == null) {
|
|
| 664 |
+ log.error(String.format("No size measure type found for TargetLength (%s) will use the one of the species", lengthWeightComputable.getTopiaId()));
|
|
| 665 |
+ inputSizeMeasureType = species.getSizeMeasureType();
|
|
| 666 |
+ }
|
|
| 658 | 667 |
Optional<LengthWeightParameter> optionalLengthWeightParameter = activityContext.findLengthWeightParameter(species, sex, inputSizeMeasureType);
|
| 659 | 668 |
|
| 660 | 669 |
if (!optionalLengthWeightParameter.isPresent()) {
|
| ... | ... | @@ -690,9 +699,7 @@ public class ConsolidateDataServiceLocal extends ObserveServiceLocal implements |
| 690 | 699 |
length = optionalLengthLengthParameter.get().computeFromFormulaOne(length);
|
| 691 | 700 |
} else {
|
| 692 | 701 |
|
| 693 |
- if (log.isWarnEnabled()) {
|
|
| 694 |
- log.warn("Could not find lengLengthParameter for input: " + inputSizeMeasureType + " - output: " + outputSizeMeasureType);
|
|
| 695 |
- }
|
|
| 702 |
+ log.warn(String.format("Could not find LengthLengthParameter for input: %s - output: %s", inputSizeMeasureType, outputSizeMeasureType));
|
|
| 696 | 703 |
return;
|
| 697 | 704 |
}
|
| 698 | 705 |
}
|
| ... | ... | @@ -71,6 +71,7 @@ class ConsolidationActivitySeineDataContext { |
| 71 | 71 |
boolean failIfLengthWeightParameterNotFound;
|
| 72 | 72 |
boolean failIfLengthLengthParameterNotFound;
|
| 73 | 73 |
BeanMonitor targetLengthMonitor;
|
| 74 |
+ String activityPrefix;
|
|
| 74 | 75 |
|
| 75 | 76 |
BeanMonitor nonTargetLengthMonitor;
|
| 76 | 77 |
|