branch develop updated (feb42a7 -> d2c85b4)
This is an automated email from the git hooks/post-receive script. New change to branch develop in repository observe. See http://git.codelutin.com/observe.git from feb42a7 utilisation de requetes spécifique pour les mises à jour plutôt que de charger la base via hibernate (refs #7135) new e6a87c6 la dernière version de topia ajoute des binders simples pour toutes les entités (refs #7141) new 995076f fixes #7141: Problème technique lors de la synchro de référentiel central -> local, lorsqu'une entité de type SpeciesGroup a été modifiée Merge branch 'feature/7141' into develop new f899b96 on se base uniquement sur les topiaId des trip pour l'export des marées vers une base distante (refs #7041) new d2c85b4 fixes #7041: La synchronisation de marées se base sur la clé métier code bateau#date de débarquement et pas sur le topiaid Merge branch 'feature/7041' into develop The 4 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "adds" were already present in the repository and have only been added to this reference. Detailed log of new commits: commit d2c85b4511ed400239e6841f90279a01476e2536 Merge: 995076f f899b96 Author: Tony CHEMIT <chemit@codelutin.com> Date: Fri May 22 16:44:56 2015 +0200 fixes #7041: La synchronisation de marées se base sur la clé métier code bateau#date de débarquement et pas sur le topiaid Merge branch 'feature/7041' into develop commit f899b96f14dcc3452417997278c9fec9db048b05 Author: Tony CHEMIT <chemit@codelutin.com> Date: Fri May 22 16:44:54 2015 +0200 on se base uniquement sur les topiaId des trip pour l'export des marées vers une base distante (refs #7041) commit 995076ff66167d6b747c857ddd1d976b61bf08dd Merge: feb42a7 e6a87c6 Author: Tony CHEMIT <chemit@codelutin.com> Date: Fri May 22 16:24:56 2015 +0200 fixes #7141: Problème technique lors de la synchro de référentiel central -> local, lorsqu'une entité de type SpeciesGroup a été modifiée Merge branch 'feature/7141' into develop commit e6a87c6d5b56e4d459fc2628dada4906b695ec47 Author: Tony CHEMIT <chemit@codelutin.com> Date: Fri May 22 16:24:54 2015 +0200 la dernière version de topia ajoute des binders simples pour toutes les entités (refs #7141) Summary of changes: .../fr/ird/observe/ObserveApplicationContext.java | 12 +----- .../java/fr/ird/observe/ui/admin/AdminUIModel.java | 48 +++++----------------- .../ird/observe/ui/admin/export/ExportModel.java | 4 +- pom.xml | 2 +- 4 files changed, 13 insertions(+), 53 deletions(-) -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@list.forge.codelutin.com>.
This is an automated email from the git hooks/post-receive script. New commit to branch develop in repository observe. See http://git.codelutin.com/observe.git commit e6a87c6d5b56e4d459fc2628dada4906b695ec47 Author: Tony CHEMIT <chemit@codelutin.com> Date: Fri May 22 16:24:54 2015 +0200 la dernière version de topia ajoute des binders simples pour toutes les entités (refs #7141) --- .../main/java/fr/ird/observe/ObserveApplicationContext.java | 12 +----------- pom.xml | 2 +- 2 files changed, 2 insertions(+), 12 deletions(-) diff --git a/observe-business/src/main/java/fr/ird/observe/ObserveApplicationContext.java b/observe-business/src/main/java/fr/ird/observe/ObserveApplicationContext.java index dccc397..ee0f6de 100644 --- a/observe-business/src/main/java/fr/ird/observe/ObserveApplicationContext.java +++ b/observe-business/src/main/java/fr/ird/observe/ObserveApplicationContext.java @@ -25,7 +25,6 @@ import fr.ird.observe.db.DataContext; import fr.ird.observe.db.DataSource; import fr.ird.observe.db.DataSourceFactory; import fr.ird.observe.entities.constants.ReferenceLocale; -import fr.ird.observe.entities.referentiel.SpeciesList; import fr.ird.observe.gps.GPSService; import fr.ird.observe.validation.ObserveValidator; import fr.ird.observe.validation.ValidationContext; @@ -35,7 +34,6 @@ import jaxx.runtime.context.JAXXContextEntryDef; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.nuiton.decorator.Decorator; -import org.nuiton.util.beans.BinderModelBuilder; import java.util.Locale; @@ -148,17 +146,9 @@ public class ObserveApplicationContext extends DefaultApplicationContext { } public final BinderService getBinderService() { - BinderService service = - BINDER_SERVICE_ENTRY_DEF.getContextValue(this); + BinderService service = BINDER_SERVICE_ENTRY_DEF.getContextValue(this); if (service == null) { service = new BinderService(); - - // Need to add by hand a speciesList binder - // see https://forge.codelutin.com/issues/6963 - BinderModelBuilder<SpeciesList, SpeciesList> builderModel= - BinderModelBuilder.newEmptyBuilder(SpeciesList.class); - service.registerTopiaBinder(SpeciesList.class, builderModel, "Observe"); - BINDER_SERVICE_ENTRY_DEF.setContextValue(this, service); } return service; diff --git a/pom.xml b/pom.xml index 7dd4021..0897bbf 100644 --- a/pom.xml +++ b/pom.xml @@ -110,7 +110,7 @@ <eugenePluginVersion>2.14</eugenePluginVersion> - <topiaVersion>2.9.5.3</topiaVersion> + <topiaVersion>2.9.5.5</topiaVersion> <jaxxVersion>2.24</jaxxVersion> <nuitonI18nVersion>3.3</nuitonI18nVersion> <nuitonValidatorVersion>3.0</nuitonValidatorVersion> -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@list.forge.codelutin.com>.
This is an automated email from the git hooks/post-receive script. New commit to branch develop in repository observe. See http://git.codelutin.com/observe.git commit 995076ff66167d6b747c857ddd1d976b61bf08dd Merge: feb42a7 e6a87c6 Author: Tony CHEMIT <chemit@codelutin.com> Date: Fri May 22 16:24:56 2015 +0200 fixes #7141: Problème technique lors de la synchro de référentiel central -> local, lorsqu'une entité de type SpeciesGroup a été modifiée Merge branch 'feature/7141' into develop .../main/java/fr/ird/observe/ObserveApplicationContext.java | 12 +----------- pom.xml | 2 +- 2 files changed, 2 insertions(+), 12 deletions(-) -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@list.forge.codelutin.com>.
This is an automated email from the git hooks/post-receive script. New commit to branch develop in repository observe. See http://git.codelutin.com/observe.git commit f899b96f14dcc3452417997278c9fec9db048b05 Author: Tony CHEMIT <chemit@codelutin.com> Date: Fri May 22 16:44:54 2015 +0200 on se base uniquement sur les topiaId des trip pour l'export des marées vers une base distante (refs #7041) --- .../java/fr/ird/observe/ui/admin/AdminUIModel.java | 48 +++++----------------- .../ird/observe/ui/admin/export/ExportModel.java | 4 +- 2 files changed, 11 insertions(+), 41 deletions(-) diff --git a/observe-swing/src/main/java/fr/ird/observe/ui/admin/AdminUIModel.java b/observe-swing/src/main/java/fr/ird/observe/ui/admin/AdminUIModel.java index ebbe452..23569e8 100644 --- a/observe-swing/src/main/java/fr/ird/observe/ui/admin/AdminUIModel.java +++ b/observe-swing/src/main/java/fr/ird/observe/ui/admin/AdminUIModel.java @@ -24,6 +24,7 @@ package fr.ird.observe.ui.admin; import fr.ird.observe.DataService; import fr.ird.observe.ObserveConfig; import fr.ird.observe.ObserveServiceHelper; +import fr.ird.observe.ObserveTechnicalException; import fr.ird.observe.db.DataSource; import fr.ird.observe.db.DataSourceConfig; import fr.ird.observe.db.DataSourceException; @@ -31,8 +32,9 @@ import fr.ird.observe.db.constants.DbMode; import fr.ird.observe.db.impl.H2DataSource; import fr.ird.observe.db.impl.PGDataSource; import fr.ird.observe.db.model.DataSelectionModel; -import fr.ird.observe.entities.Trip; import fr.ird.observe.entities.Trips; +import fr.ird.observe.entities.longline.TripLongline; +import fr.ird.observe.entities.seine.TripSeine; import fr.ird.observe.report.model.Report; import fr.ird.observe.ui.admin.consolidate.ConsolidateModel; import fr.ird.observe.ui.admin.export.ExportModel; @@ -377,24 +379,6 @@ public class AdminUIModel extends WizardExtModel<AdminStep> { } } - public static String getTripKey(Trip trip) { - StringBuilder sb = new StringBuilder(); - sb.append(trip.getProgram().getTopiaId()).append("-"); - sb.append(trip.getStartDate()).append("-"); - sb.append(trip.getEndDate()).append("-"); - if (trip.getVessel() != null) { - sb.append(trip.getVessel().getTopiaId()).append("-"); - } else { - sb.append("vesselNull"); - } - if (trip.getOcean() != null) { - sb.append(trip.getOcean().getTopiaId()).append("-"); - } else { - sb.append("oceanNull"); - } - return sb.toString(); - } - public DataSelectionModel getSelectionDataModel() { return selectionDataModel; } @@ -1282,26 +1266,14 @@ public class AdminUIModel extends WizardExtModel<AdminStep> { protected void computeExistingTrips(DataService dataService, DataSource source) { - DataSelectionModel selectionModel = new DataSelectionModel(); - selectionModel.setUseOpenData(true); - try { - DataSelectionModel.populate(selectionModel, dataService, source); - } catch (Exception e) { - if (log.isErrorEnabled()) { - log.error("could not populate selected model", e); - } - } - List<String> existingTripIds = new ArrayList<String>(); - - for (List<String> tripIds : selectionModel.getDatas().values()) { - - for (String tripId : tripIds) { - Trip trip = (Trip) selectionModel.getEntityCache(tripId); - String key = getTripKey(trip); - existingTripIds.add(key); - } - + try { + List<String> tripSeineIds = dataService.getEntityIds(source, TripSeine.class); + existingTripIds.addAll(tripSeineIds); + List<String> tripLonglineIds = dataService.getEntityIds(source, TripLongline.class); + existingTripIds.addAll(tripLonglineIds); + } catch (DataSourceException e) { + throw new ObserveTechnicalException("Coould not get trip ids",e); } getExportModel().setExistingTripIds(existingTripIds); diff --git a/observe-swing/src/main/java/fr/ird/observe/ui/admin/export/ExportModel.java b/observe-swing/src/main/java/fr/ird/observe/ui/admin/export/ExportModel.java index 97e2ca6..2283d7f 100644 --- a/observe-swing/src/main/java/fr/ird/observe/ui/admin/export/ExportModel.java +++ b/observe-swing/src/main/java/fr/ird/observe/ui/admin/export/ExportModel.java @@ -30,7 +30,6 @@ import fr.ird.observe.entities.referentiel.Program; import fr.ird.observe.entities.seine.TripSeine; import fr.ird.observe.ui.admin.AdminActionModel; import fr.ird.observe.ui.admin.AdminStep; -import fr.ird.observe.ui.admin.AdminUIModel; import org.apache.commons.collections4.CollectionUtils; import org.nuiton.decorator.Decorator; @@ -110,8 +109,7 @@ public class ExportModel extends AdminActionModel { Trip trip = (Trip) selectionModel.getEntityCache(tripId); - String tripKey = AdminUIModel.getTripKey(trip); - boolean exists = existingTripIds.contains(tripKey); + boolean exists = existingTripIds.contains(trip.getTopiaId()); TripEntry entry = new TripEntry(trip, exists); tripEntries.add(entry); -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@list.forge.codelutin.com>.
This is an automated email from the git hooks/post-receive script. New commit to branch develop in repository observe. See http://git.codelutin.com/observe.git commit d2c85b4511ed400239e6841f90279a01476e2536 Merge: 995076f f899b96 Author: Tony CHEMIT <chemit@codelutin.com> Date: Fri May 22 16:44:56 2015 +0200 fixes #7041: La synchronisation de marées se base sur la clé métier code bateau#date de débarquement et pas sur le topiaid Merge branch 'feature/7041' into develop .../java/fr/ird/observe/ui/admin/AdminUIModel.java | 48 +++++----------------- .../ird/observe/ui/admin/export/ExportModel.java | 4 +- 2 files changed, 11 insertions(+), 41 deletions(-) -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@list.forge.codelutin.com>.
participants (1)
-
codelutin.com scm