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

[Suiviobsmer-commits] r1134 - in trunk: . wao-business/src/main/java/fr/ifremer/wao wao-business/src/main/java/fr/ifremer/wao/service
by bleny＠users.labs.libre-entreprise.org April 4, 2011

April 4, 2011

Author: bleny Date: 2011-04-04 12:50:57 +0000 (Mon, 04 Apr 2011) New Revision: 1134 Log: last minute dirty hack to avoid release with snapshot dependency Modified: trunk/pom.xml trunk/wao-business/src/main/java/fr/ifremer/wao/WaoUtils.java trunk/wao-business/src/main/java/fr/ifremer/wao/service/ServiceSamplingImpl.java Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2011-04-04 12:39:47 UTC (rev 1133) +++ trunk/pom.xml 2011-04-04 12:50:57 UTC (rev 1134) @@ -312,7 +312,7 @@  <nuitonI18nVersion>2.3.1</nuitonI18nVersion> - <nuitonUtilsVersion>2.2-SNAPSHOT</nuitonUtilsVersion> + <nuitonUtilsVersion>2.1</nuitonUtilsVersion> <nuitonWebVersion>1.0</nuitonWebVersion> <topiaVersion>2.5.2</topiaVersion> <eugeneVersion>2.3.3</eugeneVersion> Modified: trunk/wao-business/src/main/java/fr/ifremer/wao/WaoUtils.java =================================================================== --- trunk/wao-business/src/main/java/fr/ifremer/wao/WaoUtils.java 2011-04-04 12:39:47 UTC (rev 1133) +++ trunk/wao-business/src/main/java/fr/ifremer/wao/WaoUtils.java 2011-04-04 12:50:57 UTC (rev 1134) @@ -31,6 +31,7 @@ import org.nuiton.topia.TopiaException; import org.nuiton.topia.persistence.TopiaDAO; import org.nuiton.topia.persistence.TopiaEntity; +import org.nuiton.util.DateUtil; import org.nuiton.util.beans.Binder; import org.nuiton.util.beans.BinderFactory; import org.slf4j.Logger; @@ -39,6 +40,7 @@ import java.lang.reflect.InvocationTargetException; import java.text.DateFormat; import java.text.SimpleDateFormat; +import java.util.Calendar; import java.util.Date; import java.util.HashMap; import java.util.Iterator; @@ -255,4 +257,28 @@ } return existingEntity; } + + + /** + * @deprecated replace by DateUtil 2.2 + */ + @Deprecated + public static Date setLastDayOfYear(Date date) { + Calendar calendar = DateUtil.getDefaultCalendar(date); + int maximum = calendar.getActualMaximum(Calendar.DAY_OF_YEAR); + calendar.set(Calendar.DAY_OF_YEAR, maximum); + Date lastDay = calendar.getTime(); + return lastDay; + } + + /** + * @deprecated replace by DateUtil 2.2 + */ + @Deprecated + public static Date setFirstDayOfYear(Date date) { + Calendar calendar = DateUtil.getDefaultCalendar(date); + calendar.set(Calendar.DAY_OF_YEAR, 1); + Date firstDay = calendar.getTime(); + return firstDay; + } } 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 2011-04-04 12:39:47 UTC (rev 1133) +++ trunk/wao-business/src/main/java/fr/ifremer/wao/service/ServiceSamplingImpl.java 2011-04-04 12:50:57 UTC (rev 1134) @@ -35,6 +35,7 @@ import fr.ifremer.wao.WaoProperty; import fr.ifremer.wao.WaoQueryBuilder; import fr.ifremer.wao.WaoQueryHelper; +import fr.ifremer.wao.WaoUtils; import fr.ifremer.wao.bean.ConnectedUser; import fr.ifremer.wao.bean.FacadeRow; import fr.ifremer.wao.bean.FacadeRowImpl; @@ -1394,8 +1395,8 @@ fromDate = DateUtils.addMonths(fromDate, -6); toDate = DateUtils.addMonths(toDate, 6); } else { - fromDate = DateUtil.setFirstDayOfYear(fromDate); - toDate = DateUtil.setLastDayOfYear(toDate); + fromDate = WaoUtils.setFirstDayOfYear(fromDate); + toDate = WaoUtils.setLastDayOfYear(toDate); } fromDate = DateUtil.setMinTimeOfDay(fromDate);

1 0

[Suiviobsmer-commits] r1133 - in trunk: . src/announcement
by bleny＠users.labs.libre-entreprise.org April 4, 2011

April 4, 2011

Author: bleny Date: 2011-04-04 12:39:47 +0000 (Mon, 04 Apr 2011) New Revision: 1133 Log: prepare release Added: trunk/src/announcement/release-email-2.1.3.txt Modified: trunk/changelog.txt Modified: trunk/changelog.txt =================================================================== --- trunk/changelog.txt 2011-04-04 12:31:06 UTC (rev 1132) +++ trunk/changelog.txt 2011-04-04 12:39:47 UTC (rev 1133) @@ -3,6 +3,15 @@ Historique des versions +2.1.3 +----- + +Anomalies ++++++++++ + +- [bleny] #2642 : Régressions dans Wao 2.1.1 + + 2.1.2 ----- Added: trunk/src/announcement/release-email-2.1.3.txt =================================================================== --- trunk/src/announcement/release-email-2.1.3.txt (rev 0) +++ trunk/src/announcement/release-email-2.1.3.txt 2011-04-04 12:39:47 UTC (rev 1133) @@ -0,0 +1,17 @@ +La nouvelle version 2.1.2 de l'applicatif Wao est disponible. + +Corrections : + +- [bleny] #2642 : Régressions dans Wao 2.1.1 + +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] r1132 - trunk/wao-ui/src/main/webapp
by bleny＠users.labs.libre-entreprise.org April 4, 2011

April 4, 2011

Author: bleny Date: 2011-04-04 12:31:06 +0000 (Mon, 04 Apr 2011) New Revision: 1132 Log: historic link invisible for guest in sampling plan Modified: trunk/wao-ui/src/main/webapp/SamplingPlan.tml Modified: trunk/wao-ui/src/main/webapp/SamplingPlan.tml =================================================================== --- trunk/wao-ui/src/main/webapp/SamplingPlan.tml 2011-04-04 10:18:14 UTC (rev 1131) +++ trunk/wao-ui/src/main/webapp/SamplingPlan.tml 2011-04-04 12:31:06 UTC (rev 1132) @@ -171,9 +171,11 @@ <t:if test="rowModified"> <t:unless test="user.observer"> <t:unless test="user.professional"> - <a t:type="pagelink" t:page="sampleRowHistoric" t:context="row.code"> - <img src="${asset:context:}/img/clock-22px.png" class="fright" alt=" * " title="Cette ligne a été modifiée (voir l'historique)"/> - </a> + <t:unless test="user.guest"> + <a t:type="pagelink" t:page="sampleRowHistoric" t:context="row.code"> + <img src="${asset:context:}/img/clock-22px.png" class="fright" alt=" * " title="Cette ligne a été modifiée (voir l'historique)"/> + </a> + </t:unless> </t:unless> </t:unless> </t:if>

1 0

[Suiviobsmer-commits] r1131 - trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/base
by bleny＠users.labs.libre-entreprise.org April 4, 2011

April 4, 2011

Author: bleny Date: 2011-04-04 10:18:14 +0000 (Mon, 04 Apr 2011) New Revision: 1131 Log: fix sample row filter for boats page Modified: trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/base/AbstractFilteredPage.java Modified: trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/base/AbstractFilteredPage.java =================================================================== --- trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/base/AbstractFilteredPage.java 2011-04-04 09:46:51 UTC (rev 1130) +++ trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/base/AbstractFilteredPage.java 2011-04-04 10:18:14 UTC (rev 1131) @@ -435,8 +435,8 @@ log.debug("REFRESH FILTERS DATA"); log.debug("observerSelect : " + observerSelect); } - //SampleRow row = getSampleRowSelectModel().findObject(sampleRowId); - // getFilter().setSampleRow(row); + SampleRow row = getSampleRowSelectModel().findObject(sampleRowId); + getFilter().setSampleRow(row); if (user.isAdmin()) { Company company = getCompanySelectModel().findObject(companyId); getFilter().setCompany(company);

1 0

[Suiviobsmer-commits] r1130 - in trunk: . wao-business wao-business/src/main/xmi wao-ui
by bleny＠users.labs.libre-entreprise.org April 4, 2011

April 4, 2011

Author: bleny Date: 2011-04-04 09:46:51 +0000 (Mon, 04 Apr 2011) New Revision: 1130 Log: set versions for next release Modified: trunk/pom.xml trunk/wao-business/pom.xml trunk/wao-business/src/main/xmi/wao.zargo trunk/wao-ui/pom.xml Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2011-04-01 15:07:05 UTC (rev 1129) +++ trunk/pom.xml 2011-04-04 09:46:51 UTC (rev 1130) @@ -15,7 +15,7 @@ <groupId>fr.ifremer</groupId> <artifactId>wao</artifactId> - <version>3.0-SNAPSHOT</version> + <version>2.1.3-SNAPSHOT</version> <modules> <module>wao-ui</module> Modified: trunk/wao-business/pom.xml =================================================================== --- trunk/wao-business/pom.xml 2011-04-01 15:07:05 UTC (rev 1129) +++ trunk/wao-business/pom.xml 2011-04-04 09:46:51 UTC (rev 1130) @@ -10,7 +10,7 @@ <parent> <groupId>fr.ifremer</groupId> <artifactId>wao</artifactId> - <version>3.0-SNAPSHOT</version> + <version>2.1.3-SNAPSHOT</version> </parent> <groupId>fr.ifremer.wao</groupId> Modified: trunk/wao-business/src/main/xmi/wao.zargo =================================================================== (Binary files differ) Modified: trunk/wao-ui/pom.xml =================================================================== --- trunk/wao-ui/pom.xml 2011-04-01 15:07:05 UTC (rev 1129) +++ trunk/wao-ui/pom.xml 2011-04-04 09:46:51 UTC (rev 1130) @@ -10,7 +10,7 @@ <parent> <groupId>fr.ifremer</groupId> <artifactId>wao</artifactId> - <version>3.0-SNAPSHOT</version> + <version>2.1.3-SNAPSHOT</version> </parent> <groupId>fr.ifremer.wao</groupId>

1 0

[Suiviobsmer-commits] r1129 - in trunk/wao-ui/src/main: java/fr/ifremer/wao/ui/pages java/fr/ifremer/wao/ui/services resources/fr/ifremer/wao/ui/pages webapp
by bleny＠users.labs.libre-entreprise.org April 1, 2011

April 1, 2011

Author: bleny Date: 2011-04-01 15:07:05 +0000 (Fri, 01 Apr 2011) New Revision: 1129 Log: use topiaEntitySelector in contact form Modified: trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/pages/ContactForm.java trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/services/ContactModelFactory.java trunk/wao-ui/src/main/resources/fr/ifremer/wao/ui/pages/Contacts_fr.properties trunk/wao-ui/src/main/webapp/ContactForm.tml trunk/wao-ui/src/main/webapp/Contacts.tml Modified: trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/pages/ContactForm.java =================================================================== --- trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/pages/ContactForm.java 2011-04-01 11:34:49 UTC (rev 1128) +++ trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/pages/ContactForm.java 2011-04-01 15:07:05 UTC (rev 1129) @@ -167,8 +167,8 @@ @Persist private String contactId; - @Persist - private Contact oldContact; +// @Persist +// private Contact oldContact; @Persist private Contact contact; @@ -177,23 +177,10 @@ public Contact getContact() { if (contact == null) { if (StringUtils.isEmpty(contactId)) { - // contact = serviceContact.getNewContact() + throw new IllegalStateException(); } else { - oldContact = serviceContact.getContact(contactId); contact = serviceContact.getContact(contactId); - - mainObserverId = contact.getMainObserver().getTopiaId(); - if (contact.getTerrestrialLocation() != null) { - terrestrialLocationId = contact.getTerrestrialLocation().getTopiaId(); - } - if (oldContact == contact) { - throw new IllegalStateException("il faut deux instances différentes"); - } } - if (logger.isDebugEnabled()) { - logger.debug("contact : " + contact.getTopiaCreateDate() + - contact.getId() + contact.getSampleRow().getCode()); - } } return contact; } @@ -224,75 +211,13 @@ } @Property - private String mainObserverId; - - @InjectComponent - private Zone observersFormZone; - - @Persist - private List<WaoUser> secondaryObservers; - - @Persist - @Property - private String selectedSecondaryObserverId; - - @Property - private int secondaryObserverIndex; - - @Property private WaoUser observer; // for loop - private GenericSelectModel<WaoUser> observerSelectModel; - - public GenericSelectModel<WaoUser> getObserverSelectModel() throws WaoException { - if (observerSelectModel == null) { - List<WaoUser> observers = - serviceUser.getObservers(connectedUser.getCompany(), true); - observerSelectModel = new GenericSelectModel<WaoUser>(observers,WaoUser.class, - "fullName", "topiaId", propertyAccess); - } - return observerSelectModel; + public List<WaoUser> getObservers() { + List<WaoUser> observers = serviceUser.getObservers(connectedUser.getCompany(), true); + return observers; } - public List<WaoUser> getSecondaryObservers() { - if (secondaryObservers == null) { - secondaryObservers = new ArrayList<WaoUser>(getContact().getSecondaryObservers()); - } - return secondaryObservers; - } - - @Log - public void onChangeFromSecondaryObserver(String value) { - if (StringUtils.isEmpty(value)) { - selectedSecondaryObserverId = null; - } else { - selectedSecondaryObserverId = value; - } - if (logger.isDebugEnabled()) { - logger.debug("selected observer changed to " + selectedSecondaryObserverId); - } - } - - @Log - public Zone onActionFromAddSecondaryObserver() { - if (selectedSecondaryObserverId != null) { - WaoUser observerToAdd = getObserverSelectModel().findObject(selectedSecondaryObserverId); - - if (observerToAdd == null) { - logger.error("observerToAdd is null, id is " + selectedSecondaryObserverId); - } else if ( ! getSecondaryObservers().contains(observerToAdd)) { - getSecondaryObservers().add(observerToAdd); - } - } - return observersFormZone; - } - - @Log - public Zone onActionFromRemoveSecondaryObserver(int secondaryObserverIndex) { - getSecondaryObservers().remove(secondaryObserverIndex); - return observersFormZone; - } - /************************ OBSERVATION REPORT ******************************/ @Component @@ -315,20 +240,11 @@ @Inject private ServiceReferential serviceReferential; - private GenericSelectModel<TerrestrialLocation> terrestrialLocationSelectModel; - - @Property - private String terrestrialLocationId; - - public GenericSelectModel<TerrestrialLocation> getTerrestrialLocationSelectModel() { - if (terrestrialLocationSelectModel == null) { - List<TerrestrialLocation> locations = + public List<TerrestrialLocation> getTerrestrialLocations() { + List<TerrestrialLocation> locations = serviceReferential.getAllTerrestrialLocations(new ContactFilterImpl(), contact.getSampleRow().getTerrestrialLocation().getDistrictCode()); - terrestrialLocationSelectModel = new GenericSelectModel<TerrestrialLocation>(locations, TerrestrialLocation.class, - "description", TerrestrialLocation.TOPIA_ID, propertyAccess); - } - return terrestrialLocationSelectModel; + return locations; } public SelectModel getContactStateSelectModel() { @@ -374,16 +290,6 @@ void onValidateFormFromContactForm() { contactForm.clearErrors(); - if (mainObserverId != null) { - WaoUser mainObserver = getObserverSelectModel().findObject(mainObserverId); - contact.setMainObserver(mainObserver); - } - contact.setSecondaryObservers(getSecondaryObservers()); - if (terrestrialLocationId != null) { - TerrestrialLocation terrestrialLocation = getTerrestrialLocationSelectModel().findObject(terrestrialLocationId); - contact.setTerrestrialLocation(terrestrialLocation); - } - ValidationResult validationResult = serviceContact.validateContact(contact); if ( ! validationResult.isSuccess()) { contactForm.recordError(validationResult.getMessage()); @@ -429,8 +335,6 @@ } else { // reset contact = null; - mainObserverId = null; - secondaryObservers = null; } if (saveContact) { Modified: trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/services/ContactModelFactory.java =================================================================== --- trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/services/ContactModelFactory.java 2011-04-01 11:34:49 UTC (rev 1128) +++ trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/services/ContactModelFactory.java 2011-04-01 15:07:05 UTC (rev 1129) @@ -76,7 +76,7 @@ // order is meaningful, properties will be displayed in columnsForImport from left to right - addNonSortableProperty(TopiaEntity.TOPIA_CREATE_DATE, null); + addNonSortableProperty(Contact.PROPERTY_CREATION_DATE, null); addNonSortableProperty(Contact.PROPERTY_MAIN_OBSERVER, getUserPropertyConduit()); addNonSortableProperty(WaoUser.PROPERTY_COMPANY, getCompanyPropertyConduit()); addNonSortableProperty(Contact.PROPERTY_SAMPLE_ROW, getSampleRowPropertyConduit()); Modified: trunk/wao-ui/src/main/resources/fr/ifremer/wao/ui/pages/Contacts_fr.properties =================================================================== --- trunk/wao-ui/src/main/resources/fr/ifremer/wao/ui/pages/Contacts_fr.properties 2011-04-01 11:34:49 UTC (rev 1128) +++ trunk/wao-ui/src/main/resources/fr/ifremer/wao/ui/pages/Contacts_fr.properties 2011-04-01 15:07:05 UTC (rev 1129) @@ -28,7 +28,7 @@ sampleRow-label: M\u00e9tier boat-label: Navire state-label: Etat -topiaCreateDate-label: Cr\u00e9ation +creationDate-label: Cr\u00e9ation observationBeginDate-label: D\u00e9but de l'observation observationEndDate-label: Fin de l'observation nbObservants-label: Nb obs. Modified: trunk/wao-ui/src/main/webapp/ContactForm.tml =================================================================== --- trunk/wao-ui/src/main/webapp/ContactForm.tml 2011-04-01 11:34:49 UTC (rev 1128) +++ trunk/wao-ui/src/main/webapp/ContactForm.tml 2011-04-01 15:07:05 UTC (rev 1129) @@ -65,7 +65,7 @@ </ul> </p> <p> - ${message:wao.ui.field.Contact.creationDate} : <t:output value="contact.topiaCreateDate" format="dateFormat" /> + ${message:wao.ui.field.Contact.creationDate} : <t:output value="contact.creationDate" format="dateFormat" /> </p> <div style="clear: right;"></div> </fieldset> @@ -95,27 +95,22 @@ <t:block id="editObservers"> <div> <label for="mainObserver">${message:wao.ui.field.Contact.mainObserver}</label> - <input t:type="select" t:id="mainObserver" t:model="observerSelectModel" t:validate="required" t:value="mainObserverId" /> + <t:topiaEntitySelector t:id="mainObserver" + t:clazzName="WaoUser" + t:labelPropertyName="fullName" + t:values="observers" + t:selectedValue="contact.mainObserver" /> </div> - <t:zone t:id="observersFormZone" t:visible="true" t:update="show" id="observersFormZoneId"> - <div> - <label for="secondaryObserver">${message:wao.ui.field.Contact.secondaryObservers}</label> - <div> - <input t:type="select" t:id="secondaryObserver" t:model="observerSelectModel" t:value="selectedSecondaryObserverId" t:mixins="ck/onEvent" t:event="change" /> - <a t:type="actionlink" t:id="addSecondaryObserver" title="Ajouter un observateur" t:zone="observersFormZoneId"> - <img src="${asset:context:img/add-16px.png}" /> - </a>  - <ul class="value"> - <li t:type="loop" t:source="secondaryObservers" t:value="observer" t:index="secondaryObserverIndex" t:volatile="true"> - ${observer.fullName} - <a t:type="actionlink" t:id="removeSecondaryObserver" t:context="secondaryObserverIndex" title="Supprimer cet observateur" t:zone="observersFormZoneId"> - <img src="${asset:context:img/remove-22px.png}" /> - </a> - </li> - </ul> - </div> - </div> - </t:zone> + <div> + <label for="secondaryObservers">${message:wao.ui.field.Contact.secondaryObservers}</label> + <t:topiaEntitySelector t:id="secondaryObservers" + t:multiple="true" + t:clazzName="WaoUser" + t:labelPropertyName="fullName" + t:values="observers" + t:selectedValues="contact.secondaryObservers" + size="6"/> + </div> </t:block> <fieldset> @@ -250,11 +245,11 @@ <label for="terrestrialLocation"> ${message:wao.ui.field.Contact.terrestrialLocation} </label> - <input t:id="terrestrialLocation" - t:type="select" - t:model="terrestrialLocationSelectModel" - t:value="terrestrialLocationId" - t:validate="required" /> + <t:topiaEntitySelector t:id="terrestrialLocation" + t:clazzName="TerrestrialLocation" + t:labelPropertyName="description" + t:values="terrestrialLocations" + t:selectedValue="contact.terrestrialLocation" /> </div> <div> <label for="actualSamplingStrategy">${message:wao.ui.field.Contact.samplingStrategy}</label> Modified: trunk/wao-ui/src/main/webapp/Contacts.tml =================================================================== --- trunk/wao-ui/src/main/webapp/Contacts.tml 2011-04-01 11:34:49 UTC (rev 1128) +++ trunk/wao-ui/src/main/webapp/Contacts.tml 2011-04-01 15:07:05 UTC (rev 1129) @@ -247,9 +247,9 @@ ${contact.sampleRow.code} </span> </p:sampleRowCell> - <p:topiaCreateDateCell> - <t:output value="contact.topiaCreateDate" format="dateFormat" /> - </p:topiaCreateDateCell> + <p:creationDateCell> + <t:output value="contact.creationDate" format="dateFormat" /> + </p:creationDateCell> <p:terrestrialLocationCell> <t:if t:test="contact.terrestrialLocation"> <span t:type="ck/Tooltip" title="Infos" t:value="${contact.terrestrialLocation.description}" t:effect="appear">

1 0

[Suiviobsmer-commits] r1128 - in trunk/wao-ui/src/main: resources/fr/ifremer/wao/ui/pages webapp
by bleny＠users.labs.libre-entreprise.org April 1, 2011

April 1, 2011

Author: bleny Date: 2011-04-01 11:34:49 +0000 (Fri, 01 Apr 2011) New Revision: 1128 Log: sorting boats by district code raise exception due to bad formatted query, removing possibility to sort Modified: trunk/wao-ui/src/main/resources/fr/ifremer/wao/ui/pages/Boats_fr.properties trunk/wao-ui/src/main/webapp/Boats.tml Modified: trunk/wao-ui/src/main/resources/fr/ifremer/wao/ui/pages/Boats_fr.properties =================================================================== --- trunk/wao-ui/src/main/resources/fr/ifremer/wao/ui/pages/Boats_fr.properties 2011-04-01 11:33:31 UTC (rev 1127) +++ trunk/wao-ui/src/main/resources/fr/ifremer/wao/ui/pages/Boats_fr.properties 2011-04-01 11:34:49 UTC (rev 1128) @@ -26,7 +26,7 @@ # GRID name-label: Nom immatriculation-label: Imma. -districtCode-label: Quartier +boatDistrict-label: Quartier boatLength-label: Long. buildYear-label: Ann\u00e9e Modified: trunk/wao-ui/src/main/webapp/Boats.tml =================================================================== --- trunk/wao-ui/src/main/webapp/Boats.tml 2011-04-01 11:33:31 UTC (rev 1127) +++ trunk/wao-ui/src/main/webapp/Boats.tml 2011-04-01 11:34:49 UTC (rev 1128) @@ -95,8 +95,8 @@ title="${format:wao.ui.action.exportBoats=boats.availableRows}" /> </a> </h1> - <div t:type="grid" t:source="boats" t:row="boat" - t:include="name, immatriculation, districtCode, boatLength, buildYear" t:rowClass="prop:rowStyle" t:rowsPerPage="20"> + <div t:type="grid" t:source="boats" t:row="boat" t:add="boatDistrict" + t:include="name, immatriculation, boatLength, buildYear" t:rowClass="prop:rowStyle" t:rowsPerPage="20"> <p:nameCell> <t:if t:test="canCreateNewContactFromList()"> <a t:type="actionlink" t:id="addNewContactFromBoat" t:context="boat.immatriculation"> @@ -110,6 +110,9 @@ </p:else> </t:unless> </p:nameCell> + <p:boatDistrictCell> + ${boat.districtCode} + </p:boatDistrictCell> <p:boatLengthCell> ${boat.boatLength} m </p:boatLengthCell>

1 0

[Suiviobsmer-commits] r1127 - trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/pages
by bleny＠users.labs.libre-entreprise.org April 1, 2011

April 1, 2011

Author: bleny Date: 2011-04-01 11:33:31 +0000 (Fri, 01 Apr 2011) New Revision: 1127 Log: lower log level Modified: trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/pages/SamplingPlan.java 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 2011-04-01 09:50:41 UTC (rev 1126) +++ trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/pages/SamplingPlan.java 2011-04-01 11:33:31 UTC (rev 1127) @@ -396,8 +396,8 @@ this.row = row; Integer expected = getNbTidesExpected(), real = getNbTidesReal(); - if (log.isDebugEnabled()) { - log.debug( String.format("for month %s and row %s : expected = %s, real = %s", + if (log.isTraceEnabled()) { + log.trace(String.format("for month %s and row %s : expected = %s, real = %s", getDateFormat().format(month), row.getCode(), expected, real)); } @@ -412,8 +412,8 @@ totalExpectedForMonths.put(month, totalExpected); totalRealForMonths.put(month, totalReal); - if (log.isDebugEnabled()) { - log.debug( String.format("totals for month %s : expected = %s, actual = %s", + if (log.isTraceEnabled()) { + log.trace(String.format("totals for month %s : expected = %s, actual = %s", getDateFormat().format(month), totalExpected, totalReal)); }

1 0

[Suiviobsmer-commits] r1126 - trunk/wao-business/src/main/java/fr/ifremer/wao/service
by bleny＠users.labs.libre-entreprise.org April 1, 2011

April 1, 2011

Author: bleny Date: 2011-04-01 09:50:41 +0000 (Fri, 01 Apr 2011) New Revision: 1126 Log: ignore pagination when exporting contacts Modified: trunk/wao-business/src/main/java/fr/ifremer/wao/service/ServiceContactImpl.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 2011-04-01 09:46:35 UTC (rev 1125) +++ trunk/wao-business/src/main/java/fr/ifremer/wao/service/ServiceContactImpl.java 2011-04-01 09:50:41 UTC (rev 1126) @@ -1115,6 +1115,12 @@ filter.setEndIndex(null); Map<String, Contact> contacts = executeGetContacts(transaction, filter); + + if (log.isDebugEnabled()) { + log.debug("export with filter " + filter.toString() + " will include " + + contacts.size() + " lines"); + } + ExportModel<Contact> contactExportModel = new ContactImportExportModel(filter.getObsProgram()); Export<Contact> export = new Export<Contact>(contactExportModel, contacts.values()); return export.startExport();

1 0

[Suiviobsmer-commits] r1125 - trunk/wao-business/src/main/java/fr/ifremer/wao/service
by bleny＠users.labs.libre-entreprise.org April 1, 2011

April 1, 2011

Author: bleny Date: 2011-04-01 09:46:35 +0000 (Fri, 01 Apr 2011) New Revision: 1125 Log: ignore pagination when exporting contacts Modified: trunk/wao-business/src/main/java/fr/ifremer/wao/service/ServiceContactImpl.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 2011-04-01 09:36:07 UTC (rev 1124) +++ trunk/wao-business/src/main/java/fr/ifremer/wao/service/ServiceContactImpl.java 2011-04-01 09:46:35 UTC (rev 1125) @@ -1110,11 +1110,15 @@ boolean useNewMethod = true; if (useNewMethod) { + // when exporting, we must not consider pagination + filter.setStartIndex(null); + filter.setEndIndex(null); + Map<String, Contact> contacts = executeGetContacts(transaction, filter); - ExportModel<Contact> contactExportModel = new ContactImportExportModel(filter.getObsProgram()); Export<Contact> export = new Export<Contact>(contactExportModel, contacts.values()); return export.startExport(); + } else { CsvWriter writer = null;

1 0