branch develop updated (cada707 -> 6e20d44)
This is an automated email from the git hooks/post-receive script. New change to branch develop in repository wao. See http://git.codelutin.com/wao.git from cada707 Utilisation de topia 3.0-SNAPSHOT new 529a73a Utilisation de ToPIA stable new 21ef218 Début de gestion des utilisateurs associés au labo dans le formulaire de modification d'un labo new e526ee6 Introduction d'une propriété slf4jJclScope dans le POM pour contourner https://issues.apache.org/jira/browse/MTOMCAT-257 new d1a3a75 Les membres d'un laboratoire peuvent être modifiés depuis le formulaire de modification d'un laboratoire new 6e20d44 On permet de modifier les membres d'un labo directement depuis le formulaire de modification du labo (fixes #6489) The 5 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "adds" were already present in the repository and have only been added to this reference. Detailed log of new commits: commit 6e20d44f0958e194d34cc4bf8ed03d6ebdcfd185 Merge: 529a73a d1a3a75 Author: Brendan Le Ny <bleny@codelutin.com> Date: Mon Jan 26 10:41:20 2015 +0100 On permet de modifier les membres d'un labo directement depuis le formulaire de modification du labo (fixes #6489) 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 commit e526ee669959f482e5892fe99f5c00bd3be9ff2c Author: Brendan Le Ny <bleny@codelutin.com> Date: Mon Jan 26 10:33:35 2015 +0100 Introduction d'une propriété slf4jJclScope dans le POM pour contourner https://issues.apache.org/jira/browse/MTOMCAT-257 commit 21ef218a63326a56f330355bf83d195e5afce6fa Author: Brendan Le Ny <bleny@codelutin.com> Date: Fri Jan 23 12:01:58 2015 +0100 Début de gestion des utilisateurs associés au labo dans le formulaire de modification d'un labo commit 529a73a52fab8e2b4471c243834302f8bd696495 Author: Brendan Le Ny <bleny@codelutin.com> Date: Mon Jan 26 10:16:26 2015 +0100 Utilisation de ToPIA stable Summary of changes: pom.xml | 6 ++-- .../administration/LaboratoriesService.java | 22 ++++++++++++++- wao-web/pom.xml | 3 +- .../administration/EditLaboratoryAction.java | 32 ++++++++++++++++++++-- .../main/resources/i18n/wao-web_en_GB.properties | 1 + .../main/resources/i18n/wao-web_fr_FR.properties | 1 + .../content/administration/edit-laboratory.jsp | 6 ++++ 7 files changed, 65 insertions(+), 6 deletions(-) -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.
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 529a73a52fab8e2b4471c243834302f8bd696495 Author: Brendan Le Ny <bleny@codelutin.com> Date: Mon Jan 26 10:16:26 2015 +0100 Utilisation de ToPIA stable --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 920849d..b867e36 100644 --- a/pom.xml +++ b/pom.xml @@ -133,7 +133,7 @@ <nuitonValidatorVersion>3.0-rc-2</nuitonValidatorVersion> <nuitonUtilsVersion>3.0-rc-8</nuitonUtilsVersion> <eugeneVersion>2.13</eugeneVersion> - <topiaVersion>3.0-SNAPSHOT</topiaVersion> + <topiaVersion>3.0-beta-15</topiaVersion> <!--Site configuration --> <locales>fr</locales> -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.
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 21ef218a63326a56f330355bf83d195e5afce6fa Author: Brendan Le Ny <bleny@codelutin.com> Date: Fri Jan 23 12:01:58 2015 +0100 Début de gestion des utilisateurs associés au labo dans le formulaire de modification d'un labo --- .../administration/LaboratoriesService.java | 22 +++++++++++++++++++++- .../administration/EditLaboratoryAction.java | 21 +++++++++++++++++++-- 2 files changed, 40 insertions(+), 3 deletions(-) diff --git a/wao-services/src/main/java/fr/ifremer/wao/services/service/administration/LaboratoriesService.java b/wao-services/src/main/java/fr/ifremer/wao/services/service/administration/LaboratoriesService.java index cde507b..a24dbde 100644 --- a/wao-services/src/main/java/fr/ifremer/wao/services/service/administration/LaboratoriesService.java +++ b/wao-services/src/main/java/fr/ifremer/wao/services/service/administration/LaboratoriesService.java @@ -1,13 +1,17 @@ package fr.ifremer.wao.services.service.administration; +import com.google.common.base.Optional; +import com.google.common.collect.ImmutableSortedSet; import fr.ifremer.wao.entity.Company; import fr.ifremer.wao.entity.Laboratory; import fr.ifremer.wao.entity.LaboratoryImpl; import fr.ifremer.wao.entity.LaboratoryTopiaDao; +import fr.ifremer.wao.entity.WaoUser; import fr.ifremer.wao.services.service.IllegalDeletionException; import fr.ifremer.wao.services.service.WaoServiceSupport; import java.util.List; +import java.util.Set; public class LaboratoriesService extends WaoServiceSupport { @@ -44,10 +48,26 @@ public class LaboratoriesService extends WaoServiceSupport { } - public void preValidate(Laboratory laboratory) throws OrganisationNameMustBeUniqueException { + public ImmutableSortedSet<WaoUser> getPossibleMembersForLaboratory(Laboratory laboratory) { + + String companyId = laboratory.getCompany().getTopiaId(); + + ImmutableSortedSet<WaoUser> possibleMembersForLaboratory = + getWaoUsersService().getWaoUsers(Optional.of(companyId)).getWaoUsers(); + + return possibleMembersForLaboratory; + + } + + public void preValidate(Laboratory laboratory, Set<String> laboratoryMemberIds) throws OrganisationNameMustBeUniqueException { getOrganisationsService().preValidate(laboratory); + List<WaoUser> laboratoryMembers = getWaoUserDao().forTopiaIdIn(laboratoryMemberIds).findAll(); + + laboratory.clearWaoUser(); + laboratory.addAllWaoUser(laboratoryMembers); + } public void save(Laboratory laboratory) { 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 e726e57..be09c05 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 @@ -21,15 +21,19 @@ package fr.ifremer.wao.web.action.administration; * #L% */ +import com.google.common.collect.ImmutableSortedSet; import com.opensymphony.xwork2.Preparable; import fr.ifremer.wao.entity.Laboratory; -import fr.ifremer.wao.services.service.administration.OrganisationNameMustBeUniqueException; +import fr.ifremer.wao.entity.WaoUser; import fr.ifremer.wao.services.service.administration.LaboratoriesService; +import fr.ifremer.wao.services.service.administration.OrganisationNameMustBeUniqueException; import fr.ifremer.wao.web.WaoJspActionSupport; import org.apache.commons.lang3.StringUtils; import org.apache.struts2.convention.annotation.Result; import org.apache.struts2.convention.annotation.Results; +import java.util.Set; + @Results({ @Result(name="success", type="redirectAction", params = { "actionName", "laboratories" }) }) @@ -43,6 +47,10 @@ public class EditLaboratoryAction extends WaoJspActionSupport implements Prepara protected Laboratory laboratory; + protected ImmutableSortedSet<WaoUser> possibleMembersForLaboratory; + + protected Set<String> laboratoryMemberIds; + public void setLaboratoryId(String laboratoryId) { this.laboratoryId = laboratoryId; } @@ -62,13 +70,22 @@ public class EditLaboratoryAction extends WaoJspActionSupport implements Prepara } else { laboratory = service.getLaboratory(laboratoryId); } + possibleMembersForLaboratory = service.getPossibleMembersForLaboratory(laboratory); + } + + public ImmutableSortedSet<WaoUser> getPossibleMembersForLaboratory() { + return possibleMembersForLaboratory; + } + + public void setLaboratoryMemberIds(Set<String> laboratoryMemberIds) { + this.laboratoryMemberIds = laboratoryMemberIds; } @Override public void validate() { try { - service.preValidate(laboratory); + service.preValidate(laboratory, laboratoryMemberIds); } catch (OrganisationNameMustBeUniqueException e) { addFieldError("company.name", t("wao.ui.form.Organisation.error.nameMustBeUnique")); } -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.
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 e526ee669959f482e5892fe99f5c00bd3be9ff2c Author: Brendan Le Ny <bleny@codelutin.com> Date: Mon Jan 26 10:33:35 2015 +0100 Introduction d'une propriété slf4jJclScope dans le POM pour contourner https://issues.apache.org/jira/browse/MTOMCAT-257 --- pom.xml | 4 +++- wao-web/pom.xml | 3 ++- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/pom.xml b/pom.xml index b867e36..0c9d77b 100644 --- a/pom.xml +++ b/pom.xml @@ -135,6 +135,8 @@ <eugeneVersion>2.13</eugeneVersion> <topiaVersion>3.0-beta-15</topiaVersion> + <slf4jJclScope>test</slf4jJclScope> + <!--Site configuration --> <locales>fr</locales> @@ -263,7 +265,7 @@ <groupId>org.slf4j</groupId> <artifactId>slf4j-jcl</artifactId> <version>${slf4jVersion}</version> - <scope>test</scope> + <scope>${slf4jJclScope}</scope> </dependency> <dependency> diff --git a/wao-web/pom.xml b/wao-web/pom.xml index 661b0d4..d54b842 100644 --- a/wao-web/pom.xml +++ b/wao-web/pom.xml @@ -27,6 +27,8 @@ <!-- see http://maven-site.nuiton.org/mavenpom/mavenpom4redmine/release.html --> <skipPostRelease>false</skipPostRelease> + <slf4jJclScope>runtime</slf4jJclScope> + </properties> <dependencies> @@ -138,7 +140,6 @@ <dependency> <groupId>org.slf4j</groupId> <artifactId>slf4j-jcl</artifactId> - <scope>runtime</scope> </dependency> <dependency> -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.
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>.
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 6e20d44f0958e194d34cc4bf8ed03d6ebdcfd185 Merge: 529a73a d1a3a75 Author: Brendan Le Ny <bleny@codelutin.com> Date: Mon Jan 26 10:41:20 2015 +0100 On permet de modifier les membres d'un labo directement depuis le formulaire de modification du labo (fixes #6489) pom.xml | 4 ++- .../administration/LaboratoriesService.java | 22 ++++++++++++++- wao-web/pom.xml | 3 +- .../administration/EditLaboratoryAction.java | 32 ++++++++++++++++++++-- .../main/resources/i18n/wao-web_en_GB.properties | 1 + .../main/resources/i18n/wao-web_fr_FR.properties | 1 + .../content/administration/edit-laboratory.jsp | 6 ++++ 7 files changed, 64 insertions(+), 5 deletions(-) -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.
participants (1)
-
codelutin.com scm