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

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

25 Jul '10

Author: fdesbois Date: 2010-07-25 17:31:49 +0000 (Sun, 25 Jul 2010) New Revision: 633 Log: Update changelog Modified: trunk/changelog.txt Modified: trunk/changelog.txt =================================================================== --- trunk/changelog.txt 2010-07-25 17:02:45 UTC (rev 632) +++ trunk/changelog.txt 2010-07-25 17:31:49 UTC (rev 633) @@ -16,7 +16,8 @@ Anomalies +++++++++ -- [fdesbois] Ano #2366 : Contact sans référence vers le plan d'échantillonnage. +- [fdesbois] Ano #2366 : Une ligne du plan d'échantillonnage ne doit pas pouvoir + être supprimée si elle est liée à des contacts. Mise à jour librairies ++++++++++++++++++++++

1 0

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

25 Jul '10

Author: fdesbois Date: 2010-07-25 17:02:45 +0000 (Sun, 25 Jul 2010) New Revision: 632 Log: Update changelog Modified: trunk/changelog.txt Modified: trunk/changelog.txt =================================================================== --- trunk/changelog.txt 2010-07-25 16:57:12 UTC (rev 631) +++ trunk/changelog.txt 2010-07-25 17:02:45 UTC (rev 632) @@ -6,6 +6,18 @@ 1.5.1 ----- +Evolutions +++++++++++ + +- [fdesbois] Evo #2370 : Cartographie contacts : modifier taille du camembert + en fonction du nombre de contacts. +- [fdesbois] Evo #2369 : Ajout filtres sur carte des contacts. + +Anomalies ++++++++++ + +- [fdesbois] Ano #2366 : Contact sans référence vers le plan d'échantillonnage. + Mise à jour librairies ++++++++++++++++++++++

1 0

[Suiviobsmer-commits] r631 - in trunk: 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
by fdesbois＠users.labs.libre-entreprise.org 25 Jul '10

25 Jul '10

Author: fdesbois Date: 2010-07-25 16:57:12 +0000 (Sun, 25 Jul 2010) New Revision: 631 Log: Ano #2366 : - Add tests to check sampleRow nullity in contact save - Block sampleRow delete if contacts exists with it Modified: 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/ServiceContactImplTest.java 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 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-07-25 13:15:50 UTC (rev 630) +++ trunk/wao-business/src/main/java/fr/ifremer/wao/service/ServiceSamplingImpl.java 2010-07-25 16:57:12 UTC (rev 631) @@ -39,6 +39,8 @@ import fr.ifremer.wao.bean.ConnectedUser; import fr.ifremer.wao.bean.FacadeRow; import fr.ifremer.wao.bean.FacadeRowImpl; +import fr.ifremer.wao.entity.Contact; +import fr.ifremer.wao.entity.ContactDAO; import fr.ifremer.wao.io.ImportResults; import fr.ifremer.wao.io.ImportResultsImpl; import fr.ifremer.wao.bean.SamplingFilter; @@ -515,10 +517,19 @@ @Override public void executeDeleteSampleRow(TopiaContext transaction, - List<Object> errorArgs, SampleRow sampleRow) throws TopiaException { + List<Object> errorArgs, + SampleRow sampleRow) + throws TopiaException, WaoBusinessException { errorArgs.add(sampleRow.getCode()); + // Check if contacts exists linked with this sampleRow, no delete permitted in this case. + ContactDAO contactDAO = WaoDAOHelper.getContactDAO(transaction); + if (contactDAO.existByProperties(Contact.SAMPLE_ROW, sampleRow)) { + throw new WaoBusinessException("Des contacts liés à cette ligne" + + " existent, aucune suppression n'est possible."); + } + SampleRowDAO dao = WaoDAOHelper.getSampleRowDAO(transaction); SampleRow row = dao.findByTopiaId(sampleRow.getTopiaId()); Modified: trunk/wao-business/src/main/xmi/wao.zargo =================================================================== (Binary files differ) 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-07-25 13:15:50 UTC (rev 630) +++ trunk/wao-business/src/test/java/fr/ifremer/wao/service/ServiceContactImplTest.java 2010-07-25 16:57:12 UTC (rev 631) @@ -23,10 +23,12 @@ package fr.ifremer.wao.service; import fr.ifremer.wao.AbstractServiceTest; +import fr.ifremer.wao.WaoException; import fr.ifremer.wao.bean.ContactFilter; import fr.ifremer.wao.bean.ContactFilterImpl; import fr.ifremer.wao.bean.UserRole; import fr.ifremer.wao.entity.Contact; +import fr.ifremer.wao.entity.ContactImpl; import fr.ifremer.wao.entity.WaoUser; import java.util.Map; import org.apache.commons.collections.CollectionUtils; @@ -85,4 +87,20 @@ results = service.getContacts(filter); Assert.assertEquals(0, results.size()); } + + @Test + public void testSaveContact() throws TopiaException { + + Contact contact = new ContactImpl(); + WaoUser observer = createDefaultObserver(); + contact.setObserver(observer); + + + try { + service.saveContact(contact, false); + Assert.fail(); + } catch (WaoException eee) { + + } + } } 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-07-25 13:15:50 UTC (rev 630) +++ trunk/wao-business/src/test/java/fr/ifremer/wao/service/ServiceSamplingImplTest.java 2010-07-25 16:57:12 UTC (rev 631) @@ -35,6 +35,9 @@ import fr.ifremer.wao.entity.Boat; import fr.ifremer.wao.entity.Company; import fr.ifremer.wao.entity.CompanyDAO; +import fr.ifremer.wao.entity.Contact; +import fr.ifremer.wao.entity.ContactDAO; +import fr.ifremer.wao.entity.ContactImpl; import fr.ifremer.wao.entity.ElligibleBoat; import fr.ifremer.wao.entity.ElligibleBoatDAO; import fr.ifremer.wao.entity.FishingZone; @@ -47,6 +50,7 @@ import fr.ifremer.wao.entity.SampleRow; import fr.ifremer.wao.entity.SampleRowDAO; import fr.ifremer.wao.entity.SampleRowLogImpl; +import fr.ifremer.wao.entity.WaoUser; import fr.ifremer.wao.io.ImportResults; import org.junit.Assert; import org.junit.Test; @@ -157,6 +161,29 @@ result = serviceSampling.getSampleRow(row.getTopiaId()); assertEquals(2, result.getFishingZone().size()); + log.info("test if sampleRow becomes null in contact after update"); + + Contact contact = new ContactImpl(); + WaoUser observer = createDefaultObserver(); + contact.setObserver(observer); + contact.setSampleRow(result); + + manager.getServiceContact().saveContact(contact, false); + + serviceSampling.createUpdateSampleRow(result, boats, new SampleRowLogImpl()); + + transaction = manager.getContext().beginTransaction(); + try { + ContactDAO contactDAO = WaoDAOHelper.getContactDAO(transaction); + + Contact contactFound = contactDAO.findBySampleRow(row); + + Assert.assertNotNull(contactFound); + + } finally { + transaction.closeContext(); + } + } @Test @@ -473,7 +500,28 @@ ElligibleBoatDAO elligibleDAO = WaoDAOHelper.getElligibleBoatDAO(transaction); List<ElligibleBoat> elligibles = elligibleDAO.findAll(); assertEquals(0, elligibles.size()); + + log.info("test if sampleRow can't be deleted if contacts are associated"); + + row = rowDAO.findByCode("2010_0002"); transaction.closeContext(); + + Contact contact = new ContactImpl(); + WaoUser observer = createDefaultObserver(); + contact.setObserver(observer); + contact.setSampleRow(row); + + manager.getServiceContact().saveContact(contact, false); + + boolean errorCatched = false; + try { + serviceSampling.deleteSampleRow(row); + Assert.fail(); + } catch (WaoBusinessException eee) { + log.debug("Business error", eee); + errorCatched = true; + } + Assert.assertTrue(errorCatched); } @Test 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-07-25 13:15:50 UTC (rev 630) +++ trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/pages/SamplingPlan.java 2010-07-25 16:57:12 UTC (rev 631) @@ -41,6 +41,7 @@ import fr.ifremer.wao.ui.components.Layout; import fr.ifremer.wao.ui.data.ExportStreamResponse; import fr.ifremer.wao.ui.data.RequiresAuthentication; +import fr.ifremer.wao.ui.services.WaoManager; import org.apache.tapestry5.StreamResponse; import org.apache.tapestry5.annotations.IncludeStylesheet; import org.apache.tapestry5.annotations.InjectComponent; @@ -50,6 +51,7 @@ import org.apache.tapestry5.annotations.SessionState; import org.apache.tapestry5.corelib.components.Form; import org.apache.tapestry5.corelib.components.Zone; +import org.apache.tapestry5.ioc.Messages; import org.apache.tapestry5.ioc.annotations.Inject; import org.apache.tapestry5.upload.services.UploadedFile; import org.nuiton.util.PeriodDates; @@ -80,6 +82,12 @@ private Logger logger; @Inject + private WaoManager manager; + + @Inject + private Messages messages; + + @Inject private ServiceSampling serviceSampling; @Inject @@ -486,7 +494,12 @@ void onActionFromDeleteSampleRow(int rowIndex) throws WaoException { row = getData().get(rowIndex); - serviceSampling.deleteSampleRow(row); + try { + serviceSampling.deleteSampleRow(row); + } catch (WaoBusinessException eee) { + String error = manager.getErrorMessage(eee, messages, logger); + layout.addError(error); + } } public boolean isRowNotFinished() {

1 0

[Suiviobsmer-commits] r630 - trunk/wao-business/src/test/java/fr/ifremer/wao/bean
by fdesbois＠users.labs.libre-entreprise.org 25 Jul '10

25 Jul '10

Author: fdesbois Date: 2010-07-25 13:15:50 +0000 (Sun, 25 Jul 2010) New Revision: 630 Log: fix test Modified: trunk/wao-business/src/test/java/fr/ifremer/wao/bean/PieChartDataImplTest.java Modified: trunk/wao-business/src/test/java/fr/ifremer/wao/bean/PieChartDataImplTest.java =================================================================== --- trunk/wao-business/src/test/java/fr/ifremer/wao/bean/PieChartDataImplTest.java 2010-07-24 21:56:24 UTC (rev 629) +++ trunk/wao-business/src/test/java/fr/ifremer/wao/bean/PieChartDataImplTest.java 2010-07-25 13:15:50 UTC (rev 630) @@ -84,7 +84,7 @@ series2.setColor("FFFFFF"); data.addSeries(series2); - String expected = "Réalisé,20.0,FFFFFF|Refusé,30.0,FFFFFF|Autres,50.0,FFFFFF:18.0"; + String expected = "Réalisé,20.0,FFFFFF|Refusé,30.0,FFFFFF|Autres,50.0,FFFFFF::18.0"; Assert.assertEquals(expected, data.getData()); }

1 0

[Suiviobsmer-commits] r629 - in trunk: wao-business/src/main/java/fr/ifremer/wao/bean wao-business/src/main/java/fr/ifremer/wao/io/kml wao-business/src/main/java/fr/ifremer/wao/service wao-business/src/main/xmi wao-business/src/test/java/fr/ifremer/wao/bean 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 21:56:24 +0000 (Sat, 24 Jul 2010) New Revision: 629 Log: Evo #2370 : - Change pieChart size depends on contacts number on each district Added: trunk/wao-business/src/main/java/fr/ifremer/wao/io/kml/IconSizeHelper.java Modified: trunk/wao-business/src/main/java/fr/ifremer/wao/bean/PieChartDataImpl.java trunk/wao-business/src/main/java/fr/ifremer/wao/io/kml/ContactKmlWriterJak.java trunk/wao-business/src/main/java/fr/ifremer/wao/io/kml/KmlWriter.java trunk/wao-business/src/main/java/fr/ifremer/wao/service/ServiceCartographyImpl.java trunk/wao-business/src/main/java/fr/ifremer/wao/service/ServiceChartEmpty.java trunk/wao-business/src/main/xmi/wao.zargo trunk/wao-business/src/test/java/fr/ifremer/wao/bean/PieChartDataImplTest.java trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/pages/KmlLoader.java trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/pages/PieChart.java trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/services/ServiceChartImpl.java trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/services/ServiceChartServlet.java Modified: trunk/wao-business/src/main/java/fr/ifremer/wao/bean/PieChartDataImpl.java =================================================================== --- trunk/wao-business/src/main/java/fr/ifremer/wao/bean/PieChartDataImpl.java 2010-07-24 18:10:31 UTC (rev 628) +++ trunk/wao-business/src/main/java/fr/ifremer/wao/bean/PieChartDataImpl.java 2010-07-24 21:56:24 UTC (rev 629) @@ -37,9 +37,8 @@ public class PieChartDataImpl extends PieChartData { private static final String SERIES_SEPARATOR = "|"; + private static final String TOTAL_SEPARATOR = "::"; - protected double total; - public PieChartDataImpl() { series = new ArrayList<PieChartSeries>(); } @@ -56,7 +55,7 @@ for (PieChartSeries curr : series) { double value = curr.getValue(); // calculate percentage - curr.setValue(value / total * 100); + curr.setValue(value / (double)total * 100); } } @@ -69,8 +68,12 @@ */ @Override public void setData(String data) { + + String[] split = data.split(TOTAL_SEPARATOR); + total = Double.parseDouble(split[1]); + // need to escape separator | - for (String curr : data.split("\\" + SERIES_SEPARATOR)) { + for (String curr : split[0].split("\\" + SERIES_SEPARATOR)) { addSeries(PieChartSeriesImpl.create(curr)); } } @@ -88,6 +91,8 @@ String result = StringUtil.join(series, PieChartSeriesImpl.TO_STRING, SERIES_SEPARATOR, true); + result += TOTAL_SEPARATOR + String.valueOf(total); + return result; } Modified: trunk/wao-business/src/main/java/fr/ifremer/wao/io/kml/ContactKmlWriterJak.java =================================================================== --- trunk/wao-business/src/main/java/fr/ifremer/wao/io/kml/ContactKmlWriterJak.java 2010-07-24 18:10:31 UTC (rev 628) +++ trunk/wao-business/src/main/java/fr/ifremer/wao/io/kml/ContactKmlWriterJak.java 2010-07-24 21:56:24 UTC (rev 629) @@ -64,7 +64,7 @@ } @Override - public void record(GeoPoint geo, String iconUrl, String description) { + public void record(GeoPoint geo, String iconUrl, double iconScale, String description) { if (geo.getLatitude() == null || geo.getLongitude() == null) { throw new IllegalArgumentException("Can't record geopoint with null latitude or longitude"); @@ -75,7 +75,7 @@ Icon icon = new Icon().withHref(iconUrl); - style.createAndSetIconStyle().withScale(1.0).withIcon(icon); + style.createAndSetIconStyle().withScale(iconScale).withIcon(icon); style.createAndSetLabelStyle().withColor("ff43b3ff").withScale(1.0); Placemark placemark = folder.createAndAddPlacemark(). Added: trunk/wao-business/src/main/java/fr/ifremer/wao/io/kml/IconSizeHelper.java =================================================================== --- trunk/wao-business/src/main/java/fr/ifremer/wao/io/kml/IconSizeHelper.java (rev 0) +++ trunk/wao-business/src/main/java/fr/ifremer/wao/io/kml/IconSizeHelper.java 2010-07-24 21:56:24 UTC (rev 629) @@ -0,0 +1,123 @@ +package fr.ifremer.wao.io.kml; + +import fr.ifremer.wao.bean.PieChartData; + +import java.util.Collection; + +/** + * Size will be rendered between {@link #BASE_SCALE} and {@link #BASE_SCALE} + + * {@link #NB_STEPS} * {@link #SCALE_STEP}. + * The constant {@link #NB_STEPS} defines the number of available sizes. + * This class must be initialized with a max reference to calculate the + * correct size and scale. This reference can be calculated from a collection + * of {@link PieChartData} : the max total found will be used. The reference + * size is defined by {@link #REF_SIZE} and is used by Kml file to render icons. + * + * Created: 24 juil. 2010 + * + * @author fdesbois <fdesbois at codelutin.com> + * @version $Id$ + */ +public class IconSizeHelper { + + /** Step for scale */ + private static final double SCALE_STEP = 0.125; + + /** Reference size (scale 1.0) */ + private static final int REF_SIZE = 32; + + /** + * Number of available size or steps for scale + * (max scale = BASE_SCALE + NB_STEPS * SCALE_STEP) + */ + private static final int NB_STEPS = 10; + + /** Base scale used for minimum size */ + private static final double BASE_SCALE = 0.5; + + /** Divided calculated from maxReference used to calculate scale */ + protected int divided; + + protected double reference; + + /** + * Initialize IconSizeHelper using {@code data}. The max total found from + * the collection will be used as reference for this instance. + * + * @param data Collection of PieChartData that contains total elements for each data + */ + public IconSizeHelper(Collection<PieChartData> data) { + double max = 0.; + for (PieChartData curr : data) { + if (curr.getTotal() > max) { + max = curr.getTotal(); + } + } + this.reference = max; + init(); + } + + public IconSizeHelper(double maxReference) { + this.reference = maxReference; + init(); + } + + /** + * Initialize the divided to calculate the scale. + */ + protected void init() { + // Ex : 215 / 15 = 14.33 --> res = 15 + Double res = reference / (double)NB_STEPS; + res = Math.ceil(res); + divided = res.intValue(); + } + + /** + * Return the reference used to calculate scale and size. + * + * @return the reference initialized on instantiation. + */ + public double getReference() { + return reference; + } + + /** + * Retrieve the scale for {@code nbElements}. This scale is used for IconStyle + * in Kml file. + * + * @param nbElements Number of elements to check the correct scale. + * @return the scale calculated + */ + public double getScale(double nbElements) { + // Ex : 160 / 15 = 10.66 --> multiplicator = 11 + Double res = nbElements / (double)divided; + res = Math.ceil(res); + int multiplicator = res.intValue(); + // Ex : scale = 11 * 0.125 = 1.375 + double scale = multiplicator * SCALE_STEP; + return BASE_SCALE + scale; + } + + /** + * Retrieve the size for {@code nbElements}. + * + * @param nbElements The number of elements to check the correct size. + * @return the size calculated + */ + public int getSize(double nbElements) { + return getSizeFromScale(getScale(nbElements)); + } + + /** + * Retrieve the size from a previously calculated {@code scale}. + * + * @param scale Scale to use with {@link #REF_SIZE}. + * @return the size calculated + */ + public int getSizeFromScale(double scale) { + // Ex : size = 1.375 * 32 = 44 px + Double size = scale * (double)REF_SIZE; + return size.intValue(); + } + +} Property changes on: trunk/wao-business/src/main/java/fr/ifremer/wao/io/kml/IconSizeHelper.java ___________________________________________________________________ Added: svn:keywords + Id HeadURL Modified: trunk/wao-business/src/main/java/fr/ifremer/wao/io/kml/KmlWriter.java =================================================================== --- trunk/wao-business/src/main/java/fr/ifremer/wao/io/kml/KmlWriter.java 2010-07-24 18:10:31 UTC (rev 628) +++ trunk/wao-business/src/main/java/fr/ifremer/wao/io/kml/KmlWriter.java 2010-07-24 21:56:24 UTC (rev 629) @@ -36,7 +36,7 @@ public void init(); - public void record(GeoPoint geo, String iconUrl, String description); + public void record(GeoPoint geo, String iconUrl, double scale, String description); public void write(OutputStream stream) throws IOException; 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 18:10:31 UTC (rev 628) +++ trunk/wao-business/src/main/java/fr/ifremer/wao/service/ServiceCartographyImpl.java 2010-07-24 21:56:24 UTC (rev 629) @@ -24,26 +24,22 @@ 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; import fr.ifremer.wao.bean.PieChartData; 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; +import fr.ifremer.wao.io.kml.IconSizeHelper; import fr.ifremer.wao.io.kml.KmlIOFactory; import fr.ifremer.wao.io.kml.KmlReader; import fr.ifremer.wao.io.kml.KmlWriter; 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; @@ -170,19 +166,8 @@ Map<String, PieChartData> districts = 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); -// } + // Create new IconSizeHelper to calculate icon size and scale for pieCharts + IconSizeHelper sizeHelper = new IconSizeHelper(districts.values()); NumberFormat numberFormat = NumberFormat.getInstance(); // Only 2 digits maximum after the comma @@ -243,9 +228,18 @@ append(" (").append(other).append(" %)"). append("</p>\n"); - String miniChartUrl = serviceChart.getPieChartUrl(data, true); + double scale = sizeHelper.getScale(data.getTotal()); + int size = sizeHelper.getSizeFromScale(scale); - writer.record(district, miniChartUrl, description.toString()); + if (logger.isDebugEnabled()) { + logger.debug("Chart : nbElements = " + data.getTotal() + + " _ size = " + size + " _ scale = " + scale + + " _ ref = " + sizeHelper.getReference()); + } + + String miniChartUrl = serviceChart.getPieChartUrl(data, size, true); + + writer.record(district, miniChartUrl, scale, description.toString()); } File file = File.createTempFile("wao-contacts-", ".kml"); @@ -264,7 +258,7 @@ return new FileInputStream(file); } - + protected double getSeriesValue(PieChartData data, ContactPieChartConstant series) { return data.getSeries(series.ordinal()).getValue(); } Modified: trunk/wao-business/src/main/java/fr/ifremer/wao/service/ServiceChartEmpty.java =================================================================== --- trunk/wao-business/src/main/java/fr/ifremer/wao/service/ServiceChartEmpty.java 2010-07-24 18:10:31 UTC (rev 628) +++ trunk/wao-business/src/main/java/fr/ifremer/wao/service/ServiceChartEmpty.java 2010-07-24 21:56:24 UTC (rev 629) @@ -38,10 +38,11 @@ private static final Logger logger = LoggerFactory.getLogger(ServiceChartEmpty.class); @Override - public String getPieChartUrl(PieChartData data, boolean thumb) { + public String getPieChartUrl(PieChartData data, int size, boolean thumb) { if (logger.isDebugEnabled()) { logger.debug("data : " + data); + logger.debug("size : " + size); logger.debug("thumb : " + thumb); } Modified: trunk/wao-business/src/main/xmi/wao.zargo =================================================================== (Binary files differ) Modified: trunk/wao-business/src/test/java/fr/ifremer/wao/bean/PieChartDataImplTest.java =================================================================== --- trunk/wao-business/src/test/java/fr/ifremer/wao/bean/PieChartDataImplTest.java 2010-07-24 18:10:31 UTC (rev 628) +++ trunk/wao-business/src/test/java/fr/ifremer/wao/bean/PieChartDataImplTest.java 2010-07-24 21:56:24 UTC (rev 629) @@ -35,12 +35,13 @@ @Test public void testSetData() throws Exception { - String input = "Réalisé,20.0,FFFFFF|Refusé,30.0,FFFFFF|Autres,50.0,FFFFFF"; + String input = "Réalisé,20.0,FFFFFF|Refusé,30.0,FFFFFF|Autres,50.0,FFFFFF::18.0"; PieChartData data = new PieChartDataImpl(); data.setData(input); Assert.assertEquals(3, data.getSeries().size()); + Assert.assertEquals(18.0, data.getTotal(), 0); PieChartSeries series0 = data.getSeries(0); Assert.assertEquals("Réalisé", series0.getLabel()); @@ -63,6 +64,8 @@ PieChartData data = new PieChartDataImpl(); + data.setTotal(18.0); + PieChartSeries series0 = new PieChartSeriesImpl(); series0.setLabel("Réalisé"); series0.setValue(20.0); @@ -81,7 +84,7 @@ series2.setColor("FFFFFF"); data.addSeries(series2); - String expected = "Réalisé,20.0,FFFFFF|Refusé,30.0,FFFFFF|Autres,50.0,FFFFFF"; + String expected = "Réalisé,20.0,FFFFFF|Refusé,30.0,FFFFFF|Autres,50.0,FFFFFF:18.0"; Assert.assertEquals(expected, data.getData()); } 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 18:10:31 UTC (rev 628) +++ trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/pages/KmlLoader.java 2010-07-24 21:56:24 UTC (rev 629) @@ -70,7 +70,7 @@ * * @param activationContext Context of the page. * @return the StreamResponse that contains Kml data. - * @throws IOException + * @throws IOException from stream error * @see KmlLoaderStrategy#getStreamResponse(WaoFilter) */ StreamResponse onActivate(Object... activationContext) throws IOException { Modified: trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/pages/PieChart.java =================================================================== --- trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/pages/PieChart.java 2010-07-24 18:10:31 UTC (rev 628) +++ trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/pages/PieChart.java 2010-07-24 21:56:24 UTC (rev 629) @@ -46,10 +46,10 @@ @InjectService("serviceChartServlet") private ServiceChart chartServlet; - URL onActivate(PieChartData data, boolean thumb) + URL onActivate(PieChartData data, int size, boolean thumb) throws MalformedURLException { - return new URL(chartServlet.getPieChartUrl(data, thumb)); + return new URL(chartServlet.getPieChartUrl(data, size, thumb)); } } Modified: trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/services/ServiceChartImpl.java =================================================================== --- trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/services/ServiceChartImpl.java 2010-07-24 18:10:31 UTC (rev 628) +++ trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/services/ServiceChartImpl.java 2010-07-24 21:56:24 UTC (rev 629) @@ -51,11 +51,11 @@ } @Override - public String getPieChartUrl(PieChartData data, boolean thumb) { + public String getPieChartUrl(PieChartData data, int size, boolean thumb) { // Create link to PieChart. This page is used to redirect // data to the correct chartServlet Link link = pageRender.createPageRenderLinkWithContext( - PieChart.class, data, thumb); + PieChart.class, data, size, thumb); return getBaseUrl() + link.toAbsoluteURI(); } Modified: trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/services/ServiceChartServlet.java =================================================================== --- trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/services/ServiceChartServlet.java 2010-07-24 18:10:31 UTC (rev 628) +++ trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/services/ServiceChartServlet.java 2010-07-24 21:56:24 UTC (rev 629) @@ -26,6 +26,8 @@ import fr.ifremer.wao.bean.PieChartSeries; import fr.ifremer.wao.service.ServiceChart; import org.nuiton.util.StringUtil; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; import java.util.ArrayList; import java.util.Date; @@ -43,6 +45,8 @@ */ public class ServiceChartServlet implements ServiceChart { + private static final Logger logger = LoggerFactory.getLogger(ServiceChartServlet.class); + private static final String PROPERTY_SEPARATOR = "&"; private static final String PROPERTY_VALUE_SEPARATOR = ","; private static final String PROPERTY_LABEL_SEPARATOR = "|"; @@ -62,12 +66,12 @@ private static final String PIE_CHART_MINI_TYPE = PROPERTY_TYPE + "p3"; private static final String PIE_CHART_MAXI_TYPE = PROPERTY_TYPE + "p3"; - private static final String PIE_CHART_MINI_SIZE = PROPERTY_SIZE + "28x28"; + private static final String PIE_CHART_MINI_SIZE = PROPERTY_SIZE + "32x32"; private static final String PIE_CHART_MAXI_SIZE = PROPERTY_SIZE + PIE_CHART_MAXI_WIDTH + "x" + PIE_CHART_MAXI_HEIGHT; @Override - public String getPieChartUrl(PieChartData data, boolean thumb) { + public String getPieChartUrl(PieChartData data, int size, boolean thumb) { List<String> labelsList = new ArrayList<String>(); List<Double> valuesList = new ArrayList<Double>(); @@ -88,9 +92,17 @@ StringBuilder url = new StringBuilder(getBaseUrl()); if (thumb) { - url.append(PIE_CHART_MINI_TYPE). - append(PROPERTY_SEPARATOR).append(PIE_CHART_MINI_SIZE); + url.append(PIE_CHART_MINI_TYPE).append(PROPERTY_SEPARATOR); + // Size + if (size != -1) { + url.append(PROPERTY_SIZE). + append(size).append('x').append(size); + // Default size for little chart + } else { + url.append(PIE_CHART_MINI_SIZE); + } + // Labels only on big image } else { String labels = StringUtil.join(labelsList, @@ -112,7 +124,7 @@ @Override public String getHtmlImgTag(PieChartData data, String text, boolean thumb) { StringBuilder builder = new StringBuilder("<img src=\""). - append(getPieChartUrl(data, thumb)). + append(getPieChartUrl(data, -1, thumb)). append("\" alt=\""). append(text). append("\" height=\"").

1 0

[Suiviobsmer-commits] r628 - in trunk/wao-ui/src/main: java/fr/ifremer/wao/ui/base java/fr/ifremer/wao/ui/data java/fr/ifremer/wao/ui/pages webapp webapp/css
by fdesbois＠users.labs.libre-entreprise.org 24 Jul '10

24 Jul '10

Author: fdesbois Date: 2010-07-24 18:10:31 +0000 (Sat, 24 Jul 2010) New Revision: 628 Log: Evo #2369 : - Add filters in Cartography page (with automatic refresh) Modified: trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/base/AbstractFilteredPage.java trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/data/FiltersModel.java trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/pages/Cartography.java trunk/wao-ui/src/main/webapp/Cartography.tml trunk/wao-ui/src/main/webapp/css/cartography.css trunk/wao-ui/src/main/webapp/css/common.css 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 2010-07-24 18:09:59 UTC (rev 627) +++ trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/base/AbstractFilteredPage.java 2010-07-24 18:10:31 UTC (rev 628) @@ -35,6 +35,7 @@ import fr.ifremer.wao.service.ServiceReferential; import fr.ifremer.wao.service.ServiceSampling; import fr.ifremer.wao.service.ServiceUser; +import fr.ifremer.wao.ui.data.FiltersModel; import fr.ifremer.wao.ui.data.GenericSelectModel; import org.apache.tapestry5.OptionModel; import org.apache.tapestry5.SelectModel; @@ -82,7 +83,9 @@ * </pre> * * @author fdesbois <fdesbois at codelutin.com> + * @deprecated since 1.5.1 : too difficult to adapt on each page, use {@link FiltersModel} instead */ + at Deprecated public abstract class AbstractFilteredPage { @Inject Modified: 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 2010-07-24 18:09:59 UTC (rev 627) +++ trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/data/FiltersModel.java 2010-07-24 18:10:31 UTC (rev 628) @@ -1,15 +1,22 @@ package fr.ifremer.wao.ui.data; -import fr.ifremer.wao.bean.ContactFilter; +import fr.ifremer.wao.WaoException; +import fr.ifremer.wao.bean.SamplingFilter; import fr.ifremer.wao.bean.UserFilter; import fr.ifremer.wao.bean.WaoFilter; import fr.ifremer.wao.entity.Company; +import fr.ifremer.wao.entity.SampleRow; +import fr.ifremer.wao.service.ServiceSampling; import fr.ifremer.wao.service.ServiceUser; -import org.apache.tapestry5.annotations.Persist; +import org.apache.tapestry5.OptionModel; +import org.apache.tapestry5.SelectModel; +import org.apache.tapestry5.internal.OptionModelImpl; +import org.apache.tapestry5.internal.SelectModelImpl; import org.apache.tapestry5.ioc.services.PropertyAccess; import org.slf4j.Logger; import org.slf4j.LoggerFactory; +import java.util.ArrayList; import java.util.List; /** @@ -27,18 +34,29 @@ private ServiceUser serviceUser; + private ServiceSampling serviceSampling; + /** MODELS */ private GenericSelectModel<Company> companySelectModel; + private SelectModel programSelectModel; + + private GenericSelectModel<SampleRow> sampleRowSelectModel; + /** DATA */ private F filter; - public FiltersModel(F filter, PropertyAccess propertyAccess) { + private boolean companyActive; - this.filter = filter; + public FiltersModel(PropertyAccess propertyAccess) { this.propertyAccess = propertyAccess; } + public FiltersModel(PropertyAccess propertyAccess, F filter) { + this(propertyAccess); + this.filter = filter; + } + /** * ServiceUser is used for filters : COMPANY. * @@ -49,14 +67,30 @@ } /** + * ServiceSampling is used for filters : PROGRAM_NAME, SAMPLE_ROW. + * + * @param serviceSampling ServiceSampling to set + */ + public void setServiceSampling(ServiceSampling serviceSampling) { + this.serviceSampling = serviceSampling; + } + + public void setCompanyActive(boolean companyActive) { + this.companyActive = companyActive; + } + + public void update(F filter) { + this.filter = filter; + } + + /** * 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) + public GenericSelectModel<Company> getCompanySelectModel() throws IllegalStateException { if (serviceUser == null) { @@ -64,7 +98,7 @@ } if (companySelectModel == null) { - List<Company> companies = serviceUser.getCompanies(activeOnly); + List<Company> companies = serviceUser.getCompanies(companyActive); companySelectModel = new GenericSelectModel<Company>( companies, Company.class, @@ -85,17 +119,122 @@ * @param companyId Id of the company to set * @throws IllegalStateException if Company SelectModel is not defined */ - public void setCompany(String companyId) throws IllegalStateException { - + public void setCompanyId(String companyId) throws IllegalStateException { if (companySelectModel == null) { throw new IllegalStateException("Company selectModel not found !"); } - Company company = companySelectModel.findObject(companyId); getUserFilter().setCompany(company); } + public String getCompanyId() { + String companyId = null; + if (getUserFilter().getCompany() != null) { + companyId = getUserFilter().getCompany().getTopiaId(); + } + return companyId; + } + /** + * Update company with {@code companyId}. Will reset dependent selects + * (PROGRAM_NAME, SAMPLE_ROW). + * + * @param companyId Company id to set + */ + public void updateCompany(String companyId) { + setCompanyId(companyId); + + // Reset filter dependencies on company, on next load company filtered will be used + programSelectModel = null; + sampleRowSelectModel = null; + } + + /** + * Get select model for sampleRow program. Depends on company set in + * filter. + * + * @return the SelectModel for program names + */ + public SelectModel getProgramSelectModel() { + + if (serviceSampling == null) { + throw new IllegalStateException("ServiceSampling not exists to retrieve programs"); + } + + if (programSelectModel == null) { + List<OptionModel> options = new ArrayList<OptionModel>(); + for (String programName : serviceSampling.getPrograms(getUserFilter().getCompany())) { + options.add(new OptionModelImpl(programName, programName)); + } + programSelectModel = new SelectModelImpl(null, options); + } + return programSelectModel; + } + + /** + * Update program with {@code programName}. Will reset dependent selects + * (SAMPLE_ROW). + * + * @param programName Name of the program to set + */ + public void updateProgram(String programName) { + getSamplingFilter().setProgramName(programName); + + // Reset filter dependencies on program + sampleRowSelectModel = null; + } + + /** + * Get select model for sampleRows. Depends on filter (Sampling part only). + * The sampleRow set from filter is temporarly extracted to avoid returning + * only one element in the select. + * + * @return the GenericSelectModel<SampleRow> for sampleRows + * @throws WaoException + */ + public GenericSelectModel<SampleRow> getSampleRowSelectModel() { + + if (serviceSampling == null) { + throw new IllegalStateException("ServiceSampling not exists to retrieve sampleRows"); + } + + if (sampleRowSelectModel == null) { + // WARN : no use of sampleRow in the filter to retrieve sampleRows + SampleRow rowFiltered = getSamplingFilter().getSampleRow(); + getSamplingFilter().setSampleRow(null); + + List<SampleRow> sampleRows = serviceSampling.getSampleRowsByFilter(getSamplingFilter()); + + getSamplingFilter().setSampleRow(rowFiltered); + + sampleRowSelectModel = new GenericSelectModel<SampleRow>( + sampleRows, + SampleRow.class, + SampleRow.CODE, + SampleRow.TOPIA_ID, + propertyAccess + ); + } + return sampleRowSelectModel; + } + + public void setSampleRowId(String sampleRowId) { + if (sampleRowSelectModel == null) { + throw new IllegalStateException("SampleRow selectModel not found !"); + } + SampleRow sampleRow = sampleRowSelectModel.findObject(sampleRowId); + getSamplingFilter().setSampleRow(sampleRow); + } + + public String getSampleRowId() { + String sampleRowId = null; + if (getSamplingFilter().getSampleRow() != null) { + sampleRowId = getSamplingFilter().getSampleRow().getTopiaId(); + } + return sampleRowId; + } + + /** * Get the filter. * * @return the current filter associated to this model. @@ -105,11 +244,19 @@ } protected UserFilter getUserFilter() { - if (!UserFilter.class.isAssignableFrom(filter.getClass())) { - throw new ClassCastException("UserFilter not assignable from " + + checkAssignableFrom(UserFilter.class); + return (UserFilter)filter; + } + + protected SamplingFilter getSamplingFilter() { + checkAssignableFrom(SamplingFilter.class); + return (SamplingFilter)filter; + } + + private void checkAssignableFrom(Class filterClass) { + if (!filterClass.isAssignableFrom(filter.getClass())) { + throw new ClassCastException("SamplingFilter not assignable from " + filter.getClass().getName()); } - - return (UserFilter)filter; } } 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 18:09:59 UTC (rev 627) +++ trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/pages/Cartography.java 2010-07-24 18:10:31 UTC (rev 628) @@ -21,31 +21,30 @@ */ package fr.ifremer.wao.ui.pages; -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.ServiceSampling; 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; import org.apache.tapestry5.Link; +import org.apache.tapestry5.annotations.InjectComponent; +import org.apache.tapestry5.annotations.Log; import org.apache.tapestry5.annotations.Persist; import org.apache.tapestry5.annotations.Property; import org.apache.tapestry5.annotations.SessionState; +import org.apache.tapestry5.corelib.components.Zone; 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.nuiton.util.PeriodDates; import org.slf4j.Logger; import java.io.IOException; -import java.util.List; /** * Created: 6 juil. 2010 @@ -72,14 +71,12 @@ @Inject private ServiceUser serviceUser; + @Inject + private ServiceSampling serviceSampling; + private String url; void setupRender() { - // Init filter if needed - initFilter(); - - // Init companyId for select - companyId = getCompany() != null ? getCompany().getTopiaId() : null; } /**************************** FILTERS *************************************/ @@ -90,16 +87,6 @@ @Persist private FiltersModel<ContactFilter> filtersModel; - @Property - private String companyId; - - protected void initFilter() { - if (cartographyFilter == null) { - cartographyFilter = new ContactFilterImpl(); - } - getFiltersModel(); - } - public FiltersModel<ContactFilter> getFiltersModel() { if (filtersModel == null) { @@ -108,35 +95,72 @@ } filtersModel = new FiltersModel<ContactFilter>( - (ContactFilter)cartographyFilter, propertyAccess); + propertyAccess, new ContactFilterImpl()); filtersModel.setServiceUser(serviceUser); + filtersModel.setServiceSampling(serviceSampling); + filtersModel.setCompanyActive(true); // Initialize company if (!user.isAdmin()) { - filtersModel.getFilter().setCompany(user.getCompany()); + getFilter().setCompany(user.getCompany()); } + + // Initialize period + PeriodDates period = PeriodDates.createMonthsPeriodFromToday(-12); + getFilter().setPeriod(period); + + // push in SessionState the filter + cartographyFilter = getFilter(); } return filtersModel; } - public GenericSelectModel<Company> getCompanySelectModel() { - return getFiltersModel().getCompanySelectModel(true); + public ContactFilter getFilter() { + return getFiltersModel().getFilter(); } public Company getCompany() { - return getFiltersModel().getFilter().getCompany(); + return getFilter().getCompany(); } - void onSuccessFromFilters() { + @InjectComponent + private Zone samplingFilterZone; + + @InjectComponent + private Zone sampleRowFilterZone; + + @Property + private boolean refreshSamplingZone; + + @Property + private boolean refreshSampleRowZone; + + @Log + Zone onChangeFromCompany(String companyId) { + getFiltersModel().updateCompany(companyId); + refreshSamplingZone = true; + return samplingFilterZone; + } + + @Log + Zone onChangeFromProgramName(String programName) { + getFiltersModel().updateProgram(programName); + refreshSampleRowZone = true; + return sampleRowFilterZone; + } + + void onSelectedFromReset() { + filtersModel = null; + } + +// 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 { Modified: trunk/wao-ui/src/main/webapp/Cartography.tml =================================================================== --- trunk/wao-ui/src/main/webapp/Cartography.tml 2010-07-24 18:09:59 UTC (rev 627) +++ trunk/wao-ui/src/main/webapp/Cartography.tml 2010-07-24 18:10:31 UTC (rev 628) @@ -58,14 +58,49 @@ <h1>${pageTitle}</h1> - <t:if t:test="user.admin"> - <div id="so-cartography-filters"> - <form t:type="form" t:id="filters" action="tapestry"> - <p><label for="company">Société</label> : </p> - <p><input t:type="select" t:id="company" t:model="companySelectModel" value="companyId" onchange="this.form.submit();"/></p> - </form> - </div> - </t:if> + + <div id="so-cartography-filters"> + <form t:type="form" t:id="filters" action="tapestry"> +  + <p class="mtop5">Période : </p> + <p> + <label for="periodBegin">du </label> + <input t:type="datefield" class="width70" t:id="periodBegin" t:value="filter.period.fromDate" t:validate="required"/> + <label for="periodEnd"> au </label> + <input t:type="datefield" class="width70" t:id="periodEnd" t:value="filter.period.thruDate" t:validate="required" /> + </p> + + <t:if t:test="user.admin"> +  + <p class="mtop5"><label for="company">Société</label> : </p> + <p><input t:type="select" t:id="company" t:model="filtersModel.companySelectModel" value="filtersModel.companyId" + t:mixins="nuiton/zoneUpdater" t:event="change" t:zone="cartography-filters-sampling" /></p> + </t:if> + + <t:zone t:id="samplingFilterZone" id="cartography-filters-sampling" t:update="show"> + <t:nuiton.subForm t:visible="refreshSamplingZone"> +  + <p class="mtop5"><label for="programName">Programme</label> : </p> + <p><select t:type="select" t:id="programName" t:model="filtersModel.programSelectModel" value="filter.programName" + t:mixins="nuiton/zoneUpdater" t:event="change" t:zone="cartography-filters-sampleRow" /></p> + + <t:zone t:id="sampleRowFilterZone" id="cartography-filters-sampleRow" t:update="show"> + <t:nuiton.subForm t:visible="refreshSampleRowZone"> +  + <p class="mtop5"><label for="sampleRow">Ligne du plan</label> : </p> + <p><input t:type="select" t:id="sampleRow" t:model="filtersModel.sampleRowSelectModel" value="filtersModel.sampleRowId" /></p> + </t:nuiton.subForm> + </t:zone> + + </t:nuiton.subForm> + </t:zone> + + <p class="mtop5"> + <input t:type="submit" class="ico search" value="Search" t:title="Répartition des contacts sur la carte en fonction des filtres saisis" /> + <input t:type="submit" class="ico undo22px" t:id="reset" value="Reset" title="Remettre les filtres par défaut" /> + </p> + </form> + </div> </div> Modified: trunk/wao-ui/src/main/webapp/css/cartography.css =================================================================== --- trunk/wao-ui/src/main/webapp/css/cartography.css 2010-07-24 18:09:59 UTC (rev 627) +++ trunk/wao-ui/src/main/webapp/css/cartography.css 2010-07-24 18:10:31 UTC (rev 628) @@ -33,7 +33,7 @@ } #so-cartography-border { - width: 220px; + width: 250px; } #so-cartography-border h1 { @@ -52,6 +52,8 @@ #so-cartography-filters { color: white; + margin-left: 10px; + font-size: 0.9em; } #so-cartography-map { Modified: trunk/wao-ui/src/main/webapp/css/common.css =================================================================== --- trunk/wao-ui/src/main/webapp/css/common.css 2010-07-24 18:09:59 UTC (rev 627) +++ trunk/wao-ui/src/main/webapp/css/common.css 2010-07-24 18:10:31 UTC (rev 628) @@ -117,6 +117,10 @@ margin-bottom: 10px; } +.mtop5 { + margin-top: 5px; +} + /* Lien sur une image */ a.img { text-decoration:none; @@ -184,6 +188,8 @@ } input.undo22px { + width: 22px; + height: 22px; background: url(../img/undo-22px.png) no-repeat center center; }

1 0

[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