Author: tchemit Date: 2014-02-28 19:43:42 +0100 (Fri, 28 Feb 2014) New Revision: 1617 Url: http://codelutin.com/projects/tutti/repository/revisions/1617 Log: fixes #4547: [PROTOCOLE] Import - Export des caract?\195?\169ristiques d'un protocole Modified: trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/protocol/CaracteristicType.java trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/protocol/ProtocolImportExportService.java trunk/tutti-service/src/test/java/fr/ifremer/tutti/service/protocol/ProtocolImportExportServiceTest.java Modified: trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/protocol/CaracteristicType.java =================================================================== --- trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/protocol/CaracteristicType.java 2014-02-24 17:20:26 UTC (rev 1616) +++ trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/protocol/CaracteristicType.java 2014-02-28 18:43:42 UTC (rev 1617) @@ -34,5 +34,6 @@ LENGTH_STEP, VESSEL_USE_FEATURE, - GEAR_USE_FEATURE + GEAR_USE_FEATURE, + INDIVIDUAL_OBSERVATION } Modified: trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/protocol/ProtocolImportExportService.java =================================================================== --- trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/protocol/ProtocolImportExportService.java 2014-02-24 17:20:26 UTC (rev 1616) +++ trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/protocol/ProtocolImportExportService.java 2014-02-28 18:43:42 UTC (rev 1617) @@ -150,6 +150,11 @@ protocol.setGearUseFeaturePmfmId( mergeIds(protocol.getGearUseFeaturePmfmId(), ids.get(CaracteristicType.GEAR_USE_FEATURE))); + + protocol.setIndividualObservationPmfmId( + mergeIds(protocol.getIndividualObservationPmfmId(), + ids.get(CaracteristicType.INDIVIDUAL_OBSERVATION))); + } public void exportAllCaracteristic(File file, @@ -165,7 +170,6 @@ List<CaracteristicRow> rows = Lists.transform( Lists.newArrayList(caracteristicMap.keySet()), function); - CaracteristicRowModel csvModel = new CaracteristicRowModel(getCsvSeparator(), caracteristicMap); @@ -210,6 +214,11 @@ function.setType(CaracteristicType.GEAR_USE_FEATURE); rows.addAll(Lists.transform(protocol.getGearUseFeaturePmfmId(), function)); } + if (!protocol.isIndividualObservationPmfmIdEmpty()) { + + function.setType(CaracteristicType.INDIVIDUAL_OBSERVATION); + rows.addAll(Lists.transform(protocol.getIndividualObservationPmfmId(), function)); + } CaracteristicRowModel csvModel = new CaracteristicRowModel(getCsvSeparator(), caracteristicMap); @@ -319,7 +328,6 @@ for (SpeciesProtocol speciesProtocol : protocol.getBenthos()) { ids.put(speciesProtocol.getSpeciesReferenceTaxonId(), speciesProtocol); } - } SpeciesRowModel csvModel = new SpeciesRowModel(getCsvSeparator(), caracteristicMap, Modified: trunk/tutti-service/src/test/java/fr/ifremer/tutti/service/protocol/ProtocolImportExportServiceTest.java =================================================================== --- trunk/tutti-service/src/test/java/fr/ifremer/tutti/service/protocol/ProtocolImportExportServiceTest.java 2014-02-24 17:20:26 UTC (rev 1616) +++ trunk/tutti-service/src/test/java/fr/ifremer/tutti/service/protocol/ProtocolImportExportServiceTest.java 2014-02-28 18:43:42 UTC (rev 1617) @@ -98,6 +98,9 @@ "gearUseFeaturePmfmId: \n" + "- 21\n" + "- 22\n" + + "individualObservationPmfmId: \n" + + "- 25\n" + + "- 26\n" + "lengthClassesPmfmId: \n" + "- 14\n" + "- 18\n" + @@ -134,7 +137,8 @@ "pmfmId;pmfmType;pmfmParameterName;pmfmMatrixName;pmfmFractionName;pmfmMethodName\n" + "1;LENGTH_STEP;parameterName1;matrixName1;fractionName1;methodName1\n" + "2;VESSEL_USE_FEATURE;parameterName2;matrixName2;fractionName2;methodName2\n" + - "3;GEAR_USE_FEATURE;parameterName3;matrixName3;fractionName3;methodName3"; + "3;GEAR_USE_FEATURE;parameterName3;matrixName3;fractionName3;methodName3\n"+ + "4;INDIVIDUAL_OBSERVATION;parameterName4;matrixName4;fractionName4;methodName4"; public static final String PROTOCOL_CARACTERISTIC_FILE_BAD_CONTENT = "pmfmId;pmfmType;pmfmParameterName;pmfmMatrixName;pmfmFractionName;pmfmMethodName\n" + @@ -189,6 +193,7 @@ protocol.setLengthClassesPmfmId(Lists.newArrayList("14", "18")); protocol.setVesselUseFeaturePmfmId(Lists.newArrayList("114", "228", "821")); protocol.setGearUseFeaturePmfmId(Lists.newArrayList("21", "22")); + protocol.setIndividualObservationPmfmId(Lists.newArrayList("25", "26")); protocol.setSpecies(Lists.<SpeciesProtocol>newArrayList()); SpeciesProtocol sp1 = SpeciesProtocols.newSpeciesProtocol(); @@ -270,6 +275,7 @@ Assert.assertEquals(Lists.newArrayList("14", "18"), protocol.getLengthClassesPmfmId()); Assert.assertEquals(Lists.newArrayList("114", "228", "821"), protocol.getVesselUseFeaturePmfmId()); Assert.assertEquals(Lists.newArrayList("21", "22"), protocol.getGearUseFeaturePmfmId()); + Assert.assertEquals(Lists.newArrayList("25", "26"), protocol.getIndividualObservationPmfmId()); Assert.assertNotNull(protocol.getSpecies()); Assert.assertEquals(2, protocol.sizeSpecies()); @@ -352,6 +358,8 @@ protocol.getVesselUseFeaturePmfmId()); Assert.assertEquals(Lists.newArrayList("3"), protocol.getGearUseFeaturePmfmId()); + Assert.assertEquals(Lists.newArrayList("4"), + protocol.getIndividualObservationPmfmId()); } @Test(expected = ImportRuntimeException.class) @@ -383,6 +391,7 @@ protocol.setLengthClassesPmfmId(Lists.newArrayList("1")); protocol.setVesselUseFeaturePmfmId(Lists.newArrayList("2")); protocol.setGearUseFeaturePmfmId(Lists.newArrayList("3")); + protocol.setIndividualObservationPmfmId(Lists.newArrayList("4")); Assert.assertFalse(file.exists()); service.exportProtocolCaracteristic(file,