- Tutti-commits - mailman.cloud.codelutin.com

branch feature/6116 updated (23e483d -> 94a14d6)
by codelutin.com scm Jan. 13, 2016

Jan. 13, 2016

This is an automated email from the git hooks/post-receive script. New change to branch feature/6116 in repository tutti. See http://git.codelutin.com/tutti.git from 23e483d fix test adds 94a14d6 fix tests No new revisions were added by this update. Summary of changes: .../entities/protocol/TuttiProtocols.java | 39 ++++++++++++---------- .../pupitri/PupitriImportServiceAno5079Test.java | 2 +- .../service/pupitri/PupitriImportServiceTest.java | 2 +- 3 files changed, 23 insertions(+), 20 deletions(-) -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm(a)codelutin.com>.

1 0

branch feature/6116 updated (d348a15 -> 23e483d)
by codelutin.com scm Jan. 13, 2016

Jan. 13, 2016

This is an automated email from the git hooks/post-receive script. New change to branch feature/6116 in repository tutti. See http://git.codelutin.com/tutti.git from d348a15 Merge branch 'feature/6116' of gitlab.nuiton.org:codelutin/tutti into feature/6116 adds 23e483d fix test No new revisions were added by this update. Summary of changes: .../ifremer/tutti/service/pupitri/PupitriImportServiceEvo6116Test.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm(a)codelutin.com>.

1 0

branch feature/6116 updated (eaa28b6 -> d348a15)
by codelutin.com scm Jan. 13, 2016

Jan. 13, 2016

This is an automated email from the git hooks/post-receive script. New change to branch feature/6116 in repository tutti. See http://git.codelutin.com/tutti.git from eaa28b6 ne pas mettre les lignes créées dans le rapport (fixes #6116) new 799b75f ajout des catégories meme si elles ne sont pas dans le fichier (refs #6116) new 144713e ajout des lots manquants lors de l'import (refs #6116) new 9989c2e ajout de la conf dans l'ui (fixes #6116) new d348a15 Merge branch 'feature/6116' of gitlab.nuiton.org:codelutin/tutti into feature/6116 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 d348a155982a4e859d0a3f38451ac735a708a257 Merge: eaa28b6 9989c2e Author: Kevin Morin <morin(a)codelutin.com> Date: Wed Jan 13 11:09:26 2016 +0100 Merge branch 'feature/6116' of gitlab.nuiton.org:codelutin/tutti into feature/6116 Conflicts: tutti-service/src/main/java/fr/ifremer/tutti/service/pupitri/PupitriImportService.java tutti-service/src/main/java/fr/ifremer/tutti/service/pupitri/PupitriSpeciesContext.java tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/actions/ImportPupitriAction.java tutti-ui-swing/src/main/resources/i18n/tutti-ui-swing_en_GB.properties tutti-ui-swing/src/main/resources/i18n/tutti-ui-swing_fr_FR.properties commit 9989c2e8d16d54994e01faf9bfd270c91037641c Author: Kevin Morin <morin(a)codelutin.com> Date: Tue Jan 12 18:24:04 2016 +0100 ajout de la conf dans l'ui (fixes #6116) commit 144713e36face2264d566ba00f7d4e229e1e7943 Author: Kevin Morin <morin(a)codelutin.com> Date: Tue Jan 12 17:28:39 2016 +0100 ajout des lots manquants lors de l'import (refs #6116) commit 799b75f9749066eed9d90144212120381dc40eea Author: Kevin Morin <morin(a)codelutin.com> Date: Mon Jan 11 18:11:30 2016 +0100 ajout des catégories meme si elles ne sont pas dans le fichier (refs #6116) Summary of changes: -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm(a)codelutin.com>.

1 4

branch feature/6116 updated (9989c2e -> eaa28b6)
by codelutin.com scm Jan. 13, 2016

Jan. 13, 2016

This is an automated email from the git hooks/post-receive script. New change to branch feature/6116 in repository tutti. See http://git.codelutin.com/tutti.git omits 9989c2e ajout de la conf dans l'ui (fixes #6116) omits 144713e ajout des lots manquants lors de l'import (refs #6116) omits 799b75f ajout des catégories meme si elles ne sont pas dans le fichier (refs #6116) adds d5c74b5 séparation du service d'import pupitri en 2 parties : - lecture des fichiers d'import - enregistrement des données importées cela permet de saisir un poids total de melag avant de faire l'élévation des poids (fixes #6592) adds 772a8ea Fix javadoc adds 55d4672 Fixes #6592 Merge branch 'feature/6592' into develop adds 6e150ec Passage en java 8u65 (Fixes #7898) adds 0f49e69 ordonnancement des lignes importées par rapport à l'ordinal du signe dans l'enum (fixes #6061) adds e842320 Simplification de l'énumération Signs adds 68f6265 Amélioration du code pour créer les ensemble immuables adds 33c2d43 Fixes #6061. Merge branch 'feature/6061' into develop new 7138094 ajout des catégories meme si elles ne sont pas dans le fichier (refs #6116) new aaa14fe ajout des lots manquants lors de l'import (refs #6116) new ae09213 ajout de la conf dans l'ui (fixes #6116) new ef240ad ajout de test + création des lots manquants avec des poids nuls (fixes #6116) new a0916bf merge with develop new eaa28b6 ne pas mettre les lignes créées dans le rapport (fixes #6116) This update added new revisions after undoing existing revisions. That is to say, some revisions that were in the old version of the branch are not in the new version. This situation occurs when a user --force pushes a change and generates a repository containing something like this: * -- * -- B -- O -- O -- O (9989c2e) \ N -- N -- N refs/heads/feature/6116 (eaa28b6) You should already have received notification emails for all of the O revisions, and so the following emails describe only the N revisions from the common base, B. Any revisions marked "omits" are not gone; other references still refer to them. Any revisions marked "discards" are gone forever. The 6 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 eaa28b632060c4aa40d45410afb79960030058ae Author: Kevin Morin <morin(a)codelutin.com> Date: Wed Jan 13 11:03:09 2016 +0100 ne pas mettre les lignes créées dans le rapport (fixes #6116) commit a0916bffb802d19478a65c0fecd3f44eaa0de104 Author: Kevin Morin <morin(a)codelutin.com> Date: Wed Jan 13 10:58:08 2016 +0100 merge with develop commit ef240adc1b1e0d9d3931f0aa675b09ab5af160f3 Author: Kevin Morin <morin(a)codelutin.com> Date: Wed Jan 13 10:38:26 2016 +0100 ajout de test + création des lots manquants avec des poids nuls (fixes #6116) commit ae09213e820564a4e68e51b6fa95b9e3b4267843 Author: Kevin Morin <morin(a)codelutin.com> Date: Tue Jan 12 18:24:04 2016 +0100 ajout de la conf dans l'ui (fixes #6116) commit aaa14fe16955a3e89dc30008cd30175785889226 Author: Kevin Morin <morin(a)codelutin.com> Date: Tue Jan 12 17:28:39 2016 +0100 ajout des lots manquants lors de l'import (refs #6116) commit 7138094370a41953447ac9c3113b3182d798172b Author: Kevin Morin <morin(a)codelutin.com> Date: Mon Jan 11 18:11:30 2016 +0100 ajout des catégories meme si elles ne sont pas dans le fichier (refs #6116) Summary of changes: pom.xml | 2 +- .../tutti/service/pupitri/PupitriImportResult.java | 4 + .../service/pupitri/PupitriImportService.java | 53 +++- .../service/pupitri/PupitriSpeciesContext.java | 17 +- .../fr/ifremer/tutti/service/pupitri/Signs.java | 128 ++------- .../pupitri/PupitriImportServiceEvo6116Test.java | 293 +++++++++++++++++++++ .../pupitri/PupitriImportServiceEvo6149Test.java | 4 +- ...t.java => PupitriImportServiceEvo6592Test.java} | 39 +-- .../src/test/resources/pupitri/evo-6116.car | 7 + .../pupitri/{evo-6149.tnk => evo-6116.tnk} | 0 .../test/resources/pupitri/evo-6116.tuttiProtocol | 198 ++++++++++++++ .../pupitri/{evo-6149.car => evo-6592.car} | 0 .../pupitri/{evo-6149.tnk => evo-6592.tnk} | 0 ...o-6149.tuttiProtocol => evo-6592.tuttiProtocol} | 0 .../species/ImportPupitriMelagWeightPopupUI.css} | 43 ++- .../species/ImportPupitriMelagWeightPopupUI.jaxx} | 46 ++-- .../ImportPupitriMelagWeightPopupUIHandler.java | 79 ++++++ .../ImportPupitriMelagWeightPopupUIModel.java | 35 +++ .../species/actions/ImportPupitriAction.java | 60 +++-- ...mportPupitriMelagWeightPopupValidateAction.java | 20 ++ .../resources/i18n/tutti-ui-swing_en_GB.properties | 6 + .../resources/i18n/tutti-ui-swing_fr_FR.properties | 3 + 22 files changed, 829 insertions(+), 208 deletions(-) create mode 100644 tutti-service/src/test/java/fr/ifremer/tutti/service/pupitri/PupitriImportServiceEvo6116Test.java copy tutti-service/src/test/java/fr/ifremer/tutti/service/pupitri/{PupitriImportServiceEvo6149Test.java => PupitriImportServiceEvo6592Test.java} (86%) create mode 100644 tutti-service/src/test/resources/pupitri/evo-6116.car copy tutti-service/src/test/resources/pupitri/{evo-6149.tnk => evo-6116.tnk} (100%) create mode 100644 tutti-service/src/test/resources/pupitri/evo-6116.tuttiProtocol copy tutti-service/src/test/resources/pupitri/{evo-6149.car => evo-6592.car} (100%) copy tutti-service/src/test/resources/pupitri/{evo-6149.tnk => evo-6592.tnk} (100%) copy tutti-service/src/test/resources/pupitri/{evo-6149.tuttiProtocol => evo-6592.tuttiProtocol} (100%) copy tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/{util/auth/LoginUI.css => content/operation/catches/species/ImportPupitriMelagWeightPopupUI.css} (51%) copy tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/{util/auth/LoginUI.jaxx => content/operation/catches/species/ImportPupitriMelagWeightPopupUI.jaxx} (53%) create mode 100644 tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/ImportPupitriMelagWeightPopupUIHandler.java create mode 100644 tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/ImportPupitriMelagWeightPopupUIModel.java create mode 100644 tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/actions/ImportPupitriMelagWeightPopupValidateAction.java -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm(a)codelutin.com>.

1 6

branch develop updated (6e150ec -> 33c2d43)
by codelutin.com scm Jan. 13, 2016

Jan. 13, 2016

This is an automated email from the git hooks/post-receive script. New change to branch develop in repository tutti. See http://git.codelutin.com/tutti.git from 6e150ec Passage en java 8u65 (Fixes #7898) adds 0f49e69 ordonnancement des lignes importées par rapport à l'ordinal du signe dans l'enum (fixes #6061) adds e842320 Simplification de l'énumération Signs adds 68f6265 Amélioration du code pour créer les ensemble immuables new 33c2d43 Fixes #6061. Merge branch 'feature/6061' into develop The 1 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 33c2d4305cc93f0bcbde6a98d7e8c65829af5b69 Merge: 6e150ec 68f6265 Author: Tony CHEMIT <chemit(a)codelutin.com> Date: Wed Jan 13 09:39:55 2016 +0100 Fixes #6061. Merge branch 'feature/6061' into develop Summary of changes: .../service/pupitri/PupitriSpeciesContext.java | 17 ++- .../fr/ifremer/tutti/service/pupitri/Signs.java | 128 ++++----------------- 2 files changed, 33 insertions(+), 112 deletions(-) -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm(a)codelutin.com>.

1 1

branch feature/6061 deleted (was 68f6265)
by codelutin.com scm Jan. 13, 2016

Jan. 13, 2016

This is an automated email from the git hooks/post-receive script. New change to branch feature/6061 in repository tutti. See http://git.codelutin.com/tutti.git was 68f6265 Amélioration du code pour créer les ensemble immuables The revisions that were on this branch are still contained in other references; therefore, this change does not discard any commits from the repository. -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm(a)codelutin.com>.

1 0

branch feature/6061 updated (0f49e69 -> 68f6265)
by codelutin.com scm Jan. 13, 2016

Jan. 13, 2016

This is an automated email from the git hooks/post-receive script. New change to branch feature/6061 in repository tutti. See http://git.codelutin.com/tutti.git from 0f49e69 ordonnancement des lignes importées par rapport à l'ordinal du signe dans l'enum (fixes #6061) adds e842320 Simplification de l'énumération Signs adds 68f6265 Amélioration du code pour créer les ensemble immuables No new revisions were added by this update. Summary of changes: .../service/pupitri/PupitriSpeciesContext.java | 13 +-- .../fr/ifremer/tutti/service/pupitri/Signs.java | 129 ++++----------------- 2 files changed, 31 insertions(+), 111 deletions(-) -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm(a)codelutin.com>.

1 0

branch feature/6061 created (now 0f49e69)
by codelutin.com scm Jan. 12, 2016

Jan. 12, 2016

This is an automated email from the git hooks/post-receive script. New change to branch feature/6061 in repository tutti. See http://git.codelutin.com/tutti.git at 0f49e69 ordonnancement des lignes importées par rapport à l'ordinal du signe dans l'enum (fixes #6061) This branch includes the following new commits: new 0f49e69 ordonnancement des lignes importées par rapport à l'ordinal du signe dans l'enum (fixes #6061) The 1 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 0f49e697cbc76c594dce0c103f89b6e4f79cc698 Author: Kevin Morin <morin(a)codelutin.com> Date: Tue Jan 12 18:30:59 2016 +0100 ordonnancement des lignes importées par rapport à l'ordinal du signe dans l'enum (fixes #6061) -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm(a)codelutin.com>.

1 1

branch feature/6116 updated (799b75f -> 9989c2e)
by codelutin.com scm Jan. 12, 2016

Jan. 12, 2016

This is an automated email from the git hooks/post-receive script. New change to branch feature/6116 in repository tutti. See http://git.codelutin.com/tutti.git from 799b75f ajout des catégories meme si elles ne sont pas dans le fichier (refs #6116) adds 144713e ajout des lots manquants lors de l'import (refs #6116) adds 9989c2e ajout de la conf dans l'ui (fixes #6116) No new revisions were added by this update. Summary of changes: .../java/fr/ifremer/tutti/TuttiConfiguration.java | 4 + .../fr/ifremer/tutti/TuttiConfigurationOption.java | 8 ++ .../entities/protocol/TuttiProtocols.java | 31 ++++++ .../i18n/tutti-persistence_en_GB.properties | 1 + .../i18n/tutti-persistence_fr_FR.properties | 1 + .../pupitri/CarrouselImportRequestResult.java | 8 +- .../service/pupitri/PupitriImportService.java | 109 ++++++++++++++++++--- .../service/pupitri/PupitriSpeciesContext.java | 55 ++++++----- .../swing/content/config/TuttiConfigUIHandler.java | 4 + .../catches/species/ImportPupitriPopupUI.css | 9 ++ .../catches/species/ImportPupitriPopupUI.jaxx | 24 +++-- .../species/ImportPupitriPopupUIHandler.java | 82 +++++++++------- .../catches/species/ImportPupitriPopupUIModel.java | 54 ++++++++++ .../species/actions/ImportPupitriAction.java | 17 +++- .../resources/i18n/tutti-ui-swing_en_GB.properties | 4 + .../resources/i18n/tutti-ui-swing_fr_FR.properties | 4 + 16 files changed, 330 insertions(+), 85 deletions(-) create mode 100644 tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/ImportPupitriPopupUIModel.java -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm(a)codelutin.com>.

1 0

branch develop updated (55d4672 -> 6e150ec)
by codelutin.com scm Jan. 12, 2016

Jan. 12, 2016

This is an automated email from the git hooks/post-receive script. New change to branch develop in repository tutti. See http://git.codelutin.com/tutti.git from 55d4672 Fixes #6592 Merge branch 'feature/6592' into develop new 6e150ec Passage en java 8u65 (Fixes #7898) The 1 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 6e150ecb4d815d56ae92f72e3a66c5d98598ea73 Author: Tony CHEMIT <chemit(a)codelutin.com> Date: Tue Jan 12 12:37:14 2016 +0100 Passage en java 8u65 (Fixes #7898) Summary of changes: pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm(a)codelutin.com>.

1 1