Author: tchemit Date: 2014-04-07 12:38:17 +0200 (Mon, 07 Apr 2014) New Revision: 1851 Url: http://forge.codelutin.com/projects/wao/repository/revisions/1851 Log: refs #4487 fix filterValues for completeSampling + contactStateMotif Modified: trunk/wao-services/src/main/java/fr/ifremer/wao/services/service/ContactsFilterValues.java trunk/wao-services/src/main/resources/i18n/wao-services_en_GB.properties trunk/wao-services/src/main/resources/i18n/wao-services_fr_FR.properties Modified: trunk/wao-services/src/main/java/fr/ifremer/wao/services/service/ContactsFilterValues.java =================================================================== --- trunk/wao-services/src/main/java/fr/ifremer/wao/services/service/ContactsFilterValues.java 2014-04-07 10:38:06 UTC (rev 1850) +++ trunk/wao-services/src/main/java/fr/ifremer/wao/services/service/ContactsFilterValues.java 2014-04-07 10:38:17 UTC (rev 1851) @@ -41,6 +41,7 @@ import java.util.TreeSet; import static org.nuiton.i18n.I18n.l; +import static org.nuiton.i18n.I18n.n; /** * Created on 4/3/14. @@ -80,7 +81,6 @@ protected SortedSet<FilterOption> programAcceptations = new TreeSet<>(); - //FIXME What to do with this ? protected SortedSet<FilterOption> completeSamplings = new TreeSet<>(); public ContactsFilterValues(Locale locale, ObsProgram obsProgram) { @@ -135,20 +135,29 @@ terrestrialLocations.add(FilterOption.forValueAndLabel(terrestrialLocation.getTopiaId(), terrestrialLocation.getDescription())); } - //FIXME ? ContactStateMotif contactStateMotif = contact.getContactStateMotif(); if (contactStateMotif != null) { - contactStateMotives.add(FilterOption.forValueAndLabel(contactStateMotif.getTopiaId(), contactStateMotif.getCode())); + contactStateMotives.add(FilterOption.forValueAndLabel(contactStateMotif.getTopiaId(), contactStateMotif.getName())); } + Boolean validationCompany = contact.getValidationCompany(); - addValidationFilterOption(companyAcceptations, validationCompany); + addBooleanFilterOption(companyAcceptations, validationCompany, + n("wao.business.validationState.standby"), + n("wao.business.validationState.validated"), + n("wao.business.validationState.refused")); Boolean validationProgram = contact.getValidationProgram(); - addValidationFilterOption(programAcceptations, validationProgram); + addBooleanFilterOption(programAcceptations, validationProgram, + n("wao.business.validationState.standby"), + n("wao.business.validationState.validated"), + n("wao.business.validationState.refused")); - //FIXME ? Boolean completeSampling = contact.getCompleteSampling(); + addBooleanFilterOption(completeSamplings, completeSampling, + n("wao.business.completeSampling.undefined"), + n("wao.business.completeSampling.true"), + n("wao.business.completeSampling.false")); } public BoatsFilterValues getBoatsFilterValues() { @@ -211,18 +220,22 @@ return completeSamplings; } - protected void addValidationFilterOption(SortedSet<FilterOption> options, Boolean validationState) { + protected void addBooleanFilterOption(SortedSet<FilterOption> options, + Boolean booleanValue, + String nullI18nKey, + String trueI18nKey, + String falseI18nKey) { String value; String label; - if (validationState == null) { + if (booleanValue == null) { value = null; - label = l(locale, "wao.business.validationState.standby"); - } else if (validationState) { - value = validationState.toString(); - label = l(locale, "wao.business.validationState.validated"); + label = l(locale, nullI18nKey); + } else if (booleanValue) { + value = booleanValue.toString(); + label = l(locale, trueI18nKey); } else { - value = validationState.toString(); - label = l(locale, "wao.business.validationState.refused"); + value = booleanValue.toString(); + label = l(locale, falseI18nKey); } options.add(FilterOption.forValueAndLabel(value, label)); } Modified: trunk/wao-services/src/main/resources/i18n/wao-services_en_GB.properties =================================================================== --- trunk/wao-services/src/main/resources/i18n/wao-services_en_GB.properties 2014-04-07 10:38:06 UTC (rev 1850) +++ trunk/wao-services/src/main/resources/i18n/wao-services_en_GB.properties 2014-04-07 10:38:17 UTC (rev 1851) @@ -8,6 +8,9 @@ csv.import.error.unableToSetValue=Unable to set value '%s' (entity '%s', line %s, column '%s') csv.import.error.unrecognizedHeaders=Fields %s are not recognized. Accepted fields are %s. csv.import.logComment=Edited through import +wao.business.completeSampling.undefined=Undefined +wao.business.completeSampling.true=Yes +wao.business.completeSampling.false=No fr.ifremer.wao.services.service.mail.UserCredentialsEmail.subject=Your Wao credentials wao.action.delete.failure.attachedContacts=Object is attached to some contacts. wao.action.delete.failure.attachedNews=Object is attached to some news. Modified: trunk/wao-services/src/main/resources/i18n/wao-services_fr_FR.properties =================================================================== --- trunk/wao-services/src/main/resources/i18n/wao-services_fr_FR.properties 2014-04-07 10:38:06 UTC (rev 1850) +++ trunk/wao-services/src/main/resources/i18n/wao-services_fr_FR.properties 2014-04-07 10:38:17 UTC (rev 1851) @@ -13,6 +13,9 @@ wao.action.delete.failure.attachedNews=L'objet est lié à des actualités. wao.action.delete.failure.attachedSampleRows=L'objet est lié à des lignes du plan. wao.action.delete.failure.attachedWaoUsers=L'objet est lié à des utilisateurs. +wao.business.completeSampling.undefined=Non défini +wao.business.completeSampling.true=Oui +wao.business.completeSampling.false=Non wao.business.boat.validation.immatriculation.wrongFormat=L'immatriculation du navire doit être formée de 6 chiffres wao.business.contact.validation.commentAdminNecessaryForDataReliability=Il faut préciser dans le commentaire administrateur pourquoi la donnée est '%s' wao.business.contact.validation.commentMissingForState=Il faut préciser un commentaire pour l'état '%s'