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

[Suiviobsmer-commits] r777 - trunk/wao-business/src/main/resources/i18n
by bleny＠users.labs.libre-entreprise.org Nov. 17, 2010

Nov. 17, 2010

Author: bleny Date: 2010-11-17 16:35:43 +0000 (Wed, 17 Nov 2010) New Revision: 777 Log: add missing gear and specices code description Modified: trunk/wao-business/src/main/resources/i18n/wao-business-fr_FR.properties 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 2010-11-14 18:27:01 UTC (rev 776) +++ trunk/wao-business/src/main/resources/i18n/wao-business-fr_FR.properties 2010-11-17 16:35:43 UTC (rev 777) @@ -17,6 +17,7 @@ DCF.gear.GND=Filets maillants d\u00E9rivants (filets d\u00E9rivants) DCF.gear.GNF=Filets maillants fixes (sur perches) DCF.gear.GNS=Filets maillants cal\u00E9s (ancr\u00E9s) +DCF.gear.GT=Tr\u00E9mailleurs DCF.gear.GTN=Tr\u00E9mails et filets maillants combin\u00E9s DCF.gear.GTR=Tr\u00E9mails DCF.gear.HAR=Harpons @@ -65,6 +66,7 @@ DCF.species.ALG=Algues DCF.species.CAT=Esp\u00E8ces catadromes DCF.species.CRU=Crustac\u00E9s +DCF.species.CSJ=Coquilles Saint-Jacques DCF.species.DEF=Esp\u00E8ces d\u00E9mersales DCF.species.DWS=Esp\u00E8ces d'eaux profondes DCF.species.FIN=Poisson plats

1 0

[Suiviobsmer-commits] r776 - in trunk: wao-business/src/main/java/fr/ifremer/wao/service wao-business/src/test/java/fr/ifremer/wao/service wao-ui/src/main/java/fr/ifremer/wao/ui/pages
by fdesbois＠users.labs.libre-entreprise.org Nov. 14, 2010

Nov. 14, 2010

Author: fdesbois Date: 2010-11-14 18:27:01 +0000 (Sun, 14 Nov 2010) New Revision: 776 Log: ANO #2565 : error on validation program reset contact form - Warning, a regression was introduce on contact validation if validationProgram is null (for a non admin save) - Test failure : ignored and need to be fixed - Resolve Ano : reset contactEdited on validationProgram failure, keep edited data will stay in editionMode which is not good for validation. Modified: trunk/wao-business/src/main/java/fr/ifremer/wao/service/ServiceContactImpl.java trunk/wao-business/src/test/java/fr/ifremer/wao/service/ServiceContactImplTest.java trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/pages/Contacts.java 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-11-12 20:19:44 UTC (rev 775) +++ trunk/wao-business/src/main/java/fr/ifremer/wao/service/ServiceContactImpl.java 2010-11-14 18:27:01 UTC (rev 776) @@ -142,7 +142,9 @@ // contactProperty.sampleRowProperty().sampleMonth()); // TODO-fdesbois-2010-06-18 : manage aliases in addLoad addLoad(TopiaQuery.getProperty(Contact.OBSERVER, WaoUser.COMPANY), - TopiaQuery.getProperty(Contact.SAMPLE_ROW, SampleRow.SAMPLE_MONTH)); + TopiaQuery.getProperty(Contact.SAMPLE_ROW, SampleRow.SAMPLE_MONTH) +// TopiaQuery.getProperty(Contact.SAMPLE_ROW, SampleRow.PROFESSION, Profession.DCF5CODE) + ); Map<String, Contact> results = dao.findAllMappedByQuery(query); Modified: trunk/wao-business/src/test/java/fr/ifremer/wao/service/ServiceContactImplTest.java =================================================================== --- trunk/wao-business/src/test/java/fr/ifremer/wao/service/ServiceContactImplTest.java 2010-11-12 20:19:44 UTC (rev 775) +++ trunk/wao-business/src/test/java/fr/ifremer/wao/service/ServiceContactImplTest.java 2010-11-14 18:27:01 UTC (rev 776) @@ -31,6 +31,7 @@ import fr.ifremer.wao.entity.WaoUser; import org.junit.Assert; import org.junit.Before; +import org.junit.Ignore; import org.junit.Test; import org.nuiton.topia.TopiaException; import org.slf4j.Logger; @@ -60,6 +61,8 @@ } @Test + // FIXME-fdesbois-2010-11-14 : NPE on ServiceContactImpl when loading dcf5code + @Ignore public void testGetContactsFilteredByObserver() throws TopiaException { log.info("getContactsFilteredByObserver"); Modified: trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/pages/Contacts.java =================================================================== --- trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/pages/Contacts.java 2010-11-12 20:19:44 UTC (rev 775) +++ trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/pages/Contacts.java 2010-11-14 18:27:01 UTC (rev 776) @@ -727,6 +727,7 @@ } // Embarquement Réalisé } else if (contactState.equals(ContactState.BOARDING_DONE)) { + if (begin == null) { contactsForm.recordError(beginDate, "La date de début de" + " marée est obligatoire pour l'état" + @@ -743,11 +744,20 @@ " '" + contactState.libelle() + "'"); } - if (contactEdited.isValidationProgram()) { + // XXX to bleny : Regression... It's better to check all case, + // when user (not admin) has a validation error, NPE appears on + // contactEdited.isValidationProgram() + if (logger.isDebugEnabled()) { + logger.debug("ValidationProgram = " + contactEdited.isValidationProgram()); + } + + if (BooleanUtils.isTrue(contactEdited.isValidationProgram())) { + // it's an admin validation, data-reliability field must be filled if (logger.isDebugEnabled()) { - logger.debug("field data reliability is " + contactEdited.getDataReliability()); + logger.debug("field data reliability is " + + contactEdited.getDataReliability()); } if (contactEdited.getDataReliability() == null || @@ -789,11 +799,15 @@ if (logger.isDebugEnabled()) { logger.debug("Contact can't be saved with errors"); } - // The contact is not saved, the contact must be editable to show form - // and correct errors - edited = true; + + // ANO #2565 : + // ContactEdited need to be reset if a validationProgram error occurs + // isEditionMode need to return false to avoid conflict with other save + if (BooleanUtils.isTrue(contactEdited.isValidationProgram())) { + contactEdited = null; + } + return contactsForm; - //return gridZone; } public void createNewContact(Boat boat, SampleRow sampleRow) throws WaoException {

1 0

[Suiviobsmer-commits] r775 - in trunk/wao-ui/src/main/webapp: . css
by bleny＠users.labs.libre-entreprise.org Nov. 12, 2010

Nov. 12, 2010

Author: bleny Date: 2010-11-12 20:19:44 +0000 (Fri, 12 Nov 2010) New Revision: 775 Log: making map page look better Modified: trunk/wao-ui/src/main/webapp/Cartography.tml trunk/wao-ui/src/main/webapp/css/cartography.css Modified: trunk/wao-ui/src/main/webapp/Cartography.tml =================================================================== --- trunk/wao-ui/src/main/webapp/Cartography.tml 2010-11-12 19:57:23 UTC (rev 774) +++ trunk/wao-ui/src/main/webapp/Cartography.tml 2010-11-12 20:19:44 UTC (rev 775) @@ -43,16 +43,9 @@ <div id="so-cartography-border" class="fleft"> <div id="so-cartography-icons"> - <span> - <a t:type="pagelink" t:page="index" title="Page d'accueil"> - <img src="${asset:context:img/logo-wao-48px.png}" alt="WAO logo" title="Retourner sur l'application Wao"/> - </a>  - </span> - <span> - <a href="mailto:obsmer at ifremer.fr" title="Contacter un responsable Obsmer"> - <img src="${asset:context:img/MiniLogo.jpg}" alt="Obsmer logo"/> - </a> - </span> + <a t:type="pagelink" t:page="index" title="Page d'accueil"> + <img src="${asset:context:img/logo-wao-48px.png}" alt="WAO logo" title="Retourner sur l'application Wao"/> + </a>  </div> <h1>${pageTitle}</h1> @@ -100,10 +93,15 @@ </p> </form> </div> - + + <div class="acenter mtop30"> + <a href="mailto:obsmer at ifremer.fr" title="Contacter un responsable Obsmer"> + <img style="height: 22px;" src="${asset:context:img/MiniLogo.jpg}" alt="Obsmer logo"/> + </a> + </div> </div> - <div id="so-cartography-map" class="fleft"></div> + <div id="so-cartography-map" class="fleft" style="margin: 10px;"/> </div> <t:footer /> Modified: trunk/wao-ui/src/main/webapp/css/cartography.css =================================================================== --- trunk/wao-ui/src/main/webapp/css/cartography.css 2010-11-12 19:57:23 UTC (rev 774) +++ trunk/wao-ui/src/main/webapp/css/cartography.css 2010-11-12 20:19:44 UTC (rev 775) @@ -34,9 +34,10 @@ #so-cartography-border { width: 300px; - background-color:#f1f1f1; - padding:10px; - color:#007CC2; + background-color: #f1f1f1; + padding: 10px; + color: #007CC2; + margin: 10px; } #so-cartography-border h1 { @@ -51,8 +52,6 @@ #so-cartography-icons { text-align: center; margin: 20px; - background-color: white; - border: 1px solid black; } #so-cartography-filters { @@ -62,8 +61,9 @@ } #so-cartography-map { - width: 700px; - height: 700px; + width: 800px; + height: 600px; + margin: 10px !important; } #so-cartography-map h3 {

1 0

[Suiviobsmer-commits] r774 - in trunk: wao-business/src/main/java/fr/ifremer/wao wao-business/src/main/xmi wao-ui/src/main/resources/fr/ifremer/wao/ui/pages wao-ui/src/main/webapp
by bleny＠users.labs.libre-entreprise.org Nov. 12, 2010

Nov. 12, 2010

Author: bleny Date: 2010-11-12 19:57:23 +0000 (Fri, 12 Nov 2010) New Revision: 774 Log: sort contacts by boarding date Modified: trunk/wao-business/src/main/java/fr/ifremer/wao/WaoQueryBuilder.java trunk/wao-business/src/main/xmi/wao.zargo trunk/wao-ui/src/main/resources/fr/ifremer/wao/ui/pages/Contacts.properties trunk/wao-ui/src/main/webapp/Contacts.tml Modified: trunk/wao-business/src/main/java/fr/ifremer/wao/WaoQueryBuilder.java =================================================================== --- trunk/wao-business/src/main/java/fr/ifremer/wao/WaoQueryBuilder.java 2010-11-12 19:37:20 UTC (rev 773) +++ trunk/wao-business/src/main/java/fr/ifremer/wao/WaoQueryBuilder.java 2010-11-12 19:57:23 UTC (rev 774) @@ -27,6 +27,7 @@ import fr.ifremer.wao.bean.SamplingFilter; import fr.ifremer.wao.bean.UserFilter; import fr.ifremer.wao.entity.Company; +import fr.ifremer.wao.entity.Contact; import fr.ifremer.wao.entity.SampleRow; import fr.ifremer.wao.entity.WaoUser; import org.apache.commons.collections.CollectionUtils; @@ -568,6 +569,10 @@ filter.setFromDate(fromDate); filter.setPeriod(period); + if (filter.isSortedByBoardingDate()) { + query.addOrder(contactProperty.$property(Contact.TIDE_BEGIN_DATE + " DESC")); + } + // ORDER_BY if (StringUtils.isNotEmpty(orderBy)) { query.addOrder(contactProperty.$property(orderBy)); Modified: trunk/wao-business/src/main/xmi/wao.zargo =================================================================== (Binary files differ) Modified: trunk/wao-ui/src/main/resources/fr/ifremer/wao/ui/pages/Contacts.properties =================================================================== --- trunk/wao-ui/src/main/resources/fr/ifremer/wao/ui/pages/Contacts.properties 2010-11-12 19:37:20 UTC (rev 773) +++ trunk/wao-ui/src/main/resources/fr/ifremer/wao/ui/pages/Contacts.properties 2010-11-12 19:57:23 UTC (rev 774) @@ -59,6 +59,7 @@ commentAdmin-label: Commentaire programme commentCoordinator-label: Commentaire soci\u00e9t\u00e9 dataReliability-label: Qualit\u00e9 de la donn\u00e9e +sortedByBoardingDate-label: Trier les contacts (ordre anti-chronologique) # Form labels contactsForm-errors-banner: Le contact n'a pas \u00e9t\u00e9 sauvegard\u00e9 \u00e0 cause des erreurs suivantes : Modified: trunk/wao-ui/src/main/webapp/Contacts.tml =================================================================== --- trunk/wao-ui/src/main/webapp/Contacts.tml 2010-11-12 19:37:20 UTC (rev 773) +++ trunk/wao-ui/src/main/webapp/Contacts.tml 2010-11-12 19:57:23 UTC (rev 774) @@ -150,8 +150,10 @@ <input t:type="checkbox" t:id="commentAdmin" value="contactFilter.commentAdmin" />  <label for="commentAdmin">programme</label> </t:if> -  </div> + <div> + <input t:type="checkbox" t:id="sortedByBoardingDate" value="contactFilter.sortedByBoardingDate" /> <t:label t:for="sortedByBoardingDate" /> + </div> <div class="t-beaneditor-row aright"> <input t:type="submit" class="ico search-32px" t:id="search" value="Search" title="Rechercher les contacts correspondants aux filtres saisies" />  <input t:type="submit" class="ico undo" t:id="reset" value="Reset" title="Remettre les filtres par défaut" />

1 0

[Suiviobsmer-commits] r773 - in trunk: wao-business/src/main/java/fr/ifremer/wao/service wao-ui/src/main/java/fr/ifremer/wao/ui/pages
by bleny＠users.labs.libre-entreprise.org Nov. 12, 2010

Nov. 12, 2010

Author: bleny Date: 2010-11-12 19:37:20 +0000 (Fri, 12 Nov 2010) New Revision: 773 Log: contact date filter initialized at first day of the year Modified: trunk/wao-business/src/main/java/fr/ifremer/wao/service/ServiceContactImpl.java trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/pages/Contacts.java 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-11-12 19:04:11 UTC (rev 772) +++ trunk/wao-business/src/main/java/fr/ifremer/wao/service/ServiceContactImpl.java 2010-11-12 19:37:20 UTC (rev 773) @@ -146,6 +146,11 @@ Map<String, Contact> results = dao.findAllMappedByQuery(query); + // XXX bleny 20101112 prevent lazy loading failure + for (Contact contact : results.values()) { + contact.getSampleRow().getProfession().sizeDcf5code(); + } + return results; } Modified: trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/pages/Contacts.java =================================================================== --- trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/pages/Contacts.java 2010-11-12 19:04:11 UTC (rev 772) +++ trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/pages/Contacts.java 2010-11-12 19:37:20 UTC (rev 773) @@ -72,14 +72,15 @@ import org.apache.tapestry5.json.JSONObject; import org.apache.tapestry5.services.BeanModelSource; import org.apache.tapestry5.upload.services.UploadedFile; -import org.nuiton.util.DateUtil; import org.slf4j.Logger; import java.io.IOException; import java.io.InputStream; import java.text.DateFormat; import java.text.SimpleDateFormat; +import java.util.Calendar; import java.util.Date; +import java.util.GregorianCalendar; import java.util.List; /** @@ -163,9 +164,9 @@ logger.debug("Init contactFilter"); } contactFilter = new ContactFilterImpl(); - // Initialized to 3 months before the current day - Date fromDate = DateUtil.createDateAfterToday(0, -3, 0); - contactFilter.setFromDate(fromDate); + GregorianCalendar beginningOfCurrentYear = new GregorianCalendar(); + beginningOfCurrentYear.set(Calendar.DAY_OF_YEAR, 1); + contactFilter.setFromDate(beginningOfCurrentYear.getTime()); } return contactFilter; }

1 0

[Suiviobsmer-commits] r772 - in trunk/wao-ui/src/main: java/fr/ifremer/wao/ui/pages webapp
by bleny＠users.labs.libre-entreprise.org Nov. 12, 2010

Nov. 12, 2010

Author: bleny Date: 2010-11-12 19:04:11 +0000 (Fri, 12 Nov 2010) New Revision: 772 Log: merge period selection and filters in sampling plan Modified: trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/pages/SamplingPlan.java trunk/wao-ui/src/main/webapp/SamplingPlan.tml Modified: trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/pages/SamplingPlan.java =================================================================== --- trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/pages/SamplingPlan.java 2010-11-12 18:13:17 UTC (rev 771) +++ trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/pages/SamplingPlan.java 2010-11-12 19:04:11 UTC (rev 772) @@ -41,6 +41,7 @@ import fr.ifremer.wao.ui.data.ExportStreamResponse; import fr.ifremer.wao.ui.data.RequiresAuthentication; import fr.ifremer.wao.ui.services.WaoManager; +import org.apache.commons.lang.BooleanUtils; import org.apache.tapestry5.StreamResponse; import org.apache.tapestry5.annotations.IncludeStylesheet; import org.apache.tapestry5.annotations.InjectComponent; @@ -205,16 +206,27 @@ return false; } + @Persist + private Boolean showFilters; + public boolean isFiltersVisible() { - boolean companyFiltered = getFilter().getCompany() != null - && user.isAdmin(); - return (!getFilter().isPeriodFilteredOnly() || companyFiltered); + if (showFilters == null) { + showFilters = false; + } + return BooleanUtils.isTrue(showFilters); } Object onActionFromShowFilters() { + showFilters = ! showFilters; + // Initialize filters initSelectFilters(true, false, true); - return filtersZone.getBody(); + + if (isFiltersVisible()) { + return filtersZone.getBody(); + } else { + return filtersZone; + } } void onSelectedFromReset() { Modified: trunk/wao-ui/src/main/webapp/SamplingPlan.tml =================================================================== --- trunk/wao-ui/src/main/webapp/SamplingPlan.tml 2010-11-12 18:13:17 UTC (rev 771) +++ trunk/wao-ui/src/main/webapp/SamplingPlan.tml 2010-11-12 19:04:11 UTC (rev 772) @@ -90,7 +90,7 @@ </t:if> </div> </div> - <form t:type="form" t:id="periodForm" action="post"> +  + <div> + Pour la pédiode du <t:output value="period.fromDate" format="dateFormat" /> au <t:output value="period.thruDate" format="dateFormat" /> +  <a t:type="actionlink" t:id="showFilters" t:zone="so-sampling-filters" class="display-form"><img src="${asset:context:img/search.png}" /> recherche avancée</a> + </div> <div t:type="zone" t:id="filtersZone" t:visible="prop:filtersVisible" id="so-sampling-filters"> <fieldset> <legend>Recherche avancée</legend> @@ -108,6 +112,12 @@ <t:errors /> <div class="t-beaneditor"> <div> + <t:label t:for="periodBegin" /> : + <input t:type="datefield" class="width70" t:id="periodBegin" t:value="period.fromDate" t:format="MM/yyyy" t:validate="required"/>  + <t:label t:for="periodEnd" /> : + <input t:type="datefield" class="width70" t:id="periodEnd" t:value="period.thruDate" t:format="MM/yyyy" t:validate="required" />  + </div> + <div> <t:if t:test="user.admin"> <t:label t:for="company" /> : <input t:type="select" t:id="company" t:model="companySelectModel" value="companyId"/>

1 0

[Suiviobsmer-commits] r771 - in trunk: wao-business/src/main/java/fr/ifremer/wao/io/csv wao-business/src/main/java/fr/ifremer/wao/service wao-ui/src/main/java/fr/ifremer/wao/ui/pages wao-ui/src/main/java/fr/ifremer/wao/ui/services wao-ui/src/main/webapp
by bleny＠users.labs.libre-entreprise.org Nov. 12, 2010

Nov. 12, 2010

Author: bleny Date: 2010-11-12 18:13:17 +0000 (Fri, 12 Nov 2010) New Revision: 771 Log: migration : dealing with CSV import/export Modified: trunk/wao-business/src/main/java/fr/ifremer/wao/io/csv/ImportHelper.java trunk/wao-business/src/main/java/fr/ifremer/wao/service/ServiceContactImpl.java trunk/wao-business/src/main/java/fr/ifremer/wao/service/ServiceSamplingImpl.java trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/pages/SampleRowForm.java trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/services/WaoManager.java trunk/wao-ui/src/main/webapp/SamplingPlan.tml Modified: trunk/wao-business/src/main/java/fr/ifremer/wao/io/csv/ImportHelper.java =================================================================== --- trunk/wao-business/src/main/java/fr/ifremer/wao/io/csv/ImportHelper.java 2010-11-12 16:53:30 UTC (rev 770) +++ trunk/wao-business/src/main/java/fr/ifremer/wao/io/csv/ImportHelper.java 2010-11-12 18:13:17 UTC (rev 771) @@ -28,6 +28,8 @@ import fr.ifremer.wao.WaoBusinessException; import fr.ifremer.wao.WaoContext; import fr.ifremer.wao.WaoException; +import fr.ifremer.wao.entity.DCFFiveCode; +import fr.ifremer.wao.entity.DCFFiveCodeImpl; import fr.ifremer.wao.io.csv.WaoCsvHeader.ACTIVITY_CALENDAR; import fr.ifremer.wao.io.csv.WaoCsvHeader.CONTACT; import fr.ifremer.wao.io.csv.WaoCsvHeader.DatedHeader; @@ -43,8 +45,10 @@ import java.text.DateFormat; import java.text.ParseException; import java.text.SimpleDateFormat; +import java.util.ArrayList; import java.util.Arrays; import java.util.Calendar; +import java.util.Collection; import java.util.Date; import java.util.GregorianCalendar; import java.util.List; @@ -128,6 +132,23 @@ return context.prepareSampleRowCode(code); } + public static Collection<DCFFiveCode> readDCF5Codes(CsvReader reader) throws IOException { + Collection<DCFFiveCode> result = new ArrayList<DCFFiveCode>(); + String codesString = read(reader, SAMPLING.METIER_CODE_DCF5); + // codeString is something like "AAA_BBB CCC", let's break it + String[] codes = codesString.split(" et "); + for (String codeString : codes) { + String[] codeParts = codeString.split("_"); + DCFFiveCode code = new DCFFiveCodeImpl(); + code.setFishingGearDCF(codeParts[0]); + if (codeParts.length == 2) { + code.setTargetSpeciesDCF(codeParts[1]); + } + result.add(code); + } + return result; + } + /** * Read a string value in CsvReader from {@code header} column. * In ActivityCalendarImport the result value can be null if the read value is "NA". 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-11-12 16:53:30 UTC (rev 770) +++ trunk/wao-business/src/main/java/fr/ifremer/wao/service/ServiceContactImpl.java 2010-11-12 18:13:17 UTC (rev 771) @@ -72,6 +72,7 @@ import org.nuiton.topia.TopiaException; import org.nuiton.topia.framework.TopiaQuery; import org.nuiton.topia.persistence.TopiaEntity; +import org.nuiton.util.StringUtil; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -466,6 +467,7 @@ Profession profession = row.getProfession(); // export.record(SAMPLING.METIER_CODE_DCF5, profession.getCodeDCF5()); + export.record(SAMPLING.METIER_CODE_DCF5, StringUtil.join(profession.getDcf5code(), " et ", true)); export.record(SAMPLING.METIER_MAILLAGE, profession.getMeshSize()); 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-11-12 16:53:30 UTC (rev 770) +++ trunk/wao-business/src/main/java/fr/ifremer/wao/service/ServiceSamplingImpl.java 2010-11-12 18:13:17 UTC (rev 771) @@ -78,6 +78,7 @@ import org.nuiton.topia.framework.TopiaQuery.Op; import org.nuiton.util.DateUtil; import org.nuiton.util.PeriodDates; +import org.nuiton.util.StringUtil; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -841,7 +842,10 @@ // Profession can't be null Profession profession = row.getProfession(); - //export.record(SAMPLING.METIER_CODE_DCF5, profession.getCodeDCF5()); + + // export.record(SAMPLING.METIER_CODE_DCF5, profession.getCodeDCF5()); + export.record(SAMPLING.METIER_CODE_DCF5, StringUtil.join(profession.getDcf5code(), " et ", true)); + export.record(SAMPLING.METIER_MAILLAGE, profession.getMeshSize()); export.record(SAMPLING.METIER_TAILLE, profession.getSize()); export.record(SAMPLING.METIER_AUTRE, profession.getOther()); @@ -1015,13 +1019,15 @@ // 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); + // profession.setCodeDCF5(codeDCF5); + profession.setDcf5code(insertOrSelect(transaction, ImportHelper.readDCF5Codes(reader))); + return profession; } 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 2010-11-12 16:53:30 UTC (rev 770) +++ trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/pages/SampleRowForm.java 2010-11-12 18:13:17 UTC (rev 771) @@ -46,6 +46,7 @@ import fr.ifremer.wao.ui.data.RequiresAuthentication; import fr.ifremer.wao.ui.data.WaoPropertyChangeListener; import fr.ifremer.wao.ui.services.WaoManager; +import org.apache.commons.collections.CollectionUtils; import org.apache.commons.lang.StringUtils; import org.apache.tapestry5.ComponentResources; import org.apache.tapestry5.EventContext; @@ -705,7 +706,7 @@ } Profession profession = getSampleRow().getProfession(); - if (StringUtils.isEmpty(profession.getCodeDCF5())) { + if (CollectionUtils.isEmpty(profession.getDcf5code())) { sampleRowForm.recordError( "Le métier doit obligatoirement avoir un Code DCF niveau 5"); } Modified: trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/services/WaoManager.java =================================================================== --- trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/services/WaoManager.java 2010-11-12 16:53:30 UTC (rev 770) +++ trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/services/WaoManager.java 2010-11-12 18:13:17 UTC (rev 771) @@ -1,3 +1,4 @@ + /* * #%L * Wao :: Web Interface @@ -181,16 +182,7 @@ DateFormat dateFormat = new SimpleDateFormat("MM/yyyy"); Profession profession = row.getProfession(); result.append("<strong>Métier : </strong>"). - append(profession.getCodeDCF5()); - if (!StringUtils.isEmpty(profession.getMeshSize())) { - result.append(' ').append(profession.getMeshSize()); - } - if (!StringUtils.isEmpty(profession.getSize())) { - result.append(' ').append(profession.getSize()); - } - if (!StringUtils.isEmpty(profession.getOther())) { - result.append(' ').append(profession.getOther()); - } + append(profession.getCode()); result.append(" - ").append(profession.getLibelle()); if (!StringUtils.isEmpty(profession.getSpecies())) { result.append("\n<strong>Espèces cibles : </strong>"). Modified: trunk/wao-ui/src/main/webapp/SamplingPlan.tml =================================================================== --- trunk/wao-ui/src/main/webapp/SamplingPlan.tml 2010-11-12 16:53:30 UTC (rev 770) +++ trunk/wao-ui/src/main/webapp/SamplingPlan.tml 2010-11-12 18:13:17 UTC (rev 771) @@ -244,10 +244,10 @@ <t:if t:test="fullView"> <td>${fishingZones}</td> <td>${row.fishingZonesInfos}</td> - <td>${row.profession.codeDCF5} ; + <td> <t:loop source="row.profession.dcf5code" value="dcf5code"> <span t:type="ck/Tooltip" t:value="${dcf5Code.fishingGearDCF} - ${dcf5Code.fishingGearDCFDescription} ; ${dcf5Code.targetSpeciesDCF} - ${dcf5Code.targetSpeciesDCFDescription}" t:effect="appear"> - ${dcf5Code.fishingGearDCF}_${dcf5Code.targetSpeciesDCF} + ${dcf5Code} </span> </t:loop> </td>

1 0

[Suiviobsmer-commits] r770 - in trunk/wao-business/src: main/java/fr/ifremer/wao/service test/java/fr/ifremer/wao test/java/fr/ifremer/wao/entity test/java/fr/ifremer/wao/service
by bleny＠users.labs.libre-entreprise.org Nov. 12, 2010

Nov. 12, 2010

Author: bleny Date: 2010-11-12 16:53:30 +0000 (Fri, 12 Nov 2010) New Revision: 770 Log: fix tests (migration + non-lazy side-effect) Modified: trunk/wao-business/src/main/java/fr/ifremer/wao/service/ServiceSamplingImpl.java trunk/wao-business/src/test/java/fr/ifremer/wao/WaoMigrationCallBackTest.java trunk/wao-business/src/test/java/fr/ifremer/wao/entity/BoatImplTest.java trunk/wao-business/src/test/java/fr/ifremer/wao/service/ServiceBoatImplTest.java trunk/wao-business/src/test/java/fr/ifremer/wao/service/ServiceSamplingImplTest.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 2010-11-12 15:49:09 UTC (rev 769) +++ trunk/wao-business/src/main/java/fr/ifremer/wao/service/ServiceSamplingImpl.java 2010-11-12 16:53:30 UTC (rev 770) @@ -261,9 +261,11 @@ rowLog.addChangePeriod(oldPeriod, newPeriod, pattern); // before saving profession - row.getProfession().setDcf5code( - insertOrSelect(transaction, - row.getProfession().getDcf5code())); + if (row.getProfession().getDcf5code() != null) { + row.getProfession().setDcf5code( + insertOrSelect(transaction, + row.getProfession().getDcf5code())); + } // Save Profession ProfessionDAO professionDAO = WaoDAOHelper.getProfessionDAO(transaction); Modified: trunk/wao-business/src/test/java/fr/ifremer/wao/WaoMigrationCallBackTest.java =================================================================== --- trunk/wao-business/src/test/java/fr/ifremer/wao/WaoMigrationCallBackTest.java 2010-11-12 15:49:09 UTC (rev 769) +++ trunk/wao-business/src/test/java/fr/ifremer/wao/WaoMigrationCallBackTest.java 2010-11-12 16:53:30 UTC (rev 770) @@ -2,6 +2,7 @@ import fr.ifremer.wao.entity.DCFFiveCode; import org.junit.Test; +import org.mockito.Mockito; import org.nuiton.topia.TopiaException; import org.nuiton.topia.framework.TopiaContextImplementor; @@ -13,121 +14,15 @@ public class WaoMigrationCallBackTest { - /** A dummy implementation of WaoMigrationCallBack to make it instanciable. */ - public class ConcreteWaoMigrationCallBack extends WaoMigrationCallBack { - @Override - protected void createUserRoleColumn_1_1a(List<String> queries) { - throw new UnsupportedOperationException(); - } - - @Override - protected void changeContactStateColumn_1_1b(List<String> queries) { - throw new UnsupportedOperationException(); - } - - @Override - protected void changeSampleRowLogAdminColumn_1_1c(List<String> queries) { - throw new UnsupportedOperationException(); - } - - @Override - protected void createBoatInfosNewColumns_1_2a(List<String> queries) { - throw new UnsupportedOperationException(); - } - - @Override - protected void createSampleMonthEstimatedTidesColumn_1_2b(List<String> queries) { - throw new UnsupportedOperationException(); - } - - @Override - protected void updateWaoUserRoleColumns_1_3a(List<String> queries) { - throw new UnsupportedOperationException(); - } - - @Override - protected void createSampleRowLogFromAdminColumn_1_3b(List<String> queries) { - throw new UnsupportedOperationException(); - } - - @Override - protected void createNewsCompanyColumn_1_4a(List<String> queries) { - throw new UnsupportedOperationException(); - } - - @Override - protected void createContactCommentColumns_1_4b(List<String> queries) { - throw new UnsupportedOperationException(); - } - - @Override - protected Map<String, List<String>> retrieveBoatDistrictCodes_1_5a(TopiaContextImplementor tx) throws TopiaException { - throw new UnsupportedOperationException(); - } - - @Override - protected void createBoatDistrictTable_1_5b(List<String> queries) { - throw new UnsupportedOperationException(); - } - - @Override - protected Map<String, String> insertBoatDistricts_1_5c(List<String> queries, Map<String, List<String>> boatDistrictCodes) { - throw new UnsupportedOperationException(); - } - - @Override - protected void updateBoatWithBoatDistrict_1_5d(List<String> queries, Map<String, String> boats) { - throw new UnsupportedOperationException(); - } - - @Override - protected void createContactEmailSentColumn_1_5e(List<String> queries) { - throw new UnsupportedOperationException(); - } - - @Override - protected void createTablesForIndicatorsAdministration_1_6(List<String> queries) { - throw new UnsupportedOperationException(); - } - - @Override - protected void insertIndicatorLevelInitialValues_1_6(List<String> queries) { - throw new UnsupportedOperationException(); - } - - @Override - protected void addDataReliability_1_6(List<String> queries) { - throw new UnsupportedOperationException(); - } - - @Override - protected void createTablesForDCF5Code_1_6(List<String> queries) { - throw new UnsupportedOperationException(); - } - - @Override - protected Map<String, String> getCodeDCF5ForMigration_1_6(TopiaContextImplementor tx) throws TopiaException { - throw new UnsupportedOperationException(); - } - - @Override - protected void insertDCFFiveCode_1_6(String codeTopiaId, DCFFiveCode code, List<String> queries) { - throw new UnsupportedOperationException(); - } - - @Override - protected void insertSplitCodes_1_6(String professionTopiaId, String codeTopiaId, List<String> queries) { - throw new UnsupportedOperationException(); - } - } - @Test public void testSplitCodeDCF5_1_6() { - ConcreteWaoMigrationCallBack migration = new ConcreteWaoMigrationCallBack(); // code to split. 4 codes should be found as result of the split String code = "AAA_BBB et CCC_DDD et EEE_ et FFF"; + WaoMigrationCallBack migration = Mockito.mock(WaoMigrationCallBack.class); + Mockito.when(migration.splitCodeDCF5_1_6(code)).thenCallRealMethod(); + // now, the split List<DCFFiveCode> codes = migration.splitCodeDCF5_1_6(code); Modified: trunk/wao-business/src/test/java/fr/ifremer/wao/entity/BoatImplTest.java =================================================================== --- trunk/wao-business/src/test/java/fr/ifremer/wao/entity/BoatImplTest.java 2010-11-12 15:49:09 UTC (rev 769) +++ trunk/wao-business/src/test/java/fr/ifremer/wao/entity/BoatImplTest.java 2010-11-12 16:53:30 UTC (rev 770) @@ -59,9 +59,6 @@ private static final Logger log = LoggerFactory.getLogger(BoatImplTest.class); - public BoatImplTest() { - } - @BeforeClass public static void setUpClass() throws Exception { manager = new TestManager(); @@ -125,7 +122,7 @@ SampleRowDAO rowDAO = WaoDAOHelper.getSampleRowDAO(transaction); SampleRow row = rowDAO.findByCode("2010_0001"); row.getCompany(); - row.getProfession(); + row.getProfession().sizeDcf5code(); row.sizeElligibleBoat(); row.sizeSampleMonth(); transaction.closeContext(); Modified: trunk/wao-business/src/test/java/fr/ifremer/wao/service/ServiceBoatImplTest.java =================================================================== --- trunk/wao-business/src/test/java/fr/ifremer/wao/service/ServiceBoatImplTest.java 2010-11-12 15:49:09 UTC (rev 769) +++ trunk/wao-business/src/test/java/fr/ifremer/wao/service/ServiceBoatImplTest.java 2010-11-12 16:53:30 UTC (rev 770) @@ -239,11 +239,11 @@ // Get two SampleRows : 2009_3 & 2010_4 SampleRowDAO rowDAO = WaoDAOHelper.getSampleRowDAO(transaction); SampleRow row1 = rowDAO.findByCode("2009_0003"); - row1.getProfession(); + row1.getProfession().sizeDcf5code(); row1.sizeElligibleBoat(); row1.sizeSampleMonth(); SampleRow row2 = rowDAO.findByCode("2010_0004"); - row2.getProfession(); + row2.getProfession().sizeDcf5code(); row2.sizeElligibleBoat(); row2.sizeSampleMonth(); Modified: trunk/wao-business/src/test/java/fr/ifremer/wao/service/ServiceSamplingImplTest.java =================================================================== --- trunk/wao-business/src/test/java/fr/ifremer/wao/service/ServiceSamplingImplTest.java 2010-11-12 15:49:09 UTC (rev 769) +++ trunk/wao-business/src/test/java/fr/ifremer/wao/service/ServiceSamplingImplTest.java 2010-11-12 16:53:30 UTC (rev 770) @@ -474,6 +474,7 @@ SampleRowDAO rowDAO = WaoDAOHelper.getSampleRowDAO(transaction); SampleRow row = rowDAO.findByCode("2010_0001"); row.getProfession(); + row.getProfession().sizeDcf5code(); row.getCompany(); row.sizeSampleMonth(); row.sizeElligibleBoat();

1 0

[Suiviobsmer-commits] r769 - trunk/wao-business/src/main/java/fr/ifremer/wao
by bleny＠users.labs.libre-entreprise.org Nov. 12, 2010

Nov. 12, 2010

Author: bleny Date: 2010-11-12 15:49:09 +0000 (Fri, 12 Nov 2010) New Revision: 769 Log: removed dcf5code field from entity ; impact + migration Modified: trunk/wao-business/src/main/java/fr/ifremer/wao/PostgresMigrationCallback.java trunk/wao-business/src/main/java/fr/ifremer/wao/WaoMigrationCallBack.java Modified: trunk/wao-business/src/main/java/fr/ifremer/wao/PostgresMigrationCallback.java =================================================================== --- trunk/wao-business/src/main/java/fr/ifremer/wao/PostgresMigrationCallback.java 2010-11-12 15:44:23 UTC (rev 768) +++ trunk/wao-business/src/main/java/fr/ifremer/wao/PostgresMigrationCallback.java 2010-11-12 15:49:09 UTC (rev 769) @@ -510,4 +510,9 @@ professionTopiaId, codeTopiaId); queries.add(sql); } + + @Override + protected void removeCodeDCF5columnFromProfession_1_6(List<String> queries) { + queries.add("ALTER TABLE Profession DROP COLUMN codedcf5;"); + } } Modified: trunk/wao-business/src/main/java/fr/ifremer/wao/WaoMigrationCallBack.java =================================================================== --- trunk/wao-business/src/main/java/fr/ifremer/wao/WaoMigrationCallBack.java 2010-11-12 15:44:23 UTC (rev 768) +++ trunk/wao-business/src/main/java/fr/ifremer/wao/WaoMigrationCallBack.java 2010-11-12 15:49:09 UTC (rev 769) @@ -96,6 +96,8 @@ protected abstract void insertSplitCodes_1_6(String professionTopiaId, String codeTopiaId, List<String> queries); + protected abstract void removeCodeDCF5columnFromProfession_1_6(List<String> queries); + protected static final Version[] VERSIONS = new Version[] { VersionUtil.valueOf("1.0"), VersionUtil.valueOf("1.1"), @@ -277,8 +279,10 @@ } } - // remove obsolete column ? + // remove obsolete column + removeCodeDCF5columnFromProfession_1_6(queries); + if (log.isDebugEnabled()) { log.debug("queries for migration to version 1.6 are \n" + queries); }

1 0

[Suiviobsmer-commits] r768 - in trunk: wao-business/src/main/java/fr/ifremer/wao wao-business/src/main/java/fr/ifremer/wao/entity wao-business/src/main/java/fr/ifremer/wao/service wao-business/src/main/xmi 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.labs.libre-entreprise.org Nov. 12, 2010

Nov. 12, 2010

Author: bleny Date: 2010-11-12 15:44:23 +0000 (Fri, 12 Nov 2010) New Revision: 768 Log: removed dcf5code field from entity ; impact Modified: trunk/wao-business/src/main/java/fr/ifremer/wao/WaoQueryBuilder.java trunk/wao-business/src/main/java/fr/ifremer/wao/entity/ProfessionImpl.java trunk/wao-business/src/main/java/fr/ifremer/wao/service/ServiceContactImpl.java trunk/wao-business/src/main/java/fr/ifremer/wao/service/ServiceReferentialImpl.java trunk/wao-business/src/main/java/fr/ifremer/wao/service/ServiceSamplingImpl.java trunk/wao-business/src/main/xmi/wao.zargo trunk/wao-business/src/test/java/fr/ifremer/wao/service/ServiceSamplingImplTest.java trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/pages/SamplingPlan.java trunk/wao-ui/src/main/webapp/SampleRowForm.tml Modified: trunk/wao-business/src/main/java/fr/ifremer/wao/WaoQueryBuilder.java =================================================================== --- trunk/wao-business/src/main/java/fr/ifremer/wao/WaoQueryBuilder.java 2010-11-12 15:14:11 UTC (rev 767) +++ trunk/wao-business/src/main/java/fr/ifremer/wao/WaoQueryBuilder.java 2010-11-12 15:44:23 UTC (rev 768) @@ -305,12 +305,6 @@ } } - // CodeDCF5 filter - if (codeDCF5 != null) { - query.addWhere(sampleRowProperty.professionProperty().codeDCF5(), - TopiaQuery.Op.LIKE, "%" + codeDCF5 + "%"); - } - // Program filter if (programName != null) { query.addEquals(sampleRowProperty.programName(), programName); Modified: trunk/wao-business/src/main/java/fr/ifremer/wao/entity/ProfessionImpl.java =================================================================== --- trunk/wao-business/src/main/java/fr/ifremer/wao/entity/ProfessionImpl.java 2010-11-12 15:14:11 UTC (rev 767) +++ trunk/wao-business/src/main/java/fr/ifremer/wao/entity/ProfessionImpl.java 2010-11-12 15:44:23 UTC (rev 768) @@ -45,7 +45,7 @@ @Override public String getCode() { - String code = getCodeDCF5(); + String code = StringUtils.join(getDcf5code(), ", "); if (!StringUtils.isEmpty(getMeshSize())) { code += " " + getMeshSize(); } 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-11-12 15:14:11 UTC (rev 767) +++ trunk/wao-business/src/main/java/fr/ifremer/wao/service/ServiceContactImpl.java 2010-11-12 15:44:23 UTC (rev 768) @@ -464,8 +464,9 @@ // Profession part Profession profession = row.getProfession(); - export.record(SAMPLING.METIER_CODE_DCF5, - profession.getCodeDCF5()); + + // export.record(SAMPLING.METIER_CODE_DCF5, profession.getCodeDCF5()); + export.record(SAMPLING.METIER_MAILLAGE, profession.getMeshSize()); export.record(SAMPLING.METIER_TAILLE, profession.getSize()); Modified: trunk/wao-business/src/main/java/fr/ifremer/wao/service/ServiceReferentialImpl.java =================================================================== --- trunk/wao-business/src/main/java/fr/ifremer/wao/service/ServiceReferentialImpl.java 2010-11-12 15:14:11 UTC (rev 767) +++ trunk/wao-business/src/main/java/fr/ifremer/wao/service/ServiceReferentialImpl.java 2010-11-12 15:44:23 UTC (rev 768) @@ -205,19 +205,4 @@ return result; } - @Override - protected List<String> executeGetCodesDCF5Contains(TopiaContext transaction, - String input) throws Exception { - - TopiaQuery query = transaction.createQuery(Profession.class, null). - addDistinct(). - setSelect(Profession.CODE_DCF5). - addWhere(Profession.CODE_DCF5, Op.LIKE, "%" + input + "%"). - addOrder(Profession.CODE_DCF5); - - List<String> results = transaction.findByQuery(query); - - return results; - } - } 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-11-12 15:14:11 UTC (rev 767) +++ trunk/wao-business/src/main/java/fr/ifremer/wao/service/ServiceSamplingImpl.java 2010-11-12 15:44:23 UTC (rev 768) @@ -839,7 +839,7 @@ // Profession can't be null Profession profession = row.getProfession(); - export.record(SAMPLING.METIER_CODE_DCF5, profession.getCodeDCF5()); + //export.record(SAMPLING.METIER_CODE_DCF5, profession.getCodeDCF5()); export.record(SAMPLING.METIER_MAILLAGE, profession.getMeshSize()); export.record(SAMPLING.METIER_TAILLE, profession.getSize()); export.record(SAMPLING.METIER_AUTRE, profession.getOther()); @@ -1013,7 +1013,7 @@ // Always create a new profession Profession profession = dao.create(); - profession.setCodeDCF5(codeDCF5); + // profession.setCodeDCF5(codeDCF5); profession.setMeshSize(maillage); profession.setSize(taille); profession.setOther(autre); Modified: trunk/wao-business/src/main/xmi/wao.zargo =================================================================== (Binary files differ) Modified: trunk/wao-business/src/test/java/fr/ifremer/wao/service/ServiceSamplingImplTest.java =================================================================== --- trunk/wao-business/src/test/java/fr/ifremer/wao/service/ServiceSamplingImplTest.java 2010-11-12 15:14:11 UTC (rev 767) +++ trunk/wao-business/src/test/java/fr/ifremer/wao/service/ServiceSamplingImplTest.java 2010-11-12 15:44:23 UTC (rev 768) @@ -102,7 +102,6 @@ // CREATE Profession profession1 = new ProfessionImpl(); - profession1.setCodeDCF5("OORR-BDP"); profession1.setMeshSize(">=18"); profession1.setSize("90-1000"); profession1.setLibelle("Chalutage de poissons tubes"); @@ -433,7 +432,6 @@ ProfessionDAO dao = WaoDAOHelper.getProfessionDAO(transaction); Profession profession = dao.create( - Profession.CODE_DCF5, "OBR", Profession.LIBELLE, "Fileyage en barre", Profession.MESH_SIZE, "< 80", Profession.OTHER, "90mm", @@ -445,7 +443,6 @@ /** EXEC METHOD **/ Profession newProfession = serviceSampling.getNewProfession(profession); Assert.assertNotSame(profession, newProfession); - Assert.assertEquals("OBR", newProfession.getCodeDCF5()); Assert.assertEquals("Fileyage en barre", newProfession.getLibelle()); Assert.assertEquals("< 80", newProfession.getMeshSize()); Assert.assertEquals("90mm", newProfession.getOther()); @@ -577,7 +574,6 @@ Profession profession = row1.getProfession(); assertNotNull(profession); - assertEquals("DB_MOL", profession.getCodeDCF5()); List<SampleMonth> months = row1.getSampleMonth(); assertEquals(11, months.size()); Modified: trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/pages/SamplingPlan.java =================================================================== --- trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/pages/SamplingPlan.java 2010-11-12 15:14:11 UTC (rev 767) +++ trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/pages/SamplingPlan.java 2010-11-12 15:44:23 UTC (rev 768) @@ -217,12 +217,6 @@ return filtersZone.getBody(); } - public String[] onProvideCompletionsFromCodeDCF5(String input) - throws WaoException { - List<String> results = serviceReferential.getCodesDCF5Contains(input); - return results.toArray(new String[0]); - } - void onSelectedFromReset() { reset = true; } Modified: trunk/wao-ui/src/main/webapp/SampleRowForm.tml =================================================================== --- trunk/wao-ui/src/main/webapp/SampleRowForm.tml 2010-11-12 15:14:11 UTC (rev 767) +++ trunk/wao-ui/src/main/webapp/SampleRowForm.tml 2010-11-12 15:44:23 UTC (rev 768) @@ -46,7 +46,7 @@ <t:if t:test="sampleRow.hasSampleMonthRealTideTime()">  <t:beandisplay t:id="professionDisplay" t:model="professionModel" t:object="sampleRow.profession" - t:include="codeDCF5, meshSize, size, other, libelle, species" /> + t:include="meshSize, size, other, libelle, species" /> <p:else>  <div class="select"> @@ -58,7 +58,7 @@ </div> <div class="t-beaneditor"> <t:beaneditor t:id="professionEditor" t:object="sampleRow.profession" - t:include="codeDCF5, meshSize, size, other, libelle, species" /> + t:include="meshSize, size, other, libelle, species" /> </div> <div class="t-beaneditor acenter"> <div class="t-beaneditor-row">

1 0