This is an automated email from the git hooks/post-receive script. New commit to branch develop in repository wao. See http://git.codelutin.com/wao.git commit d1a3a75f36699fa6a8c373f8fad5b056447b4c11 Author: Brendan Le Ny <bleny@codelutin.com> Date: Mon Jan 26 10:39:19 2015 +0100 Les membres d'un laboratoire peuvent être modifiés depuis le formulaire de modification d'un laboratoire --- .../action/administration/EditLaboratoryAction.java | 19 +++++++++++++++---- .../src/main/resources/i18n/wao-web_en_GB.properties | 1 + .../src/main/resources/i18n/wao-web_fr_FR.properties | 1 + .../content/administration/edit-laboratory.jsp | 6 ++++++ 4 files changed, 23 insertions(+), 4 deletions(-) diff --git a/wao-web/src/main/java/fr/ifremer/wao/web/action/administration/EditLaboratoryAction.java b/wao-web/src/main/java/fr/ifremer/wao/web/action/administration/EditLaboratoryAction.java index be09c05..58ba8fc 100644 --- a/wao-web/src/main/java/fr/ifremer/wao/web/action/administration/EditLaboratoryAction.java +++ b/wao-web/src/main/java/fr/ifremer/wao/web/action/administration/EditLaboratoryAction.java @@ -32,6 +32,7 @@ import org.apache.commons.lang3.StringUtils; import org.apache.struts2.convention.annotation.Result; import org.apache.struts2.convention.annotation.Results; +import java.util.LinkedHashMap; import java.util.Set; @Results({ @@ -47,7 +48,7 @@ public class EditLaboratoryAction extends WaoJspActionSupport implements Prepara protected Laboratory laboratory; - protected ImmutableSortedSet<WaoUser> possibleMembersForLaboratory; + protected LinkedHashMap<String, String> possibleMembersForLaboratory; protected Set<String> laboratoryMemberIds; @@ -70,17 +71,27 @@ public class EditLaboratoryAction extends WaoJspActionSupport implements Prepara } else { laboratory = service.getLaboratory(laboratoryId); } - possibleMembersForLaboratory = service.getPossibleMembersForLaboratory(laboratory); + ImmutableSortedSet<WaoUser> possibleMembersForLaboratory = + service.getPossibleMembersForLaboratory(laboratory); + this.possibleMembersForLaboratory = new LinkedHashMap<>(); + for (WaoUser possibleMemberForLaboratory : possibleMembersForLaboratory) { + this.possibleMembersForLaboratory.put(possibleMemberForLaboratory.getTopiaId(), possibleMemberForLaboratory.getFullName()); + } + laboratoryMemberIds = laboratory.getWaoUserTopiaIds(); } - public ImmutableSortedSet<WaoUser> getPossibleMembersForLaboratory() { - return possibleMembersForLaboratory; + public Set<String> getLaboratoryMemberIds() { + return laboratoryMemberIds; } public void setLaboratoryMemberIds(Set<String> laboratoryMemberIds) { this.laboratoryMemberIds = laboratoryMemberIds; } + public LinkedHashMap<String, String> getPossibleMembersForLaboratory() { + return possibleMembersForLaboratory; + } + @Override public void validate() { diff --git a/wao-web/src/main/resources/i18n/wao-web_en_GB.properties b/wao-web/src/main/resources/i18n/wao-web_en_GB.properties index a573431..bfaef36 100644 --- a/wao-web/src/main/resources/i18n/wao-web_en_GB.properties +++ b/wao-web/src/main/resources/i18n/wao-web_en_GB.properties @@ -243,6 +243,7 @@ wao.ui.field.FishingZone.facadeName=Facade wao.ui.field.FishingZone.sectorName=Sector wao.ui.field.Laboratory.active=Active wao.ui.field.Laboratory.name=Name +wao.ui.field.Laboratory.waoUser=Membres du laboratoire wao.ui.field.SampleRow.appliedCoverageRate=Applied coverage rate wao.ui.field.SampleRow.averageObservationsCount=Observations wao.ui.field.SampleRow.averageTideTime=Average tide time diff --git a/wao-web/src/main/resources/i18n/wao-web_fr_FR.properties b/wao-web/src/main/resources/i18n/wao-web_fr_FR.properties index f374c64..bddfbdd 100644 --- a/wao-web/src/main/resources/i18n/wao-web_fr_FR.properties +++ b/wao-web/src/main/resources/i18n/wao-web_fr_FR.properties @@ -244,6 +244,7 @@ wao.ui.field.FishingZone.facadeName=Façade wao.ui.field.FishingZone.sectorName=Zone wao.ui.field.Laboratory.active=Actif wao.ui.field.Laboratory.name=Nom +wao.ui.field.Laboratory.waoUser=Laboratory members wao.ui.field.SampleRow.appliedCoverageRate=Taux de couverture appliqué wao.ui.field.SampleRow.averageObservationsCount=Nombre d'observations wao.ui.field.SampleRow.averageTideTime=Durée moyenne d'une marée diff --git a/wao-web/src/main/webapp/WEB-INF/content/administration/edit-laboratory.jsp b/wao-web/src/main/webapp/WEB-INF/content/administration/edit-laboratory.jsp index c08b4e6..4a0621d 100644 --- a/wao-web/src/main/webapp/WEB-INF/content/administration/edit-laboratory.jsp +++ b/wao-web/src/main/webapp/WEB-INF/content/administration/edit-laboratory.jsp @@ -55,6 +55,12 @@ <s:checkbox name="laboratory.active" label="%{getText('wao.ui.field.Laboratory.active')}" /> + <s:select name="laboratoryMemberIds" + label="%{getText('wao.ui.field.Laboratory.waoUser')}" + list="possibleMembersForLaboratory" + multiple="true" + /> + <div class="form-actions"> <s:url action="laboratories" id="laboratoriesUrl" /> <s:a href="%{laboratoriesUrl}" cssClass="btn"> -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.