Author: bleny Date: 2011-01-05 21:27:32 +0000 (Wed, 05 Jan 2011) New Revision: 893 Log: make dataReliability enum elements ordered ; fix imports, migration, i18n Modified: trunk/wao-business/src/main/java/fr/ifremer/wao/PostgresMigrationCallback.java trunk/wao-business/src/main/java/fr/ifremer/wao/bean/DataReliability.java trunk/wao-business/src/main/java/fr/ifremer/wao/service/ServiceContactImpl.java trunk/wao-business/src/main/resources/i18n/wao-business_en_GB.properties trunk/wao-business/src/main/resources/i18n/wao-business_fr_FR.properties trunk/wao-business/src/test/java/fr/ifremer/wao/service/ServiceContactInternalTest.java trunk/wao-business/src/test/resources/import/contacts.csv trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/pages/Contacts.java trunk/wao-ui/src/main/resources/i18n/wao-ui_en_GB.properties trunk/wao-ui/src/main/resources/i18n/wao-ui_fr_FR.properties trunk/wao-ui/src/main/webapp/Boats.tml trunk/wao-ui/src/main/webapp/ContactForm.tml trunk/wao-ui/src/main/webapp/Contacts.tml Modified: trunk/wao-business/src/main/java/fr/ifremer/wao/PostgresMigrationCallback.java =================================================================== --- trunk/wao-business/src/main/java/fr/ifremer/wao/PostgresMigrationCallback.java 2011-01-05 20:51:40 UTC (rev 892) +++ trunk/wao-business/src/main/java/fr/ifremer/wao/PostgresMigrationCallback.java 2011-01-05 21:27:32 UTC (rev 893) @@ -437,7 +437,8 @@ /** Add a columns to Contact. */ @Override protected void addDataReliability_1_6(List<String> queries) { - queries.add("ALTER TABLE Contact ADD dataReliabilityOrdinal SMALLINT NOT NULL DEFAULT 0;"); + // 3 is for DataReliability.UNKNOWN + queries.add("ALTER TABLE Contact ADD dataReliabilityOrdinal SMALLINT NOT NULL DEFAULT 3;"); } @Override Modified: trunk/wao-business/src/main/java/fr/ifremer/wao/bean/DataReliability.java =================================================================== --- trunk/wao-business/src/main/java/fr/ifremer/wao/bean/DataReliability.java 2011-01-05 20:51:40 UTC (rev 892) +++ trunk/wao-business/src/main/java/fr/ifremer/wao/bean/DataReliability.java 2011-01-05 21:27:32 UTC (rev 893) @@ -21,40 +21,43 @@ package fr.ifremer.wao.bean; import static org.nuiton.i18n.I18n._; +import static org.nuiton.i18n.I18n.n_; /** * This enumeration represents the different levels of trust that can accorded to * a contact and to the data she provided. * + * Order of the value puts the more used first, in order to make it first in + * combo-box for user convenience + * * @author bleny */ public enum DataReliability { - /** Data reliability has not been evaluated yet (?% trust). */ - UNKNOWN("wao.business.bean.DataReliability.unknown"), + /** Data are trustworthy (100% trust). */ + RELIABLE(n_("DataReliability.RELIABLE")), + /** Data are doubtful (50% trust). */ + DOUBTFUL(n_("DataReliability.RELIABLE")), + /** Data are not reliable (0% trust). */ - NOT_RELIABLE("wao.business.bean.DataReliability.not_reliable"), + NOT_RELIABLE(n_("DataReliability.RELIABLE")), - /** Data are doubtful (50% trust). */ - DOUBTFUL("wao.business.bean.DataReliability.doubtful"), + /** Data reliability has not been evaluated yet (?% trust). */ + UNKNOWN(n_("DataReliability.RELIABLE")), - /** Data are trustworthy (100% trust). */ - RELIABLE("wao.business.bean.DataReliability.reliable"), - /** Information has not been provided */ - NOT_PROVIDED("wao.business.bean.DataReliability.not_provided"); + NOT_PROVIDED(n_("DataReliability.RELIABLE")); /** An i18n key to make enumeration printable in logs and UI. */ - protected String label; + protected String i18nKey; - DataReliability(String label) { - this.label = label; + DataReliability(String i18nKey) { + this.i18nKey = i18nKey; } - /** Get a translated name for the current value. */ - public String getLabel() { - return _(label); + public String getI18nKey() { + return i18nKey; } public static DataReliability valueOf(int ordinal) { Modified: trunk/wao-business/src/main/java/fr/ifremer/wao/service/ServiceContactImpl.java =================================================================== --- trunk/wao-business/src/main/java/fr/ifremer/wao/service/ServiceContactImpl.java 2011-01-05 20:51:40 UTC (rev 892) +++ trunk/wao-business/src/main/java/fr/ifremer/wao/service/ServiceContactImpl.java 2011-01-05 21:27:32 UTC (rev 893) @@ -469,7 +469,7 @@ export.record(CONTACT.CONT_PROGRAM_VALID, CONTACT.formatValidation(contact.getValidationProgram())); export.record(CONTACT.CONT_DATA_RELIABILITY, - String.valueOf(contact.getDataReliabilityOrdinal())); + contact.getDataReliability().name()); if (contact.getSamplingStrategy() != null) { export.record(CONTACT.CONT_SAMPLING_STRATEGY, @@ -707,7 +707,7 @@ contact.setContactState(ImportHelper.read(reader, CONTACT.CONT_ETAT)); - contact.setObserver(ImportHelper.read(reader, CONTACT.OBSERV_ID)); + contact.setObservers(ImportHelper.read(reader, CONTACT.OBSERV_ID)); contact.initCompany(); @@ -761,8 +761,8 @@ contact.setTopiaCreateDate(createDate); - contact.setDataReliabilityOrdinal( - ImportHelper.readInt(reader, CONTACT.CONT_DATA_RELIABILITY)); + contact.setDataReliability(DataReliability.valueOf( + ImportHelper.read(reader, CONTACT.CONT_DATA_RELIABILITY))); String samplingStrategyName = ImportHelper.read(reader, CONTACT.CONT_SAMPLING_STRATEGY); if (StringUtils.isNotBlank(samplingStrategyName)) { Modified: trunk/wao-business/src/main/resources/i18n/wao-business_en_GB.properties =================================================================== --- trunk/wao-business/src/main/resources/i18n/wao-business_en_GB.properties 2011-01-05 20:51:40 UTC (rev 892) +++ trunk/wao-business/src/main/resources/i18n/wao-business_en_GB.properties 2011-01-05 21:27:32 UTC (rev 893) @@ -1,3 +1,4 @@ +DataReliability.RELIABLE= SynthesisId.GRAPH_BOARDING= SynthesisId.GRAPH_SAMPLING= SynthesisId.IND_ALLEGRO_REACTIVITY= Modified: trunk/wao-business/src/main/resources/i18n/wao-business_fr_FR.properties =================================================================== --- trunk/wao-business/src/main/resources/i18n/wao-business_fr_FR.properties 2011-01-05 20:51:40 UTC (rev 892) +++ trunk/wao-business/src/main/resources/i18n/wao-business_fr_FR.properties 2011-01-05 21:27:32 UTC (rev 893) @@ -1,3 +1,18 @@ +ContactState.BOARDING_DONE=Embarquement r\u00E9alis\u00E9 +ContactState.BOARDING_EXPECTED=Embarquement programm\u00E9 +ContactState.BOAT_DEFINITIVE_REFUSED=Refus d\u00E9finitif +ContactState.BOAT_REFUSED=Refus +ContactState.BOAT_UNAVAILABLE=Non abouti +ContactState.CONTACT_START=Contact pris +DataReliability.DOUBTFUL=Douteuse +DataReliability.NOT_PROVIDED=Non contr\u00F4l\u00E9e +DataReliability.NOT_RELIABLE=Non exploitable +DataReliability.RELIABLE=Exploitable +DataReliability.UNKNOWN=Inconnue +SamplingStrategy.SIMULTANEOUS_ALL_SPECIES=Toutes esp\u00E8ces commerciales +SamplingStrategy.SIMULTANEOUS_G1_G2_SPECIES=Simultan\u00E9 \: esp\u00E8ces G1+G2 +SamplingStrategy.SIMULTANEOUS_G1_SPECIES=Simultan\u00E9 \: esp\u00E8ces G1 +SamplingStrategy.SPECIFIC_STOCK=Stock sp\u00E9cifique SynthesisId.GRAPH_BOARDING=Taux d'embarquement sur un m\u00EAme navire conforme aux exigences SynthesisId.GRAPH_SAMPLING=Taux de r\u00E9alisation du plan d'\u00E9chantillonage SynthesisId.IND_ALLEGRO_REACTIVITY=D\u00E9lais de transmission des donn\u00E9es @@ -90,11 +105,6 @@ fr.ifremer.wao.entity.TargetSpeciesDCF.LPF=Grands p\u00E9lagiques fr.ifremer.wao.entity.TargetSpeciesDCF.MOL=Mollusques fr.ifremer.wao.entity.TargetSpeciesDCF.SPF=Petits p\u00E9lagiques -wao.business.bean.DataReliability.doubtful=douteuse -wao.business.bean.DataReliability.not_provided=non renseign\u00E9e -wao.business.bean.DataReliability.not_reliable=non exploitable -wao.business.bean.DataReliability.reliable=exploitable -wao.business.bean.DataReliability.unknown=inconnue wao.business.bean.GlobalIndicatorValue.bad=P\u00E9nalit\u00E9 de niveau 1 wao.business.bean.GlobalIndicatorValue.good=Bonus de niveau 1 wao.business.bean.GlobalIndicatorValue.neutral=Conforme au cahier des charges Modified: trunk/wao-business/src/test/java/fr/ifremer/wao/service/ServiceContactInternalTest.java =================================================================== --- trunk/wao-business/src/test/java/fr/ifremer/wao/service/ServiceContactInternalTest.java 2011-01-05 20:51:40 UTC (rev 892) +++ trunk/wao-business/src/test/java/fr/ifremer/wao/service/ServiceContactInternalTest.java 2011-01-05 21:27:32 UTC (rev 893) @@ -574,7 +574,7 @@ when(reader.get(CONTACT.CONT_COMMENT.name())). thenReturn(comment); when(reader.get(CONTACT.CONT_DATA_RELIABILITY.name())). - thenReturn("0"); + thenReturn("DOUBTFUL"); when(reader.get(CONTACT.CONT_SAMPLING_STRATEGY.name())). thenReturn(SamplingStrategy.SIMULTANEOUS_ALL_SPECIES.name()); when(reader.get(CONTACT.CONT_COMPLETE_SAMPLING.name())). Modified: trunk/wao-business/src/test/resources/import/contacts.csv =================================================================== --- trunk/wao-business/src/test/resources/import/contacts.csv 2011-01-05 20:51:40 UTC (rev 892) +++ trunk/wao-business/src/test/resources/import/contacts.csv 2011-01-05 21:27:32 UTC (rev 893) @@ -1,2 +1,2 @@ -"CONT_CREATION","OBSERV_ID","PLAN_CODE","NAVS_COD","CONT_ETAT","CONT_DEBUT_MAREE","CONT_FIN_MAREE","CONT_NB_OBSERV","CONT_MAM_CAPT","CONT_MAM_OBS","CONT_COMMENT","CONT_ALLEGRO","CONT_SOCIETE_VALID","CONT_PROGRAM_VALID" -17/03/2010,"jmichmuche","2010_01",175846,"Embarquement réalisé ","18/03/2010 12:34","19/03/2010 22:33",1,,,,22/07/2010,"A","A" +"CONT_CREATION","OBSERV_ID","PLAN_CODE","NAVS_COD","CONT_ETAT","CONT_DEBUT_MAREE","CONT_FIN_MAREE","CONT_NB_OBSERV","CONT_MAM_CAPT","CONT_MAM_OBS","CONT_COMMENT","CONT_ALLEGRO","CONT_SOCIETE_VALID","CONT_PROGRAM_VALID","CONT_DATA_RELIABILITY" +17/03/2010,"jmichmuche","2010_01",175846,"Embarquement réalisé ","18/03/2010 12:34","19/03/2010 22:33",1,,,,22/07/2010,"A","A",RELIABLE Modified: trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/pages/Contacts.java =================================================================== --- trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/pages/Contacts.java 2011-01-05 20:51:40 UTC (rev 892) +++ trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/pages/Contacts.java 2011-01-05 21:27:32 UTC (rev 893) @@ -1016,4 +1016,8 @@ return this; } + public String getLabelForEnum(Enum value) { + return messages.get(value.getDeclaringClass().getSimpleName() + "." + value.name()); + } + } Modified: trunk/wao-ui/src/main/resources/i18n/wao-ui_en_GB.properties =================================================================== --- trunk/wao-ui/src/main/resources/i18n/wao-ui_en_GB.properties 2011-01-05 20:51:40 UTC (rev 892) +++ trunk/wao-ui/src/main/resources/i18n/wao-ui_en_GB.properties 2011-01-05 21:27:32 UTC (rev 893) @@ -92,6 +92,7 @@ wao.ui.field.UserProfile.userRole= wao.ui.field.WaoUser.login= wao.ui.field.WaoUser.password= +wao.ui.filters.filters= wao.ui.filters.refresh= wao.ui.forgotPassword= wao.ui.form.addRole= Modified: trunk/wao-ui/src/main/resources/i18n/wao-ui_fr_FR.properties =================================================================== --- trunk/wao-ui/src/main/resources/i18n/wao-ui_fr_FR.properties 2011-01-05 20:51:40 UTC (rev 892) +++ trunk/wao-ui/src/main/resources/i18n/wao-ui_fr_FR.properties 2011-01-05 21:27:32 UTC (rev 893) @@ -1,19 +1,3 @@ -ContactState.BOARDING_DONE=Embarquement r\u00E9alis\u00E9 -ContactState.BOARDING_EXPECTED=Embarquement programm\u00E9 -ContactState.BOAT_DEFINITIVE_REFUSED=Refus d\u00E9finitif -ContactState.BOAT_REFUSED=Refus -ContactState.BOAT_UNAVAILABLE=Non abouti -ContactState.CONTACT_START=Contact pris -DataReliability.DOUBTFUL=Douteuse -DataReliability.NOT_PROVIDED=Non contr\u00F4l\u00E9e -DataReliability.NOT_RELIABLE=Non exploitable -DataReliability.RELIABLE=Exploitable -DataReliability.UNKNOWN=Inconnue -SamplingStrategy.SIMULTANEOUS_ALL_SPECIES=Toutes esp\u00E8ces commerciales -SamplingStrategy.SIMULTANEOUS_G1_G2_SPECIES=Simultan\u00E9 \: esp\u00E8ces G1+G2 -SamplingStrategy.SIMULTANEOUS_G1_SPECIES=Simultan\u00E9 \: esp\u00E8ces G1 -SamplingStrategy.SPECIFIC_STOCK=Stock sp\u00E9cifique -wao.filters.filters=Filtres de recherche wao.ui.action.add=Ajouter wao.ui.action.addNewContactFromBoat=Cr\u00E9er un nouveau contact pour ce navire et la ligne s\u00E9lectionn\u00E9e dans les filtres wao.ui.action.back=Revenier \u00E0 l'\u00E9cran pr\u00E9c\u00E9dent @@ -89,6 +73,7 @@ wao.ui.field.UserProfile.userRole=R\u00F4le wao.ui.field.WaoUser.login=Identifiant wao.ui.field.WaoUser.password=Mot de passe +wao.ui.filters.filters=Filtres de recherche wao.ui.filters.refresh=Rafra\u00EEchir les champs du filtre wao.ui.forgotPassword=Mot de passe oubli\u00E9 ? wao.ui.form.addRole=Ajouter ce r\u00F4le Modified: trunk/wao-ui/src/main/webapp/Boats.tml =================================================================== --- trunk/wao-ui/src/main/webapp/Boats.tml 2011-01-05 20:51:40 UTC (rev 892) +++ trunk/wao-ui/src/main/webapp/Boats.tml 2011-01-05 21:27:32 UTC (rev 893) @@ -33,7 +33,7 @@ <!--t:filters t:title="Filtres de recherche" t:mainId="so-boats-filters"--> <div t:type="zone" class="so-filters" t:id="filtersZone" id="so-boats-filters"> <fieldset> - <legend>${message:wao.filters.filters}</legend> + <legend>${message:wao.ui.filters.filters}</legend> <div class="aright"> <t:if t:test="filtersHidden"> <a t:type="actionlink" t:id="showFilters" t:zone="so-boats-filters"> Modified: trunk/wao-ui/src/main/webapp/ContactForm.tml =================================================================== --- trunk/wao-ui/src/main/webapp/ContactForm.tml 2011-01-05 20:51:40 UTC (rev 892) +++ trunk/wao-ui/src/main/webapp/ContactForm.tml 2011-01-05 21:27:32 UTC (rev 893) @@ -106,7 +106,7 @@ <t:block id="viewObservationReport"> <div> <label>${message:wao.ui.field.Contact.contactState}</label> - ${contact.contactState.label} + ${getLabelForEnum(contact.contactState)} </div> <div> <label>${message:wao.ui.field.Contact.nbObservants}</label> Modified: trunk/wao-ui/src/main/webapp/Contacts.tml =================================================================== --- trunk/wao-ui/src/main/webapp/Contacts.tml 2011-01-05 20:51:40 UTC (rev 892) +++ trunk/wao-ui/src/main/webapp/Contacts.tml 2011-01-05 21:27:32 UTC (rev 893) @@ -304,7 +304,7 @@ <t:if t:test="boardingDone"> <t:if t:test="contact.validationCompany"> <t:if test="contact.validationProgram"> - ${contact.dataReliability.label} + ${getLabelForEnum(contact.dataReliability)} <!--p:else> <t:if test="canUpdateDataReliability()"> <input t:type="select" t:id="dataReliability" t:value="contact.dataReliability" validate="required" />