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

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

23 Jun '14

Author: bleny Date: 2014-06-23 23:59:05 +0200 (Mon, 23 Jun 2014) New Revision: 2099 Url: http://forge.codelutin.com/projects/wao/repository/revisions/2099 Log: hide some actions for guest Modified: trunk/wao-services/src/main/java/fr/ifremer/wao/services/AuthenticatedWaoUser.java trunk/wao-web/src/main/webapp/WEB-INF/content/obsmer/sampling-plan.jsp trunk/wao-web/src/main/webapp/WEB-INF/content/obsvente/sampling-plan.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-23 21:14:31 UTC (rev 2098) +++ trunk/wao-services/src/main/java/fr/ifremer/wao/services/AuthenticatedWaoUser.java 2014-06-23 21:59:05 UTC (rev 2099) @@ -296,6 +296,10 @@ return ! userProfile.isGuest(); } + public boolean isAuthorizedToViewSampleRowLog() { + return ! userProfile.isGuest(); + } + public boolean isAuthorizedToViewSynthesis() { return ! userProfile.isGuest(); } Modified: trunk/wao-web/src/main/webapp/WEB-INF/content/obsmer/sampling-plan.jsp =================================================================== --- trunk/wao-web/src/main/webapp/WEB-INF/content/obsmer/sampling-plan.jsp 2014-06-23 21:14:31 UTC (rev 2098) +++ trunk/wao-web/src/main/webapp/WEB-INF/content/obsmer/sampling-plan.jsp 2014-06-23 21:59:05 UTC (rev 2099) @@ -453,15 +453,17 @@ </s:a> </li> </s:if> + <s:if test="authenticatedWaoUser.authorizedToViewSampleRowLog"> + <li> + <s:url action="sample-row-log" id="sampleRowLogUrl"> + <s:param name="sampleRowId" value="sampleRowId" /> + </s:url> + <s:a href="%{sampleRowLogUrl}"> + <s:text name="wao.ui.action.viewSampleRowLog" /> + </s:a> + </li> + </s:if> <li> - <s:url action="sample-row-log" id="sampleRowLogUrl"> - <s:param name="sampleRowId" value="sampleRowId" /> - </s:url> - <s:a href="%{sampleRowLogUrl}"> - <s:text name="wao.ui.action.viewSampleRowLog" /> - </s:a> - </li> - <li> <s:url action="sampling-plan" id="sampleRowZoomUrl"> <s:param name="filter.periodFrom" value="%{formatMonth(firstSampleMonthDate)}"/> <s:param name="filter.periodTo" value="%{formatMonth(lastSampleMonthDate)}"/> @@ -477,7 +479,7 @@ <s:text name="wao.ui.action.zoomOnSampleRowPeriod" /> </s:a> </li> - <s:if test="elligibleBoatsProvided"> + <s:if test="authenticatedWaoUser.authorizedToViewBoats && elligibleBoatsProvided"> <li> <s:url action="boats" id="viewElligibleBoatsUrl"> <s:param name="filter.elligibleForSampleRowsFilter.sampleRowCodes" value="code" /> @@ -487,16 +489,18 @@ </s:a> </li> </s:if> - <li> - <s:url action="contacts" id="viewAssociatedContactsUrl"> - <s:param name="filter.sampleRowFilter.sampleRowCodes" value="code" /> - <s:param name="filter.periodFrom" /> - <s:param name="filter.periodTo" /> - </s:url> - <s:a href="%{viewAssociatedContactsUrl}"> - <s:text name="wao.ui.action.viewAssociatedContacts" /> - </s:a> - </li> + <s:if test="authenticatedWaoUser.authorizedToViewContacts"> + <li> + <s:url action="contacts" id="viewAssociatedContactsUrl"> + <s:param name="filter.sampleRowFilter.sampleRowCodes" value="code" /> + <s:param name="filter.periodFrom" /> + <s:param name="filter.periodTo" /> + </s:url> + <s:a href="%{viewAssociatedContactsUrl}"> + <s:text name="wao.ui.action.viewAssociatedContacts" /> + </s:a> + </li> + </s:if> <s:if test="authenticatedWaoUser.authorizedToCreateContact && newContactCreatable"> <li> <s:url action="boats" id="createAssociatedContactUrl"> Modified: trunk/wao-web/src/main/webapp/WEB-INF/content/obsvente/sampling-plan.jsp =================================================================== --- trunk/wao-web/src/main/webapp/WEB-INF/content/obsvente/sampling-plan.jsp 2014-06-23 21:14:31 UTC (rev 2098) +++ trunk/wao-web/src/main/webapp/WEB-INF/content/obsvente/sampling-plan.jsp 2014-06-23 21:59:05 UTC (rev 2099) @@ -432,15 +432,17 @@ </s:a> </li> </s:if> + <s:if test="authenticatedWaoUser.authorizedToViewSampleRowLog"> + <li> + <s:url action="sample-row-log" id="sampleRowLogUrl"> + <s:param name="sampleRowId" value="sampleRowId" /> + </s:url> + <s:a href="%{sampleRowLogUrl}"> + <s:text name="wao.ui.action.viewSampleRowLog" /> + </s:a> + </li> + </s:if> <li> - <s:url action="sample-row-log" id="sampleRowLogUrl"> - <s:param name="sampleRowId" value="sampleRowId" /> - </s:url> - <s:a href="%{sampleRowLogUrl}"> - <s:text name="wao.ui.action.viewSampleRowLog" /> - </s:a> - </li> - <li> <s:url action="sampling-plan" id="sampleRowZoomUrl"> <s:param name="filter.periodFrom" value="%{formatMonth(firstSampleMonthDate)}"/> <s:param name="filter.periodTo" value="%{formatMonth(lastSampleMonthDate)}"/> @@ -456,7 +458,7 @@ <s:text name="wao.ui.action.zoomOnSampleRowPeriod" /> </s:a> </li> - <s:if test="elligibleBoatsProvided"> + <s:if test="authenticatedWaoUser.authorizedToViewBoats && elligibleBoatsProvided"> <li> <s:url action="boats" id="viewElligibleBoatsUrl"> <s:param name="filter.elligibleForSampleRowsFilter.sampleRowCodes" value="code" /> @@ -466,16 +468,18 @@ </s:a> </li> </s:if> - <li> - <s:url action="contacts" id="viewAssociatedContactsUrl"> - <s:param name="filter.sampleRowFilter.sampleRowCodes" value="code" /> - <s:param name="filter.periodFrom" /> - <s:param name="filter.periodTo" /> - </s:url> - <s:a href="%{viewAssociatedContactsUrl}"> - <s:text name="wao.ui.action.viewAssociatedContacts" /> - </s:a> - </li> + <s:if test="authenticatedWaoUser.authorizedToViewContacts"> + <li> + <s:url action="contacts" id="viewAssociatedContactsUrl"> + <s:param name="filter.sampleRowFilter.sampleRowCodes" value="code" /> + <s:param name="filter.periodFrom" /> + <s:param name="filter.periodTo" /> + </s:url> + <s:a href="%{viewAssociatedContactsUrl}"> + <s:text name="wao.ui.action.viewAssociatedContacts" /> + </s:a> + </li> + </s:if> <s:if test="authenticatedWaoUser.authorizedToCreateContact && newContactCreatable"> <li> <s:url action="boats" id="createAssociatedContactUrl">

1 0

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

23 Jun '14

Author: bleny Date: 2014-06-23 23:14:31 +0200 (Mon, 23 Jun 2014) New Revision: 2098 Url: http://forge.codelutin.com/projects/wao/repository/revisions/2098 Log: fixes #5208 review rights for guest Modified: trunk/wao-services/src/main/java/fr/ifremer/wao/services/AuthenticatedWaoUser.java trunk/wao-web/src/main/webapp/WEB-INF/content/obsmer/sampling-plan.jsp trunk/wao-web/src/main/webapp/WEB-INF/content/obsvente/sampling-plan.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-23 20:59:08 UTC (rev 2097) +++ trunk/wao-services/src/main/java/fr/ifremer/wao/services/AuthenticatedWaoUser.java 2014-06-23 21:14:31 UTC (rev 2098) @@ -189,6 +189,11 @@ public boolean isAuthorizedToExportContacts() { return userProfile.isAdmin() || userProfile.isCoordinatorOrObserver(); } + + public boolean isAuthorizedToExportSamplingPlan() { + return userProfile.isAdmin() || userProfile.isCoordinatorOrObserver(); + } + public boolean isAuthorizedToViewContactsComments() { return ! userProfile.isProfessional(); } @@ -206,7 +211,7 @@ } public boolean isAuthorizedToViewOtherCompanies() { - return ! userProfile.isCoordinatorOrObserver(); + return ! (userProfile.isCoordinatorOrObserver() || userProfile.isGuest()); } public boolean isAuthorizedToViewBoatDetails() { Modified: trunk/wao-web/src/main/webapp/WEB-INF/content/obsmer/sampling-plan.jsp =================================================================== --- trunk/wao-web/src/main/webapp/WEB-INF/content/obsmer/sampling-plan.jsp 2014-06-23 20:59:08 UTC (rev 2097) +++ trunk/wao-web/src/main/webapp/WEB-INF/content/obsmer/sampling-plan.jsp 2014-06-23 21:14:31 UTC (rev 2098) @@ -141,9 +141,11 @@ <s:text name="wao.ui.action.reset"/> </s:submit> - <s:submit action="export-sampling-plan" type="button" cssClass="btn"> - <s:text name="wao.ui.action.csvExport" /> - </s:submit> + <s:if test="authenticatedWaoUser.authorizedToExportSamplingPlan"> + <s:submit action="export-sampling-plan" type="button" cssClass="btn"> + <s:text name="wao.ui.action.csvExport" /> + </s:submit> + </s:if> </div> Modified: trunk/wao-web/src/main/webapp/WEB-INF/content/obsvente/sampling-plan.jsp =================================================================== --- trunk/wao-web/src/main/webapp/WEB-INF/content/obsvente/sampling-plan.jsp 2014-06-23 20:59:08 UTC (rev 2097) +++ trunk/wao-web/src/main/webapp/WEB-INF/content/obsvente/sampling-plan.jsp 2014-06-23 21:14:31 UTC (rev 2098) @@ -151,9 +151,11 @@ <s:text name="wao.ui.action.reset"/> </s:submit> - <s:submit action="export-sampling-plan" type="button" cssClass="btn"> - <s:text name="wao.ui.action.csvExport" /> - </s:submit> + <s:if test="authenticatedWaoUser.authorizedToExportSamplingPlan"> + <s:submit action="export-sampling-plan" type="button" cssClass="btn"> + <s:text name="wao.ui.action.csvExport" /> + </s:submit> + </s:if> </div>

1 0

r2097 - in trunk/wao-web/src/main: resources/i18n webapp/WEB-INF/content
by bleny＠users.forge.codelutin.com 23 Jun '14

23 Jun '14

Author: bleny Date: 2014-06-23 22:59:08 +0200 (Mon, 23 Jun 2014) New Revision: 2097 Url: http://forge.codelutin.com/projects/wao/repository/revisions/2097 Log: fixes #5319 confirm before sample row deletion Modified: trunk/wao-web/src/main/resources/i18n/wao-web_fr_FR.properties trunk/wao-web/src/main/webapp/WEB-INF/content/edit-contact-input.jsp trunk/wao-web/src/main/webapp/WEB-INF/content/edit-sample-row-input.jsp 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-23 20:52:12 UTC (rev 2096) +++ trunk/wao-web/src/main/resources/i18n/wao-web_fr_FR.properties 2014-06-23 20:59:08 UTC (rev 2097) @@ -49,7 +49,7 @@ wao.ui.action.deleteNews=Supprimer la nouvelle wao.ui.action.deleteNews.confirm=Êtes-vous sûr de vouloir supprimer définitivement cette nouvelle ? wao.ui.action.deleteSampleRow=Supprimer la ligne du plan -wao.ui.action.deleteSampleRow.confirm=Êtes-vous sûr de vouloir supprimer la ligne %s du plan ? +wao.ui.action.deleteSampleRow.confirm=Êtes-vous sûr de vouloir supprimer cette ligne du plan ? wao.ui.action.deleteSampleRow.failure=Impossible de supprimer la ligne %s wao.ui.action.deleteSampleRow.success=La ligne %s a bien été supprimée wao.ui.action.deleteUser=Supprimer l'utilisateur Modified: trunk/wao-web/src/main/webapp/WEB-INF/content/edit-contact-input.jsp =================================================================== --- trunk/wao-web/src/main/webapp/WEB-INF/content/edit-contact-input.jsp 2014-06-23 20:52:12 UTC (rev 2096) +++ trunk/wao-web/src/main/webapp/WEB-INF/content/edit-contact-input.jsp 2014-06-23 20:59:08 UTC (rev 2097) @@ -71,7 +71,7 @@ if ( ! confirm("<s:text name="wao.ui.action.deleteContact.confirm"/>")) { e.preventDefault(); } - }) + }); }); Modified: trunk/wao-web/src/main/webapp/WEB-INF/content/edit-sample-row-input.jsp =================================================================== --- trunk/wao-web/src/main/webapp/WEB-INF/content/edit-sample-row-input.jsp 2014-06-23 20:52:12 UTC (rev 2096) +++ trunk/wao-web/src/main/webapp/WEB-INF/content/edit-sample-row-input.jsp 2014-06-23 20:59:08 UTC (rev 2097) @@ -84,6 +84,13 @@ $periodBeginInput.change(updateExpectedObservationsByMonthsTable); $periodEndInput.change(updateExpectedObservationsByMonthsTable); + + $('#delete-sample-row-link').click(function (e) { + if ( ! confirm("<s:text name="wao.ui.action.deleteSampleRow.confirm"/>")) { + e.preventDefault(); + } + }); + }); </script> @@ -269,7 +276,7 @@ <s:url action="delete-sample-row" id="deleteSampleRowUrl"> <s:param name="sampleRowId" value="sampleRowId" /> </s:url> - <s:a href="%{deleteSampleRowUrl}" cssClass="btn pull-right"> + <s:a href="%{deleteSampleRowUrl}" cssClass="btn pull-right" id="delete-sample-row-link"> <s:text name="wao.ui.action.deleteSampleRow" /> </s:a> </s:if>

1 0

r2096 - in trunk/wao-web/src/main: java/fr/ifremer/wao/web/action resources/i18n
by bleny＠users.forge.codelutin.com 23 Jun '14

23 Jun '14

Author: bleny Date: 2014-06-23 22:52:12 +0200 (Mon, 23 Jun 2014) New Revision: 2096 Url: http://forge.codelutin.com/projects/wao/repository/revisions/2096 Log: fixes #5318 prevent negative effort in sample row form Modified: trunk/wao-web/src/main/java/fr/ifremer/wao/web/action/EditSampleRowAction.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 Modified: trunk/wao-web/src/main/java/fr/ifremer/wao/web/action/EditSampleRowAction.java =================================================================== --- trunk/wao-web/src/main/java/fr/ifremer/wao/web/action/EditSampleRowAction.java 2014-06-23 20:41:01 UTC (rev 2095) +++ trunk/wao-web/src/main/java/fr/ifremer/wao/web/action/EditSampleRowAction.java 2014-06-23 20:52:12 UTC (rev 2096) @@ -26,6 +26,7 @@ import com.google.common.base.Strings; import com.opensymphony.xwork2.Preparable; import fr.ifremer.wao.WaoUtils; +import fr.ifremer.wao.entity.SampleMonth; import fr.ifremer.wao.entity.SampleRow; import fr.ifremer.wao.services.service.ObsMerSamplingPlanService; import fr.ifremer.wao.services.service.SampleRowCodeMustBeUniqueException; @@ -125,6 +126,13 @@ addFieldError("updateSampleRowCommand.sampleRow.samplingStrategy", t("wao.ui.form.SampleRow.error.missingProfessionSpecies")); } + for (SampleMonth sampleMonth : sampleRow.getSampleMonth()) { + if (sampleMonth.getExpectedTidesValue() < 0) { + addActionError(t("wao.ui.form.SampleRow.error.sampleMonthWithIllegalExpectedTidesValue", + formatMonth(sampleMonth.getPeriodDate()))); + } + } + } @Override 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-23 20:41:01 UTC (rev 2095) +++ trunk/wao-web/src/main/resources/i18n/wao-web_en_GB.properties 2014-06-23 20:52:12 UTC (rev 2096) @@ -319,6 +319,7 @@ wao.ui.form.SampleRow.error.missingPeriodEnd=You must define the month when the observations ends wao.ui.form.SampleRow.error.missingProfessionSpecies=You must define the target species wao.ui.form.SampleRow.error.missingProgramName=You must provide the program name +wao.ui.form.SampleRow.error.sampleMonthWithIllegalExpectedTidesValue=Effort for month %s must be positive wao.ui.form.SampleRow.error.unknownFishingGearDcfCode=Unknown fishing gear code\: %s wao.ui.form.SampleRow.error.unknownTargetSpeciesDcfCode=Unknown target species code\: %s wao.ui.form.SampleRow.missingBeginDate=Begin date missing to generate line code 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-23 20:41:01 UTC (rev 2095) +++ trunk/wao-web/src/main/resources/i18n/wao-web_fr_FR.properties 2014-06-23 20:52:12 UTC (rev 2096) @@ -319,6 +319,7 @@ wao.ui.form.SampleRow.error.missingPeriodEnd=Il faut préciser le mois auquel se termine la période d'observation wao.ui.form.SampleRow.error.missingProfessionSpecies=Il faut préciser les espèces cibles wao.ui.form.SampleRow.error.missingProgramName=Il faut préciser le nom du programme +wao.ui.form.SampleRow.error.sampleMonthWithIllegalExpectedTidesValue=Il faut donner un effort positif pour le mois %s wao.ui.form.SampleRow.error.unknownFishingGearDcfCode=Le code engin %s est inconnu du référentiel wao.ui.form.SampleRow.error.unknownTargetSpeciesDcfCode=Le code espèce cible %s est inconnu du référentiel wao.ui.form.SampleRow.missingBeginDate=Date de début manquante pour générer le code de la ligne \!

1 0

r2095 - in trunk/wao-web/src/main/webapp: . WEB-INF/content
by bleny＠users.forge.codelutin.com 23 Jun '14

23 Jun '14

Author: bleny Date: 2014-06-23 22:41:01 +0200 (Mon, 23 Jun 2014) New Revision: 2095 Url: http://forge.codelutin.com/projects/wao/repository/revisions/2095 Log: fixes #5317 remove hardcoded namespace in s:url Modified: trunk/wao-web/src/main/webapp/WEB-INF/content/sample-row-log.jsp trunk/wao-web/src/main/webapp/endpoints-js.jsp Modified: trunk/wao-web/src/main/webapp/WEB-INF/content/sample-row-log.jsp =================================================================== --- trunk/wao-web/src/main/webapp/WEB-INF/content/sample-row-log.jsp 2014-06-23 20:38:28 UTC (rev 2094) +++ trunk/wao-web/src/main/webapp/WEB-INF/content/sample-row-log.jsp 2014-06-23 20:41:01 UTC (rev 2095) @@ -68,7 +68,7 @@ <s:textarea name="comment" label="%{getText('wao.ui.misc.comment')}" /> <div class="form-actions"> - <s:url namespace="/obsmer" action="sampling-plan" id="samplingPlanUrl" /> + <s:url action="sampling-plan" id="samplingPlanUrl" /> <s:a href="%{samplingPlanUrl}" cssClass="btn"> <s:text name="wao.ui.action.goBackToSamplingPlan" /> </s:a> @@ -87,7 +87,7 @@ <s:else> <div class="form-actions"> - <s:url namespace="/obsmer" action="sampling-plan" id="samplingPlanUrl" /> + <s:url action="sampling-plan" id="samplingPlanUrl" /> <s:a href="%{samplingPlanUrl}" cssClass="btn"> <s:text name="wao.ui.action.goBackToSamplingPlan" /> </s:a> Modified: trunk/wao-web/src/main/webapp/endpoints-js.jsp =================================================================== --- trunk/wao-web/src/main/webapp/endpoints-js.jsp 2014-06-23 20:38:28 UTC (rev 2094) +++ trunk/wao-web/src/main/webapp/endpoints-js.jsp 2014-06-23 20:41:01 UTC (rev 2095) @@ -34,7 +34,7 @@ WAO.GET_BOAT_CONTACTS_COUNT_JSON_URL = '<s:url namespace="/" action="get-boat-contacts-count-json"/>'; WAO.SEARCH_BOAT_JSON_URL = '<s:url namespace="/" action="search-boat-json"/>'; - WAO.CONTACTS_FILTER_VALUES_JSON_URL = '<s:url namespace="/obsmer" action="contacts-filter-values-json"/>'; + WAO.CONTACTS_FILTER_VALUES_JSON_URL = '<s:url namespace="/" action="contacts-filter-values-json"/>'; // fragments WAO.BOAT_DETAILS_URL = '<s:url namespace="/" action="boat-details"/>';

1 0

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

23 Jun '14

Author: bleny Date: 2014-06-23 22:38:28 +0200 (Mon, 23 Jun 2014) New Revision: 2094 Url: http://forge.codelutin.com/projects/wao/repository/revisions/2094 Log: fixes #5316 remove hardcoded namespace in s:url Modified: trunk/wao-web/src/main/webapp/WEB-INF/content/edit-sample-row-input.jsp Modified: trunk/wao-web/src/main/webapp/WEB-INF/content/edit-sample-row-input.jsp =================================================================== --- trunk/wao-web/src/main/webapp/WEB-INF/content/edit-sample-row-input.jsp 2014-06-23 20:29:40 UTC (rev 2093) +++ trunk/wao-web/src/main/webapp/WEB-INF/content/edit-sample-row-input.jsp 2014-06-23 20:38:28 UTC (rev 2094) @@ -258,7 +258,7 @@ </s:if> <div class="form-actions"> - <s:url namespace="/obsmer" action="sampling-plan" id="samplingPlanUrl" /> + <s:url action="sampling-plan" id="samplingPlanUrl" /> <s:a href="%{samplingPlanUrl}" cssClass="btn"> <s:text name="wao.ui.action.cancel" /> </s:a>

1 0

r2093 - trunk/wao-services/src/main/java/fr/ifremer/wao/services/service/csv
by bleny＠users.forge.codelutin.com 23 Jun '14

23 Jun '14

Author: bleny Date: 2014-06-23 22:29:40 +0200 (Mon, 23 Jun 2014) New Revision: 2093 Url: http://forge.codelutin.com/projects/wao/repository/revisions/2093 Log: refs #5295 deal with export for contacts with no terrestrial location Modified: trunk/wao-services/src/main/java/fr/ifremer/wao/services/service/csv/ContactImportExportModel.java Modified: trunk/wao-services/src/main/java/fr/ifremer/wao/services/service/csv/ContactImportExportModel.java =================================================================== --- trunk/wao-services/src/main/java/fr/ifremer/wao/services/service/csv/ContactImportExportModel.java 2014-06-23 20:11:03 UTC (rev 2092) +++ trunk/wao-services/src/main/java/fr/ifremer/wao/services/service/csv/ContactImportExportModel.java 2014-06-23 20:29:40 UTC (rev 2093) @@ -24,7 +24,6 @@ package fr.ifremer.wao.services.service.csv; import com.google.common.base.Preconditions; -import com.google.common.collect.ImmutableSet; import fr.ifremer.wao.WaoUtils; import fr.ifremer.wao.entity.Boat; import fr.ifremer.wao.entity.Company; @@ -61,10 +60,12 @@ import java.text.ParseException; import java.util.Collections; import java.util.HashMap; +import java.util.HashSet; import java.util.LinkedList; import java.util.List; import java.util.Locale; import java.util.Map; +import java.util.Set; public class ContactImportExportModel implements ImportExportModel<Contact> { @@ -212,7 +213,7 @@ }); modelBuilder.newColumnForImportExport("CONTACT_TRANSMISSION_RESTITUTION", Contact.PROPERTY_RESTITUTION, Common.DAY); - List<ObservedDataControl> observedDataControlsValues = new LinkedList<>(); + Set<ObservedDataControl> observedDataControlsValues = new HashSet<>(); Collections.addAll(observedDataControlsValues, ObservedDataControl.values()); observedDataControlsValues.add(null); I18nAbleParserFormatter<ObservedDataControl> valueParserFormatter = new I18nAbleParserFormatter<>(locale, observedDataControlsValues); @@ -223,12 +224,15 @@ if (obsProgram.isObsVente()) { modelBuilder.newColumnForImportExport("CONTACT_ECHANTILLONNAGE_COMPLET", Contact.PROPERTY_COMPLETE_SAMPLING, Common.BOOLEAN); - // FIXME 20110606 bleny contact.getTerrestrialLocation() may be null, export will fail - - // terrestrial location for both ObsVente and ObsDeb + // terrestrial location + Set<LocationType> locationTypes = new HashSet<>(); + locationTypes.add(LocationType.PORT); + locationTypes.add(LocationType.AUCTION); + locationTypes.add(null); + I18nAbleParserFormatter<LocationType> locationTypeParserFormatter = + new I18nAbleParserFormatter<>(locale, locationTypes); + locationTypeParserFormatter.setAcceptNullValues(true); ValueGetterSetter<Contact, LocationType> locationTypeGetter = new Common.ValueSaver<>(); - ValueParserFormatter<LocationType> locationTypeParserFormatter = - new I18nAbleParserFormatter<>(locale, ImmutableSet.of(LocationType.AUCTION, LocationType.PORT)); modelBuilder.newMandatoryColumn( "CONTACT_LIEU_TYPE", locationTypeParserFormatter, @@ -278,8 +282,9 @@ @Override public Iterable<ImportableColumn<Contact, Object>> getColumnsForImport() { return (Iterable) getModel().getColumnsForImport(); - } /** will get terrestrial location depending on location code and pushed location type */ + } + /** will get terrestrial location depending on location code and pushed location type */ protected static class TerrestrialLocationParserFormatter implements ValueParserFormatter<TerrestrialLocation> { protected Locale locale;

1 0

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

23 Jun '14

Author: bleny Date: 2014-06-23 22:11:03 +0200 (Mon, 23 Jun 2014) New Revision: 2092 Url: http://forge.codelutin.com/projects/wao/repository/revisions/2092 Log: fixes #5314 remove data reliability for obsvente Modified: trunk/wao-services/src/main/java/fr/ifremer/wao/services/service/ContactsService.java trunk/wao-web/src/main/webapp/WEB-INF/content/contacts.jsp trunk/wao-web/src/main/webapp/WEB-INF/content/edit-contact-input.jsp Modified: trunk/wao-services/src/main/java/fr/ifremer/wao/services/service/ContactsService.java =================================================================== --- trunk/wao-services/src/main/java/fr/ifremer/wao/services/service/ContactsService.java 2014-06-23 20:00:40 UTC (rev 2091) +++ trunk/wao-services/src/main/java/fr/ifremer/wao/services/service/ContactsService.java 2014-06-23 20:11:03 UTC (rev 2092) @@ -697,27 +697,28 @@ } } + if (contact.getValidationProgram() != null && contact.getValidationCompany() == null) { + + throw new IllegalAcceptationException(contact); + } + DataReliability dataReliability = contact.getDataReliability(); if (dataReliability != null && dataReliability.isCommentRequired() && StringUtils.isBlank(contact.getCommentAdmin())) { throw new MissingContactCommentAdminException(contact); } - if (contact.getValidationProgram() != null && contact.getValidationCompany() == null) { - - throw new IllegalAcceptationException(contact); - } - if (BooleanUtils.isTrue(contact.getValidationProgram())) { //--- // validationProgram //--- + if (contact.getObsProgram().isObsMer()) { - // it's an admin validation, data-reliability field must be filled - - if (dataReliability == null || DataReliability.UNKNOWN == dataReliability) { - throw new MissingContactDataReliabilityException(contact); + // it's an admin validation, data-reliability field must be filled + if (dataReliability == null || DataReliability.UNKNOWN == dataReliability) { + throw new MissingContactDataReliabilityException(contact); + } } } } Modified: trunk/wao-web/src/main/webapp/WEB-INF/content/contacts.jsp =================================================================== --- trunk/wao-web/src/main/webapp/WEB-INF/content/contacts.jsp 2014-06-23 20:00:40 UTC (rev 2091) +++ trunk/wao-web/src/main/webapp/WEB-INF/content/contacts.jsp 2014-06-23 20:11:03 UTC (rev 2092) @@ -116,6 +116,11 @@ filterLabel: "<s:text name="wao.ui.field.Contact.observedDataControl"/>", filterValuesField: 'observedDataControls' }, + { + filterName: 'dataReliabilities', + filterLabel: "<s:text name="wao.ui.field.Contact.dataReliability"/>", + filterValuesField: 'dataReliabilities' + } </s:if> <s:if test="obsVente"> { @@ -137,13 +142,8 @@ filterName: 'completeSamplings', filterLabel: "<s:text name="wao.ui.field.Contact.completeSampling"/>", filterValuesField: 'completeSamplings' - }, + } </s:if> - { - filterName: 'dataReliabilities', - filterLabel: "<s:text name="wao.ui.field.Contact.dataReliability"/>", - filterValuesField: 'dataReliabilities' - } ]; filter = <s:property value="filter" escapeHtml="false"/>; Modified: trunk/wao-web/src/main/webapp/WEB-INF/content/edit-contact-input.jsp =================================================================== --- trunk/wao-web/src/main/webapp/WEB-INF/content/edit-contact-input.jsp 2014-06-23 20:00:40 UTC (rev 2091) +++ trunk/wao-web/src/main/webapp/WEB-INF/content/edit-contact-input.jsp 2014-06-23 20:11:03 UTC (rev 2092) @@ -325,12 +325,14 @@ <fieldset id="adminFocus"> <legend><s:text name="wao.ui.form.programEvaluation"/></legend> - <s:if test="authenticatedWaoUser.authorizedToDisplayContactDataReliability"> - <s:select name="updateContactCommand.contact.dataReliability" - label="%{getText('wao.ui.field.Contact.dataReliability')}" - list="dataReliabilities" - emptyOption="true" - disabled="%{!authenticatedWaoUser.isAuthorizedToEditContactDataReliability(updateContactCommand.contact)}"/> + <s:if test="updateContactCommand.contact.obsProgram.obsMer"> + <s:if test="authenticatedWaoUser.authorizedToDisplayContactDataReliability"> + <s:select name="updateContactCommand.contact.dataReliability" + label="%{getText('wao.ui.field.Contact.dataReliability')}" + list="dataReliabilities" + emptyOption="true" + disabled="%{!authenticatedWaoUser.isAuthorizedToEditContactDataReliability(updateContactCommand.contact)}"/> + </s:if> </s:if> <s:textarea name="updateContactCommand.contact.commentAdmin"

1 0

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

23 Jun '14

Author: bleny Date: 2014-06-23 22:00:40 +0200 (Mon, 23 Jun 2014) New Revision: 2091 Url: http://forge.codelutin.com/projects/wao/repository/revisions/2091 Log: fixes #5113 fixes #5256 remove filterOnObservationBeginDate from synthesis Modified: trunk/wao-services/src/main/java/fr/ifremer/wao/services/service/SynthesisService.java trunk/wao-web/src/main/webapp/WEB-INF/content/synthesis.jsp Modified: trunk/wao-services/src/main/java/fr/ifremer/wao/services/service/SynthesisService.java =================================================================== --- trunk/wao-services/src/main/java/fr/ifremer/wao/services/service/SynthesisService.java 2014-06-23 19:47:33 UTC (rev 2090) +++ trunk/wao-services/src/main/java/fr/ifremer/wao/services/service/SynthesisService.java 2014-06-23 20:00:40 UTC (rev 2091) @@ -1,5 +1,6 @@ package fr.ifremer.wao.services.service; +import com.google.common.base.Preconditions; import com.google.common.cache.Cache; import com.google.common.collect.Multimap; import fr.ifremer.wao.ContactsFilter; @@ -37,6 +38,7 @@ import java.util.List; import java.util.Locale; import java.util.Map; +import java.util.Set; import java.util.SortedMap; import java.util.TreeMap; @@ -62,24 +64,26 @@ if (synthesis == null) { + ContactTopiaDao dao = getContactDao(); + synthesis = new Synthesis(); - List<String> sampleRowsIds = getContactDao().getSampleRowsIds(filter); + Set<String> sampleRowIds = new HashSet<>(); - synthesis.setSampleRowIds(new HashSet<>(sampleRowsIds)); - + filter.setFilterOnObservationBeginDate(true); setExpectedVsActualObservationsByMonthsBarChartData(synthesis, filter); - setBoardingBoatsData(synthesis, filter); - setComplianceBoardingIndicator(synthesis, filter); + setDataInputDateReactivity(synthesis, filter); + setDataReliability(synthesis, filter); + sampleRowIds.addAll(dao.getSampleRowsIds(filter)); + filter.setFilterOnObservationBeginDate(false); setContactStatesStatistics(synthesis, filter); + sampleRowIds.addAll(dao.getSampleRowsIds(filter)); - setDataInputDateReactivity(synthesis, filter); + synthesis.setSampleRowIds(sampleRowIds); - setDataReliability(synthesis, filter); - for (CompanySynthesis companySynthesis : synthesis.getCompanySyntheses().values()) { String companyId = companySynthesis.getCompanyId(); Company company = getCompanyDao().findByTopiaId(companyId); @@ -96,6 +100,8 @@ protected void setDataReliability(Synthesis synthesis, ContactsFilter filter) { + Preconditions.checkArgument(filter.isFilterOnObservationBeginDate()); + ContactTopiaDao dao = getContactDao(); Map<String, Long> reliableObservationsCount = dao.getReliableObservationsCount(filter); @@ -110,6 +116,8 @@ protected void setDataInputDateReactivity(Synthesis synthesis, ContactsFilter filter) { + Preconditions.checkArgument(filter.isFilterOnObservationBeginDate()); + ContactTopiaDao dao = getContactDao(); Multimap<String, Pair<Date, Date>> contactsDoneObservationBeginDateAndDateInputDate @@ -140,6 +148,8 @@ protected void setContactStatesStatistics(Synthesis synthesis, ContactsFilter filter) { + Preconditions.checkArgument( ! filter.isFilterOnObservationBeginDate()); + ContactTopiaDao dao = getContactDao(); Map<String, Long> contactsCountsByCompany = dao.countByCompany(filter); @@ -157,6 +167,8 @@ protected void setComplianceBoardingIndicator(Synthesis synthesis, ContactsFilter filter) { + Preconditions.checkArgument(filter.isFilterOnObservationBeginDate()); + ContactTopiaDao dao = getContactDao(); Map<String, Double> complianceBoardingIndicator = dao.getComplianceBoardingIndicator(filter); @@ -174,6 +186,8 @@ */ protected void setExpectedVsActualObservationsByMonthsBarChartData(Synthesis synthesis, ContactsFilter filter) { + Preconditions.checkArgument(filter.isFilterOnObservationBeginDate()); + Locale locale = serviceContext.getLocale(); // définition de la fenêtre @@ -244,6 +258,8 @@ */ protected void setBoardingBoatsData(Synthesis synthesis, ContactsFilter filter) { + Preconditions.checkArgument(filter.isFilterOnObservationBeginDate()); + Locale locale = serviceContext.getLocale(); ContactTopiaDao dao = getContactDao(); Modified: trunk/wao-web/src/main/webapp/WEB-INF/content/synthesis.jsp =================================================================== --- trunk/wao-web/src/main/webapp/WEB-INF/content/synthesis.jsp 2014-06-23 19:47:33 UTC (rev 2090) +++ trunk/wao-web/src/main/webapp/WEB-INF/content/synthesis.jsp 2014-06-23 20:00:40 UTC (rev 2091) @@ -142,11 +142,6 @@ placeholder="%{getFilterPeriodToPlaceholder()}" cssClass="input-small"/> - <div title="<s:text name="wao.ui.form.filterOnObservationBeginDate.tooltip"/>"> - <s:checkbox name="filter.filterOnObservationBeginDate" - label="%{getText('wao.ui.form.filterOnObservationBeginDate')}"/> - </div> - </fieldset> <fieldset class="extra-filters">

1 0

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

23 Jun '14

Author: bleny Date: 2014-06-23 21:47:33 +0200 (Mon, 23 Jun 2014) New Revision: 2090 Url: http://forge.codelutin.com/projects/wao/repository/revisions/2090 Log: fixes #5312 remove obsmer filters from obsvente Modified: trunk/wao-web/src/main/webapp/WEB-INF/content/contacts.jsp trunk/wao-web/src/main/webapp/WEB-INF/content/synthesis.jsp Modified: trunk/wao-web/src/main/webapp/WEB-INF/content/contacts.jsp =================================================================== --- trunk/wao-web/src/main/webapp/WEB-INF/content/contacts.jsp 2014-06-23 19:36:40 UTC (rev 2089) +++ trunk/wao-web/src/main/webapp/WEB-INF/content/contacts.jsp 2014-06-23 19:47:33 UTC (rev 2090) @@ -223,12 +223,16 @@ <fieldset> - <s:checkbox name="filter.mammalsObservationOnly" - label="%{getText('wao.ui.misc.observations')}"/> + <s:if test="obsMer"> - <s:checkbox name="filter.mammalsCaptureOnly" - label="%{getText('wao.ui.field.Contact.mammalsCapture')}"/> + <s:checkbox name="filter.mammalsObservationOnly" + label="%{getText('wao.ui.misc.observations')}"/> + <s:checkbox name="filter.mammalsCaptureOnly" + label="%{getText('wao.ui.field.Contact.mammalsCapture')}"/> + + </s:if> + <s:checkbox name="filter.commentDefinedOnly" label="%{getText('wao.ui.field.Contact.comment')}"/> Modified: trunk/wao-web/src/main/webapp/WEB-INF/content/synthesis.jsp =================================================================== --- trunk/wao-web/src/main/webapp/WEB-INF/content/synthesis.jsp 2014-06-23 19:36:40 UTC (rev 2089) +++ trunk/wao-web/src/main/webapp/WEB-INF/content/synthesis.jsp 2014-06-23 19:47:33 UTC (rev 2090) @@ -155,12 +155,16 @@ <fieldset> - <s:checkbox name="filter.mammalsObservationOnly" - label="%{getText('wao.ui.misc.observations')}"/> + <s:if test="obsMer"> - <s:checkbox name="filter.mammalsCaptureOnly" - label="%{getText('wao.ui.field.Contact.mammalsCapture')}"/> + <s:checkbox name="filter.mammalsObservationOnly" + label="%{getText('wao.ui.misc.observations')}"/> + <s:checkbox name="filter.mammalsCaptureOnly" + label="%{getText('wao.ui.field.Contact.mammalsCapture')}"/> + + </s:if> + <s:checkbox name="filter.commentDefinedOnly" label="%{getText('wao.ui.field.Contact.comment')}"/>

1 0