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

[Suiviobsmer-commits] r627 - in trunk/wao-business/src/main: filters java/fr/ifremer/wao
by fdesbois＠users.labs.libre-entreprise.org 24 Jul '10

24 Jul '10

Author: fdesbois Date: 2010-07-24 18:09:59 +0000 (Sat, 24 Jul 2010) New Revision: 627 Log: Evo #2369 : - Missing period managment for contacts Modified: trunk/wao-business/src/main/filters/Wao.properties trunk/wao-business/src/main/java/fr/ifremer/wao/WaoQueryBuilder.java Modified: trunk/wao-business/src/main/filters/Wao.properties =================================================================== --- trunk/wao-business/src/main/filters/Wao.properties 2010-07-24 14:57:19 UTC (rev 626) +++ trunk/wao-business/src/main/filters/Wao.properties 2010-07-24 18:09:59 UTC (rev 627) @@ -48,8 +48,8 @@ wao.server.path=localhost:8080/wao ## Version (not necessary to override it) filters no working anymore -wao.version=1.5 -#wao.version=${project.version} +#wao.version=1.5.1 +wao.version=${project.version} ###### Since 1.5 ## Email used when contact is set to BOARDING_DONE state Modified: trunk/wao-business/src/main/java/fr/ifremer/wao/WaoQueryBuilder.java =================================================================== --- trunk/wao-business/src/main/java/fr/ifremer/wao/WaoQueryBuilder.java 2010-07-24 14:57:19 UTC (rev 626) +++ trunk/wao-business/src/main/java/fr/ifremer/wao/WaoQueryBuilder.java 2010-07-24 18:09:59 UTC (rev 627) @@ -21,15 +21,24 @@ */ package fr.ifremer.wao; -import fr.ifremer.wao.bean.*; -import fr.ifremer.wao.entity.*; +import fr.ifremer.wao.bean.BoatFilter; +import fr.ifremer.wao.bean.ContactFilter; +import fr.ifremer.wao.bean.ContactState; +import fr.ifremer.wao.bean.SamplingFilter; +import fr.ifremer.wao.bean.UserFilter; +import fr.ifremer.wao.entity.Company; +import fr.ifremer.wao.entity.SampleRow; +import fr.ifremer.wao.entity.WaoUser; import org.apache.commons.lang.StringUtils; import org.nuiton.topia.framework.TopiaQuery; import org.nuiton.util.PeriodDates; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import java.util.*; +import java.util.ArrayList; +import java.util.Calendar; +import java.util.Date; +import java.util.List; /** * Created: 7 juin 2010 @@ -391,6 +400,7 @@ WaoUser observer = filter.getObserver(); Company company = filter.getCompany(); Date fromDate = filter.getFromDate(); + PeriodDates period = filter.getPeriod(); boolean mammalsObservation = filter.getMammalsObservation(); boolean mammalsCapture = filter.getMammalsCapture(); boolean programAccepted = filter.getProgramAccepted(); @@ -414,6 +424,7 @@ // Ano #2327 : Reset fromDate, don't manage it in applySamplingFilter filter.setFromDate(null); + filter.setPeriod(null); if (filter.isSamplingFiltered() || company != null) { // sampleRowProperty = contactProperty.sampleRowProperty(); @@ -482,13 +493,18 @@ addNotEmpty(contactProperty.commentCoordinator()); } + // PERIOD + if (period != null) { + query.addBetween(contactProperty.topiaCreateDate(), period.getFromDate(), period.getThruDate()); + } // FROM_DATE - if (fromDate != null) { + else if (fromDate != null) { query.addWhere(contactProperty.topiaCreateDate(), TopiaQuery.Op.GE, fromDate); } - // Reinitialize fromDate of the filter, don't know if it's really needed + // Reinitialize fromDate of the filter (previously reset for samplingFilter) filter.setFromDate(fromDate); + filter.setPeriod(period); // ORDER_BY if (StringUtils.isNotEmpty(orderBy)) {

1 0

[Suiviobsmer-commits] r626 - in trunk/wao-business/src: main/java/fr/ifremer/wao main/java/fr/ifremer/wao/entity main/java/fr/ifremer/wao/service main/xmi test/java/fr/ifremer/wao/service
by fdesbois＠users.labs.libre-entreprise.org 24 Jul '10

24 Jul '10

Author: fdesbois Date: 2010-07-24 14:57:19 +0000 (Sat, 24 Jul 2010) New Revision: 626 Log: Evo #2369 : - Use ContactFilter to retrieve data for contacts cartography Modified: trunk/wao-business/src/main/java/fr/ifremer/wao/WaoQueryBuilder.java trunk/wao-business/src/main/java/fr/ifremer/wao/entity/ContactDAOImpl.java trunk/wao-business/src/main/java/fr/ifremer/wao/service/ServiceCartographyImpl.java trunk/wao-business/src/main/java/fr/ifremer/wao/service/ServiceContactImpl.java trunk/wao-business/src/main/java/fr/ifremer/wao/service/ServiceSynthesisImpl.java trunk/wao-business/src/main/xmi/wao.zargo trunk/wao-business/src/test/java/fr/ifremer/wao/service/ServiceCartographyImplTest.java Modified: trunk/wao-business/src/main/java/fr/ifremer/wao/WaoQueryBuilder.java =================================================================== --- trunk/wao-business/src/main/java/fr/ifremer/wao/WaoQueryBuilder.java 2010-07-24 12:35:32 UTC (rev 625) +++ trunk/wao-business/src/main/java/fr/ifremer/wao/WaoQueryBuilder.java 2010-07-24 14:57:19 UTC (rev 626) @@ -387,6 +387,7 @@ // need contactProperty + String orderBy = filter.getOrderBy(); WaoUser observer = filter.getObserver(); Company company = filter.getCompany(); Date fromDate = filter.getFromDate(); @@ -490,7 +491,9 @@ filter.setFromDate(fromDate); // ORDER_BY - query.addOrderDesc(contactProperty.topiaCreateDate()); + if (StringUtils.isNotEmpty(orderBy)) { + query.addOrder(contactProperty.$property(orderBy)); + } return query; } Modified: trunk/wao-business/src/main/java/fr/ifremer/wao/entity/ContactDAOImpl.java =================================================================== --- trunk/wao-business/src/main/java/fr/ifremer/wao/entity/ContactDAOImpl.java 2010-07-24 12:35:32 UTC (rev 625) +++ trunk/wao-business/src/main/java/fr/ifremer/wao/entity/ContactDAOImpl.java 2010-07-24 14:57:19 UTC (rev 626) @@ -25,7 +25,9 @@ package fr.ifremer.wao.entity; +import fr.ifremer.wao.WaoQueryBuilder; import fr.ifremer.wao.WaoQueryHelper; +import fr.ifremer.wao.bean.ContactFilter; import fr.ifremer.wao.bean.ContactState; import java.util.Date; import org.nuiton.topia.framework.TopiaQuery; @@ -51,35 +53,6 @@ @Override public TopiaQuery createQueryLastContactForBoat(Boat boat, Company company) { -// // Prepare properties for queries -// String mainContactAlias = WaoQueryBuilder.ALIAS_CONTACT + "1"; -// String mainBoatProperty = -// TopiaQuery.getProperty(mainContactAlias, Contact.BOAT); -// String mainCompanyProperty = -// TopiaQuery.getProperty(mainContactAlias, Contact.OBSERVER, WaoUser.COMPANY); -// String mainCreateDateProperty = -// TopiaQuery.getProperty(mainContactAlias, Contact.TOPIA_CREATE_DATE); -// -// String subContactAlias = WaoQueryBuilder.ALIAS_CONTACT + "2"; -// String subBoatProperty = -// TopiaQuery.getProperty(subContactAlias, Contact.BOAT); -// String subCompanyProperty = -// TopiaQuery.getProperty(subContactAlias, Contact.OBSERVER, WaoUser.COMPANY); -// String subCreateDateProperty = -// TopiaQuery.getProperty(subContactAlias, Contact.TOPIA_CREATE_DATE); -// -// // Construct subquery -// TopiaQuery subquery = createQuery(subContactAlias). -// setSelect($("MAX($1)", subCreateDateProperty)). -// addWhere($("$1 = $2", subBoatProperty ,mainBoatProperty)). -// addEquals(subCompanyProperty, company); -// -// // Construct mainquery -// TopiaQuery query = createQuery(mainContactAlias). -// addEquals(mainBoatProperty, boat). -// addEquals(mainCompanyProperty, company). -// addSubQuery($("$1 = (?)", mainCreateDateProperty), subquery); - // Prepare properties for queries WaoQueryHelper.ContactProperty mainContactProperty = WaoQueryHelper.newContactProperty("C1"); @@ -117,33 +90,6 @@ @Override public TopiaQuery createQueryDoneContactsFromDate(Boat boat, Date fromDate) { -// // Prepare properties for query -// String mainAlias = WaoQueryBuilder.ALIAS_CONTACT; -// String stateProperty = -// TopiaQuery.getProperty(mainAlias, Contact.STATE); -// String validationCompanyProperty = -// TopiaQuery.getProperty(mainAlias, Contact.VALIDATION_COMPANY); -// String validationProgramProperty = -// TopiaQuery.getProperty(mainAlias, Contact.VALIDATION_PROGRAM); -// String boatProperty = -// TopiaQuery.getProperty(mainAlias, Contact.BOAT); -// String tideBeginProperty = -// TopiaQuery.getProperty(mainAlias, Contact.TIDE_BEGIN_DATE); -// -// // Construct query -// TopiaQuery query = createQuery(mainAlias). -// addEquals(stateProperty, ContactState.BOARDING_DONE.ordinal()). -// addEquals(validationCompanyProperty, Boolean.TRUE). -// addNullOr(validationProgramProperty, Op.EQ, Boolean.TRUE); -// -// if (boat != null) { -// query.addEquals(boatProperty, boat); -// } -// -// if (fromDate != null) { -// query.addWhere(tideBeginProperty, Op.GE, fromDate); -// } - // Prepare properties for query WaoQueryHelper.ContactProperty contactProperty = WaoQueryHelper.newContactProperty(); Modified: trunk/wao-business/src/main/java/fr/ifremer/wao/service/ServiceCartographyImpl.java =================================================================== --- trunk/wao-business/src/main/java/fr/ifremer/wao/service/ServiceCartographyImpl.java 2010-07-24 12:35:32 UTC (rev 625) +++ trunk/wao-business/src/main/java/fr/ifremer/wao/service/ServiceCartographyImpl.java 2010-07-24 14:57:19 UTC (rev 626) @@ -24,6 +24,8 @@ import fr.ifremer.wao.WaoContext; import fr.ifremer.wao.WaoDAOHelper; import fr.ifremer.wao.WaoException; +import fr.ifremer.wao.WaoQueryBuilder; +import fr.ifremer.wao.WaoQueryHelper; import fr.ifremer.wao.bean.ContactFilter; import fr.ifremer.wao.bean.ContactPieChartConstant; import fr.ifremer.wao.bean.ContactState; @@ -31,6 +33,7 @@ import fr.ifremer.wao.entity.BoatDistrict; import fr.ifremer.wao.entity.BoatDistrictDAO; import fr.ifremer.wao.entity.Company; +import fr.ifremer.wao.entity.ContactDAO; import fr.ifremer.wao.io.BoatDistrictData; import fr.ifremer.wao.io.ImportResults; import fr.ifremer.wao.io.ImportResultsImpl; @@ -40,6 +43,7 @@ import org.apache.commons.io.FileUtils; import org.nuiton.topia.TopiaContext; import org.nuiton.topia.TopiaException; +import org.nuiton.topia.framework.TopiaQuery; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -164,8 +168,22 @@ KmlWriter writer = KmlIOFactory.newContactWriterJak(); Map<String, PieChartData> districts = - serviceSynthesis.getContactPieChartDataByBoatDistrict(filter.getCompany()); + serviceSynthesis.getContactPieChartDataByBoatDistrict(filter); + // Get the max of nbContacts to calculate size of each pieChart +// ContactDAO contactDAO = WaoDAOHelper.getContactDAO(transaction); +// WaoQueryBuilder builder = contactDAO.createQueryWithBoatDistrictCoordinates(filter); +// WaoQueryHelper.BoatDistrictProperty boatDistrictProperty = +// builder.getContactProperty().boatProperty().boatDistrictProperty(); +// +// long max = builder.getQuery(). +// addGroup(boatDistrictProperty.topiaId()). +// executeToInteger(transaction, "MAX(COUNT(*))"); +// +// if (logger.isDebugEnabled()) { +// logger.debug("Max contacts : " + max); +// } + NumberFormat numberFormat = NumberFormat.getInstance(); // Only 2 digits maximum after the comma numberFormat.setMaximumFractionDigits(2); 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-07-24 12:35:32 UTC (rev 625) +++ trunk/wao-business/src/main/java/fr/ifremer/wao/service/ServiceContactImpl.java 2010-07-24 14:57:19 UTC (rev 626) @@ -162,6 +162,9 @@ WaoQueryHelper.ContactProperty contactProperty = builder.initializeForContact(); + // Default order + filter.setOrderBy(TopiaEntity.TOPIA_CREATE_DATE + " desc"); + TopiaQuery query = builder.applyContactFilter(filter). // addLoad(contactProperty.observerProperty().company(), // contactProperty.sampleRowProperty().sampleMonth()); @@ -411,6 +414,8 @@ WaoQueryBuilder builder = context.newQueryBuilder(); builder.initializeForContact(); + filter.setOrderBy(TopiaEntity.TOPIA_CREATE_DATE + " desc"); + TopiaQuery query = builder.applyContactFilter(filter); // No page limit in this case Modified: trunk/wao-business/src/main/java/fr/ifremer/wao/service/ServiceSynthesisImpl.java =================================================================== --- trunk/wao-business/src/main/java/fr/ifremer/wao/service/ServiceSynthesisImpl.java 2010-07-24 12:35:32 UTC (rev 625) +++ trunk/wao-business/src/main/java/fr/ifremer/wao/service/ServiceSynthesisImpl.java 2010-07-24 14:57:19 UTC (rev 626) @@ -30,10 +30,13 @@ import fr.ifremer.wao.WaoException; import fr.ifremer.wao.WaoQueryBuilder; import fr.ifremer.wao.WaoQueryHelper; +import fr.ifremer.wao.WaoQueryHelper.ContactProperty; +import fr.ifremer.wao.WaoQueryHelper.BoatDistrictProperty; import fr.ifremer.wao.bean.BoardingResult; import fr.ifremer.wao.bean.BoardingResultImpl; import fr.ifremer.wao.bean.ContactAverageReactivity; import fr.ifremer.wao.bean.ContactAverageReactivityImpl; +import fr.ifremer.wao.bean.ContactFilter; import fr.ifremer.wao.bean.ContactPieChartConstant; import fr.ifremer.wao.bean.ContactState; import fr.ifremer.wao.bean.ContactStateStatistics; @@ -568,34 +571,54 @@ @Override public Map<String, PieChartData> executeGetContactPieChartDataByBoatDistrict( - TopiaContext transaction, Company company) + TopiaContext transaction, ContactFilter filter) throws TopiaException { ContactDAO dao = WaoDAOHelper.getContactDAO(transaction); - WaoQueryHelper.ContactProperty contactProperty = - WaoQueryHelper.newContactProperty(); +// WaoQueryHelper.ContactProperty contactProperty = +// WaoQueryHelper.newContactProperty(); +// +// WaoQueryHelper.BoatDistrictProperty boatDistrictProperty = +// contactProperty.boatProperty().boatDistrictProperty(); +// +// TopiaQuery query = dao.createQuery(contactProperty.$alias()). +// // Only districts with no null coordinates +// addNotNull(boatDistrictProperty.latitude()). +// addNotNull(boatDistrictProperty.longitude()). +// // Don't take contacts refused by company or program +// addNullOr(contactProperty.validationCompany(), Op.NEQ, Boolean.FALSE). +// addNullOr(contactProperty.validationProgram(), Op.NEQ, Boolean.FALSE); +// +// if (company != null) { +// query.addEquals(contactProperty.observerProperty().company(), company); +// } - WaoQueryHelper.BoatDistrictProperty boatDistrictProperty = +// WaoQueryBuilder builder = dao.createQueryWithBoatDistrictCoordinates(filter); +// +// ContactProperty contactProperty = builder.getContactProperty(); +// +// BoatDistrictProperty boatDistrictProperty = +// contactProperty.boatProperty().boatDistrictProperty(); + + WaoQueryBuilder builder = context.newQueryBuilder(); + + ContactProperty contactProperty = builder.initializeForContact(); + + BoatDistrictProperty boatDistrictProperty = contactProperty.boatProperty().boatDistrictProperty(); - TopiaQuery query = dao.createQuery(contactProperty.$alias()). + TopiaQuery query = builder.applyContactFilter(filter). // Only districts with no null coordinates addNotNull(boatDistrictProperty.latitude()). addNotNull(boatDistrictProperty.longitude()). // Don't take contacts refused by company or program addNullOr(contactProperty.validationCompany(), Op.NEQ, Boolean.FALSE). - addNullOr(contactProperty.validationProgram(), Op.NEQ, Boolean.FALSE); + addNullOr(contactProperty.validationProgram(), Op.NEQ, Boolean.FALSE). + // Set the results wanted : by boatDistrict, by State, get number of results + setSelect(boatDistrictProperty.topiaId(), contactProperty.state(), "COUNT(*)"). + addGroup(boatDistrictProperty.topiaId(), contactProperty.state()); - if (company != null) { - query.addEquals(contactProperty.observerProperty().company(), company); - } - - //String countSelect = WaoQueryHelper.format("COUNT($1)", contactProperty.$alias()); - - query.setSelect(boatDistrictProperty.topiaId(), contactProperty.state(), "COUNT(*)"). - addGroup(boatDistrictProperty.topiaId(), contactProperty.state()); - int realized = 0, refused = 0, other = 0, total = 0; List<Object[]> queryResults = transaction.findByQuery(query); Modified: trunk/wao-business/src/main/xmi/wao.zargo =================================================================== (Binary files differ) Modified: trunk/wao-business/src/test/java/fr/ifremer/wao/service/ServiceCartographyImplTest.java =================================================================== --- trunk/wao-business/src/test/java/fr/ifremer/wao/service/ServiceCartographyImplTest.java 2010-07-24 12:35:32 UTC (rev 625) +++ trunk/wao-business/src/test/java/fr/ifremer/wao/service/ServiceCartographyImplTest.java 2010-07-24 14:57:19 UTC (rev 626) @@ -25,6 +25,7 @@ import fr.ifremer.wao.WaoBusinessException; import fr.ifremer.wao.WaoDAOHelper; import fr.ifremer.wao.WaoException; +import fr.ifremer.wao.bean.ContactFilterImpl; import fr.ifremer.wao.entity.BoatDistrict; import fr.ifremer.wao.entity.BoatDistrictDAO; import fr.ifremer.wao.entity.Company; @@ -138,7 +139,7 @@ ImportResults results = service.importBoatDistrictKml(input); /** EXEC METHOD **/ - InputStream stream = service.exportContactStatisticsKml(null); + InputStream stream = service.exportContactStatisticsKml(new ContactFilterImpl()); //FileUtils.readFileToString() }

1 0

[Suiviobsmer-commits] r625 - in trunk: wao-business/src/main/java/fr/ifremer/wao/service wao-business/src/main/xmi wao-ui/src/main/java/fr/ifremer/wao/ui/data wao-ui/src/main/java/fr/ifremer/wao/ui/pages wao-ui/src/main/java/fr/ifremer/wao/ui/services
by fdesbois＠users.labs.libre-entreprise.org 24 Jul '10

24 Jul '10

Author: fdesbois Date: 2010-07-24 12:35:32 +0000 (Sat, 24 Jul 2010) New Revision: 625 Log: Evo #2369 : - Refactor Company by ContactFilter for Contacts cartography - Create FiltersModel to manage Filter (AbstractFilteredPage need to be deprecated) Added: trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/data/FiltersModel.java Modified: trunk/wao-business/src/main/java/fr/ifremer/wao/service/ServiceCartographyImpl.java trunk/wao-business/src/main/xmi/wao.zargo trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/pages/Cartography.java trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/pages/KmlLoader.java trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/services/AppModule.java trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/services/KmlLoaderStrategy.java trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/services/KmlLoaderStrategyContacts.java Modified: trunk/wao-business/src/main/java/fr/ifremer/wao/service/ServiceCartographyImpl.java =================================================================== --- trunk/wao-business/src/main/java/fr/ifremer/wao/service/ServiceCartographyImpl.java 2010-07-24 10:40:35 UTC (rev 624) +++ trunk/wao-business/src/main/java/fr/ifremer/wao/service/ServiceCartographyImpl.java 2010-07-24 12:35:32 UTC (rev 625) @@ -24,6 +24,7 @@ import fr.ifremer.wao.WaoContext; import fr.ifremer.wao.WaoDAOHelper; import fr.ifremer.wao.WaoException; +import fr.ifremer.wao.bean.ContactFilter; import fr.ifremer.wao.bean.ContactPieChartConstant; import fr.ifremer.wao.bean.ContactState; import fr.ifremer.wao.bean.PieChartData; @@ -155,7 +156,7 @@ @Override protected InputStream executeExportContactStatisticsKml(TopiaContext transaction, - Company company) + ContactFilter filter) throws TopiaException, IOException { BoatDistrictDAO dao = WaoDAOHelper.getBoatDistrictDAO(transaction); @@ -163,7 +164,7 @@ KmlWriter writer = KmlIOFactory.newContactWriterJak(); Map<String, PieChartData> districts = - serviceSynthesis.getContactPieChartDataByBoatDistrict(company); + serviceSynthesis.getContactPieChartDataByBoatDistrict(filter.getCompany()); NumberFormat numberFormat = NumberFormat.getInstance(); // Only 2 digits maximum after the comma Modified: trunk/wao-business/src/main/xmi/wao.zargo =================================================================== (Binary files differ) Added: trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/data/FiltersModel.java =================================================================== --- trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/data/FiltersModel.java (rev 0) +++ trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/data/FiltersModel.java 2010-07-24 12:35:32 UTC (rev 625) @@ -0,0 +1,115 @@ +package fr.ifremer.wao.ui.data; + +import fr.ifremer.wao.bean.ContactFilter; +import fr.ifremer.wao.bean.UserFilter; +import fr.ifremer.wao.bean.WaoFilter; +import fr.ifremer.wao.entity.Company; +import fr.ifremer.wao.service.ServiceUser; +import org.apache.tapestry5.annotations.Persist; +import org.apache.tapestry5.ioc.services.PropertyAccess; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; + +import java.util.List; + +/** + * Created: 24 juil. 2010 + * + * @author fdesbois <fdesbois at codelutin.com> + * @version $Id$ + */ +public class FiltersModel<F extends WaoFilter> { + + private static final Logger logger = LoggerFactory.getLogger(FiltersModel.class); + + /** SERVICES */ + private PropertyAccess propertyAccess; + + private ServiceUser serviceUser; + + /** MODELS */ + private GenericSelectModel<Company> companySelectModel; + + /** DATA */ + private F filter; + + public FiltersModel(F filter, PropertyAccess propertyAccess) { + + this.filter = filter; + this.propertyAccess = propertyAccess; + } + + /** + * ServiceUser is used for filters : COMPANY. + * + * @param serviceUser ServiceUser to set + */ + public void setServiceUser(ServiceUser serviceUser) { + this.serviceUser = serviceUser; + } + + /** + * Retrieve Company SelectModel to used in page. + * + * @param activeOnly Will retrieve only activate companies + * @return the GenericSelectModel for Company + * @throws IllegalStateException if ServiceUser is not defined + * @see ServiceUser#getCompanies(boolean) + */ + public GenericSelectModel<Company> getCompanySelectModel(boolean activeOnly) + throws IllegalStateException { + + if (serviceUser == null) { + throw new IllegalStateException("ServiceUser not exists to retrieve companies"); + } + + if (companySelectModel == null) { + List<Company> companies = serviceUser.getCompanies(activeOnly); + companySelectModel = new GenericSelectModel<Company>( + companies, + Company.class, + Company.NAME, + Company.TOPIA_ID, + propertyAccess + ); + } + return companySelectModel; + } + + /** + * Set the company in filter from its {@code companyId}. The company + * object will be retrieve from the Company SelectModel. If you want + * to set directly the company, do it directly on the filter using + * {@link #getFilter()} method. + * + * @param companyId Id of the company to set + * @throws IllegalStateException if Company SelectModel is not defined + */ + public void setCompany(String companyId) throws IllegalStateException { + + if (companySelectModel == null) { + throw new IllegalStateException("Company selectModel not found !"); + } + + Company company = companySelectModel.findObject(companyId); + getUserFilter().setCompany(company); + } + + /** + * Get the filter. + * + * @return the current filter associated to this model. + */ + public F getFilter() { + return filter; + } + + protected UserFilter getUserFilter() { + if (!UserFilter.class.isAssignableFrom(filter.getClass())) { + throw new ClassCastException("UserFilter not assignable from " + + filter.getClass().getName()); + } + + return (UserFilter)filter; + } +} Property changes on: trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/data/FiltersModel.java ___________________________________________________________________ Added: svn:keywords + Id HeadURL Modified: trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/pages/Cartography.java =================================================================== --- trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/pages/Cartography.java 2010-07-24 10:40:35 UTC (rev 624) +++ trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/pages/Cartography.java 2010-07-24 12:35:32 UTC (rev 625) @@ -23,10 +23,14 @@ import fr.ifremer.wao.WaoException; import fr.ifremer.wao.bean.ConnectedUser; +import fr.ifremer.wao.bean.ContactFilter; +import fr.ifremer.wao.bean.ContactFilterImpl; import fr.ifremer.wao.bean.UserRole; +import fr.ifremer.wao.bean.WaoFilter; import fr.ifremer.wao.entity.Company; import fr.ifremer.wao.service.ServiceCartography; import fr.ifremer.wao.service.ServiceUser; +import fr.ifremer.wao.ui.data.FiltersModel; import fr.ifremer.wao.ui.data.GenericSelectModel; import fr.ifremer.wao.ui.data.RequiresAuthentication; import org.apache.commons.lang.RandomStringUtils; @@ -36,6 +40,7 @@ import org.apache.tapestry5.annotations.SessionState; import org.apache.tapestry5.ioc.annotations.Inject; import org.apache.tapestry5.ioc.services.PropertyAccess; +import org.apache.tapestry5.services.ApplicationStateManager; import org.apache.tapestry5.services.PageRenderLinkSource; import org.slf4j.Logger; @@ -67,56 +72,78 @@ @Inject private ServiceUser serviceUser; + private String url; + + void setupRender() { + // Init filter if needed + initFilter(); + + // Init companyId for select + companyId = getCompany() != null ? getCompany().getTopiaId() : null; + } + + /**************************** FILTERS *************************************/ + + @SessionState(create = false) + private WaoFilter cartographyFilter; + @Persist - private GenericSelectModel<Company> companySelectModel; + private FiltersModel<ContactFilter> filtersModel; @Property private String companyId; - @Persist - private Company company; + protected void initFilter() { + if (cartographyFilter == null) { + cartographyFilter = new ContactFilterImpl(); + } + getFiltersModel(); + } - private String url; + public FiltersModel<ContactFilter> getFiltersModel() { + if (filtersModel == null) { - void setupRender() { + if (logger.isDebugEnabled()) { + logger.debug("Initialize FiltersModel"); + } - if (logger.isDebugEnabled()) { - String companyName = getCompany() != null ? getCompany().getName() : null; - logger.debug("Company selected : " + companyName); - } + filtersModel = new FiltersModel<ContactFilter>( + (ContactFilter)cartographyFilter, propertyAccess); - if (getCompany() != null) { - companyId = getCompany().getTopiaId(); + filtersModel.setServiceUser(serviceUser); + + // Initialize company + if (!user.isAdmin()) { + filtersModel.getFilter().setCompany(user.getCompany()); + } } + return filtersModel; } + public GenericSelectModel<Company> getCompanySelectModel() { + return getFiltersModel().getCompanySelectModel(true); + } + public Company getCompany() { - if (company == null && !user.isAdmin() && !user.isGuest()) { - company = user.getCompany(); - } - return company; + return getFiltersModel().getFilter().getCompany(); } - public GenericSelectModel<Company> getCompanySelectModel() throws WaoException { - if (companySelectModel == null) { - List<Company> companies = serviceUser.getCompanies(true); - companySelectModel = new GenericSelectModel<Company>( - companies, - Company.class, - Company.NAME, - Company.TOPIA_ID, - propertyAccess - ); - } - return companySelectModel; + void onSuccessFromFilters() { +// if (!user.isAdmin()) { +// throw new WaoException("Vous n'avez pas les droits nécessaires" + +// " pour filtrer sur une société", null); +// } + + getFiltersModel().setCompany(companyId); } + /**************************** URL *************************************/ + public String getUrl() throws IOException { if (url == null) { Link link = pageRender.createPageRenderLinkWithContext( KmlLoader.class, - KmlLoader.StrategyValues.CONTACTS, - companyId + KmlLoader.StrategyValues.CONTACTS ); url = link.toURI(); } @@ -129,19 +156,10 @@ public String getPageTitle() { String title = "Répartition des contacts par quartier des navires"; - if (company != null) { - title += " pour la société " + company.getName(); + if (getCompany() != null) { + title += " pour la société " + getCompany().getName(); } return title; } - - void onSuccessFromFilters() { - if (!user.isAdmin()) { - throw new WaoException("Vous n'avez pas les droits nécessaires" + - " pour filtrer sur une société", null); - } - - company = companySelectModel.findObject(companyId); - } } Modified: trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/pages/KmlLoader.java =================================================================== --- trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/pages/KmlLoader.java 2010-07-24 10:40:35 UTC (rev 624) +++ trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/pages/KmlLoader.java 2010-07-24 12:35:32 UTC (rev 625) @@ -21,6 +21,8 @@ */ package fr.ifremer.wao.ui.pages; +import fr.ifremer.wao.bean.ContactFilter; +import fr.ifremer.wao.bean.WaoFilter; import fr.ifremer.wao.service.ServiceCartography; import fr.ifremer.wao.service.ServiceUser; import fr.ifremer.wao.ui.services.KmlLoaderStrategy; @@ -28,6 +30,7 @@ import fr.ifremer.wao.ui.data.RequiresAuthentication; import fr.ifremer.wao.ui.data.TapestryUtil; import org.apache.tapestry5.StreamResponse; +import org.apache.tapestry5.annotations.SessionState; import org.apache.tapestry5.ioc.annotations.Inject; import java.io.IOException; @@ -50,6 +53,9 @@ CONTACTS; } + @SessionState(create = false) + private WaoFilter cartographyFilter; + @Inject private ServiceCartography serviceCartography; @@ -65,7 +71,7 @@ * @param activationContext Context of the page. * @return the StreamResponse that contains Kml data. * @throws IOException - * @see KmlLoaderStrategy#getStreamResponse(Object...) + * @see KmlLoaderStrategy#getStreamResponse(WaoFilter) */ StreamResponse onActivate(Object... activationContext) throws IOException { // Retrive context data @@ -76,7 +82,7 @@ KmlLoaderStrategy strategy = createStrategy(StrategyValues.valueOf(first)); // Return the StreamResponse from the Strategy - return strategy.getStreamResponse(other); + return strategy.getStreamResponse(cartographyFilter); } /** Modified: trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/services/AppModule.java =================================================================== --- trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/services/AppModule.java 2010-07-24 10:40:35 UTC (rev 624) +++ trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/services/AppModule.java 2010-07-24 12:35:32 UTC (rev 625) @@ -27,6 +27,8 @@ import fr.ifremer.wao.WaoContextImpl; import fr.ifremer.wao.bean.ConnectedUser; +import fr.ifremer.wao.bean.ContactFilter; +import fr.ifremer.wao.bean.ContactFilterImpl; import fr.ifremer.wao.bean.PieChartData; import fr.ifremer.wao.bean.PieChartDataImpl; import fr.ifremer.wao.service.ServiceBoat; Modified: trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/services/KmlLoaderStrategy.java =================================================================== --- trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/services/KmlLoaderStrategy.java 2010-07-24 10:40:35 UTC (rev 624) +++ trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/services/KmlLoaderStrategy.java 2010-07-24 12:35:32 UTC (rev 625) @@ -21,6 +21,8 @@ */ package fr.ifremer.wao.ui.services; +import fr.ifremer.wao.bean.ContactFilter; +import fr.ifremer.wao.bean.WaoFilter; import fr.ifremer.wao.entity.Company; import fr.ifremer.wao.ui.pages.KmlLoader; import org.apache.tapestry5.StreamResponse; @@ -36,14 +38,14 @@ * @version $Id$ * @see KmlLoader */ -public interface KmlLoaderStrategy { +public interface KmlLoaderStrategy<F extends WaoFilter> { /** * Retrieve the StreamResponse for this Strategy. * - * @param context Strategy context + * @param filter Strategy filter * @return the StreamResponse to use in KmlLoader * @throws IOException for error on StreamResponse creation */ - StreamResponse getStreamResponse(Object... context) throws IOException; + StreamResponse getStreamResponse(F filter) throws IOException; } Modified: trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/services/KmlLoaderStrategyContacts.java =================================================================== --- trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/services/KmlLoaderStrategyContacts.java 2010-07-24 10:40:35 UTC (rev 624) +++ trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/services/KmlLoaderStrategyContacts.java 2010-07-24 12:35:32 UTC (rev 625) @@ -21,11 +21,13 @@ */ package fr.ifremer.wao.ui.services; +import fr.ifremer.wao.bean.ContactFilter; import fr.ifremer.wao.entity.Company; import fr.ifremer.wao.service.ServiceCartography; import fr.ifremer.wao.service.ServiceUser; import fr.ifremer.wao.ui.data.KmlStreamResponse; import org.apache.tapestry5.StreamResponse; +import org.apache.tapestry5.annotations.SessionState; import java.io.IOException; @@ -35,7 +37,7 @@ * @author fdesbois <fdesbois at codelutin.com> * @version $Id$ */ -public class KmlLoaderStrategyContacts implements KmlLoaderStrategy { +public class KmlLoaderStrategyContacts implements KmlLoaderStrategy<ContactFilter> { protected ServiceCartography serviceCartography; @@ -48,16 +50,16 @@ } @Override - public StreamResponse getStreamResponse(Object... context) throws IOException { + public StreamResponse getStreamResponse(ContactFilter filter) throws IOException { - Company company = null; - if (context != null && context.length > 0) { - String companyId = (String)context[0]; - company = serviceUser.getCompany(companyId); - } +// Company company = null; +// if (context != null && context.length > 0) { +// String companyId = (String)context[0]; +// company = serviceUser.getCompany(companyId); +// } return new KmlStreamResponse( - serviceCartography.exportContactStatisticsKml(company) + serviceCartography.exportContactStatisticsKml(filter) ); } }

1 0

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

24 Jul '10

Author: fdesbois Date: 2010-07-24 10:40:35 +0000 (Sat, 24 Jul 2010) New Revision: 624 Log: Change version to 1.5.1 Modified: trunk/pom.xml trunk/wao-business/pom.xml trunk/wao-ui/pom.xml Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2010-07-24 10:39:28 UTC (rev 623) +++ trunk/pom.xml 2010-07-24 10:40:35 UTC (rev 624) @@ -15,7 +15,7 @@ <groupId>fr.ifremer</groupId> <artifactId>wao</artifactId> - <version>1.6-SNAPSHOT</version> + <version>1.5.1-SNAPSHOT</version> <modules> <module>wao-ui</module> Modified: trunk/wao-business/pom.xml =================================================================== --- trunk/wao-business/pom.xml 2010-07-24 10:39:28 UTC (rev 623) +++ trunk/wao-business/pom.xml 2010-07-24 10:40:35 UTC (rev 624) @@ -10,7 +10,7 @@ <parent> <groupId>fr.ifremer</groupId> <artifactId>wao</artifactId> - <version>1.6-SNAPSHOT</version> + <version>1.5.1-SNAPSHOT</version> </parent> <groupId>fr.ifremer.wao</groupId> Modified: trunk/wao-ui/pom.xml =================================================================== --- trunk/wao-ui/pom.xml 2010-07-24 10:39:28 UTC (rev 623) +++ trunk/wao-ui/pom.xml 2010-07-24 10:40:35 UTC (rev 624) @@ -10,7 +10,7 @@ <parent> <groupId>fr.ifremer</groupId> <artifactId>wao</artifactId> - <version>1.6-SNAPSHOT</version> + <version>1.5.1-SNAPSHOT</version> </parent> <groupId>fr.ifremer.wao</groupId>

1 0

[Suiviobsmer-commits] r623 - trunk
by fdesbois＠users.labs.libre-entreprise.org 24 Jul '10

24 Jul '10

Author: fdesbois Date: 2010-07-24 10:39:28 +0000 (Sat, 24 Jul 2010) New Revision: 623 Log: Update Topia to 2.4.1 and EUGene to 2.1.1 Modified: trunk/changelog.txt trunk/pom.xml Modified: trunk/changelog.txt =================================================================== --- trunk/changelog.txt 2010-07-11 20:33:23 UTC (rev 622) +++ trunk/changelog.txt 2010-07-24 10:39:28 UTC (rev 623) @@ -3,6 +3,15 @@ Historique des versions +1.5.1 +----- + +Mise à jour librairies +++++++++++++++++++++++ + +- **ToPIA** 2.4 -> 2.4.1 [http://maven-site.nuiton.org/topia/topia-persistence] +- **EUGene** 2.1 -> 2.1.1 [http://maven-site.nuiton.org/eugene] + 1.5 --- @@ -22,7 +31,7 @@ - **JavaApiforKml** 2.2.0 [http://code.google.com/p/javaapiforkml/] - **H2** 1.2.132 -> 1.2.137 [http://www.h2database.com/html/main.html] -- **ToPIA** 2.3.4 -> 2.3.5 [http://maven-site.nuiton.org/topia/topia-persistence] +- **ToPIA** 2.3.4 -> 2.4 [http://maven-site.nuiton.org/topia/topia-persistence] - **EUGene** 2.0.2 -> 2.1 [http://maven-site.nuiton.org/eugene] - **mavenpom4labs** 2.2 -> 2.2.2.1 [http://maven-site.nuiton.org/mavenpom/mavenpom4labs] Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2010-07-11 20:33:23 UTC (rev 622) +++ trunk/pom.xml 2010-07-24 10:39:28 UTC (rev 623) @@ -288,8 +288,8 @@ <i18n.version>1.2.2</i18n.version> <nuitonutils.version>1.3.1</nuitonutils.version> <nuitonweb.version>0.1</nuitonweb.version> - <topia.version>2.4</topia.version> - <eugene.version>2.1</eugene.version> + <topia.version>2.4.1</topia.version> + <eugene.version>2.1.1</eugene.version> <tapestry.version>5.1.0.5</tapestry.version> </properties>

1 0

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

11 Jul '10

Author: fdesbois Date: 2010-07-11 20:33:23 +0000 (Sun, 11 Jul 2010) New Revision: 622 Log: [maven-release-plugin] prepare for next development iteration Modified: trunk/pom.xml trunk/wao-business/pom.xml trunk/wao-ui/pom.xml Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2010-07-11 20:33:17 UTC (rev 621) +++ trunk/pom.xml 2010-07-11 20:33:23 UTC (rev 622) @@ -15,7 +15,7 @@ <groupId>fr.ifremer</groupId> <artifactId>wao</artifactId> - <version>1.5</version> + <version>1.6-SNAPSHOT</version> <modules> <module>wao-ui</module> @@ -299,9 +299,9 @@  <scm> - <connection>scm:svn:svn://anonymous at labs.libre-entreprise.org/svnroot/suiviobsmer/tags/wao-1.5</connection> - <developerConnection>scm:svn:svn+ssh://fdesbois at labs.libre-entreprise.org/svnroot/suiviobsmer/tags/wao-1.5</developerConnection> - <url>http://labs.libre-entreprise.org/scm/viewvc.php/tags/wao-1.5?root=suiviobsm…</url> + <connection>scm:svn:svn://anonymous at labs.libre-entreprise.org/svnroot/suiviobsmer/trunk</connection> + <developerConnection>scm:svn:svn+ssh://fdesbois at labs.libre-entreprise.org/svnroot/suiviobsmer/trunk</developerConnection> + <url>http://labs.libre-entreprise.org/scm/viewvc.php/trunk/?root=suiviobsmer</url> </scm> <build> Modified: trunk/wao-business/pom.xml =================================================================== --- trunk/wao-business/pom.xml 2010-07-11 20:33:17 UTC (rev 621) +++ trunk/wao-business/pom.xml 2010-07-11 20:33:23 UTC (rev 622) @@ -10,7 +10,7 @@ <parent> <groupId>fr.ifremer</groupId> <artifactId>wao</artifactId> - <version>1.5</version> + <version>1.6-SNAPSHOT</version> </parent> <groupId>fr.ifremer.wao</groupId> @@ -204,9 +204,9 @@ </build> <scm> - <url>http://labs.libre-entreprise.org/scm/viewvc.php/tags/wao-1.5/?root=suiviobs…</url> - <connection>scm:svn:svn://anonymous at labs.libre-entreprise.org/svnroot/suiviobsmer/tags/wao-1.5/wao-business</connection> - <developerConnection>scm:svn:svn+ssh://fdesbois at labs.libre-entreprise.org/svnroot/suiviobsmer/tags/wao-1.5/wao-business</developerConnection> + <url>http://labs.libre-entreprise.org/scm/viewvc.php/trunk/wao-business/?root=su…</url> + <connection>scm:svn:svn://anonymous at labs.libre-entreprise.org/svnroot/suiviobsmer/trunk/wao-business</connection> + <developerConnection>scm:svn:svn+ssh://fdesbois at labs.libre-entreprise.org/svnroot/suiviobsmer/trunk/wao-business</developerConnection> </scm>  Modified: trunk/wao-ui/pom.xml =================================================================== --- trunk/wao-ui/pom.xml 2010-07-11 20:33:17 UTC (rev 621) +++ trunk/wao-ui/pom.xml 2010-07-11 20:33:23 UTC (rev 622) @@ -10,7 +10,7 @@ <parent> <groupId>fr.ifremer</groupId> <artifactId>wao</artifactId> - <version>1.5</version> + <version>1.6-SNAPSHOT</version> </parent> <groupId>fr.ifremer.wao</groupId> @@ -227,9 +227,9 @@ </repositories> <scm> - <url>http://labs.libre-entreprise.org/scm/viewvc.php/tags/wao-1.5/?root=suiviobs…</url> - <connection>scm:svn:svn://anonymous at labs.libre-entreprise.org/svnroot/suiviobsmer/tags/wao-1.5/wao-ui</connection> - <developerConnection>scm:svn:svn+ssh://fdesbois at labs.libre-entreprise.org/svnroot/suiviobsmer/tags/wao-1.5/wao-ui</developerConnection> + <url>http://labs.libre-entreprise.org/scm/viewvc.php/trunk/wao-ui/?root=suiviobs…</url> + <connection>scm:svn:svn://anonymous at labs.libre-entreprise.org/svnroot/suiviobsmer/trunk/wao-ui</connection> + <developerConnection>scm:svn:svn+ssh://fdesbois at labs.libre-entreprise.org/svnroot/suiviobsmer/trunk/wao-ui</developerConnection> </scm> </project>

1 0

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

11 Jul '10

Author: fdesbois Date: 2010-07-11 20:33:17 +0000 (Sun, 11 Jul 2010) New Revision: 621 Log: [maven-release-plugin] copy for tag wao-1.5 Added: tags/wao-1.5/

1 0

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

11 Jul '10

Author: fdesbois Date: 2010-07-11 20:33:14 +0000 (Sun, 11 Jul 2010) New Revision: 620 Log: [maven-release-plugin] prepare release wao-1.5 Modified: trunk/pom.xml trunk/wao-business/pom.xml trunk/wao-ui/pom.xml Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2010-07-11 20:30:59 UTC (rev 619) +++ trunk/pom.xml 2010-07-11 20:33:14 UTC (rev 620) @@ -15,7 +15,7 @@ <groupId>fr.ifremer</groupId> <artifactId>wao</artifactId> - <version>1.5-SNAPSHOT</version> + <version>1.5</version> <modules> <module>wao-ui</module> @@ -299,9 +299,9 @@  <scm> - <connection>scm:svn:svn://anonymous at labs.libre-entreprise.org/svnroot/suiviobsmer/trunk</connection> - <developerConnection>scm:svn:svn+ssh://fdesbois at labs.libre-entreprise.org/svnroot/suiviobsmer/trunk</developerConnection> - <url>http://labs.libre-entreprise.org/scm/viewvc.php/trunk/?root=suiviobsmer</url> + <connection>scm:svn:svn://anonymous at labs.libre-entreprise.org/svnroot/suiviobsmer/tags/wao-1.5</connection> + <developerConnection>scm:svn:svn+ssh://fdesbois at labs.libre-entreprise.org/svnroot/suiviobsmer/tags/wao-1.5</developerConnection> + <url>http://labs.libre-entreprise.org/scm/viewvc.php/tags/wao-1.5?root=suiviobsm…</url> </scm> <build> Modified: trunk/wao-business/pom.xml =================================================================== --- trunk/wao-business/pom.xml 2010-07-11 20:30:59 UTC (rev 619) +++ trunk/wao-business/pom.xml 2010-07-11 20:33:14 UTC (rev 620) @@ -10,7 +10,7 @@ <parent> <groupId>fr.ifremer</groupId> <artifactId>wao</artifactId> - <version>1.5-SNAPSHOT</version> + <version>1.5</version> </parent> <groupId>fr.ifremer.wao</groupId> @@ -204,9 +204,9 @@ </build> <scm> - <url>http://labs.libre-entreprise.org/scm/viewvc.php/trunk/wao-business/?root=su…</url> - <connection>scm:svn:svn://anonymous at labs.libre-entreprise.org/svnroot/suiviobsmer/trunk/wao-business</connection> - <developerConnection>scm:svn:svn+ssh://fdesbois at labs.libre-entreprise.org/svnroot/suiviobsmer/trunk/wao-business</developerConnection> + <url>http://labs.libre-entreprise.org/scm/viewvc.php/tags/wao-1.5/?root=suiviobs…</url> + <connection>scm:svn:svn://anonymous at labs.libre-entreprise.org/svnroot/suiviobsmer/tags/wao-1.5/wao-business</connection> + <developerConnection>scm:svn:svn+ssh://fdesbois at labs.libre-entreprise.org/svnroot/suiviobsmer/tags/wao-1.5/wao-business</developerConnection> </scm>  Modified: trunk/wao-ui/pom.xml =================================================================== --- trunk/wao-ui/pom.xml 2010-07-11 20:30:59 UTC (rev 619) +++ trunk/wao-ui/pom.xml 2010-07-11 20:33:14 UTC (rev 620) @@ -10,7 +10,7 @@ <parent> <groupId>fr.ifremer</groupId> <artifactId>wao</artifactId> - <version>1.5-SNAPSHOT</version> + <version>1.5</version> </parent> <groupId>fr.ifremer.wao</groupId> @@ -227,9 +227,9 @@ </repositories> <scm> - <url>http://labs.libre-entreprise.org/scm/viewvc.php/trunk/wao-ui/?root=suiviobs…</url> - <connection>scm:svn:svn://anonymous at labs.libre-entreprise.org/svnroot/suiviobsmer/trunk/wao-ui</connection> - <developerConnection>scm:svn:svn+ssh://fdesbois at labs.libre-entreprise.org/svnroot/suiviobsmer/trunk/wao-ui</developerConnection> + <url>http://labs.libre-entreprise.org/scm/viewvc.php/tags/wao-1.5/?root=suiviobs…</url> + <connection>scm:svn:svn://anonymous at labs.libre-entreprise.org/svnroot/suiviobsmer/tags/wao-1.5/wao-ui</connection> + <developerConnection>scm:svn:svn+ssh://fdesbois at labs.libre-entreprise.org/svnroot/suiviobsmer/tags/wao-1.5/wao-ui</developerConnection> </scm> </project>

1 0

[Suiviobsmer-commits] r619 - trunk/wao-business/src/main/resources/i18n
by fdesbois＠users.labs.libre-entreprise.org 11 Jul '10

11 Jul '10

Author: fdesbois Date: 2010-07-11 20:30:59 +0000 (Sun, 11 Jul 2010) New Revision: 619 Log: ... 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 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 2010-07-11 20:25:08 UTC (rev 618) +++ trunk/wao-business/src/main/resources/i18n/wao-business-en_GB.properties 2010-07-11 20:30:59 UTC (rev 619) @@ -1,24 +1,3 @@ -### -# #%L -# Wao :: Business -# %% -# Copyright (C) 2009 - 2010 Ifremer -# %% -# This program is free software: you can redistribute it and/or modify -# it under the terms of the GNU General Public License as -# published by the Free Software Foundation, either version 3 of the -# License, or (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public -# License along with this program. If not, see -# <http://www.gnu.org/licenses/gpl-3.0.html>. -# #L% -### wao.error.boat.canCreateContact= wao.error.boat.getNbBoarding= wao.error.boatInfos.getNbBoardingForCompany= 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-07-11 20:25:08 UTC (rev 618) +++ trunk/wao-business/src/main/resources/i18n/wao-business-fr_FR.properties 2010-07-11 20:30:59 UTC (rev 619) @@ -1,24 +1,3 @@ -### -# #%L -# Wao :: Business -# %% -# Copyright (C) 2009 - 2010 Ifremer -# %% -# This program is free software: you can redistribute it and/or modify -# it under the terms of the GNU General Public License as -# published by the Free Software Foundation, either version 3 of the -# License, or (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public -# License along with this program. If not, see -# <http://www.gnu.org/licenses/gpl-3.0.html>. -# #L% -### wao.error.boat.canCreateContact=Impossible de cr\u00E9er un nouveau contact pour la soci\u00E9t\u00E9 %1$s et le navire %2$s (%3$d) wao.error.boat.getNbBoarding=Impossible de r\u00E9cup\u00E9rer le nombre d'embarquements r\u00E9els depuis le %1$s wao.error.boatInfos.getNbBoardingForCompany=Impossible de r\u00E9cup\u00E9rer le nombre d'embarquements r\u00E9els depuis le %1$s pour la soci\u00E9t\u00E9 %2$s

1 0

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

11 Jul '10

Author: fdesbois Date: 2010-07-11 20:25:08 +0000 (Sun, 11 Jul 2010) New Revision: 618 Log: remove bad tag Removed: tags/wao-1.5/

1 0