branch develop updated (34917dc -> cfb619c)
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 34917dc Correction d'une inversion dans les bundles new 764bdfb On mentionne dans le pied de page le nom du laboratoire après la société (fixes #6558) new 3f4f174 Plan d'échantillonnage, afficher colonne Société / Laboratoire en profil coordinateur et observateur (fixes #6559) new 3139f2b Plan d'échantillonnage, enrichir le champ Paramètres à mesurer (fixes #6560) new 60c5ed8 Plan d'échantillonnage, Formulaire de modification de ligne, modifier l'affichage des valeurs du champs Espèces cibles (fixes #6561) new 95eb643 Plan d'échantillonnage et contacts, colonne Espèces cibles, afficher le nom scientifique et non le nom commun (fixes #6562) new cfb619c Si une ligne est affectée à Ifremer, on autorise tous les labos à créer un contact scléro (fixes #6565) The 6 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 cfb619c2952bf49ad263f19f77981e1264d65929 Author: Brendan Le Ny <bleny@codelutin.com> Date: Tue Jan 27 17:04:45 2015 +0100 Si une ligne est affectée à Ifremer, on autorise tous les labos à créer un contact scléro (fixes #6565) commit 95eb643101a3ea61927ddade9817a30ebf579de5 Author: Brendan Le Ny <bleny@codelutin.com> Date: Tue Jan 27 17:00:22 2015 +0100 Plan d'échantillonnage et contacts, colonne Espèces cibles, afficher le nom scientifique et non le nom commun (fixes #6562) commit 60c5ed82fe93a4ff1555bed6765a58a3e0b9a87d Author: Brendan Le Ny <bleny@codelutin.com> Date: Tue Jan 27 16:57:39 2015 +0100 Plan d'échantillonnage, Formulaire de modification de ligne, modifier l'affichage des valeurs du champs Espèces cibles (fixes #6561) commit 3139f2b55a34708afc85ac07abf86a43ca0c9ec8 Author: Brendan Le Ny <bleny@codelutin.com> Date: Tue Jan 27 16:49:58 2015 +0100 Plan d'échantillonnage, enrichir le champ Paramètres à mesurer (fixes #6560) commit 3f4f17467282b58fa58d51e8a0fc1ac73a54749a Author: Brendan Le Ny <bleny@codelutin.com> Date: Tue Jan 27 16:45:00 2015 +0100 Plan d'échantillonnage, afficher colonne Société / Laboratoire en profil coordinateur et observateur (fixes #6559) commit 764bdfb02d3e23bca3e06de258e718a48918c98a Author: Brendan Le Ny <bleny@codelutin.com> Date: Tue Jan 27 16:41:19 2015 +0100 On mentionne dans le pied de page le nom du laboratoire après la société (fixes #6558) Summary of changes: .../wao/entity/IndividualMeasurementStrategy.java | 10 ++++++++++ .../i18n/wao-persistence_en_GB.properties | 2 ++ .../i18n/wao-persistence_fr_FR.properties | 2 ++ .../ifremer/wao/services/AuthenticatedWaoUser.java | 7 ++++++- .../service/SclerochronologySamplingPlan.java | 2 +- .../main/resources/i18n/wao-web_en_GB.properties | 2 +- .../main/resources/i18n/wao-web_fr_FR.properties | 2 +- .../src/main/webapp/WEB-INF/content/contacts.jsp | 4 ++-- .../WEB-INF/content/edit-sample-row-input.jsp | 2 +- .../content/sclerochronology/sampling-plan.jsp | 23 +++++++--------------- .../src/main/webapp/WEB-INF/decorators/layout.jsp | 2 +- 11 files changed, 34 insertions(+), 24 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 764bdfb02d3e23bca3e06de258e718a48918c98a Author: Brendan Le Ny <bleny@codelutin.com> Date: Tue Jan 27 16:41:19 2015 +0100 On mentionne dans le pied de page le nom du laboratoire après la société (fixes #6558) --- wao-web/src/main/resources/i18n/wao-web_en_GB.properties | 2 +- wao-web/src/main/resources/i18n/wao-web_fr_FR.properties | 2 +- wao-web/src/main/webapp/WEB-INF/decorators/layout.jsp | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) 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 4d26f6e..3ab18e1 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 @@ -460,7 +460,7 @@ wao.ui.indicators.title=Providers quality indicators wao.ui.invalidDateFormat=Expected format is yyyy-mm-dd wao.ui.invalidLogin=Invalid identifier wao.ui.invalidMonthFormat=Expected format is yyyy-mm -wao.ui.layout.userDescription=You are %s of company %s (%s) +wao.ui.layout.userDescription=You are %s (%s, %s) wao.ui.message.chooseProfile=Choose your profile \: wao.ui.misc.METIER=METIER wao.ui.misc.N/A=non available 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 3e5d06b..57313fc 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 @@ -461,7 +461,7 @@ wao.ui.indicators.title=Indicateurs qualités prestataires wao.ui.invalidDateFormat=Le format attendu est jj/mm/aaaa wao.ui.invalidLogin=Identifiant invalide wao.ui.invalidMonthFormat=Le format attendu est mm/aaaa -wao.ui.layout.userDescription=Vous êtes %s de la société %s (%s) +wao.ui.layout.userDescription=Vous êtes %s (%s, %s) wao.ui.message.chooseProfile=Choisissez dans la liste votre profil de connexion \: wao.ui.misc.METIER=MÉTIER wao.ui.misc.N/A=non renseignée diff --git a/wao-web/src/main/webapp/WEB-INF/decorators/layout.jsp b/wao-web/src/main/webapp/WEB-INF/decorators/layout.jsp index 812822a..275b2dd 100644 --- a/wao-web/src/main/webapp/WEB-INF/decorators/layout.jsp +++ b/wao-web/src/main/webapp/WEB-INF/decorators/layout.jsp @@ -282,7 +282,7 @@ <li> <s:text name="wao.ui.layout.userDescription"> <s:param value="authenticatedWaoUser.waoUser.fullName"/> - <s:param value="authenticatedWaoUser.waoUser.company.name"/> + <s:param value="authenticatedWaoUser.waoUser.organisation.fullName"/> <s:param value="getText(authenticatedWaoUser.userRole)"/> </s:text> </li> -- 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 3f4f17467282b58fa58d51e8a0fc1ac73a54749a Author: Brendan Le Ny <bleny@codelutin.com> Date: Tue Jan 27 16:45:00 2015 +0100 Plan d'échantillonnage, afficher colonne Société / Laboratoire en profil coordinateur et observateur (fixes #6559) --- .../content/sclerochronology/sampling-plan.jsp | 23 +++++++--------------- 1 file changed, 7 insertions(+), 16 deletions(-) diff --git a/wao-web/src/main/webapp/WEB-INF/content/sclerochronology/sampling-plan.jsp b/wao-web/src/main/webapp/WEB-INF/content/sclerochronology/sampling-plan.jsp index ea2e8a1..57c283c 100644 --- a/wao-web/src/main/webapp/WEB-INF/content/sclerochronology/sampling-plan.jsp +++ b/wao-web/src/main/webapp/WEB-INF/content/sclerochronology/sampling-plan.jsp @@ -187,12 +187,7 @@ </s:if> </div> -<s:if test="authenticatedWaoUser.authorizedToViewOtherCompanies"> - <s:set var="nbColumnsForProfessionInFullView" value="11" /> -</s:if> -<s:else> - <s:set var="nbColumnsForProfessionInFullView" value="10" /> -</s:else> +<s:set var="nbColumnsForProfessionInFullView" value="11" /> <s:set var="nbColumnsForProfessionInCompactView" value="7" /> <s:set var="nbColumnsForMonths" value="%{samplingPlan.months.size() + 1}" /> <s:set var="nbColumnsForOther" value="2" /> @@ -230,11 +225,9 @@ <!-- Profession columns --> <th><s:text name="wao.ui.field.SampleRow.code"/></th> <th><s:text name="wao.ui.samplingPlan.program"/></th> - <s:if test="authenticatedWaoUser.authorizedToViewOtherCompanies"> - <th class="only-in-full-view"> - <s:text name="wao.ui.entity.Organisation"/> - </th> - </s:if> + <th class="only-in-full-view"> + <s:text name="wao.ui.entity.Organisation"/> + </th> <th><s:text name="wao.ui.entity.FishingZone"/></th> <th class="only-in-full-view"><s:text name="wao.ui.samplingPlan.fishingZoneInfo"/></th> <th><s:text name="wao.ui.field.SampleRow.sclerochronologySamplingContext"/></th> @@ -293,11 +286,9 @@ </s:if> </th> <td><s:property value="programName" /></td> - <s:if test="authenticatedWaoUser.authorizedToViewOtherCompanies"> - <td class="only-in-full-view"> - <s:property value="organisationFullName" /> - </td> - </s:if> + <td class="only-in-full-view"> + <s:property value="organisationFullName" /> + </td> <td class="only-in-full-view"><s:property value="fishingZones" /></td> <td class="only-in-compact-view"> <s:if test="fishingZonesInfos == null"> -- 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 3139f2b55a34708afc85ac07abf86a43ca0c9ec8 Author: Brendan Le Ny <bleny@codelutin.com> Date: Tue Jan 27 16:49:58 2015 +0100 Plan d'échantillonnage, enrichir le champ Paramètres à mesurer (fixes #6560) --- .../fr/ifremer/wao/entity/IndividualMeasurementStrategy.java | 10 ++++++++++ .../src/main/resources/i18n/wao-persistence_en_GB.properties | 2 ++ .../src/main/resources/i18n/wao-persistence_fr_FR.properties | 2 ++ 3 files changed, 14 insertions(+) diff --git a/wao-persistence/src/main/java/fr/ifremer/wao/entity/IndividualMeasurementStrategy.java b/wao-persistence/src/main/java/fr/ifremer/wao/entity/IndividualMeasurementStrategy.java index fb9d274..1e38c23 100644 --- a/wao-persistence/src/main/java/fr/ifremer/wao/entity/IndividualMeasurementStrategy.java +++ b/wao-persistence/src/main/java/fr/ifremer/wao/entity/IndividualMeasurementStrategy.java @@ -42,6 +42,16 @@ public enum IndividualMeasurementStrategy implements I18nAble { SIZE_WEIGHT_SEX(n("IndividualMeasurementStrategy.SIZE_WEIGHT_SEX")), /** + * Taille, poids, âge + */ + SIZE_WEIGHT_AGE(n("IndividualMeasurementStrategy.SIZE_WEIGHT_AGE")), + + /** + * Taille, poids, sexe, maturité + */ + SIZE_WEIGHT_SEX_MATURITY(n("IndividualMeasurementStrategy.SIZE_WEIGHT_SEX_MATURITY")), + + /** * Taille, poids, sexe, maturité, âge */ SIZE_WEIGHT_SEX_MATURITY_AGE(n("IndividualMeasurementStrategy.SIZE_WEIGHT_SEX_MATURITY_AGE")); diff --git a/wao-persistence/src/main/resources/i18n/wao-persistence_en_GB.properties b/wao-persistence/src/main/resources/i18n/wao-persistence_en_GB.properties index 4770f3f..eabe04a 100644 --- a/wao-persistence/src/main/resources/i18n/wao-persistence_en_GB.properties +++ b/wao-persistence/src/main/resources/i18n/wao-persistence_en_GB.properties @@ -22,7 +22,9 @@ GlobalIndicatorValue.NEUTRAL=Conform GlobalIndicatorValue.VERY_BAD=Level 2 penalty GlobalIndicatorValue.VERY_GOOD=Level 2 bonus IndividualMeasurementStrategy.SIZE_WEIGHT=Size/Weight +IndividualMeasurementStrategy.SIZE_WEIGHT_AGE=Size/Weight/Age IndividualMeasurementStrategy.SIZE_WEIGHT_SEX=Size/Weight/Sex +IndividualMeasurementStrategy.SIZE_WEIGHT_SEX_MATURITY=Size/Weight/Sex/Maturity IndividualMeasurementStrategy.SIZE_WEIGHT_SEX_MATURITY_AGE=Size/Weight/Sex/Maturity/Age LocationType.AUCTION=Auction LocationType.DISTRICT=District diff --git a/wao-persistence/src/main/resources/i18n/wao-persistence_fr_FR.properties b/wao-persistence/src/main/resources/i18n/wao-persistence_fr_FR.properties index 2b2467c..d72722b 100644 --- a/wao-persistence/src/main/resources/i18n/wao-persistence_fr_FR.properties +++ b/wao-persistence/src/main/resources/i18n/wao-persistence_fr_FR.properties @@ -22,7 +22,9 @@ GlobalIndicatorValue.NEUTRAL=Conforme au cahier des charges GlobalIndicatorValue.VERY_BAD=Pénalité de niveau 2 GlobalIndicatorValue.VERY_GOOD=Bonus de niveau 2 IndividualMeasurementStrategy.SIZE_WEIGHT=Poids/Taille +IndividualMeasurementStrategy.SIZE_WEIGHT_AGE=Poids/Taille/Âge IndividualMeasurementStrategy.SIZE_WEIGHT_SEX=Poids/Taille/Sexe +IndividualMeasurementStrategy.SIZE_WEIGHT_SEX_MATURITY=Poids/Taille/Sexe/Maturité IndividualMeasurementStrategy.SIZE_WEIGHT_SEX_MATURITY_AGE=Poids/Taille/Sexe/Maturité/Âge LocationType.AUCTION=Criée LocationType.DISTRICT=Quartier maritime -- 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 60c5ed82fe93a4ff1555bed6765a58a3e0b9a87d Author: Brendan Le Ny <bleny@codelutin.com> Date: Tue Jan 27 16:57:39 2015 +0100 Plan d'échantillonnage, Formulaire de modification de ligne, modifier l'affichage des valeurs du champs Espèces cibles (fixes #6561) --- wao-web/src/main/webapp/WEB-INF/content/edit-sample-row-input.jsp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/wao-web/src/main/webapp/WEB-INF/content/edit-sample-row-input.jsp b/wao-web/src/main/webapp/WEB-INF/content/edit-sample-row-input.jsp index cf49380..dde799d 100644 --- a/wao-web/src/main/webapp/WEB-INF/content/edit-sample-row-input.jsp +++ b/wao-web/src/main/webapp/WEB-INF/content/edit-sample-row-input.jsp @@ -190,7 +190,7 @@ label="%{getText('wao.ui.field.SampleRow.species')}" disabled="updateSampleRowCommand.observationAlreadyStarted" list="updateSampleRowCommand.allSpecies" - listValue="%{value.permanentCode + ' ' + value.vernacularName}" + listValue="%{value.permanentCode + ', ' + value.scientificName + ', ' + value.vernacularName + (value.aphiaId == null ? '' : ', ' + value.aphiaId)}" cssClass="input-xxlarge select2" /> -- 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 95eb643101a3ea61927ddade9817a30ebf579de5 Author: Brendan Le Ny <bleny@codelutin.com> Date: Tue Jan 27 17:00:22 2015 +0100 Plan d'échantillonnage et contacts, colonne Espèces cibles, afficher le nom scientifique et non le nom commun (fixes #6562) --- .../fr/ifremer/wao/services/service/SclerochronologySamplingPlan.java | 2 +- wao-web/src/main/webapp/WEB-INF/content/contacts.jsp | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/wao-services/src/main/java/fr/ifremer/wao/services/service/SclerochronologySamplingPlan.java b/wao-services/src/main/java/fr/ifremer/wao/services/service/SclerochronologySamplingPlan.java index 052a9fe..a4cfd18 100644 --- a/wao-services/src/main/java/fr/ifremer/wao/services/service/SclerochronologySamplingPlan.java +++ b/wao-services/src/main/java/fr/ifremer/wao/services/service/SclerochronologySamplingPlan.java @@ -89,7 +89,7 @@ public class SclerochronologySamplingPlan extends SamplingPlan implements Iterab public SclerochronologySamplingPlanSampleRowPart(Locale locale, Map<Date, Effort> effortInIndividualsPerMonths, SampleRow sampleRow, long sampleRowContactCounts) { super(locale, Collections.<Date, Effort>emptyMap(), sampleRow, sampleRowContactCounts); this.effortInIndividualsPerMonths = effortInIndividualsPerMonths; - species = sampleRow.getSpecies().getVernacularName(); + species = sampleRow.getSpecies().getScientificName(); samplingContext = WaoUtils.l(locale, sampleRow.getSclerochronologySamplingContext()); samplingContextInfo = sampleRow.getSclerochronologySamplingContextInfo(); individualMeasurementStrategy = WaoUtils.l(locale, sampleRow.getIndividualMeasurementStrategy()); diff --git a/wao-web/src/main/webapp/WEB-INF/content/contacts.jsp b/wao-web/src/main/webapp/WEB-INF/content/contacts.jsp index d34c5d8..3a3a0e9 100644 --- a/wao-web/src/main/webapp/WEB-INF/content/contacts.jsp +++ b/wao-web/src/main/webapp/WEB-INF/content/contacts.jsp @@ -476,7 +476,7 @@ <s:if test="sclerochronology"> <s:text name="wao.ui.field.SampleRow.sclerochronologySamplingContext"/> <s:property value="getText(sampleRow.sclerochronologySamplingContext)" escapeHtml="false"/> <s:text name="wao.ui.field.SampleRow.individualMeasurementStrategy"/> <s:property value="getText(sampleRow.individualMeasurementStrategy)" escapeHtml="false"/> - <s:text name="wao.ui.field.SampleRow.species"/> <s:property value="sampleRow.species.vernacularName" escapeHtml="false"/> + <s:text name="wao.ui.field.SampleRow.species"/> <s:property value="sampleRow.species.scientificName" escapeHtml="false"/> </s:if> <s:text name="wao.ui.contacts.FishingZone.facadeName"/> <s:property value="sampleRow.facade" escapeHtml="false"/> <s:text name="wao.ui.contacts.FishingZone.sectorName"/> <s:property value="sampleRow.sectors" escapeHtml="false"/> @@ -516,7 +516,7 @@ <s:property value="getText(sampleRow.individualMeasurementStrategy)"/> </td> <td class="only-in-full-view"> - <s:property value="sampleRow.species.vernacularName"/> + <s:property value="sampleRow.species.scientificName"/> </td> </s:if> <td class="only-in-full-view"> -- 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 cfb619c2952bf49ad263f19f77981e1264d65929 Author: Brendan Le Ny <bleny@codelutin.com> Date: Tue Jan 27 17:04:45 2015 +0100 Si une ligne est affectée à Ifremer, on autorise tous les labos à créer un contact scléro (fixes #6565) --- .../main/java/fr/ifremer/wao/services/AuthenticatedWaoUser.java | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/wao-services/src/main/java/fr/ifremer/wao/services/AuthenticatedWaoUser.java b/wao-services/src/main/java/fr/ifremer/wao/services/AuthenticatedWaoUser.java index 0ca8bdb..2492aa3 100644 --- a/wao-services/src/main/java/fr/ifremer/wao/services/AuthenticatedWaoUser.java +++ b/wao-services/src/main/java/fr/ifremer/wao/services/AuthenticatedWaoUser.java @@ -23,6 +23,7 @@ package fr.ifremer.wao.services; import com.google.common.base.Objects; import com.google.common.base.Preconditions; +import com.google.common.collect.ImmutableSet; import fr.ifremer.wao.entity.Company; import fr.ifremer.wao.entity.Contact; import fr.ifremer.wao.entity.News; @@ -229,7 +230,11 @@ public class AuthenticatedWaoUser implements Serializable{ * dont le topiaId est en paramètre. */ public boolean isAuthorizedToCreateContact(String sampleRowOrganisationId) { - return isAuthorizedToCreateContact() && waoUser.getOrganisation().getTopiaId().equals(sampleRowOrganisationId); + ImmutableSet<String> organisationIds = ImmutableSet.of( + waoUser.getOrganisation().getTopiaId(), + waoUser.getOrganisation().getCompany().getTopiaId()); + boolean waoUserOrganisationIsOk = organisationIds.contains(sampleRowOrganisationId); + return isAuthorizedToCreateContact() && waoUserOrganisationIsOk; } public boolean isAuthorizedToUpdateContact() { -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.
participants (1)
-
codelutin.com scm