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

r1961 - trunk/wao-web/src/main/webapp/WEB-INF/content/obsmer
by bleny＠users.forge.codelutin.com May 19, 2014

May 19, 2014

Author: bleny Date: 2014-05-19 14:00:44 +0200 (Mon, 19 May 2014) New Revision: 1961 Url: http://forge.codelutin.com/projects/wao/repository/revisions/1961 Log: fixes #5096 fix order of columns in contacts Modified: trunk/wao-web/src/main/webapp/WEB-INF/content/obsmer/contacts.jsp 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-05-19 11:37:20 UTC (rev 1960) +++ trunk/wao-web/src/main/webapp/WEB-INF/content/obsmer/contacts.jsp 2014-05-19 12:00:44 UTC (rev 1961) @@ -336,8 +336,8 @@ <th class="date-time"><s:text name="wao.ui.field.Contact.beginDate"/></th> <th class="date-time"><s:text name="wao.ui.field.Contact.endDate"/></th> <th class="date"><s:text name="wao.ui.field.Contact.dataInputDate"/></th> + <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.field.Contact.observedDataControl"/></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> @@ -437,16 +437,16 @@ <s:property value="dataInputDate"/> </s:if> </td> + <td> + <s:if test="observedDataControl != null"> + <s:text name="%{observedDataControl.i18nKey}"/> + </s:if> + </td> <td class="date"> <s:if test="restitution != null"> <s:property value="restitution"/> </s:if> </td> - <td> - <s:if test="observedDataControl != null"> - <s:text name="%{observedDataControl.i18nKey}"/> - </s:if> - </td> <td class="align-center"> <s:if test="mammalsObservation"> <i class="fa fa-eye"

1 0

r1960 - trunk/wao-web/src/main/webapp/WEB-INF/content/obsmer
by bleny＠users.forge.codelutin.com May 19, 2014

May 19, 2014

Author: bleny Date: 2014-05-19 13:37:20 +0200 (Mon, 19 May 2014) New Revision: 1960 Url: http://forge.codelutin.com/projects/wao/repository/revisions/1960 Log: fixes #5100 input type=number clashes with double conversion 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-05-19 11:23:53 UTC (rev 1959) +++ trunk/wao-web/src/main/webapp/WEB-INF/content/obsmer/edit-sample-row-input.jsp 2014-05-19 11:37:20 UTC (rev 1960) @@ -217,9 +217,11 @@ /> <s:textfield type="number" name="updateSampleRowCommand.sampleRow.nbObservants" label="%{getText('wao.ui.field.SampleRow.nbObservants')}" inputAppend="%{getText('wao.ui.unit.observers')}" cssClass="input-small"/> - <s:textfield type="number" name="updateSampleRowCommand.sampleRow.averageTideTime" label="%{getText('wao.ui.field.SampleRow.averageTideTime')}" inputAppend="%{getText('wao.ui.unit.days')}" cssClass="input-small"/> - <s:textfield type="number" name="updateSampleRowCommand.sampleRow.appliedCoverageRate" label="%{getText('wao.ui.field.SampleRow.appliedCoverageRate')}" inputAppend="%" cssClass="input-small"/> + <%-- XXX brendan 19/05/14 ne pas mettre type="number" car avec le formatter qui mets la valeur avec ',' on a pas la valeur quand on modifie une ligne --%> + <s:textfield name="updateSampleRowCommand.sampleRow.averageTideTime" label="%{getText('wao.ui.field.SampleRow.averageTideTime')}" inputAppend="%{getText('wao.ui.unit.days')}" cssClass="input-small"/> + <s:textfield name="updateSampleRowCommand.sampleRow.appliedCoverageRate" label="%{getText('wao.ui.field.SampleRow.appliedCoverageRate')}" inputAppend="%" cssClass="input-small"/> + <s:textarea name="updateSampleRowCommand.elligibleBoatImmatriculations" label="%{getText('wao.ui.field.SampleRow.elligibleBoat')}" /> <s:textarea name="updateSampleRowCommand.sampleRow.comment" label="%{getText('wao.ui.field.SampleRow.comment')}" />

1 0

r1959 - trunk/wao-web/src/main/webapp/WEB-INF/content/obsmer
by bleny＠users.forge.codelutin.com May 19, 2014

May 19, 2014

Author: bleny Date: 2014-05-19 13:23:53 +0200 (Mon, 19 May 2014) New Revision: 1959 Url: http://forge.codelutin.com/projects/wao/repository/revisions/1959 Log: fixes #5095 coordinator is not allowed to modify comment Modified: trunk/wao-web/src/main/webapp/WEB-INF/content/obsmer/edit-contact-input.jsp Modified: trunk/wao-web/src/main/webapp/WEB-INF/content/obsmer/edit-contact-input.jsp =================================================================== --- trunk/wao-web/src/main/webapp/WEB-INF/content/obsmer/edit-contact-input.jsp 2014-05-19 11:22:07 UTC (rev 1958) +++ trunk/wao-web/src/main/webapp/WEB-INF/content/obsmer/edit-contact-input.jsp 2014-05-19 11:23:53 UTC (rev 1959) @@ -277,7 +277,7 @@ <s:textarea name="updateContactCommand.contact.comment" label="%{getText('wao.ui.field.Contact.comment')}" placeholder="%{getText('wao.ui.misc.noComment')}" - disabled="%{!#editObservationReport || !authenticatedWaoUser.coordinatorOrObserver}"/> + disabled="%{!#editObservationReport || !authenticatedWaoUser.observer}"/> <s:textarea name="updateContactCommand.contact.commentCoordinator" label="%{getText('wao.ui.field.Contact.commentCoordinator')}"

1 0

r1958 - trunk/wao-web/src/main/webapp/WEB-INF/content/obsmer
by bleny＠users.forge.codelutin.com May 19, 2014

May 19, 2014

Author: bleny Date: 2014-05-19 13:22:07 +0200 (Mon, 19 May 2014) New Revision: 1958 Url: http://forge.codelutin.com/projects/wao/repository/revisions/1958 Log: fixes #5094 add tooltip in contacts for mammalsCapture Modified: trunk/wao-web/src/main/webapp/WEB-INF/content/obsmer/contacts.jsp 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-05-19 10:26:40 UTC (rev 1957) +++ trunk/wao-web/src/main/webapp/WEB-INF/content/obsmer/contacts.jsp 2014-05-19 11:22:07 UTC (rev 1958) @@ -453,17 +453,10 @@ title="<s:text name="wao.ui.field.Contact.mammalsObservation"/>"></i>  </s:if> <s:if test="mammalsCapture"> - <s:if test="mammalsInfo"> + <span data-original-title="<s:property value="mammalsInfo" escapeHtml="false"/>" data-toggle="tooltip" data-placement="left"> <img src="<s:url value="/img/hook-22px.png"/>" - alt="<s:text name="wao.ui.field.Contact.mammalsCapture"/>" - title="<s:text name="wao.ui.field.Contact.mammalsCapture"/>"/> - <%--TODO<s:text name="wao.ui.field.Contact.mammalsInfo"><s:param value="%{getMammalsInfo(#contact)}"/></s:text>--%> - </s:if> - <s:else> - <img src="<s:url value="/img/hook-22px.png"/>" - alt="<s:text name="wao.ui.field.Contact.mammalsCapture"/>" - title="<s:text name="wao.ui.field.Contact.mammalsCapture"/>"/> - </s:else> + alt="<s:text name="wao.ui.field.Contact.mammalsCapture"/>"/> + </span> </s:if> </td> <td>

1 0

r1957 - trunk/wao-persistence/src/main/java/fr/ifremer/wao/entity
by bleny＠users.forge.codelutin.com May 19, 2014

May 19, 2014

Author: bleny Date: 2014-05-19 12:26:40 +0200 (Mon, 19 May 2014) New Revision: 1957 Url: http://forge.codelutin.com/projects/wao/repository/revisions/1957 Log: fixes #5105 remove wrong assertion Modified: trunk/wao-persistence/src/main/java/fr/ifremer/wao/entity/SampleRowLogImpl.java Modified: trunk/wao-persistence/src/main/java/fr/ifremer/wao/entity/SampleRowLogImpl.java =================================================================== --- trunk/wao-persistence/src/main/java/fr/ifremer/wao/entity/SampleRowLogImpl.java 2014-05-19 10:22:31 UTC (rev 1956) +++ trunk/wao-persistence/src/main/java/fr/ifremer/wao/entity/SampleRowLogImpl.java 2014-05-19 10:26:40 UTC (rev 1957) @@ -336,7 +336,7 @@ if (boatIsElligible) { newlyEligibleBoats.add(registrationCode); } else { - throw new IllegalStateException("boat " + registrationCode + " was not and is not elligible for row " + newRow); + // boat was not and is not elligible for row, it must be a boat added by coordinator } } }

1 0

r1956 - in trunk: wao-services/src/main/java/fr/ifremer/wao/services wao-web/src/main/webapp/WEB-INF/content/administration
by bleny＠users.forge.codelutin.com May 19, 2014

May 19, 2014

Author: bleny Date: 2014-05-19 12:22:31 +0200 (Mon, 19 May 2014) New Revision: 1956 Url: http://forge.codelutin.com/projects/wao/repository/revisions/1956 Log: fixes #5104 only allow admin to set user receive mammals notifs Modified: trunk/wao-services/src/main/java/fr/ifremer/wao/services/AuthenticatedWaoUser.java trunk/wao-web/src/main/webapp/WEB-INF/content/administration/edit-wao-user.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-05-19 10:14:12 UTC (rev 1955) +++ trunk/wao-services/src/main/java/fr/ifremer/wao/services/AuthenticatedWaoUser.java 2014-05-19 10:22:31 UTC (rev 1956) @@ -319,4 +319,8 @@ return isCoordinatorOrObserver() && contact.getValidationCompany() == null; } + + public boolean isAuthorizedToAllowUsersToSubscribeToMammalsNotifications() { + return isAdmin(); + } } Modified: trunk/wao-web/src/main/webapp/WEB-INF/content/administration/edit-wao-user.jsp =================================================================== --- trunk/wao-web/src/main/webapp/WEB-INF/content/administration/edit-wao-user.jsp 2014-05-19 10:14:12 UTC (rev 1955) +++ trunk/wao-web/src/main/webapp/WEB-INF/content/administration/edit-wao-user.jsp 2014-05-19 10:22:31 UTC (rev 1956) @@ -159,14 +159,13 @@ </fieldset> </s:if> - <fieldset> + <s:if test="authenticatedWaoUser.authorizedToAllowUsersToSubscribeToMammalsNotifications"> + <fieldset> + <legend><s:text name="wao.ui.form.WaoUser.preferences" /></legend> + <s:checkbox name="updateWaoUserCommand.waoUser.mammalsNotifications" label="%{getText('wao.ui.field.WaoUser.mammalsNotifications')}" /> + </fieldset> + </s:if> - <legend><s:text name="wao.ui.form.WaoUser.preferences" /></legend> - - <s:checkbox name="updateWaoUserCommand.waoUser.mammalsNotifications" label="%{getText('wao.ui.field.WaoUser.mammalsNotifications')}" /> - - </fieldset> - <div class="form-actions"> <s:url action="wao-users" id="waoUsersUrl"> <s:param name="companyId" value="updateWaoUserCommand.companyId" />

1 0

r1955 - in trunk: wao-services/src/main/java/fr/ifremer/wao/services/service 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 May 19, 2014

May 19, 2014

Author: bleny Date: 2014-05-19 12:14:12 +0200 (Mon, 19 May 2014) New Revision: 1955 Url: http://forge.codelutin.com/projects/wao/repository/revisions/1955 Log: fixes #5092 review observer in contact-form Modified: trunk/wao-services/src/main/java/fr/ifremer/wao/services/service/ObsMerContactsService.java trunk/wao-services/src/main/java/fr/ifremer/wao/services/service/UpdateContactCommand.java trunk/wao-services/src/main/java/fr/ifremer/wao/services/service/WaoServiceSupport.java 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/ValidateContactJsonAction.java trunk/wao-web/src/main/webapp/WEB-INF/content/obsmer/edit-contact-input.jsp Modified: trunk/wao-services/src/main/java/fr/ifremer/wao/services/service/ObsMerContactsService.java =================================================================== --- trunk/wao-services/src/main/java/fr/ifremer/wao/services/service/ObsMerContactsService.java 2014-05-16 15:59:16 UTC (rev 1954) +++ trunk/wao-services/src/main/java/fr/ifremer/wao/services/service/ObsMerContactsService.java 2014-05-19 10:14:12 UTC (rev 1955) @@ -190,11 +190,13 @@ updateContactCommand.setAdmin(authenticatedWaoUser.isAdmin()); + Contact contact; + if (optionalContactId.isPresent()) { String contactId = optionalContactId.get(); - Contact contact = getContact(contactId); + contact = getContact(contactId); updateContactCommand.setContact(contact); @@ -202,7 +204,7 @@ } else { - Contact contact = new ContactImpl(); + contact = new ContactImpl(); contact.setObsProgram(authenticatedWaoUser.getObsProgram()); @@ -211,6 +213,11 @@ updateContactCommand.setCreation(true); } + String mainObserverId = contact.getMainObserver().getTopiaId(); + updateContactCommand.setMainObserverId(mainObserverId); + Set<String> secondaryObserversTopiaIds = contact.getSecondaryObserversTopiaIds(); + updateContactCommand.setSecondaryObserverIds(secondaryObserversTopiaIds); + return updateContactCommand; } @@ -319,7 +326,7 @@ } try { - preValidate(authenticatedWaoUser, updateContactCommand, false); + validate(authenticatedWaoUser, updateContactCommand, false); } catch (ContactNotUpdatableException e) { String message = l(l, "wao.import.contact.failure.not.updatable", lineNumber); throw new ImportErrorException(message); @@ -403,9 +410,21 @@ commit(); } - public void preValidate(AuthenticatedWaoUser authenticatedWaoUser, - UpdateContactCommand updateContactCommand, - boolean needUpdate) throws + public void preValidate(UpdateContactCommand updateContactCommand) { + + String mainObserverId = updateContactCommand.getMainObserverId(); + + WaoUser mainObserver = getWaoUserDao().forTopiaIdEquals(mainObserverId).findUnique(); + updateContactCommand.getContact().setMainObserver(mainObserver); + + List<WaoUser> secondaryObservers = getWaoUserDao().forTopiaIdIn(updateContactCommand.getSecondaryObserverIds()).findAll(); + updateContactCommand.getContact().setSecondaryObservers(new HashSet<>(secondaryObservers)); + + } + + public void validate(AuthenticatedWaoUser authenticatedWaoUser, + UpdateContactCommand updateContactCommand, + boolean needUpdate) throws ContactNotUpdatableException, MissingContactMainObserverException, MismatchContactMainObserverCompanyException, Modified: trunk/wao-services/src/main/java/fr/ifremer/wao/services/service/UpdateContactCommand.java =================================================================== --- trunk/wao-services/src/main/java/fr/ifremer/wao/services/service/UpdateContactCommand.java 2014-05-16 15:59:16 UTC (rev 1954) +++ trunk/wao-services/src/main/java/fr/ifremer/wao/services/service/UpdateContactCommand.java 2014-05-19 10:14:12 UTC (rev 1955) @@ -28,6 +28,8 @@ import org.apache.commons.lang3.ObjectUtils; import java.io.Serializable; +import java.util.HashSet; +import java.util.Set; /** * Created on 4/6/14. @@ -51,6 +53,10 @@ protected String oldMammalsInfo; + protected String mainObserverId; + + protected Set<String> secondaryObserverIds = new HashSet<>(); + public boolean isCreation() { return creation; } @@ -158,4 +164,20 @@ } return mammalsInfosChanged; } + + public String getMainObserverId() { + return mainObserverId; + } + + public void setMainObserverId(String mainObserverId) { + this.mainObserverId = mainObserverId; + } + + public Set<String> getSecondaryObserverIds() { + return secondaryObserverIds; + } + + public void setSecondaryObserverIds(Set<String> secondaryObserverIds) { + this.secondaryObserverIds = secondaryObserverIds; + } } Modified: trunk/wao-services/src/main/java/fr/ifremer/wao/services/service/WaoServiceSupport.java =================================================================== --- trunk/wao-services/src/main/java/fr/ifremer/wao/services/service/WaoServiceSupport.java 2014-05-16 15:59:16 UTC (rev 1954) +++ trunk/wao-services/src/main/java/fr/ifremer/wao/services/service/WaoServiceSupport.java 2014-05-19 10:14:12 UTC (rev 1955) @@ -56,6 +56,7 @@ import fr.ifremer.wao.services.WaoWebApplicationContext; import fr.ifremer.wao.services.service.administration.CompaniesService; import fr.ifremer.wao.services.service.administration.ReferentialService; +import fr.ifremer.wao.services.service.administration.WaoUsersService; import fr.ifremer.wao.services.service.mail.EmailService; import java.util.Date; @@ -110,6 +111,10 @@ return newService(EmailService.class); } + protected WaoUsersService getWaoUsersService() { + return newService(WaoUsersService.class); + } + protected BoatTopiaDao getBoatDao() { return getPersistenceContext().getBoatDao(); } 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-05-16 15:59:16 UTC (rev 1954) +++ trunk/wao-web/src/main/java/fr/ifremer/wao/web/action/obsmer/EditContactAction.java 2014-05-19 10:14:12 UTC (rev 1955) @@ -205,10 +205,12 @@ @Override public void validate() { + service.preValidate(updateContactCommand); + AuthenticatedWaoUser authenticatedWaoUser = session.getAuthenticatedWaoUser(); try { - service.preValidate(authenticatedWaoUser, updateContactCommand, true); + service.validate(authenticatedWaoUser, updateContactCommand, true); } catch (ContactNotUpdatableException e) { session.addErrorMessages(t("wao.ui.contacts.validation.failure.not.updatable")); Modified: trunk/wao-web/src/main/java/fr/ifremer/wao/web/action/obsmer/ValidateContactJsonAction.java =================================================================== --- trunk/wao-web/src/main/java/fr/ifremer/wao/web/action/obsmer/ValidateContactJsonAction.java 2014-05-16 15:59:16 UTC (rev 1954) +++ trunk/wao-web/src/main/java/fr/ifremer/wao/web/action/obsmer/ValidateContactJsonAction.java 2014-05-19 10:14:12 UTC (rev 1955) @@ -166,7 +166,7 @@ AuthenticatedWaoUser authenticatedWaoUser = session.getAuthenticatedWaoUser(); try { - service.preValidate(authenticatedWaoUser, updateContactCommand, true); + service.validate(authenticatedWaoUser, updateContactCommand, true); } catch (ContactNotUpdatableException e) { session.addErrorMessages(t("wao.ui.contacts.validation.failure.not.updatable")); Modified: trunk/wao-web/src/main/webapp/WEB-INF/content/obsmer/edit-contact-input.jsp =================================================================== --- trunk/wao-web/src/main/webapp/WEB-INF/content/obsmer/edit-contact-input.jsp 2014-05-16 15:59:16 UTC (rev 1954) +++ trunk/wao-web/src/main/webapp/WEB-INF/content/obsmer/edit-contact-input.jsp 2014-05-19 10:14:12 UTC (rev 1955) @@ -186,22 +186,23 @@ <s:set name="editObservers" value="%{authenticatedWaoUser.isAuthorizedToEditContactObservers(updateContactCommand.contact)}"/> - <s:select name="updateContactCommand.contact.mainObserver.topiaId" + <s:select name="updateContactCommand.mainObserverId" + value="%{updateContactCommand.mainObserverId}" label="%{getText('wao.ui.field.Contact.mainObserver')}" list="observers" emptyOption="true" disabled="%{!#editObservers}" - cssClass="select2 input-large" + cssClass="input-large" /> <s:if test="authenticatedWaoUser.isAuthorizedToDisplayContactSecondaryObservers(updateContactCommand.contact)"> - <s:select name="updateContactCommand.contact.secondaryObservers" - value="%{updateContactCommand.contact.secondaryObserversTopiaIds}" + <s:select name="updateContactCommand.secondaryObserverIds" + value="%{updateContactCommand.secondaryObserverIds}" label="%{getText('wao.ui.field.Contact.secondaryObservers')}" list="observers" multiple="true" disabled="%{!#editObservers}" - cssClass="select2 input-xlarge" + cssClass="input-xlarge" /> </s:if>

1 0

Jenkins build is back to normal : wao-nightly » Wao :: Persistence #49
by admin+ci-codelutin.com＠codelutin.com May 16, 2014

May 16, 2014

See <http://ci.codelutin.com/jenkins/job/wao-nightly/fr.ifremer$wao-persistence/…>

1 0

Jenkins build is back to normal : wao-nightly » Wao :: Services #49
by admin+ci-codelutin.com＠codelutin.com May 16, 2014

May 16, 2014

See <http://ci.codelutin.com/jenkins/job/wao-nightly/fr.ifremer$wao-services/49/>

1 0

Jenkins build is back to normal : wao-nightly » Wao :: Web #49
by admin+ci-codelutin.com＠codelutin.com May 16, 2014

May 16, 2014

See <http://ci.codelutin.com/jenkins/job/wao-nightly/fr.ifremer$wao-web/49/chang…>

1 0