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

[Suiviobsmer-commits] r1245 - trunk/wao-business/src/main/java/fr/ifremer/wao/entity
by bleny＠users.labs.libre-entreprise.org 01 May '11

01 May '11

Author: bleny Date: 2011-05-01 14:51:23 +0000 (Sun, 01 May 2011) New Revision: 1245 Log: fix bugs when clearing observers when changing program of a sample row Modified: trunk/wao-business/src/main/java/fr/ifremer/wao/entity/SampleRowImpl.java Modified: trunk/wao-business/src/main/java/fr/ifremer/wao/entity/SampleRowImpl.java =================================================================== --- trunk/wao-business/src/main/java/fr/ifremer/wao/entity/SampleRowImpl.java 2011-04-29 14:29:07 UTC (rev 1244) +++ trunk/wao-business/src/main/java/fr/ifremer/wao/entity/SampleRowImpl.java 2011-05-01 14:51:23 UTC (rev 1245) @@ -469,6 +469,8 @@ super.setCompany(company); // clear observers because if the sample row is moved to another company, // we can't imagine that the observers will remains the same - clearObservers(); + if (getObsProgram() == ObsProgram.OBSDEB) { + clearObservers(); + } } }

1 0

[Suiviobsmer-commits] r1244 - in trunk/wao-business/src: main/java/fr/ifremer/wao/service test/java/fr/ifremer/wao/service
by bleny＠users.labs.libre-entreprise.org 29 Apr '11

29 Apr '11

Author: bleny Date: 2011-04-29 14:29:07 +0000 (Fri, 29 Apr 2011) New Revision: 1244 Log: add all hours of the days and all monthes of the year in obsdeb synthesis Modified: trunk/wao-business/src/main/java/fr/ifremer/wao/service/ServiceSynthesisImpl.java trunk/wao-business/src/test/java/fr/ifremer/wao/service/ObsDebTest.java trunk/wao-business/src/test/java/fr/ifremer/wao/service/ServiceSamplingImplTest.java 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 2011-04-29 13:03:57 UTC (rev 1243) +++ trunk/wao-business/src/main/java/fr/ifremer/wao/service/ServiceSynthesisImpl.java 2011-04-29 14:29:07 UTC (rev 1244) @@ -65,10 +65,12 @@ import fr.ifremer.wao.entity.IndicatorLogImpl; import fr.ifremer.wao.entity.SampleRow; import fr.ifremer.wao.entity.WaoUser; +import org.apache.commons.collections.CollectionUtils; import org.nuiton.topia.TopiaContext; import org.nuiton.topia.TopiaException; import org.nuiton.topia.framework.TopiaQuery; import org.nuiton.topia.framework.TopiaQuery.Op; +import org.nuiton.util.CollectionUtil; import org.nuiton.util.DateUtil; import org.nuiton.util.PeriodDates; import org.slf4j.Logger; @@ -79,6 +81,7 @@ import java.util.ArrayList; import java.util.Arrays; import java.util.Collection; +import java.util.Collections; import java.util.Date; import java.util.HashMap; import java.util.HashSet; @@ -1259,7 +1262,7 @@ log.debug(contacts.size() + " found for observation hours synthesis"); } SimpleDateFormat yearFormat = new SimpleDateFormat("yyyy"); - SimpleDateFormat hourFormat = new SimpleDateFormat("HH:00"); + SimpleDateFormat hourFormat = new SimpleDateFormat("HH"); Map<String, Map<String, Integer>> result = new TreeMap<String, Map<String, Integer>>(); for (Contact contact : contacts) { @@ -1267,17 +1270,22 @@ if (observationDate != null) { String year = yearFormat.format(observationDate); - String hour = hourFormat.format(observationDate); Map<String, Integer> hourToObservationCount = result.get(year); if (hourToObservationCount == null) { + // init a map of size 24, with all different hour of the day + // as key and 0 as values. hourToObservationCount = new TreeMap<String, Integer>(); + for (int hourOfTheDay = 0 ; hourOfTheDay < 24 ; ++hourOfTheDay) { + String hour = String.format("%1$02d", hourOfTheDay); + hourToObservationCount.put(hour, 0); + } result.put(year, hourToObservationCount); } + + // for the hour of this observation, add 1 to the count + String hour = hourFormat.format(observationDate); Integer count = hourToObservationCount.get(hour); - if (count == null) { - count = 0; - } count += 1; hourToObservationCount.put(hour, count); } @@ -1300,7 +1308,7 @@ protected Map<String, Map<String, Integer>> computeBoatsCounts(List<Contact> contacts) { SimpleDateFormat yearFormat = new SimpleDateFormat("yyyy"); - SimpleDateFormat monthFormat = new SimpleDateFormat("M"); + SimpleDateFormat monthFormat = new SimpleDateFormat("MM"); // For each year of the contact found, for each month of this year, the // boats observed this month of this year. We use a set, so we ensure @@ -1333,15 +1341,15 @@ Map<String, Map<String, Integer>> result = new TreeMap<String, Map<String, Integer>>(); for (Map.Entry<String, Map<String, Set<Boat>>> entry : temp.entrySet()) { String year = entry.getKey(); - for (Map.Entry<String, Set<Boat>> entry2 : entry.getValue().entrySet()) { - String month = entry2.getKey(); - Map<String, Integer> monthToCount = result.get(year); - if (monthToCount == null) { - monthToCount = new TreeMap<String, Integer>(); - result.put(year, monthToCount); - } - monthToCount.put(month, temp.get(year).get(month).size()); + Map<String, Integer> monthToCount = new TreeMap<String, Integer>(); + for (int monthNumber = 1 ; monthNumber <= 12 ; ++monthNumber) { + // format april as '04' in order to make it before december '12' and not after + String month = String.format("%1$02d", monthNumber); + Set<Boat> boats = entry.getValue().get(month); + Integer count = CollectionUtils.isEmpty(boats) ? 0 : boats.size(); + monthToCount.put(month, count); } + result.put(year, monthToCount); } return result; Modified: trunk/wao-business/src/test/java/fr/ifremer/wao/service/ObsDebTest.java =================================================================== --- trunk/wao-business/src/test/java/fr/ifremer/wao/service/ObsDebTest.java 2011-04-29 13:03:57 UTC (rev 1243) +++ trunk/wao-business/src/test/java/fr/ifremer/wao/service/ObsDebTest.java 2011-04-29 14:29:07 UTC (rev 1244) @@ -41,7 +41,6 @@ import org.apache.commons.lang.StringUtils; import org.junit.Assert; import org.junit.Before; -import org.junit.Ignore; import org.junit.Test; import org.nuiton.util.DateUtil; import org.nuiton.util.PeriodDates; @@ -428,11 +427,12 @@ SamplingFilter samplingFilter = serviceSampling.newSamplingFilter(fixtures.joshAsCoordinator()); Map<String, Map<String, Integer>> observationHours = serviceSynthesis.getObservationHours(samplingFilter); - Assert.assertEquals(2, observationHours.get("2010").get("09:00").intValue()); + Assert.assertEquals(2, observationHours.get("2010").get("09").intValue()); + Assert.assertEquals("24 values associated with '2010', one for each hour of the day", 24, observationHours.get("2010").size()); samplingFilter = serviceSampling.newSamplingFilter(fixtures.joshAsCoordinator()); Map<String, Map<String, Integer>> boatsCounts = serviceSynthesis.getDistinctBoatsCounts(samplingFilter); - // Two distinct boats observed on February 2010 - Assert.assertEquals(2, boatsCounts.get("2010").get("2").intValue()); + Assert.assertEquals("Two distinct boats observed on February 2010", 2, boatsCounts.get("2010").get("02").intValue()); + Assert.assertEquals("12 values for must be associated to '2010', one for each month", 12, boatsCounts.get("2010").size()); } } 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 2011-04-29 13:03:57 UTC (rev 1243) +++ trunk/wao-business/src/test/java/fr/ifremer/wao/service/ServiceSamplingImplTest.java 2011-04-29 14:29:07 UTC (rev 1244) @@ -139,7 +139,7 @@ months.add(month); } - SampleRow row = serviceSampling.newSampleRow(); + SampleRow row = serviceSampling.newSampleRow(getConnectedAdmin()); row.setCode("2010_03"); row.setNbObservants(3); row.setAverageTideTime(2.5);

1 0

[Suiviobsmer-commits] r1243 - in trunk: wao-business/src/main/java/fr/ifremer/wao/entity wao-business/src/main/java/fr/ifremer/wao/service wao-business/src/main/resources/i18n wao-business/src/main/xmi wao-business/src/test/java/fr/ifremer/wao/service wao-ui/src/main/java/fr/ifremer/wao/ui/pages wao-ui/src/main/webapp
by bleny＠users.labs.libre-entreprise.org 29 Apr '11

29 Apr '11

Author: bleny Date: 2011-04-29 13:03:57 +0000 (Fri, 29 Apr 2011) New Revision: 1243 Log: add 'add sample row' action in ObsDebSamplingPlan page Modified: trunk/wao-business/src/main/java/fr/ifremer/wao/entity/SampleRowImpl.java trunk/wao-business/src/main/java/fr/ifremer/wao/service/ServiceSamplingImpl.java trunk/wao-business/src/main/resources/i18n/wao-business_en_GB.properties trunk/wao-business/src/main/resources/i18n/wao-business_fr_FR.properties trunk/wao-business/src/main/xmi/wao.zargo trunk/wao-business/src/test/java/fr/ifremer/wao/service/ServiceSamplingImplTest.java trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/pages/SampleRowForm.java trunk/wao-ui/src/main/webapp/ObsDebSamplingPlan.tml Modified: trunk/wao-business/src/main/java/fr/ifremer/wao/entity/SampleRowImpl.java =================================================================== --- trunk/wao-business/src/main/java/fr/ifremer/wao/entity/SampleRowImpl.java 2011-04-28 13:31:00 UTC (rev 1242) +++ trunk/wao-business/src/main/java/fr/ifremer/wao/entity/SampleRowImpl.java 2011-04-29 13:03:57 UTC (rev 1243) @@ -463,4 +463,12 @@ public void setSamplingStrategy(SamplingStrategy samplingStrategy) { setSamplingStrategyOrdinal(samplingStrategy.ordinal()); } + + @Override + public void setCompany(Company company) { + super.setCompany(company); + // clear observers because if the sample row is moved to another company, + // we can't imagine that the observers will remains the same + clearObservers(); + } } Modified: trunk/wao-business/src/main/java/fr/ifremer/wao/service/ServiceSamplingImpl.java =================================================================== --- trunk/wao-business/src/main/java/fr/ifremer/wao/service/ServiceSamplingImpl.java 2011-04-28 13:31:00 UTC (rev 1242) +++ trunk/wao-business/src/main/java/fr/ifremer/wao/service/ServiceSamplingImpl.java 2011-04-29 13:03:57 UTC (rev 1243) @@ -788,14 +788,26 @@ } @Override - public SampleRow executeGetNewSampleRow() { - SampleRow row = new SampleRowImpl(); - row.setProfession(new ProfessionImpl()); - row.setFishingZone(new ArrayList<FishingZone>()); - //row.setProgram(new ProgramImpl()); - row.setElligibleBoat(new ArrayList<ElligibleBoat>()); - row.setSampleMonth(new ArrayList<SampleMonth>()); - return row; + public SampleRow executeNewSampleRow(ConnectedUser connectedUser) { + SampleRow newSampleRow = new SampleRowImpl(); + newSampleRow.setObsProgram(connectedUser.getProfile().getObsProgram()); + newSampleRow.setElligibleBoat(new ArrayList<ElligibleBoat>()); + + if (connectedUser.isCoordinator()) { + newSampleRow.setCompany(connectedUser.getCompany()); + } + + if (connectedUser.isObsMer()) { + newSampleRow.setObservers(new ArrayList<WaoUser>()); + } else { + newSampleRow.setProfession(new ProfessionImpl()); + newSampleRow.setFishingZone(new ArrayList<FishingZone>()); + newSampleRow.setSampleMonth(new ArrayList<SampleMonth>()); + if (newSampleRow.getObsProgram() == ObsProgram.OBSMER) { + newSampleRow.setSamplingStrategy(SamplingStrategy.SIMULTANEOUS_ALL_SPECIES); + } + } + return newSampleRow; } @Override Modified: trunk/wao-business/src/main/resources/i18n/wao-business_en_GB.properties =================================================================== --- trunk/wao-business/src/main/resources/i18n/wao-business_en_GB.properties 2011-04-28 13:31:00 UTC (rev 1242) +++ trunk/wao-business/src/main/resources/i18n/wao-business_en_GB.properties 2011-04-29 13:03:57 UTC (rev 1243) @@ -219,6 +219,7 @@ wao.error.serviceSampling.getSampleRowsForEligibility= wao.error.serviceSampling.getSampleRowsOrderedByFishingZone= wao.error.serviceSampling.importSamplingPlanCsv= +wao.error.serviceSampling.newSampleRow= wao.error.serviceSampling.newSamplingFilter= wao.error.serviceSampling.validateSampleRow= wao.error.serviceSynthesis.getAllIndicatorLogs= Modified: trunk/wao-business/src/main/resources/i18n/wao-business_fr_FR.properties =================================================================== --- trunk/wao-business/src/main/resources/i18n/wao-business_fr_FR.properties 2011-04-28 13:31:00 UTC (rev 1242) +++ trunk/wao-business/src/main/resources/i18n/wao-business_fr_FR.properties 2011-04-29 13:03:57 UTC (rev 1243) @@ -219,6 +219,7 @@ wao.error.serviceSampling.getSampleRowsForEligibility= wao.error.serviceSampling.getSampleRowsOrderedByFishingZone=Impossible de r\u00E9cup\u00E9rer la liste des lignes du plan d'\u00E9chantillonnage wao.error.serviceSampling.importSamplingPlanCsv=Erreur lors de l'import du plan +wao.error.serviceSampling.newSampleRow= wao.error.serviceSampling.newSamplingFilter= wao.error.serviceSampling.validateSampleRow= wao.error.serviceSynthesis.getAllIndicatorLogs= Modified: trunk/wao-business/src/main/xmi/wao.zargo =================================================================== (Binary files differ) Modified: trunk/wao-business/src/test/java/fr/ifremer/wao/service/ServiceSamplingImplTest.java =================================================================== --- trunk/wao-business/src/test/java/fr/ifremer/wao/service/ServiceSamplingImplTest.java 2011-04-28 13:31:00 UTC (rev 1242) +++ trunk/wao-business/src/test/java/fr/ifremer/wao/service/ServiceSamplingImplTest.java 2011-04-29 13:03:57 UTC (rev 1243) @@ -60,9 +60,7 @@ import fr.ifremer.wao.entity.TargetSpeciesDCFImpl; import fr.ifremer.wao.entity.WaoUser; import fr.ifremer.wao.io.ImportResults; -import org.apache.commons.io.IOUtils; import org.junit.Assert; -import org.junit.Ignore; import org.junit.Test; import org.nuiton.topia.TopiaContext; import org.nuiton.topia.TopiaException; @@ -141,7 +139,7 @@ months.add(month); } - SampleRow row = serviceSampling.getNewSampleRow(); + SampleRow row = serviceSampling.newSampleRow(); row.setCode("2010_03"); row.setNbObservants(3); row.setAverageTideTime(2.5); Modified: trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/pages/SampleRowForm.java =================================================================== --- trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/pages/SampleRowForm.java 2011-04-28 13:31:00 UTC (rev 1242) +++ trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/pages/SampleRowForm.java 2011-04-29 13:03:57 UTC (rev 1243) @@ -33,7 +33,6 @@ import fr.ifremer.wao.bean.SamplingStrategy; import fr.ifremer.wao.bean.UserRole; import fr.ifremer.wao.bean.ValidationResult; -import fr.ifremer.wao.bean.ValidationResultImpl; import fr.ifremer.wao.entity.Boat; import fr.ifremer.wao.entity.Company; import fr.ifremer.wao.entity.DCF5Code; @@ -57,7 +56,6 @@ import fr.ifremer.wao.ui.data.WaoPropertyChangeListener; import fr.ifremer.wao.ui.services.WaoManager; import org.apache.commons.collections.CollectionUtils; -import org.apache.commons.collections.iterators.ArrayListIterator; import org.apache.commons.lang.StringUtils; import org.apache.tapestry5.Block; import org.apache.tapestry5.ComponentResources; @@ -74,20 +72,17 @@ import org.apache.tapestry5.annotations.SessionState; import org.apache.tapestry5.beaneditor.BeanModel; import org.apache.tapestry5.corelib.components.Form; -import org.apache.tapestry5.internal.OptionGroupModelImpl; import org.apache.tapestry5.internal.OptionModelImpl; import org.apache.tapestry5.internal.SelectModelImpl; import org.apache.tapestry5.ioc.Messages; import org.apache.tapestry5.ioc.annotations.Inject; import org.apache.tapestry5.ioc.services.PropertyAccess; import org.apache.tapestry5.services.BeanModelSource; -import org.chenillekit.tapestry.core.internal.GenericSelectionModel; import org.nuiton.topia.persistence.TopiaEntity; import org.nuiton.util.PeriodDates; import org.nuiton.util.StringUtil; import org.slf4j.Logger; -import javax.transaction.NotSupportedException; import java.text.DateFormat; import java.text.SimpleDateFormat; import java.util.ArrayList; @@ -96,8 +91,6 @@ import java.util.LinkedList; import java.util.List; -import static org.nuiton.i18n.I18n.n_; - /** * SampleRowForm * @@ -559,10 +552,7 @@ /************** OBSDEB ***********/ public List<WaoUser> getObservers() { - List<WaoUser> observers = null; - if (getSampleRow().getCompany() != null) { - observers = serviceUser.getObservers(getSampleRow().getCompany(), true); - } + List<WaoUser> observers = serviceUser.getObservers(getSampleRow().getCompany(), true); return observers; } @@ -606,18 +596,14 @@ public SampleRow getSampleRow() throws WaoException { if (sampleRow == null) { - if (!StringUtils.isEmpty(sampleRowId)) { + if (StringUtils.isEmpty(sampleRowId)) { + sampleRow = serviceSampling.newSampleRow(user); + } else { sampleRow = serviceSampling.getSampleRow(sampleRowId); for (SampleMonth month : sampleRow.getSampleMonth()) { month.addPropertyChangeListener( SampleMonth.PROPERTY_EXPECTED_TIDES_VALUE, propertyChange); } - } else { - sampleRow = serviceSampling.getNewSampleRow(); - sampleRow.setObsProgram(user.getProfile().getObsProgram()); - if (sampleRow.getObsProgram() == ObsProgram.OBSMER) { - sampleRow.setSamplingStrategy(SamplingStrategy.SIMULTANEOUS_ALL_SPECIES); - } } propertyChange = new WaoPropertyChangeListener(); } Modified: trunk/wao-ui/src/main/webapp/ObsDebSamplingPlan.tml =================================================================== --- trunk/wao-ui/src/main/webapp/ObsDebSamplingPlan.tml 2011-04-28 13:31:00 UTC (rev 1242) +++ trunk/wao-ui/src/main/webapp/ObsDebSamplingPlan.tml 2011-04-29 13:03:57 UTC (rev 1243) @@ -34,6 +34,11 @@ </li> <t:unless test="connectedUser.observer"> <li> + <a t:type="pagelink" t:page="sampleRowForm" title="${message:wao.ui.samplingPlan.addSampleRow}"> + ${message:wao.ui.samplingPlan.addSampleRow} + </a> + </li> + <li> <t:actionlink t:id="showImport" t:zone="importZone"> ${message:wao.ui.misc.import} </t:actionlink>

1 0

[Suiviobsmer-commits] r1242 - trunk/wao-business/src/main/java/fr/ifremer/wao/service
by bleny＠users.labs.libre-entreprise.org 28 Apr '11

28 Apr '11

Author: bleny Date: 2011-04-28 13:31:00 +0000 (Thu, 28 Apr 2011) New Revision: 1242 Log: extract inner method in ServiceSynthesisImpl Modified: trunk/wao-business/src/main/java/fr/ifremer/wao/service/ServiceSynthesisImpl.java 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 2011-04-28 10:29:33 UTC (rev 1241) +++ trunk/wao-business/src/main/java/fr/ifremer/wao/service/ServiceSynthesisImpl.java 2011-04-28 13:31:00 UTC (rev 1242) @@ -1298,22 +1298,13 @@ return result; } - @Override - protected Map<String, Map<String, Integer>> executeGetDistinctBoatsCounts(TopiaContext transaction, SamplingFilter samplingFilter) throws Exception { - WaoQueryBuilder builder = context.newQueryBuilder(); - builder.initializeForContact(); - TopiaQuery query = builder.applySamplingFilter(samplingFilter); - ContactDAO contactDAO = WaoDAOHelper.getContactDAO(transaction); - List<Contact> contacts = contactDAO.findAllByQuery(query); - if (log.isDebugEnabled()) { - log.debug(contacts.size() + " found for distinct boats count synthesis"); - } + protected Map<String, Map<String, Integer>> computeBoatsCounts(List<Contact> contacts) { SimpleDateFormat yearFormat = new SimpleDateFormat("yyyy"); SimpleDateFormat monthFormat = new SimpleDateFormat("M"); // For each year of the contact found, for each month of this year, the // boats observed this month of this year. We use a set, so we ensure - // that the boats are distincts + // that the boats are distinct Map<String, Map<String, Set<Boat>>> temp = new HashMap<String, Map<String, Set<Boat>>>(); for (Contact contact : contacts) { @@ -1352,8 +1343,25 @@ monthToCount.put(month, temp.get(year).get(month).size()); } } + return result; + } + + @Override + protected Map<String, Map<String, Integer>> executeGetDistinctBoatsCounts(TopiaContext transaction, SamplingFilter samplingFilter) throws Exception { + WaoQueryBuilder builder = context.newQueryBuilder(); + builder.initializeForContact(); + TopiaQuery query = builder.applySamplingFilter(samplingFilter); + ContactDAO contactDAO = WaoDAOHelper.getContactDAO(transaction); + List<Contact> contacts = contactDAO.findAllByQuery(query); + if (log.isDebugEnabled()) { + log.debug(contacts.size() + " found for distinct boats count synthesis"); + } + + Map<String, Map<String, Integer>> result = computeBoatsCounts(contacts); + + if (log.isDebugEnabled()) { log.debug("boat counts synthesis returns "); for (Map.Entry<String, Map<String, Integer>> entry : result.entrySet()) { String year = entry.getKey();

1 0

[Suiviobsmer-commits] r1241 - trunk/wao-business/src/main/java/fr/ifremer/wao/io/csv2
by bleny＠users.labs.libre-entreprise.org 28 Apr '11

28 Apr '11

Author: bleny Date: 2011-04-28 10:29:33 +0000 (Thu, 28 Apr 2011) New Revision: 1241 Log: change time log log name, to prevent side effect in logging Modified: trunk/wao-business/src/main/java/fr/ifremer/wao/io/csv2/Import.java Modified: trunk/wao-business/src/main/java/fr/ifremer/wao/io/csv2/Import.java =================================================================== --- trunk/wao-business/src/main/java/fr/ifremer/wao/io/csv2/Import.java 2011-04-28 09:56:54 UTC (rev 1240) +++ trunk/wao-business/src/main/java/fr/ifremer/wao/io/csv2/Import.java 2011-04-28 10:29:33 UTC (rev 1241) @@ -47,7 +47,7 @@ private static final Logger log = LoggerFactory.getLogger(Import.class); - private static final TimeLog timeLog = new TimeLog(Import.class); + private static final TimeLog timeLog = new TimeLog(Import.class + "TimeLog"); protected ImportModel<E> model;

1 0

[Suiviobsmer-commits] r1240 - trunk/wao-business/src/main/java/fr/ifremer/wao
by bleny＠users.labs.libre-entreprise.org 28 Apr '11

28 Apr '11

Author: bleny Date: 2011-04-28 09:56:54 +0000 (Thu, 28 Apr 2011) New Revision: 1240 Log: init locale to french by default Modified: trunk/wao-business/src/main/java/fr/ifremer/wao/WaoContextImpl.java Modified: trunk/wao-business/src/main/java/fr/ifremer/wao/WaoContextImpl.java =================================================================== --- trunk/wao-business/src/main/java/fr/ifremer/wao/WaoContextImpl.java 2011-04-27 10:28:09 UTC (rev 1239) +++ trunk/wao-business/src/main/java/fr/ifremer/wao/WaoContextImpl.java 2011-04-28 09:56:54 UTC (rev 1240) @@ -247,7 +247,7 @@ log.info("Start Wao"); } DefaultI18nInitializer defaultI18nInitializer = new DefaultI18nInitializer(getI18nBundle()); - I18n.init(defaultI18nInitializer, null); + I18n.init(defaultI18nInitializer, Locale.FRENCH); setLocale(Locale.FRENCH); // Set context in WaoProperty enum to use easily method

1 0

[Suiviobsmer-commits] r1239 - trunk/wao-business/src/test/resources
by bleny＠users.labs.libre-entreprise.org 27 Apr '11

27 Apr '11

Author: bleny Date: 2011-04-27 10:28:09 +0000 (Wed, 27 Apr 2011) New Revision: 1239 Log: no tests logs in DEBUG Modified: trunk/wao-business/src/test/resources/log4j.properties Modified: trunk/wao-business/src/test/resources/log4j.properties =================================================================== --- trunk/wao-business/src/test/resources/log4j.properties 2011-04-27 10:27:28 UTC (rev 1238) +++ trunk/wao-business/src/test/resources/log4j.properties 2011-04-27 10:28:09 UTC (rev 1239) @@ -31,6 +31,6 @@ log4j.appender.A1.layout=org.apache.log4j.PatternLayout log4j.appender.A1.layout.ConversionPattern=%d %5p [%t] (%F:%L) %M - %m%n -log4j.logger.fr.ifremer.wao=DEBUG +log4j.logger.fr.ifremer.wao=INFO log4j.logger.org.nuiton.util=INFO log4j.logger.org.nuiton.util.beans.BinderProvider=ERROR

1 0

[Suiviobsmer-commits] r1238 - trunk
by bleny＠users.labs.libre-entreprise.org 27 Apr '11

27 Apr '11

Author: bleny Date: 2011-04-27 10:27:28 +0000 (Wed, 27 Apr 2011) New Revision: 1238 Log: update nuiton utils version Modified: trunk/pom.xml Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2011-04-26 14:08:44 UTC (rev 1237) +++ trunk/pom.xml 2011-04-27 10:27:28 UTC (rev 1238) @@ -331,7 +331,7 @@  <nuitonI18nVersion>2.3.2</nuitonI18nVersion> - <nuitonUtilsVersion>2.1.1</nuitonUtilsVersion> + <nuitonUtilsVersion>2.1.2</nuitonUtilsVersion> <nuitonWebVersion>1.0</nuitonWebVersion> <topiaVersion>2.5.3</topiaVersion> <eugeneVersion>2.3.3</eugeneVersion>

1 0

[Suiviobsmer-commits] r1237 - in trunk: wao-business/src/main/java/fr/ifremer/wao/bean wao-business/src/main/java/fr/ifremer/wao/service wao-business/src/main/resources/i18n wao-business/src/main/xmi wao-business/src/test/java/fr/ifremer/wao/service wao-ui/src/main/java/fr/ifremer/wao/ui/pages wao-ui/src/main/resources/i18n wao-ui/src/main/webapp
by bleny＠users.labs.libre-entreprise.org 26 Apr '11

26 Apr '11

Author: bleny Date: 2011-04-26 14:08:44 +0000 (Tue, 26 Apr 2011) New Revision: 1237 Log: add synthesis for count of distinct boats observed Modified: trunk/wao-business/src/main/java/fr/ifremer/wao/bean/SynthesisId.java trunk/wao-business/src/main/java/fr/ifremer/wao/service/ServiceSynthesisImpl.java trunk/wao-business/src/main/resources/i18n/wao-business_en_GB.properties trunk/wao-business/src/main/resources/i18n/wao-business_fr_FR.properties trunk/wao-business/src/main/xmi/wao.zargo trunk/wao-business/src/test/java/fr/ifremer/wao/service/ObsDebTest.java trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/pages/Synthesis.java trunk/wao-ui/src/main/resources/i18n/wao-ui_en_GB.properties trunk/wao-ui/src/main/resources/i18n/wao-ui_fr_FR.properties trunk/wao-ui/src/main/webapp/Synthesis.tml Modified: trunk/wao-business/src/main/java/fr/ifremer/wao/bean/SynthesisId.java =================================================================== --- trunk/wao-business/src/main/java/fr/ifremer/wao/bean/SynthesisId.java 2011-04-26 08:45:24 UTC (rev 1236) +++ trunk/wao-business/src/main/java/fr/ifremer/wao/bean/SynthesisId.java 2011-04-26 14:08:44 UTC (rev 1237) @@ -55,8 +55,11 @@ IND_DATA_RELIABILITY(n_("SynthesisId.IND_DATA_RELIABILITY")), /** ObsDeb, number of observations per hour of the day */ - OBSERVATION_HOUR(n_("SynthesisId.OBSERVATION_HOUR")); + OBSERVATION_HOUR(n_("SynthesisId.OBSERVATION_HOUR")), + /** ObsDeb, number of distinct boats observed by month */ + DISTINCT_BOATS_COUNTS(n_("SynthesisId.DISTINCT_BOATS_COUNTS")); + /** An i18n key to make enumeration printable in logs and UI. */ protected String i18nKey; 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 2011-04-26 08:45:24 UTC (rev 1236) +++ trunk/wao-business/src/main/java/fr/ifremer/wao/service/ServiceSynthesisImpl.java 2011-04-26 14:08:44 UTC (rev 1237) @@ -65,8 +65,6 @@ import fr.ifremer.wao.entity.IndicatorLogImpl; import fr.ifremer.wao.entity.SampleRow; import fr.ifremer.wao.entity.WaoUser; -import org.apache.commons.collections.OrderedMap; -import org.apache.commons.collections.map.HashedMap; import org.nuiton.topia.TopiaContext; import org.nuiton.topia.TopiaException; import org.nuiton.topia.framework.TopiaQuery; @@ -83,10 +81,12 @@ import java.util.Collection; import java.util.Date; import java.util.HashMap; +import java.util.HashSet; import java.util.LinkedHashMap; import java.util.LinkedList; import java.util.List; import java.util.Map; +import java.util.Set; import java.util.SortedMap; import java.util.TreeMap; @@ -1297,5 +1297,75 @@ return result; } + + @Override + protected Map<String, Map<String, Integer>> executeGetDistinctBoatsCounts(TopiaContext transaction, SamplingFilter samplingFilter) throws Exception { + WaoQueryBuilder builder = context.newQueryBuilder(); + builder.initializeForContact(); + TopiaQuery query = builder.applySamplingFilter(samplingFilter); + ContactDAO contactDAO = WaoDAOHelper.getContactDAO(transaction); + List<Contact> contacts = contactDAO.findAllByQuery(query); + if (log.isDebugEnabled()) { + log.debug(contacts.size() + " found for distinct boats count synthesis"); + } + SimpleDateFormat yearFormat = new SimpleDateFormat("yyyy"); + SimpleDateFormat monthFormat = new SimpleDateFormat("M"); + + // For each year of the contact found, for each month of this year, the + // boats observed this month of this year. We use a set, so we ensure + // that the boats are distincts + Map<String, Map<String, Set<Boat>>> temp = new HashMap<String, Map<String, Set<Boat>>>(); + + for (Contact contact : contacts) { + Date observationDate = contact.getObservationBeginDate(); + + if (observationDate != null) { + String year = yearFormat.format(observationDate); + String month = monthFormat.format(observationDate); + + Map<String, Set<Boat>> monthToBoats = temp.get(year); + if (monthToBoats == null) { + monthToBoats = new TreeMap<String, Set<Boat>>(); + temp.put(year, monthToBoats); + } + Set<Boat> boats = monthToBoats.get(month); + if (boats == null) { + boats = new HashSet<Boat>(); + monthToBoats.put(month, boats); + } + boats.add(contact.getBoat()); + } + } + + // Same collection as above, but the each set is replaced by its size() so we + // get for each month of each year the number of distinct boats + Map<String, Map<String, Integer>> result = new TreeMap<String, Map<String, Integer>>(); + for (Map.Entry<String, Map<String, Set<Boat>>> entry : temp.entrySet()) { + String year = entry.getKey(); + for (Map.Entry<String, Set<Boat>> entry2 : entry.getValue().entrySet()) { + String month = entry2.getKey(); + Map<String, Integer> monthToCount = result.get(year); + if (monthToCount == null) { + monthToCount = new TreeMap<String, Integer>(); + result.put(year, monthToCount); + } + monthToCount.put(month, temp.get(year).get(month).size()); + } + } + + if (log.isDebugEnabled()) { + log.debug("boat counts synthesis returns "); + for (Map.Entry<String, Map<String, Integer>> entry : result.entrySet()) { + String year = entry.getKey(); + for (Map.Entry<String, Integer> monthToBoatsCount : entry.getValue().entrySet()) { + String month = monthToBoatsCount.getKey(); + Integer count = monthToBoatsCount.getValue(); + log.debug(year + " " + month + " " + count); + } + } + } + + return result; + } } Modified: trunk/wao-business/src/main/resources/i18n/wao-business_en_GB.properties =================================================================== --- trunk/wao-business/src/main/resources/i18n/wao-business_en_GB.properties 2011-04-26 08:45:24 UTC (rev 1236) +++ trunk/wao-business/src/main/resources/i18n/wao-business_en_GB.properties 2011-04-26 14:08:44 UTC (rev 1237) @@ -30,6 +30,7 @@ SamplingStrategy.SIMULTANEOUS_G1_G2_SPECIES=Simultaneous \: G1+G2 species SamplingStrategy.SIMULTANEOUS_G1_SPECIES=Simultaneous \: G1 species SamplingStrategy.SPECIFIC_STOCK=Specific stock +SynthesisId.DISTINCT_BOATS_COUNTS=Counts of distinct boat observed SynthesisId.GRAPH_BOARDING=Boarding conformance rate on a given boat SynthesisId.GRAPH_SAMPLING=Sampling plan completion rate SynthesisId.IND_ALLEGRO_REACTIVITY=Data input delay @@ -222,6 +223,7 @@ wao.error.serviceSampling.validateSampleRow= wao.error.serviceSynthesis.getAllIndicatorLogs= wao.error.serviceSynthesis.getBoardingBoats= +wao.error.serviceSynthesis.getBoatsCount= wao.error.serviceSynthesis.getComplianceBoardingIndicator= wao.error.serviceSynthesis.getContactDataInputDateReactivity= wao.error.serviceSynthesis.getContactPieChartData= @@ -230,6 +232,7 @@ wao.error.serviceSynthesis.getContactStateStatistics= wao.error.serviceSynthesis.getDataReliability= wao.error.serviceSynthesis.getDataSampling= +wao.error.serviceSynthesis.getDistinctBoatsCounts= wao.error.serviceSynthesis.getGlobalSynthesisParameters=Unable to get data about global synthesis parameters wao.error.serviceSynthesis.getGlobalSynthesisResult= wao.error.serviceSynthesis.getNonComplianceBoardingIndicator= Modified: trunk/wao-business/src/main/resources/i18n/wao-business_fr_FR.properties =================================================================== --- trunk/wao-business/src/main/resources/i18n/wao-business_fr_FR.properties 2011-04-26 08:45:24 UTC (rev 1236) +++ trunk/wao-business/src/main/resources/i18n/wao-business_fr_FR.properties 2011-04-26 14:08:44 UTC (rev 1237) @@ -30,6 +30,7 @@ SamplingStrategy.SIMULTANEOUS_G1_G2_SPECIES=Simultan\u00E9 \: esp\u00E8ces G1+G2 SamplingStrategy.SIMULTANEOUS_G1_SPECIES=Simultan\u00E9 \: esp\u00E8ces G1 SamplingStrategy.SPECIFIC_STOCK=Stock sp\u00E9cifique +SynthesisId.DISTINCT_BOATS_COUNTS=Nombres de navires distincts observ\u00E9s SynthesisId.GRAPH_BOARDING=Taux d'embarquement sur un m\u00EAme navire conforme aux exigences SynthesisId.GRAPH_SAMPLING=Taux de r\u00E9alisation du plan d'\u00E9chantillonage SynthesisId.IND_ALLEGRO_REACTIVITY=D\u00E9lais de transmission des donn\u00E9es @@ -222,6 +223,7 @@ wao.error.serviceSampling.validateSampleRow= wao.error.serviceSynthesis.getAllIndicatorLogs= wao.error.serviceSynthesis.getBoardingBoats=Impossible de r\u00E9cup\u00E9rer les donn\u00E9es du graphique concernant les embarquements sur les navires +wao.error.serviceSynthesis.getBoatsCount= wao.error.serviceSynthesis.getComplianceBoardingIndicator= wao.error.serviceSynthesis.getContactDataInputDateReactivity=Impossible de r\u00E9cup\u00E9rer l'indicateur de r\u00E9activit\u00E9 sur les dates de saisies dans Allegro wao.error.serviceSynthesis.getContactPieChartData= @@ -230,6 +232,7 @@ wao.error.serviceSynthesis.getContactStateStatistics=Impossible de r\u00E9cup\u00E9rer les statistiques sur les \u00E9tats des contacts wao.error.serviceSynthesis.getDataReliability= wao.error.serviceSynthesis.getDataSampling=Impossible de r\u00E9cup\u00E9rer les donn\u00E9es pour le graphique dynamique des efforts de mar\u00E9es +wao.error.serviceSynthesis.getDistinctBoatsCounts= wao.error.serviceSynthesis.getGlobalSynthesisParameters=Impossible de r\u00E9cup\u00E9rer les donn\u00E9es concernant les indicateurs pour la synth\u00E8se globale wao.error.serviceSynthesis.getGlobalSynthesisResult= wao.error.serviceSynthesis.getNonComplianceBoardingIndicator=Impossible de r\u00E9cup\u00E9rer l'indicateur de non respect du nombre d'observateurs embarqu\u00E9s Modified: trunk/wao-business/src/main/xmi/wao.zargo =================================================================== (Binary files differ) Modified: trunk/wao-business/src/test/java/fr/ifremer/wao/service/ObsDebTest.java =================================================================== --- trunk/wao-business/src/test/java/fr/ifremer/wao/service/ObsDebTest.java 2011-04-26 08:45:24 UTC (rev 1236) +++ trunk/wao-business/src/test/java/fr/ifremer/wao/service/ObsDebTest.java 2011-04-26 14:08:44 UTC (rev 1237) @@ -423,10 +423,16 @@ public void coordinatorCanGetSynthesisResults() throws WaoBusinessException, IOException { observerCanCreateContact(); + // TODO 20110426 bleny consider validation company and validation program when counting + SamplingFilter samplingFilter = serviceSampling.newSamplingFilter(fixtures.joshAsCoordinator()); Map<String, Map<String, Integer>> observationHours = serviceSynthesis.getObservationHours(samplingFilter); - // TODO 20110426 bleny consider validation company and validation program when counting Assert.assertEquals(2, observationHours.get("2010").get("09:00").intValue()); + + samplingFilter = serviceSampling.newSamplingFilter(fixtures.joshAsCoordinator()); + Map<String, Map<String, Integer>> boatsCounts = serviceSynthesis.getDistinctBoatsCounts(samplingFilter); + // Two distinct boats observed on February 2010 + Assert.assertEquals(2, boatsCounts.get("2010").get("2").intValue()); } } Modified: trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/pages/Synthesis.java =================================================================== --- trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/pages/Synthesis.java 2011-04-26 08:45:24 UTC (rev 1236) +++ trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/pages/Synthesis.java 2011-04-26 14:08:44 UTC (rev 1237) @@ -515,6 +515,16 @@ return ChartUtils.createCategoryChart(title, axisName, categoryName, ChartType.BAR, result); } + /********************* INDICATOR : OBSERVATION HOUR ***********************/ + + public JFreeChart getDistinctBoatsCountsChart() throws WaoException { + Map result = serviceSynthesis.getDistinctBoatsCounts(getFilter()); + String title = messages.get(n_("wao.ui.synthesis.distinctBoatsCounts.title")); + String axisName = messages.get(n_("wao.ui.synthesis.distinctBoatsCounts.axisName")); + String categoryName = messages.get(n_("wao.ui.synthesis.distinctBoatsCounts.categoryName")); + return ChartUtils.createCategoryChart(title, axisName, categoryName, ChartType.BAR, result); + } + /********************* GLOBAL SYNTHESIS ***********************************/ @Property Modified: trunk/wao-ui/src/main/resources/i18n/wao-ui_en_GB.properties =================================================================== --- trunk/wao-ui/src/main/resources/i18n/wao-ui_en_GB.properties 2011-04-26 08:45:24 UTC (rev 1236) +++ trunk/wao-ui/src/main/resources/i18n/wao-ui_en_GB.properties 2011-04-26 14:08:44 UTC (rev 1237) @@ -1,3 +1,4 @@ +SynthesisId.DISTINCT_BOATS_COUNTS= SynthesisId.GRAPH_BOARDING= SynthesisId.GRAPH_SAMPLING= SynthesisId.IND_ALLEGRO_REACTIVITY= @@ -287,6 +288,10 @@ wao.ui.synthesis.dataReliability.description=Percentage of the number of tides providing reliable data in relation to the total number of realized tides. wao.ui.synthesis.dataReliability.title=Data reliability wao.ui.synthesis.dataSampling.title=Tides data (realized / expected) +wao.ui.synthesis.distinctBoatsCounts.axisName=Number of boats +wao.ui.synthesis.distinctBoatsCounts.categoryName=Month of the year +wao.ui.synthesis.distinctBoatsCounts.description=For each month, the number of distinct boats observed during this month +wao.ui.synthesis.distinctBoatsCounts.title=Numbers of boats observed depending on the year wao.ui.synthesis.globalSynthesis.globalResult=Result of the global synthesis wao.ui.synthesis.globalSynthesis.title=Global synthesis wao.ui.synthesis.globalSynthesis.title.estimated=Global synthesis (according to estimations) Modified: trunk/wao-ui/src/main/resources/i18n/wao-ui_fr_FR.properties =================================================================== --- trunk/wao-ui/src/main/resources/i18n/wao-ui_fr_FR.properties 2011-04-26 08:45:24 UTC (rev 1236) +++ trunk/wao-ui/src/main/resources/i18n/wao-ui_fr_FR.properties 2011-04-26 14:08:44 UTC (rev 1237) @@ -1,3 +1,4 @@ +SynthesisId.DISTINCT_BOATS_COUNTS= SynthesisId.GRAPH_BOARDING= SynthesisId.GRAPH_SAMPLING= SynthesisId.IND_ALLEGRO_REACTIVITY= @@ -286,6 +287,10 @@ wao.ui.synthesis.dataReliability.description=Pourcentage du nombre de mar\u00E9es exploitables par rapport nombre de mar\u00E9e r\u00E9alis\u00E9es. wao.ui.synthesis.dataReliability.title=Qualit\u00E9 de la donn\u00E9e wao.ui.synthesis.dataSampling.title=Donn\u00E9es des mar\u00E9es (r\u00E9alis\u00E9 / planifi\u00E9) +wao.ui.synthesis.distinctBoatsCounts.axisName=Nombre de navires distincts +wao.ui.synthesis.distinctBoatsCounts.categoryName=Mois de l'ann\u00E9e +wao.ui.synthesis.distinctBoatsCounts.description=Nombre de navires distincts observ\u00E9s selon le mois de l'ann\u00E9e +wao.ui.synthesis.distinctBoatsCounts.title=Nombre de navires observ\u00E9s wao.ui.synthesis.globalSynthesis.globalResult=Bilan de la synth\u00E8se global wao.ui.synthesis.globalSynthesis.title=Synth\u00E8se globale wao.ui.synthesis.globalSynthesis.title.estimated=Synth\u00E8se globale (selon estimations) Modified: trunk/wao-ui/src/main/webapp/Synthesis.tml =================================================================== --- trunk/wao-ui/src/main/webapp/Synthesis.tml 2011-04-26 08:45:24 UTC (rev 1236) +++ trunk/wao-ui/src/main/webapp/Synthesis.tml 2011-04-26 14:08:44 UTC (rev 1237) @@ -49,6 +49,11 @@ <img src="${asset:context:}/img/synthesis-observation-hour.png" alt="${message:SynthesisId.OBSERVATION_HOUR}" /> </a> </li> + <li> + <a t:type="actionlink" t:context="[actionSynthesisId,'DISTINCT_BOATS_COUNTS']" t:zone="so-synthesis-main" title="${message:SynthesisId.DISTINCT_BOATS_COUNTS}"> + <img src="${asset:context:}/img/synthesis-distinct-boats-counts.png" alt="${message:SynthesisId.DISTINCT_BOATS_COUNTS}" /> + </a> + </li> <p:else> <li> <a t:type="actionlink" t:context="[actionSynthesisId,'GRAPH_SAMPLING']" t:zone="so-synthesis-main" title="${message:SynthesisId.GRAPH_SAMPLING}"> @@ -370,4 +375,16 @@ <t:chart t:width="600" t:height="400" t:chart="observationHoursChart" /> </div> </t:block> +  + <t:block t:id="ind7"> + <div class="ind-table acenter" id="so-datareliability"> + <h2>${message:wao.ui.synthesis.distinctBoatsCounts.title}</h2> + <br /> + <p> + ${message:wao.ui.synthesis.distinctBoatsCounts.description} + </p> + + <t:chart t:width="600" t:height="400" t:chart="distinctBoatsCountsChart" /> + </div> + </t:block> </t:layout>

1 0

[Suiviobsmer-commits] r1236 - in trunk: wao-business/src/main/java/fr/ifremer/wao/bean wao-business/src/main/java/fr/ifremer/wao/service wao-business/src/main/resources/i18n wao-business/src/test/java/fr/ifremer/wao/service wao-business/src/test/resources wao-ui/src/main/java/fr/ifremer/wao/ui/pages wao-ui/src/main/resources/i18n wao-ui/src/main/webapp
by bleny＠users.labs.libre-entreprise.org 26 Apr '11

26 Apr '11

Author: bleny Date: 2011-04-26 08:45:24 +0000 (Tue, 26 Apr 2011) New Revision: 1236 Log: add observation hours synthesis Modified: trunk/wao-business/src/main/java/fr/ifremer/wao/bean/SynthesisId.java trunk/wao-business/src/main/java/fr/ifremer/wao/service/ServiceSynthesisImpl.java trunk/wao-business/src/main/resources/i18n/wao-business_en_GB.properties trunk/wao-business/src/main/resources/i18n/wao-business_fr_FR.properties trunk/wao-business/src/test/java/fr/ifremer/wao/service/ObsDebTest.java trunk/wao-business/src/test/resources/log4j.properties trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/pages/Synthesis.java trunk/wao-ui/src/main/resources/i18n/wao-ui_en_GB.properties trunk/wao-ui/src/main/resources/i18n/wao-ui_fr_FR.properties trunk/wao-ui/src/main/webapp/Synthesis.tml Modified: trunk/wao-business/src/main/java/fr/ifremer/wao/bean/SynthesisId.java =================================================================== --- trunk/wao-business/src/main/java/fr/ifremer/wao/bean/SynthesisId.java 2011-04-22 12:35:30 UTC (rev 1235) +++ trunk/wao-business/src/main/java/fr/ifremer/wao/bean/SynthesisId.java 2011-04-26 08:45:24 UTC (rev 1236) @@ -52,8 +52,11 @@ IND_ALLEGRO_REACTIVITY(n_("SynthesisId.IND_ALLEGRO_REACTIVITY")), /** */ - IND_DATA_RELIABILITY(n_("SynthesisId.IND_DATA_RELIABILITY")); + IND_DATA_RELIABILITY(n_("SynthesisId.IND_DATA_RELIABILITY")), + /** ObsDeb, number of observations per hour of the day */ + OBSERVATION_HOUR(n_("SynthesisId.OBSERVATION_HOUR")); + /** An i18n key to make enumeration printable in logs and UI. */ protected String i18nKey; 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 2011-04-22 12:35:30 UTC (rev 1235) +++ trunk/wao-business/src/main/java/fr/ifremer/wao/service/ServiceSynthesisImpl.java 2011-04-26 08:45:24 UTC (rev 1236) @@ -1263,30 +1263,34 @@ Map<String, Map<String, Integer>> result = new TreeMap<String, Map<String, Integer>>(); for (Contact contact : contacts) { - String year = yearFormat.format(contact.getObservationBeginDate()); - String hour = hourFormat.format(contact.getObservationBeginDate()); + Date observationDate = contact.getObservationBeginDate(); - Map<String, Integer> yearToObservationCount = result.get(hour); - if (yearToObservationCount == null) { - yearToObservationCount = new TreeMap<String, Integer>(); - result.put(hour, yearToObservationCount); + if (observationDate != null) { + String year = yearFormat.format(observationDate); + String hour = hourFormat.format(observationDate); + + Map<String, Integer> hourToObservationCount = result.get(year); + if (hourToObservationCount == null) { + hourToObservationCount = new TreeMap<String, Integer>(); + result.put(year, hourToObservationCount); + } + Integer count = hourToObservationCount.get(hour); + if (count == null) { + count = 0; + } + count += 1; + hourToObservationCount.put(hour, count); } - Integer count = yearToObservationCount.get(year); - if (count == null) { - count = 0; - } - count += 1; - yearToObservationCount.put(year, count); } if (log.isDebugEnabled()) { log.debug("observation hours synthesis returns "); for (Map.Entry<String, Map<String, Integer>> entry : result.entrySet()) { - String hour = entry.getKey(); - for (Map.Entry<String, Integer> yearToObservationCount : entry.getValue().entrySet()) { - String year = yearToObservationCount.getKey(); - Integer count = yearToObservationCount.getValue(); - log.debug(hour + " " + year + " " + count); + String year = entry.getKey(); + for (Map.Entry<String, Integer> hourToObservationCount : entry.getValue().entrySet()) { + String hour = hourToObservationCount.getKey(); + Integer count = hourToObservationCount.getValue(); + log.debug(year + " " + hour + " " + count); } } } Modified: trunk/wao-business/src/main/resources/i18n/wao-business_en_GB.properties =================================================================== --- trunk/wao-business/src/main/resources/i18n/wao-business_en_GB.properties 2011-04-22 12:35:30 UTC (rev 1235) +++ trunk/wao-business/src/main/resources/i18n/wao-business_en_GB.properties 2011-04-26 08:45:24 UTC (rev 1236) @@ -36,6 +36,7 @@ SynthesisId.IND_COMPLIANCE_BOARDING=Number of observers conformance SynthesisId.IND_CONTACT_STATE=Contacts states SynthesisId.IND_DATA_RELIABILITY=Data reliability +SynthesisId.OBSERVATION_HOUR=Hours of observation in the day UserRole.ADMIN=Administrator UserRole.COORDINATOR=Coordinator UserRole.GUEST=Guest Modified: trunk/wao-business/src/main/resources/i18n/wao-business_fr_FR.properties =================================================================== --- trunk/wao-business/src/main/resources/i18n/wao-business_fr_FR.properties 2011-04-22 12:35:30 UTC (rev 1235) +++ trunk/wao-business/src/main/resources/i18n/wao-business_fr_FR.properties 2011-04-26 08:45:24 UTC (rev 1236) @@ -36,6 +36,7 @@ SynthesisId.IND_COMPLIANCE_BOARDING=Respect du nombre d'observateurs embarqu\u00E9s SynthesisId.IND_CONTACT_STATE=\u00C9tats des contacts SynthesisId.IND_DATA_RELIABILITY=Qualit\u00E9 de la donn\u00E9e +SynthesisId.OBSERVATION_HOUR=Heures d'observation dans la journ\u00E9e UserRole.ADMIN=Administrateur UserRole.COORDINATOR=Coordinateur UserRole.GUEST=Invit\u00E9 Modified: trunk/wao-business/src/test/java/fr/ifremer/wao/service/ObsDebTest.java =================================================================== --- trunk/wao-business/src/test/java/fr/ifremer/wao/service/ObsDebTest.java 2011-04-22 12:35:30 UTC (rev 1235) +++ trunk/wao-business/src/test/java/fr/ifremer/wao/service/ObsDebTest.java 2011-04-26 08:45:24 UTC (rev 1236) @@ -426,6 +426,7 @@ SamplingFilter samplingFilter = serviceSampling.newSamplingFilter(fixtures.joshAsCoordinator()); Map<String, Map<String, Integer>> observationHours = serviceSynthesis.getObservationHours(samplingFilter); - Assert.assertEquals(2, observationHours.get("09:00").get("2010").intValue()); + // TODO 20110426 bleny consider validation company and validation program when counting + Assert.assertEquals(2, observationHours.get("2010").get("09:00").intValue()); } } Modified: trunk/wao-business/src/test/resources/log4j.properties =================================================================== --- trunk/wao-business/src/test/resources/log4j.properties 2011-04-22 12:35:30 UTC (rev 1235) +++ trunk/wao-business/src/test/resources/log4j.properties 2011-04-26 08:45:24 UTC (rev 1236) @@ -31,6 +31,6 @@ log4j.appender.A1.layout=org.apache.log4j.PatternLayout log4j.appender.A1.layout.ConversionPattern=%d %5p [%t] (%F:%L) %M - %m%n -log4j.logger.fr.ifremer.wao=INFO +log4j.logger.fr.ifremer.wao=DEBUG log4j.logger.org.nuiton.util=INFO log4j.logger.org.nuiton.util.beans.BinderProvider=ERROR Modified: trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/pages/Synthesis.java =================================================================== --- trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/pages/Synthesis.java 2011-04-22 12:35:30 UTC (rev 1235) +++ trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/pages/Synthesis.java 2011-04-26 08:45:24 UTC (rev 1236) @@ -142,8 +142,12 @@ public SynthesisId getActiveSynthesis() { if (activeSynthesis == null) { - // Initialize default synthesis by Data Sampling - activeSynthesis = SynthesisId.GRAPH_SAMPLING; + // fix the synthesis to show according to role + if (user.isObsDeb()) { + activeSynthesis = SynthesisId.OBSERVATION_HOUR; + } else { + activeSynthesis = SynthesisId.GRAPH_SAMPLING; + } } return activeSynthesis; } @@ -501,6 +505,16 @@ return getDataReliability().get(user.getCompany()); } + /********************* INDICATOR : OBSERVATION HOUR ***********************/ + + public JFreeChart getObservationHoursChart() throws WaoException { + Map result = serviceSynthesis.getObservationHours(getFilter()); + String title = messages.get(n_("wao.ui.synthesis.observationHours.title")); + String axisName = messages.get(n_("wao.ui.synthesis.observationHours.axisName")); + String categoryName = messages.get(n_("wao.ui.synthesis.observationHours.categoryName")); + return ChartUtils.createCategoryChart(title, axisName, categoryName, ChartType.BAR, result); + } + /********************* GLOBAL SYNTHESIS ***********************************/ @Property Modified: trunk/wao-ui/src/main/resources/i18n/wao-ui_en_GB.properties =================================================================== --- trunk/wao-ui/src/main/resources/i18n/wao-ui_en_GB.properties 2011-04-22 12:35:30 UTC (rev 1235) +++ trunk/wao-ui/src/main/resources/i18n/wao-ui_en_GB.properties 2011-04-26 08:45:24 UTC (rev 1236) @@ -1,3 +1,10 @@ +SynthesisId.GRAPH_BOARDING= +SynthesisId.GRAPH_SAMPLING= +SynthesisId.IND_ALLEGRO_REACTIVITY= +SynthesisId.IND_COMPLIANCE_BOARDING= +SynthesisId.IND_CONTACT_STATE= +SynthesisId.IND_DATA_RELIABILITY= +SynthesisId.OBSERVATION_HOUR= wao.ui.action.acceptContact=Validate contact wao.ui.action.add=Add wao.ui.action.addNewContactFromBoat=Create a new contact for this boat and the selected sample row (in filters) @@ -290,6 +297,10 @@ wao.ui.synthesis.log.entry.date=Modification date wao.ui.synthesis.log.entry.summary=Modifications done wao.ui.synthesis.log.title=Global synthesis parameters historic +wao.ui.synthesis.observationHours.axisName=Number of observations +wao.ui.synthesis.observationHours.categoryName=Hours of the day +wao.ui.synthesis.observationHours.description=Number of observations according to the time of the day (based on the observation begin date) +wao.ui.synthesis.observationHours.title=Observation hours wao.ui.unavailableOperation=Unavailable operation wao.ui.userList=Users list wao.ui.validLogin=Valid identifier Modified: trunk/wao-ui/src/main/resources/i18n/wao-ui_fr_FR.properties =================================================================== --- trunk/wao-ui/src/main/resources/i18n/wao-ui_fr_FR.properties 2011-04-22 12:35:30 UTC (rev 1235) +++ trunk/wao-ui/src/main/resources/i18n/wao-ui_fr_FR.properties 2011-04-26 08:45:24 UTC (rev 1236) @@ -1,3 +1,10 @@ +SynthesisId.GRAPH_BOARDING= +SynthesisId.GRAPH_SAMPLING= +SynthesisId.IND_ALLEGRO_REACTIVITY= +SynthesisId.IND_COMPLIANCE_BOARDING= +SynthesisId.IND_CONTACT_STATE= +SynthesisId.IND_DATA_RELIABILITY= +SynthesisId.OBSERVATION_HOUR= wao.ui.action.acceptContact=Valider le contact wao.ui.action.add=Ajouter wao.ui.action.addNewContactFromBoat=Cr\u00E9er un nouveau contact pour ce navire et la ligne s\u00E9lectionn\u00E9e dans les filtres @@ -289,6 +296,10 @@ wao.ui.synthesis.log.entry.date=Date de la modification wao.ui.synthesis.log.entry.summary=Modifications effectu\u00E9es wao.ui.synthesis.log.title=Historique des modifications des param\u00E8tres de la synth\u00E8se globale +wao.ui.synthesis.observationHours.axisName=Nombre d'observations +wao.ui.synthesis.observationHours.categoryName=Heures de la journ\u00E9e +wao.ui.synthesis.observationHours.description=Nombre d'observations effectu\u00E9e selon l'heure d'arriv\u00E9e +wao.ui.synthesis.observationHours.title=Distribution des p\u00E9riodes d'observation wao.ui.unavailableOperation=Op\u00E9ration non-disponible wao.ui.userList=Liste des utilisateurs wao.ui.validLogin=Identifiant valide Modified: trunk/wao-ui/src/main/webapp/Synthesis.tml =================================================================== --- trunk/wao-ui/src/main/webapp/Synthesis.tml 2011-04-22 12:35:30 UTC (rev 1235) +++ trunk/wao-ui/src/main/webapp/Synthesis.tml 2011-04-26 08:45:24 UTC (rev 1236) @@ -43,56 +43,58 @@ <div class="clearfix"> <div class="fleft" id="so-synthesis-menu"> <ul> - <li> - <a t:type="actionlink" t:context="[actionSynthesisId,'GRAPH_SAMPLING']" t:zone="so-synthesis-main"> - <img src="${asset:context:}/img/synthesis-graph-sampling.png" alt="Graphique des données des marées (réalisé / planifié)" - title="Graphique des données des marées (réalisé / planifié)" /> - </a> - </li> - <li> - <a t:type="actionlink" t:context="[actionSynthesisId,'GRAPH_BOARDING']" t:zone="so-synthesis-main"> - <img src="${asset:context:}/img/synthesis-graph-boarding.png" alt="Graphique des sollicitations des navires" - title="Graphique des sollicitations des navires" /> - </a> - </li> - <t:unless test="user.professional"> - <t:if test="showObsMer()"> - <li> - <a t:type="actionlink" t:context="[actionSynthesisId,'IND_COMPLIANCE_BOARDING']" t:zone="so-synthesis-main"> - <img src="${asset:context:}/img/synthesis-ind-non-compliance-boarding.png" alt="Indicateur de non respect du nombre d'observateurs embarqués" - title="Indicateur de non respect du nombre d'observateurs embarqués" /> - </a> - </li> - </t:if> + <t:if test="user.obsDeb"> <li> - <a t:type="actionlink" t:context="[actionSynthesisId,'IND_ALLEGRO_REACTIVITY']" t:zone="so-synthesis-main"> - <img src="${asset:context:}/img/synthesis-ind-allegro-reactivity.png" alt="Indicateur de réactivité sur la saisie des données dans Allegro" - title="Indicateur de réactivité sur la saisie des données dans Allegro" /> + <a t:type="actionlink" t:context="[actionSynthesisId,'OBSERVATION_HOUR']" t:zone="so-synthesis-main" title="${message:SynthesisId.OBSERVATION_HOUR}"> + <img src="${asset:context:}/img/synthesis-observation-hour.png" alt="${message:SynthesisId.OBSERVATION_HOUR}" /> </a> </li> - <t:if test="showObsMer()"> + <p:else> <li> - <a t:type="actionlink" t:context="[actionSynthesisId,'IND_DATA_RELIABILITY']" t:zone="so-synthesis-main"> - <img src="${asset:context:}/img/synthesis-ind-data-reliability.png" alt="Indicateur de la qualité des données" - title="Indicateur de la qualité des données" /> + <a t:type="actionlink" t:context="[actionSynthesisId,'GRAPH_SAMPLING']" t:zone="so-synthesis-main" title="${message:SynthesisId.GRAPH_SAMPLING}"> + <img src="${asset:context:}/img/synthesis-graph-sampling.png" alt="${message:SynthesisId.GRAPH_SAMPLING}" /> </a> </li> - </t:if> - <t:if test="user.indicatorsViewer"> <li> - <a t:type="actionlink" t:context="[actionShowGlobalSynthesis,'']" t:zone="so-synthesis-main"> - <img src="${asset:context:}/img/synthesis-global-synthesis.png" alt="Synthèse globale des indicateurs" - title="Synthèse globale des indicateurs" /> + <a t:type="actionlink" t:context="[actionSynthesisId,'GRAPH_BOARDING']" t:zone="so-synthesis-main" title="${message:SynthesisId.GRAPH_BOARDING}"> + <img src="${asset:context:}/img/synthesis-graph-boarding.png" alt="${message:SynthesisId.GRAPH_BOARDING}" /> </a> </li> - </t:if> - <li> - <a t:type="actionlink" t:context="[actionSynthesisId,'IND_CONTACT_STATE']" t:zone="so-synthesis-main"> - <img src="${asset:context:}/img/synthesis-ind-contact-states.png" alt="Indicateur sur les états des contacts" - title="Indicateur sur les états des contacts" /> - </a> - </li> - </t:unless> + <t:unless test="user.professional"> + <t:if test="showObsMer()"> + <li> + <a t:type="actionlink" t:context="[actionSynthesisId,'IND_COMPLIANCE_BOARDING']" t:zone="so-synthesis-main" title="${message:SynthesisId.IND_COMPLIANCE_BOARDING}"> + <img src="${asset:context:}/img/synthesis-ind-non-compliance-boarding.png" alt="${message:SynthesisId.IND_COMPLIANCE_BOARDING}" /> + </a> + </li> + </t:if> + <li> + <a t:type="actionlink" t:context="[actionSynthesisId,'IND_ALLEGRO_REACTIVITY']" t:zone="so-synthesis-main" title="${message:SynthesisId.IND_ALLEGRO_REACTIVITY}"> + <img src="${asset:context:}/img/synthesis-ind-allegro-reactivity.png" alt="${message:SynthesisId.IND_ALLEGRO_REACTIVITY}" /> + </a> + </li> + <t:if test="showObsMer()"> + <li> + <a t:type="actionlink" t:context="[actionSynthesisId,'IND_DATA_RELIABILITY']" t:zone="so-synthesis-main" title="${message:SynthesisId.IND_DATA_RELIABILITY}"> + <img src="${asset:context:}/img/synthesis-ind-data-reliability.png" alt="${message:SynthesisId.IND_DATA_RELIABILITY}" /> + </a> + </li> + </t:if> + <t:if test="user.indicatorsViewer"> + <li> + <a t:type="actionlink" t:context="[actionShowGlobalSynthesis,'']" t:zone="so-synthesis-main" title="${message:wao.ui.synthesis.globalSynthesis.title}"> + <img src="${asset:context:}/img/synthesis-global-synthesis.png" alt="${message:wao.ui.synthesis.globalSynthesis.title}" /> + </a> + </li> + </t:if> + <li> + <a t:type="actionlink" t:context="[actionSynthesisId,'IND_CONTACT_STATE']" t:zone="so-synthesis-main" title="${message:SynthesisId.IND_CONTACT_STATE}"> + <img src="${asset:context:}/img/synthesis-ind-contact-states.png" alt="${message:SynthesisId.IND_CONTACT_STATE}" /> + </a> + </li> + </t:unless> + </p:else> + </t:if> </ul> </div> <div t:type="zone" t:id="delegator" class="fleft" t:update="show" id="so-synthesis-main"> @@ -356,4 +358,16 @@ </div> </t:if> </t:block> +  + <t:block t:id="ind6"> + <div class="ind-table acenter" id="so-datareliability"> + <h2>${message:wao.ui.synthesis.observationHours.title}</h2> + <br /> + <p> + ${message:wao.ui.synthesis.observationHours.description} + </p> + + <t:chart t:width="600" t:height="400" t:chart="observationHoursChart" /> + </div> + </t:block> </t:layout>

1 0