branch feature/4304_synchro_marees updated (3504333 -> 8866f26)
This is an automated email from the git hooks/post-receive script. New change to branch feature/4304_synchro_marees in repository observe. See https://gitlab.nuiton.org/codelutin/observe.git from 3504333 use now delete from sql producer instead of hibernate delete new 17e311f Rename test new 8866f26 Ajout de plus de messages de préparation des tâches à executer The 2 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 8866f268374950aebb72b587e7abf1e52a1dc1d6 Author: Tony CHEMIT <chemit@codelutin.com> Date: Mon Aug 8 16:17:55 2016 +0200 Ajout de plus de messages de préparation des tâches à executer commit 17e311f56fe45a01122745a51aeddd3afd7d20c9 Author: Tony CHEMIT <chemit@codelutin.com> Date: Mon Aug 8 15:59:26 2016 +0200 Rename test Summary of changes: .../observe/ui/admin/datasynchro/DataSynchroUIHandler.java | 14 ++++++++++++++ .../i18n/observe-application-swing_en_GB.properties | 4 ++++ .../i18n/observe-application-swing_es_ES.properties | 4 ++++ .../i18n/observe-application-swing_fr_FR.properties | 4 ++++ ...Test.java => AddSqlScriptProducerServiceTopiaTest.java} | 4 ++-- 5 files changed, 28 insertions(+), 2 deletions(-) rename observe-services-topia/src/test/java/fr/ird/observe/services/service/{SqlScriptProducerServiceTopiaTest.java => AddSqlScriptProducerServiceTopiaTest.java} (94%) -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.
This is an automated email from the git hooks/post-receive script. New commit to branch feature/4304_synchro_marees in repository observe. See https://gitlab.nuiton.org/codelutin/observe.git commit 17e311f56fe45a01122745a51aeddd3afd7d20c9 Author: Tony CHEMIT <chemit@codelutin.com> Date: Mon Aug 8 15:59:26 2016 +0200 Rename test --- ...erviceTopiaTest.java => AddSqlScriptProducerServiceTopiaTest.java} | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/observe-services-topia/src/test/java/fr/ird/observe/services/service/SqlScriptProducerServiceTopiaTest.java b/observe-services-topia/src/test/java/fr/ird/observe/services/service/AddSqlScriptProducerServiceTopiaTest.java similarity index 94% rename from observe-services-topia/src/test/java/fr/ird/observe/services/service/SqlScriptProducerServiceTopiaTest.java rename to observe-services-topia/src/test/java/fr/ird/observe/services/service/AddSqlScriptProducerServiceTopiaTest.java index 364c9bc..9d97f2c 100644 --- a/observe-services-topia/src/test/java/fr/ird/observe/services/service/SqlScriptProducerServiceTopiaTest.java +++ b/observe-services-topia/src/test/java/fr/ird/observe/services/service/AddSqlScriptProducerServiceTopiaTest.java @@ -40,9 +40,9 @@ import java.io.IOException; * * @author Tony Chemit - chemit@codelutin.com */ -public class SqlScriptProducerServiceTopiaTest extends AbstractServiceTopiaTest { +public class AddSqlScriptProducerServiceTopiaTest extends AbstractServiceTopiaTest { - private static final TimeLog timeLog = new TimeLog(SqlScriptProducerServiceTopiaTest.class, 10, 1000); + private static final TimeLog timeLog = new TimeLog(AddSqlScriptProducerServiceTopiaTest.class, 10, 1000); protected SqlScriptProducerService service; -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.
This is an automated email from the git hooks/post-receive script. New commit to branch feature/4304_synchro_marees in repository observe. See https://gitlab.nuiton.org/codelutin/observe.git commit 8866f268374950aebb72b587e7abf1e52a1dc1d6 Author: Tony CHEMIT <chemit@codelutin.com> Date: Mon Aug 8 16:17:55 2016 +0200 Ajout de plus de messages de préparation des tâches à executer --- .../observe/ui/admin/datasynchro/DataSynchroUIHandler.java | 14 ++++++++++++++ .../i18n/observe-application-swing_en_GB.properties | 4 ++++ .../i18n/observe-application-swing_es_ES.properties | 4 ++++ .../i18n/observe-application-swing_fr_FR.properties | 4 ++++ 4 files changed, 26 insertions(+) diff --git a/observe-application-swing/src/main/java/fr/ird/observe/ui/admin/datasynchro/DataSynchroUIHandler.java b/observe-application-swing/src/main/java/fr/ird/observe/ui/admin/datasynchro/DataSynchroUIHandler.java index 332bf62..0025eef 100644 --- a/observe-application-swing/src/main/java/fr/ird/observe/ui/admin/datasynchro/DataSynchroUIHandler.java +++ b/observe-application-swing/src/main/java/fr/ird/observe/ui/admin/datasynchro/DataSynchroUIHandler.java @@ -1,5 +1,7 @@ package fr.ird.observe.ui.admin.datasynchro; +import fr.ird.observe.application.swing.decoration.DecoratorService; +import fr.ird.observe.application.swing.decoration.decorators.ReferentialReferenceDecorator; import fr.ird.observe.db.ObserveSwingDataSource; import fr.ird.observe.services.configuration.ObserveDataSourceConfigurationTopiaH2; import fr.ird.observe.services.dto.DataReference; @@ -256,19 +258,27 @@ public class DataSynchroUIHandler extends AdminTabUIHandler { DefaultListModel<DataSynchronizeTaskSupport> tasks = getStepModel().getTasks(); int size = tasks.size(); + DecoratorService decoratorService = getDecoratorService(); + ReferentialReferenceDecorator<ProgramDto> programDecorator = decoratorService.getReferentialReferenceDecorator(ProgramDto.class); + DataSynchronizeRequest.Builder leftDataSynchronizeRequestBuilder = DataSynchronizeRequest.builder(leftSourceIsH2, rightSourceIsH2); DataSynchronizeRequest.Builder rightDataSynchronizeRequestBuilder = DataSynchronizeRequest.builder(rightSourceIsH2, leftSourceIsH2); for (int i = 0; i < size; i++) { DataSynchronizeTaskSupport task = tasks.getElementAt(i); + String programStr = programDecorator.toString(task.getProgram()); + String tripStr = decoratorService.getTripReferenceDecorator(task.getTrip()).toString(task.getTrip()); + if (task instanceof DeleteFromLeftDataSynchronizeTask) { + sendMessage(t("observe.datasynchro.prepare.deleteFromLeftTask", programStr, tripStr)); leftDataSynchronizeRequestBuilder.addDeleteTask(new DataSynchronizeDeleteTask(task.getProgram().getId(), task.getTrip().getId())); continue; } if (task instanceof DeleteFromRightDataSynchronizeTask) { + sendMessage(t("observe.datasynchro.prepare.deleteFromRightTask", programStr, tripStr)); rightDataSynchronizeRequestBuilder.addDeleteTask(new DataSynchronizeDeleteTask(task.getProgram().getId(), task.getTrip().getId())); continue; } @@ -276,8 +286,10 @@ public class DataSynchroUIHandler extends AdminTabUIHandler { if (task instanceof CopyToLeftDataSynchronizeTask) { CopyToLeftDataSynchronizeTask copyTask = (CopyToLeftDataSynchronizeTask) task; if (copyTask.isTripExistOnLeft()) { + sendMessage(t("observe.datasynchro.prepare.deleteFromLeftTask", programStr, tripStr)); leftDataSynchronizeRequestBuilder.addDeleteTask(new DataSynchronizeDeleteTask(task.getProgram().getId(), task.getTrip().getId())); } + sendMessage(t("observe.datasynchro.prepare.copyToLeftTask", programStr, tripStr)); leftDataSynchronizeRequestBuilder.addCopyTask(new DataSynchronizeCopyTask(task.getProgram().getId(), task.getTrip().getId())); continue; } @@ -285,8 +297,10 @@ public class DataSynchroUIHandler extends AdminTabUIHandler { if (task instanceof CopyToRightDataSynchronizeTask) { CopyToRightDataSynchronizeTask copyTask = (CopyToRightDataSynchronizeTask) task; if (copyTask.isTripExistOnRight()) { + sendMessage(t("observe.datasynchro.prepare.deleteFromRightTask", programStr, tripStr)); rightDataSynchronizeRequestBuilder.addDeleteTask(new DataSynchronizeDeleteTask(task.getProgram().getId(), task.getTrip().getId())); } + sendMessage(t("observe.datasynchro.prepare.copyToRightTask", programStr, tripStr)); rightDataSynchronizeRequestBuilder.addCopyTask(new DataSynchronizeCopyTask(task.getProgram().getId(), task.getTrip().getId())); } diff --git a/observe-application-swing/src/main/resources/i18n/observe-application-swing_en_GB.properties b/observe-application-swing/src/main/resources/i18n/observe-application-swing_en_GB.properties index 7d26d45..b82f923 100644 --- a/observe-application-swing/src/main/resources/i18n/observe-application-swing_en_GB.properties +++ b/observe-application-swing/src/main/resources/i18n/observe-application-swing_en_GB.properties @@ -1046,6 +1046,10 @@ observe.datasynchro.copyToLeftTask= observe.datasynchro.copyToRightTask= observe.datasynchro.deleteFromLeftTask= observe.datasynchro.deleteFromRightTask= +observe.datasynchro.prepare.copyToLeftTask= +observe.datasynchro.prepare.copyToRightTask= +observe.datasynchro.prepare.deleteFromLeftTask= +observe.datasynchro.prepare.deleteFromRightTask= observe.encounter.action.create=Insert this encounter observe.encounter.action.create.tip=Insert this encounter observe.encounter.count=Count diff --git a/observe-application-swing/src/main/resources/i18n/observe-application-swing_es_ES.properties b/observe-application-swing/src/main/resources/i18n/observe-application-swing_es_ES.properties index bc0bf88..11418c7 100644 --- a/observe-application-swing/src/main/resources/i18n/observe-application-swing_es_ES.properties +++ b/observe-application-swing/src/main/resources/i18n/observe-application-swing_es_ES.properties @@ -1046,6 +1046,10 @@ observe.datasynchro.copyToLeftTask= observe.datasynchro.copyToRightTask= observe.datasynchro.deleteFromLeftTask= observe.datasynchro.deleteFromRightTask= +observe.datasynchro.prepare.copyToLeftTask= +observe.datasynchro.prepare.copyToRightTask= +observe.datasynchro.prepare.deleteFromLeftTask= +observe.datasynchro.prepare.deleteFromRightTask= observe.encounter.action.create= observe.encounter.action.create.tip= observe.encounter.count= diff --git a/observe-application-swing/src/main/resources/i18n/observe-application-swing_fr_FR.properties b/observe-application-swing/src/main/resources/i18n/observe-application-swing_fr_FR.properties index 279004e..811c813 100644 --- a/observe-application-swing/src/main/resources/i18n/observe-application-swing_fr_FR.properties +++ b/observe-application-swing/src/main/resources/i18n/observe-application-swing_fr_FR.properties @@ -1045,6 +1045,10 @@ observe.datasynchro.copyToLeftTask=Copier vers la base de gauche \: %s - %s observe.datasynchro.copyToRightTask=Copier vers la base de droite \: %s - %s observe.datasynchro.deleteFromLeftTask=Supprimer de la base de gauche \: %s - %s observe.datasynchro.deleteFromRightTask=Supprimer de la base de droite \: %s - %s +observe.datasynchro.prepare.copyToLeftTask=Préparation de la recopie vers la base de gauche \: %s - %s +observe.datasynchro.prepare.copyToRightTask=Préparation de la recopie vers la base de droite \: %s - %s +observe.datasynchro.prepare.deleteFromLeftTask=Préparation de la suppression de la base de gauche \: %s - %s +observe.datasynchro.prepare.deleteFromRightTask=Préparation de la suppression de la base de droite \: %s - %s observe.encounter.action.create=Insérer cette rencontre observe.encounter.action.create.tip=Insérer cette rencontre observe.encounter.count=Nombre -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.
participants (1)
-
codelutin.com scm