Author: bleny Date: 2012-03-15 16:22:28 +0100 (Thu, 15 Mar 2012) New Revision: 1566 Url: http://forge.codelutin.com/repositories/revision/wao/1566 Log: Evolution #665 Ajouter une contrainte de filtrage des informations par navire pour le professionnel - champs sous la forme d'une liste d'immatriculation Modified: trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/pages/Administration.java trunk/wao-ui/src/main/webapp/Administration.tml trunk/wao-ui/src/main/webapp/css/administration.css Modified: trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/pages/Administration.java =================================================================== --- trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/pages/Administration.java 2012-03-14 11:21:22 UTC (rev 1565) +++ trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/pages/Administration.java 2012-03-15 15:22:28 UTC (rev 1566) @@ -83,6 +83,7 @@ import java.io.InputStream; import java.text.DateFormat; import java.text.SimpleDateFormat; +import java.util.LinkedList; import java.util.List; /** @@ -455,6 +456,7 @@ // reset : if user change, its profiles change editedUserProfiles = null; editedProfile = null; + editedUserCanReadBoats = null; if (log.isDebugEnabled()) { log.debug("'User id : " + userId); @@ -533,6 +535,19 @@ void onValidateFormFromUserForm() { userForm.clearErrors(); + if (editedUserCanReadBoats != null) { + getUserEdited().clearCanReadBoats(); + if (StringUtils.isNotBlank(editedUserCanReadBoats)) { + try { + List<Boat> boatsByImmatriculations = + serviceBoat.getBoatsByImmatriculations(editedUserCanReadBoats); + getUserEdited().addAllCanReadBoats(boatsByImmatriculations); + } catch (WaoBusinessException e) { + userForm.recordError("Vous devez préciser une liste d'immatriculations de navire séparées par des espaces"); + } + } + } + getUserEdited().clearUserProfile(currentUser.getProfile().getObsProgram()); getUserEdited().addAllUserProfile(getEditedUserProfiles()); } @@ -579,6 +594,9 @@ private List<UserProfile> editedUserProfiles; @Persist + private String editedUserCanReadBoats; + + @Persist @Property private UserProfile profile; @@ -654,6 +672,23 @@ return editedUserProfiles; } + public String getEditedUserCanReadBoats() { + if (editedUserCanReadBoats == null) { + if (getUserEdited() != null) { + List<String> boatImmatriculations = new LinkedList<String>(); + for (Boat boat : getUserEdited().getCanReadBoats()) { + boatImmatriculations.add(String.valueOf(boat.getImmatriculation())); + } + editedUserCanReadBoats = StringUtils.join(boatImmatriculations, " "); + } + } + return editedUserCanReadBoats; + } + + public void setEditedUserCanReadBoats(String editedUserCanReadBoats) { + this.editedUserCanReadBoats = editedUserCanReadBoats; + } + @Log Zone onActionFromAddRole() { Modified: trunk/wao-ui/src/main/webapp/Administration.tml =================================================================== --- trunk/wao-ui/src/main/webapp/Administration.tml 2012-03-14 11:21:22 UTC (rev 1565) +++ trunk/wao-ui/src/main/webapp/Administration.tml 2012-03-15 15:22:28 UTC (rev 1566) @@ -149,14 +149,8 @@ </p:mammalsNotifications> <p:canReadBoats> <t:if t:test="currentUser.admin"> - <label t:for="canReadBoats">${message:wao.ui.field.WaoUser.canReadBoats}</label> - <t:topiaEntitySelector t:id="canReadBoats" - t:multiple="true" - t:clazzName="Boat" - t:labelPropertyName="description" - t:values="boats" - t:selectedValues="userEdited.canReadBoats" - size="6"/> + <label t:for="editedUserCanReadBoats">${message:wao.ui.field.WaoUser.canReadBoats}</label> + <input t:type="textarea" t:id="editedUserCanReadBoats" value="editedUserCanReadBoats" /> </t:if> </p:canReadBoats> </t:beaneditform> Modified: trunk/wao-ui/src/main/webapp/css/administration.css =================================================================== --- trunk/wao-ui/src/main/webapp/css/administration.css 2012-03-14 11:21:22 UTC (rev 1565) +++ trunk/wao-ui/src/main/webapp/css/administration.css 2012-03-15 15:22:28 UTC (rev 1566) @@ -51,10 +51,15 @@ padding-left: 5px; } -div#so-admin fieldset.user-form div.t-beaneditor input { +div#so-admin fieldset.user-form div.t-beaneditor input, +div#so-admin fieldset.user-form div.t-beaneditor textarea { width: 350px; } +div#so-admin fieldset.user-form div.t-beaneditor textarea { + height: 200px; +} + fieldset.user-form div.t-beaneditor input.t-beaneditor-submit { background: url(../img/save.png) no-repeat center right !important; }