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

[Git][ultreiaio/ird-t3] Pushed new branch release/2.4
by Tony CHEMIT 19 Mar '18

19 Mar '18

Tony CHEMIT pushed new branch release/2.4 at ultreiaio / ird-t3 --- View it on GitLab: https://gitlab.com/ultreiaio/ird-t3/tree/release/2.4 You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-t3][develop] fix some templates around io import
by Tony CHEMIT 19 Mar '18

19 Mar '18

Tony CHEMIT pushed to branch develop at ultreiaio / ird-t3 Commits: 05b939e3 by Tony CHEMIT at 2018-03-19T21:20:04Z fix some templates around io import - - - - - 5 changed files: - t3-actions/src/main/java/fr/ird/t3/actions/io/input/ImportInputSourceConfiguration.java - t3-actions/src/main/resources/ftl/fr/ird/t3/actions/io/input/AnalyzeInputSourceAction.ftl - t3-actions/src/main/resources/ftl/fr/ird/t3/actions/io/input/AnalyzeInputSourceAction_en.ftl - t3-actions/src/main/resources/ftl/fr/ird/t3/actions/io/input/ImportInputSourceAction.ftl - t3-actions/src/main/resources/ftl/fr/ird/t3/actions/io/input/ImportInputSourceAction_en.ftl Changes: ===================================== t3-actions/src/main/java/fr/ird/t3/actions/io/input/ImportInputSourceConfiguration.java ===================================== --- a/t3-actions/src/main/java/fr/ird/t3/actions/io/input/ImportInputSourceConfiguration.java +++ b/t3-actions/src/main/java/fr/ird/t3/actions/io/input/ImportInputSourceConfiguration.java @@ -73,6 +73,7 @@ public class ImportInputSourceConfiguration implements InputSourceConfiguration result.setTripType(analyzeConfiguration.getTripType()); result.setCanCreateVessel(analyzeConfiguration.isCanCreateVessel()); result.setCreateVirtualVessel(analyzeConfiguration.isCanCreateVessel()); + result.setCanCreateVirtualActivity(analyzeConfiguration.isCanCreateVirtualActivity()); return result; } ===================================== t3-actions/src/main/resources/ftl/fr/ird/t3/actions/io/input/AnalyzeInputSourceAction.ftl ===================================== --- a/t3-actions/src/main/resources/ftl/fr/ird/t3/actions/io/input/AnalyzeInputSourceAction.ftl +++ b/t3-actions/src/main/resources/ftl/fr/ird/t3/actions/io/input/AnalyzeInputSourceAction.ftl @@ -23,7 +23,7 @@ Pilote d'acquisition de données : ${configuration.inputProvider.label} Source de données : ${configuration.inputFile.name} Utilisation des plans de cuves : ${configuration.useWells?string} -Type de marées : ${configuration.tripType.label} +Autoriser à créer des activités : ${configuration.canCreateVirtualActivity?string} Autoriser à créer des bateaux : ${configuration.canCreateVessel?string} <#if configuration.canCreateVessel> Créer des bateaux virtuels : ${configuration.createVirtualVessel?string} ===================================== t3-actions/src/main/resources/ftl/fr/ird/t3/actions/io/input/AnalyzeInputSourceAction_en.ftl ===================================== --- a/t3-actions/src/main/resources/ftl/fr/ird/t3/actions/io/input/AnalyzeInputSourceAction_en.ftl +++ b/t3-actions/src/main/resources/ftl/fr/ird/t3/actions/io/input/AnalyzeInputSourceAction_en.ftl @@ -23,7 +23,7 @@ Input Pilot: ${configuration.inputProvider.label} Input file: ${configuration.inputFile.name} Use wells: ${configuration.useWells?string} -Trip type: ${configuration.tripType.label} +Authorise to create activities: ${configuration.canCreateVirtualActivity?string} Authorise to create vessels: ${configuration.canCreateVessel?string} <#if configuration.canCreateVessel> Create virtual vessels: ${configuration.createVirtualVessel?string} ===================================== t3-actions/src/main/resources/ftl/fr/ird/t3/actions/io/input/ImportInputSourceAction.ftl ===================================== --- a/t3-actions/src/main/resources/ftl/fr/ird/t3/actions/io/input/ImportInputSourceAction.ftl +++ b/t3-actions/src/main/resources/ftl/fr/ird/t3/actions/io/input/ImportInputSourceAction.ftl @@ -23,7 +23,7 @@ Pilote d'acquisition de données : ${configuration.inputProvider.label} Source de données : ${configuration.inputFile.name} Utilisation des plans de cuves : ${configuration.useWells?string} -Type de marées : ${configuration.tripType.label} +Autoriser à créer des activités : ${configuration.canCreateVirtualActivity?string} Autoriser à créer des bateaux : ${configuration.canCreateVessel?string} <#if configuration.canCreateVessel> Créer des bateaux virtuels : ${configuration.createVirtualVessel?string} ===================================== t3-actions/src/main/resources/ftl/fr/ird/t3/actions/io/input/ImportInputSourceAction_en.ftl ===================================== --- a/t3-actions/src/main/resources/ftl/fr/ird/t3/actions/io/input/ImportInputSourceAction_en.ftl +++ b/t3-actions/src/main/resources/ftl/fr/ird/t3/actions/io/input/ImportInputSourceAction_en.ftl @@ -23,7 +23,7 @@ Input Pilot: ${configuration.inputProvider.label} Input file: ${configuration.inputFile.name} Use wells: ${configuration.useWells?string} -Trip type: ${configuration.tripType.label} +Authorise to create activities: ${configuration.canCreateVirtualActivity?string} Authorise to create vessels: ${configuration.canCreateVessel?string} <#if configuration.canCreateVessel> Create virtual vessels: ${configuration.createVirtualVessel?string} View it on GitLab: https://gitlab.com/ultreiaio/ird-t3/commit/05b939e34cba40b453473437071f6b37… --- View it on GitLab: https://gitlab.com/ultreiaio/ird-t3/commit/05b939e34cba40b453473437071f6b37… You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-t3][develop] use data 1.5
by Tony CHEMIT 19 Mar '18

19 Mar '18

Tony CHEMIT pushed to branch develop at ultreiaio / ird-t3 Commits: 86f396e1 by Tony CHEMIT at 2018-03-19T17:36:46Z use data 1.5 - - - - - 1 changed file: - pom.xml Changes: ===================================== pom.xml ===================================== --- a/pom.xml +++ b/pom.xml @@ -99,7 +99,7 @@ <projectId>ird-t3</projectId> <stageId>frirdt3</stageId> <applicationName>t3</applicationName> - <t3-data.version>1.5-SNAPSHOT</t3-data.version> + <t3-data.version>1.5</t3-data.version> <lib.version.java4all.i18n>4.0-alpha-11</lib.version.java4all.i18n> <env>dev</env> View it on GitLab: https://gitlab.com/ultreiaio/ird-t3/commit/86f396e1ac5069d4d72efc292de05b54… --- View it on GitLab: https://gitlab.com/ultreiaio/ird-t3/commit/86f396e1ac5069d4d72efc292de05b54… You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-t3][develop] [N0] Amélioration du calcul de RF1 pour les marées n'ayant pas de bons de…
by Tony CHEMIT 19 Mar '18

19 Mar '18

Tony CHEMIT pushed to branch develop at ultreiaio / ird-t3 Commits: 455478ec by Tony CHEMIT at 2018-03-19T17:27:41Z [N0] Amélioration du calcul de RF1 pour les marées n'ayant pas de bons de débarquement (closes #283) - - - - - 15 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/ComputeRF1Configuration.java - t3-actions/src/main/resources/ftl/fr/ird/t3/actions/data/level0/ComputeRF1Action.ftl - t3-actions/src/main/resources/ftl/fr/ird/t3/actions/data/level0/ComputeRF1Action_en.ftl - t3-web/src/main/java/fr/ird/t3/web/actions/T3ActionSupport.java - t3-web/src/main/java/fr/ird/t3/web/actions/data/level0/AbstractLevel0ConfigureAction.java - t3-web/src/main/java/fr/ird/t3/web/actions/data/level0/AbstractLevel0RunAction.java - t3-web/src/main/java/fr/ird/t3/web/actions/data/level0/ComputeRF1ConfigureAction.java - t3-web/src/main/java/fr/ird/t3/web/actions/data/level0/ComputeRF1RunAction.java - t3-web/src/main/java/fr/ird/t3/web/actions/data/level0/ComputeRF2ConfigureAction.java - t3-web/src/main/java/fr/ird/t3/web/actions/data/level0/ComputeRF2RunAction.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/data/level0/ComputeRF1Config.jsp - t3-web/src/main/webapp/WEB-INF/jsp/data/level0/ComputeRF1ConfigResume.jsp 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 @@ -273,7 +273,8 @@ public class ComputeRF1Action extends AbstractLevel0Action<ComputeRF1Configurati // means there is so species for this complete trip so rf1 = 1.0 rf1 = 1.0f; } else { - rf1 = computeRF1ForCompleteTrip(completeTrip, species); + boolean useLegacyBehaviourForTripWithoutLanding = getConfiguration().isUseLegacyBehaviourForTripWithoutLanding(); + rf1 = computeRF1ForCompleteTrip(useLegacyBehaviourForTripWithoutLanding, completeTrip, species); if (rf1 < minimumRate) { String warnMessage = l(locale, "t3.level0.computeRF1.warning.too.low.rf1", @@ -333,24 +334,29 @@ public class ComputeRF1Action extends AbstractLevel0Action<ComputeRF1Configurati decorate(completeTrip.getLandingTrip()), totalCatchWeightRF1, totalLandingWeight)); } - private float computeRF1ForCompleteTrip(Iterable<Trip> completeTrip, Collection<Species> speciesList) { + private float computeRF1ForCompleteTrip(boolean useLegacyBehaviourForTripWithoutLanding, CompleteTrip completeTrip, Collection<Species> speciesList) { // do the computation of rf1 for all trips of the complete trip float sumLanding = 0; float sumCatch = 0; float sumLocalMarket = 0; float sumLocalMarketDetailled = 0; + int tripWithoutLanding = 0; for (Trip trip : completeTrip) { String tripStr = decorate(trip, DecoratorService.WITH_ID); log.debug(String.format("Start count for trip %s", tripStr)); float elementaryLandingTotalWeight = trip.getElementaryLandingTotalWeight(speciesList); float elementaryCatchTotalWeight = trip.getElementaryCatchTotalWeight(speciesList); + boolean noLanding = elementaryLandingTotalWeight == 0; + if (noLanding) { + tripWithoutLanding++; + } if (elementaryCatchTotalWeight == 0 && elementaryLandingTotalWeight > 0) { // Add a warning, seems not possible to have no catches and landing : // the logBookAvailability flag should be setted to 0. addWarningMessage(l(locale, "t3.level0.computeRF1.warning.no.catches.but.some.landings", tripStr, elementaryLandingTotalWeight)); } - if (elementaryCatchTotalWeight > 0 && elementaryLandingTotalWeight == 0) { + if (elementaryCatchTotalWeight > 0 && noLanding) { // Special case : no landing: do not take account of the catch weight // in fact (see https://gitlab.com/ultreiaio/ird-t3/issues/283) we do not want to loose this catches //elementaryCatchTotalWeight = 0; @@ -372,7 +378,8 @@ public class ComputeRF1Action extends AbstractLevel0Action<ComputeRF1Configurati sumLocalMarketDetailled += localMarketTotalWeightDetailled; } float rf1 = 1; - if (sumCatch > 0) { + boolean computeRF1 = sumCatch > 0 && (useLegacyBehaviourForTripWithoutLanding || tripWithoutLanding == 0); + if (computeRF1) { rf1 = sumLanding / sumCatch; } log.debug(String.format("Computed rf1 %s", rf1)); ===================================== t3-actions/src/main/java/fr/ird/t3/actions/data/level0/ComputeRF1Configuration.java ===================================== --- a/t3-actions/src/main/java/fr/ird/t3/actions/data/level0/ComputeRF1Configuration.java +++ b/t3-actions/src/main/java/fr/ird/t3/actions/data/level0/ComputeRF1Configuration.java @@ -42,6 +42,8 @@ public class ComputeRF1Configuration extends AbstractLevel0Configuration { private float minimumRate; /** Maximum rf1 rate acceptable. */ private float maximumRate; + /** Flag to use or not legacy behaviour when you treat trips without landings. */ + private boolean useLegacyBehaviourForTripWithoutLanding; public ComputeRF1Configuration() { super(Level0Step.COMPUTE_RF1); @@ -62,4 +64,12 @@ public class ComputeRF1Configuration extends AbstractLevel0Configuration { public void setMaximumRate(float maximumRate) { this.maximumRate = maximumRate; } + + public boolean isUseLegacyBehaviourForTripWithoutLanding() { + return useLegacyBehaviourForTripWithoutLanding; + } + + public void setUseLegacyBehaviourForTripWithoutLanding(boolean useLegacyBehaviourForTripWithoutLanding) { + this.useLegacyBehaviourForTripWithoutLanding = useLegacyBehaviourForTripWithoutLanding; + } } ===================================== t3-actions/src/main/resources/ftl/fr/ird/t3/actions/data/level0/ComputeRF1Action.ftl ===================================== --- a/t3-actions/src/main/resources/ftl/fr/ird/t3/actions/data/level0/ComputeRF1Action.ftl +++ b/t3-actions/src/main/resources/ftl/fr/ird/t3/actions/data/level0/ComputeRF1Action.ftl @@ -33,6 +33,13 @@ Type de navire sélectionné : ${vesselSimpleType} Flotte sélectionnée : ${fleet} </#list> +Gestion des marées sans débarquement : +<#if !configuration.useLegacyBehaviourForTripWithoutLanding> +Attribuer RF1=1 sur les marées composées avec défaut de débarquement +<#else > +Calculer un RF1 sur les marées composées avec défaut de débarquement +</#if> + Indicateurs ----------- ===================================== t3-actions/src/main/resources/ftl/fr/ird/t3/actions/data/level0/ComputeRF1Action_en.ftl ===================================== --- a/t3-actions/src/main/resources/ftl/fr/ird/t3/actions/data/level0/ComputeRF1Action_en.ftl +++ b/t3-actions/src/main/resources/ftl/fr/ird/t3/actions/data/level0/ComputeRF1Action_en.ftl @@ -18,6 +18,7 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. #L% --> +<#--#TODO--> <#include "/ftl/header_en.ftl"/> Begin date: ${configuration.beginDate} @@ -33,6 +34,13 @@ Selected simple vessel type: ${vesselSimpleType} Selected fleet: ${fleet} </#list> +Trip without landing management: +<#if !configuration.useLegacyBehaviourForTripWithoutLanding> +Attribuer RF1=1 sur les marées composées avec défaut de débarquement +<#else > +Calculer un RF1 sur les marées composées avec défaut de débarquement +</#if> + Indicators ---------- ===================================== t3-web/src/main/java/fr/ird/t3/web/actions/T3ActionSupport.java ===================================== --- a/t3-web/src/main/java/fr/ird/t3/web/actions/T3ActionSupport.java +++ b/t3-web/src/main/java/fr/ird/t3/web/actions/T3ActionSupport.java @@ -328,4 +328,11 @@ public class T3ActionSupport extends ActionSupport implements T3TopiaPersistence "false", t("t3.label.data.level1.configuration.useOnlyRfTot")); } + + protected ImmutableMap<String, String> createUseLegacyBehaviourForTripWithoutLandingOrNot() { + return ImmutableMap.of( + "false", t("t3.label.level0.configuration.rf1.useNewBehaviourForTripWithoutLanding"), + "true", t("t3.label.level0.configuration.rf1.useLegacyBehaviourForTripWithoutLanding")); + } + } ===================================== t3-web/src/main/java/fr/ird/t3/web/actions/data/level0/AbstractLevel0ConfigureAction.java ===================================== --- a/t3-web/src/main/java/fr/ird/t3/web/actions/data/level0/AbstractLevel0ConfigureAction.java +++ b/t3-web/src/main/java/fr/ird/t3/web/actions/data/level0/AbstractLevel0ConfigureAction.java @@ -8,12 +8,12 @@ * 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% @@ -25,18 +25,16 @@ import fr.ird.t3.entities.data.Trip; import fr.ird.t3.entities.data.TripTopiaDao; import fr.ird.t3.entities.reference.Country; import fr.ird.t3.entities.reference.CountryTopiaDao; -import fr.ird.t3.entities.reference.Vessel; import fr.ird.t3.entities.reference.VesselSimpleType; import fr.ird.t3.entities.reference.VesselSimpleTypeTopiaDao; -import fr.ird.t3.entities.reference.VesselTopiaDao; import fr.ird.t3.entities.type.T3Date; import fr.ird.t3.services.ioc.InjectDAO; import fr.ird.t3.services.ioc.InjectDecoratedBeans; import fr.ird.t3.web.actions.AbstractConfigureAction; -import java.util.Map; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; -import org.nuiton.topia.persistence.TopiaException; + +import java.util.Map; /** * Abstract level 0 configuration action. @@ -48,34 +46,27 @@ public abstract class AbstractLevel0ConfigureAction<C extends AbstractLevel0Conf private static final long serialVersionUID = 1L; - /** Logger. */ - private static final Log log = - LogFactory.getLog(AbstractLevel0ConfigureAction.class); + private static final Log log = LogFactory.getLog(AbstractLevel0ConfigureAction.class); @InjectDAO(entityType = Trip.class) protected transient TripTopiaDao tripDAO; - - @InjectDAO(entityType = Vessel.class) - protected transient VesselTopiaDao vesselDAO; - - @InjectDAO(entityType = Country.class) - protected transient CountryTopiaDao countryDAO; - - @InjectDAO(entityType = VesselSimpleType.class) - protected transient VesselSimpleTypeTopiaDao vesselSimpleTypeDAO; - + // @InjectDAO(entityType = Vessel.class) +// private transient VesselTopiaDao vesselDAO; @InjectDecoratedBeans(beanType = VesselSimpleType.class) protected Map<String, String> vesselSimpleTypes; - @InjectDecoratedBeans(beanType = Country.class) protected Map<String, String> fleets; + @InjectDAO(entityType = Country.class) + private transient CountryTopiaDao countryDAO; + @InjectDAO(entityType = VesselSimpleType.class) + private transient VesselSimpleTypeTopiaDao vesselSimpleTypeDAO; - protected AbstractLevel0ConfigureAction(Class<C> configurationType) { + AbstractLevel0ConfigureAction(Class<C> configurationType) { super(configurationType); } @Override - public final void prepare() throws Exception { + public void prepare() throws Exception { // always invalidate configuration status setConfirm(false); @@ -132,9 +123,8 @@ public abstract class AbstractLevel0ConfigureAction<C extends AbstractLevel0Conf * Loads the default configuration. * * @param config the configuration to fill - * @throws TopiaException if any error while loading data from T3 database */ - protected void loadDefaultConfiguration(C config) throws TopiaException { + protected void loadDefaultConfiguration(C config) { T3Date minDate = tripDAO.getFirstLandingDate(false); config.setMinDate(minDate); ===================================== t3-web/src/main/java/fr/ird/t3/web/actions/data/level0/AbstractLevel0RunAction.java ===================================== --- a/t3-web/src/main/java/fr/ird/t3/web/actions/data/level0/AbstractLevel0RunAction.java +++ b/t3-web/src/main/java/fr/ird/t3/web/actions/data/level0/AbstractLevel0RunAction.java @@ -46,7 +46,7 @@ public abstract class AbstractLevel0RunAction<C extends AbstractLevel0Configurat @InjectDecoratedBeans(beanType = Country.class, filterById = true) private Map<String, String> fleets; - protected AbstractLevel0RunAction(Class<A> actionType) { + AbstractLevel0RunAction(Class<A> actionType) { super(actionType); } @@ -59,15 +59,8 @@ public abstract class AbstractLevel0RunAction<C extends AbstractLevel0Configurat } @Override - protected Map<String, Object> prepareResumeParameters(A action, - Exception error, - Date startDate, - Date endDate) { - Map<String, Object> map = super.prepareResumeParameters(action, - error, - startDate, - endDate - ); + protected Map<String, Object> prepareResumeParameters(A action, Exception error, Date startDate, Date endDate) { + Map<String, Object> map = super.prepareResumeParameters(action, error, startDate, endDate); map.put("vesselSimpleTypes", vesselSimpleTypes); map.put("fleets", fleets); return map; ===================================== t3-web/src/main/java/fr/ird/t3/web/actions/data/level0/ComputeRF1ConfigureAction.java ===================================== --- a/t3-web/src/main/java/fr/ird/t3/web/actions/data/level0/ComputeRF1ConfigureAction.java +++ b/t3-web/src/main/java/fr/ird/t3/web/actions/data/level0/ComputeRF1ConfigureAction.java @@ -8,12 +8,12 @@ * 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% @@ -22,7 +22,8 @@ package fr.ird.t3.web.actions.data.level0; import fr.ird.t3.actions.data.level0.ComputeRF1Action; import fr.ird.t3.actions.data.level0.ComputeRF1Configuration; -import org.nuiton.topia.persistence.TopiaException; + +import java.util.Map; /** * To configure the Compute Raising factor 1 action. @@ -35,15 +36,27 @@ public class ComputeRF1ConfigureAction extends AbstractLevel0ConfigureAction<Com private static final long serialVersionUID = 1L; + private Map<String, String> useLegacyBehaviourForTripWithoutLandingOrNot; + public ComputeRF1ConfigureAction() { super(ComputeRF1Configuration.class); } @Override - protected void loadDefaultConfiguration(ComputeRF1Configuration config) throws TopiaException { + public void prepare() throws Exception { + useLegacyBehaviourForTripWithoutLandingOrNot = createUseLegacyBehaviourForTripWithoutLandingOrNot(); + super.prepare(); + } + @Override + protected void loadDefaultConfiguration(ComputeRF1Configuration config) { super.loadDefaultConfiguration(config); config.setMinimumRate(getApplicationConfig().getRf1MinimumRate()); config.setMaximumRate(getApplicationConfig().getRf1MaximumRate()); } + + @SuppressWarnings("unused") + public Map<String, String> getUseLegacyBehaviourForTripWithoutLandingOrNot() { + return useLegacyBehaviourForTripWithoutLandingOrNot; + } } ===================================== t3-web/src/main/java/fr/ird/t3/web/actions/data/level0/ComputeRF1RunAction.java ===================================== --- a/t3-web/src/main/java/fr/ird/t3/web/actions/data/level0/ComputeRF1RunAction.java +++ b/t3-web/src/main/java/fr/ird/t3/web/actions/data/level0/ComputeRF1RunAction.java @@ -8,12 +8,12 @@ * 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% @@ -23,6 +23,8 @@ package fr.ird.t3.web.actions.data.level0; import fr.ird.t3.actions.data.level0.ComputeRF1Action; import fr.ird.t3.actions.data.level0.ComputeRF1Configuration; +import java.util.Map; + /** * Compute Raising factor 1 for some selected vessels. * @@ -34,7 +36,21 @@ public class ComputeRF1RunAction extends AbstractLevel0RunAction<ComputeRF1Confi private static final long serialVersionUID = 1L; + private Map<String, String> useLegacyBehaviourForTripWithoutLandingOrNot; + public ComputeRF1RunAction() { super(ComputeRF1Action.class); } + + + @Override + public void prepare() throws Exception { + useLegacyBehaviourForTripWithoutLandingOrNot = createUseLegacyBehaviourForTripWithoutLandingOrNot(); + super.prepare(); + } + + @SuppressWarnings("unused") + public Map<String, String> getUseLegacyBehaviourForTripWithoutLandingOrNot() { + return useLegacyBehaviourForTripWithoutLandingOrNot; + } } ===================================== t3-web/src/main/java/fr/ird/t3/web/actions/data/level0/ComputeRF2ConfigureAction.java ===================================== --- a/t3-web/src/main/java/fr/ird/t3/web/actions/data/level0/ComputeRF2ConfigureAction.java +++ b/t3-web/src/main/java/fr/ird/t3/web/actions/data/level0/ComputeRF2ConfigureAction.java @@ -8,12 +8,12 @@ * 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% @@ -26,8 +26,8 @@ import fr.ird.t3.entities.reference.Harbour; import fr.ird.t3.entities.reference.HarbourTopiaDao; import fr.ird.t3.services.ioc.InjectDAO; import fr.ird.t3.services.ioc.InjectDecoratedBeans; + import java.util.Map; -import org.nuiton.topia.persistence.TopiaException; /** * To configure the Compute Raising factor 1 action. @@ -41,23 +41,23 @@ public class ComputeRF2ConfigureAction extends AbstractLevel0ConfigureAction<Com private static final long serialVersionUID = 1L; @InjectDAO(entityType = Harbour.class) - protected transient HarbourTopiaDao harbourDAO; - + private transient HarbourTopiaDao harbourDAO; @InjectDecoratedBeans(beanType = Harbour.class) - protected Map<String, String> landingHarbours; + private Map<String, String> landingHarbours; public ComputeRF2ConfigureAction() { super(ComputeRF2Configuration.class); } @Override - protected void loadDefaultConfiguration(ComputeRF2Configuration config) throws TopiaException { + protected void loadDefaultConfiguration(ComputeRF2Configuration config) { super.loadDefaultConfiguration(config); config.setLandingHarbours(sortToList(harbourDAO.findAllUsedInLandingTrip(false))); } + @SuppressWarnings("unused") public Map<String, String> getLandingHarbours() { return landingHarbours; } ===================================== t3-web/src/main/java/fr/ird/t3/web/actions/data/level0/ComputeRF2RunAction.java ===================================== --- a/t3-web/src/main/java/fr/ird/t3/web/actions/data/level0/ComputeRF2RunAction.java +++ b/t3-web/src/main/java/fr/ird/t3/web/actions/data/level0/ComputeRF2RunAction.java @@ -8,12 +8,12 @@ * 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% @@ -40,26 +40,20 @@ public class ComputeRF2RunAction extends AbstractLevel0RunAction<ComputeRF2Confi private static final long serialVersionUID = 1L; @InjectDecoratedBeans(beanType = Harbour.class, filterById = true) - protected Map<String, String> landingHarbours; + private Map<String, String> landingHarbours; public ComputeRF2RunAction() { super(ComputeRF2Action.class); } + @SuppressWarnings("unused") public Map<String, String> getLandingHarbours() { return landingHarbours; } @Override - protected Map<String, Object> prepareResumeParameters(ComputeRF2Action action, - Exception error, - Date startDate, - Date endDate) { - Map<String, Object> map = super.prepareResumeParameters(action, - error, - startDate, - endDate - ); + protected Map<String, Object> prepareResumeParameters(ComputeRF2Action action, Exception error, Date startDate, Date endDate) { + Map<String, Object> map = super.prepareResumeParameters(action, error, startDate, endDate); map.put("landingHarbours", landingHarbours); return map; } ===================================== 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 @@ -87,6 +87,7 @@ t3.common.oceanFilter=Filter on oceans t3.common.reimported=réimporté t3.common.replacementVessel=Replacement vessel t3.common.rf0=Raising factor 0 +t3.common.rf1.useLegacyBehaviourForTripWithoutLandingOrNot=Trip without landing management t3.common.rfMinus10Max=Rf Minus 10 maximum t3.common.rfMinus10MinNumber=Minimum fish measured mandatory for -10kg t3.common.rfPlus10Max=Rf Plus 10 maximum @@ -286,6 +287,8 @@ t3.label.importData.config.resume=Configuration resume of data import t3.label.info.changePassword=To change password, fill the both password fields t3.label.inprogress=in progress... t3.label.language=Langue +t3.label.level0.configuration.rf1.useLegacyBehaviourForTripWithoutLanding=Calculer un RF1 sur les marées composées avec défaut de débarquement +t3.label.level0.configuration.rf1.useNewBehaviourForTripWithoutLanding=Attribuer RF1\=1 sur les marées composées avec défaut de débarquement t3.label.locale.english=English t3.label.locale.french=French t3.label.locale.spanish=spanish ===================================== 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 @@ -87,6 +87,7 @@ t3.common.oceanFilter=Filter les océans t3.common.reimported=réimporté t3.common.replacementVessel=Navire de remplacement t3.common.rf0=Raising factor 0 +t3.common.rf1.useLegacyBehaviourForTripWithoutLandingOrNot=Gestion des marées sans débarquement t3.common.rfMinus10Max=Rf Minus 10 maximum t3.common.rfMinus10MinNumber=Seuil minimum d'individus mesurés dans la catégorie -10kg t3.common.rfPlus10Max=Rf Plus 10 maximum @@ -286,6 +287,8 @@ t3.label.importData.config.resume=Résumé de la configuration d'import de donn 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.level0.configuration.rf1.useLegacyBehaviourForTripWithoutLanding=Calculer un RF1 sur les marées composées avec défaut de débarquement +t3.label.level0.configuration.rf1.useNewBehaviourForTripWithoutLanding=Attribuer RF1\=1 sur les marées composées avec défaut de débarquement t3.label.locale.english=Anglais t3.label.locale.french=Français t3.label.locale.spanish=Espagnol ===================================== t3-web/src/main/webapp/WEB-INF/jsp/data/level0/ComputeRF1Config.jsp ===================================== --- a/t3-web/src/main/webapp/WEB-INF/jsp/data/level0/ComputeRF1Config.jsp +++ b/t3-web/src/main/webapp/WEB-INF/jsp/data/level0/ComputeRF1Config.jsp @@ -27,16 +27,17 @@ .ui-datepicker-calendar { display: none; } + .wwlbl { width: 500px; } </style> <title><s:text name="t3.label.data.treatment.level0"/> : <s:text - name="t3.label.data.level0.computeRF1"/></title> + name="t3.label.data.level0.computeRF1"/></title> <h2><s:text name="t3.label.data.treatment.level0"/> : <s:text - name="t3.label.data.level0.computeRF1"/></h2> + name="t3.label.data.level0.computeRF1"/></h2> <s:if test="confirm"> @@ -62,7 +63,7 @@ <s:text name="t3.label.configure"/> </legend> - <%-- begin date --%> + <%-- begin date --%> <sj:datepicker key="configuration.beginDate" requiredLabel="true" label='%{getText("t3.common.beginDate")}' appendText=" (mm-yyyy)"/> @@ -89,6 +90,9 @@ label='%{getText("t3.common.fleetCountry")}' requiredLabel="true" template="mycheckboxlist"/> + <s:radio key="configuration.useLegacyBehaviourForTripWithoutLanding" requiredLabel="true" + list="useLegacyBehaviourForTripWithoutLandingOrNot" + label='%{getText("t3.common.rf1.useLegacyBehaviourForTripWithoutLandingOrNot")}'/> </fieldset> <br/> @@ -100,13 +104,13 @@ <script type="text/javascript"> - jQuery(document).ready(function () { + jQuery(document).ready(function () { - $.prepareMonthPickers( - { - minDateAsMonth:'<s:property value="configuration.minDate"/>', - maxDateAsMonth:'<s:property value="configuration.maxDate"/>' - }); + $.prepareMonthPickers( + { + minDateAsMonth: '<s:property value="configuration.minDate"/>', + maxDateAsMonth: '<s:property value="configuration.maxDate"/>' + }); - }); + }); </script> ===================================== t3-web/src/main/webapp/WEB-INF/jsp/data/level0/ComputeRF1ConfigResume.jsp ===================================== --- a/t3-web/src/main/webapp/WEB-INF/jsp/data/level0/ComputeRF1ConfigResume.jsp +++ b/t3-web/src/main/webapp/WEB-INF/jsp/data/level0/ComputeRF1ConfigResume.jsp @@ -51,4 +51,8 @@ list="fleets" template="mycheckboxlist" label='%{getText("t3.common.fleetCountry")}'/> + <s:radio key="configuration.useLegacyBehaviourForTripWithoutLanding" disabled="true" + list="useLegacyBehaviourForTripWithoutLandingOrNot" + label='%{getText("t3.common.rf1.useLegacyBehaviourForTripWithoutLandingOrNot")}'/> + </fieldset> View it on GitLab: https://gitlab.com/ultreiaio/ird-t3/commit/455478ec65e2c7d4e143fe43cc67ca0d… --- View it on GitLab: https://gitlab.com/ultreiaio/ird-t3/commit/455478ec65e2c7d4e143fe43cc67ca0d… You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-t3][develop] correction sur les requetes du niveau 2 et 3
by Tony CHEMIT 19 Mar '18

19 Mar '18

Tony CHEMIT pushed to branch develop at ultreiaio / ird-t3 Commits: 9b357a07 by Tony CHEMIT at 2018-03-19T15:42:43Z correction sur les requetes du niveau 2 et 3 - - - - - 4 changed files: - t3-actions/src/main/java/fr/ird/t3/actions/data/level2/Level2Action.java - t3-domain/src/main/java/fr/ird/t3/entities/data/AbstractActivityTopiaDao.java - t3-web/src/main/java/fr/ird/t3/web/actions/data/level2/Level2RunAction.java - t3-web/src/main/java/fr/ird/t3/web/actions/data/level3/Level3RunAction.java Changes: ===================================== t3-actions/src/main/java/fr/ird/t3/actions/data/level2/Level2Action.java ===================================== --- a/t3-actions/src/main/java/fr/ird/t3/actions/data/level2/Level2Action.java +++ b/t3-actions/src/main/java/fr/ird/t3/actions/data/level2/Level2Action.java @@ -99,7 +99,7 @@ public class Level2Action extends T3Action<Level2Configuration> { * * @since 1.3 */ - WeightCompositionAggregateModel inputCatchModelForAllSpecies; + private WeightCompositionAggregateModel inputCatchModelForAllSpecies; /** * Output Weight composition * (based on {@link CorrectedElementaryCatch#getCorrectedCatchWeight()}) for all @@ -107,13 +107,13 @@ public class Level2Action extends T3Action<Level2Configuration> { * * @since 1.3 */ - WeightCompositionAggregateModel outputCatchModelForAllSpecies; + private WeightCompositionAggregateModel outputCatchModelForAllSpecies; /** * For each stratum gets his result. * * @since 1.3 */ - Collection<L2StratumResult> stratumsResult; + private Collection<L2StratumResult> stratumsResult; @InjectDAO(entityType = Activity.class) private ActivityTopiaDao activityDAO; @InjectDAO(entityType = WeightCategoryTreatment.class) @@ -126,9 +126,9 @@ public class Level2Action extends T3Action<Level2Configuration> { @InjectFromDAO(entityType = SchoolType.class, method = "findAllForStratum") private Set<SchoolType> schoolTypes; @InjectEntitiesById(entityType = Country.class) - private Set<Country> catchFleets; + private Collection<Country> catchFleets; @InjectEntitiesById(entityType = Ocean.class) - private Set<Ocean> oceans; + private Collection<Ocean> oceans; @InjectEntitiesById(entityType = Species.class, path = "configuration.speciesIds") private Collection<Species> species; @InjectEntitiesById(entityType = Country.class) ===================================== t3-domain/src/main/java/fr/ird/t3/entities/data/AbstractActivityTopiaDao.java ===================================== --- a/t3-domain/src/main/java/fr/ird/t3/entities/data/AbstractActivityTopiaDao.java +++ b/t3-domain/src/main/java/fr/ird/t3/entities/data/AbstractActivityTopiaDao.java @@ -267,17 +267,19 @@ public class AbstractActivityTopiaDao<E extends Activity> extends GeneratedActiv schoolTypeParameters.append(", ?"); } PreparedStatement ps = connection.prepareStatement( - "SELECT a.topiaid FROM trip t, activity a, " + zoneTableName + " z " + - "WHERE a.trip = t.topiaId " + - "AND t." + Trip.PROPERTY_TRIP_TYPE + " IN (0, 2)" + + "SELECT a.topiaid FROM trip t, route r, activity a, " + zoneTableName + " z " + + "WHERE " + + "a.route = r.topiaId " + + "AND r.trip = t.topiaId " + + "AND t." + Trip.PROPERTY_TRIP_TYPE + " IN ('STANDARD', 'LOGBOOKMISSING')" + "AND t." + Trip.PROPERTY_COMPLETION_STATUS + " IS NOT NULL " + "AND t." + Trip.PROPERTY_COMPLETION_STATUS + " > 0 " + "AND ST_WITHIN(a.the_geom, z.the_geom) " + "AND z.topiaid = ? " + "AND a.expertflag != 0 " + "AND a.schooltype IN (" + schoolTypeParameters.substring(2) + ")" + - "AND a.date::date >= ? " + - "AND a.date::date <= ? " + + "AND r.date::date >= ? " + + "AND r.date::date <= ? " + "AND (SELECT COUNT(*) FROM CorrectedElementaryCatch c WHERE c.activity = a.topiaid) > 0" ); @@ -330,19 +332,20 @@ public class AbstractActivityTopiaDao<E extends Activity> extends GeneratedActiv schoolTypeParameters.append(", ?"); } PreparedStatement ps = connection.prepareStatement( - "SELECT a.topiaid FROM trip t, activity a, " + + "SELECT a.topiaid FROM trip t, route r, activity a, " + zoneTableName + " z WHERE " + - "a.trip = t.topiaId " + - "AND t." + Trip.PROPERTY_TRIP_TYPE + " IN (0, 2)" + + "r.trip = t.topiaId " + + "AND a.route = r.topiaId " + + "AND t." + Trip.PROPERTY_TRIP_TYPE + " IN ('STANDARD', 'LOGBOOKMISSING')" + "AND t." + Trip.PROPERTY_COMPLETION_STATUS + " IS NOT NULL " + "AND t." + Trip.PROPERTY_COMPLETION_STATUS + " > 0 " + "AND ST_INTERSECTS(a.the_geom, z.the_geom) " + "AND NOT ST_WITHIN(a.the_geom, z.the_geom) " + "AND z.topiaid = ? " + "AND a.expertflag != 0 " + - "AND a.schooltype = IN (" + schoolTypeParameters.substring(2) + ") " + - "AND a.date::date >= ? " + - "AND a.date::date <= ? " + + "AND a.schooltype IN (" + schoolTypeParameters.substring(2) + ") " + + "AND r.date::date >= ? " + + "AND r.date::date <= ? " + "AND (SELECT COUNT(*) FROM CorrectedElementaryCatch c WHERE c.activity = a.topiaid) > 0"); int index = 0; @@ -394,17 +397,18 @@ public class AbstractActivityTopiaDao<E extends Activity> extends GeneratedActiv schoolTypeParameters.append(", ?"); } PreparedStatement ps = connection.prepareStatement( - "SELECT a.topiaid FROM trip t, activity a, " + + "SELECT a.topiaid FROM trip t, route r, activity a, " + zoneTableName + " z WHERE " + - "a.trip = t.topiaId " + - "AND (t." + Trip.PROPERTY_TRIP_TYPE + " = 1 OR (" + + "r.trip = t.topiaId " + + "AND a.route = r.topiaId " + + "AND (t." + Trip.PROPERTY_TRIP_TYPE + " = 'SAMPLEONLY' OR (" + "t." + Trip.PROPERTY_COMPLETION_STATUS + " IS NOT NULL " + "AND t." + Trip.PROPERTY_COMPLETION_STATUS + " > 0 ))" + "AND ST_WITHIN(a.the_geom, z.the_geom) " + "AND z.topiaid = ? " + - "AND a.schooltype = IN (" + schoolTypeParameters.substring(2) + ")" + - "AND a.date::date >= ? " + - "AND a.date::date <= ? " + + "AND a.schooltype IN (" + schoolTypeParameters.substring(2) + ")" + + "AND r.date::date >= ? " + + "AND r.date::date <= ? " + "AND (SELECT COUNT(*) FROM SetSpeciesCatWeight c WHERE c.activity = a.topiaid) > 0"); int index = 0; ps.setString(++index, zoneId); @@ -446,16 +450,17 @@ public class AbstractActivityTopiaDao<E extends Activity> extends GeneratedActiv @Override public PreparedStatement prepareQuery(Connection connection) throws SQLException { PreparedStatement ps = connection.prepareStatement( - "SELECT a.topiaid FROM trip t, activity a, " + + "SELECT a.topiaid FROM trip t, route r, activity a, " + zoneTableName + " z WHERE " + - "a.trip = t.topiaId " + - "AND (t." + Trip.PROPERTY_TRIP_TYPE + " = 1 OR (" + + "r.trip = t.topiaId " + + "AND a.route = r.topiaId " + + "AND (t." + Trip.PROPERTY_TRIP_TYPE + " = 'SAMPLEONLY' OR (" + "t." + Trip.PROPERTY_COMPLETION_STATUS + " IS NOT NULL " + "AND t." + Trip.PROPERTY_COMPLETION_STATUS + " > 0 ))" + "AND ST_WITHIN(a.the_geom, z.the_geom) " + "AND z.topiaid = ? " + - "AND a.date::date >= ? " + - "AND a.date::date <= ? " + + "AND r.date::date >= ? " + + "AND r.date::date <= ? " + "AND (SELECT COUNT(*) FROM SetSpeciesCatWeight c WHERE c.activity = a.topiaid) > 0" ); ps.setString(1, zoneId); ===================================== t3-web/src/main/java/fr/ird/t3/web/actions/data/level2/Level2RunAction.java ===================================== --- a/t3-web/src/main/java/fr/ird/t3/web/actions/data/level2/Level2RunAction.java +++ b/t3-web/src/main/java/fr/ird/t3/web/actions/data/level2/Level2RunAction.java @@ -31,6 +31,7 @@ import fr.ird.t3.entities.reference.zone.ZoneVersion; import fr.ird.t3.services.ioc.InjectDecoratedBeans; import fr.ird.t3.web.actions.AbstractRunAction; +import java.util.Arrays; import java.util.Date; import java.util.Map; @@ -59,7 +60,6 @@ public class Level2RunAction extends AbstractRunAction<Level2Configuration, Leve private Map<String, String> sampleFleets; @InjectDecoratedBeans(beanType = Country.class, filterById = true) private Map<String, String> sampleFlags; - @InjectDecoratedBeans(beanType = SchoolTypeIndeterminate.class) private Map<String, String> schoolTypeIndeterminate; private Map<String, String> useSamplesOrNot; private Map<String, String> useWeightCategoriesInStratumOrNot; @@ -127,6 +127,7 @@ public class Level2RunAction extends AbstractRunAction<Level2Configuration, Leve public void prepare() throws Exception { useSamplesOrNot = createLevel2UseSamplesOrNotMap(); useWeightCategoriesInStratumOrNot = createUseWeightCategoriesInStratumOrNot(); + schoolTypeIndeterminate = sortAndDecorateIdAbles(Arrays.asList(SchoolTypeIndeterminate.values())); super.prepare(); } ===================================== t3-web/src/main/java/fr/ird/t3/web/actions/data/level3/Level3RunAction.java ===================================== --- a/t3-web/src/main/java/fr/ird/t3/web/actions/data/level3/Level3RunAction.java +++ b/t3-web/src/main/java/fr/ird/t3/web/actions/data/level3/Level3RunAction.java @@ -33,6 +33,7 @@ import fr.ird.t3.entities.reference.zone.ZoneVersion; import fr.ird.t3.services.ioc.InjectDecoratedBeans; import fr.ird.t3.web.actions.AbstractRunAction; +import java.util.Arrays; import java.util.Date; import java.util.Map; import java.util.TreeMap; @@ -69,7 +70,6 @@ public class Level3RunAction extends AbstractRunAction<Level3Configuration, Leve /** all sample flags. */ @InjectDecoratedBeans(beanType = Country.class, filterById = true) private Map<String, String> sampleFlags; - @InjectDecoratedBeans(beanType = SchoolTypeIndeterminate.class) private Map<String, String> schoolTypeIndeterminate; private Map<String, String> useSamplesOrNot; private Map<String, String> useWeightCategoriesOrNot; @@ -159,6 +159,7 @@ public class Level3RunAction extends AbstractRunAction<Level3Configuration, Leve useSamplesOrNot = createLevel3UseSamplesOrNotMap(); useWeightCategoriesOrNot = createLevel3UseWeightCategoriesOrNotMap(); useWeightCategoriesInStratumOrNot = createUseWeightCategoriesInStratumOrNot(); + schoolTypeIndeterminate = sortAndDecorateIdAbles(Arrays.asList(SchoolTypeIndeterminate.values())); super.prepare(); // on level 3, can't treat Indeterminate school type schoolTypeIndeterminate.remove(SchoolTypeTopiaDao.SCHOOL_TYPE_INDETERMINATE_ID); View it on GitLab: https://gitlab.com/ultreiaio/ird-t3/commit/9b357a079348524012c3360a374d45f5… --- View it on GitLab: https://gitlab.com/ultreiaio/ird-t3/commit/9b357a079348524012c3360a374d45f5… You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-t3][develop] 2 commits: fix migration script names
by Tony CHEMIT 19 Mar '18

19 Mar '18

Tony CHEMIT pushed to branch develop at ultreiaio / ird-t3 Commits: b4da1f66 by Tony CHEMIT at 2018-03-19T14:38:33Z fix migration script names - - - - - c3708ae6 by Tony CHEMIT at 2018-03-19T14:55:46Z Problème d'UI en cas de traitement N2 (et N3) avec période de 1 mois (closes #280) - - - - - 8 changed files: - t3-domain/src/main/java/fr/ird/t3/entities/type/T3Date.java - t3-domain/src/main/resources/db/migration/V_2_3_03-spatialize-ocean.sql → t3-domain/src/main/resources/db/migration/V2_3_03-spatialize-ocean.sql - t3-domain/src/main/resources/db/migration/V_2_3_04-add-WeightCategoryLogbook-unknown.sql → t3-domain/src/main/resources/db/migration/V2_3_04-add-WeightCategoryLogbook-unknown.sql - t3-domain/src/main/resources/db/migration/V_2_3_05-spatialize-harbour.sql → t3-domain/src/main/resources/db/migration/V2_3_05-spatialize-harbour.sql - t3-domain/src/main/resources/db/migration/V_2_3_05_change-Activity-stratum-type.sql → t3-domain/src/main/resources/db/migration/V2_3_05_change-Activity-stratum-type.sql - t3-domain/src/main/resources/db/migration/V_2_4_01_delete_idx.sql → t3-domain/src/main/resources/db/migration/V2_4_01_delete_idx.sql - t3-domain/src/main/resources/db/migration/V_2_4_02-spatialize-ocean.sql → t3-domain/src/main/resources/db/migration/V2_4_02-spatialize-ocean.sql - t3-domain/src/main/resources/db/migration/V_2_4_03-review-referential.sql → t3-domain/src/main/resources/db/migration/V2_4_03-review-referential.sql Changes: ===================================== t3-domain/src/main/java/fr/ird/t3/entities/type/T3Date.java ===================================== --- a/t3-domain/src/main/java/fr/ird/t3/entities/type/T3Date.java +++ b/t3-domain/src/main/java/fr/ird/t3/entities/type/T3Date.java @@ -20,14 +20,13 @@ */ package fr.ird.t3.entities.type; -import com.google.common.base.Preconditions; import com.google.common.collect.Sets; + import java.io.Serializable; import java.util.Calendar; import java.util.Date; import java.util.Set; - import static org.nuiton.i18n.I18n.n; public class T3Date implements Comparable<T3Date>, Serializable { @@ -152,15 +151,15 @@ public class T3Date implements Comparable<T3Date>, Serializable { } public void fromT3Date(T3Date date) { - month = date.getMonth(); year = date.getYear(); } public T3Date incrementsMonths(int nbMonth) { - Preconditions.checkArgument( - nbMonth > 0, - "nbMonth must be a strict positif integer but was : " + nbMonth); + if (nbMonth==0) { + // ok just return this date + return this; + } int nmonth = getMonth(); int nyear = getYear(); int nbMonthCount = nbMonth; @@ -176,9 +175,9 @@ public class T3Date implements Comparable<T3Date>, Serializable { } public T3Date decrementsMonths(int nbMonth) { - Preconditions.checkArgument( - nbMonth > 0, - "nbMonth must be a strict positif integer but was : " + nbMonth); + if (nbMonth == 0) { + return this; + } int nmonth = getMonth(); int nyear = getYear(); @@ -201,7 +200,7 @@ public class T3Date implements Comparable<T3Date>, Serializable { } @Override - public int compareTo(T3Date date) { + public int compareTo(@SuppressWarnings("NullableProblems") T3Date date) { int result = year - date.year; if (result != 0) { return result; ===================================== t3-domain/src/main/resources/db/migration/V_2_3_03-spatialize-ocean.sql → t3-domain/src/main/resources/db/migration/V2_3_03-spatialize-ocean.sql ===================================== ===================================== t3-domain/src/main/resources/db/migration/V_2_3_04-add-WeightCategoryLogbook-unknown.sql → t3-domain/src/main/resources/db/migration/V2_3_04-add-WeightCategoryLogbook-unknown.sql ===================================== ===================================== t3-domain/src/main/resources/db/migration/V_2_3_05-spatialize-harbour.sql → t3-domain/src/main/resources/db/migration/V2_3_05-spatialize-harbour.sql ===================================== ===================================== t3-domain/src/main/resources/db/migration/V_2_3_05_change-Activity-stratum-type.sql → t3-domain/src/main/resources/db/migration/V2_3_05_change-Activity-stratum-type.sql ===================================== ===================================== t3-domain/src/main/resources/db/migration/V_2_4_01_delete_idx.sql → t3-domain/src/main/resources/db/migration/V2_4_01_delete_idx.sql ===================================== ===================================== t3-domain/src/main/resources/db/migration/V_2_4_02-spatialize-ocean.sql → t3-domain/src/main/resources/db/migration/V2_4_02-spatialize-ocean.sql ===================================== ===================================== t3-domain/src/main/resources/db/migration/V_2_4_03-review-referential.sql → t3-domain/src/main/resources/db/migration/V2_4_03-review-referential.sql ===================================== View it on GitLab: https://gitlab.com/ultreiaio/ird-t3/compare/8d2bcfb750646023f3dddff7cf63c83… --- View it on GitLab: https://gitlab.com/ultreiaio/ird-t3/compare/8d2bcfb750646023f3dddff7cf63c83… You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-t3][develop] Revoir les traductions - ajout des templates (See #172)
by Tony CHEMIT 19 Mar '18

19 Mar '18

Tony CHEMIT pushed to branch develop at ultreiaio / ird-t3 Commits: 8d2bcfb7 by Tony CHEMIT at 2018-03-19T14:19:15Z Revoir les traductions - ajout des templates (See #172) - - - - - 2 changed files: - pom.xml - t3-installer/pom.xml Changes: ===================================== pom.xml ===================================== --- a/pom.xml +++ b/pom.xml @@ -100,6 +100,7 @@ <stageId>frirdt3</stageId> <applicationName>t3</applicationName> <t3-data.version>1.5-SNAPSHOT</t3-data.version> + <lib.version.java4all.i18n>4.0-alpha-11</lib.version.java4all.i18n> <env>dev</env> <skipITs>true</skipITs> ===================================== t3-installer/pom.xml ===================================== --- a/t3-installer/pom.xml +++ b/t3-installer/pom.xml @@ -47,6 +47,13 @@ </dependency> <dependency> + <groupId>${project.groupId}</groupId> + <artifactId>t3-actions</artifactId> + <version>${project.version}</version> + <scope>runtime</scope> + </dependency> + + <dependency> <groupId>io.ultreia.java4all.config</groupId> <artifactId>nuiton-config</artifactId> </dependency> @@ -91,6 +98,50 @@ </dependencies> + <build> + <pluginManagement> + <plugins> + + <plugin> + <groupId>io.ultreia.java4all.i18n</groupId> + <artifactId>i18n-maven-plugin</artifactId> + <executions> + <execution> + <id>default-bundle</id> + <goals> + <goal>bundle</goal> + </goals> + <configuration> + <templateExtension>ftl</templateExtension> + <templateList> + <template>classpath:fr/ird/t3/actions/admin/DeleteTripAction</template> + <template>classpath:fr/ird/t3/actions/data/level0/ComputeRF1Action</template> + <template>classpath:fr/ird/t3/actions/data/level0/ComputeRF2Action</template> + <template>classpath:fr/ird/t3/actions/data/level0/ComputeSetDurationAndPositiveSetCountAction</template> + <template>classpath:fr/ird/t3/actions/data/level0/ComputeTripEffortsAction</template> + <template>classpath:fr/ird/t3/actions/data/level0/ComputeWellPlanWeightCategoriesProportionsAction</template> + <template>classpath:fr/ird/t3/actions/data/level0/ConvertCatchesWeightCategoriesAction</template> + <template>classpath:fr/ird/t3/actions/data/level1/ComputeWeightOfCategoriesForSetAction</template> + <template>classpath:fr/ird/t3/actions/data/level1/ConvertSampleSetSpeciesFrequencyToWeightAction</template> + <template>classpath:fr/ird/t3/actions/data/level1/ConvertSetSpeciesFrequencyToWeightAction</template> + <template>classpath:fr/ird/t3/actions/data/level1/ExtrapolateSampleCountedAndMeasuredAction</template> + <template>classpath:fr/ird/t3/actions/data/level1/ExtrapolateSampleWeightToSetAction</template> + <template>classpath:fr/ird/t3/actions/data/level1/RedistributeSampleNumberToSetAction</template> + <template>classpath:fr/ird/t3/actions/data/level1/StandardizeSampleMeasuresAction</template> + <template>classpath:fr/ird/t3/actions/data/level2/Level2Action</template> + <template>classpath:fr/ird/t3/actions/data/level3/Level3Action</template> + <template>classpath:fr/ird/t3/actions/io/input/AnalyzeInputSourceAction</template> + <template>classpath:fr/ird/t3/actions/io/input/ImportInputSourceAction</template> + <template>classpath:fr/ird/t3/actions/io/output/ExportAction</template> + </templateList> + </configuration> + </execution> + </executions> + </plugin> + + </plugins> + </pluginManagement> + </build> <profiles> <profile> View it on GitLab: https://gitlab.com/ultreiaio/ird-t3/commit/8d2bcfb750646023f3dddff7cf63c836… --- View it on GitLab: https://gitlab.com/ultreiaio/ird-t3/commit/8d2bcfb750646023f3dddff7cf63c836… You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-t3][develop] 2 commits: Internationalisation des tables (Closes #294)
by Tony CHEMIT 19 Mar '18

19 Mar '18

Tony CHEMIT pushed to branch develop at ultreiaio / ird-t3 Commits: 1c4fdd94 by Tony CHEMIT at 2018-03-19T11:48:46Z Internationalisation des tables (Closes #294) - - - - - 047eab38 by Tony CHEMIT at 2018-03-19T11:49:21Z use last pom - - - - - 10 changed files: - pom.xml - t3-domain/src/main/java/fr/ird/t3/services/migration/T3MigrationCallbackV2_4.java - + t3-domain/src/main/resources/db/migration/V_2_4_03-review-referential.sql - t3-domain/src/main/xmi/t3-persistence.zargo - t3-domain/src/test/resources/db/LengthWeightConversionHelperTest.sql - t3-domain/src/test/resources/db/WeightCategoryLogBookConverterProviderTest.sql - t3-domain/src/test/resources/db/WeightCategoryTreatmentImplTest.sql - t3-input-avdthv33/src/main/java/fr/ird/t3/io/input/avdth/v33/T3AccessEntityMetaProviderAvdth33.java - t3-input-avdthv35/src/main/java/fr/ird/t3/io/input/avdth/v35/T3AccessEntityMetaProviderAvdth35.java - t3-input-avdthv36/src/main/java/fr/ird/t3/io/input/avdth/v36/T3AccessEntityMetaProviderAvdth36.java Changes: ===================================== pom.xml ===================================== --- a/pom.xml +++ b/pom.xml @@ -23,7 +23,7 @@ <parent> <groupId>io.ultreia.maven</groupId> <artifactId>pom</artifactId> - <version>2018.24</version> + <version>2018.25</version> </parent> <groupId>fr.ird.t3</groupId> @@ -99,7 +99,7 @@ <projectId>ird-t3</projectId> <stageId>frirdt3</stageId> <applicationName>t3</applicationName> - <t3-data.version>1.4</t3-data.version> + <t3-data.version>1.5-SNAPSHOT</t3-data.version> <env>dev</env> <skipITs>true</skipITs> ===================================== t3-domain/src/main/java/fr/ird/t3/services/migration/T3MigrationCallbackV2_4.java ===================================== --- a/t3-domain/src/main/java/fr/ird/t3/services/migration/T3MigrationCallbackV2_4.java +++ b/t3-domain/src/main/java/fr/ird/t3/services/migration/T3MigrationCallbackV2_4.java @@ -45,6 +45,7 @@ public class T3MigrationCallbackV2_4 extends T3MigrationCallbackSupport { protected void prepareMigrationScript(TopiaSqlSupport sqlSupport, List<String> queries, boolean showSql, boolean showProgression) throws TopiaException { addScript("01", "delete_idx", queries); addScript("02", "spatialize-harbour", queries); + addScript("03", "review-referential", queries); } } ===================================== t3-domain/src/main/resources/db/migration/V_2_4_03-review-referential.sql ===================================== --- /dev/null +++ b/t3-domain/src/main/resources/db/migration/V_2_4_03-review-referential.sql @@ -0,0 +1,32 @@ +--- +-- #%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 schooltype RENAME libelle4 TO homeId; +ALTER TABLE vesselsizecategory RENAME gaugelibelle TO homeId; +ALTER TABLE vesselsizecategory RENAME capacitylibelle TO label1; +ALTER TABLE vesselsizecategory ADD COLUMN label2 VARCHAR(255); +ALTER TABLE vesselsizecategory ADD COLUMN label3 VARCHAR(255); +ALTER TABLE vesselsizecategory ADD COLUMN label4 VARCHAR(255); +ALTER TABLE vesselsizecategory ADD COLUMN label5 VARCHAR(255); +ALTER TABLE vesselsizecategory ADD COLUMN label6 VARCHAR(255); +ALTER TABLE vesselsizecategory ADD COLUMN label7 VARCHAR(255); +ALTER TABLE vesselsizecategory ADD COLUMN label8 VARCHAR(255); +ALTER TABLE vessel ADD COLUMN iotcId VARCHAR(255); +ALTER TABLE vessel ADD COLUMN iccatId VARCHAR(255); ===================================== 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 ===================================== t3-domain/src/test/resources/db/LengthWeightConversionHelperTest.sql ===================================== --- a/t3-domain/src/test/resources/db/LengthWeightConversionHelperTest.sql +++ b/t3-domain/src/test/resources/db/LengthWeightConversionHelperTest.sql @@ -94,7 +94,7 @@ INSERT INTO PUBLIC.SPECIES(TOPIAID, TOPIAVERSION, TOPIACREATEDATE, CODE, CODE3L, UPDATE PUBLIC.SPECIES SET status = TRUE; -- 3 +/- SELECT COUNT(*) FROM PUBLIC.SCHOOLTYPE; -INSERT INTO PUBLIC.SCHOOLTYPE(TOPIAID, TOPIAVERSION, TOPIACREATEDATE, CODE, LABEL1, LIBELLE4, THRESHOLDNUMBERLEVEL2) VALUES +INSERT INTO PUBLIC.SCHOOLTYPE(TOPIAID, TOPIAVERSION, TOPIACREATEDATE, CODE, LABEL1, HOMEID, THRESHOLDNUMBERLEVEL2) VALUES ('fr.ird.t3.entities.reference.SchoolType#1297580528908#0.8923578380543445', 0, TIMESTAMP '2011-02-13 08:02:06.309', 1, 'Banc sous objet', 'BO', 4500), ('fr.ird.t3.entities.reference.SchoolType#1297580528908#0.633774803291473', 0, TIMESTAMP '2011-02-13 08:02:06.319', 2, 'Banc libre', 'BL', 3000), ('fr.ird.t3.entities.reference.SchoolType#1297580528908#0.9747685881931636', 0, TIMESTAMP '2011-02-13 08:02:06.319', 3, 'Indéterminé', 'IND', NULL); ===================================== t3-domain/src/test/resources/db/WeightCategoryLogBookConverterProviderTest.sql ===================================== --- a/t3-domain/src/test/resources/db/WeightCategoryLogBookConverterProviderTest.sql +++ b/t3-domain/src/test/resources/db/WeightCategoryLogBookConverterProviderTest.sql @@ -28,7 +28,7 @@ INSERT INTO PUBLIC.OCEAN(TOPIAID, TOPIAVERSION, TOPIACREATEDATE, CODE, LABEL1) V UPDATE PUBLIC.ocean SET status = TRUE; -- 3 +/- SELECT COUNT(*) FROM PUBLIC.SCHOOLTYPE; -INSERT INTO PUBLIC.SCHOOLTYPE(TOPIAID, TOPIAVERSION, TOPIACREATEDATE, CODE, LABEL1, LIBELLE4, THRESHOLDNUMBERLEVEL2) VALUES +INSERT INTO PUBLIC.SCHOOLTYPE(TOPIAID, TOPIAVERSION, TOPIACREATEDATE, CODE, LABEL1, HOMEID, THRESHOLDNUMBERLEVEL2) VALUES ('fr.ird.t3.entities.reference.SchoolType#1297580528908#0.8923578380543445', 0, TIMESTAMP '2011-02-13 08:02:06.309', 1, 'Banc sous objet', 'BO', 4500), ('fr.ird.t3.entities.reference.SchoolType#1297580528908#0.633774803291473', 0, TIMESTAMP '2011-02-13 08:02:06.319', 2, 'Banc libre', 'BL', 3000), ('fr.ird.t3.entities.reference.SchoolType#1297580528908#0.9747685881931636', 0, TIMESTAMP '2011-02-13 08:02:06.319', 3, 'Indéterminé', 'IND', NULL); ===================================== t3-domain/src/test/resources/db/WeightCategoryTreatmentImplTest.sql ===================================== --- a/t3-domain/src/test/resources/db/WeightCategoryTreatmentImplTest.sql +++ b/t3-domain/src/test/resources/db/WeightCategoryTreatmentImplTest.sql @@ -28,7 +28,7 @@ INSERT INTO PUBLIC.OCEAN(TOPIAID, TOPIAVERSION, TOPIACREATEDATE, CODE, LABEL1) V UPDATE PUBLIC.ocean SET status = TRUE; -- 3 +/- SELECT COUNT(*) FROM PUBLIC.SCHOOLTYPE; -INSERT INTO PUBLIC.SCHOOLTYPE(TOPIAID, TOPIAVERSION, TOPIACREATEDATE, CODE, LABEL1, LIBELLE4, THRESHOLDNUMBERLEVEL2) VALUES +INSERT INTO PUBLIC.SCHOOLTYPE(TOPIAID, TOPIAVERSION, TOPIACREATEDATE, CODE, LABEL1, HOMEID, THRESHOLDNUMBERLEVEL2) VALUES ('fr.ird.t3.entities.reference.SchoolType#1297580528908#0.8923578380543445', 0, TIMESTAMP '2011-02-13 08:02:06.309', 1, 'Banc sous objet', 'BO', 4500), ('fr.ird.t3.entities.reference.SchoolType#1297580528908#0.633774803291473', 0, TIMESTAMP '2011-02-13 08:02:06.319', 2, 'Banc libre', 'BL', 3000), ('fr.ird.t3.entities.reference.SchoolType#1297580528908#0.9747685881931636', 0, TIMESTAMP '2011-02-13 08:02:06.319', 3, 'Indéterminé', 'IND', NULL); ===================================== t3-input-avdthv33/src/main/java/fr/ird/t3/io/input/avdth/v33/T3AccessEntityMetaProviderAvdth33.java ===================================== --- a/t3-input-avdthv33/src/main/java/fr/ird/t3/io/input/avdth/v33/T3AccessEntityMetaProviderAvdth33.java +++ b/t3-input-avdthv33/src/main/java/fr/ird/t3/io/input/avdth/v33/T3AccessEntityMetaProviderAvdth33.java @@ -297,8 +297,8 @@ public class T3AccessEntityMetaProviderAvdth33 implements T3AccessEntityMetaProv "CAT_BATEAU", new String[]{"C_CAT_B"}, VesselSizeCategory.PROPERTY_CODE, Integer.class, "C_CAT_B", - VesselSizeCategory.PROPERTY_CAPACITY_LIBELLE, String.class, "L_CAPAC", - VesselSizeCategory.PROPERTY_GAUGE_LIBELLE, String.class, "L_JAUGE" + VesselSizeCategory.PROPERTY_LABEL1, String.class, "L_CAPAC", + VesselSizeCategory.PROPERTY_HOME_ID, String.class, "L_JAUGE" ); // BATEAU : [AN_SERV, C_BAT, C_CAT_B, C_FLOTTE, C_PAYS, C_QUILLE, C_TYP_B, D_CHGT_PAV, L_BAT, L_COM_B, V_CT_M3, V_L_HT, V_MAX_RECH, V_P_CV] @@ -375,7 +375,7 @@ public class T3AccessEntityMetaProviderAvdth33 implements T3AccessEntityMetaProv new String[]{"C_TBANC"}, SchoolType.PROPERTY_CODE, Integer.class, "C_TBANC", SchoolType.PROPERTY_LABEL1, String.class, "L_TBANC", - SchoolType.PROPERTY_LIBELLE4, String.class, "L_TBANC4L" + SchoolType.PROPERTY_HOME_ID, String.class, "L_TBANC4L" ); // OCEAN : [C_OCEA, L_OCEA] ===================================== t3-input-avdthv35/src/main/java/fr/ird/t3/io/input/avdth/v35/T3AccessEntityMetaProviderAvdth35.java ===================================== --- a/t3-input-avdthv35/src/main/java/fr/ird/t3/io/input/avdth/v35/T3AccessEntityMetaProviderAvdth35.java +++ b/t3-input-avdthv35/src/main/java/fr/ird/t3/io/input/avdth/v35/T3AccessEntityMetaProviderAvdth35.java @@ -409,8 +409,8 @@ public class T3AccessEntityMetaProviderAvdth35 implements T3AccessEntityMetaProv "CAT_BATEAU", new String[]{"C_CAT_B"}, VesselSizeCategory.PROPERTY_CODE, Integer.class, "C_CAT_B", - VesselSizeCategory.PROPERTY_CAPACITY_LIBELLE, String.class, "L_CAPAC", - VesselSizeCategory.PROPERTY_GAUGE_LIBELLE, String.class, "L_JAUGE" + VesselSizeCategory.PROPERTY_LABEL1, String.class, "L_CAPAC", + VesselSizeCategory.PROPERTY_HOME_ID, String.class, "L_JAUGE" ); // BATEAU : [AN_SERV, C_BAT, C_CAT_B, C_FLOTTE, C_PAYS, C_QUILLE, C_TYP_B, D_CHGT_PAV, L_BAT, L_COM_B, V_CT_M3, V_L_HT, V_MAX_RECH, V_P_CV] @@ -493,7 +493,7 @@ public class T3AccessEntityMetaProviderAvdth35 implements T3AccessEntityMetaProv new String[]{"C_TBANC"}, SchoolType.PROPERTY_CODE, Integer.class, "C_TBANC", SchoolType.PROPERTY_LABEL1, String.class, "L_TBANC", - SchoolType.PROPERTY_LIBELLE4, String.class, "L_TBANC4L" + SchoolType.PROPERTY_HOME_ID, String.class, "L_TBANC4L" ); // OCEAN : [C_OCEA, L_OCEA] ===================================== t3-input-avdthv36/src/main/java/fr/ird/t3/io/input/avdth/v36/T3AccessEntityMetaProviderAvdth36.java ===================================== --- a/t3-input-avdthv36/src/main/java/fr/ird/t3/io/input/avdth/v36/T3AccessEntityMetaProviderAvdth36.java +++ b/t3-input-avdthv36/src/main/java/fr/ird/t3/io/input/avdth/v36/T3AccessEntityMetaProviderAvdth36.java @@ -412,8 +412,8 @@ public class T3AccessEntityMetaProviderAvdth36 implements T3AccessEntityMetaProv "CAT_BATEAU", new String[]{"C_CAT_B"}, VesselSizeCategory.PROPERTY_CODE, Integer.class, "C_CAT_B", - VesselSizeCategory.PROPERTY_CAPACITY_LIBELLE, String.class, "L_CAPAC", - VesselSizeCategory.PROPERTY_GAUGE_LIBELLE, String.class, "L_JAUGE" + VesselSizeCategory.PROPERTY_LABEL1, String.class, "L_CAPAC", + VesselSizeCategory.PROPERTY_HOME_ID, String.class, "L_JAUGE" ); // BATEAU : [AN_SERV, C_BAT, C_CAT_B, C_FLOTTE, C_PAYS, C_QUILLE, C_TYP_B, D_CHGT_PAV, L_BAT, L_COM_B, V_CT_M3, V_L_HT, V_MAX_RECH, V_P_CV] @@ -497,7 +497,7 @@ public class T3AccessEntityMetaProviderAvdth36 implements T3AccessEntityMetaProv new String[]{"C_TBANC"}, SchoolType.PROPERTY_CODE, Integer.class, "C_TBANC", SchoolType.PROPERTY_LABEL1, String.class, "L_TBANC", - SchoolType.PROPERTY_LIBELLE4, String.class, "L_TBANC4L" + SchoolType.PROPERTY_HOME_ID, String.class, "L_TBANC4L" ); // OCEAN : [C_OCEA, L_OCEA] View it on GitLab: https://gitlab.com/ultreiaio/ird-t3/compare/f29b7d5de44fea51e8602b828d7d0b8… --- View it on GitLab: https://gitlab.com/ultreiaio/ird-t3/compare/f29b7d5de44fea51e8602b828d7d0b8… You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-t3][pages] Site checkin for project T3 :: Pom
by Tony CHEMIT 19 Mar '18

19 Mar '18

Tony CHEMIT pushed to branch pages at ultreiaio / ird-t3 Commits: c0b1fe16 by Tony CHEMIT at 2018-03-19T11:08:42Z Site checkin for project T3 :: Pom - - - - - 18 changed files: - aggregate-third-party-report.html - changelog.html - changes-report.html - config-report.html - css/apache-maven-fluido-1.6.min.css → css/apache-maven-fluido-1.7.min.css - css/print.css - dependency-convergence.html - dependency-management.html - dependency-updates-report.html - dev-activity.html - file-activity.html - fonts/glyphicons-halflings-regular.eot - fonts/glyphicons-halflings-regular.svg - fonts/glyphicons-halflings-regular.ttf - fonts/glyphicons-halflings-regular.woff - index.html - install.html - installer.html The diff was not included because it is too large. View it on GitLab: https://gitlab.com/ultreiaio/ird-t3/commit/c0b1fe1600301cce0a747ec7a4274868… --- View it on GitLab: https://gitlab.com/ultreiaio/ird-t3/commit/c0b1fe1600301cce0a747ec7a4274868… You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-t3][develop] 8 commits: Création de base en ligne de commande (closes #293)
by Tony CHEMIT 19 Mar '18

19 Mar '18

Tony CHEMIT pushed to branch develop at ultreiaio / ird-t3 Commits: 696c4082 by Tony CHEMIT at 2018-03-19T10:50:53Z Création de base en ligne de commande (closes #293) - - - - - 35af3068 by Tony CHEMIT at 2018-03-19T10:50:57Z Qu'est-ce que le champ trip_idx ? (Closes #292) - - - - - bddc763b by Tony CHEMIT at 2018-03-19T10:50:57Z Revoir les traductions (Closes #172) - - - - - 8c6096f4 by Tony CHEMIT at 2018-03-19T10:50:57Z [N0.2][LOG] Petite bizarerie dans les logs (closes #239) - - - - - 4a885ab1 by Tony CHEMIT at 2018-03-19T10:50:57Z Spatialiser la table Ocean (See #288) - - - - - 1aba705d by Tony CHEMIT at 2018-03-19T10:50:57Z go to version 2.4 - - - - - a915e99f by Tony CHEMIT at 2018-03-19T10:50:57Z Copyright (Closes #295) - - - - - f29b7d5d by Tony CHEMIT at 2018-03-19T10:50:57Z improve site - - - - - 30 changed files: - pom.xml - src/site/markdown/installer.md.vm - + src/site/markdown/translate.md - src/site/site.xml - t3-actions/pom.xml - t3-actions/src/main/java/fr/ird/t3/actions/data/level0/ComputeRF2Action.java - t3-actions/src/main/java/fr/ird/t3/actions/data/level0/ComputeTripEffortsAction.java - t3-domain/pom.xml - t3-domain/src/main/config/T3.ini - t3-domain/src/main/java/fr/ird/t3/T3Config.java - t3-installer/src/main/java/fr/ird/t3/tools/T3ApplicationInstaller.java → t3-domain/src/main/java/fr/ird/t3/console/T3DatabaseTool.java - t3-domain/src/main/java/fr/ird/t3/entities/data/TripImpl.java - t3-installer/src/test/java/fr/ird/t3/tools/db/reference/SetDurationImporterIT.java → t3-domain/src/main/java/fr/ird/t3/services/migration/T3MigrationCallbackV2_4.java - + t3-domain/src/main/resources/db/migration/V_2_4_01_delete_idx.sql - + t3-domain/src/main/resources/db/migration/V_2_4_02-spatialize-ocean.sql - t3-domain/src/main/resources/i18n/t3-domain_en_GB.properties - t3-domain/src/main/resources/i18n/t3-domain_fr_FR.properties - t3-domain/src/main/xmi/t3-persistence.properties - t3-domain/src/main/xmi/t3-persistence.zargo - t3-input-avdthv33/pom.xml - t3-input-avdthv35/pom.xml - t3-input-avdthv36/pom.xml - t3-installer/pom.xml - t3-installer/src/license/THIRD-PARTY.properties - t3-installer/src/main/assembly/bin.xml - + t3-installer/src/main/assembly/dist/README.md - + t3-installer/src/main/assembly/dist/create-db.bat - + t3-installer/src/main/assembly/dist/create-db.sh - t3-installer/src/main/assembly/dist/db.properties - − t3-installer/src/main/assembly/dist/debug.sh The diff was not included because it is too large. View it on GitLab: https://gitlab.com/ultreiaio/ird-t3/compare/16070f0e18fb69eaea4226cccfb2a49… --- View it on GitLab: https://gitlab.com/ultreiaio/ird-t3/compare/16070f0e18fb69eaea4226cccfb2a49… You're receiving this email because of your account on gitlab.com.

1 0