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

r1552 - trunk/src/site/resources/schemas
by bleny＠users.forge.codelutin.com 12 Mar '12

12 Mar '12

Author: bleny Date: 2012-03-12 12:05:34 +0100 (Mon, 12 Mar 2012) New Revision: 1552 Url: http://forge.codelutin.com/repositories/revision/wao/1552 Log: mise ?\195?\160 jour des sch?\195?\169mas dans la documentation Modified: trunk/src/site/resources/schemas/Beans.png trunk/src/site/resources/schemas/Contacts.png trunk/src/site/resources/schemas/Entities.png trunk/src/site/resources/schemas/Operationsdetails.png trunk/src/site/resources/schemas/References.png trunk/src/site/resources/schemas/SamplingPlan.png Modified: trunk/src/site/resources/schemas/Beans.png =================================================================== (Binary files differ) Modified: trunk/src/site/resources/schemas/Contacts.png =================================================================== (Binary files differ) Modified: trunk/src/site/resources/schemas/Entities.png =================================================================== (Binary files differ) Modified: trunk/src/site/resources/schemas/Operationsdetails.png =================================================================== (Binary files differ) Modified: trunk/src/site/resources/schemas/References.png =================================================================== (Binary files differ) Modified: trunk/src/site/resources/schemas/SamplingPlan.png =================================================================== (Binary files differ)

1 0

r1551 - trunk/src/site/rst/obsDeb
by bleny＠users.forge.codelutin.com 12 Mar '12

12 Mar '12

Author: bleny Date: 2012-03-12 11:57:46 +0100 (Mon, 12 Mar 2012) New Revision: 1551 Url: http://forge.codelutin.com/repositories/revision/wao/1551 Log: Evolution #957 Documenter le format d'import du plan ObsDeb Modified: trunk/src/site/rst/obsDeb/administrateur.rst Modified: trunk/src/site/rst/obsDeb/administrateur.rst =================================================================== --- trunk/src/site/rst/obsDeb/administrateur.rst 2012-03-06 15:06:35 UTC (rev 1550) +++ trunk/src/site/rst/obsDeb/administrateur.rst 2012-03-12 10:57:46 UTC (rev 1551) @@ -72,14 +72,20 @@ le fichier) et agira en conséquence. Dans Wao, les lignes du plan d'échantillonnage sont identifiées par un -code unique. Lors de l'import initial, il est très vivement recommandé -de ne pas essayer d'attribuer arbitrairement des valeurs dans la colonne -PLAN_CODE (risque de collision avec les plan des autres actions). En -laissant la colonne vide pour une ligne donnée, Wao déduira qu'il s'agit -d'une nouvelle ligne et y affectera, au moment du chargement, un code unique. -Ainsi, pour l'import initial, il est recommandé de laisser toutes les lignes -avec la colonne PLAN_CODE vide. +code unique de la forme AAAA_IIII (année, n° de ligne). Vous devez attribuer +à chaque ligne un identifiant unique. +La colonne OBSERVATEUR_COD est une chaîne de caractère arbitraire qui représente +un observateur pour un tirage du plan donné ("OBS1", "OBS2"...). Cela n'est pas +interprété par Wao mais seulement stocké et restitué. L'objectif est de conservé +les données du tirage pour pouvoir, par exemple, définir un observateur pendant +une période de temps donnée (en affectant à toute les lignes "OBS1" à un seul et +même observateur, on est sûr de ne pas avoir de contradiction dans le plan). + +La colonne OBSERVATEURS permet de définir les observateurs désignés pour observer +pour cette ligne. Ils sont identifiés par leurs identifiants Wao (une adresse email) +séparés par des "," s'il y a plusieurs observateurs. Par exemple, "léon.b(a)ifremer.fr". + Vous pouvez consulter les fichiers d'exemples. ===============================================================================

1 0

r1550 - in trunk: wao-business/src/main/resources/i18n wao-ui/src/main/java/fr/ifremer/wao/ui/pages
by bleny＠users.forge.codelutin.com 06 Mar '12

06 Mar '12

Author: bleny Date: 2012-03-06 16:06:35 +0100 (Tue, 06 Mar 2012) New Revision: 1550 Url: http://forge.codelutin.com/repositories/revision/wao/1550 Log: cl?\195?\169 d?\195?\169j?\195?\160 d?\195?\169clar?\195?\169e dans le module business Modified: trunk/wao-business/src/main/resources/i18n/wao-business_en_GB.properties trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/pages/SampleRowForm.java Modified: trunk/wao-business/src/main/resources/i18n/wao-business_en_GB.properties =================================================================== --- trunk/wao-business/src/main/resources/i18n/wao-business_en_GB.properties 2012-03-06 15:04:19 UTC (rev 1549) +++ trunk/wao-business/src/main/resources/i18n/wao-business_en_GB.properties 2012-03-06 15:06:35 UTC (rev 1550) @@ -320,4 +320,4 @@ wao.import.sampleRow.failure.wrongFishingZone=There is no fishing zone with the code '%s' wao.import.sampleRow.failure.wrongSampleRowCodeFormat=The sample row code '%s' is not compliant with the format "YYYY_IIII" wao.validation.sampleRow.conflictOnObserver=Observer %s cannot be associated to the line %s because he has to observer, on the same day, for row %s -wao.validation.sampleRow.observerNotInCompany=Observer %s doesn't work for company %s \ No newline at end of file +wao.validation.sampleRow.observerNotInCompany=Observer %s doesn't work for company %s Modified: trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/pages/SampleRowForm.java =================================================================== --- trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/pages/SampleRowForm.java 2012-03-06 15:04:19 UTC (rev 1549) +++ trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/pages/SampleRowForm.java 2012-03-06 15:06:35 UTC (rev 1550) @@ -856,7 +856,7 @@ } else if (isCreateMode()) { if ( ! WaoUtils.isValidSampleRowCode(getSampleRow().getCode())) { sampleRowForm.recordError(code, String.format( - messages.get(n_("wao.import.sampleRow.failure.wrongSampleRowCodeFormat")), + messages.get("wao.import.sampleRow.failure.wrongSampleRowCodeFormat"), getSampleRow().getCode())); } }

1 0

r1549 - trunk/wao-business/src/main/java/fr/ifremer/wao/service
by bleny＠users.forge.codelutin.com 06 Mar '12

06 Mar '12

Author: bleny Date: 2012-03-06 16:04:19 +0100 (Tue, 06 Mar 2012) New Revision: 1549 Url: http://forge.codelutin.com/repositories/revision/wao/1549 Log: T?\195?\162che #627 Migrer l'import/export des plans d'?\195?\169chantillonages ObsMer/ObsVente vers l'API csv2 Modified: trunk/wao-business/src/main/java/fr/ifremer/wao/service/ServiceSamplingImpl.java 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 2012-03-06 15:03:46 UTC (rev 1548) +++ trunk/wao-business/src/main/java/fr/ifremer/wao/service/ServiceSamplingImpl.java 2012-03-06 15:04:19 UTC (rev 1549) @@ -929,10 +929,6 @@ sampleRowLog.setComment(logComment); boolean allowUpdate = sampleRow.getObsProgram().equals(ObsProgram.OBSDEB); createUpdateSampleRowWithoutCommit(transaction, sampleRow, new ArrayList<Boat>(), sampleRowLog, connectedUser, allowUpdate); - - // FIXME 20110203 bleny commit nécessaire pour éviter un deadlock lors de la recherche d'un nouveau code, or, il faudrait ne commiter qu'une seule fois à la fin pour éviter un import partiel du plan - transaction.commitTransaction(); - result.incNbImported(); } catch (Exception e) {

1 0

r1548 - trunk/wao-business/src/test/resources
by bleny＠users.forge.codelutin.com 06 Mar '12

06 Mar '12

Author: bleny Date: 2012-03-06 16:03:46 +0100 (Tue, 06 Mar 2012) New Revision: 1548 Url: http://forge.codelutin.com/repositories/revision/wao/1548 Log: T?\195?\162che #627 Migrer l'import/export des plans d'?\195?\169chantillonages ObsMer/ObsVente vers l'API csv2 Modified: trunk/wao-business/src/test/resources/WaoTest.properties Modified: trunk/wao-business/src/test/resources/WaoTest.properties =================================================================== --- trunk/wao-business/src/test/resources/WaoTest.properties 2012-03-06 14:20:03 UTC (rev 1547) +++ trunk/wao-business/src/test/resources/WaoTest.properties 2012-03-06 15:03:46 UTC (rev 1548) @@ -28,4 +28,4 @@ hibernate.connection.username=sa hibernate.connection.password= hibernate.connection.driver_class=org.h2.Driver -hibernate.connection.url=jdbc:h2:file:target/db/h2data +hibernate.connection.url=jdbc:h2:file:target/db/h2data;LOCK_MODE=0

1 0

r1547 - in trunk: src/site/rst/obsMer wao-business/src/main/java/fr/ifremer/wao wao-business/src/main/java/fr/ifremer/wao/io/csv2/models/operations wao-business/src/main/java/fr/ifremer/wao/service wao-business/src/main/resources/i18n wao-business/src/main/xmi wao-business/src/test/java/fr/ifremer/wao/business wao-business/src/test/java/fr/ifremer/wao/service wao-ui/src/main/java/fr/ifremer/wao/ui/pages wao-ui/src/main/webapp
by bleny＠users.forge.codelutin.com 06 Mar '12

06 Mar '12

Author: bleny Date: 2012-03-06 15:20:03 +0100 (Tue, 06 Mar 2012) New Revision: 1547 Url: http://forge.codelutin.com/repositories/revision/wao/1547 Log: #921 Permettre de d?\195?\169finir les codes des nouvelles lignes ?\195?\160 l'import du plan d'?\195?\169chantillonnage Modified: trunk/src/site/rst/obsMer/administrateur.rst trunk/wao-business/src/main/java/fr/ifremer/wao/WaoUtils.java trunk/wao-business/src/main/java/fr/ifremer/wao/io/csv2/models/operations/SampleRowCodeParserFormatter.java trunk/wao-business/src/main/java/fr/ifremer/wao/service/ServiceSamplingImpl.java trunk/wao-business/src/main/resources/i18n/wao-business_en_GB.properties trunk/wao-business/src/main/resources/i18n/wao-business_fr_FR.properties trunk/wao-business/src/main/xmi/wao.zargo trunk/wao-business/src/test/java/fr/ifremer/wao/business/ObsDebFieldWorkTest.java trunk/wao-business/src/test/java/fr/ifremer/wao/service/ServiceSamplingTest.java trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/pages/SampleRowForm.java trunk/wao-ui/src/main/webapp/SampleRowForm.tml Modified: trunk/src/site/rst/obsMer/administrateur.rst =================================================================== --- trunk/src/site/rst/obsMer/administrateur.rst 2012-03-02 14:22:27 UTC (rev 1546) +++ trunk/src/site/rst/obsMer/administrateur.rst 2012-03-06 14:20:03 UTC (rev 1547) @@ -74,7 +74,7 @@ Format de fichier : -- PLAN_CODE (string) : Code de la ligne (unique, obligatoire) +- PLAN_CODE (string) : Code de la ligne (unique, obligatoire) au format AAAA_IIII (année, n° de ligne), exemple 2012_0003 - SOCIETE_NOM (string) : Nom de la société - PECHE_DIVISION (string) : Zones de pêche liés à la ligne, chaque zone est séparé par un " / " -> ex : VIIa / VIIb (obligatoire) - PECHE_AUTRE (string) : Autres information sur les zones de pêche pour la ligne Modified: trunk/wao-business/src/main/java/fr/ifremer/wao/WaoUtils.java =================================================================== --- trunk/wao-business/src/main/java/fr/ifremer/wao/WaoUtils.java 2012-03-02 14:22:27 UTC (rev 1546) +++ trunk/wao-business/src/main/java/fr/ifremer/wao/WaoUtils.java 2012-03-06 14:20:03 UTC (rev 1547) @@ -49,6 +49,7 @@ import java.util.List; import java.util.Locale; import java.util.Map; +import java.util.regex.Pattern; import static org.nuiton.i18n.I18n.l_; @@ -67,6 +68,8 @@ private static WaoContext context; + protected static final Pattern SAMPLE_ROW_CODE_PATTERN = Pattern.compile("^(\\d{4})_(\\d{4})$"); + static void setContext(WaoContext context) { WaoUtils.context = context; } @@ -309,4 +312,8 @@ } return list; } + + public static boolean isValidSampleRowCode(String code) { + return SAMPLE_ROW_CODE_PATTERN.matcher(code).matches(); + } } Modified: trunk/wao-business/src/main/java/fr/ifremer/wao/io/csv2/models/operations/SampleRowCodeParserFormatter.java =================================================================== --- trunk/wao-business/src/main/java/fr/ifremer/wao/io/csv2/models/operations/SampleRowCodeParserFormatter.java 2012-03-02 14:22:27 UTC (rev 1546) +++ trunk/wao-business/src/main/java/fr/ifremer/wao/io/csv2/models/operations/SampleRowCodeParserFormatter.java 2012-03-06 14:20:03 UTC (rev 1547) @@ -5,12 +5,9 @@ import org.nuiton.util.csv.ValueParserFormatter; import java.text.ParseException; -import java.util.regex.Pattern; public class SampleRowCodeParserFormatter implements ValueParserFormatter<String> { - protected static final Pattern SAMPLE_ROW_CODE_PATTERN = Pattern.compile("^(\\d{4})_(\\d{4})$"); - @Override public String format(String value) { return value; @@ -20,9 +17,9 @@ public String parse(String value) throws ParseException { String sampleRowCode; if (StringUtils.isBlank(value)) { - sampleRowCode = null; + throw new IllegalArgumentException(WaoUtils._("wao.import.sampleRow.failure.missingSampleRowCode")); } else { - if (SAMPLE_ROW_CODE_PATTERN.matcher(value).matches()) { + if (WaoUtils.isValidSampleRowCode(value)) { sampleRowCode = value; } else { throw new IllegalArgumentException(WaoUtils._("wao.import.sampleRow.failure.wrongSampleRowCodeFormat", value.trim())); 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 2012-03-02 14:22:27 UTC (rev 1546) +++ trunk/wao-business/src/main/java/fr/ifremer/wao/service/ServiceSamplingImpl.java 2012-03-06 14:20:03 UTC (rev 1547) @@ -280,39 +280,13 @@ SampleRowDAO dao = WaoDAOHelper.getSampleRowDAO(transaction); - SampleRow oldRow = null; + SampleRow oldRow; if (StringUtils.isEmpty(row.getCode())) { - // all rows must have a unique code, the code has a year as prefix - // like '2011_' so we must know on which year the row is active - // the date from which year will be extracted (whatever the day of the year) - Date year; + throw new IllegalStateException(WaoUtils._("wao.import.sampleRow.failure.missingSampleRowCode")); - if (ObsProgram.OBSDEB.equals(row.getObsProgram())) { - // this line has a precise day, let's take the - // year of this day - year = row.getExpectedDate(); - } else { - if (CollectionUtils.isEmpty(row.getSampleMonth())) { - // if the row has no sample months, we can't know - // we take current year by default - year = context.getCurrentDate(); - } else { - // if the row has sample months, take the first month - year = row.getSampleMonth().get(0).getPeriodDate(); - } - } - - // now we have the year for prefix, let's get the whole new - // code (suffix depends on already used codes) - String code = executeGetNewSampleRowCode(transaction, year); - - row.setCode(code); - } else { - row.setCode(WaoUtils.padSampleRowCode(row.getCode())); - // We call the service in another transaction, to prevent // putting an entity in with the same id in the same session oldRow = getSampleRowByCode(null, row.getCode()); @@ -694,12 +668,8 @@ transaction.commitTransaction(); } - @Override - public String executeGetNewSampleRowCode(TopiaContext transaction, + protected String executeGetNewSampleRowCode(TopiaContext transaction, Date beginDate) throws TopiaException { - if (beginDate == null) { - return null; - } Calendar begin = new GregorianCalendar(); begin.setTime(beginDate); @@ -717,7 +687,7 @@ } int num = 1; - if (!StringUtils.isEmpty(maxCode)) { + if (StringUtils.isNotEmpty(maxCode)) { String[] part = maxCode.split("_"); num = Integer.parseInt(part[1]) + 1; } @@ -726,7 +696,7 @@ } @Override - public SampleRow executeNewSampleRow(ConnectedUser connectedUser) { + public SampleRow executeNewSampleRow(TopiaContext transaction, ConnectedUser connectedUser) throws TopiaException { SampleRow newSampleRow = new SampleRowImpl(); newSampleRow.setObsProgram(connectedUser.getProfile().getObsProgram()); newSampleRow.setElligibleBoat(new ArrayList<ElligibleBoat>()); @@ -735,7 +705,7 @@ newSampleRow.setCompany(connectedUser.getCompany()); } - if (connectedUser.isObsMer()) { + if (connectedUser.isObsDeb()) { newSampleRow.setObservers(new ArrayList<WaoUser>()); } else { newSampleRow.setProfession(new ProfessionImpl()); @@ -745,14 +715,42 @@ newSampleRow.setSamplingStrategy(SamplingStrategy.SIMULTANEOUS_ALL_SPECIES); } } + + // all rows must have a unique code, the code has a year as prefix + // like '2011_' so we must know on which year the row is active + + // the date from which year will be extracted (whatever the day of the year) + Date year; + + if (ObsProgram.OBSDEB.equals(newSampleRow.getObsProgram())) { + // this line has a precise day, let's take the + // year of this day + year = newSampleRow.getExpectedDate(); + } else { + if (CollectionUtils.isEmpty(newSampleRow.getSampleMonth())) { + // if the row has no sample months, we can't know + // we take current year by default + year = context.getCurrentDate(); + } else { + // if the row has sample months, take the first month + year = newSampleRow.getSampleMonth().get(0).getPeriodDate(); + } + } + + // now we have the year for prefix, let's get the whole new + // code (suffix depends on already used codes) + String code = executeGetNewSampleRowCode(transaction, year); + + newSampleRow.setCode(code); + return newSampleRow; } @Override protected SampleRow executeNewSampleRow(TopiaContext transaction, ConnectedUser connectedUser, - ObservationType observationType) { - SampleRow newSampleRow = executeNewSampleRow(connectedUser); + ObservationType observationType) throws TopiaException { + SampleRow newSampleRow = executeNewSampleRow(transaction, connectedUser); newSampleRow.setObservationType(observationType); return newSampleRow; } Modified: trunk/wao-business/src/main/resources/i18n/wao-business_en_GB.properties =================================================================== --- trunk/wao-business/src/main/resources/i18n/wao-business_en_GB.properties 2012-03-02 14:22:27 UTC (rev 1546) +++ trunk/wao-business/src/main/resources/i18n/wao-business_en_GB.properties 2012-03-06 14:20:03 UTC (rev 1547) @@ -316,7 +316,8 @@ wao.import.failure.wrongObsDebCode=There is no profession code having code '%s' wao.import.failure.wrongUser=There is no user with login '%s' wao.import.sampleRow.failure.fishingZoneMissing=You must precise at least one fishing zone +wao.import.sampleRow.failure.missingSampleRowCode=You must precise a code for the sample row wao.import.sampleRow.failure.wrongFishingZone=There is no fishing zone with the code '%s' wao.import.sampleRow.failure.wrongSampleRowCodeFormat=The sample row code '%s' is not compliant with the format "YYYY_IIII" wao.validation.sampleRow.conflictOnObserver=Observer %s cannot be associated to the line %s because he has to observer, on the same day, for row %s -wao.validation.sampleRow.observerNotInCompany=Observer %s doesn't work for company %s +wao.validation.sampleRow.observerNotInCompany=Observer %s doesn't work for company %s \ No newline at end of file Modified: trunk/wao-business/src/main/resources/i18n/wao-business_fr_FR.properties =================================================================== --- trunk/wao-business/src/main/resources/i18n/wao-business_fr_FR.properties 2012-03-02 14:22:27 UTC (rev 1546) +++ trunk/wao-business/src/main/resources/i18n/wao-business_fr_FR.properties 2012-03-06 14:20:03 UTC (rev 1547) @@ -315,6 +315,7 @@ wao.import.failure.wrongObsDebCode=Il n'y a pas de code métier ayant pour code '%s' wao.import.failure.wrongUser=Il n'y a pas d'utilisateur ayant pour identifiant '%s' wao.import.sampleRow.failure.fishingZoneMissing=Il faut préciser au moins une zone de pêche +wao.import.sampleRow.failure.missingSampleRowCode=Il faut préciser un code pour a ligne du plan wao.import.sampleRow.failure.wrongFishingZone=Le code '%s' ne correspond à aucune zone de pêche connue du référentiel wao.import.sampleRow.failure.wrongSampleRowCodeFormat=Le code '%s' n'est pas un code de ligne valide selon le format "AAAA_IIII" wao.validation.sampleRow.conflictOnObserver=L'observateur %s ne peut être associé à la ligne %s car il doit observer, le même jour, pour la ligne %s Modified: trunk/wao-business/src/main/xmi/wao.zargo =================================================================== (Binary files differ) Modified: trunk/wao-business/src/test/java/fr/ifremer/wao/business/ObsDebFieldWorkTest.java =================================================================== --- trunk/wao-business/src/test/java/fr/ifremer/wao/business/ObsDebFieldWorkTest.java 2012-03-02 14:22:27 UTC (rev 1546) +++ trunk/wao-business/src/test/java/fr/ifremer/wao/business/ObsDebFieldWorkTest.java 2012-03-06 14:20:03 UTC (rev 1547) @@ -79,7 +79,7 @@ + "2011_0890;GA;OBS1;13/02/2010;UO007;josh;N"; protected static final String SAMPLING_PLAN_WITH_CONFLICTING_SAMPLE_ROW_CSV = "PLAN_CODE;REGION_IFREMER_COD;OBSERVATEUR_COD;OBSERVATION_DATE;UNITE_OBSERVATION_COD;OBSERVATEURS;LIGNE_SANS_CONTACTS\n" - + ";MA;OBS2;13/02/2010;UO087;josh;N"; + + "2011_0892;MA;OBS2;13/02/2010;UO087;josh;N"; protected ObsDebFixtures fixtures = new ObsDebFixtures(manager); Modified: trunk/wao-business/src/test/java/fr/ifremer/wao/service/ServiceSamplingTest.java =================================================================== --- trunk/wao-business/src/test/java/fr/ifremer/wao/service/ServiceSamplingTest.java 2012-03-02 14:22:27 UTC (rev 1546) +++ trunk/wao-business/src/test/java/fr/ifremer/wao/service/ServiceSamplingTest.java 2012-03-06 14:20:03 UTC (rev 1547) @@ -27,6 +27,7 @@ import fr.ifremer.wao.WaoBusinessException; import fr.ifremer.wao.WaoDAOHelper; import fr.ifremer.wao.WaoException; +import fr.ifremer.wao.WaoUtils; import fr.ifremer.wao.bean.ConnectedUser; import fr.ifremer.wao.bean.FacadeRow; import fr.ifremer.wao.bean.ObsProgram; @@ -100,6 +101,16 @@ } @Test + public void testNewSampleRow() throws Exception { + manager.setCurrentDate(5, 3, 2012); + SampleRow sampleRow = serviceSampling.newSampleRow(obsMerFixtures.jeanMichmucheAsAdmin()); + String newSampleRowCode = sampleRow.getCode(); + log.debug("new sample row code is " + newSampleRowCode); + Assert.assertNotNull(newSampleRowCode); + Assert.assertTrue(WaoUtils.isValidSampleRowCode(newSampleRowCode)); + } + + @Test public void testCreateUpdateSampleRow() throws Exception { /** PREPARE DATA **/ TopiaContext transaction = manager.getContext().beginTransaction(); @@ -525,18 +536,7 @@ assertEquals(4, programs.size()); } - @Test - public void testGetNewSampleRowCode() throws Exception { - obsMerFixtures.samplingPlan(); - - Calendar begin = new GregorianCalendar(2009, 11, 1); - - String result = serviceSampling.getNewSampleRowCode(begin.getTime()); - Assert.assertEquals("2009_0007", result); - } - - @Test public void testNewSamplingFilter() throws Exception { manager.setCurrentDate(15, 3, 2012); Modified: trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/pages/SampleRowForm.java =================================================================== --- trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/pages/SampleRowForm.java 2012-03-02 14:22:27 UTC (rev 1546) +++ trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/pages/SampleRowForm.java 2012-03-06 14:20:03 UTC (rev 1547) @@ -26,6 +26,7 @@ import fr.ifremer.wao.WaoBusinessException; import fr.ifremer.wao.WaoException; +import fr.ifremer.wao.WaoUtils; import fr.ifremer.wao.bean.ConnectedUser; import fr.ifremer.wao.bean.ObsProgram; import fr.ifremer.wao.bean.SamplingFilter; @@ -432,6 +433,9 @@ @InjectComponent private Field program; + @InjectComponent + private Field code; + private boolean periodChanged; public SelectModel getProgramSelectModel() throws WaoException { @@ -850,8 +854,11 @@ boats = serviceBoat.getBoatsByImmatriculations(immatriculations); // Update sampleRowCode from program only if changed } else if (isCreateMode()) { - String rowCode = serviceSampling.getNewSampleRowCode(periodBegin); - getSampleRow().setCode(rowCode); + if ( ! WaoUtils.isValidSampleRowCode(getSampleRow().getCode())) { + sampleRowForm.recordError(code, String.format( + messages.get(n_("wao.import.sampleRow.failure.wrongSampleRowCodeFormat")), + getSampleRow().getCode())); + } } if (sampleRow.getSamplingStrategy() == SamplingStrategy.SPECIFIC_STOCK) { Modified: trunk/wao-ui/src/main/webapp/SampleRowForm.tml =================================================================== --- trunk/wao-ui/src/main/webapp/SampleRowForm.tml 2012-03-02 14:22:27 UTC (rev 1546) +++ trunk/wao-ui/src/main/webapp/SampleRowForm.tml 2012-03-06 14:20:03 UTC (rev 1547) @@ -256,14 +256,13 @@ <div class="t-beaneditor"> <t:beaneditor t:id="sampleRowEditor" t:object="sampleRow" t:model="sampleRowModel"> <p:code> - <label>${message:wao.ui.field.SampleRow.code}</label> -  - <t:if t:test="sampleRow.code"> - <strong>${sampleRow.code}</strong> + <label for="code"> + ${message:wao.ui.field.SampleRow.code} + </label> + <t:if t:test="createMode"> + <t:textfield t:id="code" t:value="sampleRow.code" size="9" /> <p:else> - <span class="code-missing"> - ${message:wao.ui.form.SampleRow.missingBeginDate} - </span> + ${sampleRow.code} </p:else> </t:if> </p:code>

1 0

r1546 - in trunk/wao-ui/src/main: java/fr/ifremer/wao/ui/components resources/fr/ifremer/wao/ui/components
by bleny＠users.forge.codelutin.com 02 Mar '12

02 Mar '12

Author: bleny Date: 2012-03-02 15:22:27 +0100 (Fri, 02 Mar 2012) New Revision: 1546 Url: http://forge.codelutin.com/repositories/revision/wao/1546 Log: Evolution #670 Ajouter le programme dans les filtres des contacts ; passage en s?\195?\169lection multiple Modified: trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/components/SimpleSelector.java trunk/wao-ui/src/main/resources/fr/ifremer/wao/ui/components/ContactFilterComponent.tml trunk/wao-ui/src/main/resources/fr/ifremer/wao/ui/components/SimpleSelector.tml Modified: trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/components/SimpleSelector.java =================================================================== --- trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/components/SimpleSelector.java 2012-03-02 11:25:41 UTC (rev 1545) +++ trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/components/SimpleSelector.java 2012-03-02 14:22:27 UTC (rev 1546) @@ -31,9 +31,11 @@ import org.apache.tapestry5.ioc.annotations.Inject; import org.apache.tapestry5.ioc.services.PropertyAccess; import org.apache.tapestry5.util.AbstractSelectModel; +import org.chenillekit.tapestry.core.encoders.MultipleValueEncoder; import org.slf4j.Logger; import java.util.ArrayList; +import java.util.Arrays; import java.util.Collections; import java.util.Comparator; import java.util.List; @@ -75,6 +77,25 @@ @Parameter(required = false) private SimpleSelectorModel model; + private MultipleValueEncoder<String> encoder; + + public MultipleValueEncoder<String> getEncoder() { + if (encoder == null) { + encoder = new MultipleValueEncoder<String>() { + @Override + public String toClient(String value) { + return value; + } + + @Override + public List<String> toValue(String[] clientValue) { + return Arrays.asList(clientValue); + } + }; + } + return encoder; + } + public SimpleSelectorModel getModel() { if (model == null) { model = new SimpleSelectorModel(); Modified: trunk/wao-ui/src/main/resources/fr/ifremer/wao/ui/components/ContactFilterComponent.tml =================================================================== --- trunk/wao-ui/src/main/resources/fr/ifremer/wao/ui/components/ContactFilterComponent.tml 2012-03-02 11:25:41 UTC (rev 1545) +++ trunk/wao-ui/src/main/resources/fr/ifremer/wao/ui/components/ContactFilterComponent.tml 2012-03-02 14:22:27 UTC (rev 1546) @@ -41,6 +41,16 @@ t:selectedValues="filter.samplingFilter.sampleRows" size="6"/> </div> + <t:unless test="user.obsDeb"> + <div style="float: left; margin-right: 15px;"> + <label for="programName">${message:wao.ui.field.SampleRow.programName} :</label><br /> + <t:simpleSelector t:id="programName" + t:values="possibleValuesForFilter.samplingFilterValues.programsAsList" + t:selectedValues="filter.samplingFilter.programNames" + t:multiple="true" + t:size="6" /> + </div> + </t:unless> <label for="periodBegin">${message:wao.ui.form.periodFrom}</label> <input t:type="datefield" @@ -143,10 +153,6 @@ t:values="possibleValuesForFilter.obsDebCodesAsList" t:selectedValue="filter.obsDebCode"/> <p:else> - <label for="programName">${message:wao.ui.field.SampleRow.programName} :</label> - <t:simpleSelector t:id="programName" - t:values="possibleValuesForFilter.samplingFilterValues.programsAsList" - t:selectedValue="filter.samplingFilter.programName"/> <label t:for="facadeName">${message:wao.ui.field.FishingZone.facadeName} :</label> <t:simpleSelector t:id="facadeName" t:values="possibleValuesForFilter.samplingFilterValues.facadeNamesAsList" Modified: trunk/wao-ui/src/main/resources/fr/ifremer/wao/ui/components/SimpleSelector.tml =================================================================== --- trunk/wao-ui/src/main/resources/fr/ifremer/wao/ui/components/SimpleSelector.tml 2012-03-02 11:25:41 UTC (rev 1545) +++ trunk/wao-ui/src/main/resources/fr/ifremer/wao/ui/components/SimpleSelector.tml 2012-03-02 14:22:27 UTC (rev 1546) @@ -30,7 +30,8 @@ t:model="model" t:value="selectedValues" t:disabled="disabled" - size="${size}"/> + t:encoder="encoder" + size="${size}" /> <p:else> <input t:type="select" t:id="select"

1 0

r1545 - in trunk: wao-business/src/main/java/fr/ifremer/wao/bean wao-business/src/main/java/fr/ifremer/wao/entity wao-business/src/main/xmi wao-ui/src/main/resources/fr/ifremer/wao/ui/components
by bleny＠users.forge.codelutin.com 02 Mar '12

02 Mar '12

Author: bleny Date: 2012-03-02 12:25:41 +0100 (Fri, 02 Mar 2012) New Revision: 1545 Url: http://forge.codelutin.com/repositories/revision/wao/1545 Log: Evolution #670 Ajouter le programme dans les filtres des contacts : en s?\195?\169lection simple pour l'instant Modified: trunk/wao-business/src/main/java/fr/ifremer/wao/bean/SamplingFilterImpl.java trunk/wao-business/src/main/java/fr/ifremer/wao/entity/SampleRowDAOImpl.java trunk/wao-business/src/main/xmi/wao.zargo trunk/wao-ui/src/main/resources/fr/ifremer/wao/ui/components/ContactFilterComponent.tml Modified: trunk/wao-business/src/main/java/fr/ifremer/wao/bean/SamplingFilterImpl.java =================================================================== --- trunk/wao-business/src/main/java/fr/ifremer/wao/bean/SamplingFilterImpl.java 2012-03-02 10:21:23 UTC (rev 1544) +++ trunk/wao-business/src/main/java/fr/ifremer/wao/bean/SamplingFilterImpl.java 2012-03-02 11:25:41 UTC (rev 1545) @@ -54,7 +54,7 @@ getSampleRows() != null || StringUtils.isNotEmpty(getSectorName()) || StringUtils.isNotEmpty(getFacadeName()) || - StringUtils.isNotEmpty(getProgramName()) || + CollectionUtils.isNotEmpty(getProgramNames()) || StringUtils.isNotEmpty(getCodeDCF5()) || getPeriod() != null || getSampleRows() != null || @@ -102,6 +102,29 @@ } @Override + public void setProgramName(String programName) { + if (programName == null) { + setProgramNames(null); + } else { + List<String> programNames = new ArrayList<String>(); + programNames.add(programName); + setProgramNames(programNames); + } + } + + @Override + public String getProgramName() { + String programName = null; + if (CollectionUtils.isNotEmpty(getProgramNames())) { + programName = getProgramNames().get(0); + if (getProgramNames().size() > 1) { + log.warn("other program names will be ignored"); + } + } + return programName; + } + + @Override public String toString() { String toString = ToStringBuilder.reflectionToString(this); return toString; Modified: trunk/wao-business/src/main/java/fr/ifremer/wao/entity/SampleRowDAOImpl.java =================================================================== --- trunk/wao-business/src/main/java/fr/ifremer/wao/entity/SampleRowDAOImpl.java 2012-03-02 10:21:23 UTC (rev 1544) +++ trunk/wao-business/src/main/java/fr/ifremer/wao/entity/SampleRowDAOImpl.java 2012-03-02 11:25:41 UTC (rev 1545) @@ -39,6 +39,10 @@ } + if (CollectionUtils.isNotEmpty(filter.getProgramNames())) { + query.addEquals(SampleRow.PROPERTY_PROGRAM_NAME, filter.getProgramNames().toArray()); + } + boolean filterOnFaceName = StringUtils.isNotEmpty(filter.getFacadeName()); boolean filterOnSectorName = StringUtils.isNotEmpty(filter.getSectorName()); boolean filterOnFishingZone = filterOnFaceName || filterOnSectorName; @@ -87,10 +91,6 @@ } - if (filter.getProgramName() != null) { - query.addEquals(SampleRow.PROPERTY_PROGRAM_NAME, filter.getProgramName()); - } - // Period filter on sampleRow dates if (filter.getPeriod() != null) { if (ObsProgram.OBSDEB.equals(filter.getObsProgram())) { Modified: trunk/wao-business/src/main/xmi/wao.zargo =================================================================== (Binary files differ) Modified: trunk/wao-ui/src/main/resources/fr/ifremer/wao/ui/components/ContactFilterComponent.tml =================================================================== --- trunk/wao-ui/src/main/resources/fr/ifremer/wao/ui/components/ContactFilterComponent.tml 2012-03-02 10:21:23 UTC (rev 1544) +++ trunk/wao-ui/src/main/resources/fr/ifremer/wao/ui/components/ContactFilterComponent.tml 2012-03-02 11:25:41 UTC (rev 1545) @@ -143,7 +143,10 @@ t:values="possibleValuesForFilter.obsDebCodesAsList" t:selectedValue="filter.obsDebCode"/> <p:else> - + <label for="programName">${message:wao.ui.field.SampleRow.programName} :</label> + <t:simpleSelector t:id="programName" + t:values="possibleValuesForFilter.samplingFilterValues.programsAsList" + t:selectedValue="filter.samplingFilter.programName"/> <label t:for="facadeName">${message:wao.ui.field.FishingZone.facadeName} :</label> <t:simpleSelector t:id="facadeName" t:values="possibleValuesForFilter.samplingFilterValues.facadeNamesAsList"

1 0

r1544 - in trunk: wao-business/src/main/resources/i18n wao-ui/src/main/java/fr/ifremer/wao/ui/pages wao-ui/src/main/resources/i18n
by bleny＠users.forge.codelutin.com 02 Mar '12

02 Mar '12

Author: bleny Date: 2012-03-02 11:21:23 +0100 (Fri, 02 Mar 2012) New Revision: 1544 Url: http://forge.codelutin.com/repositories/revision/wao/1544 Log: ajout de valeurs i18n manquantes Modified: trunk/wao-business/src/main/resources/i18n/wao-business_en_GB.properties trunk/wao-business/src/main/resources/i18n/wao-business_fr_FR.properties trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/pages/Connexion.java trunk/wao-ui/src/main/resources/i18n/wao-ui_en_GB.properties trunk/wao-ui/src/main/resources/i18n/wao-ui_fr_FR.properties Modified: trunk/wao-business/src/main/resources/i18n/wao-business_en_GB.properties =================================================================== --- trunk/wao-business/src/main/resources/i18n/wao-business_en_GB.properties 2012-03-01 16:50:43 UTC (rev 1543) +++ trunk/wao-business/src/main/resources/i18n/wao-business_en_GB.properties 2012-03-02 10:21:23 UTC (rev 1544) @@ -281,6 +281,7 @@ wao.error.serviceSynthesis.getNonComplianceBoardingIndicator= wao.error.serviceSynthesis.getObservationHours= wao.error.serviceSynthesis.updateGlobalSynthesisParameters=Unable to update global synthesis parameters +wao.error.serviceUser.acceptCgu= wao.error.serviceUser.addTokensToAllProfiles= wao.error.serviceUser.connect= wao.error.serviceUser.createDefaultAdmin= Modified: trunk/wao-business/src/main/resources/i18n/wao-business_fr_FR.properties =================================================================== --- trunk/wao-business/src/main/resources/i18n/wao-business_fr_FR.properties 2012-03-01 16:50:43 UTC (rev 1543) +++ trunk/wao-business/src/main/resources/i18n/wao-business_fr_FR.properties 2012-03-02 10:21:23 UTC (rev 1544) @@ -280,6 +280,7 @@ wao.error.serviceSynthesis.getNonComplianceBoardingIndicator=Impossible de récupérer l'indicateur de non respect du nombre d'observateurs embarqués wao.error.serviceSynthesis.getObservationHours= wao.error.serviceSynthesis.updateGlobalSynthesisParameters=Impossible de mettre à jour les paramètres de la synthèse globale +wao.error.serviceUser.acceptCgu= wao.error.serviceUser.addTokensToAllProfiles= wao.error.serviceUser.connect=Une erreur est survenue lors de la demande de connexion wao.error.serviceUser.createDefaultAdmin=Impossible de créer l'administrateur par défaut Modified: trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/pages/Connexion.java =================================================================== --- trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/pages/Connexion.java 2012-03-01 16:50:43 UTC (rev 1543) +++ trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/pages/Connexion.java 2012-03-02 10:21:23 UTC (rev 1544) @@ -51,6 +51,8 @@ import java.util.Arrays; import java.util.List; +import static org.nuiton.i18n.I18n.n_; + /** * Login * @@ -309,7 +311,7 @@ serviceUser.acceptCgu(serviceAuthentication.getConnectedUser()); } if (serviceAuthentication.getConnectedUser().getUser().getCguAccepted() == null) { - String message = messages.get("wao.ui.userMustAcceptCgu"); + String message = messages.get(n_("wao.ui.userMustAcceptCgu")); connexionFeedback.addError(message); roleForm.recordError(message); } Modified: trunk/wao-ui/src/main/resources/i18n/wao-ui_en_GB.properties =================================================================== --- trunk/wao-ui/src/main/resources/i18n/wao-ui_en_GB.properties 2012-03-01 16:50:43 UTC (rev 1543) +++ trunk/wao-ui/src/main/resources/i18n/wao-ui_en_GB.properties 2012-03-02 10:21:23 UTC (rev 1544) @@ -344,4 +344,5 @@ wao.ui.synthesis.observationHours.title=Observation hours wao.ui.unavailableOperation=Unavailable operation wao.ui.userList=Users list +wao.ui.userMustAcceptCgu=You must accept the terms of use wao.ui.validLogin=Valid identifier Modified: trunk/wao-ui/src/main/resources/i18n/wao-ui_fr_FR.properties =================================================================== --- trunk/wao-ui/src/main/resources/i18n/wao-ui_fr_FR.properties 2012-03-01 16:50:43 UTC (rev 1543) +++ trunk/wao-ui/src/main/resources/i18n/wao-ui_fr_FR.properties 2012-03-02 10:21:23 UTC (rev 1544) @@ -340,4 +340,5 @@ wao.ui.synthesis.observationHours.title=Distribution des périodes d'observation wao.ui.unavailableOperation=Opération non-disponible wao.ui.userList=Liste des utilisateurs +wao.ui.userMustAcceptCgu=Vous devez accepter les conditions d'utilisation pour utiliser Wao wao.ui.validLogin=Identifiant valide

1 0

r1543 - trunk/wao-business/src/main/java/fr/ifremer/wao/service
by bleny＠users.forge.codelutin.com 01 Mar '12

01 Mar '12

Author: bleny Date: 2012-03-01 17:50:43 +0100 (Thu, 01 Mar 2012) New Revision: 1543 Url: http://forge.codelutin.com/repositories/revision/wao/1543 Log: Evolution #607: Ajouter une ?\195?\169tape d'acceptation des conditions d'utilisation ?\195?\160 la premi?\195?\168re connexion Modified: trunk/wao-business/src/main/java/fr/ifremer/wao/service/ServiceUserImpl.java Modified: trunk/wao-business/src/main/java/fr/ifremer/wao/service/ServiceUserImpl.java =================================================================== --- trunk/wao-business/src/main/java/fr/ifremer/wao/service/ServiceUserImpl.java 2012-03-01 16:50:20 UTC (rev 1542) +++ trunk/wao-business/src/main/java/fr/ifremer/wao/service/ServiceUserImpl.java 2012-03-01 16:50:43 UTC (rev 1543) @@ -643,7 +643,7 @@ WaoUserDAO dao = WaoDAOHelper.getWaoUserDAO(transaction); dao.update(user); - // transaction.commitTransaction(); + transaction.commitTransaction(); }

1 0