- T3-commits - mailman.cloud.codelutin.com

[Git][ultreiaio/ird-t3][develop] Amélioration du log du RF1 (N0.1) (See #2171)
by Tony CHEMIT 19 Feb '18

19 Feb '18

Tony CHEMIT pushed to branch develop at ultreiaio / ird-t3 Commits: 334460db by Tony CHEMIT at 2018-02-19T08:35:48+01:00 Amélioration du log du RF1 (N0.1) (See #2171) - - - - - 5 changed files: - t3-actions/src/main/java/fr/ird/t3/actions/data/level0/ComputeRF1Action.java - t3-actions/src/main/resources/i18n/t3-actions_en_GB.properties - t3-actions/src/main/resources/i18n/t3-actions_fr_FR.properties - t3-domain/src/main/java/fr/ird/t3/entities/data/TripImpl.java - t3-domain/src/main/xmi/t3-persistence.zargo Changes: ===================================== t3-actions/src/main/java/fr/ird/t3/actions/data/level0/ComputeRF1Action.java ===================================== --- a/t3-actions/src/main/java/fr/ird/t3/actions/data/level0/ComputeRF1Action.java +++ b/t3-actions/src/main/java/fr/ird/t3/actions/data/level0/ComputeRF1Action.java @@ -467,13 +467,14 @@ public class ComputeRF1Action extends AbstractLevel0Action<ComputeRF1Configurati // do the computation of rf1 for all trips of the complete trip float sumLanding = 0; float sumCatch = 0; + float sumLocalMarket = 0; + float sumLocalMarketDetailled = 0; for (Trip trip : completeTrip) { String tripStr = decorate(trip, DecoratorService.WITH_ID); if (log.isDebugEnabled()) { - log.debug("Start count for trip " + - tripStr); + log.debug("Start count for trip " + tripStr); } float elementaryLandingTotalWeight = @@ -507,20 +508,24 @@ public class ComputeRF1Action extends AbstractLevel0Action<ComputeRF1Configurati ); } + float localMarketTotalWeight = trip.getFalseFishesWeight(); + float localMarketTotalWeightDetailled = trip.getLocalMarketBatchTotalWeight(speciesList); + addInfoMessage(l(locale, "t3.level0.computeRF1.resume.for.trip", - tripStr, elementaryCatchTotalWeight, - elementaryLandingTotalWeight) - ); + tripStr, elementaryCatchTotalWeight, elementaryLandingTotalWeight, + localMarketTotalWeight, localMarketTotalWeightDetailled)); if (log.isDebugEnabled()) { - log.debug("elementaryLandingTotalWeight = " + - elementaryLandingTotalWeight); - log.debug("elementaryCatchTotalWeight = " + - elementaryCatchTotalWeight); + log.debug("elementaryLandingTotalWeight = " + elementaryLandingTotalWeight); + log.debug("elementaryCatchTotalWeight = " + elementaryCatchTotalWeight); + log.debug("localMarketTotalWeight = " + localMarketTotalWeight); + log.debug("localMarketTotalWeightDetailled = " + localMarketTotalWeightDetailled); } sumLanding += elementaryLandingTotalWeight; sumCatch += elementaryCatchTotalWeight; + sumLocalMarket += localMarketTotalWeight; + sumLocalMarketDetailled += localMarketTotalWeightDetailled; } float rf1 = 1; @@ -533,8 +538,7 @@ public class ComputeRF1Action extends AbstractLevel0Action<ComputeRF1Configurati addInfoMessage( l(locale, "t3.level0.computeRF1.resume.for.complete.trip", - sumCatch, sumLanding, rf1) - ); + sumCatch, sumLanding, sumLocalMarket, sumLocalMarketDetailled, rf1)); return rf1; } ===================================== t3-actions/src/main/resources/i18n/t3-actions_en_GB.properties ===================================== --- a/t3-actions/src/main/resources/i18n/t3-actions_en_GB.properties +++ b/t3-actions/src/main/resources/i18n/t3-actions_en_GB.properties @@ -20,8 +20,8 @@ t3.input.ImportInputSource=Input Data Import t3.level0.action=Level 0 Operation\: %s t3.level0.computeActivitySetDurationAndPositiveSetCount=%s, set duration\: %s, positiveSetCount\: %s t3.level0.computeRF1.complete.trips.to.use.for.vessel=Found %s complete trip(s) for vessel %s -t3.level0.computeRF1.resume.for.complete.trip=Total catches weight %s / Total landing weight %s / RF1 \= %s -t3.level0.computeRF1.resume.for.trip=Trip %s, Total catches weight %s / Total landing weight %s +t3.level0.computeRF1.resume.for.complete.trip=Total catches weight %s / Total landing weight %s / Total local market weight %s / Detailled total local market weight %s / RF1 \= %s +t3.level0.computeRF1.resume.for.trip=Trip %s, Total catches weight %s / Total landing weight %s / Total local market weight %s / Detailled total local market weight %s t3.level0.computeRF1.resume.rf1.for.trip=Trip %s, rf1 to use %s t3.level0.computeRF1.resume.rf2.for.trip=Trip %s, rf2 to use %s t3.level0.computeRF1.species.to.use=Will use %s species \: %s ===================================== t3-actions/src/main/resources/i18n/t3-actions_fr_FR.properties ===================================== --- a/t3-actions/src/main/resources/i18n/t3-actions_fr_FR.properties +++ b/t3-actions/src/main/resources/i18n/t3-actions_fr_FR.properties @@ -20,8 +20,8 @@ t3.input.ImportInputSource=Import de données t3.level0.action=Opération du niveau 0 \: %s t3.level0.computeActivitySetDurationAndPositiveSetCount=%s, durée de calée \: %s, positiveSetCount \: %s t3.level0.computeRF1.complete.trips.to.use.for.vessel=%s marée(s) complète(s) trouvées pour le navire %s -t3.level0.computeRF1.resume.for.complete.trip=Poids total capturé %s / Poids total vendu %s / RF1 \= %s -t3.level0.computeRF1.resume.for.trip=Marée %s, Poids total capturé %s / Poids total vendu %s +t3.level0.computeRF1.resume.for.complete.trip=Poids total capturé %s / Poids total vendu %s / Poids marché local résumé %s / Poids marché local détaillé %s / RF1 \= %s +t3.level0.computeRF1.resume.for.trip=Marée %s, Poids total capturé %s / Poids total vendu %s / Poids marché local résumé %s / Poids marché local détaillé %s t3.level0.computeRF1.resume.rf1.for.trip=Marée %s, rf1 utilisé %s t3.level0.computeRF1.resume.rf2.for.trip=Marée %s, rf2 utilisé %s t3.level0.computeRF1.species.to.use=%s espèces à utiliser \: %s ===================================== t3-domain/src/main/java/fr/ird/t3/entities/data/TripImpl.java ===================================== --- a/t3-domain/src/main/java/fr/ird/t3/entities/data/TripImpl.java +++ b/t3-domain/src/main/java/fr/ird/t3/entities/data/TripImpl.java @@ -30,10 +30,10 @@ import fr.ird.t3.entities.reference.Ocean; import fr.ird.t3.entities.reference.Species; import fr.ird.t3.entities.reference.Vessel; import fr.ird.t3.entities.reference.VesselImpl; + import java.util.Collection; import java.util.Set; - import static org.nuiton.i18n.I18n.n; /** @@ -191,6 +191,19 @@ public class TripImpl extends TripAbstract { } @Override + public float getLocalMarketBatchTotalWeight(Collection<Species> species) { + float result = 0; + if (isLocalMarketBatchNotEmpty()) { + for (LocalMarketBatch localMarketBatch : getLocalMarketBatch()) { + if (species.contains(localMarketBatch.getSpecies()) && localMarketBatch.getWeight() != null) { + result += localMarketBatch.getWeight(); + } + } + } + return result; + } + + @Override public float getElementaryLandingTotalWeight(Collection<Species> species) { float result = 0; if (!isElementaryLandingEmpty()) { ===================================== t3-domain/src/main/xmi/t3-persistence.zargo ===================================== Binary files a/t3-domain/src/main/xmi/t3-persistence.zargo and b/t3-domain/src/main/xmi/t3-persistence.zargo differ View it on GitLab: https://gitlab.com/ultreiaio/ird-t3/commit/334460dbc1efdd9b7d84b493eeeced1c… --- View it on GitLab: https://gitlab.com/ultreiaio/ird-t3/commit/334460dbc1efdd9b7d84b493eeeced1c… You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-t3][develop] 2 commits: Ordonnacement du traitement de marées au 1.4 (distribution des échantillons sur…
by Tony CHEMIT 19 Feb '18

19 Feb '18

Tony CHEMIT pushed to branch develop at ultreiaio / ird-t3 Commits: 7f04e295 by Tony CHEMIT at 2018-02-19T07:49:49+01:00 Ordonnacement du traitement de marées au 1.4 (distribution des échantillons sur les calées de l'échantillon) (See #259) - - - - - bf12f594 by Tony CHEMIT at 2018-02-19T07:52:57+01:00 Erreur de libellé dans le log N0.1 (calcul des RF1) (See #270) - - - - - 7 changed files: - t3-actions/src/main/java/fr/ird/t3/actions/data/level0/ComputeRF1Action.java - t3-actions/src/main/java/fr/ird/t3/actions/data/level1/AbstractLevel1Action.java - t3-actions/src/main/resources/ftl/fr/ird/t3/actions/data/level1/RedistributeSampleNumberToSetAction.ftl - t3-actions/src/main/resources/ftl/fr/ird/t3/actions/data/level1/RedistributeSampleNumberToSetAction_en.ftl - t3-actions/src/main/resources/i18n/t3-actions_en_GB.properties - t3-actions/src/main/resources/i18n/t3-actions_fr_FR.properties - t3-domain/src/main/java/fr/ird/t3/services/DecoratorService.java Changes: ===================================== t3-actions/src/main/java/fr/ird/t3/actions/data/level0/ComputeRF1Action.java ===================================== --- a/t3-actions/src/main/java/fr/ird/t3/actions/data/level0/ComputeRF1Action.java +++ b/t3-actions/src/main/java/fr/ird/t3/actions/data/level0/ComputeRF1Action.java @@ -32,13 +32,13 @@ import fr.ird.t3.entities.reference.Species; import fr.ird.t3.entities.reference.Vessel; import fr.ird.t3.services.DecoratorService; import fr.ird.t3.services.ioc.InjectDAO; -import java.util.Collection; -import java.util.List; -import java.util.Set; import org.apache.commons.collections.CollectionUtils; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; +import java.util.Collection; +import java.util.List; +import java.util.Set; import static org.nuiton.i18n.I18n.l; @@ -347,14 +347,12 @@ public class ComputeRF1Action extends AbstractLevel0Action<ComputeRF1Configurati String warnMessage = l(locale, "t3.level0.computeRF1.warning.too.low.rf1", - decorate(completeTrip.getDepartureTrip()), - decorate(completeTrip.getLandingTrip()), - rf1, - minimumRate - ); - + completeTrip.getDepartureTrip().getVesselLabel(), + DecoratorService.formatDate(completeTrip.getDepartureTrip().getDepartureDate()), + DecoratorService.formatDate(completeTrip.getLandingTrip().getLandingDate()), + rf1, + minimumRate); addWarningMessage(warnMessage); - nbCompleteAcceptedTripsWithBadRF1++; } @@ -362,11 +360,11 @@ public class ComputeRF1Action extends AbstractLevel0Action<ComputeRF1Configurati String warnMessage = l(locale, "t3.level0.computeRF1.warning.too.high.rf1", - decorate(completeTrip.getDepartureTrip()), - decorate(completeTrip.getLandingTrip()), - rf1, - maximumRate - ); + completeTrip.getDepartureTrip().getVesselLabel(), + DecoratorService.formatDate(completeTrip.getDepartureTrip().getDepartureDate()), + DecoratorService.formatDate(completeTrip.getLandingTrip().getLandingDate()), + rf1, + maximumRate); addWarningMessage(warnMessage); nbCompleteAcceptedTripsWithBadRF1++; } ===================================== t3-actions/src/main/java/fr/ird/t3/actions/data/level1/AbstractLevel1Action.java ===================================== --- a/t3-actions/src/main/java/fr/ird/t3/actions/data/level1/AbstractLevel1Action.java +++ b/t3-actions/src/main/java/fr/ird/t3/actions/data/level1/AbstractLevel1Action.java @@ -33,7 +33,11 @@ import fr.ird.t3.services.DecoratorService; import fr.ird.t3.services.ioc.InjectDAO; import fr.ird.t3.services.ioc.InjectEntityById; import java.util.Collection; +import java.util.Comparator; +import java.util.List; import java.util.Set; +import java.util.stream.Collectors; + import org.apache.commons.collections.CollectionUtils; import org.nuiton.topia.persistence.TopiaException; @@ -48,6 +52,10 @@ import static org.nuiton.i18n.I18n.l; */ public abstract class AbstractLevel1Action extends T3Action<Level1Configuration> { + private static final Comparator<Trip> TRIP_COMPARATOR = Comparator + .<Trip, Integer>comparing(t -> t.getVessel().getCode()) + .thenComparing(Comparator.comparing(Trip::getLandingDate)); + protected final Level1Step step; protected final Set<Level1Step> higherSteps; @@ -81,6 +89,10 @@ public abstract class AbstractLevel1Action extends T3Action<Level1Configuration> return samplesByTrip.keySet(); } + public List<Trip> getOrderedTrips() { + return samplesByTrip.keySet().stream().sorted(TRIP_COMPARATOR).collect(Collectors.toList()); + } + public Collection<Sample> getSamples(Trip trip) { return getSamplesByTrip().get(trip); } ===================================== t3-actions/src/main/resources/ftl/fr/ird/t3/actions/data/level1/RedistributeSampleNumberToSetAction.ftl ===================================== --- a/t3-actions/src/main/resources/ftl/fr/ird/t3/actions/data/level1/RedistributeSampleNumberToSetAction.ftl +++ b/t3-actions/src/main/resources/ftl/fr/ird/t3/actions/data/level1/RedistributeSampleNumberToSetAction.ftl @@ -49,7 +49,7 @@ Nombre de marées traitées : ${action.nbTripsTreated} Nombre d'échantillons traités : ${action.nbSamplesTreated} Nombre d'échantillons non traités : ${action.nbSamplesNotTreated} -<#list action.trips as trip> +<#list action.orderedTrips as trip> Marée ${tripDecorator.toString(trip)} : <#assign samples = action.getSamples(trip)/> <#list samples as sample> ===================================== t3-actions/src/main/resources/ftl/fr/ird/t3/actions/data/level1/RedistributeSampleNumberToSetAction_en.ftl ===================================== --- a/t3-actions/src/main/resources/ftl/fr/ird/t3/actions/data/level1/RedistributeSampleNumberToSetAction_en.ftl +++ b/t3-actions/src/main/resources/ftl/fr/ird/t3/actions/data/level1/RedistributeSampleNumberToSetAction_en.ftl @@ -49,7 +49,7 @@ Number of treated trips: ${action.nbTripsTreated} Number of treated samples: ${action.nbSamplesTreated} Number of untreated samples: ${action.nbSamplesNotTreated} -<#list action.trips as trip> +<#list action.orderedTrips as trip> Trip ${tripDecorator.toString(trip)} : <#assign samples = action.getSamples(trip)/> <#list samples as sample> ===================================== t3-actions/src/main/resources/i18n/t3-actions_en_GB.properties ===================================== --- a/t3-actions/src/main/resources/i18n/t3-actions_en_GB.properties +++ b/t3-actions/src/main/resources/i18n/t3-actions_en_GB.properties @@ -33,8 +33,8 @@ t3.level0.computeRF1.warning.no.catches.but.some.landings=Trip %s has no catches t3.level0.computeRF1.warning.no.landings.but.some.catches=Trip %s has no landing but some catches (%s), this trip will not be use to compute rf1. t3.level0.computeRF1.warning.no.logbook=No log book for trip %s, use a null rf1 value t3.level0.computeRF1.warning.no.species.usable.for.country=Could not find usable species fro Raising Factor 1 computation from country %s -t3.level0.computeRF1.warning.too.high.rf1=For complete trip from %s to %s computed rf1 %s is too high (higher than %s) -t3.level0.computeRF1.warning.too.low.rf1=For complete trip from %s to %s computed rf1 is too small (less than %s) +t3.level0.computeRF1.warning.too.high.rf1=For complete trip %s from %s to %s computed rf1 %s is too high (higher than %s) +t3.level0.computeRF1.warning.too.low.rf1=For complete trip %s from %s to %s computed rf1 is too small (less than %s) t3.level0.computeRF1.warning.trip.is.not.complete=Trip %s is not compelte, can not compute any rf1 for it t3.level0.computeRF2.computed.rf2.for.stratum=Computed rf2 for stratum \: %s t3.level0.computeRF2.nbTrips.for.stratum=%s trip(s) for Stratum (%s) [%s/%s/%s/%s] ===================================== t3-actions/src/main/resources/i18n/t3-actions_fr_FR.properties ===================================== --- a/t3-actions/src/main/resources/i18n/t3-actions_fr_FR.properties +++ b/t3-actions/src/main/resources/i18n/t3-actions_fr_FR.properties @@ -33,8 +33,8 @@ t3.level0.computeRF1.warning.no.catches.but.some.landings=La marée %s n'a pas d t3.level0.computeRF1.warning.no.landings.but.some.catches=La marée %s n'a pas de lots commerciaux mais des captures (%s), marée non utilisée dans le calcul du rf1. t3.level0.computeRF1.warning.no.logbook=Pas de livre de bord pour la marée %s, utilisation de la valeur null pour le rf1 t3.level0.computeRF1.warning.no.species.usable.for.country=Aucune espèces utilisable dans le calcul du rf1 pour le pays %s -t3.level0.computeRF1.warning.too.high.rf1=Pour la marée complète de %s à %s le rf1 calculé %s est trop grand (supérieur à %s) -t3.level0.computeRF1.warning.too.low.rf1=Pour la marée complète de %s à %s le rf1 calculé %s est trop petit (inférieur à %s) +t3.level0.computeRF1.warning.too.high.rf1=Pour la marée complète %s de %s à %s le rf1 calculé %s est trop grand (supérieur à %s) +t3.level0.computeRF1.warning.too.low.rf1=Pour la marée complète %s de %s à %s le rf1 calculé %s est trop petit (inférieur à %s) t3.level0.computeRF1.warning.trip.is.not.complete=La marée %s n'est pas complète, calcul du rf1 impossible t3.level0.computeRF2.computed.rf2.for.stratum=Valeur du rf2 calculé pour la strate \: %s t3.level0.computeRF2.nbTrips.for.stratum=%s marée(s) pour la Strate (%s) [%s/%s/%s/%s] ===================================== t3-domain/src/main/java/fr/ird/t3/services/DecoratorService.java ===================================== --- a/t3-domain/src/main/java/fr/ird/t3/services/DecoratorService.java +++ b/t3-domain/src/main/java/fr/ird/t3/services/DecoratorService.java @@ -48,10 +48,6 @@ import fr.ird.t3.entities.reference.zone.ZoneStratumAwareMeta; import fr.ird.t3.entities.reference.zone.ZoneVersion; import fr.ird.t3.entities.user.UserOutputDatabase; import fr.ird.t3.entities.user.UserT3Database; -import java.util.Collection; -import java.util.List; -import java.util.Locale; -import java.util.Map; import org.apache.commons.collections.CollectionUtils; import org.apache.commons.jxpath.JXPathContext; import org.nuiton.decorator.Decorator; @@ -60,6 +56,12 @@ import org.nuiton.decorator.DecoratorUtil; import org.nuiton.decorator.JXPathDecorator; import org.nuiton.topia.persistence.TopiaEntity; +import java.text.SimpleDateFormat; +import java.util.Collection; +import java.util.Date; +import java.util.List; +import java.util.Locale; +import java.util.Map; import static org.nuiton.i18n.I18n.l; @@ -75,6 +77,12 @@ public class DecoratorService extends T3ServiceSupport implements T3ServiceSingl private final DecoratorMulti18nProvider decoratorProvider; + private static final SimpleDateFormat DATE_FORMAT = new SimpleDateFormat("dd/MM/yyyy"); + + public static String formatDate(Date date) { + return DATE_FORMAT.format(date); + } + public DecoratorService() { decoratorProvider = new T3DecoratorProvider(); } View it on GitLab: https://gitlab.com/ultreiaio/ird-t3/compare/9afa9c1acc91aca4d128e3ed822d666… --- View it on GitLab: https://gitlab.com/ultreiaio/ird-t3/compare/9afa9c1acc91aca4d128e3ed822d666… You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-t3][develop] [LOGS] Inversion de libellé dans le log d'import AVDTH (See #247)
by Tony CHEMIT 18 Feb '18

18 Feb '18

Tony CHEMIT pushed to branch develop at ultreiaio / ird-t3 Commits: 9afa9c1a by Tony CHEMIT at 2018-02-18T18:22:32+01:00 [LOGS] Inversion de libellé dans le log d'import AVDTH (See #247) - - - - - 3 changed files: - t3-input-avdthv33/src/main/java/fr/ird/t3/io/input/avdth/v33/T3DataEntityVisitorAvdth33.java - t3-input-avdthv35/src/main/java/fr/ird/t3/io/input/avdth/v35/T3DataEntityVisitorAvdth35.java - t3-input-avdthv36/src/main/java/fr/ird/t3/io/input/avdth/v36/T3DataEntityVisitorAvdth36.java Changes: ===================================== t3-input-avdthv33/src/main/java/fr/ird/t3/io/input/avdth/v33/T3DataEntityVisitorAvdth33.java ===================================== --- a/t3-input-avdthv33/src/main/java/fr/ird/t3/io/input/avdth/v33/T3DataEntityVisitorAvdth33.java +++ b/t3-input-avdthv33/src/main/java/fr/ird/t3/io/input/avdth/v33/T3DataEntityVisitorAvdth33.java @@ -247,7 +247,7 @@ public class T3DataEntityVisitorAvdth33 extends T3DataEntityVisitor { T3EntityEnum.ElementaryCatch, T3EntityEnum.WeightCategoryLogBook, getPKey(T3EntityEnum.ElementaryCatch), - new Object[]{codeEspece, codeCate} + new Object[]{codeCate, codeEspece} )); } else { ===================================== t3-input-avdthv35/src/main/java/fr/ird/t3/io/input/avdth/v35/T3DataEntityVisitorAvdth35.java ===================================== --- a/t3-input-avdthv35/src/main/java/fr/ird/t3/io/input/avdth/v35/T3DataEntityVisitorAvdth35.java +++ b/t3-input-avdthv35/src/main/java/fr/ird/t3/io/input/avdth/v35/T3DataEntityVisitorAvdth35.java @@ -246,7 +246,7 @@ public class T3DataEntityVisitorAvdth35 extends T3DataEntityVisitor { T3EntityEnum.ElementaryCatch, T3EntityEnum.WeightCategoryLogBook, getPKey(T3EntityEnum.ElementaryCatch), - new Object[]{codeEspece, codeCate} + new Object[]{codeCate, codeEspece} )); } else { ===================================== t3-input-avdthv36/src/main/java/fr/ird/t3/io/input/avdth/v36/T3DataEntityVisitorAvdth36.java ===================================== --- a/t3-input-avdthv36/src/main/java/fr/ird/t3/io/input/avdth/v36/T3DataEntityVisitorAvdth36.java +++ b/t3-input-avdthv36/src/main/java/fr/ird/t3/io/input/avdth/v36/T3DataEntityVisitorAvdth36.java @@ -245,7 +245,7 @@ public class T3DataEntityVisitorAvdth36 extends T3DataEntityVisitor { T3EntityEnum.ElementaryCatch, T3EntityEnum.WeightCategoryLogBook, getPKey(T3EntityEnum.ElementaryCatch), - new Object[]{codeEspece, codeCate} + new Object[]{codeCate, codeEspece} )); } else { View it on GitLab: https://gitlab.com/ultreiaio/ird-t3/commit/9afa9c1acc91aca4d128e3ed822d6660… --- View it on GitLab: https://gitlab.com/ultreiaio/ird-t3/commit/9afa9c1acc91aca4d128e3ed822d6660… You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-t3][develop] [N0.4][LOG] Calcul du nombre de calées et durée des calées - Petite erreur dans le log (See #160)
by Tony CHEMIT 18 Feb '18

18 Feb '18

Tony CHEMIT pushed to branch develop at ultreiaio / ird-t3 Commits: 7dbbca05 by Tony CHEMIT at 2018-02-18T18:12:20+01:00 [N0.4][LOG] Calcul du nombre de calées et durée des calées - Petite erreur dans le log (See #160) - - - - - 3 changed files: - t3-actions/src/main/java/fr/ird/t3/actions/data/level0/ComputeSetDurationAndPositiveSetCountAction.java - t3-actions/src/main/resources/ftl/fr/ird/t3/actions/data/level0/ComputeSetDurationAndPositiveSetCountAction.ftl - t3-actions/src/main/resources/ftl/fr/ird/t3/actions/data/level0/ComputeSetDurationAndPositiveSetCountAction_en.ftl Changes: ===================================== t3-actions/src/main/java/fr/ird/t3/actions/data/level0/ComputeSetDurationAndPositiveSetCountAction.java ===================================== --- a/t3-actions/src/main/java/fr/ird/t3/actions/data/level0/ComputeSetDurationAndPositiveSetCountAction.java +++ b/t3-actions/src/main/java/fr/ird/t3/actions/data/level0/ComputeSetDurationAndPositiveSetCountAction.java @@ -32,15 +32,15 @@ import fr.ird.t3.entities.reference.SetDurationTopiaDao; import fr.ird.t3.entities.reference.Species; import fr.ird.t3.services.DecoratorService; import fr.ird.t3.services.ioc.InjectDAO; -import java.util.List; -import java.util.Map; -import java.util.Set; import org.apache.commons.collections.CollectionUtils; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.nuiton.topia.persistence.TopiaException; import org.nuiton.util.TimeLog; +import java.util.List; +import java.util.Map; +import java.util.Set; import static org.nuiton.i18n.I18n.l; @@ -64,10 +64,10 @@ public class ComputeSetDurationAndPositiveSetCountAction extends AbstractLevel0A /** Count of treated activites. */ protected int nbActivities; - + /** Count of set (sum(a.setCount) on each activity trip). */ + protected int nbSet; /** Count of positive activites found. */ protected int nbPositiveActivities; - /** * Cache of setDuration (improve a lot performance!). * @@ -79,8 +79,8 @@ public class ComputeSetDurationAndPositiveSetCountAction extends AbstractLevel0A super(Level0Step.COMPUTE_SET_DURATION_AND_POSITIVE_SET_COUNT); } - public int getNbActivities() { - return nbActivities; + public int getNbSet() { + return nbSet; } public int getNbPositiveActivities() { @@ -144,6 +144,7 @@ public class ComputeSetDurationAndPositiveSetCountAction extends AbstractLevel0A String activityStr = "Activity " + tripStr + " - " + decorate(activity); + nbSet += activity.getSetCount(); incrementsProgression(); float totalCatchesWeight = ===================================== t3-actions/src/main/resources/ftl/fr/ird/t3/actions/data/level0/ComputeSetDurationAndPositiveSetCountAction.ftl ===================================== --- a/t3-actions/src/main/resources/ftl/fr/ird/t3/actions/data/level0/ComputeSetDurationAndPositiveSetCountAction.ftl +++ b/t3-actions/src/main/resources/ftl/fr/ird/t3/actions/data/level0/ComputeSetDurationAndPositiveSetCountAction.ftl @@ -36,7 +36,7 @@ Indicateurs - Nombre de navires : ${action.nbVessels} - Nombre de marées : ${action.nbTrips} -- Nombre de calées : ${action.nbActivities} +- Nombre de calées : ${action.nbSet} - Nombre de calées positives : ${action.nbPositiveActivities} <#include "/ftl/showMessages.ftl"/> ===================================== t3-actions/src/main/resources/ftl/fr/ird/t3/actions/data/level0/ComputeSetDurationAndPositiveSetCountAction_en.ftl ===================================== --- a/t3-actions/src/main/resources/ftl/fr/ird/t3/actions/data/level0/ComputeSetDurationAndPositiveSetCountAction_en.ftl +++ b/t3-actions/src/main/resources/ftl/fr/ird/t3/actions/data/level0/ComputeSetDurationAndPositiveSetCountAction_en.ftl @@ -36,7 +36,7 @@ Indicators - Number of vessels: ${action.nbVessels} - Number of trips: ${action.nbTrips} -- Number of activities: ${action.nbActivities} +- Number of activities: ${action.nbSet} - Number of positive activities: ${action.nbPositiveActivities} <#include "/ftl/showMessages.ftl"/> View it on GitLab: https://gitlab.com/ultreiaio/ird-t3/commit/7dbbca052194fe1763bbae3d24f63340… --- View it on GitLab: https://gitlab.com/ultreiaio/ird-t3/commit/7dbbca052194fe1763bbae3d24f63340… You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-t3][develop] [LOGS] Erreur d'affichage sur le log du RF1 (See #246)
by Tony CHEMIT 18 Feb '18

18 Feb '18

Tony CHEMIT pushed to branch develop at ultreiaio / ird-t3 Commits: 3b02bd30 by Tony CHEMIT at 2018-02-18T17:57:22+01:00 [LOGS] Erreur d'affichage sur le log du RF1 (See #246) - - - - - 1 changed file: - t3-actions/src/main/java/fr/ird/t3/actions/data/level0/ComputeRF1Action.java Changes: ===================================== t3-actions/src/main/java/fr/ird/t3/actions/data/level0/ComputeRF1Action.java ===================================== --- a/t3-actions/src/main/java/fr/ird/t3/actions/data/level0/ComputeRF1Action.java +++ b/t3-actions/src/main/java/fr/ird/t3/actions/data/level0/ComputeRF1Action.java @@ -491,8 +491,7 @@ public class ComputeRF1Action extends AbstractLevel0Action<ComputeRF1Configurati addWarningMessage( l(locale, "t3.level0.computeRF1.warning.no.catches.but.some.landings", - tripStr, - elementaryCatchTotalWeight) + tripStr, elementaryLandingTotalWeight) ); } View it on GitLab: https://gitlab.com/ultreiaio/ird-t3/commit/3b02bd305bd6e6decffe526edc91bfc7… --- View it on GitLab: https://gitlab.com/ultreiaio/ird-t3/commit/3b02bd305bd6e6decffe526edc91bfc7… You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-t3][develop] 3 commits: generate bundle for main application
by Tony CHEMIT 18 Feb '18

18 Feb '18

Tony CHEMIT pushed to branch develop at ultreiaio / ird-t3 Commits: 624ff5bb by Tony CHEMIT at 2018-02-18T13:34:55+01:00 generate bundle for main application - - - - - 32858eb1 by Tony CHEMIT at 2018-02-18T14:01:16+01:00 move some pom conf - - - - - 6c6860d5 by Tony CHEMIT at 2018-02-18T14:02:26+01:00 Améliorations dans la gestion des profils utilisateurs (See #251) - - - - - 8 changed files: - pom.xml - + t3-web/.mvn/i18n-bundle - + t3-web/.mvn/i18n-check-i18n-artifacts - t3-web/pom.xml - t3-web/src/main/java/fr/ird/t3/web/actions/admin/UserAction.java - t3-web/src/main/resources/i18n/t3-web_en_GB.properties - t3-web/src/main/resources/i18n/t3-web_fr_FR.properties - t3-web/src/main/webapp/WEB-INF/jsp/admin/userForm.jsp Changes: ===================================== pom.xml ===================================== --- a/pom.xml +++ b/pom.xml @@ -101,6 +101,7 @@ <applicationName>t3</applicationName> <t3-data.version>1.2-SNAPSHOT</t3-data.version> + <env>dev</env>  @@ -287,6 +288,9 @@ <module>t3-installer</module> <module>t3</module> </modules> + <properties> + <env>prod</env> + </properties> </profile> <profile> ===================================== t3-web/.mvn/i18n-bundle ===================================== --- /dev/null +++ b/t3-web/.mvn/i18n-bundle ===================================== t3-web/.mvn/i18n-check-i18n-artifacts ===================================== --- /dev/null +++ b/t3-web/.mvn/i18n-check-i18n-artifacts ===================================== t3-web/pom.xml ===================================== --- a/t3-web/pom.xml +++ b/t3-web/pom.xml @@ -33,14 +33,6 @@ <name>T3 :: Web</name> <description>T3 web application</description> - <properties> - - <i18n.silent>true</i18n.silent> - - <env>dev</env> - - </properties> - <dependencies>  @@ -148,7 +140,6 @@ <artifactId>h2</artifactId> <scope>runtime</scope> </dependency> - <dependency> <groupId>org.postgresql</groupId> <artifactId>postgresql</artifactId> @@ -270,28 +261,4 @@ </build> - <profiles> - - <profile> - <id>do-release</id> - <activation> - <property> - <name>performRelease</name> - <value>true</value> - </property> - </activation> - <properties> - <env>prod</env> - </properties> - -  -  -  -  -  -  -  - </profile> - - </profiles> </project> ===================================== t3-web/src/main/java/fr/ird/t3/web/actions/admin/UserAction.java ===================================== --- a/t3-web/src/main/java/fr/ird/t3/web/actions/admin/UserAction.java +++ b/t3-web/src/main/java/fr/ird/t3/web/actions/admin/UserAction.java @@ -28,6 +28,8 @@ import org.apache.commons.lang3.StringUtils; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; +import java.util.Objects; + /** * Action to manage user (create - update - change password,...) * @@ -43,6 +45,7 @@ public class UserAction extends T3ActionSupport implements Preparable { public static final String BACK_TO_LIST = "backToList"; protected T3User user; + protected String checkPassword; protected String userEditAction; @@ -54,6 +57,14 @@ public class UserAction extends T3ActionSupport implements Preparable { this.userEditAction = userEditAction; } + public String getCheckPassword() { + return checkPassword; + } + + public void setCheckPassword(String checkPassword) { + this.checkPassword = checkPassword; + } + @Override public void prepare() throws Exception { @@ -61,7 +72,11 @@ public class UserAction extends T3ActionSupport implements Preparable { if (!StringUtils.isEmpty(userId)) { // load user - user = getUserService().getUserById(userId); + user = new T3UserImpl(); + T3User userById = getUserService().getUserById(userId); + user.setTopiaId(userById.getTopiaId()); + user.setAdmin(userById.isAdmin()); + user.setLogin(userById.getLogin()); } } @@ -85,6 +100,10 @@ public class UserAction extends T3ActionSupport implements Preparable { log.info("will update user " + t3User.getLogin()); } + if (!t3User.isAdmin() && getT3Session().getUser().isAdmin() && getT3Session().getUser().getLogin().equals(t3User.getLogin())) { + // never change admin flag on connected user + t3User.setAdmin(true); + } // update user getUserService().updateUser(t3User); return SUCCESS; @@ -112,7 +131,7 @@ public class UserAction extends T3ActionSupport implements Preparable { T3User t3User = getUser(); String userLogin = t3User.getLogin(); - + String userPassword = t3User.getPassword(); switch (action) { case CREATE: @@ -142,18 +161,26 @@ public class UserAction extends T3ActionSupport implements Preparable { } } - String userPassword = t3User.getPassword(); if (StringUtils.isEmpty(userPassword)) { // empty user password - addFieldError("user.password", - t("t3.error.required.password")); + addFieldError("user.password", t("t3.error.required.password")); + } else { + if (!Objects.equals(checkPassword, userPassword)) { + addFieldError("user.password", t("t3.error.password.mismatch")); + } } break; case EDIT: - // at the moment nothing to validate + + if (!StringUtils.isEmpty(userPassword)) { + if (!Objects.equals(checkPassword, userPassword)) { + addFieldError("user.password", t("t3.error.password.mismatch")); + } + } + break; case DELETE: ===================================== t3-web/src/main/resources/i18n/t3-web_en_GB.properties ===================================== --- a/t3-web/src/main/resources/i18n/t3-web_en_GB.properties +++ b/t3-web/src/main/resources/i18n/t3-web_en_GB.properties @@ -45,6 +45,7 @@ t3.common.available.vesselSimpleTypes=Types simplifiés de navire disponibles t3.common.available.vessels=Navires disponibles t3.common.canCreateVessel=Authorise to create vessels t3.common.catchFleet=Flotte des captures +t3.common.checkPassword=repeat password t3.common.configuration=Préférences t3.common.countries.to.select=Flottes à selectionner t3.common.createVirtualVessel=Create virtual vessels @@ -188,6 +189,7 @@ t3.error.no.zoneVersion.selected=No zone version selected t3.error.parametersProfile.already.used=Le nom de profile de paramètres est déjà utilisé t3.error.parametersProfile.required.profileDescription=Description du profile non renseigné t3.error.parametersProfile.required.profileName=Nom du profile non renseigné +t3.error.password.mismatch=Passwords are different t3.error.required.description=No description filled t3.error.required.file.to.upload=No file to upload selected t3.error.required.login=No Login filled @@ -273,7 +275,7 @@ t3.label.export.config.jdbc=Connexion parameters t3.label.export.config.pilot=Output pilot configuration t3.label.export.config.resume=Configuration summary t3.label.importData.config.resume=Configuration resume of data import -t3.label.info.changePassword=To change password, fill this field +t3.label.info.changePassword=To change password, fill the both password fields t3.label.inprogress=in progress... t3.label.language=Langue t3.label.locale.english=English ===================================== t3-web/src/main/resources/i18n/t3-web_fr_FR.properties ===================================== --- a/t3-web/src/main/resources/i18n/t3-web_fr_FR.properties +++ b/t3-web/src/main/resources/i18n/t3-web_fr_FR.properties @@ -45,6 +45,7 @@ t3.common.available.vesselSimpleTypes=Types simplifiés de navire disponibles t3.common.available.vessels=Navires disponibles t3.common.canCreateVessel=Autoriser la création de bateaux t3.common.catchFleet=Flotte des captures +t3.common.checkPassword=Répéter le mot de passe t3.common.configuration=Préférences t3.common.countries.to.select=Flottes à selectionner t3.common.createVirtualVessel=Créer des bateaux virtuels @@ -188,6 +189,7 @@ t3.error.no.zoneVersion.selected=Aucune version de zone sélectionnée t3.error.parametersProfile.already.used=Le nom de profile de paramètres est déjà utilisé t3.error.parametersProfile.required.profileDescription=Description du profile non renseigné t3.error.parametersProfile.required.profileName=Nom du profile non renseigné +t3.error.password.mismatch=Mots de passe différents t3.error.required.description=Aucune description renseignée t3.error.required.file.to.upload=Aucun fichier à télécharger sélectionné t3.error.required.login=Login non renseigné @@ -273,7 +275,7 @@ t3.label.export.config.jdbc=Paramètres de connexion t3.label.export.config.pilot=Pilote de sortie t3.label.export.config.resume=Résumé de configuration t3.label.importData.config.resume=Résumé de la configuration d'import de données -t3.label.info.changePassword=Pour changer de mot de passe, veuillez remplir le champs dédié +t3.label.info.changePassword=Pour changer de mot de passe, veuillez remplir les deux champs dédiés t3.label.inprogress=en cours... t3.label.language=Langue t3.label.locale.english=Anglais ===================================== t3-web/src/main/webapp/WEB-INF/jsp/admin/userForm.jsp ===================================== --- a/t3-web/src/main/webapp/WEB-INF/jsp/admin/userForm.jsp +++ b/t3-web/src/main/webapp/WEB-INF/jsp/admin/userForm.jsp @@ -24,6 +24,7 @@ <%@ taglib prefix="sjg" uri="/struts-jquery-grid-tags" %> <s:set var="userIsAdmin" value="%{#session.t3Session.user.admin}"/> +<s:set var="connectedUserLogin" value="%{#session.t3Session.user.login}"/> <s:url id="t3LoadUrl" action="getUserT3Databases" namespace="/json" escapeAmp="false"> @@ -152,14 +153,19 @@ </legend> <s:hidden key="user.topiaId" label=""/> <s:hidden key="user.login" label=""/> - <s:hidden key="user.admin" label=""/> <s:hidden key="userEditAction" label=""/> <s:textfield key="user.login" label="%{getText('t3.common.login')}" size="40" disabled="true"/> - <s:textfield name="user.password" value="" key="t3.common.password" - size="40"/> - <s:checkbox value="%{user.admin}" key="t3.common.admin" disabled="true"/> + <s:textfield name="user.password" value="" key="t3.common.password" size="40"/> + <s:textfield name="checkPassword" value="" key="t3.common.checkPassword" size="40"/> + <s:if test="userIsAdmin"> + <s:checkbox key="user.admin" value="%{user.admin}" label="%{getText('t3.common.admin')}"/> + <s:else> + <s:hidden key="user.admin" label=""/> + <s:checkbox value="%{user.admin}" key="t3.common.admin" disabled="true"/> + </s:else> + </s:if> </fieldset> <p><s:text name="t3.label.info.changePassword"/></p> <br/> View it on GitLab: https://gitlab.com/ultreiaio/ird-t3/compare/fbbec4577bc5325f47f0c5912694c88… --- View it on GitLab: https://gitlab.com/ultreiaio/ird-t3/compare/fbbec4577bc5325f47f0c5912694c88… You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-t3][develop] 2 commits: [REFERENTIEL] Rajouter des champs de traduction (See #245)
by Tony CHEMIT 18 Feb '18

18 Feb '18

Tony CHEMIT pushed to branch develop at ultreiaio / ird-t3 Commits: 600c1a50 by Tony CHEMIT at 2018-02-18T11:49:36+01:00 [REFERENTIEL] Rajouter des champs de traduction (See #245) - - - - - fbbec457 by Tony CHEMIT at 2018-02-18T11:50:38+01:00 L'importeur plante si les coordonnées d'un port sont à NULL (See #258) - - - - - 30 changed files: - t3-actions/src/main/java/fr/ird/t3/actions/data/level0/ComputeRF1Action.java - t3-actions/src/main/java/fr/ird/t3/actions/data/level0/ComputeRF2Action.java - t3-actions/src/main/java/fr/ird/t3/actions/data/level0/ComputeWellPlanWeightCategoriesProportionsAction.java - t3-actions/src/main/java/fr/ird/t3/actions/data/level0/ConvertCatchesWeightCategoriesAction.java - t3-actions/src/main/java/fr/ird/t3/actions/data/level1/ConvertSampleSetSpeciesFrequencyToWeightAction.java - t3-actions/src/main/java/fr/ird/t3/actions/data/level1/ConvertSetSpeciesFrequencyToWeightAction.java - t3-actions/src/main/java/fr/ird/t3/actions/data/level1/ExtrapolateSampleCountedAndMeasuredAction.java - t3-actions/src/main/java/fr/ird/t3/actions/data/level3/L3SampleStratumLoader.java - t3-actions/src/main/java/fr/ird/t3/actions/io/input/ImportInputSourceAction.java - t3-actions/src/test/java/fr/ird/t3/actions/AbstractActionResumeTest.java - t3-actions/src/test/java/fr/ird/t3/actions/data/level0/ConvertCatchesWeightCategoriesActionResumeTest.java - t3-actions/src/test/java/fr/ird/t3/actions/data/level1/AbstractLevel1ActionResumeTest.java - t3-actions/src/test/java/fr/ird/t3/actions/data/level1/ExtrapolateSampleCountedAndMeasuredActionResumeTest.java - t3-actions/src/test/java/fr/ird/t3/actions/data/level1/StandardizeSampleMeasuresActionResumeTest.java - t3-actions/src/test/java/fr/ird/t3/actions/data/level2/Level2ActionResumeTest.java - t3-actions/src/test/java/fr/ird/t3/actions/data/level3/Level3ActionResumeTest.java - t3-domain/src/main/java/fr/ird/t3/actions/stratum/StratumConfiguration.java - t3-domain/src/main/java/fr/ird/t3/entities/data/AbstractRaisingFactor2TopiaDao.java - t3-domain/src/main/java/fr/ird/t3/entities/data/TripImpl.java - t3-domain/src/main/java/fr/ird/t3/entities/reference/AbstractLengthWeightConversionTopiaDao.java - t3-domain/src/main/java/fr/ird/t3/entities/reference/LengthWeightConversionImpl.java - t3-domain/src/main/java/fr/ird/t3/entities/reference/RF1SpeciesForFleetImpl.java - t3-domain/src/main/java/fr/ird/t3/entities/reference/SetDurationImpl.java - t3-domain/src/main/java/fr/ird/t3/entities/reference/SpeciesLengthStepImpl.java - t3-domain/src/main/java/fr/ird/t3/entities/reference/VesselSizeCategoryImpl.java - t3-domain/src/main/java/fr/ird/t3/entities/reference/WeightCategoryLandingImpl.java - t3-domain/src/main/java/fr/ird/t3/entities/reference/zone/AbstractZoneTopiaDao.java - t3-domain/src/main/java/fr/ird/t3/entities/reference/zone/ZoneCWPImpl.java - t3-domain/src/main/java/fr/ird/t3/entities/reference/zone/ZoneStratumAwareImpl.java - t3-domain/src/main/java/fr/ird/t3/entities/reference/zone/ZoneVersion.java The diff was not included because it is too large. View it on GitLab: https://gitlab.com/ultreiaio/ird-t3/compare/c0965197235911a7db4db8678a572f5… --- View it on GitLab: https://gitlab.com/ultreiaio/ird-t3/compare/c0965197235911a7db4db8678a572f5… You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-t3][develop] [PERSISTENCE] Renommage de tables et champs (See #196)
by Tony CHEMIT 18 Feb '18

18 Feb '18

Tony CHEMIT pushed to branch develop at ultreiaio / ird-t3 Commits: c0965197 by Tony CHEMIT at 2018-02-18T09:09:54+01:00 [PERSISTENCE] Renommage de tables et champs (See #196) - - - - - 30 changed files: - t3-actions/src/main/java/fr/ird/t3/actions/data/level1/ComputeWeightOfCategoriesForSetAction.java - t3-actions/src/main/java/fr/ird/t3/actions/data/level1/ConvertSampleSetSpeciesFrequencyToWeightAction.java - t3-actions/src/main/java/fr/ird/t3/actions/data/level1/ConvertSetSpeciesFrequencyToWeightAction.java - t3-actions/src/main/java/fr/ird/t3/actions/data/level1/ExtrapolateSampleWeightToSetAction.java - t3-actions/src/main/java/fr/ird/t3/actions/data/level1/Level1Configuration.java - t3-actions/src/main/java/fr/ird/t3/actions/data/level1/RedistributeSampleNumberToSetAction.java - t3-actions/src/main/resources/ftl/fr/ird/t3/actions/data/level1/RedistributeSampleNumberToSetAction.ftl - t3-actions/src/main/resources/ftl/fr/ird/t3/actions/data/level1/RedistributeSampleNumberToSetAction_en.ftl - t3-actions/src/main/resources/i18n/t3-actions_en_GB.properties - t3-actions/src/main/resources/i18n/t3-actions_fr_FR.properties - t3-actions/src/test/java/fr/ird/t3/actions/data/level1/AbstractLevel1ActionResumeTest.java - t3-domain/src/main/java/fr/ird/t3/entities/T3EntityHelper.java - t3-domain/src/main/java/fr/ird/t3/entities/data/AbstractActivityTopiaDao.java - t3-domain/src/main/java/fr/ird/t3/entities/data/RfUsageStatus.java - t3-domain/src/main/java/fr/ird/t3/entities/data/SampleImpl.java - t3-domain/src/main/java/fr/ird/t3/entities/data/SampleWellImpl.java → t3-domain/src/main/java/fr/ird/t3/entities/data/SampleSetImpl.java - + t3-domain/src/main/java/fr/ird/t3/services/migration/T3MigrationCallbackV3_0.java - t3-domain/src/main/resources/META-INF/services/org.nuiton.topia.migration.TopiaMigrationCallbackByClassNG$MigrationCallBackForVersion - + t3-domain/src/main/resources/db/migration/V3_0_04_rename-SampleWell-table.sql - + t3-domain/src/main/resources/db/migration/V3_0_05_rename-SampleSpecies-fields.sql - t3-domain/src/main/xmi/t3-persistence.zargo - t3-input-avdthv33/src/main/java/fr/ird/t3/io/input/avdth/v33/T3AccessEntityMetaProviderAvdth33.java - t3-input-avdthv33/src/main/java/fr/ird/t3/io/input/avdth/v33/T3DataEntityVisitorAvdth33.java - t3-input-avdthv33/src/main/java/fr/ird/t3/io/input/avdth/v33/T3InputAvdth33.java - t3-input-avdthv35/src/main/java/fr/ird/t3/io/input/avdth/v35/T3AccessEntityMetaProviderAvdth35.java - t3-input-avdthv35/src/main/java/fr/ird/t3/io/input/avdth/v35/T3DataEntityVisitorAvdth35.java - t3-input-avdthv35/src/main/java/fr/ird/t3/io/input/avdth/v35/T3InputAvdth35.java - t3-input-avdthv36/src/main/java/fr/ird/t3/io/input/avdth/v36/T3AccessEntityMetaProviderAvdth36.java - t3-input-avdthv36/src/main/java/fr/ird/t3/io/input/avdth/v36/T3DataEntityVisitorAvdth36.java - t3-input-avdthv36/src/main/java/fr/ird/t3/io/input/avdth/v36/T3InputAvdth36.java The diff was not included because it is too large. View it on GitLab: https://gitlab.com/ultreiaio/ird-t3/commit/c0965197235911a7db4db8678a572f5d… --- View it on GitLab: https://gitlab.com/ultreiaio/ird-t3/commit/c0965197235911a7db4db8678a572f5d… You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-t3][develop] Les topiaid de LocalMarketPackagingType sont mal préfixés (See #250)
by Tony CHEMIT 18 Feb '18

18 Feb '18

Tony CHEMIT pushed to branch develop at ultreiaio / ird-t3 Commits: 3d049b2d by Tony CHEMIT at 2018-02-18T08:09:53+01:00 Les topiaid de LocalMarketPackagingType sont mal préfixés (See #250) - - - - - 1 changed file: - + t3-domain/src/main/resources/db/migration/V3_0_03_fix-LocalMarketPackagingType-ids.sql Changes: ===================================== t3-domain/src/main/resources/db/migration/V3_0_03_fix-LocalMarketPackagingType-ids.sql ===================================== --- /dev/null +++ b/t3-domain/src/main/resources/db/migration/V3_0_03_fix-LocalMarketPackagingType-ids.sql @@ -0,0 +1,31 @@ +--- +-- #%L +-- T3 :: Data +-- %% +-- Copyright (C) 2016 - 2018 IRD, Code Lutin, Ultreia.io +-- %% +-- This program is free software: you can redistribute it and/or modify +-- it under the terms of the GNU Affero General Public License as published by +-- the Free Software Foundation, either version 3 of the License, or +-- (at your option) any later version. +-- +-- This program is distributed in the hope that it will be useful, +-- but WITHOUT ANY WARRANTY; without even the implied warranty of +-- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +-- GNU General Public License for more details. +-- +-- You should have received a copy of the GNU Affero General Public License +-- along with this program. If not, see <http://www.gnu.org/licenses/>. +-- #L% +--- +INSERT INTO localmarketpackagingtype (topiaid, topiaversion, topiacreatedate, code, libelle, status) VALUES ('fr.ird.t3.entities.reference.LocalMarketPackagingType#1454009635523#0.1', 0, '2016-01-28 00:00:00', 1, 'Vrac pesé ou non (multispécifique) (sondage)', true); +INSERT INTO localmarketpackagingtype (topiaid, topiaversion, topiacreatedate, code, libelle, status) VALUES ('fr.ird.t3.entities.reference.LocalMarketPackagingType#1454009635523#0.2', 0, '2016-01-28 00:00:00', 2, 'Pesée (monospécifique) (pas de sondage)', true); +INSERT INTO localmarketpackagingtype (topiaid, topiaversion, topiacreatedate, code, libelle, status) VALUES ('fr.ird.t3.entities.reference.LocalMarketPackagingType#1454009635523#0.3', 0, '2016-01-28 00:00:00', 3, 'Espèce unité (monospécifique) (pas de sondage)', true); +INSERT INTO localmarketpackagingtype (topiaid, topiaversion, topiacreatedate, code, libelle, status) VALUES ('fr.ird.t3.entities.reference.LocalMarketPackagingType#1454009635523#0.4', 0, '2016-01-28 00:00:00', 4, 'Paquet non pesé (monospécifique) (pas de sondage)', true); + +UPDATE Localmarketpackaging SET localmarketpackagingtype = replace(localmarketpackagingtype,'LocalMarketPackaging', 'LocalMarketPackagingType'); + +DELETE FROM Localmarketpackagingtype WHERE topiaid = 'fr.ird.t3.entities.reference.LocalMarketPackaging#1454009635523#0.1'; +DELETE FROM Localmarketpackagingtype WHERE topiaid = 'fr.ird.t3.entities.reference.LocalMarketPackaging#1454009635523#0.2'; +DELETE FROM Localmarketpackagingtype WHERE topiaid = 'fr.ird.t3.entities.reference.LocalMarketPackaging#1454009635523#0.3'; +DELETE FROM Localmarketpackagingtype WHERE topiaid = 'fr.ird.t3.entities.reference.LocalMarketPackaging#1454009635523#0.4'; View it on GitLab: https://gitlab.com/ultreiaio/ird-t3/commit/3d049b2df0900656a9de9e209a466751… --- View it on GitLab: https://gitlab.com/ultreiaio/ird-t3/commit/3d049b2df0900656a9de9e209a466751… You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-t3][develop] Supprimer localmarketpackaging.status (See #249)
by Tony CHEMIT 18 Feb '18

18 Feb '18

Tony CHEMIT pushed to branch develop at ultreiaio / ird-t3 Commits: d9193bca by Tony CHEMIT at 2018-02-18T07:57:38+01:00 Supprimer localmarketpackaging.status (See #249) - - - - - 3 changed files: - + t3-domain/src/main/java/fr/ird/t3/entities/reference/LocalMarketPackagingImpl.java - + t3-domain/src/main/resources/db/migration/V3_0_02_remove-LocalMarketPackaging-status.sql - t3-domain/src/main/xmi/t3-persistence.zargo Changes: ===================================== t3-domain/src/main/java/fr/ird/t3/entities/reference/LocalMarketPackagingImpl.java ===================================== --- /dev/null +++ b/t3-domain/src/main/java/fr/ird/t3/entities/reference/LocalMarketPackagingImpl.java @@ -0,0 +1,31 @@ +/* + * #%L + * T3 :: Domain + * %% + * Copyright (C) 2010 - 2017 IRD, Code Lutin, Ultreia.io + * %% + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU Affero General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU Affero General Public License + * along with this program. If not, see <http://www.gnu.org/licenses/>. + * #L% + */ +package fr.ird.t3.entities.reference; + +public class LocalMarketPackagingImpl extends LocalMarketPackagingAbstract { + + private static final long serialVersionUID = 1L; + + @Override + public boolean isStatus() { + return true; + } +} ===================================== t3-domain/src/main/resources/db/migration/V3_0_02_remove-LocalMarketPackaging-status.sql ===================================== --- /dev/null +++ b/t3-domain/src/main/resources/db/migration/V3_0_02_remove-LocalMarketPackaging-status.sql @@ -0,0 +1,21 @@ +--- +-- #%L +-- T3 :: Domain +-- %% +-- Copyright (C) 2010 - 2018 IRD, Code Lutin, Ultreia.io +-- %% +-- This program is free software: you can redistribute it and/or modify +-- it under the terms of the GNU Affero General Public License as published by +-- the Free Software Foundation, either version 3 of the License, or +-- (at your option) any later version. +-- +-- This program is distributed in the hope that it will be useful, +-- but WITHOUT ANY WARRANTY; without even the implied warranty of +-- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +-- GNU General Public License for more details. +-- +-- You should have received a copy of the GNU Affero General Public License +-- along with this program. If not, see <http://www.gnu.org/licenses/>. +-- #L% +--- +alter TABLE LocalMarketPackaging DROP COLUMN status; \ No newline at end of file ===================================== t3-domain/src/main/xmi/t3-persistence.zargo ===================================== Binary files a/t3-domain/src/main/xmi/t3-persistence.zargo and b/t3-domain/src/main/xmi/t3-persistence.zargo differ View it on GitLab: https://gitlab.com/ultreiaio/ird-t3/commit/d9193bcafb64c1d50be28833bcfe068a… --- View it on GitLab: https://gitlab.com/ultreiaio/ird-t3/commit/d9193bcafb64c1d50be28833bcfe068a… You're receiving this email because of your account on gitlab.com.

1 0