- Wao-commits - mailman.cloud.codelutin.com

branch develop updated (149e50f -> fe00227)
by codelutin.com scm March 3, 2015

March 3, 2015

This is an automated email from the git hooks/post-receive script. New change to branch develop in repository wao. See http://git.codelutin.com/wao.git from 149e50f Modification du build pour filtrer web.xml afin d'injecter la version du projet dans la description du war (termine #6734) new fe00227 L'observateur peut désormais filtrer selon le labo/la société sur scléro (testable-client #6763) 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 fe002277ef824301613c424a65c9124d04129cbb Author: Brendan Le Ny <bleny(a)codelutin.com> Date: Tue Mar 3 17:56:25 2015 +0100 L'observateur peut désormais filtrer selon le labo/la société sur scléro (testable-client #6763) Summary of changes: .../src/main/java/fr/ifremer/wao/services/AuthenticatedWaoUser.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 1

branch develop updated (616cce3 -> 149e50f)
by codelutin.com scm March 3, 2015

March 3, 2015

This is an automated email from the git hooks/post-receive script. New change to branch develop in repository wao. See http://git.codelutin.com/wao.git from 616cce3 Correction d'un bogue dans le calcul de mois ayant le plus de jour (on ne mettait pas à jour le max, donc on tombait toujours sur le dernier mois) (testable-cl #6392)) new 149e50f Modification du build pour filtrer web.xml afin d'injecter la version du projet dans la description du war (termine #6734) 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 149e50f515999f4f219c7d2970c3b5256b6bf49e Author: Brendan Le Ny <bleny(a)codelutin.com> Date: Tue Mar 3 11:21:28 2015 +0100 Modification du build pour filtrer web.xml afin d'injecter la version du projet dans la description du war (termine #6734) Summary of changes: wao-web/pom.xml | 8 ++++++++ 1 file changed, 8 insertions(+) -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm(a)codelutin.com>.

1 1

branch develop updated (bab86b3 -> 616cce3)
by codelutin.com scm March 3, 2015

March 3, 2015

This is an automated email from the git hooks/post-receive script. New change to branch develop in repository wao. See http://git.codelutin.com/wao.git from bab86b3 Fusion de la branche 'feature/6733' dans develop (testable-cl #6733) new 616cce3 Correction d'un bogue dans le calcul de mois ayant le plus de jour (on ne mettait pas à jour le max, donc on tombait toujours sur le dernier mois) (testable-cl #6392)) 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 616cce34c08c3d62770e36a79baf508b96faec56 Author: Brendan Le Ny <bleny(a)codelutin.com> Date: Tue Mar 3 10:25:01 2015 +0100 Correction d'un bogue dans le calcul de mois ayant le plus de jour (on ne mettait pas à jour le max, donc on tombait toujours sur le dernier mois) (testable-cl #6392)) Summary of changes: wao-persistence/src/main/java/fr/ifremer/wao/WaoUtils.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm(a)codelutin.com>.

1 1

branch develop updated (ee1ac27 -> bab86b3)
by codelutin.com scm March 2, 2015

March 2, 2015

This is an automated email from the git hooks/post-receive script. New change to branch develop in repository wao. See http://git.codelutin.com/wao.git from ee1ac27 Correction du build (les données de tests datent d'avant la première mise en prod de Wao donc on change la date de contrôle) new 26102ed On revoit le calcul de la synthèse pour exprimer le prévisionnel, on introduit une nouvelle action pour le filtrage vu que les filtres doivent intégrer le planifé et pas seulement les contacts new bab86b3 Fusion de la branche 'feature/6733' dans develop (testable-cl #6733) 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 bab86b3b84b189e33dab0f5a54d42a8681d1c579 Merge: ee1ac27 26102ed Author: Brendan Le Ny <bleny(a)codelutin.com> Date: Mon Mar 2 18:22:08 2015 +0100 Fusion de la branche 'feature/6733' dans develop (testable-cl #6733) commit 26102edd13dd8548146f0583088d1b9e8155ffa4 Author: Brendan Le Ny <bleny(a)codelutin.com> Date: Mon Mar 2 18:20:30 2015 +0100 On revoit le calcul de la synthèse pour exprimer le prévisionnel, on introduit une nouvelle action pour le filtrage vu que les filtres doivent intégrer le planifé et pas seulement les contacts Summary of changes: .../service/ContactsFilterValuesCacheKey.java | 3 +- .../services/service/SampleRowsFilterValues.java | 9 +- .../fr/ifremer/wao/services/service/Synthesis.java | 22 +++++ .../wao/services/service/SynthesisCacheKey.java | 49 +++++++++- .../wao/services/service/SynthesisService.java | 103 +++++++++++++++------ .../fr/ifremer/wao/web/action/SynthesisAction.java | 2 +- ...n.java => SynthesisFilterValuesJsonAction.java} | 18 ++-- .../src/main/webapp/WEB-INF/content/synthesis.jsp | 4 +- .../src/main/webapp/WEB-INF/decorators/layout.jsp | 2 + 9 files changed, 162 insertions(+), 50 deletions(-) copy wao-web/src/main/java/fr/ifremer/wao/web/action/{ContactsFilterValuesJsonAction.java => SynthesisFilterValuesJsonAction.java} (78%) -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm(a)codelutin.com>.

1 2

branch develop updated (b44b984 -> ee1ac27)
by codelutin.com scm March 2, 2015

March 2, 2015

This is an automated email from the git hooks/post-receive script. New change to branch develop in repository wao. See http://git.codelutin.com/wao.git from b44b984 On contrôle la cohérence des dates de début et de fin de période à l'import du plan (termine #6731) new 272bc5e Correction d'un appel constructeur avec <> manquant new ee1ac27 Correction du build (les données de tests datent d'avant la première mise en prod de Wao donc on change la date de contrôle) 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 ee1ac27306ba1f6744eab87e9cf970a3562ee939 Author: Brendan Le Ny <bleny(a)codelutin.com> Date: Mon Mar 2 11:32:01 2015 +0100 Correction du build (les données de tests datent d'avant la première mise en prod de Wao donc on change la date de contrôle) commit 272bc5efa4bd133491494a80ed28ed3cd10dd8d8 Author: Brendan Le Ny <bleny(a)codelutin.com> Date: Mon Mar 2 10:57:01 2015 +0100 Correction d'un appel constructeur avec <> manquant Summary of changes: wao-persistence/src/main/java/fr/ifremer/wao/WaoUtils.java | 2 +- .../src/main/java/fr/ifremer/wao/services/service/Synthesis.java | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm(a)codelutin.com>.

1 2

branch develop updated (1d8b333 -> b44b984)
by codelutin.com scm March 2, 2015

March 2, 2015

This is an automated email from the git hooks/post-receive script. New change to branch develop in repository wao. See http://git.codelutin.com/wao.git from 1d8b333 Correction d'une expression OGNL (termine #6732) new b44b984 On contrôle la cohérence des dates de début et de fin de période à l'import du plan (termine #6731) 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 b44b984df329b624cecb6bfac3a789ea374e584b Author: Brendan Le Ny <bleny(a)codelutin.com> Date: Mon Mar 2 10:47:24 2015 +0100 On contrôle la cohérence des dates de début et de fin de période à l'import du plan (termine #6731) Summary of changes: .../services/service/csv/SamplingPlanImportExportModel.java | 10 ++++++---- ...DayParserFormatter.java => MonthYearParserFormatter.java} | 12 ++++++------ 2 files changed, 12 insertions(+), 10 deletions(-) copy wao-services/src/main/java/fr/ifremer/wao/services/service/csv/operations/{DayParserFormatter.java => MonthYearParserFormatter.java} (82%) -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm(a)codelutin.com>.

1 1

branch develop updated (4bf3b56 -> 1d8b333)
by codelutin.com scm March 2, 2015

March 2, 2015

This is an automated email from the git hooks/post-receive script. New change to branch develop in repository wao. See http://git.codelutin.com/wao.git from 4bf3b56 On remanie la génération du plan ObsVente pour ne plus lire en base l'estimé et le réalisé. Du coup, tous les programmes n'utilisent plus les champs dénormalisés de la base. new 1d8b333 Correction d'une expression OGNL (termine #6732) 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 1d8b3330e71f09ff3e1848939e8fcadfb436794b Author: Brendan Le Ny <bleny(a)codelutin.com> Date: Mon Mar 2 10:37:01 2015 +0100 Correction d'une expression OGNL (termine #6732) Summary of changes: wao-web/src/main/webapp/WEB-INF/content/boat-details.jsp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm(a)codelutin.com>.

1 1

branch develop updated (a4b5b34 -> 4bf3b56)
by codelutin.com scm Feb. 26, 2015

Feb. 26, 2015

This is an automated email from the git hooks/post-receive script. New change to branch develop in repository wao. See http://git.codelutin.com/wao.git from a4b5b34 Merge branch 'feature/6452' into develop new 5be88b9 Mise à jour des dépendances new 4bf3b56 On remanie la génération du plan ObsVente pour ne plus lire en base l'estimé et le réalisé. Du coup, tous les programmes n'utilisent plus les champs dénormalisés de la base. 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 4bf3b56fbaf10645699145a8b4c68f0d6d7038fc Author: Brendan Le Ny <bleny(a)codelutin.com> Date: Thu Feb 26 18:02:54 2015 +0100 On remanie la génération du plan ObsVente pour ne plus lire en base l'estimé et le réalisé. Du coup, tous les programmes n'utilisent plus les champs dénormalisés de la base. commit 5be88b9c80d3c5c7d509be80c8cd461540a44aca Author: Brendan Le Ny <bleny(a)codelutin.com> Date: Thu Feb 26 17:01:58 2015 +0100 Mise à jour des dépendances Summary of changes: pom.xml | 12 +- .../java/fr/ifremer/wao/entity/SampleMonths.java | 70 -------- .../java/fr/ifremer/wao/entity/SampleRows.java | 19 --- .../service/ObsVenteSamplingPlanBuilder.java | 178 +++++++++------------ .../service/ObsVenteSamplingPlanService.java | 7 +- 5 files changed, 86 insertions(+), 200 deletions(-) delete mode 100644 wao-persistence/src/main/java/fr/ifremer/wao/entity/SampleMonths.java -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm(a)codelutin.com>.

1 2

branch develop updated (90c3842 -> a4b5b34)
by codelutin.com scm Feb. 26, 2015

Feb. 26, 2015

This is an automated email from the git hooks/post-receive script. New change to branch develop in repository wao. See http://git.codelutin.com/wao.git from 90c3842 [jgitflow-maven-plugin]Updating develop poms back to pre merge state adds 1322a83 Remaniement de la génération du graphique du planifié vs réalisé, on introduit un pattern Template Method et trois implémentations (une par programme) adds 49a6592 Factorisation de la déclaration du converter, on applique le même pour toutes les instances de JFreeChart adds b54359d Ajout de .chart sur toutes les images correspondantes et mise en place d'une marge adds b2f3804 Dans la synthèse ObsMer on, montre le graphique du réalisé en jours de mers adds 237cadb Suppression de code mort new 34567cf Dans la synthèse, on modifie le TemplateMethod pour pouvoir permettre de préciser un réalisé sur plusieurs mois new bed195a Récupération via cherry-pick, dans WaoUtils, de la méthode permettant de déduire le mois sur lequel compter le contact ObsMer new 3c6b59f Dans la synthèse, on compte désormais l'observation sur le mois avec le plus de jours de mer new 5f70e8a Correction d'un bogue dans le calcul du réalisé dans les synthèses new e77194d Merge branch 'feature/5923' into develop adds ecc4187 Lors du calcul du plan ObsMer, on ne se repose plus sur les données dénormalisées en base mais on calcul les nombres d'observations par mois en même temps que le nombre de jours par mois. En même temps, on corrige le mode de calcul en affectant la marée au mois ayant le plus de jours (testable-cl #6392) adds 6fa7fe7 Extraction, dans WaoUtils, de la méthode permettant de déduire le mois sur lequel compter le contact ObsMer new 16c5570 Merge branch 'feature/6392' into develop new a53a891 prototype pour un bouton pour tout sélectionner dans un filtre new a6d116c Bouton pour tout sélectionner dans les filtres et tout déselectionner (testable-client #6383) new fe97750 Merge branch 'feature/6393' into develop new da14b3b Ajout du code espèces cibles DCP (crevettes) (refs #6452) new a4b5b34 Merge branch 'feature/6452' into develop The 11 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 a4b5b3456ee123da4dc4e01775746b91e81ea1c6 Merge: fe97750 da14b3b Author: Brendan Le Ny <bleny(a)codelutin.com> Date: Thu Feb 26 16:31:06 2015 +0100 Merge branch 'feature/6452' into develop commit fe97750d19bf60fa3698bb449a5beed8a13533c0 Merge: 16c5570 a6d116c Author: Brendan Le Ny <bleny(a)codelutin.com> Date: Thu Feb 26 16:30:42 2015 +0100 Merge branch 'feature/6393' into develop commit 16c5570852110afeba4b666872766fccaabc82e9 Merge: e77194d 6fa7fe7 Author: Brendan Le Ny <bleny(a)codelutin.com> Date: Thu Feb 26 16:30:19 2015 +0100 Merge branch 'feature/6392' into develop commit e77194db2e306d4e01ec7c4d0988f6a62f5d973e Merge: 90c3842 5f70e8a Author: Brendan Le Ny <bleny(a)codelutin.com> Date: Thu Feb 26 16:28:58 2015 +0100 Merge branch 'feature/5923' into develop commit 5f70e8a69a94f1e9a8db876616e57031cb3b2477 Author: Brendan Le Ny <bleny(a)codelutin.com> Date: Thu Feb 26 15:16:14 2015 +0100 Correction d'un bogue dans le calcul du réalisé dans les synthèses commit 3c6b59f378f6bf90aa49835b838ad7cdeb216343 Author: Brendan Le Ny <bleny(a)codelutin.com> Date: Thu Feb 26 14:20:32 2015 +0100 Dans la synthèse, on compte désormais l'observation sur le mois avec le plus de jours de mer commit bed195a8206703ebefe63cdf52eb66d1557a1caf Author: Brendan Le Ny <bleny(a)codelutin.com> Date: Thu Feb 26 14:17:28 2015 +0100 Récupération via cherry-pick, dans WaoUtils, de la méthode permettant de déduire le mois sur lequel compter le contact ObsMer commit 34567cf2dc51164cbdf44bf93a2ebcddb5b839d2 Author: Brendan Le Ny <bleny(a)codelutin.com> Date: Thu Feb 26 12:23:34 2015 +0100 Dans la synthèse, on modifie le TemplateMethod pour pouvoir permettre de préciser un réalisé sur plusieurs mois commit a6d116c234e63f53d25ddb36ba95faddae8e800c Author: Brendan Le Ny <bleny(a)codelutin.com> Date: Tue Feb 24 16:44:15 2015 +0100 Bouton pour tout sélectionner dans les filtres et tout déselectionner (testable-client #6383) commit da14b3b183110522e1edfe49c17a57f9f9b7df32 Author: Brendan Le Ny <bleny(a)codelutin.com> Date: Tue Feb 24 10:11:24 2015 +0100 Ajout du code espèces cibles DCP (crevettes) (refs #6452) commit a53a89184f40c164cea6116c6067b1f60d7d6ced Author: Brendan Le Ny <bleny(a)codelutin.com> Date: Wed Jan 21 11:59:18 2015 +0100 prototype pour un bouton pour tout sélectionner dans un filtre Summary of changes: .../src/main/java/fr/ifremer/wao/WaoUtils.java | 17 + .../fr/ifremer/wao/entity/ContactTopiaDao.java | 32 +- .../fr/ifremer/wao/entity/SampleRowTopiaDao.java | 51 --- .../ifremer/wao/entity/TargetSpeciesDcfImpl.java | 2 +- .../i18n/wao-persistence_en_GB.properties | 1 + .../i18n/wao-persistence_fr_FR.properties | 1 + .../service/ObsMerSamplingPlanBuilder.java | 125 +++--- .../fr/ifremer/wao/services/service/Synthesis.java | 10 + .../wao/services/service/SynthesisService.java | 485 +++++++++++++++++---- .../service/administration/ReferentialService.java | 2 +- .../resources/i18n/wao-services_en_GB.properties | 1 + .../resources/i18n/wao-services_fr_FR.properties | 1 + .../web/converter/JFreeChartToImgTagConverter.java | 2 +- .../service/Synthesis-conversion.properties | 22 - .../src/main/resources/xwork-conversion.properties | 1 + .../src/main/webapp/WEB-INF/content/synthesis.jsp | 5 + wao-web/src/main/webapp/wao.css | 2 +- wao-web/src/main/webapp/wao.js | 23 + 18 files changed, 549 insertions(+), 234 deletions(-) delete mode 100644 wao-web/src/main/resources/fr/ifremer/wao/services/service/Synthesis-conversion.properties -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm(a)codelutin.com>.

1 11

branch feature/6452 deleted (was da14b3b)
by codelutin.com scm Feb. 26, 2015

Feb. 26, 2015

This is an automated email from the git hooks/post-receive script. New change to branch feature/6452 in repository wao. See http://git.codelutin.com/wao.git was da14b3b Ajout du code espèces cibles DCP (crevettes) (refs #6452) This change permanently discards the following revisions: discards da14b3b Ajout du code espèces cibles DCP (crevettes) (refs #6452) -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm(a)codelutin.com>.

1 0