Author: fdesbois Date: 2010-02-02 21:01:46 +0000 (Tue, 02 Feb 2010) New Revision: 316 Modified: trunk/suiviobsmer-business/src/main/java/fr/ifremer/suiviobsmer/entity/BoatImpl.java trunk/suiviobsmer-business/src/main/java/fr/ifremer/suiviobsmer/entity/BoatInfosImpl.java trunk/suiviobsmer-business/src/main/java/fr/ifremer/suiviobsmer/impl/ServiceSynthesisImpl.java trunk/suiviobsmer-business/src/main/xmi/suiviobsmer.zargo trunk/suiviobsmer-business/src/test/java/fr/ifremer/suiviobsmer/entity/BoatImplTest.java trunk/suiviobsmer-business/src/test/java/fr/ifremer/suiviobsmer/entity/BoatInfosImplTest.java trunk/suiviobsmer-ui/src/main/java/fr/ifremer/suiviobsmer/ui/data/ChartUtils.java trunk/suiviobsmer-ui/src/main/java/fr/ifremer/suiviobsmer/ui/pages/Synthesis.java trunk/suiviobsmer-ui/src/main/webapp/Boats.tml trunk/suiviobsmer-ui/src/main/webapp/Synthesis.tml Log: - Evo #2078 : add + for max value in boardingsBoat synthesis - Prepare change for get maxBoat from boardingsBoat query Modified: trunk/suiviobsmer-business/src/main/java/fr/ifremer/suiviobsmer/entity/BoatImpl.java =================================================================== --- trunk/suiviobsmer-business/src/main/java/fr/ifremer/suiviobsmer/entity/BoatImpl.java 2010-02-02 17:25:18 UTC (rev 315) +++ trunk/suiviobsmer-business/src/main/java/fr/ifremer/suiviobsmer/entity/BoatImpl.java 2010-02-02 21:01:46 UTC (rev 316) @@ -26,7 +26,9 @@ import fr.ifremer.suiviobsmer.SuiviObsmerModelDAOHelper; import fr.ifremer.suiviobsmer.bean.ContactState; import java.io.Serializable; +import java.util.Date; import org.nuiton.topia.TopiaContext; +import org.nuiton.topia.framework.TopiaQuery; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -86,5 +88,36 @@ return result; } + /** + * Calculate the number of boarding done on the boat since the + * {@code fromDate}. Only validated contacts by company will be counted. + * + * @param fromDate the date to start calcul + * @return a number of boarding done on the boat for all companies + * @throws SuiviObsmerException + * @see fr.ifremer.suiviobsmer.entity.ContactDAO#createQueryDoneContactsFromDate(Boat, Date) + */ + @Override + public int getNbBoarding(Date fromDate) throws SuiviObsmerException { + TopiaContext transaction = null; + int result = 0; + try { + transaction = SuiviObsmerContext.getTopiaRootContext().beginTransaction(); + ContactDAO dao = SuiviObsmerModelDAOHelper.getContactDAO(transaction); + + TopiaQuery<Contact> query = dao.createQueryDoneContactsFromDate(this, fromDate); + result = query.executeCount(transaction); + + transaction.closeContext(); + } catch (Exception eee) { + SuiviObsmerContext.serviceException(transaction, + "Impossible de récupérer le nombre d'embarquements réels depuis le " + + "'" + fromDate + "'", + eee); + } + return result; + } + + } Modified: trunk/suiviobsmer-business/src/main/java/fr/ifremer/suiviobsmer/entity/BoatInfosImpl.java =================================================================== --- trunk/suiviobsmer-business/src/main/java/fr/ifremer/suiviobsmer/entity/BoatInfosImpl.java 2010-02-02 17:25:18 UTC (rev 315) +++ trunk/suiviobsmer-business/src/main/java/fr/ifremer/suiviobsmer/entity/BoatInfosImpl.java 2010-02-02 21:01:46 UTC (rev 316) @@ -48,41 +48,7 @@ private static final long serialVersionUID = 1L; - protected int nbBoarding; - protected int nbBoardingForCompany; - /** - * Calculate the number of boarding done on the boat since the - * {@code fromDate}. Only validated contacts by company will be counted. - * - * @param fromDate the date to start calcul - * @return a number of boarding done on the boat for all companies - * @throws SuiviObsmerException - * @see fr.ifremer.suiviobsmer.entity.ContactDAO#createQueryDoneContactsFromDate(Boat, Date) - */ - @Override - public int getNbBoarding(Date fromDate) throws SuiviObsmerException { - TopiaContext transaction = null; - int result = 0; - try { - transaction = SuiviObsmerContext.getTopiaRootContext().beginTransaction(); - - ContactDAO dao = SuiviObsmerModelDAOHelper.getContactDAO(transaction); - - TopiaQuery<Contact> query = dao.createQueryDoneContactsFromDate(getBoat(), fromDate); - result = query.executeCount(transaction); - - transaction.closeContext(); - } catch (Exception eee) { - SuiviObsmerContext.serviceException(transaction, - "Impossible de récupérer le nombre d'embarquements réels depuis le " + - "'" + fromDate + "'", - eee); - } - return result; - } - - /** * Calculate the number of boarding done on the boat since the * {@code fromDate}. Only validated contacts by company will be counted. * Modified: trunk/suiviobsmer-business/src/main/java/fr/ifremer/suiviobsmer/impl/ServiceSynthesisImpl.java =================================================================== --- trunk/suiviobsmer-business/src/main/java/fr/ifremer/suiviobsmer/impl/ServiceSynthesisImpl.java 2010-02-02 17:25:18 UTC (rev 315) +++ trunk/suiviobsmer-business/src/main/java/fr/ifremer/suiviobsmer/impl/ServiceSynthesisImpl.java 2010-02-02 21:01:46 UTC (rev 316) @@ -25,6 +25,7 @@ import fr.ifremer.suiviobsmer.SuiviObsmerException; import fr.ifremer.suiviobsmer.SuiviObsmerModelDAOHelper; import fr.ifremer.suiviobsmer.bean.SamplingFilter; +import fr.ifremer.suiviobsmer.entity.Boat; import fr.ifremer.suiviobsmer.entity.Company; import fr.ifremer.suiviobsmer.entity.Contact; import fr.ifremer.suiviobsmer.entity.ContactDAO; @@ -33,10 +34,13 @@ import fr.ifremer.suiviobsmer.entity.SampleRow; import fr.ifremer.suiviobsmer.services.ServiceSynthesis; import java.text.DateFormat; +import java.text.NumberFormat; import java.text.SimpleDateFormat; import java.util.ArrayList; import java.util.Date; +import java.util.LinkedHashMap; import java.util.List; +import java.util.Map; import java.util.SortedMap; import java.util.TreeMap; import org.nuiton.topia.TopiaContext; @@ -128,23 +132,38 @@ return results; } + protected static final int MAX_BOARDINGS = 12; + public static final String MAX_BOARDINGS_KEY = MAX_BOARDINGS + " +"; + @Override - public SortedMap<Integer, Integer> getBoardingBoats(Company company, Date fromDate) throws SuiviObsmerException { + public Map<String, Integer> getBoardingBoats(Company company, Date fromDate) throws SuiviObsmerException { TopiaContext transaction = null; - SortedMap<Integer, Integer> results = new TreeMap<Integer, Integer>(); + //Pair<SortedMap<String, Integer>, Boat> result = null; + Map<String, Integer> map = new LinkedHashMap<String, Integer>(); try { transaction = rootContext.beginTransaction(); - for (int i = 1; i <= 12; i++) { - results.put(i, 0); + //SortedMap<String, Integer> map = new TreeMap<String, Integer>(); + +// NumberFormat numberFormat = NumberFormat.getNumberInstance(); +// numberFormat.setMinimumIntegerDigits( +// String.valueOf(MAX_BOARDINGS).length()); + + for (int i = 1; i < MAX_BOARDINGS; i++) { + map.put(String.valueOf(i), 0); } + map.put(MAX_BOARDINGS_KEY, 0); ContactDAO dao = SuiviObsmerModelDAOHelper.getContactDAO(transaction); TopiaQuery<Contact> query = dao.createQueryDoneContactsFromDate(null, fromDate); // Only for sampleRows with averageTideTime less or equals to 2 days + String countAlias = "nbElmts"; query.add(Contact.SAMPLE_ROW + "." + SampleRow.AVERAGE_TIDE_TIME, Op.LE, 2.). - addGroup(Contact.BOAT).setSelect("COUNT(*)"); + addGroup(Contact.BOAT). + setSelect("COUNT(*)"); + //setSelect("COUNT(*) AS " + countAlias + ", " + Contact.BOAT). + //addOrderDesc(countAlias); if (company != null) { query.add(Contact.SAMPLE_ROW + "." + SampleRow.COMPANY, company); @@ -154,23 +173,63 @@ log.trace("Exec query : " + query); } + //List<Object[]> nbBoardingsByBoat = (List<Object[]>)query.execute(); List<Long> nbBoardingsByBoat = (List<Long>)query.execute(); - for (Long boardings : nbBoardingsByBoat) { - int value = boardings.intValue(); - if (value >= 12) { - value = 12; + Boat maxBoat = null; + if (!nbBoardingsByBoat.isEmpty()) { + for (Long boardings : nbBoardingsByBoat) { + //int intValue = ((Long)boardings[0]).intValue(); + int intValue = boardings.intValue(); + String value = boardings.toString(); + if (intValue >= MAX_BOARDINGS) { + value = MAX_BOARDINGS_KEY; + } + Integer nbBoats = map.get(value); + map.put(value, nbBoats + 1); } - Integer nbBoats = results.get(value); - results.put(value, nbBoats + 1); + +// Object[] first = nbBoardingsByBoat.get(0); +// maxBoat = (Boat)first[1]; } + //result = new Pair<SortedMap<String, Integer>, Boat>(map, maxBoat); + + //Entry<String, Integer> plop = new SimpleEntry<String, Integer>("bol", 3); + //Pair<String, Integer> plop = new Pair<String, Integer>("bol",3); + //Pair<Boat, Integer> maxBoardingsBoat = + transaction.closeContext(); } catch (Exception eee) { SuiviObsmerContext.serviceException(transaction, "Impossible de récupérer les données pour le graphique dynamique des efforts de marées", eee); } - return results; + return map; } +// @Override +// public Boat getBoatWithMaxBoardings(Date fromDate) { +// TopiaContext transaction = null; +// Boat result = null; +// try { +// transaction = rootContext.beginTransaction(); +// +// +// BoatDAO dao = SuiviObsmerModelDAOHelper.getBoatDAO(transaction); +// TopiaQuery<Boat> query = dao.createQuery(); +// //result = query.setSelect(Contact.BOAT). +// +// ContactDAO contactDAO = SuiviObsmerModelDAOHelper.getContactDAO(transaction); +// TopiaQuery<Contact> subquery = contactDAO. +// createQueryDoneContactsFromDate(null, fromDate). +// setSelect(Contact.BOAT); +// +// transaction.closeContext(); +// } catch (Exception eee) { +// SuiviObsmerContext.serviceException(transaction, +// "Impossible de récupérer le navire ayant le plus de sollicitations", eee); +// } +// return result; +// } + } Modified: trunk/suiviobsmer-business/src/main/xmi/suiviobsmer.zargo =================================================================== (Binary files differ) Modified: trunk/suiviobsmer-business/src/test/java/fr/ifremer/suiviobsmer/entity/BoatImplTest.java =================================================================== --- trunk/suiviobsmer-business/src/test/java/fr/ifremer/suiviobsmer/entity/BoatImplTest.java 2010-02-02 17:25:18 UTC (rev 315) +++ trunk/suiviobsmer-business/src/test/java/fr/ifremer/suiviobsmer/entity/BoatImplTest.java 2010-02-02 21:01:46 UTC (rev 316) @@ -35,6 +35,7 @@ import fr.ifremer.suiviobsmer.services.ServiceSampling; import fr.ifremer.suiviobsmer.services.ServiceUser; import java.io.InputStream; +import java.util.Date; import java.util.List; import org.junit.After; import org.junit.AfterClass; @@ -43,6 +44,7 @@ import org.junit.BeforeClass; import org.junit.Test; import org.nuiton.topia.TopiaContext; +import org.nuiton.util.DateUtils; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -171,4 +173,100 @@ Assert.assertTrue(result); } + /** + * Test of getNbBoarding method, of class BoatInfosImpl. + */ + @Test + public void testGetNbBoarding() throws Exception { + log.info("getNbBoarding"); + + /** PREPARE DATA **/ + InputStream input = getClass().getResourceAsStream("/import/navires.csv"); + ServiceBoat serviceBoat = new ServiceBoatImpl(); + serviceBoat.importBoatCsv(input); + List<Boat> boats = serviceBoat.getBoatsByImmatriculations("174258"); + Boat boat = boats.get(0); + + TopiaContext transaction = SuiviObsmerContext.getTopiaRootContext().beginTransaction(); + + CompanyDAO companyDAO = SuiviObsmerModelDAOHelper.getCompanyDAO(transaction); + Company company = companyDAO.create(Company.NAME, "TARTANPION"); + Company company2 = companyDAO.create(Company.NAME, "BIS"); + + WaoUserDAO userDAO = SuiviObsmerModelDAOHelper.getWaoUserDAO(transaction); + WaoUser user = userDAO.create(WaoUser.FIRST_NAME,"Jean", WaoUser.LAST_NAME, "Michmuche", + WaoUser.COMPANY, company); + company.addWaoUser(user); + WaoUser user2 = userDAO.create(WaoUser.FIRST_NAME,"Bill", WaoUser.LAST_NAME, "Murray", + WaoUser.COMPANY, company2); + company2.addWaoUser(user2); + +// BoatInfosDAO boatInfosDAO = SuiviObsmerModelDAOHelper.getBoatInfosDAO(transaction); +// BoatInfos boatInfos = boatInfosDAO.create(BoatInfos.BOAT, boat, BoatInfos.COMPANY, company); + + transaction.commitTransaction(); + transaction.closeContext(); + + ServiceContact serviceContact = new ServiceContactImpl(); + // First contact : OK + Contact contact1 = new ContactImpl(); + contact1.setBoat(boat); + contact1.setObserver(user); + contact1.setState(ContactState.BOARDING_DONE.toString()); + Date begin = DateUtils.createDate(3, 3, 2009); + contact1.setTideBeginDate(begin); + contact1.setValidationCompany(Boolean.TRUE); + serviceContact.saveContact(contact1, false); + + /** EXEC METHOD **/ + + Date fromDate = DateUtils.createDate(1, 1, 2009); + int result = boat.getNbBoarding(fromDate); + Assert.assertEquals(1, result); + + Contact contact2 = new ContactImpl(); + // Second contact with ValidationProgram = FALSE + contact2.setBoat(boat); + contact2.setObserver(user); + contact2.setState(ContactState.BOARDING_DONE.toString()); + begin = DateUtils.createDate(3, 8, 2009); + contact2.setTideBeginDate(begin); + contact2.setValidationCompany(Boolean.TRUE); + contact2.setValidationProgram(Boolean.FALSE); + serviceContact.saveContact(contact2, false); + + result = boat.getNbBoarding(fromDate); + Assert.assertEquals(1, result); + + Contact contact3 = new ContactImpl(); + // Third contact with tideBeginDate < fromDate + contact3.setBoat(boat); + contact3.setObserver(user); + contact3.setState(ContactState.BOARDING_DONE.toString()); + begin = DateUtils.createDate(3, 8, 2008); + contact3.setTideBeginDate(begin); + contact3.setValidationCompany(Boolean.TRUE); + serviceContact.saveContact(contact3, false); + + result = boat.getNbBoarding(fromDate); + Assert.assertEquals(1, result); + + Contact contact4 = new ContactImpl(); + // Fourth contact : OK with an other company + contact4.setBoat(boat); + contact4.setObserver(user2); + contact4.setState(ContactState.BOARDING_DONE.toString()); + begin = DateUtils.createDate(3, 4, 2009); + contact4.setTideBeginDate(begin); + contact4.setValidationCompany(Boolean.TRUE); + serviceContact.saveContact(contact4, false); + + result = boat.getNbBoarding(fromDate); + Assert.assertEquals(2, result); + + // Calcul with a fromDate null + result = boat.getNbBoarding(null); + Assert.assertEquals(3, result); + } + } Modified: trunk/suiviobsmer-business/src/test/java/fr/ifremer/suiviobsmer/entity/BoatInfosImplTest.java =================================================================== --- trunk/suiviobsmer-business/src/test/java/fr/ifremer/suiviobsmer/entity/BoatInfosImplTest.java 2010-02-02 17:25:18 UTC (rev 315) +++ trunk/suiviobsmer-business/src/test/java/fr/ifremer/suiviobsmer/entity/BoatInfosImplTest.java 2010-02-02 21:01:46 UTC (rev 316) @@ -84,105 +84,9 @@ } /** - * Test of getNbBoarding method, of class BoatInfosImpl. - */ - @Test - public void testGetNbBoarding() throws Exception { - log.info("getNbBoarding"); - - /** PREPARE DATA **/ - InputStream input = getClass().getResourceAsStream("/import/navires.csv"); - ServiceBoat serviceBoat = new ServiceBoatImpl(); - serviceBoat.importBoatCsv(input); - List<Boat> boats = serviceBoat.getBoatsByImmatriculations("174258"); - Boat boat = boats.get(0); - - TopiaContext transaction = SuiviObsmerContext.getTopiaRootContext().beginTransaction(); - - CompanyDAO companyDAO = SuiviObsmerModelDAOHelper.getCompanyDAO(transaction); - Company company = companyDAO.create(Company.NAME, "TARTANPION"); - Company company2 = companyDAO.create(Company.NAME, "BIS"); - - WaoUserDAO userDAO = SuiviObsmerModelDAOHelper.getWaoUserDAO(transaction); - WaoUser user = userDAO.create(WaoUser.FIRST_NAME,"Jean", WaoUser.LAST_NAME, "Michmuche", - WaoUser.COMPANY, company); - company.addWaoUser(user); - WaoUser user2 = userDAO.create(WaoUser.FIRST_NAME,"Bill", WaoUser.LAST_NAME, "Murray", - WaoUser.COMPANY, company2); - company2.addWaoUser(user2); - - BoatInfosDAO boatInfosDAO = SuiviObsmerModelDAOHelper.getBoatInfosDAO(transaction); - BoatInfos boatInfos = boatInfosDAO.create(BoatInfos.BOAT, boat, BoatInfos.COMPANY, company); - - transaction.commitTransaction(); - transaction.closeContext(); - - ServiceContact serviceContact = new ServiceContactImpl(); - // First contact : OK - Contact contact1 = new ContactImpl(); - contact1.setBoat(boat); - contact1.setObserver(user); - contact1.setState(ContactState.BOARDING_DONE.toString()); - Date begin = DateUtils.createDate(3, 3, 2009); - contact1.setTideBeginDate(begin); - contact1.setValidationCompany(Boolean.TRUE); - serviceContact.saveContact(contact1, false); - - /** EXEC METHOD **/ - - Date fromDate = DateUtils.createDate(1, 1, 2009); - int result = boatInfos.getNbBoarding(fromDate); - Assert.assertEquals(1, result); - - Contact contact2 = new ContactImpl(); - // Second contact with ValidationProgram = FALSE - contact2.setBoat(boat); - contact2.setObserver(user); - contact2.setState(ContactState.BOARDING_DONE.toString()); - begin = DateUtils.createDate(3, 8, 2009); - contact2.setTideBeginDate(begin); - contact2.setValidationCompany(Boolean.TRUE); - contact2.setValidationProgram(Boolean.FALSE); - serviceContact.saveContact(contact2, false); - - result = boatInfos.getNbBoarding(fromDate); - Assert.assertEquals(1, result); - - Contact contact3 = new ContactImpl(); - // Third contact with tideBeginDate < fromDate - contact3.setBoat(boat); - contact3.setObserver(user); - contact3.setState(ContactState.BOARDING_DONE.toString()); - begin = DateUtils.createDate(3, 8, 2008); - contact3.setTideBeginDate(begin); - contact3.setValidationCompany(Boolean.TRUE); - serviceContact.saveContact(contact3, false); - - result = boatInfos.getNbBoarding(fromDate); - Assert.assertEquals(1, result); - - Contact contact4 = new ContactImpl(); - // Fourth contact : OK with an other company - contact4.setBoat(boat); - contact4.setObserver(user2); - contact4.setState(ContactState.BOARDING_DONE.toString()); - begin = DateUtils.createDate(3, 4, 2009); - contact4.setTideBeginDate(begin); - contact4.setValidationCompany(Boolean.TRUE); - serviceContact.saveContact(contact4, false); - - result = boatInfos.getNbBoarding(fromDate); - Assert.assertEquals(2, result); - - // Calcul with a fromDate null - result = boatInfos.getNbBoarding(null); - Assert.assertEquals(3, result); - } - - /** * Test of getNbBoardingForCompany method, of class BoatInfosImpl. */ - //@Test + @Test public void testGetNbBoardingForCompany() { System.out.println("getNbBoardingForCompany"); } Modified: trunk/suiviobsmer-ui/src/main/java/fr/ifremer/suiviobsmer/ui/data/ChartUtils.java =================================================================== --- trunk/suiviobsmer-ui/src/main/java/fr/ifremer/suiviobsmer/ui/data/ChartUtils.java 2010-02-02 17:25:18 UTC (rev 315) +++ trunk/suiviobsmer-ui/src/main/java/fr/ifremer/suiviobsmer/ui/data/ChartUtils.java 2010-02-02 21:01:46 UTC (rev 316) @@ -79,7 +79,7 @@ public static JFreeChart createCategoryChart(String title, String axisName, String categoryName, ChartType type, - Map<String, SortedMap<?, Integer>> input) { + Map<String, Map<?, Integer>> input) { DateFormat format = new SimpleDateFormat("MM/yyyy"); boolean dateType = false; @@ -87,7 +87,7 @@ // Fill data in dataset int i = 0; - for (Map.Entry<String, SortedMap<?, Integer>> map : input.entrySet()) { + for (Map.Entry<String, Map<?, Integer>> map : input.entrySet()) { for (Map.Entry<?, Integer> data : map.getValue().entrySet()) { Object dataKey = data.getKey(); String columnKey = ""; Modified: trunk/suiviobsmer-ui/src/main/java/fr/ifremer/suiviobsmer/ui/pages/Synthesis.java =================================================================== --- trunk/suiviobsmer-ui/src/main/java/fr/ifremer/suiviobsmer/ui/pages/Synthesis.java 2010-02-02 17:25:18 UTC (rev 315) +++ trunk/suiviobsmer-ui/src/main/java/fr/ifremer/suiviobsmer/ui/pages/Synthesis.java 2010-02-02 21:01:46 UTC (rev 316) @@ -24,7 +24,7 @@ import fr.ifremer.suiviobsmer.SuiviObsmerException; import fr.ifremer.suiviobsmer.bean.BoatFilter; import fr.ifremer.suiviobsmer.bean.BoatFilterImpl; -import fr.ifremer.suiviobsmer.entity.Company; +import fr.ifremer.suiviobsmer.entity.Boat; import fr.ifremer.suiviobsmer.entity.WaoUser; import fr.ifremer.suiviobsmer.services.ServiceSynthesis; import fr.ifremer.suiviobsmer.ui.base.AbstractFilteredPage; @@ -130,7 +130,7 @@ log.info("BUSINESS REQUEST [getDataSampling]"); } List<SortedMap<Date, Integer>> res = serviceSynthesis.getDataSampling(getFilter()); - Map<String, SortedMap<?, Integer>> data = new HashMap<String, SortedMap<?, Integer>>(); + Map<String, Map<?, Integer>> data = new HashMap<String, Map<?, Integer>>(); data.put("Planifié", res.get(0)); data.put("Réalisé", res.get(1)); String title = BusinessUtils.getDataSamplingTitle(getFilter()); @@ -176,19 +176,38 @@ /********************* STATIC GRAPH : BOARDINGBOAT ************************/ + @Property + private Boat maxBoat; + public JFreeChart getBoardingBoatsChart() throws SuiviObsmerException { if (log.isInfoEnabled()) { log.info("BUSINESS REQUEST [getBoardingBoats]"); } //Company company = user.getAdmin() ? null : user.getCompany(); - Date fromDate = DateUtils.createDateAfterToday(0, -12, 0); - SortedMap<Integer, Integer> res = serviceSynthesis.getBoardingBoats(getFilter().getCompany(), fromDate); - Map<String, SortedMap<?, Integer>> data = new HashMap<String, SortedMap<?, Integer>>(); - data.put("Navires", res); + //Date fromDate = DateUtils.createDateAfterToday(0, -12, 0); + Map<String, Integer> result = + serviceSynthesis.getBoardingBoats( + getFilter().getCompany(), + getFromDate()); - DateFormat dateFormat = new SimpleDateFormat("dd/MM/yyyy"); + Map<String, Map<?, Integer>> data = + new HashMap<String, Map<?, Integer>>(); + data.put("Navires", result); - String title = "Sollicitations des navires depuis le " + dateFormat.format(fromDate); - return ChartUtils.createCategoryChart(title, "Nb navires", "Nb embarquements", ChartType.BAR, data); + //maxBoat = result.getSecond(); + + String title = "Sollicitations des navires depuis le " + + getDateFormat().format(getFromDate()); + + return ChartUtils.createCategoryChart(title, "Nb navires", + "Nb embarquements", ChartType.BAR, data); } + + public Date getFromDate() { + return DateUtils.createDateAfterToday(0, -12, 0); + } + + public DateFormat getDateFormat() { + return new SimpleDateFormat("dd/MM/yyyy"); + } } Modified: trunk/suiviobsmer-ui/src/main/webapp/Boats.tml =================================================================== --- trunk/suiviobsmer-ui/src/main/webapp/Boats.tml 2010-02-02 17:25:18 UTC (rev 315) +++ trunk/suiviobsmer-ui/src/main/webapp/Boats.tml 2010-02-02 21:01:46 UTC (rev 316) @@ -244,7 +244,7 @@ </form> </p> <p> - <strong>${boatInfos.getNbBoarding(boardingFromDate)}</strong> embarquement(s) + <strong>${boatInfos.boat.getNbBoarding(boardingFromDate)}</strong> embarquement(s) dont <strong>${boatInfos.getNbBoardingForCompany(boardingFromDate)}</strong> dans votre société </p> <t:if t:test="companyBoatInfos.elligibleBoatsValues.size()"> Modified: trunk/suiviobsmer-ui/src/main/webapp/Synthesis.tml =================================================================== --- trunk/suiviobsmer-ui/src/main/webapp/Synthesis.tml 2010-02-02 17:25:18 UTC (rev 315) +++ trunk/suiviobsmer-ui/src/main/webapp/Synthesis.tml 2010-02-02 21:01:46 UTC (rev 316) @@ -108,5 +108,6 @@ </div> <div class="acenter"> <t:chart t:width="600" t:height="400" t:chart="boardingBoatsChart" /> + <!--<p>Navire le plus sollicité avec ${maxBoat.getNbBoarding(fromDate)} : ${maxBoat.name}</p>--> </div> </t:layout>