Author: chatellier Date: 2011-01-06 10:26:42 +0000 (Thu, 06 Jan 2011) New Revision: 470 Log: Prise en compte du nouveau fichier code type espece (code en plus) Modified: trunk/coser-business/src/main/java/fr/ifremer/coser/bean/Project.java trunk/coser-business/src/main/java/fr/ifremer/coser/services/ControlService.java trunk/coser-business/src/main/java/fr/ifremer/coser/services/ProjectService.java Modified: trunk/coser-business/src/main/java/fr/ifremer/coser/bean/Project.java =================================================================== --- trunk/coser-business/src/main/java/fr/ifremer/coser/bean/Project.java 2011-01-06 10:26:02 UTC (rev 469) +++ trunk/coser-business/src/main/java/fr/ifremer/coser/bean/Project.java 2011-01-06 10:26:42 UTC (rev 470) @@ -62,7 +62,7 @@ }; public static final String[] TYPE_ESPECE_HEADER = { - "Types","Commentaire","NumSys min","NumSys max" + "Types","Commentaire","NumSys min","NumSys max","Code" }; public static final String PROPERTY_SELECTIONS = "selections"; Modified: trunk/coser-business/src/main/java/fr/ifremer/coser/services/ControlService.java =================================================================== --- trunk/coser-business/src/main/java/fr/ifremer/coser/services/ControlService.java 2011-01-06 10:26:02 UTC (rev 469) +++ trunk/coser-business/src/main/java/fr/ifremer/coser/services/ControlService.java 2011-01-06 10:26:42 UTC (rev 470) @@ -907,7 +907,7 @@ Iterator<String[]> itTypeSpecies = project.getTypeEspeces().iterator(); itTypeSpecies.next(); // skip header while (itTypeSpecies.hasNext()) { - // "Types";"Commentaire";"NumSys min";"NumSys max" + // "Types";"Commentaire";"NumSys min";"NumSys max","Code" String[] tuple = itTypeSpecies.next(); String specyType = tuple[0]; Modified: trunk/coser-business/src/main/java/fr/ifremer/coser/services/ProjectService.java =================================================================== --- trunk/coser-business/src/main/java/fr/ifremer/coser/services/ProjectService.java 2011-01-06 10:26:02 UTC (rev 469) +++ trunk/coser-business/src/main/java/fr/ifremer/coser/services/ProjectService.java 2011-01-06 10:26:42 UTC (rev 470) @@ -1609,7 +1609,7 @@ /** * Retourne la liste des type d'especes definie dans le projet sous forme - * de map avec leur commentaire. + * de map avec leur commentaire (sauf "Tous"). * * @param project project to search into * @return project species type @@ -1617,7 +1617,7 @@ public Map<String, String> getProjectSpeciesTypes(Project project) { SortedMap<String, String> types = new TreeMap<String, String>(); - // "Types","Commentaire","NumSys min","NumSys max" + // "Types","Commentaire","NumSys min","NumSys max","Code" Iterator<String[]> itTuples = project.getTypeEspeces().iterator(); itTuples.next(); // skip headers @@ -1627,7 +1627,13 @@ String type = tuple[0]; String comment = tuple[1]; - types.put(type, comment); + String numSysMin = tuple[2]; + String numSysMax = tuple[3]; + + // pour le cas "Tous", min est max sont a 0, donc pas filtrable + if (!numSysMin.equals(numSysMax)) { + types.put(type, comment); + } } return types; @@ -1830,7 +1836,7 @@ Iterator<String[]> itTypeSpecies = project.getTypeEspeces().iterator(); itTypeSpecies.next(); // skip header while (itTypeSpecies.hasNext()) { - // "Types";"Commentaire";"NumSys min";"NumSys max" + // "Types";"Commentaire";"NumSys min";"NumSys max","Code" String[] tuple = itTypeSpecies.next(); String specyType = tuple[0];