Author: bleny Date: 2014-05-13 11:05:52 +0200 (Tue, 13 May 2014) New Revision: 1931 Url: http://forge.codelutin.com/projects/wao/repository/revisions/1931 Log: refs #4490 show both contacts and observations done counts Modified: trunk/wao-services/src/main/java/fr/ifremer/wao/services/service/BoatContactsCounts.java trunk/wao-services/src/main/java/fr/ifremer/wao/services/service/ObsMerBoatsService.java trunk/wao-web/src/main/resources/i18n/wao-web_en_GB.properties trunk/wao-web/src/main/resources/i18n/wao-web_fr_FR.properties trunk/wao-web/src/main/webapp/WEB-INF/content/obsmer/boat-details.jsp Modified: trunk/wao-services/src/main/java/fr/ifremer/wao/services/service/BoatContactsCounts.java =================================================================== --- trunk/wao-services/src/main/java/fr/ifremer/wao/services/service/BoatContactsCounts.java 2014-05-13 08:47:28 UTC (rev 1930) +++ trunk/wao-services/src/main/java/fr/ifremer/wao/services/service/BoatContactsCounts.java 2014-05-13 09:05:52 UTC (rev 1931) @@ -4,18 +4,32 @@ protected long contactsCount; + protected long observationsCount; + protected long contactsCompanyCount; - public BoatContactsCounts(long contactsCount, long contactsCompanyCount) { + protected long observationsCompanyCount; + + public BoatContactsCounts(long contactsCount, long observationsCount, long contactsCompanyCount, long observationsCompanyCount) { this.contactsCount = contactsCount; + this.observationsCount = observationsCount; this.contactsCompanyCount = contactsCompanyCount; + this.observationsCompanyCount = observationsCompanyCount; } public long getContactsCount() { return contactsCount; } + public long getObservationsCount() { + return observationsCount; + } + public long getContactsCompanyCount() { return contactsCompanyCount; } + + public long getObservationsCompanyCount() { + return observationsCompanyCount; + } } Modified: trunk/wao-services/src/main/java/fr/ifremer/wao/services/service/ObsMerBoatsService.java =================================================================== --- trunk/wao-services/src/main/java/fr/ifremer/wao/services/service/ObsMerBoatsService.java 2014-05-13 08:47:28 UTC (rev 1930) +++ trunk/wao-services/src/main/java/fr/ifremer/wao/services/service/ObsMerBoatsService.java 2014-05-13 09:05:52 UTC (rev 1931) @@ -227,19 +227,29 @@ filter.getSampleRowFilter().setObsProgram(authenticatedWaoUser.getObsProgram()); filter.setPeriodFrom(since); filter.getBoatFilter().setBoatIds(ImmutableSet.of(boatId)); - filter.setContactStates(ImmutableSet.of(ContactState.OBSERVATION_DONE)); filter.setFilterOnObservationBeginDate(true); ContactTopiaDao dao = getContactDao(); + long contactsCount = dao.count(filter); filter.getSampleRowFilter().setCompanyIds(ImmutableSet.of(companyId)); long contactsCompanyCount = dao.count(filter); + filter.setContactStates(ImmutableSet.of(ContactState.OBSERVATION_DONE)); + long observationsCompanyCount = dao.count(filter); + + filter.getSampleRowFilter().setCompanyIds(null); + long observationsCount = dao.count(filter); + Preconditions.checkState(contactsCompanyCount <= contactsCount); + Preconditions.checkState(observationsCount <= contactsCount); - return new BoatContactsCounts(contactsCount, contactsCompanyCount); + Preconditions.checkState(observationsCompanyCount <= contactsCompanyCount); + Preconditions.checkState(observationsCompanyCount <= observationsCount); + return new BoatContactsCounts(contactsCount, observationsCount, contactsCompanyCount, observationsCompanyCount); + } public Collection<Boat> getBoats(BoatsFilter boatsFilter, int pageSize) { Modified: trunk/wao-web/src/main/resources/i18n/wao-web_en_GB.properties =================================================================== --- trunk/wao-web/src/main/resources/i18n/wao-web_en_GB.properties 2014-05-13 08:47:28 UTC (rev 1930) +++ trunk/wao-web/src/main/resources/i18n/wao-web_en_GB.properties 2014-05-13 09:05:52 UTC (rev 1931) @@ -92,8 +92,8 @@ wao.ui.action.zoomOnSampleRowPeriod=Use as filter dates the one of this sample row wao.ui.actions=Actions wao.ui.boatDetails.boatContactsCounts.compute=Compute -wao.ui.boatDetails.boatContactsCounts.contactsCompanyCount=Observations done with the company -wao.ui.boatDetails.boatContactsCounts.contactsCount=Observations done (all companies) +wao.ui.boatDetails.boatContactsCounts.contactsCompanyCount=Contacts with the company (observations done) +wao.ui.boatDetails.boatContactsCounts.contactsCount=Contacts with all companies (observations done) wao.ui.boatDetails.boatContactsCounts.since=Since... wao.ui.boatDetails.boatContactsCounts.title=Compute observations done wao.ui.boatList=List of %s boats Modified: trunk/wao-web/src/main/resources/i18n/wao-web_fr_FR.properties =================================================================== --- trunk/wao-web/src/main/resources/i18n/wao-web_fr_FR.properties 2014-05-13 08:47:28 UTC (rev 1930) +++ trunk/wao-web/src/main/resources/i18n/wao-web_fr_FR.properties 2014-05-13 09:05:52 UTC (rev 1931) @@ -92,8 +92,8 @@ wao.ui.action.zoomOnSampleRowPeriod=Changer les dates de la période par rapport à celles de la ligne wao.ui.actions=Actions wao.ui.boatDetails.boatContactsCounts.compute=Calculer -wao.ui.boatDetails.boatContactsCounts.contactsCompanyCount=Nombre d'observations réalisées par la société -wao.ui.boatDetails.boatContactsCounts.contactsCount=Nombre d'observations réalisées (toutes sociétés) +wao.ui.boatDetails.boatContactsCounts.contactsCompanyCount=Nombre de contacts avec la société (dont nombre d'observations réalisées) +wao.ui.boatDetails.boatContactsCounts.contactsCount=Nombre de contacts avec toutes les sociétés (dont nombre d'observations réalisées) wao.ui.boatDetails.boatContactsCounts.since=Depuis le... wao.ui.boatDetails.boatContactsCounts.title=Calculer le nombre de sollicitations du navire wao.ui.boatList=Liste de %s navires Modified: trunk/wao-web/src/main/webapp/WEB-INF/content/obsmer/boat-details.jsp =================================================================== --- trunk/wao-web/src/main/webapp/WEB-INF/content/obsmer/boat-details.jsp 2014-05-13 08:47:28 UTC (rev 1930) +++ trunk/wao-web/src/main/webapp/WEB-INF/content/obsmer/boat-details.jsp 2014-05-13 09:05:52 UTC (rev 1931) @@ -59,9 +59,11 @@ + ' </td>' + ' <td>' + data.boatContactsCounts.contactsCompanyCount + + ' (' + data.boatContactsCounts.observationsCompanyCount + ')' + ' </td>' + ' <td>' + data.boatContactsCounts.contactsCount + + ' (' + data.boatContactsCounts.observationsCount + ')' + ' </td>' + '</tr>'; $boatContactsCountsTable.find('tbody').append(tr);