branch feature/7739 updated (3a9e5d3 -> a9db994)
This is an automated email from the git hooks/post-receive script. New change to branch feature/7739 in repository tutti. See https://gitlab.nuiton.org/codelutin/tutti.git from 3a9e5d3 Début de migration des interfaces graphiques pour la synchronisation (See #7739) new 300ca6a Correction du timestamp lors de la génération du sql (je ne comprends pas pk, mais ça fonctionne :() new a9db994 Amélioration du message de résumé 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 a9db9948012902229886b8b5f812e4efe181fba8 Author: Tony CHEMIT <chemit@codelutin.com> Date: Wed Jul 13 13:32:46 2016 +0200 Amélioration du message de résumé commit 300ca6a772c97d92276f269609d61011eae2d194 Author: Tony CHEMIT <chemit@codelutin.com> Date: Wed Jul 13 13:30:16 2016 +0200 Correction du timestamp lors de la génération du sql (je ne comprends pas pk, mais ça fonctionne :() Summary of changes: .../fr/ird/observe/ui/admin/synchronize/SynchronizeUIHandler.java | 8 ++++---- .../resources/i18n/observe-application-swing_fr_FR.properties | 8 ++++---- .../service/actions/synchro/InsertSqlStatementGenerator.java | 7 ++++++- .../service/actions/synchro/UpdateSqlStatementGenerator.java | 6 +++++- 4 files changed, 19 insertions(+), 10 deletions(-) -- 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/7739 in repository tutti. See https://gitlab.nuiton.org/codelutin/tutti.git commit 300ca6a772c97d92276f269609d61011eae2d194 Author: Tony CHEMIT <chemit@codelutin.com> Date: Wed Jul 13 13:30:16 2016 +0200 Correction du timestamp lors de la génération du sql (je ne comprends pas pk, mais ça fonctionne :() --- .../service/actions/synchro/InsertSqlStatementGenerator.java | 7 ++++++- .../service/actions/synchro/UpdateSqlStatementGenerator.java | 6 +++++- 2 files changed, 11 insertions(+), 2 deletions(-) diff --git a/observe-services-topia/src/main/java/fr/ird/observe/services/service/actions/synchro/InsertSqlStatementGenerator.java b/observe-services-topia/src/main/java/fr/ird/observe/services/service/actions/synchro/InsertSqlStatementGenerator.java index 9dcd36c..760e993 100644 --- a/observe-services-topia/src/main/java/fr/ird/observe/services/service/actions/synchro/InsertSqlStatementGenerator.java +++ b/observe-services-topia/src/main/java/fr/ird/observe/services/service/actions/synchro/InsertSqlStatementGenerator.java @@ -94,7 +94,7 @@ public class InsertSqlStatementGenerator<R extends ReferentialDto> { addStringParameter(referentialDto.getId(), parameters); addOtherTypeParameter(referentialDto.getVersion(), parameters); - addDateParameter(referentialDto.getCreateDate(), parameters); + addTimestampParameter(referentialDto.getCreateDate(), parameters); Map<String, Object> simpleParameters = binder.obtainProperties(referentialDto, true, true, simplePropertyNames); for (String simplePropertyName : simplePropertyNames) { @@ -213,6 +213,11 @@ public class InsertSqlStatementGenerator<R extends ReferentialDto> { parameters.add("'" + parameter + "'"); } + private void addTimestampParameter(Date parameter, List<String> parameters) { + parameters.add("'" + parameter + "'::timestamp"); + } + + private void addEnumParameter(Enum parameter, List<String> parameters) { parameters.add("" + parameter.ordinal()); } diff --git a/observe-services-topia/src/main/java/fr/ird/observe/services/service/actions/synchro/UpdateSqlStatementGenerator.java b/observe-services-topia/src/main/java/fr/ird/observe/services/service/actions/synchro/UpdateSqlStatementGenerator.java index ff34ac9..513a5a2 100644 --- a/observe-services-topia/src/main/java/fr/ird/observe/services/service/actions/synchro/UpdateSqlStatementGenerator.java +++ b/observe-services-topia/src/main/java/fr/ird/observe/services/service/actions/synchro/UpdateSqlStatementGenerator.java @@ -95,7 +95,7 @@ public class UpdateSqlStatementGenerator<R extends ReferentialDto> { StringBuilder parameters = new StringBuilder(); addOtherTypeParameter(TopiaEntity.PROPERTY_TOPIA_VERSION, referentialDto.getVersion(), parameters); - addDateParameter(TopiaEntity.PROPERTY_TOPIA_CREATE_DATE, referentialDto.getCreateDate(), parameters); + addTimestampParameter(TopiaEntity.PROPERTY_TOPIA_CREATE_DATE, referentialDto.getCreateDate(), parameters); if (simplePropertyNames.length > 0) { @@ -246,6 +246,10 @@ public class UpdateSqlStatementGenerator<R extends ReferentialDto> { addParameter0(columnName, "'" + parameter + "'", parameters); } + private void addTimestampParameter(String columnName, Date parameter, StringBuilder parameters) { + addParameter0(columnName, "'" + parameter + "'::timestamp", parameters); + } + private void addEnumParameter(String columnName, Enum parameter, StringBuilder parameters) { addParameter0(columnName, "" + parameter.ordinal(), parameters); } -- 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/7739 in repository tutti. See https://gitlab.nuiton.org/codelutin/tutti.git commit a9db9948012902229886b8b5f812e4efe181fba8 Author: Tony CHEMIT <chemit@codelutin.com> Date: Wed Jul 13 13:32:46 2016 +0200 Amélioration du message de résumé --- .../fr/ird/observe/ui/admin/synchronize/SynchronizeUIHandler.java | 8 ++++---- .../resources/i18n/observe-application-swing_fr_FR.properties | 8 ++++---- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/observe-application-swing/src/main/java/fr/ird/observe/ui/admin/synchronize/SynchronizeUIHandler.java b/observe-application-swing/src/main/java/fr/ird/observe/ui/admin/synchronize/SynchronizeUIHandler.java index a1a22ec..94fde71 100644 --- a/observe-application-swing/src/main/java/fr/ird/observe/ui/admin/synchronize/SynchronizeUIHandler.java +++ b/observe-application-swing/src/main/java/fr/ird/observe/ui/admin/synchronize/SynchronizeUIHandler.java @@ -294,7 +294,7 @@ public class SynchronizeUIHandler extends AdminTabUIHandler { Collection<String> referentialAdded = referentialSynchronizeResult.getReferentialAdded(referentialName); if (CollectionUtils.isNotEmpty(referentialAdded)) { - sendMessage(t("observe.message.synchro.referentiel.was.added", referentialAdded.size())); + sendMessage(t("observe.message.synchro.referentiel.was.added", referentialName, referentialAdded.size())); for (String id : referentialAdded) { sendMessage(" - " + id); } @@ -304,7 +304,7 @@ public class SynchronizeUIHandler extends AdminTabUIHandler { Collection<String> referentialUpdated = referentialSynchronizeResult.getReferentialUpdated(referentialName); if (CollectionUtils.isNotEmpty(referentialUpdated)) { - sendMessage(t("observe.message.synchro.referentiel.was.modified", referentialUpdated.size())); + sendMessage(t("observe.message.synchro.referentiel.was.modified", referentialName, referentialUpdated.size())); for (String id : referentialUpdated) { sendMessage(" - " + id); } @@ -314,7 +314,7 @@ public class SynchronizeUIHandler extends AdminTabUIHandler { Collection<String> referentialRemoved = referentialSynchronizeResult.getReferentialRemoved(referentialName); if (CollectionUtils.isNotEmpty(referentialRemoved)) { - sendMessage(t("observe.message.synchro.referentiel.was.removed", referentialRemoved.size())); + sendMessage(t("observe.message.synchro.referentiel.was.removed", referentialName, referentialRemoved.size())); for (String id : referentialRemoved) { sendMessage(" - " + id); } @@ -324,7 +324,7 @@ public class SynchronizeUIHandler extends AdminTabUIHandler { Collection<Pair<String, String>> referentialReplaced = referentialSynchronizeResult.getReferentialReplaced(referentialName); if (CollectionUtils.isNotEmpty(referentialReplaced)) { - sendMessage(t("observe.message.synchro.referentiel.was.replaced", referentialReplaced.size())); + sendMessage(t("observe.message.synchro.referentiel.was.replaced", referentialName, referentialReplaced.size())); for (Pair<String, String> ids : referentialReplaced) { sendMessage(" - " + ids.getLeft() + " → " + ids.getRight()); } 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 fb8556a..07ae77a 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 @@ -1544,10 +1544,10 @@ observe.message.synchro.operation.done=Opération terminée le %1$td/%1$tm/%1$tY observe.message.synchro.operation.failed=L'opération a échouée observe.message.synchro.operation.needFix=L'opération requière des corrections. observe.message.synchro.ref.is.updtodate=Le référentiel de la base locale est à jour, aucune correction requise. -observe.message.synchro.referentiel.was.added=Des données ont été ajoutées au référentiel distant (%1$d objet(s)) -observe.message.synchro.referentiel.was.modified=Des données ont été modifiées sur le référentiel distant (%1$d objet(s)) -observe.message.synchro.referentiel.was.removed=Des données ont été supprimées du réferentiel distant (%1$d objet(s)) -observe.message.synchro.referentiel.was.replaced= +observe.message.synchro.referentiel.was.added=Des données (type %s) ont été ajoutées au référentiel distant (%1$d objet(s)) +observe.message.synchro.referentiel.was.modified=Des données (type %s) ont été modifiées sur le référentiel distant (%1$d objet(s)) +observe.message.synchro.referentiel.was.removed=Des données (type %s) ont été supprimées du réferentiel distant (%1$d objet(s)) +observe.message.synchro.referentiel.was.replaced=Des données (type %s) ont été remplacées dans le référentiel local (%1$d objet(s)) observe.message.table.editBean.modified=L'entrée en cours d'édition a été modifiée et est valide. observe.message.table.editBean.modified.but.invalid=L'entrée en cours d'édition a été modifiée, mais n'est pas valide. observe.message.updating.floatingObject=L'objet flottant est en cours de modification. -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.
participants (1)
-
codelutin.com scm