branch develop updated (67951c8 -> f7553a4)
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 67951c8 Problème dans les synthèses : à la remise à zéro des filtres, on pouvait obtenir une synthèse qui ne tenait pas contre du filtre estimé/réalisé (testable-client #6642) new 769de12 Ajout d'un padding dans les cellules du corps du tableau plan d'échantillonnage scléro (testable-client #6639) new f7553a4 Ajout d'une stratégie d'échantillonnage Poids/Taille/Sexe/Age (termine #6645) The 2 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 f7553a4dd063dcef05803c0a9e3d838af2412bc8 Author: Brendan Le Ny <bleny@codelutin.com> Date: Tue Feb 10 16:37:40 2015 +0100 Ajout d'une stratégie d'échantillonnage Poids/Taille/Sexe/Age (termine #6645) commit 769de12d997f6e0375025a55f202011b8ecc203f Author: Brendan Le Ny <bleny@codelutin.com> Date: Tue Feb 10 16:33:04 2015 +0100 Ajout d'un padding dans les cellules du corps du tableau plan d'échantillonnage scléro (testable-client #6639) Summary of changes: .../java/fr/ifremer/wao/entity/IndividualMeasurementStrategy.java | 5 +++++ .../src/main/resources/i18n/wao-persistence_en_GB.properties | 1 + .../src/main/resources/i18n/wao-persistence_fr_FR.properties | 1 + .../main/webapp/WEB-INF/content/sclerochronology/sampling-plan.jsp | 2 +- wao-web/src/main/webapp/wao.css | 5 +++++ 5 files changed, 13 insertions(+), 1 deletion(-) -- 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 769de12d997f6e0375025a55f202011b8ecc203f Author: Brendan Le Ny <bleny@codelutin.com> Date: Tue Feb 10 16:33:04 2015 +0100 Ajout d'un padding dans les cellules du corps du tableau plan d'échantillonnage scléro (testable-client #6639) --- .../main/webapp/WEB-INF/content/sclerochronology/sampling-plan.jsp | 2 +- wao-web/src/main/webapp/wao.css | 5 +++++ 2 files changed, 6 insertions(+), 1 deletion(-) 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 12f8c1c..0e97854 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 @@ -199,7 +199,7 @@ <s:set var="nbColumnsTotalInFullView" value="%{#nbColumnsForProfessionInFullView + #nbColumnsForMonths + #nbColumnsForOther}" /> <s:set var="nbColumnsTotalInCompactView" value="%{#nbColumnsForProfessionInCompactView + #nbColumnsForMonths + #nbColumnsForOther}" /> - <table id="sampling-plan" class="large-table sampling-plan show-estimated"> + <table id="sclerochronology-sampling-plan" class="large-table sampling-plan show-estimated"> <thead> <tr> <th colspan="<s:property value="#nbColumnsForProfessionInFullView" />" class="only-in-full-view"> diff --git a/wao-web/src/main/webapp/wao.css b/wao-web/src/main/webapp/wao.css index 90d4275..d3524b9 100644 --- a/wao-web/src/main/webapp/wao.css +++ b/wao-web/src/main/webapp/wao.css @@ -712,6 +712,11 @@ table.contacts-list .actions .dropdown-menu { width: 90%; } +#sclerochronology-sampling-plan tbody td { + padding-left: 10px; + padding-right: 10px; +} + /** * Contacts */ -- 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 f7553a4dd063dcef05803c0a9e3d838af2412bc8 Author: Brendan Le Ny <bleny@codelutin.com> Date: Tue Feb 10 16:37:40 2015 +0100 Ajout d'une stratégie d'échantillonnage Poids/Taille/Sexe/Age (termine #6645) --- .../java/fr/ifremer/wao/entity/IndividualMeasurementStrategy.java | 5 +++++ .../src/main/resources/i18n/wao-persistence_en_GB.properties | 1 + .../src/main/resources/i18n/wao-persistence_fr_FR.properties | 1 + 3 files changed, 7 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 1e38c23..c98b90c 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 @@ -52,6 +52,11 @@ public enum IndividualMeasurementStrategy implements I18nAble { SIZE_WEIGHT_SEX_MATURITY(n("IndividualMeasurementStrategy.SIZE_WEIGHT_SEX_MATURITY")), /** + * Taille, poids, sexe, âge + */ + SIZE_WEIGHT_SEX_AGE(n("IndividualMeasurementStrategy.SIZE_WEIGHT_SEX_AGE")), + + /** * 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 bfda578..9683525 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 @@ -24,6 +24,7 @@ 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_AGE=Size/Weight/Sex/Age IndividualMeasurementStrategy.SIZE_WEIGHT_SEX_MATURITY=Size/Weight/Sex/Maturity IndividualMeasurementStrategy.SIZE_WEIGHT_SEX_MATURITY_AGE=Size/Weight/Sex/Maturity/Age LocationType.AUCTION=Auction 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 20646d7..bbdbde3 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 @@ -24,6 +24,7 @@ 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_AGE=Poids/Taille/Sex/Âge IndividualMeasurementStrategy.SIZE_WEIGHT_SEX_MATURITY=Poids/Taille/Sexe/Maturité IndividualMeasurementStrategy.SIZE_WEIGHT_SEX_MATURITY_AGE=Poids/Taille/Sexe/Maturité/Âge LocationType.AUCTION=Criée -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.
participants (1)
-
codelutin.com scm