This is an automated email from the git hooks/post-receive script. New commit to branch develop in repository observe. See https://gitlab.nuiton.org/codelutin/observe.git commit c938eca80c8f93af3307f6342e6e7152fa45564f Author: Tony CHEMIT <chemit@codelutin.com> Date: Mon Nov 7 13:27:22 2016 +0100 Afficher les références insérées dans la base centrale --- .../swing/ui/admin/export/ExportUIHandler.java | 33 ++++++++++++++-------- .../i18n/application-swing_en_GB.properties | 10 ++++--- .../i18n/application-swing_es_ES.properties | 10 ++++--- .../i18n/application-swing_fr_FR.properties | 10 ++++--- 4 files changed, 40 insertions(+), 23 deletions(-) diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/admin/export/ExportUIHandler.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/admin/export/ExportUIHandler.java index c54b578..4f46a9d 100644 --- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/admin/export/ExportUIHandler.java +++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/admin/export/ExportUIHandler.java @@ -25,6 +25,7 @@ import com.google.common.base.Preconditions; import com.google.common.collect.SetMultimap; import fr.ird.observe.application.swing.db.ObserveSwingDataSource; import fr.ird.observe.application.swing.decoration.DecoratorService; +import fr.ird.observe.application.swing.decoration.ObserveI18nDecoratorHelper; import fr.ird.observe.application.swing.decoration.decorators.DataReferenceDecorator; import fr.ird.observe.application.swing.decoration.decorators.ReferentialReferenceDecorator; import fr.ird.observe.application.swing.ui.UIHelper; @@ -37,24 +38,27 @@ import fr.ird.observe.application.swing.ui.admin.config.ConfigUI; import fr.ird.observe.application.swing.ui.admin.config.SelectDataUI; import fr.ird.observe.application.swing.ui.storage.tabs.DataSelectionModel; import fr.ird.observe.application.swing.ui.usage.UsagesUI; +import fr.ird.observe.services.dto.AbstractReference; import fr.ird.observe.services.dto.DataReference; +import fr.ird.observe.services.dto.IdDto; import fr.ird.observe.services.dto.ReferenceMap; import fr.ird.observe.services.dto.longline.TripLonglineDto; import fr.ird.observe.services.dto.referential.ProgramDto; import fr.ird.observe.services.dto.referential.ReferentialDto; import fr.ird.observe.services.dto.seine.TripSeineDto; -import fr.ird.observe.services.service.referential.MissingReferentialResult; -import fr.ird.observe.services.service.referential.ReferentialService; import fr.ird.observe.services.service.data.ExportTripRequest; import fr.ird.observe.services.service.data.ExportTripResult; import fr.ird.observe.services.service.data.ImportTripRequest; import fr.ird.observe.services.service.data.ImportTripResult; import fr.ird.observe.services.service.data.TripManagementService; +import fr.ird.observe.services.service.referential.MissingReferentialResult; +import fr.ird.observe.services.service.referential.ReferentialService; import jaxx.runtime.swing.editor.MyDefaultCellEditor; import jaxx.runtime.swing.wizard.ext.WizardState; import org.apache.commons.collections4.CollectionUtils; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; +import org.nuiton.decorator.Decorator; import javax.swing.JOptionPane; import javax.swing.JTable; @@ -63,6 +67,8 @@ import java.awt.event.MouseAdapter; import java.awt.event.MouseEvent; import java.util.Date; import java.util.List; +import java.util.Map; +import java.util.Set; import java.util.stream.Collectors; import static org.nuiton.i18n.I18n.n; @@ -103,10 +109,6 @@ public class ExportUIHandler extends AdminTabUIHandler { tabUI.getModel().addPropertyChangeListener(AdminUIModel.SELECTION_MODEL_CHANGED_PROPERTY_NAME, evt -> { AdminUIModel model1 = (AdminUIModel) evt.getSource(); -// if (!getModel().containsStep(tabUI.getStep())) { -// // avoid multi-cast -// return; -// } DataSelectionModel value = (DataSelectionModel) evt.getNewValue(); if (log.isInfoEnabled()) { @@ -286,7 +288,7 @@ public class ExportUIHandler extends AdminTabUIHandler { if (!insertMissingReferentials && result != null) { // l'export n'est pas possible - UIHelper.displayInfo(t("observe.actions.export.error.missingReferentialsId")); + UIHelper.displayInfo(t("observe.actions.exportData.error.missingReferentialsId")); return WizardState.CANCELED; } @@ -319,7 +321,16 @@ public class ExportUIHandler extends AdminTabUIHandler { log.info("Insertion dans la base centrale des référentiels manquants."); } - //TODO Send message + for (Map.Entry<Class<? extends IdDto>, Set<? extends AbstractReference>> entry : usages.entrySet()) { + Class<? extends IdDto> key = entry.getKey(); + Set<? extends AbstractReference> references = entry.getValue(); + String type = t(ObserveI18nDecoratorHelper.getTypePluralI18nKey(key)); + sendMessage(t("observe.actions.exportData.message.add.missing.referentials", type, references.size())); + Decorator decorator = decoratorService.getReferenceDecorator(key); + for (AbstractReference reference : references) { + sendMessage(t("observe.actions.exportData.message.add.missing.referential", decorator.toString(reference))); + } + } centraltReferentialService.insertMissingReferentials(result.getSqlCode()); } @@ -328,7 +339,7 @@ public class ExportUIHandler extends AdminTabUIHandler { ExportTripRequest exportTripRequest = new ExportTripRequest(false, tripEntry.getProgramId(), tripEntry.getTripId()); ExportTripResult exportTripResult = localTripManagementService.exportTrip(exportTripRequest); - logExportResult(n("observe.actions.exportData.result.export.trip"), + logExportResult(n("observe.actions.exportData.message.result.export.trip"), exportTripResult, programDecorator, tripEntry.getProgram(), @@ -336,8 +347,8 @@ public class ExportUIHandler extends AdminTabUIHandler { ImportTripRequest importTripRequest = new ImportTripRequest(exportTripResult); ImportTripResult importTripResult = centralTripManagementService.importTrip(importTripRequest); - logImportResult(n("observe.actions.exportData.result.import.trip"), - n("observe.actions.exportData.result.delete.trip"), + logImportResult(n("observe.actions.exportData.message.result.import.trip"), + n("observe.actions.exportData.message.result.delete.trip"), importTripResult, programDecorator, tripEntry.getProgram(), diff --git a/application-swing/src/main/resources/i18n/application-swing_en_GB.properties b/application-swing/src/main/resources/i18n/application-swing_en_GB.properties index 2ed0d2c..9514fdc 100644 --- a/application-swing/src/main/resources/i18n/application-swing_en_GB.properties +++ b/application-swing/src/main/resources/i18n/application-swing_en_GB.properties @@ -144,15 +144,17 @@ observe.actions.consolidate.message.save.changes=Save modified %1$s trip(s). observe.actions.consolidate.message.trip=Data consolidate for trip %1$s observe.actions.consolidate.title=Consolidate data observe.actions.consolidate.title.tip=Consolidate observed data -observe.actions.export.error.missingReferentialsId=Can't export data, there is some missing referentials in central source and you did not select insert option. observe.actions.exportData=Export data observe.actions.exportData.description=Export data +observe.actions.exportData.error.missingReferentialsId=Can't export data, there is some missing referentials in central source and you did not select insert option. +observe.actions.exportData.message.add.missing.referential=\t%s +observe.actions.exportData.message.add.missing.referentials=Insert %s missing referentials of type «%s» observe.actions.exportData.message.not.possible=Export is not possible (see above messages) observe.actions.exportData.message.operation.needFix=Select data to export. observe.actions.exportData.message.prepare.data=Prepare data to export... -observe.actions.exportData.result.delete.trip=Trip %s - %s was deleted from central database -observe.actions.exportData.result.export.trip=Trip %s - %s was deleted from central database -observe.actions.exportData.result.import.trip=Trip %s - %s was deleted in central database +observe.actions.exportData.message.result.delete.trip=Trip %s - %s was deleted from central database +observe.actions.exportData.message.result.export.trip=Trip %s - %s was deleted from central database +observe.actions.exportData.message.result.import.trip=Trip %s - %s was deleted in central database observe.actions.exportData.table.exist.label=E observe.actions.exportData.table.exist.label.tip=Trip alreay in remote database observe.actions.exportData.table.program.label=Program diff --git a/application-swing/src/main/resources/i18n/application-swing_es_ES.properties b/application-swing/src/main/resources/i18n/application-swing_es_ES.properties index ec4495d..35ebcc4 100644 --- a/application-swing/src/main/resources/i18n/application-swing_es_ES.properties +++ b/application-swing/src/main/resources/i18n/application-swing_es_ES.properties @@ -144,15 +144,17 @@ observe.actions.consolidate.message.save.changes=Guardar las modificaciones de l observe.actions.consolidate.message.trip=Datos calculados para la marea %1$s observe.actions.consolidate.title=Consolidar los datos observados observe.actions.consolidate.title.tip=Consolidar los datos observados -observe.actions.export.error.missingReferentialsId=Il existe des référentiels dans la base locale non présente en base centrale, mais vous n'avez pas activé l'option d'insertion automatique. \#TODO observe.actions.exportData=Exportar los datos observados observe.actions.exportData.description=Exportar los datos observados en la base central +observe.actions.exportData.error.missingReferentialsId=Il existe des référentiels dans la base locale non présente en base centrale, mais vous n'avez pas activé l'option d'insertion automatique. \#TODO +observe.actions.exportData.message.add.missing.referential=\t%s +observe.actions.exportData.message.add.missing.referentials=Insertion de %s référentiels de type «%s» \#TODO observe.actions.exportData.message.not.possible=La exportación no es posible (vea el mensaje anterior). observe.actions.exportData.message.operation.needFix=Seleccione las mareas a exportar. observe.actions.exportData.message.prepare.data=Preparación de los datos a exportar... -observe.actions.exportData.result.delete.trip=La marea %s - %s fue eliminada de la base central -observe.actions.exportData.result.export.trip=La marea %s - %s fue exportada de la base locale -observe.actions.exportData.result.import.trip=La marea %s - %s fue importada en la base central +observe.actions.exportData.message.result.delete.trip=La marea %s - %s fue eliminada de la base central +observe.actions.exportData.message.result.export.trip=La marea %s - %s fue exportada de la base locale +observe.actions.exportData.message.result.import.trip=La marea %s - %s fue importada en la base central observe.actions.exportData.table.exist.label=E observe.actions.exportData.table.exist.label.tip=Marea ya está presente en la base de datos remota observe.actions.exportData.table.program.label=Programa diff --git a/application-swing/src/main/resources/i18n/application-swing_fr_FR.properties b/application-swing/src/main/resources/i18n/application-swing_fr_FR.properties index 971af68..af21d96 100644 --- a/application-swing/src/main/resources/i18n/application-swing_fr_FR.properties +++ b/application-swing/src/main/resources/i18n/application-swing_fr_FR.properties @@ -144,15 +144,17 @@ observe.actions.consolidate.message.save.changes=Sauvegarde des modifications su observe.actions.consolidate.message.trip=Données calculées pour la marée %1$s observe.actions.consolidate.title=Consolider les données observateur observe.actions.consolidate.title.tip=Consolider les données observateur -observe.actions.export.error.missingReferentialsId=Il existe des référentiels dans la base locale non présente en base centrale, mais vous n'avez pas activé l'option d'insertion automatique. observe.actions.exportData=Exporter les données observateurs observe.actions.exportData.description=Exporter les données observateurs vers la base centrale +observe.actions.exportData.error.missingReferentialsId=Il existe des référentiels dans la base locale non présente en base centrale, mais vous n'avez pas activé l'option d'insertion automatique. +observe.actions.exportData.message.add.missing.referential=\t%s +observe.actions.exportData.message.add.missing.referentials=Insertion de %s référentiels de type «%s» observe.actions.exportData.message.not.possible=L'opération d'export n'est pas possible (voir les messages précédents). observe.actions.exportData.message.operation.needFix=Veuillez sélectionner les marées à exporter. observe.actions.exportData.message.prepare.data=Préparation des données à exporter... -observe.actions.exportData.result.delete.trip=La marée %s - %s a été supprimée de la base centrale -observe.actions.exportData.result.export.trip=La marée %s - %s a été exportée depuis la base locale -observe.actions.exportData.result.import.trip=La marée %s - %s a été importée dans la base centrale +observe.actions.exportData.message.result.delete.trip=La marée %s - %s a été supprimée de la base centrale +observe.actions.exportData.message.result.export.trip=La marée %s - %s a été exportée depuis la base locale +observe.actions.exportData.message.result.import.trip=La marée %s - %s a été importée dans la base centrale observe.actions.exportData.table.exist.label=E observe.actions.exportData.table.exist.label.tip=Marée déjà présente sur la base distante observe.actions.exportData.table.program.label=Programme -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.