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

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

14 May '14

Author: bleny Date: 2014-05-14 10:13:27 +0200 (Wed, 14 May 2014) New Revision: 1937 Url: http://forge.codelutin.com/projects/wao/repository/revisions/1937 Log: refs #4487 use select2 for observers selection, show hide some form parts when necessary Modified: 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/edit-contact-input.jsp trunk/wao-web/src/main/webapp/wao.js Modified: trunk/wao-web/src/main/resources/i18n/wao-web_en_GB.properties =================================================================== --- trunk/wao-web/src/main/resources/i18n/wao-web_en_GB.properties 2014-05-13 15:10:44 UTC (rev 1936) +++ trunk/wao-web/src/main/resources/i18n/wao-web_en_GB.properties 2014-05-14 08:13:27 UTC (rev 1937) @@ -218,7 +218,7 @@ wao.ui.field.Contact.restitution=Restitution wao.ui.field.Contact.sampleRow=Sample row wao.ui.field.Contact.samplingStrategy=Sampling strategy followed -wao.ui.field.Contact.secondaryObservers=Observers +wao.ui.field.Contact.secondaryObservers=Secondary observers wao.ui.field.Contact.terrestrialLocation=Observation's place wao.ui.field.Contact.validationCompany=Company validation wao.ui.field.Contact.validationProgram=Program validation Modified: trunk/wao-web/src/main/resources/i18n/wao-web_fr_FR.properties =================================================================== --- trunk/wao-web/src/main/resources/i18n/wao-web_fr_FR.properties 2014-05-13 15:10:44 UTC (rev 1936) +++ trunk/wao-web/src/main/resources/i18n/wao-web_fr_FR.properties 2014-05-14 08:13:27 UTC (rev 1937) @@ -218,7 +218,7 @@ wao.ui.field.Contact.restitution=Transmission de la restitution wao.ui.field.Contact.sampleRow=Ligne du plan wao.ui.field.Contact.samplingStrategy=Stratégie d'échantillonnage suivie -wao.ui.field.Contact.secondaryObservers=Observateurs +wao.ui.field.Contact.secondaryObservers=Observateurs secondaires wao.ui.field.Contact.terrestrialLocation=Lieu d'observation wao.ui.field.Contact.validationCompany=Validation société wao.ui.field.Contact.validationProgram=Validation programme 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-13 15:10:44 UTC (rev 1936) +++ trunk/wao-web/src/main/webapp/WEB-INF/content/obsmer/edit-contact-input.jsp 2014-05-14 08:13:27 UTC (rev 1937) @@ -35,6 +35,35 @@ $(document).ready(function () { + var $mammalsCaptureCheckbox = $('#mammalsCaptureCheckbox'); + var $mammalsInfo = $('#mammalsInfo'); + + var showHideMammalsInfo = function () { + if ($mammalsCaptureCheckbox.prop('checked')) { + $mammalsInfo.show(); + } else { + $mammalsInfo.hide(); + } + }; + + $mammalsCaptureCheckbox.change(showHideMammalsInfo); + showHideMammalsInfo(); + + var $contactStateMotif = $('#contactStateMotif'); + var $contactStateSelect = $('select[name="updateContactCommand.contact.contactState"]'); + + var showHideContactStateMotif = function () { + var contactState = $contactStateSelect.val(); + if (contactState === 'CONTACT_REFUSED' || contactState == 'CONTACT_DEFINITELY_REFUSED') { + $contactStateMotif.show(); + } else { + $contactStateMotif.hide(); + } + }; + + $contactStateSelect.change(showHideContactStateMotif); + showHideContactStateMotif(); + }); </script> @@ -159,7 +188,9 @@ label="%{getText('wao.ui.field.Contact.mainObserver')}" list="observers" emptyOption="true" - disabled="%{!#editObservers}"/> + disabled="%{!#editObservers}" + cssClass="select2 input-large" + /> <s:if test="authenticatedWaoUser.isAuthorizedToDisplayContactSecondaryObservers(updateContactCommand.contact)"> <s:select name="updateContactCommand.contact.secondaryObservers" @@ -167,7 +198,9 @@ label="%{getText('wao.ui.field.Contact.secondaryObservers')}" list="observers" multiple="true" - disabled="%{!#editObservers}"/> + disabled="%{!#editObservers}" + cssClass="select2 input-xlarge" + /> </s:if> </fieldset> @@ -195,30 +228,33 @@ list="contactStates" disabled="%{!#editObservationReport}"/> - <s:select name="updateContactCommand.contact.contactStateMotif" - value="%{updateContactCommand.contact.contactState.topiaId}" - label="%{getText('wao.ui.field.Contact.contactStateMotif')}" - list="contactStateMotives" - emptyOption="true" - disabled="%{!#editObservationReport}"/> + <div id="contactStateMotif"> + <s:select name="updateContactCommand.contact.contactStateMotif" + value="%{updateContactCommand.contact.contactState.topiaId}" + label="%{getText('wao.ui.field.Contact.contactStateMotif')}" + list="contactStateMotives" + emptyOption="true" + disabled="%{!#editObservationReport}"/> + </div> <s:checkbox name="updateContactCommand.contact.mammalsObservation" label="%{getText('wao.ui.field.Contact.mammalsObservation')}" disabled="%{!#editObservationReport}"/> <s:checkbox name="updateContactCommand.contact.mammalsCapture" + id="mammalsCaptureCheckbox" label="%{getText('wao.ui.field.Contact.mammalsCapture')}" disabled="%{!#editObservationReport}"/> - <%--TODO onclick="updateMammalsInfoBox(this);" />--%> - <%--<span style="color: red;">--%> - <%--<s:text name="wao.ui.page.ContactForm.mammalsInfo.disclaimer"/>--%> - <%--</span>--%> + <div id="mammalsInfo"> + <s:textarea name="updateContactCommand.contact.mammalsInfo" + label="%{getText('wao.ui.field.Contact.mammalsInfo')}" + disabled="%{!#editObservationReport}"/> + <div class="alert"> + <s:text name="wao.ui.page.ContactForm.mammalsInfo.disclaimer"/> + </div> + </div> - <s:textarea name="updateContactCommand.contact.mammalsInfo" - label="%{getText('wao.ui.field.Contact.mammalsInfo')}" - disabled="%{!#editObservationReport}"/> - <s:textfield name="updateContactCommand.contact.dataInputDate" label="%{getText('wao.ui.field.Contact.dataInputDate')}" placeholder="%{getDatePlaceholder()}" Modified: trunk/wao-web/src/main/webapp/wao.js =================================================================== --- trunk/wao-web/src/main/webapp/wao.js 2014-05-13 15:10:44 UTC (rev 1936) +++ trunk/wao-web/src/main/webapp/wao.js 2014-05-14 08:13:27 UTC (rev 1937) @@ -270,6 +270,7 @@ // FIXME brendan 07/04/14 cannot enable select2 because we can't bind blur event without driving the application crazy, see https://github.com/ivaynberg/select2/issues/2193 //$('select').addClass('input-xlarge').select2(); + $('select.select2').select2(); WAO = new Wao();

1 0

r1936 - in trunk: wao-services/src/main/resources/i18n wao-web/src/main/resources/i18n wao-web/src/main/webapp wao-web/src/main/webapp/WEB-INF/content/obsmer
by bleny＠users.forge.codelutin.com 13 May '14

13 May '14

Author: bleny Date: 2014-05-13 17:10:44 +0200 (Tue, 13 May 2014) New Revision: 1936 Url: http://forge.codelutin.com/projects/wao/repository/revisions/1936 Log: refs #4487 put immutable information aside in contact form Modified: trunk/wao-services/src/main/resources/i18n/wao-services_en_GB.properties trunk/wao-services/src/main/resources/i18n/wao-services_fr_FR.properties 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/edit-contact-input.jsp trunk/wao-web/src/main/webapp/wao.css Modified: trunk/wao-services/src/main/resources/i18n/wao-services_en_GB.properties =================================================================== --- trunk/wao-services/src/main/resources/i18n/wao-services_en_GB.properties 2014-05-13 15:08:56 UTC (rev 1935) +++ trunk/wao-services/src/main/resources/i18n/wao-services_en_GB.properties 2014-05-13 15:10:44 UTC (rev 1936) @@ -28,7 +28,7 @@ wao.business.validationState.validated=validate wao.email.addBoatToUserAllegroWallet.contactDone=This demand is for observation expected done between %s and %s wao.email.addBoatToUserAllegroWallet.contactExpected=This demand is for observation expected on %s -wao.email.addBoatToUserAllegroWallet.subject=%s: add boat %d to ALLEGRO wallet for user %s +wao.email.addBoatToUserAllegroWallet.subject=%s\: add boat %d to ALLEGRO wallet for user %s wao.export.ical.desc=wtih %s wao.export.ical.title=ObsDeb Observation wao.import.boat.failure.invalid.locationCode=The code '%s' is not a valid location code Modified: trunk/wao-services/src/main/resources/i18n/wao-services_fr_FR.properties =================================================================== --- trunk/wao-services/src/main/resources/i18n/wao-services_fr_FR.properties 2014-05-13 15:08:56 UTC (rev 1935) +++ trunk/wao-services/src/main/resources/i18n/wao-services_fr_FR.properties 2014-05-13 15:10:44 UTC (rev 1936) @@ -27,7 +27,7 @@ wao.business.validationState.validated=Validé wao.email.addBoatToUserAllegroWallet.contactDone=Cette demande émane de l'observation réalisée entre le %s et le %s. wao.email.addBoatToUserAllegroWallet.contactExpected=Cette demande émane de l'observation prévue le %s. -wao.email.addBoatToUserAllegroWallet.subject=%s : ajout navire %d sur portefeuille ALLEGRO de %s +wao.email.addBoatToUserAllegroWallet.subject=%s \: ajout navire %d sur portefeuille ALLEGRO de %s wao.export.ical.desc=avec %s wao.export.ical.title=Observation ObsDeb wao.import.boat.failure.invalid.locationCode=Le code '%s' n'est pas un code de lieu valide Modified: trunk/wao-web/src/main/resources/i18n/wao-web_en_GB.properties =================================================================== --- trunk/wao-web/src/main/resources/i18n/wao-web_en_GB.properties 2014-05-13 15:08:56 UTC (rev 1935) +++ trunk/wao-web/src/main/resources/i18n/wao-web_en_GB.properties 2014-05-13 15:10:44 UTC (rev 1936) @@ -281,6 +281,7 @@ wao.ui.form.Company.error.nameMustBeUnique=Company name must be unique wao.ui.form.Company.title.creation=Create a new company wao.ui.form.Company.title.edition=Edit company %s +wao.ui.form.Contact.contactCreatedOn=Contact created on %s wao.ui.form.Contact.error.dataInputDateAfterToday= wao.ui.form.Contact.error.dataInputDateBeforeObservationEndDate= wao.ui.form.Contact.error.duplicatedMainObserverInSecondaryObservers= Modified: trunk/wao-web/src/main/resources/i18n/wao-web_fr_FR.properties =================================================================== --- trunk/wao-web/src/main/resources/i18n/wao-web_fr_FR.properties 2014-05-13 15:08:56 UTC (rev 1935) +++ trunk/wao-web/src/main/resources/i18n/wao-web_fr_FR.properties 2014-05-13 15:10:44 UTC (rev 1936) @@ -281,6 +281,7 @@ wao.ui.form.Company.error.nameMustBeUnique=Le nom de la société doit être unique wao.ui.form.Company.title.creation=Création d'une société wao.ui.form.Company.title.edition=Modification de la société %s +wao.ui.form.Contact.contactCreatedOn=Contact créé le %s wao.ui.form.Contact.error.dataInputDateAfterToday=La date de saisie des données doit être antérieure à la date du jour wao.ui.form.Contact.error.dataInputDateBeforeObservationEndDate=La date de saisie des données doit être postérieure à la date de fin d'observation wao.ui.form.Contact.error.duplicatedMainObserverInSecondaryObservers=L'utilisateur référant ne doit pas se trouver aussi parmi les observateurs secondaires 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-13 15:08:56 UTC (rev 1935) +++ trunk/wao-web/src/main/webapp/WEB-INF/content/obsmer/edit-contact-input.jsp 2014-05-13 15:10:44 UTC (rev 1936) @@ -49,59 +49,106 @@ </s:else> </h1> -<s:form> +<aside class="well"> - <s:hidden name="contactId" value="%{contactId}"/> + <h2><s:text name="wao.ui.misc.information"/></h2> - <fieldset> + <s:text name="wao.ui.form.Contact.contactCreatedOn"> + <s:param value="%{formatDate(updateContactCommand.contact.creationDate)}"/> + </s:text> - <legend><s:text name="wao.ui.misc.information"/></legend> + <h3><s:text name="wao.ui.field.Contact.boat"/></h3> - <s:textfield name="updateContactCommand.contact.boat.name" - label="%{getText('wao.ui.field.Boat.name')}" - disabled="true"/> - <s:textfield name="updateContactCommand.contact.boat.immatriculation" - value="%{'' + updateContactCommand.contact.boat.immatriculation}" - label="%{getText('wao.ui.field.Boat.immatriculation')}" - disabled="true"/> - <s:textfield name="updateContactCommand.contact.boat.districtCode" - label="%{getText('wao.ui.field.Boat.districtCode')}" - disabled="true"/> - <s:textfield name="updateContactCommand.contact.boat.boatLength" - label="%{getText('wao.ui.field.Boat.boatLength')}" - disabled="true"/> - <s:textfield name="updateContactCommand.contact.boat.buildYear" - value="%{'' + updateContactCommand.contact.boat.buildYear}" - label="%{getText('wao.ui.field.Boat.buildYear')}" - disabled="true"/> + <table class="table"> + <tbody> + <tr> + <th> + <s:text name="wao.ui.field.Boat.name"/> + </th> + <td> + <s:property value="updateContactCommand.contact.boat.name"/> + </td> + </tr> + <tr> + <th> + <s:text name="wao.ui.field.Boat.immatriculation"/> + </th> + <td> + <s:property value="updateContactCommand.contact.boat.immatriculation"/> + </td> + </tr> + <tr> + <th> + <s:text name="wao.ui.field.Boat.districtCode"/> + </th> + <td> + <s:property value="updateContactCommand.contact.boat.districtCode"/> + </td> + </tr> + <tr> + <th> + <s:text name="wao.ui.field.Boat.boatLength"/> + </th> + <td> + <s:property value="%{'' + updateContactCommand.contact.boat.boatLength}"/> + </td> + </tr> + <tr> + <th> + <s:text name="wao.ui.field.Boat.buildYear"/> + </th> + <td> + <s:property value="%{'' + updateContactCommand.contact.boat.buildYear}"/> + </td> + </tr> + </tbody> + </table> - <hr/> + <h3><s:text name="wao.ui.field.Contact.sampleRow"/></h3> - <s:textfield name="updateContactCommand.contact.sampleRow.professionDescription" - label="%{getText('wao.ui.field.SampleRow.profession')}" - disabled="true"/> - <s:textfield name="updateContactCommand.contact.sampleRow.programName" - label="%{getText('wao.ui.field.SampleRow.programName')}" - disabled="true"/> - <s:textfield name="updateContactCommand.contact.sampleRow.periodBegin" - label="%{getText('wao.ui.field.SampleRow.periodBegin')}" - value="%{formatMonth(updateContactCommand.contact.sampleRow.periodBegin)}" - cssClass="input-small" - disabled="true"/> - <s:textfield name="updateContactCommand.contact.sampleRow.periodEnd" - label="%{getText('wao.ui.field.SampleRow.periodEnd')}" - value="%{formatMonth(updateContactCommand.contact.sampleRow.periodEnd)}" - cssClass="input-small" - disabled="true"/> + <table class="table"> + <tbody> + <tr> + <th> + <s:text name="wao.ui.field.SampleRow.profession"/> + </th> + <td> + <s:property value="updateContactCommand.contact.sampleRow.professionDescription"/> + </td> + </tr> + <tr> + <th> + <s:text name="wao.ui.field.SampleRow.programName"/> + </th> + <td> + <s:property value="updateContactCommand.contact.sampleRow.programName"/> + </td> + </tr> + <tr> + <th> + <s:text name="wao.ui.field.SampleRow.periodBegin"/> + </th> + <td> + <s:property value="%{formatMonth(updateContactCommand.contact.sampleRow.periodBegin)}"/> + </td> + </tr> + <tr> + <th> + <s:text name="wao.ui.field.SampleRow.periodEnd"/> + </th> + <td> + <s:property value="%{formatMonth(updateContactCommand.contact.sampleRow.periodEnd)}"/> + </td> + </tr> + </tbody> + </table> - <hr/> +</aside> - <s:textfield name="updateContactCommand.contact.creationDate" - label="%{getText('wao.ui.field.Contact.creationDate')}" - disabled="true"/> - <%--value="%{formatDate(updateContactCommand.contact.creationDate)}"--%> - </fieldset> +<s:form> + <s:hidden name="contactId" value="%{contactId}"/> + <fieldset> <legend><s:text name="wao.ui.misc.observers"/></legend> Modified: trunk/wao-web/src/main/webapp/wao.css =================================================================== --- trunk/wao-web/src/main/webapp/wao.css 2014-05-13 15:08:56 UTC (rev 1935) +++ trunk/wao-web/src/main/webapp/wao.css 2014-05-13 15:10:44 UTC (rev 1936) @@ -158,6 +158,11 @@ max-width: 100%; } +aside { + float: right; + max-width: 360px; +} + /** * Le Menu */

1 0

r1935 - trunk/wao-persistence/src/main/java/fr/ifremer/wao/entity
by bleny＠users.forge.codelutin.com 13 May '14

13 May '14

Author: bleny Date: 2014-05-13 17:08:56 +0200 (Tue, 13 May 2014) New Revision: 1935 Url: http://forge.codelutin.com/projects/wao/repository/revisions/1935 Log: implements toString on an entity Modified: trunk/wao-persistence/src/main/java/fr/ifremer/wao/entity/WaoUserImpl.java Modified: trunk/wao-persistence/src/main/java/fr/ifremer/wao/entity/WaoUserImpl.java =================================================================== --- trunk/wao-persistence/src/main/java/fr/ifremer/wao/entity/WaoUserImpl.java 2014-05-13 14:32:08 UTC (rev 1934) +++ trunk/wao-persistence/src/main/java/fr/ifremer/wao/entity/WaoUserImpl.java 2014-05-13 15:08:56 UTC (rev 1935) @@ -24,6 +24,8 @@ package fr.ifremer.wao.entity; +import com.google.common.base.Objects; + import java.util.ArrayList; import java.util.Collection; import java.util.List; @@ -90,4 +92,11 @@ removeUserProfile(userProfile); } } + + @Override + public String toString() { + return Objects.toStringHelper(this) + .add(PROPERTY_LOGIN, login) + .toString(); + } }

1 0

r1934 - in trunk: wao-persistence/src/main/java/fr/ifremer/wao wao-services/src/main/java/fr/ifremer/wao/services/service wao-services/src/main/java/fr/ifremer/wao/services/service/mail wao-services/src/main/resources/email wao-services/src/main/resources/i18n
by bleny＠users.forge.codelutin.com 13 May '14

13 May '14

Author: bleny Date: 2014-05-13 16:32:08 +0200 (Tue, 13 May 2014) New Revision: 1934 Url: http://forge.codelutin.com/projects/wao/repository/revisions/1934 Log: refs #4487 send notifications to update allegro wallets for observers Added: trunk/wao-services/src/main/java/fr/ifremer/wao/services/service/mail/AddBoatToUserAllegroWalletEmail.java trunk/wao-services/src/main/resources/email/AddBoatToUserAllegroWalletEmail_en.mustache trunk/wao-services/src/main/resources/email/AddBoatToUserAllegroWalletEmail_fr.mustache Modified: trunk/wao-persistence/src/main/java/fr/ifremer/wao/WaoApplicationConfig.java trunk/wao-persistence/src/main/java/fr/ifremer/wao/WaoApplicationConfigOption.java trunk/wao-services/src/main/java/fr/ifremer/wao/services/service/ObsMerContactsService.java trunk/wao-services/src/main/java/fr/ifremer/wao/services/service/mail/EmailService.java trunk/wao-services/src/main/resources/i18n/wao-services_en_GB.properties trunk/wao-services/src/main/resources/i18n/wao-services_fr_FR.properties Modified: trunk/wao-persistence/src/main/java/fr/ifremer/wao/WaoApplicationConfig.java =================================================================== --- trunk/wao-persistence/src/main/java/fr/ifremer/wao/WaoApplicationConfig.java 2014-05-13 12:37:37 UTC (rev 1933) +++ trunk/wao-persistence/src/main/java/fr/ifremer/wao/WaoApplicationConfig.java 2014-05-13 14:32:08 UTC (rev 1934) @@ -118,4 +118,8 @@ public boolean isGoogleAnalyticsEnabled() { return applicationConfig.getOptionAsBoolean(WaoApplicationConfigOption.GOOGLE_ANALYTICS_ENABLED.key); } + + public String getEmailToUpdateAllegroWallets() { + return applicationConfig.getOption(WaoApplicationConfigOption.EMAIL_TO_UPDATE_ALLEGRO_WALLETS.key); + } } Modified: trunk/wao-persistence/src/main/java/fr/ifremer/wao/WaoApplicationConfigOption.java =================================================================== --- trunk/wao-persistence/src/main/java/fr/ifremer/wao/WaoApplicationConfigOption.java 2014-05-13 12:37:37 UTC (rev 1933) +++ trunk/wao-persistence/src/main/java/fr/ifremer/wao/WaoApplicationConfigOption.java 2014-05-13 14:32:08 UTC (rev 1934) @@ -65,8 +65,14 @@ "googleAnalyticsEnabled", "S'il faut activer les statistitques Google Analytics", "false", - Boolean.class); + Boolean.class), + EMAIL_TO_UPDATE_ALLEGRO_WALLETS( + "wao.emailToUpdateAllegroWallets", + "Adresse email à laquelle seront envoyé les demandes d'ajout au portefeuille", + null, + String.class); + protected final String key; protected final String description; protected final Class<?> type; 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-13 12:37:37 UTC (rev 1933) +++ trunk/wao-services/src/main/java/fr/ifremer/wao/services/service/ObsMerContactsService.java 2014-05-13 14:32:08 UTC (rev 1934) @@ -46,6 +46,8 @@ import fr.ifremer.wao.entity.WaoUserTopiaDao; import fr.ifremer.wao.services.AuthenticatedWaoUser; import fr.ifremer.wao.services.service.csv.ObsMerContactImportExportModel; +import fr.ifremer.wao.services.service.mail.AddBoatToUserAllegroWalletEmail; +import fr.ifremer.wao.services.service.mail.EmailService; import fr.ifremer.wao.services.service.mail.MammalsObservationEmail; import org.apache.commons.collections4.CollectionUtils; import org.apache.commons.io.IOUtils; @@ -61,9 +63,11 @@ import org.nuiton.csv.ImportConf; import org.nuiton.csv.ImportModel; import org.nuiton.csv.ImportRow; +import org.nuiton.i18n.I18n; import org.nuiton.topia.persistence.TopiaEntity; import org.nuiton.topia.persistence.pager.TopiaPagerBean; import org.nuiton.util.DateUtil; +import org.nuiton.util.StringUtil; import org.nuiton.util.beans.Binder; import org.nuiton.util.beans.BinderFactory; @@ -222,7 +226,7 @@ List<Contact> contacts = dao.findAll(filter, true); ExportModel<Contact> exportModel = ObsMerContactImportExportModel.forExport(getLocale(), - filter.getSampleRowFilter().getObsProgram()); + filter.getSampleRowFilter().getObsProgram()); Export<Contact> export = Export.newExport(exportModel, contacts); @@ -253,11 +257,11 @@ Locale l = getLocale(); ImportModel<Contact> contactImportModel = ObsMerContactImportExportModel.forImport(l, - obsProgram, - waoUsers, - sampleRows, - boats, - motives); + obsProgram, + waoUsers, + sampleRows, + boats, + motives); ImportConf importConf = new ImportConf(); importConf.setStrictMode(true); @@ -653,6 +657,9 @@ save0(updateContactCommand); commit(); + + updateAllegroWalletIfNecessary(updateContactCommand); + } public void delete(String contactId) throws IllegalDeletionException { @@ -736,8 +743,120 @@ dao.update(contact); } + } + protected void updateAllegroWalletIfNecessary(UpdateContactCommand updateContactCommand) { + + Contact contact = updateContactCommand.getContact(); + ContactState contactState = contact.getContactState(); + ObsProgram obsProgram = contact.getObsProgram(); + + boolean addBoatToObserversAllegroWallet = false; + + if (obsProgram == ObsProgram.OBSMER) { + addBoatToObserversAllegroWallet = contactState == ContactState.OBSERVATION_DONE + || contactState == ContactState.OBSERVATION_EXPECTED; + } else if (obsProgram == ObsProgram.OBSVENTE) { + addBoatToObserversAllegroWallet = ContactState.OBSERVATION_DONE == contactState; + } + + if (addBoatToObserversAllegroWallet) { + + Boat boat = contact.getBoat(); + + String info; + + if (contactState == ContactState.OBSERVATION_EXPECTED) { + info = I18n.l( + serviceContext.getLocale(), + "wao.email.addBoatToUserAllegroWallet.contactExpected", + WaoUtils.formatDate(serviceContext.getLocale(), contact.getObservationBeginDate())); + } else if (contactState == ContactState.OBSERVATION_DONE) { + info = I18n.l( + serviceContext.getLocale(), + "wao.email.addBoatToUserAllegroWallet.contactDone", + WaoUtils.formatDateTime(serviceContext.getLocale(), contact.getObservationBeginDate()), + WaoUtils.formatDateTime(serviceContext.getLocale(), contact.getObservationEndDate())); + } else { + throw new IllegalStateException(contactState + " should not lead to a mail sent"); + } + + // in obsvente, only the main observer + Collection<WaoUser> observers; + if (ObsProgram.OBSVENTE.equals(obsProgram)) { + observers = ImmutableSet.of(contact.getMainObserver()); + } else if (ObsProgram.OBSMER.equals(obsProgram)) { + observers = contact.getAllObservers(); + } else { + throw new IllegalStateException(); + } + + EmailService emailService = getEmailService(); + + WaoUserTopiaDao waoUserDao = getWaoUserDao(); + + for (WaoUser observer : observers) { + + boolean boatAlreadyInWallet = observer.containsAllegroWallet(boat); + + if (boatAlreadyInWallet) { + + if (log.isInfoEnabled()) { + log.info("user " + observer + " already has " + boat + " in his allegroWallet"); + } + + } else { + + if (log.isInfoEnabled()) { + log.info("user " + observer + " miss " + boat + " in his allegro wallet, adding"); + } + + String observerLogin = observer.getLogin(); + String emailToUpdateAllegroWallets = getApplicationConfig().getEmailToUpdateAllegroWallets(); + + AddBoatToUserAllegroWalletEmail email = + emailService.newAddBoatToUserAllegroWalletEmail(); + + email.setBoat(boat); + email.setObserver(observer); + email.setInfo(info); + email.setObsProgram(contact.getObsProgram()); + + if ( ! StringUtil.isEmail(observerLogin)) { + if (log.isInfoEnabled()) { + log.info("user login is not a email, won't send anything: " + observerLogin + " email=" + email); + } + } else if ( ! observer.isActive()) { + if (log.isInfoEnabled()) { + log.info("observer is no longer active, won't send " + email); + } + } else if (StringUtils.isBlank(emailToUpdateAllegroWallets)) { + if (log.isInfoEnabled()) { + log.info("no email to update allegro wallets provided in configuration, won't send " + email); + } + } else if ( ! StringUtil.isEmail(emailToUpdateAllegroWallets)) { + if (log.isWarnEnabled()) { + log.warn("email to update allegro wallets provided in configuration is not valid, won't send " + emailToUpdateAllegroWallets); + } + } else { + + email.addBcc(observer); + + email.addTo(emailToUpdateAllegroWallets); + + emailService.send(email); + + observer.addAllegroWallet(boat); + waoUserDao.update(observer); + commit(); + + } + } + } + } + } + public Contact createContact(AuthenticatedWaoUser authenticatedWaoUser, String sampleRowId, String boatId) { if (log.isInfoEnabled()) { Added: trunk/wao-services/src/main/java/fr/ifremer/wao/services/service/mail/AddBoatToUserAllegroWalletEmail.java =================================================================== --- trunk/wao-services/src/main/java/fr/ifremer/wao/services/service/mail/AddBoatToUserAllegroWalletEmail.java (rev 0) +++ trunk/wao-services/src/main/java/fr/ifremer/wao/services/service/mail/AddBoatToUserAllegroWalletEmail.java 2014-05-13 14:32:08 UTC (rev 1934) @@ -0,0 +1,67 @@ +package fr.ifremer.wao.services.service.mail; + +import fr.ifremer.wao.entity.Boat; +import fr.ifremer.wao.entity.ObsProgram; +import fr.ifremer.wao.entity.WaoUser; +import org.nuiton.i18n.I18n; + +import java.util.Locale; + +public class AddBoatToUserAllegroWalletEmail extends WaoMail { + + protected Boat boat; + + protected WaoUser observer; + + protected String info; + + private ObsProgram obsProgram; + + public AddBoatToUserAllegroWalletEmail(Locale locale) { + super(locale); + } + + @Override + public String getSubject() { + String subject = I18n.l( + getLocale(), + "wao.email.addBoatToUserAllegroWallet.subject", + I18n.l(getLocale(), obsProgram.getI18nKey()), + boat.getImmatriculation(), + observer.getLogin() + ); + return subject; + } + + public void setBoat(Boat boat) { + this.boat = boat; + } + + public Boat getBoat() { + return boat; + } + + public void setObserver(WaoUser observer) { + this.observer = observer; + } + + public WaoUser getObserver() { + return observer; + } + + public void setInfo(String info) { + this.info = info; + } + + public String getInfo() { + return info; + } + + public void setObsProgram(ObsProgram obsProgram) { + this.obsProgram = obsProgram; + } + + public ObsProgram getObsProgram() { + return obsProgram; + } +} Modified: trunk/wao-services/src/main/java/fr/ifremer/wao/services/service/mail/EmailService.java =================================================================== --- trunk/wao-services/src/main/java/fr/ifremer/wao/services/service/mail/EmailService.java 2014-05-13 12:37:37 UTC (rev 1933) +++ trunk/wao-services/src/main/java/fr/ifremer/wao/services/service/mail/EmailService.java 2014-05-13 14:32:08 UTC (rev 1934) @@ -139,4 +139,7 @@ } + public AddBoatToUserAllegroWalletEmail newAddBoatToUserAllegroWalletEmail() { + return new AddBoatToUserAllegroWalletEmail(getLocale()); + } } \ No newline at end of file Added: trunk/wao-services/src/main/resources/email/AddBoatToUserAllegroWalletEmail_en.mustache =================================================================== --- trunk/wao-services/src/main/resources/email/AddBoatToUserAllegroWalletEmail_en.mustache (rev 0) +++ trunk/wao-services/src/main/resources/email/AddBoatToUserAllegroWalletEmail_en.mustache 2014-05-13 14:32:08 UTC (rev 1934) @@ -0,0 +1,10 @@ +Hello, + +Please, add boat {{boat.immatriculation}} to the ALLEGRO wallet of the observer +{{observer.fullName}} {{observer.company.name}} ({{observer.login}}). + +{{info}} + +Regards, + +Wao Added: trunk/wao-services/src/main/resources/email/AddBoatToUserAllegroWalletEmail_fr.mustache =================================================================== --- trunk/wao-services/src/main/resources/email/AddBoatToUserAllegroWalletEmail_fr.mustache (rev 0) +++ trunk/wao-services/src/main/resources/email/AddBoatToUserAllegroWalletEmail_fr.mustache 2014-05-13 14:32:08 UTC (rev 1934) @@ -0,0 +1,10 @@ +Bonjour, + +Merci d'ajouter le navire {{boat.immatriculation}} au portefeuille ALLEGRO de l'observateur +{{observer.fullName}} {{observer.company.name}} ({{observer.login}}). + +{{info}} + +Cordialement, + +Wao Modified: trunk/wao-services/src/main/resources/i18n/wao-services_en_GB.properties =================================================================== --- trunk/wao-services/src/main/resources/i18n/wao-services_en_GB.properties 2014-05-13 12:37:37 UTC (rev 1933) +++ trunk/wao-services/src/main/resources/i18n/wao-services_en_GB.properties 2014-05-13 14:32:08 UTC (rev 1934) @@ -26,6 +26,9 @@ wao.business.validationState.refused=Refused wao.business.validationState.standby=Stand by wao.business.validationState.validated=validate +wao.email.addBoatToUserAllegroWallet.contactDone=This demand is for observation expected done between %s and %s +wao.email.addBoatToUserAllegroWallet.contactExpected=This demand is for observation expected on %s +wao.email.addBoatToUserAllegroWallet.subject=%s: add boat %d to ALLEGRO wallet for user %s wao.export.ical.desc=wtih %s wao.export.ical.title=ObsDeb Observation wao.import.boat.failure.invalid.locationCode=The code '%s' is not a valid location code Modified: trunk/wao-services/src/main/resources/i18n/wao-services_fr_FR.properties =================================================================== --- trunk/wao-services/src/main/resources/i18n/wao-services_fr_FR.properties 2014-05-13 12:37:37 UTC (rev 1933) +++ trunk/wao-services/src/main/resources/i18n/wao-services_fr_FR.properties 2014-05-13 14:32:08 UTC (rev 1934) @@ -25,6 +25,9 @@ wao.business.validationState.refused=Réfusé wao.business.validationState.standby=En attente wao.business.validationState.validated=Validé +wao.email.addBoatToUserAllegroWallet.contactDone=Cette demande émane de l'observation réalisée entre le %s et le %s. +wao.email.addBoatToUserAllegroWallet.contactExpected=Cette demande émane de l'observation prévue le %s. +wao.email.addBoatToUserAllegroWallet.subject=%s : ajout navire %d sur portefeuille ALLEGRO de %s wao.export.ical.desc=avec %s wao.export.ical.title=Observation ObsDeb wao.import.boat.failure.invalid.locationCode=Le code '%s' n'est pas un code de lieu valide

1 0

r1933 - in trunk: wao-persistence/src/main/java/fr/ifremer/wao/entity wao-persistence/src/main/xmi wao-services/src/main/java/fr/ifremer/wao/services/service wao-web/src/main/resources/fr/ifremer/wao/services/service wao-web/src/main/webapp/WEB-INF/content/obsmer
by bleny＠users.forge.codelutin.com 13 May '14

13 May '14

Author: bleny Date: 2014-05-13 14:37:37 +0200 (Tue, 13 May 2014) New Revision: 1933 Url: http://forge.codelutin.com/projects/wao/repository/revisions/1933 Log: refs #4490 add a warn message before creation of a contact for an expired sample row Added: trunk/wao-web/src/main/resources/fr/ifremer/wao/services/service/BoatDetails-conversion.properties Modified: trunk/wao-persistence/src/main/java/fr/ifremer/wao/entity/SampleRowImpl.java trunk/wao-persistence/src/main/xmi/wao-model.zargo trunk/wao-services/src/main/java/fr/ifremer/wao/services/service/BoatDetails.java trunk/wao-services/src/main/java/fr/ifremer/wao/services/service/ObsMerBoatsService.java trunk/wao-web/src/main/webapp/WEB-INF/content/obsmer/boat-details.jsp Modified: trunk/wao-persistence/src/main/java/fr/ifremer/wao/entity/SampleRowImpl.java =================================================================== --- trunk/wao-persistence/src/main/java/fr/ifremer/wao/entity/SampleRowImpl.java 2014-05-13 09:45:36 UTC (rev 1932) +++ trunk/wao-persistence/src/main/java/fr/ifremer/wao/entity/SampleRowImpl.java 2014-05-13 12:37:37 UTC (rev 1933) @@ -292,4 +292,17 @@ } return trulyElligibleBoats; } + + @Override + public boolean isExpired(Date date) { + boolean expired = true; + if (isSampleMonthNotEmpty()) { + for (SampleMonth sampleMonth : getSampleMonth()) { + if (sampleMonth.getPeriodDate().after(date) || sampleMonth.isPeriodDatesContains(date)) { + expired = false; + } + } + } + return expired; + } } Modified: trunk/wao-persistence/src/main/xmi/wao-model.zargo =================================================================== (Binary files differ) Modified: trunk/wao-services/src/main/java/fr/ifremer/wao/services/service/BoatDetails.java =================================================================== --- trunk/wao-services/src/main/java/fr/ifremer/wao/services/service/BoatDetails.java 2014-05-13 09:45:36 UTC (rev 1932) +++ trunk/wao-services/src/main/java/fr/ifremer/wao/services/service/BoatDetails.java 2014-05-13 12:37:37 UTC (rev 1933) @@ -28,13 +28,18 @@ import fr.ifremer.wao.entity.SampleRow; import java.io.Serializable; +import java.util.Date; +import java.util.HashSet; import java.util.LinkedList; import java.util.List; +import java.util.Set; public class BoatDetails implements Serializable { private static final long serialVersionUID = 1L; + protected Date now; + protected ObsProgram obsProgram; protected BoatInfos boatInfos; @@ -43,7 +48,8 @@ protected long contactsCount; - public BoatDetails(ObsProgram obsProgram, BoatInfos boatInfos, Contact mostRecentContact, long contactsCount) { + public BoatDetails(Date now, ObsProgram obsProgram, BoatInfos boatInfos, Contact mostRecentContact, long contactsCount) { + this.now = now; this.obsProgram = obsProgram; this.boatInfos = boatInfos; this.mostRecentContact = mostRecentContact; @@ -68,7 +74,7 @@ List<SampleRow> elligibleForSampleRows = new LinkedList<>(); for (ElligibleBoat elligibleBoat : boatInfos.getBoat().getElligibleBoat()) { SampleRow sampleRow = elligibleBoat.getSampleRow(); - if (sampleRow.getCompany().equals(boatInfos.getCompany()) && sampleRow.getObsProgram().equals(obsProgram)) { + if (boatInfos.getCompany().equals(sampleRow.getCompany()) && sampleRow.getObsProgram().equals(obsProgram)) { if (elligibleBoat.isBoatElligible()) { elligibleForSampleRows.add(sampleRow); } @@ -77,6 +83,16 @@ return elligibleForSampleRows; } + public Set<String> getExpiredSampleRowIds() { + Set<String> expiredSampleRowIds = new HashSet<>(); + for (SampleRow sampleRow : getElligibleForSampleRows()) { + if (sampleRow.isExpired(now)) { + expiredSampleRowIds.add(sampleRow.getTopiaId()); + } + } + return expiredSampleRowIds; + } + public long getContactsCount() { return contactsCount; } Modified: trunk/wao-services/src/main/java/fr/ifremer/wao/services/service/ObsMerBoatsService.java =================================================================== --- trunk/wao-services/src/main/java/fr/ifremer/wao/services/service/ObsMerBoatsService.java 2014-05-13 09:45:36 UTC (rev 1932) +++ trunk/wao-services/src/main/java/fr/ifremer/wao/services/service/ObsMerBoatsService.java 2014-05-13 12:37:37 UTC (rev 1933) @@ -175,8 +175,10 @@ filter.getSampleRowFilter().setCompanyIds(ImmutableSet.of(companyId)); long contactsCount = getContactDao().count(filter); - BoatDetails boatDetails = new BoatDetails(obsProgram, boatInfos, mostRecentContact, contactsCount); + Date now = serviceContext.getNow(); + BoatDetails boatDetails = new BoatDetails(now, obsProgram, boatInfos, mostRecentContact, contactsCount); + return boatDetails; } Added: trunk/wao-web/src/main/resources/fr/ifremer/wao/services/service/BoatDetails-conversion.properties =================================================================== --- trunk/wao-web/src/main/resources/fr/ifremer/wao/services/service/BoatDetails-conversion.properties (rev 0) +++ trunk/wao-web/src/main/resources/fr/ifremer/wao/services/service/BoatDetails-conversion.properties 2014-05-13 12:37:37 UTC (rev 1933) @@ -0,0 +1 @@ +expiredSampleRowIds=org.nuiton.web.struts2.converters.JsonConverter Modified: trunk/wao-web/src/main/webapp/WEB-INF/content/obsmer/boat-details.jsp =================================================================== --- trunk/wao-web/src/main/webapp/WEB-INF/content/obsmer/boat-details.jsp 2014-05-13 09:45:36 UTC (rev 1932) +++ trunk/wao-web/src/main/webapp/WEB-INF/content/obsmer/boat-details.jsp 2014-05-13 12:37:37 UTC (rev 1933) @@ -82,9 +82,19 @@ // création d'un contact depuis une ligne éligible - $('input[name="sampleRowId"]').change(function () { - $('#createContactFromBoatButton').removeAttr('disabled'); + var $createContactFromBoatButton = $('#createContactFromBoatButton'); + var $sampleRowIdInput = $('input[name="sampleRowId"]'); + var expiredSampleRowIds = <s:property value="boatDetails.expiredSampleRowIds" escapeHtml="false"/> + $sampleRowIdInput.change(function () { + $createContactFromBoatButton.removeAttr('disabled'); }); + $createContactFromBoatButton.click(function (e) { + var selectedSampleRowIsExpired = $.inArray($('input[name="sampleRowId"]:checked').val(), expiredSampleRowIds); + var confirmMessage = "<s:text name="wao.ui.contacts.createFromBoat.warn"/>"; + if (selectedSampleRowIsExpired && ! confirm(confirmMessage)) { + e.preventDefault(); + } + }); }); </script>

1 0

r1932 - trunk/wao-web/src/main/webapp/WEB-INF/content/obsmer
by bleny＠users.forge.codelutin.com 13 May '14

13 May '14

Author: bleny Date: 2014-05-13 11:45:36 +0200 (Tue, 13 May 2014) New Revision: 1932 Url: http://forge.codelutin.com/projects/wao/repository/revisions/1932 Log: refs #4490 replace multiple links to create contact from boat by radio form Modified: trunk/wao-web/src/main/webapp/WEB-INF/content/obsmer/boat-details.jsp Modified: trunk/wao-web/src/main/webapp/WEB-INF/content/obsmer/boat-details.jsp =================================================================== --- trunk/wao-web/src/main/webapp/WEB-INF/content/obsmer/boat-details.jsp 2014-05-13 09:05:52 UTC (rev 1931) +++ trunk/wao-web/src/main/webapp/WEB-INF/content/obsmer/boat-details.jsp 2014-05-13 09:45:36 UTC (rev 1932) @@ -24,6 +24,8 @@ <script> $(document).ready(function () { + // le formulaire concernant l'interlocuteur + var $boatInfosForm = $('#boat-infos-form'); var $saveBoatInfosButton = $('#save-boat-infos'); var $unlockBoatInfosFormButton = $('#unlock-boat-infos-form'); @@ -44,6 +46,9 @@ $unlockBoatInfosFormButton.attr('disabled', 'disabled'); }); + + // le calcul des sollicitations + var $boatContactsCountForm = $('#boat-contacts-count-form'); var $boatContactsCountsTable = $('#boat-contacts-counts-table'); @@ -74,6 +79,13 @@ $('#get-boat-contacts-count').click(getBoatContactsCount); $boatContactsCountForm.enterKey(getBoatContactsCount); + + // création d'un contact depuis une ligne éligible + + $('input[name="sampleRowId"]').change(function () { + $('#createContactFromBoatButton').removeAttr('disabled'); + }); + }); </script> @@ -158,22 +170,28 @@ </s:if> <s:else> <s:text name="wao.ui.boats.associatedLine"/> - <ul> - <s:iterator value="boatDetails.elligibleForSampleRows"> - <li> - <s:property value="code"/> - <s:if test="boatDetails.newContactCreatable && authenticatedWaoUser.authorizedToCreateContact"> - <s:url action="create-contact" id="createContactUrl"> - <s:param name="boatId" value="boatDetails.boatInfos.boat.topiaId"/> - <s:param name="sampleRowId" value="topiaId"/> - </s:url> - <s:a href="%{createContactUrl}"> - <s:text name="wao.ui.contacts.createFromBoat"/> - </s:a> - </s:if> - </li> - </s:iterator> - </ul> + <s:if test="boatDetails.newContactCreatable && authenticatedWaoUser.authorizedToCreateContact"> + <s:form action="create-contact"> + + <s:hidden name="boatId" value="%{boatDetails.boatInfos.boat.topiaId}"/> + + <s:radio name="sampleRowId" list="boatDetails.elligibleForSampleRows" listKey="topiaId" listValue="code" /> + + <s:submit id="createContactFromBoatButton" type="button" cssClass="btn btn-success" disabled="true"> + <i class="icon-plus"></i> + <s:text name="wao.ui.contacts.createFromBoat"/> + </s:submit> + </s:form> + </s:if> + <s:else> + <ul> + <s:iterator value="boatDetails.elligibleForSampleRows"> + <li> + <s:property value="code"/> + </li> + </s:iterator> + </ul> + </s:else> </s:else> <s:if test="authenticatedWaoUser.authorizedToCreateContact"> <div class="alert alert-info">

1 0

r1931 - 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 13 May '14

13 May '14

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

1 0

r1930 - in trunk/wao-web/src/main: java/fr/ifremer/wao/web webapp/WEB-INF/content/obsmer
by bleny＠users.forge.codelutin.com 13 May '14

13 May '14

Author: bleny Date: 2014-05-13 10:47:28 +0200 (Tue, 13 May 2014) New Revision: 1930 Url: http://forge.codelutin.com/projects/wao/repository/revisions/1930 Log: refs #4490 use value instead of placeholder in compute contacts count form Modified: trunk/wao-web/src/main/java/fr/ifremer/wao/web/WaoJspActionSupport.java trunk/wao-web/src/main/webapp/WEB-INF/content/obsmer/boat-details.jsp Modified: trunk/wao-web/src/main/java/fr/ifremer/wao/web/WaoJspActionSupport.java =================================================================== --- trunk/wao-web/src/main/java/fr/ifremer/wao/web/WaoJspActionSupport.java 2014-05-13 08:43:06 UTC (rev 1929) +++ trunk/wao-web/src/main/java/fr/ifremer/wao/web/WaoJspActionSupport.java 2014-05-13 08:47:28 UTC (rev 1930) @@ -24,6 +24,7 @@ import fr.ifremer.wao.WaoUtils; import fr.ifremer.wao.entity.ObsProgram; import fr.ifremer.wao.services.AuthenticatedWaoUser; +import org.apache.commons.lang3.time.DateUtils; import java.util.Date; @@ -101,4 +102,8 @@ return paginationUrl; } + public String getOneYearAgoDatePlaceHolder() { + return formatDate(DateUtils.addYears(new Date(), -1)); + } + } Modified: trunk/wao-web/src/main/webapp/WEB-INF/content/obsmer/boat-details.jsp =================================================================== --- trunk/wao-web/src/main/webapp/WEB-INF/content/obsmer/boat-details.jsp 2014-05-13 08:43:06 UTC (rev 1929) +++ trunk/wao-web/src/main/webapp/WEB-INF/content/obsmer/boat-details.jsp 2014-05-13 08:47:28 UTC (rev 1930) @@ -241,8 +241,7 @@ <s:text name="wao.ui.boatDetails.boatContactsCounts.since"/> </span> - <s:set name="sincePlaceholder" value="%{formatDate(new java.util.Date())}"/> - <input name="since" type="text" placeholder="<s:property value="%{#sincePlaceholder}"/>"/> + <input name="since" type="text" value="<s:property value="%{oneYearAgoDatePlaceHolder}"/>"/> <button type="button" id="get-boat-contacts-count" class="btn"> <i class="icon-plus"></i> <s:text name="wao.ui.boatDetails.boatContactsCounts.compute" />

1 0

r1929 - in trunk/wao-web/src/main: resources/i18n webapp/WEB-INF/content/obsmer
by bleny＠users.forge.codelutin.com 13 May '14

13 May '14

Author: bleny Date: 2014-05-13 10:43:06 +0200 (Tue, 13 May 2014) New Revision: 1929 Url: http://forge.codelutin.com/projects/wao/repository/revisions/1929 Log: refs #4490 review orders of sections of boat-details Modified: trunk/wao-web/src/main/resources/i18n/wao-web_en_GB.properties trunk/wao-web/src/main/resources/i18n/wao-web_fr_FR.properties trunk/wao-web/src/main/webapp/WEB-INF/content/obsmer/boat-details.jsp Modified: trunk/wao-web/src/main/resources/i18n/wao-web_en_GB.properties =================================================================== --- trunk/wao-web/src/main/resources/i18n/wao-web_en_GB.properties 2014-05-13 08:33:14 UTC (rev 1928) +++ trunk/wao-web/src/main/resources/i18n/wao-web_en_GB.properties 2014-05-13 08:43:06 UTC (rev 1929) @@ -97,6 +97,7 @@ wao.ui.boatDetails.boatContactsCounts.since=Since... wao.ui.boatDetails.boatContactsCounts.title=Compute observations done wao.ui.boatList=List of %s boats +wao.ui.boatinfo.contacts=Contacts with %s wao.ui.boatinfo.title=Infos about %s wao.ui.boats.associatedLine=Sample row(s) associated with this boat wao.ui.boats.boatLength=Length Modified: trunk/wao-web/src/main/resources/i18n/wao-web_fr_FR.properties =================================================================== --- trunk/wao-web/src/main/resources/i18n/wao-web_fr_FR.properties 2014-05-13 08:33:14 UTC (rev 1928) +++ trunk/wao-web/src/main/resources/i18n/wao-web_fr_FR.properties 2014-05-13 08:43:06 UTC (rev 1929) @@ -97,6 +97,7 @@ wao.ui.boatDetails.boatContactsCounts.since=Depuis le... wao.ui.boatDetails.boatContactsCounts.title=Calculer le nombre de sollicitations du navire wao.ui.boatList=Liste de %s navires +wao.ui.boatinfo.contacts=Contacts pour le navire %s wao.ui.boatinfo.title=Informations sur %s wao.ui.boats.associatedLine=Ligne(s) du plan associée(s) à ce navire wao.ui.boats.boatLength=Longueur @@ -106,7 +107,7 @@ wao.ui.boats.contacts.existing=Contacts existants wao.ui.boats.contacts.none=Aucun contact wao.ui.boats.district=Quartier maritime -wao.ui.boats.info=Autres informations sur ce navire +wao.ui.boats.info=Données sur ce navire wao.ui.boats.interlocutor=Coordonnées de l'interlocuteur wao.ui.boats.nbObservations=%s observation(s) dont %s avec votre société wao.ui.boats.portOfRegistry=Port Modified: trunk/wao-web/src/main/webapp/WEB-INF/content/obsmer/boat-details.jsp =================================================================== --- trunk/wao-web/src/main/webapp/WEB-INF/content/obsmer/boat-details.jsp 2014-05-13 08:33:14 UTC (rev 1928) +++ trunk/wao-web/src/main/webapp/WEB-INF/content/obsmer/boat-details.jsp 2014-05-13 08:43:06 UTC (rev 1929) @@ -21,12 +21,6 @@ <%@ page language="java" contentType="text/html; charset=utf-8" pageEncoding="utf-8" %> <%@taglib uri="/struts-tags" prefix="s" %> -<h2> - <s:text name="wao.ui.boatinfo.title"> - <s:param value="boatDetails.boatInfos.boat.name"/> - </s:text> -</h2> - <script> $(document).ready(function () { @@ -81,78 +75,10 @@ }); </script> -<h3> - <s:text name="wao.ui.boats.interlocutor"/> -</h3> - -<s:form id="boat-infos-form" cssClass="form-horizontal"> - - <s:hidden name="boatId" value="%{boatDetails.boatInfos.boat.topiaId}" /> - <s:hidden name="companyId" value="%{boatDetails.boatInfos.company.topiaId}" /> - - <s:textfield name="boatInfos.contactFirstName" value="%{boatDetails.boatInfos.contactFirstName}" label="%{getText('wao.ui.field.BoatInfos.contactFirstName')}" readonly="true" cssClass="input-large" /> - <s:textfield name="boatInfos.contactLastName" value="%{boatDetails.boatInfos.contactLastName}" label="%{getText('wao.ui.field.BoatInfos.contactLastName')}" readonly="true" cssClass="input-large" /> - <s:textfield type="email" name="boatInfos.contactEmail" value="%{boatDetails.boatInfos.contactEmail}" label="%{getText('wao.ui.field.BoatInfos.contactEmail')}" readonly="true" cssClass="input-large" /> - <s:textfield type="tel" name="boatInfos.contactPhoneNumber" value="%{boatDetails.boatInfos.contactPhoneNumber}" label="%{getText('wao.ui.field.BoatInfos.contactPhoneNumber')}" readonly="true" cssClass="input-large" /> - <s:textfield type="number" name="boatInfos.dup" value="%{boatDetails.boatInfos.dup}" label="%{getText('wao.ui.field.BoatInfos.dup')}" readonly="true" cssClass="input-small" /> - <s:textfield name="boatInfos.contactAddress1" value="%{boatDetails.boatInfos.contactAddress1}" label="%{getText('wao.ui.field.BoatInfos.contactAddress1')}" readonly="true" cssClass="input-xxlarge" /> - <s:textfield name="boatInfos.contactAddress2" value="%{boatDetails.boatInfos.contactAddress2}" label="%{getText('wao.ui.field.BoatInfos.contactAddress2')}" readonly="true" cssClass="input-xxlarge" /> - <s:textfield name="boatInfos.contactPostalCode" value="%{boatDetails.boatInfos.contactPostalCode}" label="%{getText('wao.ui.field.BoatInfos.contactPostalCode')}" readonly="true" cssClass="input-small" /> - <s:textfield name="boatInfos.contactCity" value="%{boatDetails.boatInfos.contactCity}" label="%{getText('wao.ui.field.BoatInfos.contactCity')}" readonly="true" cssClass="input-large" /> - <s:textarea name="boatInfos.comment" value="%{boatDetails.boatInfos.comment}" label="%{getText('wao.ui.field.BoatInfos.comment')}" readonly="true" cssClass="input-xxlarge" /> - - <div class="form-actions"> - <button type="button" id="unlock-boat-infos-form" class="btn"> - <i class="icon-edit"></i> <s:text name="wao.ui.action.edit" /> - </button> - - <button type="button" id="save-boat-infos" class="btn" disabled="disabled"> - <i class="icon-hdd"></i> <s:text name="wao.ui.action.save" /> - </button> - </div> - -</s:form> - -<h3> - <s:text name="wao.ui.boats.info"/> -</h3> - -<table class="table"> - <tbody> - <tr> - <th> - <s:text name="wao.ui.field.Boat.shipOwner"/> - </th> - <td> - <s:property value="boatDetails.boatInfos.boat.shipOwner.firstName"/> - <s:property value="boatDetails.boatInfos.boat.shipOwner.lastName"/> - - <s:url action="boats" id="shipOwnerBoatsUrl"> - <s:param name="filter.shipOwnerIds" value="boatDetails.boatInfos.boat.shipOwner.topiaId"/> - </s:url> - <s:a href="%{shipOwnerBoatsUrl}"> - <s:text name="wao.ui.action.viewShipOwnerBoats"/> - </s:a> - </td> - </tr> - <tr> - <th> - <s:text name="wao.ui.field.Boat.boatGroup"/> - </th> - <td> - <s:if test="boatDetails.boatInfos.boat.boatGroup == null"> - <s:text name="wao.ui.misc.N/A"/> - </s:if> - <s:else> - <s:property value="boatDetails.boatInfos.boat.boatGroup.description"/> - </s:else> - </td> - </tr> - </tbody> -</table> - <h2> - <s:text name="wao.ui.boats.contacts"/> + <s:text name="wao.ui.boatinfo.contacts"> + <s:param value="boatDetails.boatInfos.boat.name"/> + </s:text> </h2> <h3> @@ -323,3 +249,79 @@ </button> </div> </s:form> + +<h2> + <s:text name="wao.ui.boatinfo.title"> + <s:param value="boatDetails.boatInfos.boat.name"/> + </s:text> +</h2> + +<h3> + <s:text name="wao.ui.boats.info"/> +</h3> + +<table class="table"> + <tbody> + <tr> + <th> + <s:text name="wao.ui.field.Boat.shipOwner"/> + </th> + <td> + <s:property value="boatDetails.boatInfos.boat.shipOwner.firstName"/> + <s:property value="boatDetails.boatInfos.boat.shipOwner.lastName"/> + + <s:url action="boats" id="shipOwnerBoatsUrl"> + <s:param name="filter.shipOwnerIds" value="boatDetails.boatInfos.boat.shipOwner.topiaId"/> + </s:url> + <s:a href="%{shipOwnerBoatsUrl}"> + <s:text name="wao.ui.action.viewShipOwnerBoats"/> + </s:a> + </td> + </tr> + <tr> + <th> + <s:text name="wao.ui.field.Boat.boatGroup"/> + </th> + <td> + <s:if test="boatDetails.boatInfos.boat.boatGroup == null"> + <s:text name="wao.ui.misc.N/A"/> + </s:if> + <s:else> + <s:property value="boatDetails.boatInfos.boat.boatGroup.description"/> + </s:else> + </td> + </tr> + </tbody> +</table> + +<h3> + <s:text name="wao.ui.boats.interlocutor"/> +</h3> + +<s:form id="boat-infos-form" cssClass="form-horizontal"> + + <s:hidden name="boatId" value="%{boatDetails.boatInfos.boat.topiaId}" /> + <s:hidden name="companyId" value="%{boatDetails.boatInfos.company.topiaId}" /> + + <s:textfield name="boatInfos.contactFirstName" value="%{boatDetails.boatInfos.contactFirstName}" label="%{getText('wao.ui.field.BoatInfos.contactFirstName')}" readonly="true" cssClass="input-large" /> + <s:textfield name="boatInfos.contactLastName" value="%{boatDetails.boatInfos.contactLastName}" label="%{getText('wao.ui.field.BoatInfos.contactLastName')}" readonly="true" cssClass="input-large" /> + <s:textfield type="email" name="boatInfos.contactEmail" value="%{boatDetails.boatInfos.contactEmail}" label="%{getText('wao.ui.field.BoatInfos.contactEmail')}" readonly="true" cssClass="input-large" /> + <s:textfield type="tel" name="boatInfos.contactPhoneNumber" value="%{boatDetails.boatInfos.contactPhoneNumber}" label="%{getText('wao.ui.field.BoatInfos.contactPhoneNumber')}" readonly="true" cssClass="input-large" /> + <s:textfield type="number" name="boatInfos.dup" value="%{boatDetails.boatInfos.dup}" label="%{getText('wao.ui.field.BoatInfos.dup')}" readonly="true" cssClass="input-small" /> + <s:textfield name="boatInfos.contactAddress1" value="%{boatDetails.boatInfos.contactAddress1}" label="%{getText('wao.ui.field.BoatInfos.contactAddress1')}" readonly="true" cssClass="input-xxlarge" /> + <s:textfield name="boatInfos.contactAddress2" value="%{boatDetails.boatInfos.contactAddress2}" label="%{getText('wao.ui.field.BoatInfos.contactAddress2')}" readonly="true" cssClass="input-xxlarge" /> + <s:textfield name="boatInfos.contactPostalCode" value="%{boatDetails.boatInfos.contactPostalCode}" label="%{getText('wao.ui.field.BoatInfos.contactPostalCode')}" readonly="true" cssClass="input-small" /> + <s:textfield name="boatInfos.contactCity" value="%{boatDetails.boatInfos.contactCity}" label="%{getText('wao.ui.field.BoatInfos.contactCity')}" readonly="true" cssClass="input-large" /> + <s:textarea name="boatInfos.comment" value="%{boatDetails.boatInfos.comment}" label="%{getText('wao.ui.field.BoatInfos.comment')}" readonly="true" cssClass="input-xxlarge" /> + + <div class="form-actions"> + <button type="button" id="unlock-boat-infos-form" class="btn"> + <i class="icon-edit"></i> <s:text name="wao.ui.action.edit" /> + </button> + + <button type="button" id="save-boat-infos" class="btn" disabled="disabled"> + <i class="icon-hdd"></i> <s:text name="wao.ui.action.save" /> + </button> + </div> + +</s:form> \ No newline at end of file

1 0

r1928 - trunk/wao-web/src/main/webapp/WEB-INF/content/obsmer
by bleny＠users.forge.codelutin.com 13 May '14

13 May '14

Author: bleny Date: 2014-05-13 10:33:14 +0200 (Tue, 13 May 2014) New Revision: 1928 Url: http://forge.codelutin.com/projects/wao/repository/revisions/1928 Log: refs #4490 lock form for boat-details after save Modified: trunk/wao-web/src/main/webapp/WEB-INF/content/obsmer/boat-details.jsp Modified: trunk/wao-web/src/main/webapp/WEB-INF/content/obsmer/boat-details.jsp =================================================================== --- trunk/wao-web/src/main/webapp/WEB-INF/content/obsmer/boat-details.jsp 2014-05-12 13:42:35 UTC (rev 1927) +++ trunk/wao-web/src/main/webapp/WEB-INF/content/obsmer/boat-details.jsp 2014-05-13 08:33:14 UTC (rev 1928) @@ -30,9 +30,14 @@ <script> $(document).ready(function () { - $boatInfosForm = $('#boat-infos-form'); + var $boatInfosForm = $('#boat-infos-form'); + var $saveBoatInfosButton = $('#save-boat-infos'); + var $unlockBoatInfosFormButton = $('#unlock-boat-infos-form'); - $('#save-boat-infos').click(function () { + $saveBoatInfosButton.click(function () { + $boatInfosForm.find('input, textarea').attr('readonly', 'readonly'); + $saveBoatInfosButton.attr('disabled', 'disabled'); + $unlockBoatInfosFormButton.removeAttr('disabled'); var data = WAO.toData($boatInfosForm); var successCallback = function () { WAO.notifications.success('<s:text name="wao.ui.form.BoatInfos.success"/>'); @@ -40,13 +45,14 @@ WAO.post(WAO.OBSMER_UPDATE_BOAT_INFOS_JSON_URL, data, successCallback); }); - $('#unlock-boat-infos-form').click(function () { + $unlockBoatInfosFormButton.click(function () { $boatInfosForm.find('input[readonly], button, textarea').removeAttr('readonly').removeAttr('disabled'); - $(this).attr('disabled', 'disabled'); + $unlockBoatInfosFormButton.attr('disabled', 'disabled'); }); - $boatContactsCountForm = $('#boat-contacts-count-form'); - $boatContactsCountsTable = $('#boat-contacts-counts-table'); + var $boatContactsCountForm = $('#boat-contacts-count-form'); + var $boatContactsCountsTable = $('#boat-contacts-counts-table'); + $boatContactsCountsTable.hide(); var getBoatContactsCount = function () {

1 0