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

r2049 - in trunk: wao-services/src/main/java/fr/ifremer/wao/services/service wao-web/src/main/resources/i18n wao-web/src/main/webapp/WEB-INF/content/obsmer
by bleny＠users.forge.codelutin.com 17 Jun '14

17 Jun '14

Author: bleny Date: 2014-06-17 15:01:12 +0200 (Tue, 17 Jun 2014) New Revision: 2049 Url: http://forge.codelutin.com/projects/wao/repository/revisions/2049 Log: fixes #5248 deal with empty synthesis Modified: trunk/wao-services/src/main/java/fr/ifremer/wao/services/service/ObsMerSynthesis.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/synthesis.jsp Modified: trunk/wao-services/src/main/java/fr/ifremer/wao/services/service/ObsMerSynthesis.java =================================================================== --- trunk/wao-services/src/main/java/fr/ifremer/wao/services/service/ObsMerSynthesis.java 2014-06-17 12:45:06 UTC (rev 2048) +++ trunk/wao-services/src/main/java/fr/ifremer/wao/services/service/ObsMerSynthesis.java 2014-06-17 13:01:12 UTC (rev 2049) @@ -127,4 +127,7 @@ return new LinkedHashSet<>(companySynthesesOrderedByName.values()); } + public boolean isEmpty() { + return companySyntheses.isEmpty(); + } } 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-06-17 12:45:06 UTC (rev 2048) +++ trunk/wao-web/src/main/resources/i18n/wao-web_en_GB.properties 2014-06-17 13:01:12 UTC (rev 2049) @@ -520,6 +520,7 @@ 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.empty=No synthesis data 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-web/src/main/resources/i18n/wao-web_fr_FR.properties =================================================================== --- trunk/wao-web/src/main/resources/i18n/wao-web_fr_FR.properties 2014-06-17 12:45:06 UTC (rev 2048) +++ trunk/wao-web/src/main/resources/i18n/wao-web_fr_FR.properties 2014-06-17 13:01:12 UTC (rev 2049) @@ -520,6 +520,7 @@ wao.ui.synthesis.distinctBoatsCounts.categoryName=Mois de l'année wao.ui.synthesis.distinctBoatsCounts.description=Nombre de navires distincts observés selon le mois de l'année wao.ui.synthesis.distinctBoatsCounts.title=Nombre de navires observés +wao.ui.synthesis.empty=Aucune données à afficher wao.ui.synthesis.globalSynthesis.globalResult=Bilan de la synthèse global wao.ui.synthesis.globalSynthesis.title=Synthèse globale wao.ui.synthesis.globalSynthesis.title.estimated=Synthèse globale (selon estimations) Modified: trunk/wao-web/src/main/webapp/WEB-INF/content/obsmer/synthesis.jsp =================================================================== --- trunk/wao-web/src/main/webapp/WEB-INF/content/obsmer/synthesis.jsp 2014-06-17 12:45:06 UTC (rev 2048) +++ trunk/wao-web/src/main/webapp/WEB-INF/content/obsmer/synthesis.jsp 2014-06-17 13:01:12 UTC (rev 2049) @@ -164,189 +164,196 @@ </s:form> - <article> - <h2> - <s:text name="SynthesisId.GRAPH_SAMPLING"/> - </h2> + <s:if test="synthesis.empty"> + <s:text name="wao.ui.synthesis.empty"/> + </s:if> + <s:else> - <s:property value="synthesis.expectedVsActualObservationsByMonthsChart" escapeHtml="false"/> - </article> + <article> + <h2> + <s:text name="SynthesisId.GRAPH_SAMPLING"/> + </h2> - <article> - <h2> - <s:text name="SynthesisId.GRAPH_BOARDING"/> - </h2> + <s:property value="synthesis.expectedVsActualObservationsByMonthsChart" escapeHtml="false"/> + </article> - <s:property value="synthesis.boardingBoatsChart" escapeHtml="false"/> + <article> + <h2> + <s:text name="SynthesisId.GRAPH_BOARDING"/> + </h2> - <p> - <s:text name="wao.ui.synthesis.boarding.description"/> - </p> + <s:property value="synthesis.boardingBoatsChart" escapeHtml="false"/> - <p> - <s:text name="wao.ui.synthesis.boarding.mostUsedBoat"> - <s:param value="%{synthesis.maxBoardingValue}"/> - <s:param value="%{synthesis.maxBoardingBoat.name}"/> - <s:param value="%{synthesis.maxBoardingBoat.immatriculation}"/> - </s:text> - </p> + <p> + <s:text name="wao.ui.synthesis.boarding.description"/> + </p> - <p> - <s:text name="wao.ui.synthesis.boarding.boardingCount"> - <s:param value="%{synthesis.invalidBoardingsCount}"/> - <s:param value="%{synthesis.boardingsCount}"/> - <%-- - <s:param value="%{synthesis.validBoardingsCount}"/> - --%> - </s:text> - </p> + <p> + <s:text name="wao.ui.synthesis.boarding.mostUsedBoat"> + <s:param value="%{synthesis.maxBoardingValue}"/> + <s:param value="%{synthesis.maxBoardingBoat.name}"/> + <s:param value="%{synthesis.maxBoardingBoat.immatriculation}"/> + </s:text> + </p> - </article> + <p> + <s:text name="wao.ui.synthesis.boarding.boardingCount"> + <s:param value="%{synthesis.invalidBoardingsCount}"/> + <s:param value="%{synthesis.boardingsCount}"/> + <%-- + <s:param value="%{synthesis.validBoardingsCount}"/> + --%> + </s:text> + </p> - <article> - <h2> - <s:text name="SynthesisId.IND_COMPLIANCE_BOARDING"/> - </h2> + </article> - <table class="table"> - <thead> - <tr> - <th> - <s:text name="wao.ui.entity.Company"/> - </th> - <th> - <s:text name="wao.ui.synthesis.complianceBoarding.description"/> - </th> - </tr> - </thead> - <tbody> - <s:iterator value="synthesis.companySynthesesOrderedByName"> + <article> + <h2> + <s:text name="SynthesisId.IND_COMPLIANCE_BOARDING"/> + </h2> + + <table class="table"> + <thead> <tr> - <td> - <s:property value="companyName"/> - </td> - <td> - <s:property value="complianceBoardingIndicator * 100"/> % - </td> + <th> + <s:text name="wao.ui.entity.Company"/> + </th> + <th> + <s:text name="wao.ui.synthesis.complianceBoarding.description"/> + </th> </tr> - </s:iterator> - </tbody> - </table> + </thead> + <tbody> + <s:iterator value="synthesis.companySynthesesOrderedByName"> + <tr> + <td> + <s:property value="companyName"/> + </td> + <td> + <s:property value="complianceBoardingIndicator * 100"/> % + </td> + </tr> + </s:iterator> + </tbody> + </table> - </article> + </article> - <article> - <h2> - <s:text name="SynthesisId.IND_CONTACT_STATE"/> - </h2> + <article> + <h2> + <s:text name="SynthesisId.IND_CONTACT_STATE"/> + </h2> - <table class="table"> - <thead> - <tr> - <th> - <s:text name="wao.ui.entity.Company"/> - </th> - <s:iterator value="synthesis.companySynthesesOrderedByName.iterator.next().contactsStatesStatistics.keySet()" var="contactState"> + <table class="table"> + <thead> + <tr> <th> - <s:text name="%{#contactState.i18nKey}"/> + <s:text name="wao.ui.entity.Company"/> </th> - </s:iterator> - <th> - <s:text name="wao.ui.misc.total"/> - </th> - </tr> - </thead> - <tbody> - <s:iterator value="synthesis.companySynthesesOrderedByName"> - <tr> - <td> - <s:property value="companyName"/> - </td> - <s:iterator value="contactsStatesStatistics"> + <s:iterator value="synthesis.companySynthesesOrderedByName.iterator.next().contactsStatesStatistics.keySet()" var="contactState"> + <th> + <s:text name="%{#contactState.i18nKey}"/> + </th> + </s:iterator> + <th> + <s:text name="wao.ui.misc.total"/> + </th> + </tr> + </thead> + <tbody> + <s:iterator value="synthesis.companySynthesesOrderedByName"> + <tr> <td> - <s:property value="value"/> - <s:set name="percentage" value="%{value.doubleValue() / contactsCount * 100}" /> - (<s:property value="#percentage"/> %) + <s:property value="companyName"/> </td> - </s:iterator> - <td> - <s:property value="contactsCount"/> - </td> - </tr> - </s:iterator> - </tbody> - </table> + <s:iterator value="contactsStatesStatistics"> + <td> + <s:property value="value"/> + <s:set name="percentage" value="%{value.doubleValue() / contactsCount * 100}" /> + (<s:property value="#percentage"/> %) + </td> + </s:iterator> + <td> + <s:property value="contactsCount"/> + </td> + </tr> + </s:iterator> + </tbody> + </table> - </article> + </article> - <article> - <h2> - <s:text name="SynthesisId.IND_ALLEGRO_REACTIVITY"/> - </h2> + <article> + <h2> + <s:text name="SynthesisId.IND_ALLEGRO_REACTIVITY"/> + </h2> - <table class="table"> - <thead> - <tr> - <th> - <s:text name="wao.ui.entity.Company"/> - </th> - <th> - <s:text name="wao.ui.synthesis.allegroReactivity.title"/> - </th> - </tr> - </thead> - <tbody> - <s:iterator value="synthesis.companySynthesesOrderedByName"> + <table class="table"> + <thead> <tr> - <td> - <s:property value="companyName"/> - </td> - <td<s:if test="dataInputDateReactivityHigh"> class="lower-than-expected"</s:if>> - <s:property value="dataInputDateReactivity"/> - </td> + <th> + <s:text name="wao.ui.entity.Company"/> + </th> + <th> + <s:text name="wao.ui.synthesis.allegroReactivity.title"/> + </th> </tr> - </s:iterator> - </tbody> - </table> + </thead> + <tbody> + <s:iterator value="synthesis.companySynthesesOrderedByName"> + <tr> + <td> + <s:property value="companyName"/> + </td> + <td<s:if test="dataInputDateReactivityHigh"> class="lower-than-expected"</s:if>> + <s:property value="dataInputDateReactivity"/> + </td> + </tr> + </s:iterator> + </tbody> + </table> - <p> - <s:text name="wao.ui.synthesis.allegroReactivity.description"/> - </p> + <p> + <s:text name="wao.ui.synthesis.allegroReactivity.description"/> + </p> - </article> + </article> - <article> + <article> - <h2> - <s:text name="SynthesisId.IND_DATA_RELIABILITY"/> - </h2> + <h2> + <s:text name="SynthesisId.IND_DATA_RELIABILITY"/> + </h2> - <table class="table"> - <thead> - <tr> - <th> - <s:text name="wao.ui.entity.Company"/> - </th> - <th> - <s:text name="wao.ui.synthesis.dataReliability.description"/> - </th> - </tr> - </thead> - <tbody> - <s:iterator value="synthesis.companySynthesesOrderedByName"> + <table class="table"> + <thead> <tr> - <td> - <s:property value="companyName"/> - </td> - <td> - <s:property value="dataReliabilityRatio * 100"/> % - </td> + <th> + <s:text name="wao.ui.entity.Company"/> + </th> + <th> + <s:text name="wao.ui.synthesis.dataReliability.description"/> + </th> </tr> - </s:iterator> - </tbody> - </table> + </thead> + <tbody> + <s:iterator value="synthesis.companySynthesesOrderedByName"> + <tr> + <td> + <s:property value="companyName"/> + </td> + <td> + <s:property value="dataReliabilityRatio * 100"/> % + </td> + </tr> + </s:iterator> + </tbody> + </table> - </article> + </article> + </s:else> + </html>

1 0

r2048 - trunk/wao-web/src/main/webapp/WEB-INF/content/obsmer
by bleny＠users.forge.codelutin.com 17 Jun '14

17 Jun '14

Author: bleny Date: 2014-06-17 14:45:06 +0200 (Tue, 17 Jun 2014) New Revision: 2048 Url: http://forge.codelutin.com/projects/wao/repository/revisions/2048 Log: refs #5211 remove filter for professional in synthesis Modified: trunk/wao-web/src/main/webapp/WEB-INF/content/obsmer/synthesis.jsp Modified: trunk/wao-web/src/main/webapp/WEB-INF/content/obsmer/synthesis.jsp =================================================================== --- trunk/wao-web/src/main/webapp/WEB-INF/content/obsmer/synthesis.jsp 2014-06-17 12:24:45 UTC (rev 2047) +++ trunk/wao-web/src/main/webapp/WEB-INF/content/obsmer/synthesis.jsp 2014-06-17 12:45:06 UTC (rev 2048) @@ -72,13 +72,15 @@ filterLabel: "<s:text name="wao.ui.entity.targetSpeciesDCF"/>", filterValuesField: 'sampleRowsFilterValues.targetSpeciesDcfs', }, + <s:if test="authenticatedWaoUser.authorizedToFilterOnBoats"> + { + filterName: 'boatFilter.boatIds', + filterLabel: "<s:text name="wao.ui.entity.Boat"/>", + filterValuesField: 'boatsFilterValues.boats', + minimumInputLength: 3 + }, + </s:if> { - filterName: 'boatFilter.boatIds', - filterLabel: "<s:text name="wao.ui.entity.Boat"/>", - filterValuesField: 'boatsFilterValues.boats', - minimumInputLength: 3 - }, - { filterName: 'boatFilter.districtIds', filterLabel: "<s:text name="wao.ui.field.Boat.district"/>", filterValuesField: 'boatsFilterValues.districts'

1 0

r2047 - trunk/wao-services/src/main/java/fr/ifremer/wao/services
by bleny＠users.forge.codelutin.com 17 Jun '14

17 Jun '14

Author: bleny Date: 2014-06-17 14:24:45 +0200 (Tue, 17 Jun 2014) New Revision: 2047 Url: http://forge.codelutin.com/projects/wao/repository/revisions/2047 Log: fixes #5251 Modified: trunk/wao-services/src/main/java/fr/ifremer/wao/services/AuthenticatedWaoUser.java Modified: trunk/wao-services/src/main/java/fr/ifremer/wao/services/AuthenticatedWaoUser.java =================================================================== --- trunk/wao-services/src/main/java/fr/ifremer/wao/services/AuthenticatedWaoUser.java 2014-06-17 12:10:11 UTC (rev 2046) +++ trunk/wao-services/src/main/java/fr/ifremer/wao/services/AuthenticatedWaoUser.java 2014-06-17 12:24:45 UTC (rev 2047) @@ -183,7 +183,7 @@ } public boolean isAuthorizedToImportContacts() { - return userProfile.isAdmin() && isCanWrite(); + return isAuthorizedToExportContacts() && isCanWrite(); } public boolean isAuthorizedToExportContacts() {

1 0

r2046 - trunk/wao-web/src/main/java/fr/ifremer/wao/web/action/obsmer
by bleny＠users.forge.codelutin.com 17 Jun '14

17 Jun '14

Author: bleny Date: 2014-06-17 14:10:11 +0200 (Tue, 17 Jun 2014) New Revision: 2046 Url: http://forge.codelutin.com/projects/wao/repository/revisions/2046 Log: fixes #5250 synthesis action had a side effect on contacts filter Modified: trunk/wao-web/src/main/java/fr/ifremer/wao/web/action/obsmer/SynthesisAction.java Modified: trunk/wao-web/src/main/java/fr/ifremer/wao/web/action/obsmer/SynthesisAction.java =================================================================== --- trunk/wao-web/src/main/java/fr/ifremer/wao/web/action/obsmer/SynthesisAction.java 2014-06-17 11:52:19 UTC (rev 2045) +++ trunk/wao-web/src/main/java/fr/ifremer/wao/web/action/obsmer/SynthesisAction.java 2014-06-17 12:10:11 UTC (rev 2046) @@ -28,7 +28,7 @@ @Override public void prepare() { - filter = getSession().getContactsFilter(); + filter = getSession().getSynthesisFilter(); if (filter == null) { filter = service.newFilter(getAuthenticatedWaoUser()); getSession().setSynthesisFilter(filter);

1 0

r2045 - trunk/wao-services/src/main/java/fr/ifremer/wao/services
by bleny＠users.forge.codelutin.com 17 Jun '14

17 Jun '14

Author: bleny Date: 2014-06-17 13:52:19 +0200 (Tue, 17 Jun 2014) New Revision: 2045 Url: http://forge.codelutin.com/projects/wao/repository/revisions/2045 Log: fixes #5249 allow coordinator to set coordinator Modified: trunk/wao-services/src/main/java/fr/ifremer/wao/services/AuthenticatedWaoUser.java Modified: trunk/wao-services/src/main/java/fr/ifremer/wao/services/AuthenticatedWaoUser.java =================================================================== --- trunk/wao-services/src/main/java/fr/ifremer/wao/services/AuthenticatedWaoUser.java 2014-06-17 11:41:54 UTC (rev 2044) +++ trunk/wao-services/src/main/java/fr/ifremer/wao/services/AuthenticatedWaoUser.java 2014-06-17 11:52:19 UTC (rev 2045) @@ -124,7 +124,7 @@ } public boolean isAuthorizedToSetCoordinator() { - return userProfile.isAdmin() && isCanWrite(); + return (userProfile.isAdmin() || userProfile.isCoordinator()) && isCanWrite(); } public boolean isAuthorizedToSetObserver() {

1 0

r2044 - in trunk: wao-persistence/src/main/resources/db/migration wao-services/src/main/java/fr/ifremer/wao/services/service wao-services/src/main/java/fr/ifremer/wao/services/service/administration wao-web/src/main/java/fr/ifremer/wao/web/action/obsmer wao-web/src/main/webapp/WEB-INF/content/obsmer
by bleny＠users.forge.codelutin.com 17 Jun '14

17 Jun '14

Author: bleny Date: 2014-06-17 13:41:54 +0200 (Tue, 17 Jun 2014) New Revision: 2044 Url: http://forge.codelutin.com/projects/wao/repository/revisions/2044 Log: fixes #5224 use a select to choose dcf5code Modified: trunk/wao-persistence/src/main/resources/db/migration/V4_0__clean_database.sql trunk/wao-services/src/main/java/fr/ifremer/wao/services/service/ObsMerSamplingPlanService.java trunk/wao-services/src/main/java/fr/ifremer/wao/services/service/UpdateSampleRowCommand.java trunk/wao-services/src/main/java/fr/ifremer/wao/services/service/administration/ReferentialService.java trunk/wao-web/src/main/java/fr/ifremer/wao/web/action/obsmer/EditSampleRowAction.java trunk/wao-web/src/main/webapp/WEB-INF/content/obsmer/edit-sample-row-input.jsp Modified: trunk/wao-persistence/src/main/resources/db/migration/V4_0__clean_database.sql =================================================================== --- trunk/wao-persistence/src/main/resources/db/migration/V4_0__clean_database.sql 2014-06-17 11:34:57 UTC (rev 2043) +++ trunk/wao-persistence/src/main/resources/db/migration/V4_0__clean_database.sql 2014-06-17 11:41:54 UTC (rev 2044) @@ -29,4 +29,10 @@ -- On ferme l'accès à ObsDeb -delete from userProfile where obsProgramOrdinal=2 +delete from userProfile where obsProgramOrdinal=2; + +-- Erreur de l'unicité dans le référentiel des codes DCF + +update dcf5code_sampleRow set dcf5code='fr.ifremer.wao.entities.DCF5Code#1289320029000#798260963OTB' where dcf5code='fr.ifremer.wao.entities.DCF5Code#1289320029000#798260963OTBDES'; + +delete from dcf5code where topiaId='fr.ifremer.wao.entities.DCF5Code#1289320029000#798260963OTBDES'; Modified: trunk/wao-services/src/main/java/fr/ifremer/wao/services/service/ObsMerSamplingPlanService.java =================================================================== --- trunk/wao-services/src/main/java/fr/ifremer/wao/services/service/ObsMerSamplingPlanService.java 2014-06-17 11:34:57 UTC (rev 2043) +++ trunk/wao-services/src/main/java/fr/ifremer/wao/services/service/ObsMerSamplingPlanService.java 2014-06-17 11:41:54 UTC (rev 2044) @@ -67,8 +67,6 @@ import fr.ifremer.wao.services.AuthenticatedWaoUser; import fr.ifremer.wao.services.service.administration.ReferentialService; import fr.ifremer.wao.services.service.administration.UnknownBoatImmatriculationsException; -import fr.ifremer.wao.services.service.administration.UnknownFishingGearDcfCodeException; -import fr.ifremer.wao.services.service.administration.UnknownTargetSpeciesDcfCodeException; import fr.ifremer.wao.services.service.csv.ObsMerObsVenteSamplingPlanImportExportModel; import org.apache.commons.io.IOUtils; import org.apache.commons.lang3.BooleanUtils; @@ -140,12 +138,6 @@ String elligibleBoatImmatriculations = Boats.toImmatriculations(elligibleBoats); updateSampleRowCommand.setElligibleBoatImmatriculations(elligibleBoatImmatriculations); - Set<String> dcf5Codes = new HashSet<>(); - for (DCF5Code dcf5Code : sampleRow.getdCF5Code()) { - dcf5Codes.add(dcf5Code.getCode()); - } - updateSampleRowCommand.setDcf5Codes(StringUtils.join(dcf5Codes, ' ')); - } else { SampleRow newSampleRow = new SampleRowImpl(); @@ -179,6 +171,13 @@ ); updateSampleRowCommand.setAllCompanies(allCompanies); + ImmutableMap<String, DCF5Code> allDcf5Codes = + Maps.uniqueIndex( + getReferentialService().getAllDcf5Codes(), + TopiaEntities.getTopiaIdFunction() + ); + updateSampleRowCommand.setAllDcf5Codes(allDcf5Codes); + return updateSampleRowCommand; } @@ -228,7 +227,7 @@ } public void preValidate(AuthenticatedWaoUser authenticatedWaoUser, UpdateSampleRowCommand updateSampleRowCommand) - throws UnknownBoatImmatriculationsException, UnknownFishingGearDcfCodeException, UnknownTargetSpeciesDcfCodeException, SampleRowCodeMustBeUniqueException { + throws UnknownBoatImmatriculationsException, SampleRowCodeMustBeUniqueException { SampleRow sampleRow = updateSampleRowCommand.getSampleRow(); @@ -275,11 +274,6 @@ } } - String dcf5Codes = updateSampleRowCommand.getDcf5Codes(); - - sampleRow.cleardCF5Code(); - sampleRow.addAlldCF5Code(getReferentialService().getDcf5Codes(dcf5Codes)); - SampleMonthTopiaDao sampleMonthDao = getSampleMonthDao(); Set<SampleMonth> sampleMonthsToRemove = new HashSet<>(sampleRow.getSampleMonth()); Modified: trunk/wao-services/src/main/java/fr/ifremer/wao/services/service/UpdateSampleRowCommand.java =================================================================== --- trunk/wao-services/src/main/java/fr/ifremer/wao/services/service/UpdateSampleRowCommand.java 2014-06-17 11:34:57 UTC (rev 2043) +++ trunk/wao-services/src/main/java/fr/ifremer/wao/services/service/UpdateSampleRowCommand.java 2014-06-17 11:41:54 UTC (rev 2044) @@ -26,6 +26,7 @@ import com.google.common.collect.Iterables; import com.google.common.collect.Sets; import fr.ifremer.wao.entity.Company; +import fr.ifremer.wao.entity.DCF5Code; import fr.ifremer.wao.entity.FishingZone; import fr.ifremer.wao.entity.SampleMonth; import fr.ifremer.wao.entity.SampleRow; @@ -61,10 +62,10 @@ protected ImmutableMap<String, Company> allCompanies; + protected ImmutableMap<String, DCF5Code> allDcf5Codes; + protected String elligibleBoatImmatriculations; - protected String dcf5Codes; - /** * La clé est un mois au format YYYY-MM */ @@ -107,6 +108,18 @@ sampleRow.setCompany(company); } + public Set<String> getDcf5CodesIds() { + return sampleRow.getdCF5CodeTopiaIds(); + } + + public void setDcf5CodesIds(Set<String> dcf5CodesIds) { + sampleRow.cleardCF5Code(); + for (String dcf5CodesId : dcf5CodesIds) { + DCF5Code dcf5Code = allDcf5Codes.get(dcf5CodesId); + sampleRow.adddCF5Code(dcf5Code); + } + } + public void setCode(String code) { Preconditions.checkState(isCreation(), "cannot change code for sample row " + sampleRow); sampleRow.setCode(code); @@ -181,6 +194,14 @@ this.allCompanies = allCompanies; } + public ImmutableMap<String, DCF5Code> getAllDcf5Codes() { + return allDcf5Codes; + } + + public void setAllDcf5Codes(ImmutableMap<String, DCF5Code> allDcf5Codes) { + this.allDcf5Codes = allDcf5Codes; + } + public String getElligibleBoatImmatriculations() { return elligibleBoatImmatriculations; } @@ -189,14 +210,6 @@ this.elligibleBoatImmatriculations = elligibleBoatImmatriculations; } - public String getDcf5Codes() { - return dcf5Codes; - } - - public void setDcf5Codes(String dcf5Codes) { - this.dcf5Codes = dcf5Codes; - } - public boolean isObservationAlreadyStarted() { return sampleRow.hasSampleMonthRealTideTime(); } Modified: trunk/wao-services/src/main/java/fr/ifremer/wao/services/service/administration/ReferentialService.java =================================================================== --- trunk/wao-services/src/main/java/fr/ifremer/wao/services/service/administration/ReferentialService.java 2014-06-17 11:34:57 UTC (rev 2043) +++ trunk/wao-services/src/main/java/fr/ifremer/wao/services/service/administration/ReferentialService.java 2014-06-17 11:41:54 UTC (rev 2044) @@ -80,6 +80,7 @@ import org.apache.commons.io.IOUtils; import org.apache.commons.lang3.ArrayUtils; import org.apache.commons.lang3.StringUtils; +import org.apache.commons.lang3.tuple.Pair; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.nuiton.csv.Import; @@ -741,6 +742,43 @@ log.info(nbCodes + " dcf codes in database"); } + DCF5CodeTopiaDao dcf5CodeDao = getDCF5CodeDao(); + + if (log.isInfoEnabled()) { + log.info(dcf5CodeDao.count() + " dcf5 codes in database before filling"); + } + + List<FishingGearDCF> fishingGearDCFs = fishingGearDCFDao.findAll(); + List<TargetSpeciesDCF> targetSpeciesDCFs = targetSpeciesDCFDao.findAll(); + + Set<Pair<FishingGearDCF, TargetSpeciesDCF>> pairs = new HashSet<>(); + + for (FishingGearDCF fishingGearDCF : fishingGearDCFs) { + for (TargetSpeciesDCF targetSpeciesDCF : targetSpeciesDCFs) { + pairs.add(Pair.of(fishingGearDCF, targetSpeciesDCF)); + } + pairs.add(Pair.of(fishingGearDCF, (TargetSpeciesDCF) null)); + } + + for (Pair<FishingGearDCF, TargetSpeciesDCF> pair : pairs) { + + FishingGearDCF fishingGearDCF = pair.getLeft(); + TargetSpeciesDCF targetSpeciesDCF = pair.getRight(); + + Map<String, Object> properties = new HashMap<>(); + properties.put(DCF5Code.PROPERTY_FISHING_GEAR_DCF, fishingGearDCF); + properties.put(DCF5Code.PROPERTY_TARGET_SPECIES_DCF, targetSpeciesDCF); + + DCF5Code dcf5code = dcf5CodeDao.forProperties(properties).findUniqueOrNull(); + if (dcf5code == null) { + dcf5CodeDao.create(properties); + } + } + + if (log.isInfoEnabled()) { + log.info(dcf5CodeDao.count() + " dcf5 codes in database after filling"); + } + commit(); } @@ -1085,4 +1123,11 @@ return dcf5Codes; } + public List<DCF5Code> getAllDcf5Codes() { + + List<DCF5Code> dcf5Codes = getDCF5CodeDao().findAll(); + + return dcf5Codes; + + } } Modified: trunk/wao-web/src/main/java/fr/ifremer/wao/web/action/obsmer/EditSampleRowAction.java =================================================================== --- trunk/wao-web/src/main/java/fr/ifremer/wao/web/action/obsmer/EditSampleRowAction.java 2014-06-17 11:34:57 UTC (rev 2043) +++ trunk/wao-web/src/main/java/fr/ifremer/wao/web/action/obsmer/EditSampleRowAction.java 2014-06-17 11:41:54 UTC (rev 2044) @@ -31,8 +31,6 @@ import fr.ifremer.wao.services.service.SampleRowCodeMustBeUniqueException; import fr.ifremer.wao.services.service.UpdateSampleRowCommand; import fr.ifremer.wao.services.service.administration.UnknownBoatImmatriculationsException; -import fr.ifremer.wao.services.service.administration.UnknownFishingGearDcfCodeException; -import fr.ifremer.wao.services.service.administration.UnknownTargetSpeciesDcfCodeException; import fr.ifremer.wao.web.WaoJspActionSupport; import org.apache.commons.collections4.CollectionUtils; import org.apache.commons.lang3.StringUtils; @@ -92,10 +90,6 @@ } catch (UnknownBoatImmatriculationsException e) { addFieldError("updateSampleRowCommand.elligibleBoatImmatriculations", t("wao.ui.unknownBoatImmatriculations", Joiner.on(", ").join(e.getImmatriculations()))); - } catch (UnknownFishingGearDcfCodeException e) { - addFieldError("updateSampleRowCommand.dcf5Codes", t("wao.ui.form.SampleRow.error.unknownFishingGearDcfCode", e.getCode())); - } catch (UnknownTargetSpeciesDcfCodeException e) { - addFieldError("updateSampleRowCommand.dcf5Codes", t("wao.ui.form.SampleRow.error.unknownTargetSpeciesDcfCode", e.getCode())); } catch (SampleRowCodeMustBeUniqueException e) { addFieldError("updateSampleRowCommand.code", t("wao.ui.form.SampleRow.error.codeMustBeUnique")); } Modified: trunk/wao-web/src/main/webapp/WEB-INF/content/obsmer/edit-sample-row-input.jsp =================================================================== --- trunk/wao-web/src/main/webapp/WEB-INF/content/obsmer/edit-sample-row-input.jsp 2014-06-17 11:34:57 UTC (rev 2043) +++ trunk/wao-web/src/main/webapp/WEB-INF/content/obsmer/edit-sample-row-input.jsp 2014-06-17 11:41:54 UTC (rev 2044) @@ -142,10 +142,14 @@ disabled="updateSampleRowCommand.observationAlreadyStarted" cssClass="input-xxlarge" /> - <s:textfield name="updateSampleRowCommand.dcf5Codes" - label="%{getText('wao.ui.field.SampleRow.dcf5Codes')}" - disabled="updateSampleRowCommand.observationAlreadyStarted" - cssClass="input-xxlarge" /> + <s:select name="updateSampleRowCommand.dcf5CodesIds" + label="%{getText('wao.ui.field.SampleRow.dcf5Codes')}" + disabled="updateSampleRowCommand.observationAlreadyStarted" + list="updateSampleRowCommand.allDcf5Codes" + listValue="%{value.code}" + cssClass="input-xxlarge select2" + multiple="true" + /> </fieldset>

1 0

r2043 - trunk/wao-web/src/main/webapp/WEB-INF/content/obsmer
by bleny＠users.forge.codelutin.com 17 Jun '14

17 Jun '14

Author: bleny Date: 2014-06-17 13:34:57 +0200 (Tue, 17 Jun 2014) New Revision: 2043 Url: http://forge.codelutin.com/projects/wao/repository/revisions/2043 Log: indent jsp Modified: trunk/wao-web/src/main/webapp/WEB-INF/content/obsmer/edit-sample-row-input.jsp Modified: trunk/wao-web/src/main/webapp/WEB-INF/content/obsmer/edit-sample-row-input.jsp =================================================================== --- trunk/wao-web/src/main/webapp/WEB-INF/content/obsmer/edit-sample-row-input.jsp 2014-06-17 10:40:03 UTC (rev 2042) +++ trunk/wao-web/src/main/webapp/WEB-INF/content/obsmer/edit-sample-row-input.jsp 2014-06-17 11:34:57 UTC (rev 2043) @@ -100,14 +100,15 @@ <s:form> - <h1> - <s:if test="updateSampleRowCommand.creation"> - <s:text name="wao.ui.sampleRow.creation" /> - </s:if> - <s:else> - <s:property value="t('wao.ui.sampleRow.edition', updateSampleRowCommand.sampleRow.code)" /> - </s:else> - </h1> + <h1> + <s:if test="updateSampleRowCommand.creation"> + <s:text name="wao.ui.sampleRow.creation" /> + </s:if> + <s:else> + <s:property value="t('wao.ui.sampleRow.edition', updateSampleRowCommand.sampleRow.code)" /> + </s:else> + </h1> + <s:hidden name="sampleRowId" value="%{sampleRowId}" /> <fieldset>

1 0

r2042 - in trunk: wao-persistence/src/main/java/fr/ifremer/wao/entity wao-web/src/main/java/fr/ifremer/wao/web/action/obsmer
by bleny＠users.forge.codelutin.com 17 Jun '14

17 Jun '14

Author: bleny Date: 2014-06-17 12:40:03 +0200 (Tue, 17 Jun 2014) New Revision: 2042 Url: http://forge.codelutin.com/projects/wao/repository/revisions/2042 Log: fixes #5216 sort observer names in select Modified: trunk/wao-persistence/src/main/java/fr/ifremer/wao/entity/WaoUsers.java trunk/wao-web/src/main/java/fr/ifremer/wao/web/action/obsmer/EditContactAction.java Modified: trunk/wao-persistence/src/main/java/fr/ifremer/wao/entity/WaoUsers.java =================================================================== --- trunk/wao-persistence/src/main/java/fr/ifremer/wao/entity/WaoUsers.java 2014-06-17 10:29:55 UTC (rev 2041) +++ trunk/wao-persistence/src/main/java/fr/ifremer/wao/entity/WaoUsers.java 2014-06-17 10:40:03 UTC (rev 2042) @@ -22,13 +22,24 @@ */ import com.google.common.base.Function; +import com.google.common.collect.Ordering; +import java.util.Comparator; + public class WaoUsers { public static Function<WaoUser, String> getLogin() { return new GetLogin(); } + public static Comparator<WaoUser> fullNameComparator() { + return Ordering.natural().onResultOf(getFullName()); + } + + public static Function<WaoUser, String> getFullName() { + return new GetFullName(); + } + protected static class GetLogin implements Function<WaoUser, String> { @Override @@ -36,4 +47,12 @@ return input.getLogin(); } } + + protected static class GetFullName implements Function<WaoUser, String> { + + @Override + public String apply(WaoUser input) { + return input.getFullName(); + } + } } Modified: trunk/wao-web/src/main/java/fr/ifremer/wao/web/action/obsmer/EditContactAction.java =================================================================== --- trunk/wao-web/src/main/java/fr/ifremer/wao/web/action/obsmer/EditContactAction.java 2014-06-17 10:29:55 UTC (rev 2041) +++ trunk/wao-web/src/main/java/fr/ifremer/wao/web/action/obsmer/EditContactAction.java 2014-06-17 10:40:03 UTC (rev 2042) @@ -23,6 +23,7 @@ import com.google.common.base.Optional; import com.google.common.base.Strings; +import com.google.common.collect.Sets; import com.opensymphony.xwork2.Preparable; import fr.ifremer.wao.WaoUtils; import fr.ifremer.wao.entity.ContactState; @@ -30,6 +31,7 @@ import fr.ifremer.wao.entity.DataReliability; import fr.ifremer.wao.entity.ObservedDataControl; import fr.ifremer.wao.entity.WaoUser; +import fr.ifremer.wao.entity.WaoUsers; import fr.ifremer.wao.services.AuthenticatedWaoUser; import fr.ifremer.wao.services.service.ContactDataInputDateAfterTodayException; import fr.ifremer.wao.services.service.ContactDataInputDateBeforeObservationEndDateException; @@ -64,8 +66,10 @@ import java.util.Date; import java.util.EnumMap; +import java.util.LinkedHashMap; import java.util.List; import java.util.Map; +import java.util.Set; import java.util.TreeMap; /** @@ -177,9 +181,11 @@ updateContactCommand = service.newUpdateContactCommand(getAuthenticatedWaoUser(), optionalContactId); - observers = new TreeMap<>(); List<WaoUser> waoUsers = waoUsersService.getActiveWaoUsers(Optional.of(updateContactCommand.getContact().getSampleRow().getCompany().getTopiaId())); - for (WaoUser waoUser : waoUsers) { + Set<WaoUser> sortedWaoUsers = Sets.newTreeSet(WaoUsers.fullNameComparator()); + sortedWaoUsers.addAll(waoUsers); + observers = new LinkedHashMap<>(); + for (WaoUser waoUser : sortedWaoUsers) { observers.put(waoUser.getTopiaId(), waoUser.getFullName()); } contactStates = new EnumMap<>(ContactState.class);

1 0

r2041 - in trunk: wao-services/src/main/java/fr/ifremer/wao/services wao-web/src/main/webapp/WEB-INF/content/obsmer
by bleny＠users.forge.codelutin.com 17 Jun '14

17 Jun '14

Author: bleny Date: 2014-06-17 12:29:55 +0200 (Tue, 17 Jun 2014) New Revision: 2041 Url: http://forge.codelutin.com/projects/wao/repository/revisions/2041 Log: fixes #5247 hide contacts comment for professional Modified: trunk/wao-services/src/main/java/fr/ifremer/wao/services/AuthenticatedWaoUser.java trunk/wao-web/src/main/webapp/WEB-INF/content/obsmer/contacts.jsp Modified: trunk/wao-services/src/main/java/fr/ifremer/wao/services/AuthenticatedWaoUser.java =================================================================== --- trunk/wao-services/src/main/java/fr/ifremer/wao/services/AuthenticatedWaoUser.java 2014-06-17 10:26:54 UTC (rev 2040) +++ trunk/wao-services/src/main/java/fr/ifremer/wao/services/AuthenticatedWaoUser.java 2014-06-17 10:29:55 UTC (rev 2041) @@ -189,6 +189,9 @@ public boolean isAuthorizedToExportContacts() { return userProfile.isAdmin() || userProfile.isCoordinatorOrObserver(); } + public boolean isAuthorizedToViewContactsComments() { + return ! userProfile.isProfessional(); + } public boolean isAuthorizedToEditSamplingPlan() { return userProfile.isAdmin() && isCanWrite(); Modified: trunk/wao-web/src/main/webapp/WEB-INF/content/obsmer/contacts.jsp =================================================================== --- trunk/wao-web/src/main/webapp/WEB-INF/content/obsmer/contacts.jsp 2014-06-17 10:26:54 UTC (rev 2040) +++ trunk/wao-web/src/main/webapp/WEB-INF/content/obsmer/contacts.jsp 2014-06-17 10:29:55 UTC (rev 2041) @@ -325,9 +325,11 @@ <th><s:text name="wao.ui.field.Contact.observedDataControl"/></th> <th class="date"><s:text name="wao.ui.field.Contact.restitution"/></th> <th><s:text name="wao.ui.contacts.observations"/></th> - <th><s:text name="wao.ui.field.Contact.comment"/></th> - <th><s:text name="wao.ui.field.Contact.commentCompany"/></th> - <th><s:text name="wao.ui.field.Contact.commentAdmin"/></th> + <s:if test="authenticatedWaoUser.authorizedToViewContactsComments"> + <th><s:text name="wao.ui.field.Contact.comment"/></th> + <th><s:text name="wao.ui.field.Contact.commentCompany"/></th> + <th><s:text name="wao.ui.field.Contact.commentAdmin"/></th> + </s:if> <th><s:text name="wao.ui.field.Contact.dataReliability"/></th> <th><s:text name="wao.ui.contacts.validation"/></th> <th><s:text name="wao.ui.actions"/></th> @@ -451,21 +453,23 @@ </span> </s:if> </td> - <td class="align-center"> - <s:if test=" ! comment.empty"> - <i title="<s:property value="comment" escapeHtml="false"/>" class="fa fa-comment"></i> - </s:if> - </td> - <td class="align-center"> - <s:if test=" ! commentCoordinator.empty"> - <i title="<s:property value="commentCoordinator" escapeHtml="false"/>" class="fa fa-comment"></i> - </s:if> - </td> - <td class="align-center"> - <s:if test=" ! commentAdmin.empty"> - <i title="<s:property value="commentAdmin" escapeHtml="false"/>" class="fa fa-comment"></i> - </s:if> - </td> + <s:if test="authenticatedWaoUser.authorizedToViewContactsComments"> + <td class="align-center"> + <s:if test=" ! comment.empty"> + <i title="<s:property value="comment" escapeHtml="false"/>" class="fa fa-comment"></i> + </s:if> + </td> + <td class="align-center"> + <s:if test=" ! commentCoordinator.empty"> + <i title="<s:property value="commentCoordinator" escapeHtml="false"/>" class="fa fa-comment"></i> + </s:if> + </td> + <td class="align-center"> + <s:if test=" ! commentAdmin.empty"> + <i title="<s:property value="commentAdmin" escapeHtml="false"/>" class="fa fa-comment"></i> + </s:if> + </td> + </s:if> <td> <s:if test="isBoardingDone(#contact)"> <s:if test="validationCompany">

1 0

r2040 - in trunk: wao-services/src/main/java/fr/ifremer/wao/services wao-web/src/main/webapp/WEB-INF/content/obsmer
by bleny＠users.forge.codelutin.com 17 Jun '14

17 Jun '14

Author: bleny Date: 2014-06-17 12:26:54 +0200 (Tue, 17 Jun 2014) New Revision: 2040 Url: http://forge.codelutin.com/projects/wao/repository/revisions/2040 Log: refs #5247 professional should not be able to export contacts Modified: trunk/wao-services/src/main/java/fr/ifremer/wao/services/AuthenticatedWaoUser.java trunk/wao-web/src/main/webapp/WEB-INF/content/obsmer/contacts.jsp Modified: trunk/wao-services/src/main/java/fr/ifremer/wao/services/AuthenticatedWaoUser.java =================================================================== --- trunk/wao-services/src/main/java/fr/ifremer/wao/services/AuthenticatedWaoUser.java 2014-06-17 09:56:21 UTC (rev 2039) +++ trunk/wao-services/src/main/java/fr/ifremer/wao/services/AuthenticatedWaoUser.java 2014-06-17 10:26:54 UTC (rev 2040) @@ -186,6 +186,10 @@ return userProfile.isAdmin() && isCanWrite(); } + public boolean isAuthorizedToExportContacts() { + return userProfile.isAdmin() || userProfile.isCoordinatorOrObserver(); + } + public boolean isAuthorizedToEditSamplingPlan() { return userProfile.isAdmin() && isCanWrite(); } Modified: trunk/wao-web/src/main/webapp/WEB-INF/content/obsmer/contacts.jsp =================================================================== --- trunk/wao-web/src/main/webapp/WEB-INF/content/obsmer/contacts.jsp 2014-06-17 09:56:21 UTC (rev 2039) +++ trunk/wao-web/src/main/webapp/WEB-INF/content/obsmer/contacts.jsp 2014-06-17 10:26:54 UTC (rev 2040) @@ -225,9 +225,11 @@ <i class="icon-trash"></i> <s:text name="wao.ui.action.reset"/> </s:a> - <s:submit action="export-contacts" type="button" cssClass="btn"> - <i class="icon-download"></i> <s:text name="wao.ui.action.csvExport"/> - </s:submit> + <s:if test="authenticatedWaoUser.authorizedToExportContacts"> + <s:submit action="export-contacts" type="button" cssClass="btn"> + <i class="icon-download"></i> <s:text name="wao.ui.action.csvExport"/> + </s:submit> + </s:if> </div>

1 0