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

[Suiviobsmer-commits] r383 - in trunk/src: . announcement
by fdesbois＠users.labs.libre-entreprise.org 24 Mar '10

24 Mar '10

Author: fdesbois Date: 2010-03-24 12:15:07 +0000 (Wed, 24 Mar 2010) New Revision: 383 Added: trunk/src/announcement/ trunk/src/announcement/release-email-1.0.3.txt Log: Add announce for 1.0.3 Added: trunk/src/announcement/release-email-1.0.3.txt =================================================================== --- trunk/src/announcement/release-email-1.0.3.txt (rev 0) +++ trunk/src/announcement/release-email-1.0.3.txt 2010-03-24 12:15:07 UTC (rev 383) @@ -0,0 +1,26 @@ + +La nouvelle version 1.0.3 de l'applicatif Wao est disponible ! + +Nouveautés : + +- Ajout du script pour Google Analytics [fdesbois-Evo#2223] + +Résolutions d'anomalies : + +- Plan d'échantillonnage : Problème d'import sur un fichier précédemment + exporté. [fdesbois-Ano#2222] +- Les métiers (libelle/ espèces) ne sont pas isolés d'une ligne du plan à + l'autre. [fdesbois-Ano#2221] + +Documentation : + +http://suiviobsmer.labs.libre-entreprise.org/wao/ + +Téléchargement : + +https://labs.libre-entreprise.org/frs/?group_id=154 + +Cordialement, + +L'équipe Wao +

1 0

[Suiviobsmer-commits] r382 - in trunk: . wao-business wao-ui
by fdesbois＠users.labs.libre-entreprise.org 24 Mar '10

24 Mar '10

Author: fdesbois Date: 2010-03-24 11:18:25 +0000 (Wed, 24 Mar 2010) New Revision: 382 Modified: trunk/pom.xml trunk/wao-business/pom.xml trunk/wao-ui/pom.xml Log: [maven-release-plugin] prepare for next development iteration Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2010-03-24 11:18:21 UTC (rev 381) +++ trunk/pom.xml 2010-03-24 11:18:25 UTC (rev 382) @@ -15,7 +15,7 @@ <groupId>fr.ifremer</groupId> <artifactId>wao</artifactId> - <version>1.0.3</version> + <version>1.0.4-SNAPSHOT</version> <modules> <module>wao-ui</module> @@ -226,9 +226,9 @@  <scm> - <connection>scm:svn:svn://anonymous at labs.libre-entreprise.org/svnroot/suiviobsmer/tags/wao-1.0.3</connection> - <developerConnection>scm:svn:svn+ssh://fdesbois at labs.libre-entreprise.org/svnroot/suiviobsmer/tags/wao-1.0.3</developerConnection> - <url>http://labs.libre-entreprise.org/scm/viewvc.php/tags/wao-1.0.3?root=suiviob…</url> + <connection>scm:svn:svn://anonymous at labs.libre-entreprise.org/svnroot/suiviobsmer/trunk</connection> + <developerConnection>scm:svn:svn+ssh://fdesbois at labs.libre-entreprise.org/svnroot/suiviobsmer/trunk</developerConnection> + <url>http://labs.libre-entreprise.org/scm/viewvc.php/trunk/?root=suiviobsmer</url> </scm> <build> Modified: trunk/wao-business/pom.xml =================================================================== --- trunk/wao-business/pom.xml 2010-03-24 11:18:21 UTC (rev 381) +++ trunk/wao-business/pom.xml 2010-03-24 11:18:25 UTC (rev 382) @@ -10,7 +10,7 @@ <parent> <groupId>fr.ifremer</groupId> <artifactId>wao</artifactId> - <version>1.0.3</version> + <version>1.0.4-SNAPSHOT</version> </parent> <groupId>fr.ifremer.wao</groupId> @@ -160,9 +160,9 @@ </build> <scm> - <url>http://labs.libre-entreprise.org/scm/viewvc.php/tags/wao-1.0.3/?root=suivio…</url> - <connection>scm:svn:svn://anonymous at labs.libre-entreprise.org/svnroot/suiviobsmer/tags/wao-1.0.3/wao-business</connection> - <developerConnection>scm:svn:svn+ssh://fdesbois at labs.libre-entreprise.org/svnroot/suiviobsmer/tags/wao-1.0.3/wao-business</developerConnection> + <url>http://labs.libre-entreprise.org/scm/viewvc.php/trunk/wao-business/?root=su…</url> + <connection>scm:svn:svn://anonymous at labs.libre-entreprise.org/svnroot/suiviobsmer/trunk/wao-business</connection> + <developerConnection>scm:svn:svn+ssh://fdesbois at labs.libre-entreprise.org/svnroot/suiviobsmer/trunk/wao-business</developerConnection> </scm> </project> Modified: trunk/wao-ui/pom.xml =================================================================== --- trunk/wao-ui/pom.xml 2010-03-24 11:18:21 UTC (rev 381) +++ trunk/wao-ui/pom.xml 2010-03-24 11:18:25 UTC (rev 382) @@ -10,7 +10,7 @@ <parent> <groupId>fr.ifremer</groupId> <artifactId>wao</artifactId> - <version>1.0.3</version> + <version>1.0.4-SNAPSHOT</version> </parent> <groupId>fr.ifremer.wao</groupId> @@ -141,9 +141,9 @@ </repositories> <scm> - <url>http://labs.libre-entreprise.org/scm/viewvc.php/tags/wao-1.0.3/?root=suivio…</url> - <connection>scm:svn:svn://anonymous at labs.libre-entreprise.org/svnroot/suiviobsmer/tags/wao-1.0.3/wao-ui</connection> - <developerConnection>scm:svn:svn+ssh://fdesbois at labs.libre-entreprise.org/svnroot/suiviobsmer/tags/wao-1.0.3/wao-ui</developerConnection> + <url>http://labs.libre-entreprise.org/scm/viewvc.php/trunk/wao-ui/?root=suiviobs…</url> + <connection>scm:svn:svn://anonymous at labs.libre-entreprise.org/svnroot/suiviobsmer/trunk/wao-ui</connection> + <developerConnection>scm:svn:svn+ssh://fdesbois at labs.libre-entreprise.org/svnroot/suiviobsmer/trunk/wao-ui</developerConnection> </scm> </project>

1 0

[Suiviobsmer-commits] r381 - tags
by fdesbois＠users.labs.libre-entreprise.org 24 Mar '10

24 Mar '10

Author: fdesbois Date: 2010-03-24 11:18:21 +0000 (Wed, 24 Mar 2010) New Revision: 381 Added: tags/wao-1.0.3/ Log: [maven-release-plugin] copy for tag wao-1.0.3

1 0

[Suiviobsmer-commits] r380 - in trunk: . wao-business wao-ui
by fdesbois＠users.labs.libre-entreprise.org 24 Mar '10

24 Mar '10

Author: fdesbois Date: 2010-03-24 11:18:16 +0000 (Wed, 24 Mar 2010) New Revision: 380 Modified: trunk/pom.xml trunk/wao-business/pom.xml trunk/wao-ui/pom.xml Log: [maven-release-plugin] prepare release wao-1.0.3 Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2010-03-24 11:15:58 UTC (rev 379) +++ trunk/pom.xml 2010-03-24 11:18:16 UTC (rev 380) @@ -15,7 +15,7 @@ <groupId>fr.ifremer</groupId> <artifactId>wao</artifactId> - <version>1.0.3-SNAPSHOT</version> + <version>1.0.3</version> <modules> <module>wao-ui</module> @@ -226,9 +226,9 @@  <scm> - <connection>scm:svn:svn://anonymous at labs.libre-entreprise.org/svnroot/suiviobsmer/trunk</connection> - <developerConnection>scm:svn:svn+ssh://fdesbois at labs.libre-entreprise.org/svnroot/suiviobsmer/trunk</developerConnection> - <url>http://labs.libre-entreprise.org/scm/viewvc.php/trunk/?root=suiviobsmer</url> + <connection>scm:svn:svn://anonymous at labs.libre-entreprise.org/svnroot/suiviobsmer/tags/wao-1.0.3</connection> + <developerConnection>scm:svn:svn+ssh://fdesbois at labs.libre-entreprise.org/svnroot/suiviobsmer/tags/wao-1.0.3</developerConnection> + <url>http://labs.libre-entreprise.org/scm/viewvc.php/tags/wao-1.0.3?root=suiviob…</url> </scm> <build> Modified: trunk/wao-business/pom.xml =================================================================== --- trunk/wao-business/pom.xml 2010-03-24 11:15:58 UTC (rev 379) +++ trunk/wao-business/pom.xml 2010-03-24 11:18:16 UTC (rev 380) @@ -10,7 +10,7 @@ <parent> <groupId>fr.ifremer</groupId> <artifactId>wao</artifactId> - <version>1.0.3-SNAPSHOT</version> + <version>1.0.3</version> </parent> <groupId>fr.ifremer.wao</groupId> @@ -160,9 +160,9 @@ </build> <scm> - <url>http://labs.libre-entreprise.org/scm/viewvc.php/trunk/wao-business/?root=su…</url> - <connection>scm:svn:svn://anonymous at labs.libre-entreprise.org/svnroot/suiviobsmer/trunk/wao-business</connection> - <developerConnection>scm:svn:svn+ssh://fdesbois at labs.libre-entreprise.org/svnroot/suiviobsmer/trunk/wao-business</developerConnection> + <url>http://labs.libre-entreprise.org/scm/viewvc.php/tags/wao-1.0.3/?root=suivio…</url> + <connection>scm:svn:svn://anonymous at labs.libre-entreprise.org/svnroot/suiviobsmer/tags/wao-1.0.3/wao-business</connection> + <developerConnection>scm:svn:svn+ssh://fdesbois at labs.libre-entreprise.org/svnroot/suiviobsmer/tags/wao-1.0.3/wao-business</developerConnection> </scm> </project> Modified: trunk/wao-ui/pom.xml =================================================================== --- trunk/wao-ui/pom.xml 2010-03-24 11:15:58 UTC (rev 379) +++ trunk/wao-ui/pom.xml 2010-03-24 11:18:16 UTC (rev 380) @@ -10,7 +10,7 @@ <parent> <groupId>fr.ifremer</groupId> <artifactId>wao</artifactId> - <version>1.0.3-SNAPSHOT</version> + <version>1.0.3</version> </parent> <groupId>fr.ifremer.wao</groupId> @@ -141,9 +141,9 @@ </repositories> <scm> - <url>http://labs.libre-entreprise.org/scm/viewvc.php/trunk/wao-ui/?root=suiviobs…</url> - <connection>scm:svn:svn://anonymous at labs.libre-entreprise.org/svnroot/suiviobsmer/trunk/wao-ui</connection> - <developerConnection>scm:svn:svn+ssh://fdesbois at labs.libre-entreprise.org/svnroot/suiviobsmer/trunk/wao-ui</developerConnection> + <url>http://labs.libre-entreprise.org/scm/viewvc.php/tags/wao-1.0.3/?root=suivio…</url> + <connection>scm:svn:svn://anonymous at labs.libre-entreprise.org/svnroot/suiviobsmer/tags/wao-1.0.3/wao-ui</connection> + <developerConnection>scm:svn:svn+ssh://fdesbois at labs.libre-entreprise.org/svnroot/suiviobsmer/tags/wao-1.0.3/wao-ui</developerConnection> </scm> </project>

1 0

[Suiviobsmer-commits] r379 - in trunk: . wao-business/src/main/filters wao-ui/src/main/resources/fr/ifremer/wao/ui/components
by fdesbois＠users.labs.libre-entreprise.org 24 Mar '10

24 Mar '10

Author: fdesbois Date: 2010-03-24 11:15:58 +0000 (Wed, 24 Mar 2010) New Revision: 379 Modified: trunk/changelog.txt trunk/wao-business/src/main/filters/Wao.properties trunk/wao-ui/src/main/resources/fr/ifremer/wao/ui/components/Layout.tml Log: Evo #2223 : Add script for google analytics Modified: trunk/changelog.txt =================================================================== --- trunk/changelog.txt 2010-03-24 11:05:02 UTC (rev 378) +++ trunk/changelog.txt 2010-03-24 11:15:58 UTC (rev 379) @@ -6,6 +6,7 @@ 1.0.3 (patch) ------------- +- [fdesbois] Evo #2223 : Ajout du script pour Google Analytics - [fdesbois] Ano #2222 : Plan d'échantillonnage : Problème d'import sur un fichier précédemment exporté. - [fdesbois] Ano #2221 : Les métiers (libelle/ espèces) ne sont pas isolés Modified: trunk/wao-business/src/main/filters/Wao.properties =================================================================== --- trunk/wao-business/src/main/filters/Wao.properties 2010-03-24 11:05:02 UTC (rev 378) +++ trunk/wao-business/src/main/filters/Wao.properties 2010-03-24 11:15:58 UTC (rev 379) @@ -21,4 +21,4 @@ wao.server.path=localhost:8080/wao ## Version (not necessary to override it) -wao.version=1.0.2 \ No newline at end of file +wao.version=1.0.3 \ No newline at end of file Modified: trunk/wao-ui/src/main/resources/fr/ifremer/wao/ui/components/Layout.tml =================================================================== --- trunk/wao-ui/src/main/resources/fr/ifremer/wao/ui/components/Layout.tml 2010-03-24 11:05:02 UTC (rev 378) +++ trunk/wao-ui/src/main/resources/fr/ifremer/wao/ui/components/Layout.tml 2010-03-24 11:15:58 UTC (rev 379) @@ -9,6 +9,17 @@ </head> <t:if t:test="currentUserExists"> <body> +  + <script type="text/javascript"> + var gaJsHost = (("https:" == document.location.protocol) ? "https://ssl." : "http://www."); + document.write(unescape("%3Cscript src='" + gaJsHost + "google-analytics.com/ga.js' type='text/javascript'%3E%3C/script%3E")); + </script> + <script type="text/javascript"> + try { + var pageTracker = _gat._getTracker("UA-12982015-1"); + pageTracker._trackPageview(); + } catch(err) {} + </script> <div id="so-session" class="clearfix"> <div class="fleft"> <a t:type="pagelink" t:page="index" title="Page d'accueil">

1 0

[Suiviobsmer-commits] r378 - in trunk: . wao-business/src/main/java/fr/ifremer/wao/io wao-business/src/main/java/fr/ifremer/wao/service wao-business/src/test/java/fr/ifremer/wao/services wao-business/src/test/resources/import
by fdesbois＠users.labs.libre-entreprise.org 24 Mar '10

24 Mar '10

Author: fdesbois Date: 2010-03-24 11:05:02 +0000 (Wed, 24 Mar 2010) New Revision: 378 Modified: trunk/changelog.txt trunk/wao-business/src/main/java/fr/ifremer/wao/io/WaoCsvHeader.java trunk/wao-business/src/main/java/fr/ifremer/wao/service/ServiceSamplingImpl.java trunk/wao-business/src/test/java/fr/ifremer/wao/services/ServiceSamplingImplTest.java trunk/wao-business/src/test/resources/import/echantillonnage.csv Log: - Ano #2221 : error on importProfession : don't use an existing profession for tow different rows - Ano #2222 : error on importSamplingCsv after export : not the same number of fixed columns to calculate month headers Modified: trunk/changelog.txt =================================================================== --- trunk/changelog.txt 2010-03-15 15:08:30 UTC (rev 377) +++ trunk/changelog.txt 2010-03-24 11:05:02 UTC (rev 378) @@ -3,13 +3,20 @@ Historique des versions +1.0.3 (patch) +------------- + +- [fdesbois] Ano #2222 : Plan d'échantillonnage : Problème d'import sur un + fichier précédemment exporté. +- [fdesbois] Ano #2221 : Les métiers (libelle/ espèces) ne sont pas isolés + d'une ligne du plan à l'autre. + 1.0.2 (patch) ------------- - [fdesbois] Ano #2185 : Erreur a la creation d'un contact sur le même navire en même temps pour une même société. - 1.0.1 (patch) ------------- Modified: trunk/wao-business/src/main/java/fr/ifremer/wao/io/WaoCsvHeader.java =================================================================== --- trunk/wao-business/src/main/java/fr/ifremer/wao/io/WaoCsvHeader.java 2010-03-15 15:08:30 UTC (rev 377) +++ trunk/wao-business/src/main/java/fr/ifremer/wao/io/WaoCsvHeader.java 2010-03-24 11:05:02 UTC (rev 378) @@ -239,14 +239,18 @@ } public static int getStartIndexForMonths() { - // PROGRAMME_FIN is the last column before months - return PROGRAMME_FIN.forSamplingCsv() + 1; + return getLastHeaderBeforeMonths().forSamplingCsv() + 1; } public static int getTotalHeaders() { // PLAN_COMMENT is the last column return PLAN_COMMENT.forSamplingCsv() + 1; } + + public static SAMPLING getLastHeaderBeforeMonths() { + // PROGRAMME_FIN is the last column before months + return PROGRAMME_FIN; + } } /** Modified: trunk/wao-business/src/main/java/fr/ifremer/wao/service/ServiceSamplingImpl.java =================================================================== --- trunk/wao-business/src/main/java/fr/ifremer/wao/service/ServiceSamplingImpl.java 2010-03-15 15:08:30 UTC (rev 377) +++ trunk/wao-business/src/main/java/fr/ifremer/wao/service/ServiceSamplingImpl.java 2010-03-24 11:05:02 UTC (rev 378) @@ -764,26 +764,32 @@ protected Profession importProfession(TopiaContext transaction, CsvReader reader) throws IOException, TopiaException { - String codeDCF5 = reader.get(SAMPLING.METIER_CODE_DCF5.name()).trim(); - String maillage = reader.get(SAMPLING.METIER_MAILLAGE.name()).trim(); - String taille = reader.get(SAMPLING.METIER_TAILLE.name()).trim(); - String autre = reader.get(SAMPLING.METIER_AUTRE.name()).trim(); - String libelle = reader.get(SAMPLING.METIER_LIBELLE.name()).trim(); - String especes = reader.get(SAMPLING.METIER_ESPECES.name()).trim(); + String codeDCF5 = ImportHelper.read(reader, SAMPLING.METIER_CODE_DCF5); + String maillage = ImportHelper.read(reader, SAMPLING.METIER_MAILLAGE); + String taille = ImportHelper.read(reader, SAMPLING.METIER_TAILLE); + String autre = ImportHelper.read(reader, SAMPLING.METIER_AUTRE); + String libelle = ImportHelper.read(reader, SAMPLING.METIER_LIBELLE); + String especes = ImportHelper.read(reader, SAMPLING.METIER_ESPECES); ProfessionDAO dao = WaoModelDAOHelper.getProfessionDAO(transaction); - Map<String, Object> existParams = new HashMap<String, Object>(); - existParams.put(Profession.CODE_DCF5, codeDCF5); - existParams.put(Profession.MESH_SIZE, maillage); - existParams.put(Profession.SIZE, taille); - existParams.put(Profession.OTHER, autre); +// Map<String, Object> existParams = new HashMap<String, Object>(); +// existParams.put(Profession.CODE_DCF5, codeDCF5); +// existParams.put(Profession.MESH_SIZE, maillage); +// existParams.put(Profession.SIZE, taille); +// existParams.put(Profession.OTHER, autre); +// +// Profession profession = dao.findByProperties(existParams); +// +// if (profession == null) { +// profession = dao.create(); +// } - Profession profession = dao.findByProperties(existParams); - - if (profession == null) { - profession = dao.create(existParams); - } - + // Always create a new profession + Profession profession = dao.create(); + profession.setCodeDCF5(codeDCF5); + profession.setMeshSize(maillage); + profession.setSize(taille); + profession.setOther(autre); profession.setLibelle(libelle); profession.setSpecies(especes); @@ -830,7 +836,11 @@ * Program must be set to get beginDate and endDate for getting correct months. * SampleMonth will be created corresponding to program period. * Careful : fixed columns set to 16 and months columns start to 13. - * Updatable fields : fishingZoneInfos, nbObservants, averageTideTime, sampleMonths. + * The case of importing a previously exported file is Ok (the default + * values is check from SAMPLING header). + * Updatable fields : fishingZoneInfos, nbObservants, averageTideTime, + * sampleMonths. + * * @param transaction Topia transaction for using FishingZoneDAO * @param sampleRow * @param reader CsvReader to get values for updatable fields @@ -842,14 +852,17 @@ protected void updateRow(TopiaContext transaction, SampleRow sampleRow, CsvReader reader) throws IOException, TopiaException, ParseException { - String fishingZoneInfos = ImportHelper.read(reader, SAMPLING.PECHE_AUTRE); - int nbObservants = ImportHelper.readInt(reader, SAMPLING.PLAN_NB_OBSERV); + String fishingZoneInfos = + ImportHelper.read(reader, SAMPLING.PECHE_AUTRE); + int nbObservants = + ImportHelper.readInt(reader, SAMPLING.PLAN_NB_OBSERV); String averageStr = ImportHelper.read(reader, SAMPLING.PLAN_DUREE_MOY); averageStr = averageStr.replaceAll(",", "."); double averageTideTime = Double.parseDouble(averageStr); String programName = ImportHelper.read(reader, SAMPLING.PROGRAMME_CODE); String comment = ImportHelper.read(reader, SAMPLING.PLAN_COMMENT); - PeriodDates period = ImportHelper.readPeriod(reader, SAMPLING.PROGRAMME_DEBUT, SAMPLING.PROGRAMME_FIN); + PeriodDates period = ImportHelper.readPeriod(reader, + SAMPLING.PROGRAMME_DEBUT, SAMPLING.PROGRAMME_FIN); sampleRow.setFishingZonesInfos(fishingZoneInfos); sampleRow.setNbObservants(nbObservants); @@ -860,22 +873,48 @@ sampleRow.setComment(comment); // 16 fixed columns : 13 before months and 3 after - final int nbFixedColumns = 16; + int nbFixedColumns = 16; // Months begin at 14th column - final int firstMonthColumnId = 13; + int firstMonthColumnId = 13; int nbTotalColumns = reader.getColumnCount(); + + // Case for importing CSV after exporting from appli : more columns + // are exported. + // Check if the previous column (12) is the lastHeader + // defined in SAMPLING + if (!reader.getHeader(firstMonthColumnId-1). + equals(SAMPLING.getLastHeaderBeforeMonths().name())) { + if (log.isTraceEnabled()) { + log.trace("CSV import from previous export"); + } + + // Reinitialize variables to calculate months header + firstMonthColumnId = SAMPLING.getStartIndexForMonths(); + nbFixedColumns = SAMPLING.getTotalHeaders(); + } + // Note : nbTotalColumns must be > nbFixedColumns - int lastMonthColumnId = firstMonthColumnId + nbTotalColumns - nbFixedColumns; + int lastMonthColumnId = firstMonthColumnId + + nbTotalColumns - nbFixedColumns; + if (log.isTraceEnabled()) { + log.trace("Month headers : firstMontId = " + firstMonthColumnId + + " _ nbFixedColumns = " + nbFixedColumns + + " _ lastMonthId = " + lastMonthColumnId); + } + DateFormat dateFormat = SAMPLING.getDateFormat(); for (int i = firstMonthColumnId; i < lastMonthColumnId; i++) { Date monthDate = dateFormat.parse(reader.getHeader(i)); - Integer monthValue = StringUtils.isEmpty(reader.get(i)) ? null : Integer.parseInt(reader.get(i)); + Integer monthValue = StringUtils.isEmpty(reader.get(i)) ? + null : Integer.parseInt(reader.get(i)); - if (monthValue != null && DateUtils.between(monthDate, sampleRow.getPeriodBegin(), sampleRow.getPeriodEnd())) { - SampleMonthDAO dao = WaoModelDAOHelper.getSampleMonthDAO(transaction); + if (monthValue != null && DateUtils.between(monthDate, + sampleRow.getPeriodBegin(), sampleRow.getPeriodEnd())) { + SampleMonthDAO dao = + WaoModelDAOHelper.getSampleMonthDAO(transaction); SampleMonth month = sampleRow.getSampleMonth(monthDate); Modified: trunk/wao-business/src/test/java/fr/ifremer/wao/services/ServiceSamplingImplTest.java =================================================================== --- trunk/wao-business/src/test/java/fr/ifremer/wao/services/ServiceSamplingImplTest.java 2010-03-15 15:08:30 UTC (rev 377) +++ trunk/wao-business/src/test/java/fr/ifremer/wao/services/ServiceSamplingImplTest.java 2010-03-24 11:05:02 UTC (rev 378) @@ -478,20 +478,26 @@ ImportResults result = service.importSamplingPlanCsv(input); // total imported - assertEquals(10, result.getNbRowsImported()); + assertEquals(12, result.getNbRowsImported()); // total refused assertEquals(1, result.getNbRowsRefused()); /** CHECK VALUES **/ transaction = WaoContext.getTopiaRootContext().beginTransaction(); + + SampleRowDAO rowDAO = WaoModelDAOHelper.getSampleRowDAO(transaction); - ProfessionDAO professionDAO = WaoModelDAOHelper.getProfessionDAO(transaction); + // Error #2221 : don't keep the same profession for two different rows + SampleRow row2 = rowDAO.findByCode("2010_0010"); + SampleRow row3 = rowDAO.findByCode("2010_0011"); + assertNotSame(row2.getProfession(), row3.getProfession()); + ProfessionDAO professionDAO = + WaoModelDAOHelper.getProfessionDAO(transaction); + List<Profession> professions = professionDAO.findAll(); - assertEquals(9, professions.size()); + assertEquals(12, professions.size()); - SampleRowDAO rowDAO = WaoModelDAOHelper.getSampleRowDAO(transaction); - SampleRow row1 = rowDAO.findByCode("2010_0001"); assertNotNull(row1); assertEquals(1, row1.getNbObservants()); Modified: trunk/wao-business/src/test/resources/import/echantillonnage.csv =================================================================== --- trunk/wao-business/src/test/resources/import/echantillonnage.csv 2010-03-15 15:08:30 UTC (rev 377) +++ trunk/wao-business/src/test/resources/import/echantillonnage.csv 2010-03-24 11:05:02 UTC (rev 378) @@ -10,3 +10,5 @@ "2009_6",BIS,"I / IV",,"OP_DEF","70-1100",">1140",,"Leon","poissons plats","PPP2010",12/2009,10/2010,0,1,0,1,0,1,2,2,2,2,1,,,,,,3,2, "2010_4",TARTANPION,"IId / IV",,"OTB_TEF et OTB_U et OL",,,,"Chalutage de fond","gadidés, poissons plats, divers","BLOB",01/2010,12/2010,,3,0,0,3,0,0,3,0,0,3,0,0,,,,3,1, "2010_5",,,,"OTB_TEF et OTB_U et OL",,,,"Kamoulox","merlu, poissons cerises, divers","MA-2009",03/2010,01/2011,,,,0,5,0,0,5,0,0,6,0,0,3,,,3,1, +"2010_10",,"I / IV",,"OTB_TEF et OTB_U et OL","70-1100",,,"Kamoulox","merlu, poissons pommes, divers","MA-2009",03/2010,01/2011,,,,0,5,0,0,5,0,0,6,0,0,3,,,3,1, +"2010_11",,"I / IV",,"OTB_TEF et OTB_U et OL","70-1100",,,"Troubidou","merlu, poissons cerises","MA-2009",03/2010,01/2011,,,,0,5,0,0,5,0,0,6,0,0,3,,,3,1,

1 0

[Suiviobsmer-commits] r377 - trunk/wao-business/src/main/java/fr/ifremer/wao/service
by fdesbois＠users.labs.libre-entreprise.org 15 Mar '10

15 Mar '10

Author: fdesbois Date: 2010-03-15 15:08:30 +0000 (Mon, 15 Mar 2010) New Revision: 377 Modified: trunk/wao-business/src/main/java/fr/ifremer/wao/service/ServiceContactImpl.java Log: Request for evolution on validation for import contact Modified: trunk/wao-business/src/main/java/fr/ifremer/wao/service/ServiceContactImpl.java =================================================================== --- trunk/wao-business/src/main/java/fr/ifremer/wao/service/ServiceContactImpl.java 2010-03-12 20:12:01 UTC (rev 376) +++ trunk/wao-business/src/main/java/fr/ifremer/wao/service/ServiceContactImpl.java 2010-03-15 15:08:30 UTC (rev 377) @@ -461,6 +461,7 @@ contact.setDataInputDate(dataInput); // Import validations only for superadmin and a new contact : useful for archives + // FIXME : can update validation when the user is the super admin if (newContact && user.getAdmin() && user.getLogin().equals("admin")) { if (log.isDebugEnabled()) { log.debug("SuperAdmin import :: validations");

1 0

[Suiviobsmer-commits] r376 - trunk
by tchemit＠users.labs.libre-entreprise.org 12 Mar '10

12 Mar '10

Author: tchemit Date: 2010-03-12 20:12:01 +0000 (Fri, 12 Mar 2010) New Revision: 376 Modified: trunk/pom.xml Log: Utilisation de mavenpom4labs 2.0.6 Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2010-03-11 10:09:09 UTC (rev 375) +++ trunk/pom.xml 2010-03-12 20:12:01 UTC (rev 376) @@ -10,7 +10,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>mavenpom4labs</artifactId> - <version>2.0.4</version> + <version>2.0.6</version> </parent> <groupId>fr.ifremer</groupId>

1 0

[Suiviobsmer-commits] r375 - in trunk: . wao-business wao-ui
by fdesbois＠users.labs.libre-entreprise.org 11 Mar '10

11 Mar '10

Author: fdesbois Date: 2010-03-11 10:09:09 +0000 (Thu, 11 Mar 2010) New Revision: 375 Modified: trunk/pom.xml trunk/wao-business/pom.xml trunk/wao-ui/pom.xml Log: [maven-release-plugin] prepare for next development iteration Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2010-03-11 10:09:06 UTC (rev 374) +++ trunk/pom.xml 2010-03-11 10:09:09 UTC (rev 375) @@ -15,7 +15,7 @@ <groupId>fr.ifremer</groupId> <artifactId>wao</artifactId> - <version>1.0.2</version> + <version>1.0.3-SNAPSHOT</version> <modules> <module>wao-ui</module> @@ -226,9 +226,9 @@  <scm> - <connection>scm:svn:svn://anonymous at labs.libre-entreprise.org/svnroot/suiviobsmer/tags/wao-1.0.2</connection> - <developerConnection>scm:svn:svn+ssh://fdesbois at labs.libre-entreprise.org/svnroot/suiviobsmer/tags/wao-1.0.2</developerConnection> - <url>http://labs.libre-entreprise.org/scm/viewvc.php/tags/wao-1.0.2?root=suiviob…</url> + <connection>scm:svn:svn://anonymous at labs.libre-entreprise.org/svnroot/suiviobsmer/trunk</connection> + <developerConnection>scm:svn:svn+ssh://fdesbois at labs.libre-entreprise.org/svnroot/suiviobsmer/trunk</developerConnection> + <url>http://labs.libre-entreprise.org/scm/viewvc.php/trunk/?root=suiviobsmer</url> </scm> <build> Modified: trunk/wao-business/pom.xml =================================================================== --- trunk/wao-business/pom.xml 2010-03-11 10:09:06 UTC (rev 374) +++ trunk/wao-business/pom.xml 2010-03-11 10:09:09 UTC (rev 375) @@ -10,7 +10,7 @@ <parent> <groupId>fr.ifremer</groupId> <artifactId>wao</artifactId> - <version>1.0.2</version> + <version>1.0.3-SNAPSHOT</version> </parent> <groupId>fr.ifremer.wao</groupId> @@ -160,9 +160,9 @@ </build> <scm> - <url>http://labs.libre-entreprise.org/scm/viewvc.php/tags/wao-1.0.2/wao-business…</url> - <connection>scm:svn:svn://anonymous at labs.libre-entreprise.org/svnroot/suiviobsmer/tags/wao-1.0.2/wao-business</connection> - <developerConnection>scm:svn:svn+ssh://fdesbois at labs.libre-entreprise.org/svnroot/suiviobsmer/tags/wao-1.0.2/wao-business</developerConnection> + <url>http://labs.libre-entreprise.org/scm/viewvc.php/trunk/wao-business/?root=su…</url> + <connection>scm:svn:svn://anonymous at labs.libre-entreprise.org/svnroot/suiviobsmer/trunk/wao-business</connection> + <developerConnection>scm:svn:svn+ssh://fdesbois at labs.libre-entreprise.org/svnroot/suiviobsmer/trunk/wao-business</developerConnection> </scm> </project> Modified: trunk/wao-ui/pom.xml =================================================================== --- trunk/wao-ui/pom.xml 2010-03-11 10:09:06 UTC (rev 374) +++ trunk/wao-ui/pom.xml 2010-03-11 10:09:09 UTC (rev 375) @@ -10,7 +10,7 @@ <parent> <groupId>fr.ifremer</groupId> <artifactId>wao</artifactId> - <version>1.0.2</version> + <version>1.0.3-SNAPSHOT</version> </parent> <groupId>fr.ifremer.wao</groupId> @@ -141,9 +141,9 @@ </repositories> <scm> - <url>http://labs.libre-entreprise.org/scm/viewvc.php/tags/wao-1.0.2/wao-ui?root=…</url> - <connection>scm:svn:svn://anonymous at labs.libre-entreprise.org/svnroot/suiviobsmer/tags/wao-1.0.2/wao-ui</connection> - <developerConnection>scm:svn:svn+ssh://fdesbois at labs.libre-entreprise.org/svnroot/suiviobsmer/tags/wao-1.0.2/wao-ui</developerConnection> + <url>http://labs.libre-entreprise.org/scm/viewvc.php/trunk/wao-ui/?root=suiviobs…</url> + <connection>scm:svn:svn://anonymous at labs.libre-entreprise.org/svnroot/suiviobsmer/trunk/wao-ui</connection> + <developerConnection>scm:svn:svn+ssh://fdesbois at labs.libre-entreprise.org/svnroot/suiviobsmer/trunk/wao-ui</developerConnection> </scm> </project>

1 0

[Suiviobsmer-commits] r374 - tags
by fdesbois＠users.labs.libre-entreprise.org 11 Mar '10

11 Mar '10

Author: fdesbois Date: 2010-03-11 10:09:06 +0000 (Thu, 11 Mar 2010) New Revision: 374 Added: tags/wao-1.0.2/ Log: [maven-scm] copy for tag wao-1.0.2

1 0