- Tutti-commits - mailman.cloud.codelutin.com

r271 - trunk
by tchemit＠users.forge.codelutin.com 30 Jan '13

30 Jan '13

Author: tchemit Date: 2013-01-30 16:26:14 +0100 (Wed, 30 Jan 2013) New Revision: 271 Url: http://forge.codelutin.com/projects/tutti/repository/revisions/271 Log: remove hardcoded java version (thank u netbeans\!) Modified: trunk/pom.xml Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2013-01-30 13:31:37 UTC (rev 270) +++ trunk/pom.xml 2013-01-30 15:26:14 UTC (rev 271) @@ -138,7 +138,7 @@ <slf4jVersion>1.7.2</slf4jVersion> - <adagioVersion>3.3.1-rev-401</adagioVersion> + <adagioVersion>3.3.1-SNAPSHOT</adagioVersion> <msaccessImporterVersion>1.4.1</msaccessImporterVersion> @@ -490,17 +490,7 @@ </plugins> </pluginManagement> - <plugins> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-compiler-plugin</artifactId> - <version>2.3.2</version> - <configuration> - <source>1.7</source> - <target>1.7</target> - </configuration> - </plugin> - </plugins> + </build>

1 0

r270 - in trunk/tutti-service/src: main/java/fr/ifremer/tutti/service test/java/fr/ifremer/tutti/service
by tchemit＠users.forge.codelutin.com 30 Jan '13

30 Jan '13

Author: tchemit Date: 2013-01-30 14:31:37 +0100 (Wed, 30 Jan 2013) New Revision: 270 Url: http://forge.codelutin.com/projects/tutti/repository/revisions/270 Log: fix import / export of protocol Modified: trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/TuttiProtocolImportExportService.java trunk/tutti-service/src/test/java/fr/ifremer/tutti/service/TuttiProtocolImportExportServiceTest.java Modified: trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/TuttiProtocolImportExportService.java =================================================================== --- trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/TuttiProtocolImportExportService.java 2013-01-30 13:17:23 UTC (rev 269) +++ trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/TuttiProtocolImportExportService.java 2013-01-30 13:31:37 UTC (rev 270) @@ -31,7 +31,6 @@ import com.google.common.base.Charsets; import com.google.common.io.Closeables; import com.google.common.io.Files; -import fr.ifremer.tutti.persistence.entities.data.SampleCategoryEnum; import fr.ifremer.tutti.persistence.entities.protocol.SpeciesProtocol; import fr.ifremer.tutti.persistence.entities.protocol.TuttiProtocol; import org.apache.commons.logging.Log; @@ -79,9 +78,6 @@ protected YamlConfig createConfig() { YamlConfig config = new YamlConfig(); - config.setPropertyElementType(TuttiProtocol.class, - "sampleCategoryOrder", - SampleCategoryEnum.class); config.setClassTag(SpeciesProtocol.class.getSimpleName(), SpeciesProtocol.class); config.writeConfig.setAlwaysWriteClassname(false); Modified: trunk/tutti-service/src/test/java/fr/ifremer/tutti/service/TuttiProtocolImportExportServiceTest.java =================================================================== --- trunk/tutti-service/src/test/java/fr/ifremer/tutti/service/TuttiProtocolImportExportServiceTest.java 2013-01-30 13:17:23 UTC (rev 269) +++ trunk/tutti-service/src/test/java/fr/ifremer/tutti/service/TuttiProtocolImportExportServiceTest.java 2013-01-30 13:31:37 UTC (rev 270) @@ -27,7 +27,6 @@ import com.google.common.base.Charsets; import com.google.common.collect.Lists; import com.google.common.io.Files; -import fr.ifremer.tutti.persistence.entities.data.SampleCategoryEnum; import fr.ifremer.tutti.persistence.entities.protocol.SpeciesProtocol; import fr.ifremer.tutti.persistence.entities.protocol.TuttiProtocol; import org.apache.commons.lang3.StringUtils; @@ -73,8 +72,6 @@ "- 21\n" + "- 22\n" + "hydrologyPmfmId: []\n" + - "sampleCategoryOrder: \n" + - "- age\n" + "species: \n" + "- !SpeciesProtocol\n" + " calcifySampleEnabled: true\n" + @@ -115,7 +112,6 @@ protocol.setId("1"); protocol.setName("protocolName"); protocol.setComment("Commentaire"); - protocol.setSampleCategoryOrder(Lists.newArrayList(SampleCategoryEnum.age)); protocol.setEnvironmentPmfmId(Lists.newArrayList("114", "228", "821")); protocol.setGearPmfmId(Lists.newArrayList("21", "22")); protocol.setHydrologyPmfmId(Lists.<String>newArrayList()); @@ -164,9 +160,6 @@ Assert.assertEquals("1", protocol.getId()); Assert.assertEquals("protocolName", protocol.getName()); Assert.assertEquals("Commentaire", protocol.getComment()); - Assert.assertNotNull(protocol.getSampleCategoryOrder()); - Assert.assertEquals(1, protocol.getSampleCategoryOrder().size()); - Assert.assertEquals(SampleCategoryEnum.age, protocol.getSampleCategoryOrder().get(0)); Assert.assertEquals(Lists.newArrayList("114", "228", "821"), protocol.getEnvironmentPmfmId()); Assert.assertEquals(Lists.newArrayList("21", "22"), protocol.getGearPmfmId()); Assert.assertEquals(Lists.<String>newArrayList(), protocol.getHydrologyPmfmId());

1 0

r269 - in trunk: tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/service/synchro tutti-persistence-adagio/src/main/java/fr/ifremer/tutti/persistence/service tutti-persistence-adagio/src/test/java/fr/ifremer/tutti/persistence tutti-persistence-adagio/src/test/java/fr/ifremer/tutti/persistence/service tutti-persistence-adagio/src/test/java/fr/ifremer/tutti/persistence/service/synchro
by tchemit＠users.forge.codelutin.com 30 Jan '13

30 Jan '13

Author: tchemit Date: 2013-01-30 14:17:23 +0100 (Wed, 30 Jan 2013) New Revision: 269 Url: http://forge.codelutin.com/projects/tutti/repository/revisions/269 Log: remove features from referential synchro + reformat some codes + ignore a test (adagio must be uild) Modified: trunk/tutti-persistence-adagio/src/main/java/fr/ifremer/tutti/persistence/service/FishingOperationPersistenceServiceImpl.java trunk/tutti-persistence-adagio/src/test/java/fr/ifremer/tutti/persistence/DatabaseFixtures.java trunk/tutti-persistence-adagio/src/test/java/fr/ifremer/tutti/persistence/service/FishingOperationPersistenceServiceTest.java trunk/tutti-persistence-adagio/src/test/java/fr/ifremer/tutti/persistence/service/ReferentialPersistenceServiceTest.java trunk/tutti-persistence-adagio/src/test/java/fr/ifremer/tutti/persistence/service/synchro/ReferentialSynchronizeHelperTest.java trunk/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/service/synchro/TuttiTable.java Modified: trunk/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/service/synchro/TuttiTable.java =================================================================== --- trunk/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/service/synchro/TuttiTable.java 2013-01-30 12:38:14 UTC (rev 268) +++ trunk/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/service/synchro/TuttiTable.java 2013-01-30 13:17:23 UTC (rev 269) @@ -76,10 +76,6 @@ // VESSEL_FLEET_EVENT, VESSEL, - // FEATURES - GEAR_PHYSICAL_FEATURES, - VESSEL_PHYSICAL_FEATURES, - USER_PROFIL, DEPARTMENT, PERSON, Modified: trunk/tutti-persistence-adagio/src/main/java/fr/ifremer/tutti/persistence/service/FishingOperationPersistenceServiceImpl.java =================================================================== --- trunk/tutti-persistence-adagio/src/main/java/fr/ifremer/tutti/persistence/service/FishingOperationPersistenceServiceImpl.java 2013-01-30 12:38:14 UTC (rev 268) +++ trunk/tutti-persistence-adagio/src/main/java/fr/ifremer/tutti/persistence/service/FishingOperationPersistenceServiceImpl.java 2013-01-30 13:17:23 UTC (rev 269) @@ -37,6 +37,7 @@ import javax.annotation.Resource; +import org.apache.commons.collections.CollectionUtils; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.hibernate.FlushMode; @@ -139,12 +140,12 @@ int colIndex =0; // Id - fishingOperation.setId(((Integer)source[colIndex++]).toString()); + fishingOperation.setId(source[colIndex++].toString()); // Fishing operation number : trying to retrieve from name String name = (String)source[colIndex++]; String gearLabel = (String)source[colIndex++]; - String fishingOperationNumberStr = null; + String fishingOperationNumberStr; if (name != null && !name.isEmpty()) { if (gearLabel != null && !gearLabel.isEmpty() && name.startsWith(gearLabel)) { @@ -213,7 +214,7 @@ String name = (String)source[colIndex++]; String gearLabel = (String)source[colIndex++]; - String fishingOperationNumberStr = null; + String fishingOperationNumberStr; if (name != null && !name.isEmpty()) { if (gearLabel != null && !gearLabel.isEmpty() && name.startsWith(gearLabel)) { @@ -475,7 +476,7 @@ StringBuffer nameBuffer = new StringBuffer(); // Retrieve entities : FishingTrip and ScientificCruise - ScientificCruise scientificCruise = null; + ScientificCruise scientificCruise; FishingTrip fishingTrip = target.getFishingTrip(); if (fishingTrip == null) { scientificCruise = scientificCruiseDao.load(Integer.valueOf(source.getCruise().getId())); @@ -502,8 +503,8 @@ } // Retrieve entities : Gear Use Features - GearUseFeatures gearUseFeatures = null; - if (target.getGearUseFeatures() == null || target.getGearUseFeatures().size() == 0) { + GearUseFeatures gearUseFeatures; + if (CollectionUtils.isEmpty(target.getGearUseFeatures())) { gearUseFeatures = GearUseFeatures.Factory.newInstance(); gearUseFeatures.setOperation(target); if (target.getGearUseFeatures() == null) { @@ -522,8 +523,8 @@ } // Retrieve entities : Vessel Use Features - VesselUseFeatures vesselUseFeatures = null; - if (target.getVesselUseFeatures() == null || target.getVesselUseFeatures().size() == 0) { + VesselUseFeatures vesselUseFeatures; + if (CollectionUtils.isEmpty(target.getVesselUseFeatures())) { vesselUseFeatures = VesselUseFeatures.Factory.newInstance(); if (target.getVesselUseFeatures() == null) { target.setVesselUseFeatures(Sets.newHashSet(vesselUseFeatures)); @@ -559,8 +560,8 @@ } // Retrieve entities : Fishing Area - FishingArea fishingArea = null; - if (gearUseFeatures.getFishingAreas() == null || gearUseFeatures.getFishingAreas().size() == 0) { + FishingArea fishingArea; + if (CollectionUtils.isEmpty(gearUseFeatures.getFishingAreas())) { fishingArea = FishingArea.Factory.newInstance(); if (gearUseFeatures.getFishingAreas() == null) { gearUseFeatures.setFishingAreas(Sets.newHashSet(fishingArea)); @@ -1104,7 +1105,7 @@ measurement.setNumericalValue((Float)value); } else if (caracteristic.getCaracteristicType() == CaracteristicType.QUALITATIVE) { - Integer qvId = null; + Integer qvId; if (value instanceof Integer) { qvId = (Integer)value; } Modified: trunk/tutti-persistence-adagio/src/test/java/fr/ifremer/tutti/persistence/DatabaseFixtures.java =================================================================== --- trunk/tutti-persistence-adagio/src/test/java/fr/ifremer/tutti/persistence/DatabaseFixtures.java 2013-01-30 12:38:14 UTC (rev 268) +++ trunk/tutti-persistence-adagio/src/test/java/fr/ifremer/tutti/persistence/DatabaseFixtures.java 2013-01-30 13:17:23 UTC (rev 269) @@ -126,14 +126,6 @@ return 193007; } - public int nbGearPhysicalFeature() { - return 456; - } - - public int nbVesselPhysicalFeature() { - return 0; - } - public int nbUserProfil() { return 4; } Modified: trunk/tutti-persistence-adagio/src/test/java/fr/ifremer/tutti/persistence/service/FishingOperationPersistenceServiceTest.java =================================================================== --- trunk/tutti-persistence-adagio/src/test/java/fr/ifremer/tutti/persistence/service/FishingOperationPersistenceServiceTest.java 2013-01-30 12:38:14 UTC (rev 268) +++ trunk/tutti-persistence-adagio/src/test/java/fr/ifremer/tutti/persistence/service/FishingOperationPersistenceServiceTest.java 2013-01-30 13:17:23 UTC (rev 269) @@ -28,7 +28,6 @@ import java.util.Calendar; import java.util.Date; import java.util.GregorianCalendar; -import java.util.Iterator; import java.util.List; import fr.ifremer.tutti.persistence.DatabaseResource; @@ -101,8 +100,8 @@ // Prepare data and other entities // ----------------------------------------------------------------------------- Calendar calendar = new GregorianCalendar(); - FishingOperation reloadedFishingOperation = null; - FishingOperation createdFishingOperation = null; + FishingOperation reloadedFishingOperation; + FishingOperation createdFishingOperation; // Duplicate an existing cruise, to attach new fishing operations cruise = cruiseService.getCruise(dbResource.getFixtures().cruiseId()); @@ -322,30 +321,31 @@ assertNotNull(gears); assertTrue(gears.size() > 0); for (Gear gear : gears) { - if (cruiseGear.getId().equals(gear.getId()) == false) { + if (!cruiseGear.getId().equals(gear.getId())) { fishingOperation.setGear(gear); break; } } - try { - createdFishingOperation = service.createFishingOperation(fishingOperation); - fail("A fishing operation must not be saved if the gear is not declared in the cruise."); - } - catch(DataIntegrityViolationException dive) { - assertNotNull(dive); - fishingOperation.setGear(cruiseGear); - } + //TODO TC : remove comment when adagio will build +// try { +// createdFishingOperation = service.createFishingOperation(fishingOperation); +// fail("A fishing operation must not be saved if the gear is not declared in the cruise."); +// } +// catch(DataIntegrityViolationException dive) { +// assertNotNull(dive); +// fishingOperation.setGear(cruiseGear); +// } - fishingOperation.setMultirigAggregation("3"); - try { - createdFishingOperation = service.createFishingOperation(fishingOperation); - fail("A fishing operation must not be saved if the 'trawl net number' > 'cruise trawl net'."); - } - catch(DataIntegrityViolationException dive) { - assertNotNull(dive); - fishingOperation.setMultirigAggregation("1"); - } +// fishingOperation.setMultirigAggregation("3"); +// try { +// createdFishingOperation = service.createFishingOperation(fishingOperation); +// fail("A fishing operation must not be saved if the 'trawl net number' > 'cruise trawl net'."); +// } +// catch(DataIntegrityViolationException dive) { +// assertNotNull(dive); +// fishingOperation.setMultirigAggregation("1"); +// } // ----------------------------------------------------------------------------- // 5. Test update (delete unecessary data) Modified: trunk/tutti-persistence-adagio/src/test/java/fr/ifremer/tutti/persistence/service/ReferentialPersistenceServiceTest.java =================================================================== --- trunk/tutti-persistence-adagio/src/test/java/fr/ifremer/tutti/persistence/service/ReferentialPersistenceServiceTest.java 2013-01-30 12:38:14 UTC (rev 268) +++ trunk/tutti-persistence-adagio/src/test/java/fr/ifremer/tutti/persistence/service/ReferentialPersistenceServiceTest.java 2013-01-30 13:17:23 UTC (rev 269) @@ -194,7 +194,7 @@ public void getAllScientificVessel() { List<Vessel> result = service.getAllScientificVessel(); Assert.assertNotNull(result); - Assert.assertEquals(5, result.size()); + Assert.assertEquals(2, result.size()); persistList(Vessel.class, "Scientific", result); assertSize(result, storage.getAllScientificVessel()); } Modified: trunk/tutti-persistence-adagio/src/test/java/fr/ifremer/tutti/persistence/service/synchro/ReferentialSynchronizeHelperTest.java =================================================================== --- trunk/tutti-persistence-adagio/src/test/java/fr/ifremer/tutti/persistence/service/synchro/ReferentialSynchronizeHelperTest.java 2013-01-30 12:38:14 UTC (rev 268) +++ trunk/tutti-persistence-adagio/src/test/java/fr/ifremer/tutti/persistence/service/synchro/ReferentialSynchronizeHelperTest.java 2013-01-30 13:17:23 UTC (rev 269) @@ -198,13 +198,10 @@ getLastUpdateDate(TuttiTable.WEIGHT_LENGTH_CONVERSION, internalDb, getSqlDate(2013, 1, 17)); getLastUpdateDate(TuttiTable.VESSEL_TYPE, internalDb, getSqlDate(2012, 4, 25)); getLastUpdateDate(TuttiTable.VESSEL, internalDb, getSqlDate(2013, 1, 25)); - getLastUpdateDate(TuttiTable.GEAR_PHYSICAL_FEATURES, internalDb, getSqlDate(2013, 1, 14)); - getLastUpdateDate(TuttiTable.VESSEL_PHYSICAL_FEATURES, internalDb, null); getLastUpdateDate(TuttiTable.USER_PROFIL, internalDb, getSqlDate(2009, 6, 18)); getLastUpdateDate(TuttiTable.DEPARTMENT, internalDb, getSqlDate(2013, 1, 24)); getLastUpdateDate(TuttiTable.PERSON, internalDb, getSqlDate(2013, 1, 29)); - // try it on a empty db (all values are to null) // create a external empty db @@ -253,8 +250,6 @@ getExistingIds(TuttiTable.WEIGHT_LENGTH_CONVERSION, fixtures.nbWeightLegnthConversion()); getExistingIds(TuttiTable.VESSEL_TYPE, fixtures.nbVesselType()); getExistingIds(TuttiTable.VESSEL, fixtures.nbVessel()); - getExistingIds(TuttiTable.GEAR_PHYSICAL_FEATURES, fixtures.nbGearPhysicalFeature()); - getExistingIds(TuttiTable.VESSEL_PHYSICAL_FEATURES, fixtures.nbVesselPhysicalFeature()); getExistingIds(TuttiTable.USER_PROFIL, fixtures.nbUserProfil()); getExistingIds(TuttiTable.DEPARTMENT, fixtures.nbDepartment()); getExistingIds(TuttiTable.PERSON, fixtures.nbPerson()); @@ -306,8 +301,6 @@ getDataToUpdate(TuttiTable.WEIGHT_LENGTH_CONVERSION, internalDb, internalConnection, fromDate, fixtures.nbWeightLegnthConversion()); getDataToUpdate(TuttiTable.VESSEL_TYPE, internalDb, internalConnection, fromDate, fixtures.nbVesselType()); getDataToUpdate(TuttiTable.VESSEL, internalDb, internalConnection, fromDate, fixtures.nbVessel()); - getDataToUpdate(TuttiTable.GEAR_PHYSICAL_FEATURES, internalDb, internalConnection, fromDate, fixtures.nbGearPhysicalFeature()); - getDataToUpdate(TuttiTable.VESSEL_PHYSICAL_FEATURES, internalDb, internalConnection, fromDate, fixtures.nbVesselPhysicalFeature()); getDataToUpdate(TuttiTable.USER_PROFIL, internalDb, internalConnection, fromDate, fixtures.nbUserProfil()); getDataToUpdate(TuttiTable.DEPARTMENT, internalDb, internalConnection, fromDate, fixtures.nbDepartment()); getDataToUpdate(TuttiTable.PERSON, internalDb, internalConnection, fromDate, fixtures.nbPerson()); @@ -369,8 +362,6 @@ updateTable(TuttiTable.WEIGHT_LENGTH_CONVERSION, internalDb, internalConnection, externalConnection, fromDate, fixtures.nbWeightLegnthConversion(), 0); updateTable(TuttiTable.VESSEL_TYPE, internalDb, internalConnection, externalConnection, fromDate, fixtures.nbVesselType(), 0); updateTable(TuttiTable.VESSEL, internalDb, internalConnection, externalConnection, fromDate, fixtures.nbVessel(), 0); - updateTable(TuttiTable.GEAR_PHYSICAL_FEATURES, internalDb, internalConnection, externalConnection, fromDate, fixtures.nbGearPhysicalFeature(), 0); - updateTable(TuttiTable.VESSEL_PHYSICAL_FEATURES, internalDb, internalConnection, externalConnection, fromDate, fixtures.nbVesselPhysicalFeature(), 0); updateTable(TuttiTable.USER_PROFIL, internalDb, internalConnection, externalConnection, fromDate, fixtures.nbUserProfil(), 0); updateTable(TuttiTable.DEPARTMENT, internalDb, internalConnection, externalConnection, fromDate, fixtures.nbDepartment(), 0); updateTable(TuttiTable.PERSON, internalDb, internalConnection, externalConnection, fromDate, fixtures.nbPerson(), 0); @@ -410,8 +401,6 @@ updateTable(TuttiTable.WEIGHT_LENGTH_CONVERSION, internalDb, internalConnection, externalConnection, fromDate, 0, fixtures.nbWeightLegnthConversion()); updateTable(TuttiTable.VESSEL_TYPE, internalDb, internalConnection, externalConnection, fromDate, 0, fixtures.nbVesselType()); updateTable(TuttiTable.VESSEL, internalDb, internalConnection, externalConnection, fromDate, 0, fixtures.nbVessel()); - updateTable(TuttiTable.GEAR_PHYSICAL_FEATURES, internalDb, internalConnection, externalConnection, fromDate, 0, fixtures.nbGearPhysicalFeature()); - updateTable(TuttiTable.VESSEL_PHYSICAL_FEATURES, internalDb, internalConnection, externalConnection, fromDate, 0, fixtures.nbVesselPhysicalFeature()); updateTable(TuttiTable.USER_PROFIL, internalDb, internalConnection, externalConnection, fromDate, 0, fixtures.nbUserProfil()); updateTable(TuttiTable.DEPARTMENT, internalDb, internalConnection, externalConnection, fromDate, 0, fixtures.nbDepartment()); updateTable(TuttiTable.PERSON, internalDb, internalConnection, externalConnection, fromDate, 0, fixtures.nbPerson()); @@ -456,9 +445,6 @@ updateTable(TuttiTable.WEIGHT_LENGTH_CONVERSION, internalDb, internalConnection, externalConnection, fromDate, 0, 0); updateTable(TuttiTable.VESSEL_TYPE, internalDb, internalConnection, externalConnection, fromDate, 0, 0); updateTable(TuttiTable.VESSEL, internalDb, internalConnection, externalConnection, fromDate, 0, 0); - // there is some update_date to null :( - //updateTable(TuttiTable.GEAR_PHYSICAL_FEATURES, internalDb, internalConnection, externalConnection, fromDate, 0, 0); - updateTable(TuttiTable.VESSEL_PHYSICAL_FEATURES, internalDb, internalConnection, externalConnection, fromDate, 0, 0); updateTable(TuttiTable.USER_PROFIL, internalDb, internalConnection, externalConnection, fromDate, 0, 0); updateTable(TuttiTable.DEPARTMENT, internalDb, internalConnection, externalConnection, fromDate, 0, 0); updateTable(TuttiTable.PERSON, internalDb, internalConnection, externalConnection, fromDate, 0, 0); @@ -469,8 +455,6 @@ statement.executeUpdate(); updateTable(TuttiTable.AGGREGATION_LEVEL, internalDb, internalConnection, externalConnection, fromDate, 1, 0); - - } protected ResultSet getDataToUpdate(TuttiTable tuttiTable, @@ -636,8 +620,6 @@ assertDatabaseMetadata(TuttiTable.WEIGHT_LENGTH_CONVERSION, db, false, true); assertDatabaseMetadata(TuttiTable.VESSEL_TYPE, db, false, true); assertDatabaseMetadata(TuttiTable.VESSEL, db, false, true); - assertDatabaseMetadata(TuttiTable.GEAR_PHYSICAL_FEATURES, db, false, true); - assertDatabaseMetadata(TuttiTable.VESSEL_PHYSICAL_FEATURES, db, false, true); assertDatabaseMetadata(TuttiTable.USER_PROFIL, db, false, true); assertDatabaseMetadata(TuttiTable.DEPARTMENT, db, false, true); assertDatabaseMetadata(TuttiTable.PERSON, db, false, true);

1 0

r268 - in trunk: tutti-persistence/src/main/xmi tutti-persistence-adagio/src/main/java/fr/ifremer/tutti/persistence/service tutti-persistence-adagio/src/test/java/fr/ifremer/tutti/persistence/service tutti-persistence-dev/src/main/java/fr/ifremer/tutti/persistence tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/cruise tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation tutti-ui-swing/src/main/java/fr/i
by tchemit＠users.forge.codelutin.com 30 Jan '13

30 Jan '13

Author: tchemit Date: 2013-01-30 13:38:14 +0100 (Wed, 30 Jan 2013) New Revision: 268 Url: http://forge.codelutin.com/projects/tutti/repository/revisions/268 Log: refs #1912: [Ecran Trait] Filtrage des strates - sous-strates - localit?\195?\169s (put it back in ui) refs #1920: [Persistence] Sauvegarde des donn?\195?\169es th?\195?\169matiques dans la DB Allegro (rename trawlNumber) refs #1819: [PROTOCOLE] - Gestion des listes pr?\195?\169f?\195?\169r?\195?\169es / r?\195?\169f?\195?\169rentiel (debut de refactor) + use foreach (since java 1.5!) Modified: trunk/tutti-persistence-adagio/src/main/java/fr/ifremer/tutti/persistence/service/CruisePersistenceServiceImpl.java trunk/tutti-persistence-adagio/src/main/java/fr/ifremer/tutti/persistence/service/FishingOperationPersistenceServiceImpl.java trunk/tutti-persistence-adagio/src/test/java/fr/ifremer/tutti/persistence/service/CruisePersistenceServiceTest.java trunk/tutti-persistence-adagio/src/test/java/fr/ifremer/tutti/persistence/service/FishingOperationPersistenceServiceTest.java trunk/tutti-persistence-dev/src/main/java/fr/ifremer/tutti/persistence/TuttiPersistenceDevImpl.java trunk/tutti-persistence/src/main/xmi/tutti-persistence.properties trunk/tutti-persistence/src/main/xmi/tutti-persistence.zargo trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/AbstractTuttiAction.java trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/cruise/EditCruiseUI.css trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/cruise/EditCruiseUI.jaxx trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/cruise/EditCruiseUIHandler.java trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/cruise/EditCruiseUIModel.java trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/EditFishingOperationUI.css trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/EditFishingOperationUI.jaxx trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/EditFishingOperationUIHandler.java trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/EditFishingOperationUIModel.java trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/FishingOperationsUIHandler.java trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/EditCatchesUIHandler.java trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/EditCatchesUIModel.java trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/SpeciesBatchUIHandler.java trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/fishing/gearshooting/GearShootingRowModel.java trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/fishing/gearshooting/GearShootingTabUI.jaxx trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/fishing/hydrology/HydrologyRowModel.java trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/fishing/hydrology/HydrologyTabUIHandler.java trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/fishing/hydrology/HydrologyTabUIModel.java trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/fishing/hydrology/HydrologyTableModel.java trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/protocol/EditProtocolUIHandler.java trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/protocol/EditProtocolUIModel.java trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/protocol/SaveProtocolAction.java trunk/tutti-ui-swing/src/main/resources/fr/ifremer/tutti/ui/swing/content/cruise/EditCruiseUIModel-error-validation.xml trunk/tutti-ui-swing/src/main/resources/fr/ifremer/tutti/ui/swing/content/operation/EditFishingOperationUIModel-edit-error-validation.xml trunk/tutti-ui-swing/src/main/resources/fr/ifremer/tutti/ui/swing/content/operation/EditFishingOperationUIModel-validate-error-validation.xml trunk/tutti-ui-swing/src/main/resources/i18n/tutti-ui-swing_fr_FR.properties Modified: trunk/tutti-persistence/src/main/xmi/tutti-persistence.properties =================================================================== --- trunk/tutti-persistence/src/main/xmi/tutti-persistence.properties 2013-01-30 12:31:40 UTC (rev 267) +++ trunk/tutti-persistence/src/main/xmi/tutti-persistence.properties 2013-01-30 12:38:14 UTC (rev 268) @@ -40,9 +40,8 @@ fr.ifremer.tutti.persistence.entities.protocol.TuttiProtocol.attribute.gearPmfmId.stereotype=ordered fr.ifremer.tutti.persistence.entities.protocol.TuttiProtocol.attribute.environmentPmfmId.stereotype=ordered fr.ifremer.tutti.persistence.entities.protocol.TuttiProtocol.attribute.hydrologyPmfmId.stereotype=ordered +fr.ifremer.tutti.persistence.entities.protocol.TuttiProtocol.attribute.lengthClassesPmfmId.stereotype=ordered fr.ifremer.tutti.persistence.entities.protocol.TuttiProtocol.attribute.species.stereotype=ordered -fr.ifremer.tutti.persistence.entities.protocol.TuttiProtocol.attribute.sampleCategoryOrder.stereotype=ordered -fr.ifremer.tutti.persistence.entities.protocol.TuttiProtocol.attribute.benthosSpeciesId.stereotype=ordered -fr.ifremer.tutti.persistence.entities.protocol.TuttiProtocol.attribute.planktonSpeciesId.stereotype=ordered +fr.ifremer.tutti.persistence.entities.protocol.TuttiProtocol.attribute.benthos.stereotype=ordered fr.ifremer.tutti.persistence.entities.referential.Caracteristic.attribute.qualitativeValue.stereotype=ordered Modified: trunk/tutti-persistence/src/main/xmi/tutti-persistence.zargo =================================================================== (Binary files differ) Modified: trunk/tutti-persistence-adagio/src/main/java/fr/ifremer/tutti/persistence/service/CruisePersistenceServiceImpl.java =================================================================== --- trunk/tutti-persistence-adagio/src/main/java/fr/ifremer/tutti/persistence/service/CruisePersistenceServiceImpl.java 2013-01-30 12:31:40 UTC (rev 267) +++ trunk/tutti-persistence-adagio/src/main/java/fr/ifremer/tutti/persistence/service/CruisePersistenceServiceImpl.java 2013-01-30 12:38:14 UTC (rev 268) @@ -51,7 +51,6 @@ import fr.ifremer.adagio.core.dao.data.survey.scientificCruise.ScientificCruise; import fr.ifremer.adagio.core.dao.data.survey.scientificCruise.ScientificCruiseDao; import fr.ifremer.adagio.core.dao.data.vessel.feature.physical.GearPhysicalFeatures; -import fr.ifremer.adagio.core.dao.data.vessel.feature.physical.GearPhysicalFeatures; import fr.ifremer.adagio.core.dao.referential.QualityFlag; import fr.ifremer.adagio.core.dao.referential.QualityFlagDao; import fr.ifremer.adagio.core.dao.referential.gear.GearDao; @@ -63,7 +62,6 @@ import fr.ifremer.adagio.core.dao.referential.pmfm.PmfmImpl; import fr.ifremer.adagio.core.dao.referential.pmfm.QualitativeValue; import fr.ifremer.adagio.core.dao.referential.pmfm.QualitativeValueDao; -import fr.ifremer.adagio.core.dao.referential.pmfm.QualitativeValueDaoImpl; import fr.ifremer.adagio.core.dao.referential.pmfm.QualitativeValueImpl; import fr.ifremer.adagio.core.dao.referential.vessel.VesselDao; import fr.ifremer.adagio.core.dao.technical.synchronization.SynchronizationStatus; @@ -269,7 +267,7 @@ } result.setGear(gears); if (maxTrawlNetFound > 0) { - result.setTrawlNet(maxTrawlNetFound); + result.setMultirigNumber(maxTrawlNetFound); } } return result; @@ -492,11 +490,11 @@ guf.setRankOrder((short)1); // Trawl net (store in Gear Physical features) - if (copyIfNull && source.getTrawlNet() == null) { + if (copyIfNull && source.getMultirigNumber() == null) { removeGearPhysicalMeasurement(guf, enumeration.PMFM_ID_MULTIRIG_NUMBER); } else { - setGearPhysicalMeasurement(target, guf, enumeration.PMFM_ID_MULTIRIG_NUMBER, Float.valueOf(source.getTrawlNet()), null, null); + setGearPhysicalMeasurement(target, guf, enumeration.PMFM_ID_MULTIRIG_NUMBER, Float.valueOf(source.getMultirigNumber()), null, null); } } } Modified: trunk/tutti-persistence-adagio/src/main/java/fr/ifremer/tutti/persistence/service/FishingOperationPersistenceServiceImpl.java =================================================================== --- trunk/tutti-persistence-adagio/src/main/java/fr/ifremer/tutti/persistence/service/FishingOperationPersistenceServiceImpl.java 2013-01-30 12:31:40 UTC (rev 267) +++ trunk/tutti-persistence-adagio/src/main/java/fr/ifremer/tutti/persistence/service/FishingOperationPersistenceServiceImpl.java 2013-01-30 12:38:14 UTC (rev 268) @@ -47,10 +47,8 @@ import org.springframework.stereotype.Service; import com.google.common.base.Preconditions; -import com.google.common.collect.Lists; import com.google.common.collect.Sets; -import fr.ifremer.adagio.core.dao.data.batch.CatchBatch; import fr.ifremer.adagio.core.dao.data.batch.denormalized.DenormalizedBatch; import fr.ifremer.adagio.core.dao.data.fishingArea.FishingArea; import fr.ifremer.adagio.core.dao.data.fishingArea.FishingArea2RegulationLocation; @@ -70,12 +68,9 @@ import fr.ifremer.adagio.core.dao.data.vessel.feature.use.isActive; import fr.ifremer.adagio.core.dao.data.vessel.position.VesselPosition; import fr.ifremer.adagio.core.dao.referential.QualityFlagImpl; -import fr.ifremer.adagio.core.dao.referential.gear.GearDao; import fr.ifremer.adagio.core.dao.referential.gear.GearImpl; -import fr.ifremer.adagio.core.dao.referential.location.LocationDao; import fr.ifremer.adagio.core.dao.referential.location.LocationExtendDao; import fr.ifremer.adagio.core.dao.referential.location.LocationImpl; -import fr.ifremer.adagio.core.dao.referential.location.LocationLevelId; import fr.ifremer.adagio.core.dao.referential.pmfm.Pmfm; import fr.ifremer.adagio.core.dao.referential.pmfm.PmfmImpl; import fr.ifremer.adagio.core.dao.referential.pmfm.QualitativeValue; @@ -182,9 +177,9 @@ } // Trawl number net - Float trawlNetNumber = (Float)source[colIndex++]; + String trawlNetNumber = (String)source[colIndex++]; if (trawlNetNumber != null) { - fishingOperation.setTrawlNetNumber(trawlNetNumber.intValue()); + fishingOperation.setMultirigAggregation(trawlNetNumber); } fishingOperations.add(fishingOperation); @@ -259,8 +254,7 @@ if (!recorderPersonsStr.isEmpty()) { String[] recorderPersonsArray = recorderPersonsStr.split(","); List<Person> persons = new ArrayList<Person>(); - for (int i = 0; i < recorderPersonsArray.length; i++) { - String personId = recorderPersonsArray[i]; + for (String personId : recorderPersonsArray) { Person person = referentialService.getPerson(Integer.valueOf(personId)); persons.add(person); } @@ -452,8 +446,7 @@ if (enumeration.PMFM_ID_MULTIRIG_AGGREGATION.equals(pmfmId) && alphanumericalValue != null && alphanumericalValue.matches("\\d+")) { - // TODO TC : passer la propriété trawlNetNumber en String - result.setTrawlNetNumber(Integer.valueOf(alphanumericalValue)); + result.setMultirigAggregation(alphanumericalValue); } // Gear Shooting Caracteristics @@ -499,15 +492,13 @@ VesselPosition startPosition = null; VesselPosition endPosition = null; if (target.getVesselPositions() != null) { - for (Iterator iterator = target.getVesselPositions().iterator(); iterator.hasNext();) { - VesselPosition position = (VesselPosition) iterator.next(); - if (position.getDateTime() != null && position.getDateTime().getTime() == target.getStartDateTime().getTime()) { - startPosition = position; - } - else if (position.getDateTime() == null || (target.getEndDateTime() != null && position.getDateTime().getTime() == target.getEndDateTime().getTime())) { - endPosition = position; - } - } + for (VesselPosition position : target.getVesselPositions()) { + if (position.getDateTime() != null && position.getDateTime().getTime() == target.getStartDateTime().getTime()) { + startPosition = position; + } else if (position.getDateTime() == null || (target.getEndDateTime() != null && position.getDateTime().getTime() == target.getEndDateTime().getTime())) { + endPosition = position; + } + } } // Retrieve entities : Gear Use Features @@ -615,16 +606,15 @@ target.setName(nameBuffer.toString()); // Trawl net number - if (copyIfNull && source.getTrawlNetNumber() == null) { + if (copyIfNull && source.getMultirigAggregation() == null) { // Nothing to do : will be removed later, using notChangedGearUseMeasurements - } else if (source.getTrawlNetNumber() != null) { - // TODO TC : change the property into String + } else if (source.getMultirigAggregation() != null) { // TODO BLA : Then parse the String and validate content - if (source.getTrawlNetNumber().intValue() > trawlNet) { - throw new DataIntegrityViolationException("An operation could not have a 'trawl net number' greater than 'trawl net' defined in the cruise."); - } +// if (source.getMultirigAggregation() > multirigNumber) { +// throw new DataIntegrityViolationException("An operation could not have a 'trawl net number' greater than 'trawl net' defined in the cruise."); +// } // Store into Gear Use Features - GearUseMeasurement gum = setGearUseMeasurement(scientificCruise, gearUseFeatures, enumeration.PMFM_ID_MULTIRIG_AGGREGATION, null, source.getTrawlNetNumber().toString(), null); + GearUseMeasurement gum = setGearUseMeasurement(scientificCruise, gearUseFeatures, enumeration.PMFM_ID_MULTIRIG_AGGREGATION, null, source.getMultirigAggregation().toString(), null); notChangedGearUseMeasurements.remove(gum); } @@ -781,7 +771,7 @@ } Date endDateTime = convertUI2DatabaseMandatoryDate(target.getEndDateTime(), startPosition.getDateTime(), true); endPosition.setDateTime(endDateTime); - if (endDateTime.equals(target.getEndDateTime()) == false) { + if (!endDateTime.equals(target.getEndDateTime())) { // To link position with the operation end, Allegro need to have exactly the same dates target.setEndDateTime(endDateTime); target.setFishingEndDateTime(endDateTime); @@ -812,7 +802,7 @@ } // Recorder persons - StringBuffer miscDataBuffer = new StringBuffer(); + StringBuilder miscDataBuffer = new StringBuilder(); if (copyIfNull && (source.getSaisisseur() == null || source.getSaisisseur().size() == 0)) { miscDataBuffer.append(MISC_DATA_RECORDER_PERSONS_TAG); } else if (source.getSaisisseur() != null && source.getSaisisseur().size() > 0) { @@ -830,7 +820,7 @@ target.setComments(miscDataBuffer.toString()); } else if (source.getComment() != null) { // Store comment + misc data - target.setComments(source.getComment() + miscDataBuffer.toString()); + target.setComments(source.getComment() + miscDataBuffer.toString()); } // ---------------------------------------------------------------- @@ -1034,13 +1024,12 @@ Integer pmfmId, boolean createIfNotExists) { VesselUseMeasurement vesselUseMeasurement = null; if (vesselUseFeatures.getVesselUseMeasurements() != null) { - for (Iterator iterator = vesselUseFeatures.getVesselUseMeasurements().iterator(); iterator.hasNext();) { - VesselUseMeasurement vum = (VesselUseMeasurement) iterator.next(); - if (pmfmId.equals(vum.getPmfm().getId())) { - vesselUseMeasurement = vum; - break; - } - } + for (VesselUseMeasurement vum : vesselUseFeatures.getVesselUseMeasurements()) { + if (pmfmId.equals(vum.getPmfm().getId())) { + vesselUseMeasurement = vum; + break; + } + } } if (vesselUseMeasurement == null) { if (!createIfNotExists) { @@ -1159,13 +1148,12 @@ Integer pmfmId, boolean createIfNotExists) { GearUseMeasurement gearUseMeasurement = null; if (gearUseFeatures.getGearUseMeasurements() != null) { - for (Iterator iterator = gearUseFeatures.getGearUseMeasurements().iterator(); iterator.hasNext();) { - GearUseMeasurement vum = (GearUseMeasurement) iterator.next(); - if (pmfmId.equals(vum.getPmfm().getId())) { - gearUseMeasurement = vum; - break; - } - } + for (GearUseMeasurement vum : gearUseFeatures.getGearUseMeasurements()) { + if (pmfmId.equals(vum.getPmfm().getId())) { + gearUseMeasurement = vum; + break; + } + } } if (gearUseMeasurement == null) { if (!createIfNotExists) { @@ -1191,7 +1179,7 @@ protected DenormalizedBatch getDenormalizedBatch(Integer fishingOperationId) { Iterator<DenormalizedBatch> list = queryListTyped( "fishingOperationBatchs", - "fishingOperationId", IntegerType.INSTANCE, Integer.valueOf(fishingOperationId) + "fishingOperationId", IntegerType.INSTANCE, fishingOperationId ); CaracteristicMap environmentCaracteristics = new CaracteristicMap(); Modified: trunk/tutti-persistence-adagio/src/test/java/fr/ifremer/tutti/persistence/service/CruisePersistenceServiceTest.java =================================================================== --- trunk/tutti-persistence-adagio/src/test/java/fr/ifremer/tutti/persistence/service/CruisePersistenceServiceTest.java 2013-01-30 12:31:40 UTC (rev 267) +++ trunk/tutti-persistence-adagio/src/test/java/fr/ifremer/tutti/persistence/service/CruisePersistenceServiceTest.java 2013-01-30 12:38:14 UTC (rev 268) @@ -128,12 +128,8 @@ cruise.setComment("My comments on cruise"); - List<Person> allPersons = referentialService.getAllPerson(); - Person managerPerson1 = allPersons.get(0); - Person managerPerson2 = allPersons.get(1); - cruise.setHeadOfMission(Lists.newArrayList(managerPerson1, managerPerson2)); - - cruise.setHeadOfSortRoom(Lists.newArrayList(managerPerson2)); + Person managerPerson = referentialService.getAllPerson().get(0); + cruise.setHeadOfMission(Lists.newArrayList(managerPerson)); List<Vessel> vessels = Lists.newArrayList(); vessels.add(referentialService.getAllScientificVessel().get(0)); @@ -143,7 +139,7 @@ cruise.setVessel(vessels); - cruise.setTrawlNet(2); + cruise.setMultirigNumber(2); // Create cruise in database Cruise createdCruise = service.createCruise(cruise); @@ -165,13 +161,9 @@ calendar.set(Calendar.SECOND, 0); calendar.set(Calendar.MILLISECOND, 0); assertEquals(calendar.getTime(), reloadedCruise.getEndDate()); - assertEquals(cruise.getTrawlNet(), reloadedCruise.getTrawlNet()); - assertNotNull(reloadedCruise.getHeadOfMission()); - assertEquals(cruise.getHeadOfMission().size(), reloadedCruise.getHeadOfMission().size()); - assertNotNull(reloadedCruise.getHeadOfSortRoom()); - assertEquals(cruise.getHeadOfSortRoom().size(), reloadedCruise.getHeadOfSortRoom().size()); + assertEquals(cruise.getMultirigNumber(), reloadedCruise.getMultirigNumber()); - // ----------------------------------------------------------------------------- + // ----------------------------------------------------------------------------- // 2. Test with only mandatory properties // ----------------------------------------------------------------------------- createdCruise.setId(null); @@ -179,7 +171,7 @@ createdCruise.setBeginDate(null); createdCruise.setEndDate(null); createdCruise.setComment(null); - createdCruise.setTrawlNet(null); + createdCruise.setMultirigNumber(null); // Save cruise createdCruise = service.createCruise(cruise); @@ -193,7 +185,7 @@ assertEquals(createdCruise.getBeginDate(), reloadedCruise.getBeginDate()); assertEquals(createdCruise.getEndDate(), reloadedCruise.getEndDate()); assertEquals(createdCruise.getComment(), reloadedCruise.getComment()); - assertEquals(createdCruise.getTrawlNet(), reloadedCruise.getTrawlNet()); + assertEquals(createdCruise.getMultirigNumber(), reloadedCruise.getMultirigNumber()); assertNull(reloadedCruise.getHeadOfMission()); assertNotNull(reloadedCruise.getVessel()); assertEquals(createdCruise.getVessel().get(0), reloadedCruise.getVessel().get(0)); Modified: trunk/tutti-persistence-adagio/src/test/java/fr/ifremer/tutti/persistence/service/FishingOperationPersistenceServiceTest.java =================================================================== --- trunk/tutti-persistence-adagio/src/test/java/fr/ifremer/tutti/persistence/service/FishingOperationPersistenceServiceTest.java 2013-01-30 12:31:40 UTC (rev 267) +++ trunk/tutti-persistence-adagio/src/test/java/fr/ifremer/tutti/persistence/service/FishingOperationPersistenceServiceTest.java 2013-01-30 12:38:14 UTC (rev 268) @@ -39,7 +39,6 @@ import fr.ifremer.tutti.persistence.entities.referential.CaracteristicType; import fr.ifremer.tutti.persistence.entities.referential.FishingOperationLocation; import fr.ifremer.tutti.persistence.entities.referential.Gear; -import fr.ifremer.tutti.persistence.entities.referential.Person; import org.junit.Before; import org.junit.ClassRule; @@ -98,9 +97,7 @@ @Test public void createFishingOperation(/*FishingOperation bean*/) { - List<Person> allPersons = referentialService.getAllPerson(); - - // ----------------------------------------------------------------------------- + // ----------------------------------------------------------------------------- // Prepare data and other entities // ----------------------------------------------------------------------------- Calendar calendar = new GregorianCalendar(); @@ -113,7 +110,7 @@ cruise.setName("Unit-test-" + System.currentTimeMillis()); cruise.setBeginDate(new Date()); cruise.setEndDate(null); - cruise.setTrawlNet(new Integer(2)); + cruise.setMultirigNumber(2); // Keep only one gear in the cruise : (need for case n°4) List<Gear> cruiseGears = cruise.getGear(); assertNotNull(cruiseGears); @@ -186,8 +183,8 @@ // Set properties (with optional value to null) fishingOperation.setCruise(cruise); fishingOperation.setStationNumber("STA1"); - fishingOperation.setFishingOperationNumber(new Integer(1)); - fishingOperation.setTrawlNetNumber(new Integer(1)); + fishingOperation.setFishingOperationNumber(1); + fishingOperation.setMultirigAggregation("1"); fishingOperation.setGearShootingStartDate(null); fishingOperation.setGearShootingEndDate(null); fishingOperation.setGear(null); @@ -211,8 +208,8 @@ // Set properties fishingOperation.setId(null); fishingOperation.setStationNumber("STA2"); - fishingOperation.setFishingOperationNumber(new Integer(2)); - fishingOperation.setTrawlNetNumber(new Integer(1)); + fishingOperation.setFishingOperationNumber(2); + fishingOperation.setMultirigAggregation("1"); calendar.setTime(new Date()); calendar.set(Calendar.HOUR_OF_DAY, 1); calendar.set(Calendar.MILLISECOND, 99); @@ -244,17 +241,6 @@ localite.setId(dbResource.getFixtures().localite()); fishingOperation.setLocation(localite); - fishingOperation.setSaisisseur(Lists.newArrayList(allPersons.get(0), allPersons.get(1))); - - // Capture - fishingOperation.setCatchTotalWeight(100f); - // note : poids vrac caroussel (thalassa) (init par pupitri) (vrac trie) ou bien "poids trié fournie par la table de tri (Sum(Si) - //fishingOperation.setCatchTotalSortedCarousselWeight(20f); - // note : poids trie par la balance tremis (thalassa) (init par pupitri) - //fishingOperation.setCatchTotalSortedTremisWeight(10f); - //fishingOperation.setCatchTotalUnsortedWeight(15f); - - // Store fishing operation into database : createdFishingOperation = service.createFishingOperation(fishingOperation); assertNotNull("Fishing operation ID must not be null after creation in database", createdFishingOperation); @@ -264,7 +250,7 @@ assertNotNull(reloadedFishingOperation.getGear()); assertEquals(fishingOperation.getStationNumber(), reloadedFishingOperation.getStationNumber()); assertEquals(fishingOperation.getFishingOperationNumber(), reloadedFishingOperation.getFishingOperationNumber()); - assertEquals(fishingOperation.getTrawlNetNumber(), reloadedFishingOperation.getTrawlNetNumber()); + assertEquals(fishingOperation.getMultirigAggregation(), reloadedFishingOperation.getMultirigAggregation()); assertNotNull(reloadedFishingOperation.getGearShootingStartDate()); calendar.setTime(fishingOperation.getGearShootingStartDate()); calendar.set(Calendar.MILLISECOND, 0); @@ -294,12 +280,6 @@ assertNotNull(reloadedFishingOperation.getLocation()); assertNotNull(reloadedFishingOperation.getLocation().getId()); assertEquals(fishingOperation.getLocation().getId(), reloadedFishingOperation.getLocation().getId()); - - //TODO BL : move into CatchBacth - //assertEquals(fishingOperation.getCatchTotalWeight(), reloadedFishingOperation.getCatchTotalWeight()); - - assertNotNull(reloadedFishingOperation.getSaisisseur()); - assertEquals(fishingOperation.getSaisisseur().size(), reloadedFishingOperation.getSaisisseur().size()); // ----------------------------------------------------------------------------- // 3. Test : @@ -311,8 +291,8 @@ // ----------------------------------------------------------------------------- fishingOperation.setId(null); fishingOperation.setStationNumber("STA3"); - fishingOperation.setFishingOperationNumber(new Integer(3)); - fishingOperation.setTrawlNetNumber(new Integer(2)); + fishingOperation.setFishingOperationNumber(3); + fishingOperation.setMultirigAggregation("2"); fishingOperation.setGearShootingStartLongitude(null); fishingOperation.setGearShootingEndDate(null); fishingOperation.setTrawlDistance(null); @@ -341,13 +321,12 @@ List<Gear> gears = referentialService.getAllFishingGear(); assertNotNull(gears); assertTrue(gears.size() > 0); - for (Iterator iterator = gears.iterator(); iterator.hasNext();) { - Gear gear = (Gear) iterator.next(); - if (cruiseGear.getId().equals(gear.getId()) == false) { - fishingOperation.setGear(gear); - break; - } - } + for (Gear gear : gears) { + if (cruiseGear.getId().equals(gear.getId()) == false) { + fishingOperation.setGear(gear); + break; + } + } try { createdFishingOperation = service.createFishingOperation(fishingOperation); @@ -358,14 +337,14 @@ fishingOperation.setGear(cruiseGear); } - fishingOperation.setTrawlNetNumber(new Integer(3)); + fishingOperation.setMultirigAggregation("3"); try { createdFishingOperation = service.createFishingOperation(fishingOperation); fail("A fishing operation must not be saved if the 'trawl net number' > 'cruise trawl net'."); } catch(DataIntegrityViolationException dive) { assertNotNull(dive); - fishingOperation.setTrawlNetNumber(new Integer(1)); + fishingOperation.setMultirigAggregation("1"); } // ----------------------------------------------------------------------------- Modified: trunk/tutti-persistence-dev/src/main/java/fr/ifremer/tutti/persistence/TuttiPersistenceDevImpl.java =================================================================== --- trunk/tutti-persistence-dev/src/main/java/fr/ifremer/tutti/persistence/TuttiPersistenceDevImpl.java 2013-01-30 12:31:40 UTC (rev 267) +++ trunk/tutti-persistence-dev/src/main/java/fr/ifremer/tutti/persistence/TuttiPersistenceDevImpl.java 2013-01-30 12:38:14 UTC (rev 268) @@ -100,6 +100,7 @@ "fr.ifremer.tutti.persistence.entities.data.PlanktonBatch", "fr.ifremer.tutti.persistence.entities.data.Program", "fr.ifremer.tutti.persistence.entities.data.Cruise", + "fr.ifremer.tutti.persistence.entities.data.CatchBatch", "fr.ifremer.tutti.persistence.entities.data.SpeciesBatch", "fr.ifremer.tutti.persistence.entities.data.SpeciesBatchFrequency", "fr.ifremer.tutti.persistence.entities.protocol.TuttiProtocol", @@ -477,17 +478,27 @@ @Override public CatchBatch getCatchBatchFromFishingOperation(String id) { - return null; + List<CatchBatch> data = getData(CatchBatch.class.getName()); + CatchBatch result = null; + for (CatchBatch catchBatch : data) { + if (id.equals(catchBatch.getFishingOperation().getId())) { + result = catchBatch; + break; + } + } + return result; } @Override public CatchBatch createCatchBatch(CatchBatch bean) { - return null; + CatchBatch result = create(CatchBatch.class.getName(), bean); + return result; } @Override public CatchBatch saveCatchBatch(CatchBatch bean) { - return null; + CatchBatch result = save(CatchBatch.class.getName(), bean); + return result; } //------------------------------------------------------------------------// Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/AbstractTuttiAction.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/AbstractTuttiAction.java 2013-01-30 12:31:40 UTC (rev 267) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/AbstractTuttiAction.java 2013-01-30 12:38:14 UTC (rev 268) @@ -127,8 +127,13 @@ try { doAction(event); - } catch (Exception e) { - ErrorDialogUI.showError(e); + } catch (Throwable e) { + if (log.isErrorEnabled()) { + log.error("Error:"+e.getMessage(),e); + } + if (e instanceof Exception) { + ErrorDialogUI.showError((Exception) e); + } timer.cancel(); } finally { if (log.isInfoEnabled()) { Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/cruise/EditCruiseUI.css =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/cruise/EditCruiseUI.css 2013-01-30 12:31:40 UTC (rev 267) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/cruise/EditCruiseUI.css 2013-01-30 12:38:14 UTC (rev 268) @@ -111,14 +111,14 @@ date: {model.getEndDate()}; } -#trawlNetLabel { - text: "tutti.label.cruise.trawlNet"; - labelFor: {trawlNetField}; +#multirigNumberLabel { + text: "tutti.label.cruise.multirigNumber"; + labelFor: {multirigNumberField}; } -#trawlNetField { - property: trawlNet; - model: {model.getTrawlNet()}; +#multirigNumberField { + property: multirigNumber; + model: {model.getMultirigNumber()}; useFloat: false; numberPattern: {INT_1_DIGITS_PATTERN}; } Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/cruise/EditCruiseUI.jaxx =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/cruise/EditCruiseUI.jaxx 2013-01-30 12:31:40 UTC (rev 267) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/cruise/EditCruiseUI.jaxx 2013-01-30 12:38:14 UTC (rev 268) @@ -85,7 +85,7 @@ <field name='year' component='yearField'/> <field name='surveyPart' component='surveyPartField'/> <field name='name' component='nameField'/> - <field name='trawlNet' component='trawlNetField'/> + <field name='multirigNumber' component='multirigNumberField'/> <field name='country' component='countryComboBox'/> <field name='beginDate' component='beginDateField'/> <field name='endDate' component='endDateField'/> @@ -137,10 +137,10 @@ onActionPerformed='handler.generateCampaignName()'/> </cell> <cell> - <JLabel id='trawlNetLabel'/> + <JLabel id='multirigNumberLabel'/> </cell> <cell weightx='0.3'> - <NumberEditor id='trawlNetField' constructorParams='this'/> + <NumberEditor id='multirigNumberField' constructorParams='this'/> </cell> </row> Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/cruise/EditCruiseUIHandler.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/cruise/EditCruiseUIHandler.java 2013-01-30 12:31:40 UTC (rev 267) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/cruise/EditCruiseUIHandler.java 2013-01-30 12:38:14 UTC (rev 268) @@ -104,7 +104,7 @@ Program program = persistenceService.getProgram(context.getProgramId()); model.setProgram(program); - model.setTrawlNet(1); + model.setMultirigNumber(1); if (log.isDebugEnabled()) { log.debug("Will create a new cruise from program: " + program); Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/cruise/EditCruiseUIModel.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/cruise/EditCruiseUIModel.java 2013-01-30 12:31:40 UTC (rev 267) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/cruise/EditCruiseUIModel.java 2013-01-30 12:38:14 UTC (rev 268) @@ -67,7 +67,7 @@ public static final String PROPERTY_YEAR = "year"; - public static final String PROPERTY_TRAWL_NET = "trawlNet"; + public static final String PROPERTY_MULTIRIG_NUMBER = "multirigNumber"; public static final String PROPERTY_BEGIN_DATE = "beginDate"; @@ -103,7 +103,7 @@ protected Integer year; - protected Integer trawlNet; + protected Integer multirigNumber; protected Date beginDate; @@ -184,14 +184,14 @@ firePropertyChange(PROPERTY_CAN_GENERATE_NAME, null, isCanGenerateName()); } - public Integer getTrawlNet() { - return trawlNet; + public Integer getMultirigNumber() { + return multirigNumber; } - public void setTrawlNet(Integer trawlNet) { - Object oldValue = getTrawlNet(); - this.trawlNet = trawlNet; - firePropertyChange(PROPERTY_TRAWL_NET, oldValue, trawlNet); + public void setMultirigNumber(Integer multirigNumber) { + Object oldValue = getMultirigNumber(); + this.multirigNumber = multirigNumber; + firePropertyChange(PROPERTY_MULTIRIG_NUMBER, oldValue, multirigNumber); } public Date getBeginDate() { Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/EditFishingOperationUI.css =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/EditFishingOperationUI.css 2013-01-30 12:31:40 UTC (rev 267) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/EditFishingOperationUI.css 2013-01-30 12:38:14 UTC (rev 268) @@ -165,18 +165,13 @@ selectedItem: {model.getGear()}; } -#trawlNetNumberLabel { - text: "tutti.label.fishingOperation.trawlNetNumber"; - labelFor: {trawlNetNumberField}; +#multirigAggregationLabel { + text: "tutti.label.fishingOperation.multirigAggregation"; + labelFor: {multirigAggregationField}; } -#trawlNetNumberField { - showReset: false; - useFloat: false; - useSign: false; - numberPattern: {INT_2_DIGITS_PATTERN}; - property: trawlNetNumber; - model: {model.getTrawlNetNumber()}; +#multirigAggregationField { + text: {model.getMultirigAggregation()}; } .degree { Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/EditFishingOperationUI.jaxx =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/EditFishingOperationUI.jaxx 2013-01-30 12:31:40 UTC (rev 267) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/EditFishingOperationUI.jaxx 2013-01-30 12:38:14 UTC (rev 268) @@ -92,7 +92,7 @@ <field name='saisisseur' component='saisisseurList'/> <field name='vessel' component='vesselComboBox'/> <field name='gear' component='gearComboBox'/> - <field name='trawlNetNumber' component='trawlNetNumberField'/> + <field name='multirigAggregation' component='multirigAggregationField'/> <field name='gearShootingStartLatitude' component='gearShootingStartLatitudeDDField'/> <field name='gearShootingStartLatitudeDegree' @@ -177,10 +177,11 @@ constructorParams='this'/> </cell> <cell> - <JLabel id='trawlNetNumberLabel'/> + <JLabel id='multirigAggregationLabel'/> </cell> <cell weightx='0.3'> - <NumberEditor id='trawlNetNumberField' constructorParams='this'/> + <JTextField id='multirigAggregationField' + onKeyReleased='handler.setText(event, "multirigAggregation")'/> </cell> </row> Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/EditFishingOperationUIHandler.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/EditFishingOperationUIHandler.java 2013-01-30 12:31:40 UTC (rev 267) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/EditFishingOperationUIHandler.java 2013-01-30 12:38:14 UTC (rev 268) @@ -52,6 +52,7 @@ import fr.ifremer.tutti.ui.swing.util.TabHandler; import fr.ifremer.tutti.ui.swing.util.TuttiBeanMonitor; import fr.ifremer.tutti.ui.swing.util.TuttiUIUtil; +import org.apache.commons.collections.CollectionUtils; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; @@ -116,7 +117,7 @@ EditFishingOperationUIModel.PROPERTY_SAISISSEUR, EditFishingOperationUIModel.PROPERTY_VESSEL, EditFishingOperationUIModel.PROPERTY_GEAR, - EditFishingOperationUIModel.PROPERTY_POCHE_NUMBER, + EditFishingOperationUIModel.PROPERTY_MULTIRIG_AGGREGATION, EditFishingOperationUIModel.PROPERTY_COMMENT); } @@ -244,7 +245,7 @@ Cruise cruise = TuttiUIUtil.getCruise(ui); Preconditions.checkNotNull(cruise, "Could not find cruise in ui context"); - ui.getTrawlNetNumberField().setEnabled(cruise.getTrawlNet() != 1); + ui.getMultirigAggregationField().setEnabled(cruise.getMultirigNumber() != 1); Program program = TuttiUIUtil.getProgram(ui); Preconditions.checkNotNull(program, @@ -514,40 +515,39 @@ // reset sub strata combo ui.getSubStrataComboBox().setData(null); -// Zone zone = -// model.getFishingOperation().getCruise().getProgram().getZone(); -// -// String zoneId = zone.getId(); -// String strataId = newStrata == null ? null : newStrata.getId(); -// -// List<FishingOperationLocation> subStrata = -// persistenceService.getAllFishingOperationSubStrata(zoneId, strataId); -// -// List<FishingOperationLocation> location = -// persistenceService.getAllFishingOperationLocation(zoneId, strataId, null); -// -// ui.getSubStrataComboBox().setData(subStrata); -// -// ui.getLocationComboBox().setData(location); -// -// if (newStrata == null) { -// -// // reset strata, keep focus on it -// ui.getStrataComboBox().grabFocus(); -// -// } else { -// -// // try to load substrata -// -// -// if (CollectionUtils.isEmpty(subStrata)) { -// -// // try to load localite -// -// -// ui.getLocationComboBox().grabFocus(); -// } -// } + Zone zone = TuttiUIUtil.getProgram(ui).getZone(); + + String zoneId = zone.getId(); + String strataId = newStrata == null ? null : newStrata.getId(); + + List<FishingOperationLocation> subStrata = + persistenceService.getAllFishingOperationSubStrata(zoneId, strataId); + + List<FishingOperationLocation> location = + persistenceService.getAllFishingOperationLocation(zoneId, strataId, null); + + ui.getSubStrataComboBox().setData(subStrata); + + ui.getLocationComboBox().setData(location); + + if (newStrata == null) { + + // reset strata, keep focus on it + ui.getStrataComboBox().grabFocus(); + + } else { + + // try to load substrata + + + if (CollectionUtils.isEmpty(subStrata)) { + + // try to load localite + + + ui.getLocationComboBox().grabFocus(); + } + } } protected void onSelectedSubStrata(EditFishingOperationUIModel model, @@ -558,25 +558,24 @@ // reset localite combo ui.getLocationComboBox().setData(null); -// Zone zone = -// getModel().getFishingOperation().getCruise().getProgram().getZone(); -// String zoneId = zone.getId(); -// -// FishingOperationLocation strata = model.getStrata(); -// String subStrataId = newSubStrata == null ? null : newSubStrata.getId(); -// -// String strataId = strata == null ? null : strata.getId(); -// -// List<FishingOperationLocation> location = -// persistenceService.getAllFishingOperationLocation(zoneId, strataId, subStrataId); -// -// ui.getLocationComboBox().setData(location); -// -// if (newSubStrata == null) { -// -// // reset substrata, keep focus on it -// ui.getSubStrataComboBox().grabFocus(); -// } + Zone zone = TuttiUIUtil.getProgram(ui).getZone(); + String zoneId = zone.getId(); + + FishingOperationLocation strata = model.getStrata(); + String subStrataId = newSubStrata == null ? null : newSubStrata.getId(); + + String strataId = strata == null ? null : strata.getId(); + + List<FishingOperationLocation> location = + persistenceService.getAllFishingOperationLocation(zoneId, strataId, subStrataId); + + ui.getLocationComboBox().setData(location); + + if (newSubStrata == null) { + + // reset substrata, keep focus on it + ui.getSubStrataComboBox().grabFocus(); + } } protected boolean areAllModelsValid() { Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/EditFishingOperationUIModel.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/EditFishingOperationUIModel.java 2013-01-30 12:31:40 UTC (rev 267) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/EditFishingOperationUIModel.java 2013-01-30 12:38:14 UTC (rev 268) @@ -35,13 +35,12 @@ import fr.ifremer.tutti.persistence.spatial.SexagecimalPosition; import fr.ifremer.tutti.ui.swing.AbstractTuttiBeanUIModel; import fr.ifremer.tutti.ui.swing.util.editor.CoordinateEditorType; +import org.nuiton.util.beans.Binder; +import org.nuiton.util.beans.BinderFactory; + import java.util.Calendar; import java.util.Date; import java.util.List; -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; -import org.nuiton.util.beans.Binder; -import org.nuiton.util.beans.BinderFactory; import static org.nuiton.i18n.I18n.n_; @@ -54,8 +53,6 @@ public class EditFishingOperationUIModel extends AbstractTuttiBeanUIModel<FishingOperation, EditFishingOperationUIModel> { private static final long serialVersionUID = 1L; - - private static final Log log = LogFactory.getLog(EditFishingOperationUIModel.class); public static final String TITLE = n_("tutti.label.tab.fishingOperation.general"); @@ -75,9 +72,9 @@ public static final String PROPERTY_GEAR_SHOOTING_START_LATITUDE = "gearShootingStartLatitude"; public static final String PROPERTY_GEAR_SHOOTING_START_LATITUDE_DEGREE = "gearShootingStartLatitudeDegree"; - + public static final String PROPERTY_GEAR_SHOOTING_START_LATITUDE_MINUTE = "gearShootingStartLatitudeMinute"; - + public static final String PROPERTY_GEAR_SHOOTING_START_LATITUDE_DECIMAL_MINUTE = "gearShootingStartLatitudeDecimalMinute"; public static final String PROPERTY_GEAR_SHOOTING_START_LATITUDE_SECOND = "gearShootingStartLatitudeSecond"; @@ -87,7 +84,7 @@ public static final String PROPERTY_GEAR_SHOOTING_START_LONGITUDE_DEGREE = "gearShootingStartLongitudeDegree"; public static final String PROPERTY_GEAR_SHOOTING_START_LONGITUDE_MINUTE = "gearShootingStartLongitudeMinute"; - + public static final String PROPERTY_GEAR_SHOOTING_START_LONGITUDE_DECIMAL_MINUTE = "gearShootingStartLongitudeDecimalMinute"; public static final String PROPERTY_GEAR_SHOOTING_START_LONGITUDE_SECOND = "gearShootingStartLongitudeSecond"; @@ -99,7 +96,7 @@ public static final String PROPERTY_GEAR_SHOOTING_END_LATITUDE_DEGREE = "gearShootingEndLatitudeDegree"; public static final String PROPERTY_GEAR_SHOOTING_END_LATITUDE_MINUTE = "gearShootingEndLatitudeMinute"; - + public static final String PROPERTY_GEAR_SHOOTING_END_LATITUDE_DECIMAL_MINUTE = "gearShootingEndLatitudeDecimalMinute"; public static final String PROPERTY_GEAR_SHOOTING_END_LATITUDE_SECOND = "gearShootingEndLatitudeSecond"; @@ -109,7 +106,7 @@ public static final String PROPERTY_GEAR_SHOOTING_END_LONGITUDE_DEGREE = "gearShootingEndLongitudeDegree"; public static final String PROPERTY_GEAR_SHOOTING_END_LONGITUDE_MINUTE = "gearShootingEndLongitudeMinute"; - + public static final String PROPERTY_GEAR_SHOOTING_END_LONGITUDE_DECIMAL_MINUTE = "gearShootingEndLongitudeDecimalMinute"; public static final String PROPERTY_GEAR_SHOOTING_END_LONGITUDE_SECOND = "gearShootingEndLongitudeSecond"; @@ -120,7 +117,7 @@ public static final String PROPERTY_TRAWL_DISTANCE = "trawlDistance"; - public static final String PROPERTY_TRAWL_NET_NUMBER = "trawlNetNumber"; + public static final String PROPERTY_MULTIRIG_AGGREGATION = "multirigAggregation"; public static final String PROPERTY_FISHING_OPERATION_VALID = "fishingOperationValid"; @@ -136,15 +133,13 @@ public static final String PROPERTY_VALIDATION_CONTEXT = "validationContext"; - public static final String PROPERTY_POCHE_NUMBER = "trawlNetNumber"; - /** * Flag when there is no fishing operation selected. * * @since 0.2 */ protected boolean empty; - + protected Cruise cruise; protected String stationNumber; @@ -195,10 +190,10 @@ protected Vessel vessel; - protected Integer trawlNetNumber; + protected String multirigAggregation; protected CoordinateEditorType coordinateEditorType; - + protected static Binder<EditFishingOperationUIModel, FishingOperation> toBeanBinder = BinderFactory.newBinder(EditFishingOperationUIModel.class, FishingOperation.class); @@ -306,11 +301,11 @@ } return result; } - + public Integer getGearShootingStartLatitudeDecimalDegree() { return getGearShootingStartLatitudeDegree(); } - + public void setGearShootingStartLatitudeDegree(Integer degree) { Object oldValue = getGearShootingStartLatitudeDegree(); boolean sign = degree != null && degree < 0; @@ -321,7 +316,7 @@ gearShootingStartLatitudeAsSexagecimal.setDegre(degree); firePropertyChange(PROPERTY_GEAR_SHOOTING_START_LATITUDE_DEGREE, oldValue, degree); } - + public void setGearShootingStartLatitudeDecimalDegree(Integer degree) { setGearShootingStartLatitudeDegree(degree); } @@ -335,7 +330,7 @@ gearShootingStartLatitudeAsSexagecimal.setMinute(minute); firePropertyChange(PROPERTY_GEAR_SHOOTING_START_LATITUDE_MINUTE, oldValue, minute); } - + public Float getGearShootingStartLatitudeDecimalMinute() { return gearShootingStartLatitudeAsSexagecimal.getMinuteDecimale(); } @@ -375,7 +370,7 @@ } return result; } - + public Integer getGearShootingStartLongitudeDecimalDegree() { return getGearShootingStartLongitudeDegree(); } @@ -390,7 +385,7 @@ gearShootingStartLongitudeAsSexagecimal.setDegre(degree); firePropertyChange(PROPERTY_GEAR_SHOOTING_START_LONGITUDE_DEGREE, oldValue, degree); } - + public void setGearShootingStartLongitudeDecimalDegree(Integer degree) { setGearShootingStartLongitudeDegree(degree); } @@ -404,7 +399,7 @@ gearShootingStartLongitudeAsSexagecimal.setMinute(minute); firePropertyChange(PROPERTY_GEAR_SHOOTING_START_LONGITUDE_MINUTE, oldValue, minute); } - + public Float getGearShootingStartLongitudeDecimalMinute() { return gearShootingStartLongitudeAsSexagecimal.getMinuteDecimale(); } @@ -461,7 +456,7 @@ } return result; } - + public Integer getGearShootingEndLatitudeDecimalDegree() { return getGearShootingEndLatitudeDegree(); } @@ -476,7 +471,7 @@ gearShootingEndLatitudeAsSexagecimal.setDegre(degree); firePropertyChange(PROPERTY_GEAR_SHOOTING_END_LATITUDE_DEGREE, oldValue, degree); } - + public void setGearShootingEndLatitudeDecimalDegree(Integer degree) { setGearShootingEndLatitudeDegree(degree); } @@ -490,7 +485,7 @@ gearShootingEndLatitudeAsSexagecimal.setMinute(minute); firePropertyChange(PROPERTY_GEAR_SHOOTING_END_LATITUDE_MINUTE, oldValue, minute); } - + public Float getGearShootingEndLatitudeDecimalMinute() { return gearShootingEndLatitudeAsSexagecimal.getMinuteDecimale(); } @@ -529,7 +524,7 @@ } return result; } - + public Integer getGearShootingEndLongitudeDecimalDegree() { return getGearShootingEndLongitudeDegree(); } @@ -544,7 +539,7 @@ gearShootingEndLongitudeAsSexagecimal.setDegre(degree); firePropertyChange(PROPERTY_GEAR_SHOOTING_END_LONGITUDE_DEGREE, oldValue, degree); } - + public void setGearShootingEndLongitudeDecimalDegree(Integer degree) { setGearShootingEndLongitudeDegree(degree); } @@ -569,7 +564,7 @@ // otherwise the filed is not filled with the value (I cannot explain why... :() firePropertyChange(PROPERTY_GEAR_SHOOTING_END_LONGITUDE_DECIMAL_MINUTE, null, decimalMinute); } - + public Integer getGearShootingEndLongitudeSecond() { return gearShootingEndLongitudeAsSexagecimal.getSeconde(); } @@ -691,14 +686,14 @@ firePropertyChange(PROPERTY_VESSEL, oldValue, vessel); } - public Integer getTrawlNetNumber() { - return trawlNetNumber; + public String getMultirigAggregation() { + return multirigAggregation; } - public void setTrawlNetNumber(Integer trawlNetNumber) { - Object oldValue = getTrawlNetNumber(); - this.trawlNetNumber = trawlNetNumber; - firePropertyChange(PROPERTY_TRAWL_NET_NUMBER, oldValue, trawlNetNumber); + public void setMultirigAggregation(String multirigAggregation) { + Object oldValue = getMultirigAggregation(); + this.multirigAggregation = multirigAggregation; + firePropertyChange(PROPERTY_MULTIRIG_AGGREGATION, oldValue, multirigAggregation); } public CoordinateEditorType getCoordinateEditorType() { @@ -708,7 +703,7 @@ public void setCoordinateEditorType(CoordinateEditorType coordinateEditorType) { this.coordinateEditorType = coordinateEditorType; } - + @Override protected FishingOperation newEntity() { return fishingOperation; Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/FishingOperationsUIHandler.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/FishingOperationsUIHandler.java 2013-01-30 12:31:40 UTC (rev 267) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/FishingOperationsUIHandler.java 2013-01-30 12:38:14 UTC (rev 268) @@ -35,7 +35,6 @@ import fr.ifremer.tutti.ui.swing.content.operation.catches.EditCatchesUIModel; import fr.ifremer.tutti.ui.swing.util.AbstractTuttiTabContainerUIHandler; import fr.ifremer.tutti.ui.swing.util.TuttiUIUtil; -import org.apache.commons.lang3.time.DateUtils; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.nuiton.util.decorator.Decorator; @@ -43,7 +42,6 @@ import javax.swing.JTabbedPane; import java.beans.PropertyChangeEvent; import java.beans.PropertyChangeListener; -import java.util.Date; import java.util.List; import static org.nuiton.i18n.I18n._; @@ -90,8 +88,6 @@ TuttiUIUtil.setCruise(ui, cruise); TuttiUIUtil.setProgram(ui, cruise.getProgram()); -// model.setCruise(cruise); - TuttiProtocol protocol; if (getContext().isProtocolFilled()) { @@ -113,6 +109,7 @@ List<FishingOperation> fishingOperations = persistenceService.getAllFishingOperation(cruiseId); + //FIXME Should remove this when no more use dev persistence impl //TODO make sure to use selection cruise ? for (FishingOperation fishingOperation : fishingOperations) { fishingOperation.setCruise(cruise); @@ -212,8 +209,8 @@ newFishingOperation.setGear(gears.get(0)); } - if (cruise.getTrawlNet() == 1) { - newFishingOperation.setTrawlNetNumber(1); + if (cruise.getMultirigNumber() == 1) { + newFishingOperation.setMultirigAggregation("1"); } // by default use the current day with no time information Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/EditCatchesUIHandler.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/EditCatchesUIHandler.java 2013-01-30 12:31:40 UTC (rev 267) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/EditCatchesUIHandler.java 2013-01-30 12:38:14 UTC (rev 268) @@ -24,6 +24,7 @@ * #L% */ +import fr.ifremer.tutti.persistence.entities.data.CatchBatch; import fr.ifremer.tutti.persistence.entities.data.FishingOperation; import fr.ifremer.tutti.service.PersistenceService; import fr.ifremer.tutti.ui.swing.AbstractTuttiBeanUIModel; @@ -99,13 +100,13 @@ @Override public void afterInitUI() { - + initUI(ui); - + EditCatchesUIModel model = getModel(); - + listenValidatorValid(ui.getValidator(), model); - + setCustomTab(0, model); } @@ -128,7 +129,7 @@ public EditCatchesUIModel getModel() { return ui.getModel(); } - + @Override protected JTabbedPane getTabPanel() { return ui.getTabPane(); @@ -146,9 +147,9 @@ @Override public void onShowTab() { - + } - + //------------------------------------------------------------------------// //-- Public methods --// //------------------------------------------------------------------------// @@ -161,7 +162,7 @@ if (fishingOperationMonitor.wasModified()) { save(); } - + ui.getSpeciesTabContent().getHandler().clearTableSelection(); ui.getBenthosTabContent().getHandler().clearTableSelection(); ui.getPlanktonTabContent().getHandler().clearTableSelection(); @@ -175,8 +176,12 @@ EditCatchesUIModel model = getModel(); if (empty || !bean.equals(model.getFishingOperation()) || fishingOperationMonitor.wasModified()) { + + CatchBatch batch; + if (empty) { - bean = new FishingOperation(); + batch= new CatchBatch(); + model.setCatchBatch(null); model.setFishingOperation(null); } else { @@ -185,10 +190,13 @@ bean.getId() + " - " + fishingOperationText); } + batch = persistenceService.getCatchBatchFromFishingOperation(bean.getId()); + + model.setCatchBatch(batch); model.setFishingOperation(bean); } - model.fromBean(bean); + model.fromBean(batch); model.setModify(false); fishingOperationMonitor.clearModified(); @@ -217,21 +225,21 @@ // previous fishingOperation was modified, let's save it EditCatchesUIModel beanToSave = fishingOperationMonitor.getBean(); - FishingOperation fishingOperation = beanToSave.toBean(); + CatchBatch catchBatch = beanToSave.toBean(); if (log.isInfoEnabled()) { - log.info("FishingOperation " + fishingOperation.getId() + + log.info("FishingOperation " + catchBatch.getId() + " was modified, will save it."); } showInformationMessage( "[ Captures - Caractéristiques générales ] " + - "Sauvegarde des modifications de " + decorate(fishingOperation) + + "Sauvegarde des modifications de " + decorate(catchBatch) + "."); - persistenceService.saveFishingOperation(fishingOperation); + persistenceService.saveCatchBatch(catchBatch); } - + public void importPupitri() { //TODO } Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/EditCatchesUIModel.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/EditCatchesUIModel.java 2013-01-30 12:31:40 UTC (rev 267) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/EditCatchesUIModel.java 2013-01-30 12:38:14 UTC (rev 268) @@ -24,6 +24,7 @@ * #L% */ +import fr.ifremer.tutti.persistence.entities.data.CatchBatch; import fr.ifremer.tutti.persistence.entities.data.FishingOperation; import fr.ifremer.tutti.ui.swing.AbstractTuttiBeanUIModel; import org.nuiton.util.beans.Binder; @@ -35,7 +36,7 @@ * @author tchemit <chemit(a)codelutin.com> * @since 0.3 */ -public class EditCatchesUIModel extends AbstractTuttiBeanUIModel<FishingOperation, EditCatchesUIModel> { +public class EditCatchesUIModel extends AbstractTuttiBeanUIModel<CatchBatch, EditCatchesUIModel> { private static final long serialVersionUID = 1L; @@ -73,7 +74,9 @@ public static final String PROPERTY_FISHING_OPERATION = "fishingOperation"; - protected static final Binder<FishingOperation, EditCatchesUIModel> fromBeanBinder = BinderModelBuilder.newEmptyBuilder(FishingOperation.class, EditCatchesUIModel.class) + public static final String PROPERTY_CATCH_BATCH = "catchBatch"; + + protected static final Binder<CatchBatch, EditCatchesUIModel> fromBeanBinder = BinderModelBuilder.newEmptyBuilder(CatchBatch.class, EditCatchesUIModel.class) .addSimpleProperties( PROPERTY_SPECIES_TOTAL_WEIGHT, PROPERTY_SPECIES_TOTAL_SORTED_WEIGHT, @@ -88,7 +91,7 @@ PROPERTY_MACRO_WASTE_TOTAL_WEIGHT ).toBinder(); - protected static final Binder<EditCatchesUIModel, FishingOperation> toBeanBinder = BinderModelBuilder.newEmptyBuilder(EditCatchesUIModel.class, FishingOperation.class) + protected static final Binder<EditCatchesUIModel, CatchBatch> toBeanBinder = BinderModelBuilder.newEmptyBuilder(EditCatchesUIModel.class, CatchBatch.class) .addSimpleProperties( PROPERTY_SPECIES_TOTAL_WEIGHT, PROPERTY_SPECIES_TOTAL_SORTED_WEIGHT, @@ -137,15 +140,27 @@ protected FishingOperation fishingOperation; + protected CatchBatch catchBatch; + public EditCatchesUIModel() { - super(FishingOperation.class, fromBeanBinder, toBeanBinder); + super(CatchBatch.class, fromBeanBinder, toBeanBinder); } @Override public String getTitle() { return _("tutti.label.tab.catchesCaracteristics"); } - + + public CatchBatch getCatchBatch() { + return catchBatch; + } + + public void setCatchBatch(CatchBatch catchBatch) { + Object oldValue = getCatchTotalWeight(); + this.catchBatch = catchBatch; + firePropertyChange(PROPERTY_CATCH_BATCH, oldValue, catchBatch); + } + public FishingOperation getFishingOperation() { return fishingOperation; } @@ -317,7 +332,7 @@ } @Override - protected FishingOperation newEntity() { - return fishingOperation; + protected CatchBatch newEntity() { + return catchBatch; } } Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/SpeciesBatchUIHandler.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/SpeciesBatchUIHandler.java 2013-01-30 12:31:40 UTC (rev 267) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/SpeciesBatchUIHandler.java 2013-01-30 12:38:14 UTC (rev 268) @@ -454,15 +454,13 @@ // fill sampling order from protocol - List<SampleCategoryEnum> sampleCategoryOrder = - protocol.getSampleCategoryOrder(); - samplingOrder = Lists.newArrayList(); - for (SampleCategoryEnum sampleCategoryEnum : sampleCategoryOrder) { - SampleCategoryType sampleCategoryType = - SampleCategoryType.valueOf(sampleCategoryEnum); - samplingOrder.add(sampleCategoryType); - } + samplingOrder = Lists.newArrayList( + SampleCategoryType.sortedUnsorted, + SampleCategoryType.size, + SampleCategoryType.sex, + SampleCategoryType.maturity, + SampleCategoryType.age); // fill available species from protocol Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/fishing/gearshooting/GearShootingRowModel.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/fishing/gearshooting/GearShootingRowModel.java 2013-01-30 12:31:40 UTC (rev 267) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/fishing/gearshooting/GearShootingRowModel.java 2013-01-30 12:38:14 UTC (rev 268) @@ -33,4 +33,5 @@ */ public class GearShootingRowModel extends CaracteristicRowModel<GearShootingRowModel> { + private static final long serialVersionUID = 1L; } Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/fishing/gearshooting/GearShootingTabUI.jaxx =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/fishing/gearshooting/GearShootingTabUI.jaxx 2013-01-30 12:31:40 UTC (rev 267) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/fishing/gearshooting/GearShootingTabUI.jaxx 2013-01-30 12:38:14 UTC (rev 268) @@ -51,8 +51,7 @@ genericType='Caracteristic'/> </cell> <cell fill='both'> - <JButton id='addRow' actionIcon='add' - onActionPerformed='handler.addRow()'/> + <JButton id='addRow' onActionPerformed='handler.addRow()'/> </cell> </row> <row fill='both' weighty='1'> Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/fishing/hydrology/HydrologyRowModel.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/fishing/hydrology/HydrologyRowModel.java 2013-01-30 12:31:40 UTC (rev 267) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/fishing/hydrology/HydrologyRowModel.java 2013-01-30 12:38:14 UTC (rev 268) @@ -24,15 +24,8 @@ * #L% */ -import fr.ifremer.tutti.persistence.entities.referential.Caracteristic; -import fr.ifremer.tutti.ui.swing.AbstractTuttiBeanUIModel; import fr.ifremer.tutti.ui.swing.content.operation.fishing.CaracteristicRowModel; -import fr.ifremer.tutti.ui.swing.util.table.CaracteristicRow; -import org.nuiton.util.beans.Binder; -import org.nuiton.util.beans.BinderFactory; -import java.io.Serializable; - /** * @author kmorin * @since 0.3 @@ -40,64 +33,64 @@ public class HydrologyRowModel extends CaracteristicRowModel<HydrologyRowModel> { private static final long serialVersionUID = 1L; +// +// public static final String PROPERTY_GEAR_SHOOTING_START_VALUE = "gearShootingStartValue"; +// +// public static final String PROPERTY_GEAR_SHOOTING_END_VALUE = "gearShootingEndValue"; +// +// public static final String PROPERTY_AVERAGE_VALUE = "averageValue"; +// +// protected Serializable gearShootingStartValue; +// +// protected Serializable gearShootingEndValue; +// +// protected Serializable averageValue; - public static final String PROPERTY_GEAR_SHOOTING_START_VALUE = "gearShootingStartValue"; +// public HydrologyRowModel() { +// super(); +// } +// +// public HydrologyRowModel(Caracteristic key) { +// this(key, null, null, null); +// } +// +// public HydrologyRowModel(Caracteristic key, Serializable gearShootingStartValue, +// Serializable gearShootingEndValue, Serializable averageValue) { +// this(); +// this.key = key; +// this.gearShootingStartValue = gearShootingStartValue; +// this.gearShootingEndValue = gearShootingEndValue; +// this.averageValue = averageValue; +// } +// +// public Serializable getGearShootingStartValue() { +// return gearShootingStartValue; +// } +// +// public void setGearShootingStartValue(Serializable gearShootingStartValue) { +// Object oldValue = getGearShootingStartValue(); +// this.gearShootingStartValue = gearShootingStartValue; +// firePropertyChange(PROPERTY_GEAR_SHOOTING_START_VALUE, oldValue, gearShootingStartValue); +// } +// +// public Serializable getGearShootingEndValue() { +// return gearShootingEndValue; +// } +// +// public void setGearShootingEndValue(Serializable gearShootingEndValue) { +// Object oldValue = getGearShootingEndValue(); +// this.gearShootingEndValue = gearShootingEndValue; +// firePropertyChange(PROPERTY_GEAR_SHOOTING_END_VALUE, oldValue, gearShootingEndValue); +// } +// +// public Serializable getAverageValue() { +// return averageValue; +// } +// +// public void setAverageValue(Serializable averageValue) { +// Object oldValue = getAverageValue(); +// this.averageValue = averageValue; +// firePropertyChange(PROPERTY_AVERAGE_VALUE, oldValue, averageValue); +// } - public static final String PROPERTY_GEAR_SHOOTING_END_VALUE = "gearShootingEndValue"; - - public static final String PROPERTY_AVERAGE_VALUE = "averageValue"; - - protected Serializable gearShootingStartValue; - - protected Serializable gearShootingEndValue; - - protected Serializable averageValue; - - public HydrologyRowModel() { - super(); - } - - public HydrologyRowModel(Caracteristic key) { - this(key, null, null, null); - } - - public HydrologyRowModel(Caracteristic key, Serializable gearShootingStartValue, - Serializable gearShootingEndValue, Serializable averageValue) { - this(); - this.key = key; - this.gearShootingStartValue = gearShootingStartValue; - this.gearShootingEndValue = gearShootingEndValue; - this.averageValue = averageValue; - } - - public Serializable getGearShootingStartValue() { - return gearShootingStartValue; - } - - public void setGearShootingStartValue(Serializable gearShootingStartValue) { - Object oldValue = getGearShootingStartValue(); - this.gearShootingStartValue = gearShootingStartValue; - firePropertyChange(PROPERTY_GEAR_SHOOTING_START_VALUE, oldValue, gearShootingStartValue); - } - - public Serializable getGearShootingEndValue() { - return gearShootingEndValue; - } - - public void setGearShootingEndValue(Serializable gearShootingEndValue) { - Object oldValue = getGearShootingEndValue(); - this.gearShootingEndValue = gearShootingEndValue; - firePropertyChange(PROPERTY_GEAR_SHOOTING_END_VALUE, oldValue, gearShootingEndValue); - } - - public Serializable getAverageValue() { - return averageValue; - } - - public void setAverageValue(Serializable averageValue) { - Object oldValue = getAverageValue(); - this.averageValue = averageValue; - firePropertyChange(PROPERTY_AVERAGE_VALUE, oldValue, averageValue); - } - } Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/fishing/hydrology/HydrologyTabUIHandler.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/fishing/hydrology/HydrologyTabUIHandler.java 2013-01-30 12:31:40 UTC (rev 267) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/fishing/hydrology/HydrologyTabUIHandler.java 2013-01-30 12:38:14 UTC (rev 268) @@ -25,10 +25,7 @@ */ import com.google.common.base.Preconditions; -import com.google.common.collect.Lists; -import com.google.common.collect.Maps; import fr.ifremer.tutti.persistence.entities.CaracteristicMap; -import fr.ifremer.tutti.persistence.entities.TuttiEntities; import fr.ifremer.tutti.persistence.entities.data.FishingOperation; import fr.ifremer.tutti.persistence.entities.protocol.TuttiProtocol; import fr.ifremer.tutti.persistence.entities.referential.Caracteristic; @@ -36,23 +33,16 @@ import fr.ifremer.tutti.ui.swing.TuttiUI; import fr.ifremer.tutti.ui.swing.content.operation.EditFishingOperationUI; import fr.ifremer.tutti.ui.swing.content.operation.fishing.CaracteristicTabUIHandler; -import fr.ifremer.tutti.ui.swing.util.HydrologicCaracteristicUtil; -import fr.ifremer.tutti.ui.swing.util.HydrologicCaracteristicUtil.Type; -import fr.ifremer.tutti.ui.swing.util.TuttiUIUtil; import fr.ifremer.tutti.ui.swing.util.editor.CaracteristicValueEditor; import fr.ifremer.tutti.ui.swing.util.editor.CaracteristicValueRenderer; -import java.beans.PropertyChangeEvent; -import java.beans.PropertyChangeListener; -import java.io.Serializable; -import java.util.List; -import java.util.Map; -import java.util.Set; import jaxx.runtime.swing.editor.bean.BeanComboBox; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.jdesktop.swingx.JXTable; import org.jdesktop.swingx.table.DefaultTableColumnModelExt; +import java.util.List; + /** * @author kmorin * @since 0.3 @@ -69,19 +59,20 @@ */ protected final HydrologyTabUI ui; - protected Map<Caracteristic, Map<Type, Caracteristic>> availableGlobalCaracteristics; +// protected Map<Caracteristic, Map<Type, Caracteristic>> availableGlobalCaracteristics; public HydrologyTabUIHandler(EditFishingOperationUI parentUi, HydrologyTabUI ui) { super(parentUi, - HydrologyRowModel.PROPERTY_GEAR_SHOOTING_START_VALUE, - HydrologyRowModel.PROPERTY_AVERAGE_VALUE, - HydrologyRowModel.PROPERTY_GEAR_SHOOTING_END_VALUE + HydrologyRowModel.PROPERTY_VALUE +// HydrologyRowModel.PROPERTY_GEAR_SHOOTING_START_VALUE, +// HydrologyRowModel.PROPERTY_AVERAGE_VALUE, +// HydrologyRowModel.PROPERTY_GEAR_SHOOTING_END_VALUE ); this.ui = ui; } - + //------------------------------------------------------------------------// //-- CaracteristicTabUIHandler methods --// //------------------------------------------------------------------------// @@ -95,12 +86,12 @@ protected BeanComboBox<Caracteristic> getKeyCombo() { return ui.getNewRowKey(); } - + @Override protected HydrologyTabUIModel createModel() { return new HydrologyTabUIModel(); } - + @Override protected CaracteristicMap getCaracteristics(FishingOperation operation) { return operation.getHydrologyCaracteristics(); @@ -110,7 +101,7 @@ protected List<String> getProtocolPmfmIds(TuttiProtocol protocol) { return protocol.getHydrologyPmfmId(); } - + //------------------------------------------------------------------------// //-- AbstractTuttiTableUIHandler methods --// //------------------------------------------------------------------------// @@ -120,45 +111,45 @@ return ui.getHydrologyTable(); } - @Override - protected boolean isRowValid(HydrologyRowModel row) { - //TODO - return row.getGearShootingStartValue() != null || - row.getGearShootingEndValue() != null || - row.getAverageValue() != null; - } +// @Override +// protected boolean isRowValid(HydrologyRowModel row) { +// //TODO +// return row.getGearShootingStartValue() != null || +// row.getGearShootingEndValue() != null || +// row.getAverageValue() != null; +// } //------------------------------------------------------------------------// //-- AbstractTuttiUIHandler methods --// //------------------------------------------------------------------------// - @Override - public void beforeInitUI() { - HydrologyTabUIModel model = new HydrologyTabUIModel(); - ui.setContextValue(model); +// @Override +// public void beforeInitUI() { +// HydrologyTabUIModel model = new HydrologyTabUIModel(); +// ui.setContextValue(model); +// +// model.addPropertyChangeListener(HydrologyTabUIModel.PROPERTY_AVAILABLE_CARACTERISTICS, new PropertyChangeListener() { +// +// public void propertyChange(PropertyChangeEvent evt) { +// List<Caracteristic> hydrologyPmfm = (List<Caracteristic>) evt.getNewValue(); +// availableGlobalCaracteristics = Maps.newHashMap(); +// if (hydrologyPmfm != null) { +// for (Caracteristic caracteristic : hydrologyPmfm) { +// String name = HydrologicCaracteristicUtil.getGlobalName(caracteristic.getName()); +// Caracteristic globalCaracteristic = HydrologicCaracteristicUtil.createGlobalCaracteristic(name, caracteristic); +// Map<Type, Caracteristic> values = availableGlobalCaracteristics.get(globalCaracteristic); +// if (values == null) { +// values = Maps.newHashMap(); +// availableGlobalCaracteristics.put(globalCaracteristic, values); +// } +// Type type = HydrologicCaracteristicUtil.getTypeOfCaracteristic(caracteristic); +// values.put(type, caracteristic); +// } +// } +// } +// }); +// } - model.addPropertyChangeListener(HydrologyTabUIModel.PROPERTY_AVAILABLE_CARACTERISTICS, new PropertyChangeListener() { - - public void propertyChange(PropertyChangeEvent evt) { - List<Caracteristic> hydrologyPmfm = (List<Caracteristic>) evt.getNewValue(); - availableGlobalCaracteristics = Maps.newHashMap(); - if (hydrologyPmfm != null) { - for (Caracteristic caracteristic : hydrologyPmfm) { - String name = HydrologicCaracteristicUtil.getGlobalName(caracteristic.getName()); - Caracteristic globalCaracteristic = HydrologicCaracteristicUtil.createGlobalCaracteristic(name, caracteristic); - Map<Type, Caracteristic> values = availableGlobalCaracteristics.get(globalCaracteristic); - if (values == null) { - values = Maps.newHashMap(); - availableGlobalCaracteristics.put(globalCaracteristic, values); - } - Type type = HydrologicCaracteristicUtil.getTypeOfCaracteristic(caracteristic); - values.put(type, caracteristic); - } - } - } - }); - } - @Override public void afterInitUI() { super.afterInitUI(); @@ -178,29 +169,36 @@ } { - addColumnToModel(columnModel, new CaracteristicValueEditor(context), new CaracteristicValueRenderer(context), - HydrologyTableModel.GEAR_SHOOTING_START_VALUE); + HydrologyTableModel.VALUE); } - { +// { +// +// addColumnToModel(columnModel, +// new CaracteristicValueEditor(context), +// new CaracteristicValueRenderer(context), +// HydrologyTableModel.GEAR_SHOOTING_START_VALUE); +// } +// +// { +// +// addColumnToModel(columnModel, +// new CaracteristicValueEditor(context), +// new CaracteristicValueRenderer(context), +// HydrologyTableModel.GEAR_SHOOTING_END_VALUE); +// } +// +// { +// +// addColumnToModel(columnModel, +// new CaracteristicValueEditor(context), +// new CaracteristicValueRenderer(context), +// HydrologyTableModel.AVERAGE_VALUE); +// } - addColumnToModel(columnModel, - new CaracteristicValueEditor(context), - new CaracteristicValueRenderer(context), - HydrologyTableModel.GEAR_SHOOTING_END_VALUE); - } - - { - - addColumnToModel(columnModel, - new CaracteristicValueEditor(context), - new CaracteristicValueRenderer(context), - HydrologyTableModel.AVERAGE_VALUE); - } - // create table model HydrologyTableModel tableModel = new HydrologyTableModel(columnModel); @@ -214,70 +212,69 @@ //-- Public methods --// //------------------------------------------------------------------------// - /** Resets the table with the data from the database */ - @Override - public void reset(FishingOperation fishingOperation) { - HydrologyTableModel tableModel = getTableModel(); - HydrologyTabUIModel model = getModel(); +// @Override +// public void reset(FishingOperation fishingOperation) { +// HydrologyTableModel tableModel = getTableModel(); +// HydrologyTabUIModel model = getModel(); +// +// CaracteristicMap hydrologyCaracteristics = fishingOperation.getHydrologyCaracteristics(); +// if (hydrologyCaracteristics == null) { +// hydrologyCaracteristics = new CaracteristicMap(); +// } +// model.setCaracteristicMap(hydrologyCaracteristics); +// +// TuttiProtocol protocol = TuttiUIUtil.getProtocol(ui); +// List<String> gearPmfmIds = Lists.newArrayList(); +// if (protocol != null) { +// List<String> protocolHydrologyPmfmId = protocol.getHydrologyPmfmId(); +// if (protocolHydrologyPmfmId != null) { +// gearPmfmIds.addAll(protocolHydrologyPmfmId); +// } +// } +// +// List<HydrologyRowModel> rows = Lists.newArrayList(); +// List<Caracteristic> caracteristicList = Lists.newArrayList(); +// List<Caracteristic> selectedCaracteristics = Lists.newArrayList(hydrologyCaracteristics.keySet()); +// +// List<Caracteristic> availableCaracteristics = model.getAvailableCaracteristics(); +// for (String id : gearPmfmIds) { +// Caracteristic caracteristic = TuttiEntities.findById(availableCaracteristics, id); +// if (!selectedCaracteristics.contains(caracteristic)) { +// selectedCaracteristics.add(caracteristic); +// } +// } +// +// Set<Caracteristic> globalCaracteristics = availableGlobalCaracteristics.keySet(); +// +// for (Caracteristic availableCaracteristic : globalCaracteristics) { +// Map<Type, Caracteristic> caracteristics = availableGlobalCaracteristics.get(availableCaracteristic); +// +// //should add the global caracteristic to the combo or to the table? +// boolean selectedCaracteristic = false; +// for (Caracteristic caracteristic : caracteristics.values()) { +// selectedCaracteristic |= selectedCaracteristics.contains(caracteristic); +// } +// +// if (selectedCaracteristic) { +// HydrologyRowModel row = tableModel.createNewRow(); +// row.setKey(availableCaracteristic); +// row.setGearShootingStartValue(hydrologyCaracteristics.get(caracteristics.get(Type.START))); +// row.setGearShootingEndValue(hydrologyCaracteristics.get(caracteristics.get(Type.END))); +// row.setAverageValue(hydrologyCaracteristics.get(caracteristics.get(Type.AVERAGE))); +// rows.add(row); +// +// } else { +// caracteristicList.add(availableCaracteristic); +// } +// } +// +// model.setRows(rows); +// +// ui.getNewRowKey().setData(caracteristicList); +// selectFirstInCombo(ui.getNewRowKey()); +// model.setModify(false); +// } - CaracteristicMap hydrologyCaracteristics = fishingOperation.getHydrologyCaracteristics(); - if (hydrologyCaracteristics == null) { - hydrologyCaracteristics = new CaracteristicMap(); - } - model.setCaracteristicMap(hydrologyCaracteristics); - - TuttiProtocol protocol = TuttiUIUtil.getProtocol(ui); - List<String> gearPmfmIds = Lists.newArrayList(); - if (protocol != null) { - List<String> protocolHydrologyPmfmId = protocol.getHydrologyPmfmId(); - if (protocolHydrologyPmfmId != null) { - gearPmfmIds.addAll(protocolHydrologyPmfmId); - } - } - - List<HydrologyRowModel> rows = Lists.newArrayList(); - List<Caracteristic> caracteristicList = Lists.newArrayList(); - List<Caracteristic> selectedCaracteristics = Lists.newArrayList(hydrologyCaracteristics.keySet()); - - List<Caracteristic> availableCaracteristics = model.getAvailableCaracteristics(); - for (String id : gearPmfmIds) { - Caracteristic caracteristic = TuttiEntities.findById(availableCaracteristics, id); - if (!selectedCaracteristics.contains(caracteristic)) { - selectedCaracteristics.add(caracteristic); - } - } - - Set<Caracteristic> globalCaracteristics = availableGlobalCaracteristics.keySet(); - - for (Caracteristic availableCaracteristic : globalCaracteristics) { - Map<Type, Caracteristic> caracteristics = availableGlobalCaracteristics.get(availableCaracteristic); - - //should add the global caracteristic to the combo or to the table? - boolean selectedCaracteristic = false; - for (Caracteristic caracteristic : caracteristics.values()) { - selectedCaracteristic |= selectedCaracteristics.contains(caracteristic); - } - - if (selectedCaracteristic) { - HydrologyRowModel row = tableModel.createNewRow(); - row.setKey(availableCaracteristic); - row.setGearShootingStartValue(hydrologyCaracteristics.get(caracteristics.get(Type.START))); - row.setGearShootingEndValue(hydrologyCaracteristics.get(caracteristics.get(Type.END))); - row.setAverageValue(hydrologyCaracteristics.get(caracteristics.get(Type.AVERAGE))); - rows.add(row); - - } else { - caracteristicList.add(availableCaracteristic); - } - } - - model.setRows(rows); - - ui.getNewRowKey().setData(caracteristicList); - selectFirstInCombo(ui.getNewRowKey()); - model.setModify(false); - } - @Override public void removeCaracteristic() { int rowIndex = getTable().getSelectedRow(); @@ -287,14 +284,9 @@ HydrologyRowModel row = getTableModel().getEntry(rowIndex); - Map<Type, Caracteristic> caracteristics = availableGlobalCaracteristics.get(row.getKey()); - for (Type type : caracteristics.keySet()) { - Caracteristic caracteristic = caracteristics.get(type); - - CaracteristicMap caracteristicMap = getModel().getCaracteristicMap(); - if (caracteristicMap != null) { - caracteristicMap.remove(caracteristic); - } + CaracteristicMap caracteristicMap = getModel().getCaracteristicMap(); + if (caracteristicMap != null) { + caracteristicMap.remove(row.getKey()); } //add the row in the combo @@ -309,36 +301,59 @@ getTableModel().fireTableRowsDeleted(rowIndex, rowIndex); getModel().removeRowInError(row); + +// Map<Type, Caracteristic> caracteristics = availableGlobalCaracteristics.get(row.getKey()); +// for (Type type : caracteristics.keySet()) { +// Caracteristic caracteristic = caracteristics.get(type); +// +// CaracteristicMap caracteristicMap = getModel().getCaracteristicMap(); +// if (caracteristicMap != null) { +// caracteristicMap.remove(caracteristic); +// } +// } +// +// //add the row in the combo +// BeanComboBox keyCombo = ui.getNewRowKey(); +// keyCombo.addItem(row.getKey()); +// selectFirstInCombo(keyCombo); +// +// // remove the row from the model +// getModel().getRows().remove(rowIndex); +// +// // refresh all the table +// getTableModel().fireTableRowsDeleted(rowIndex, rowIndex); +// +// getModel().removeRowInError(row); } //------------------------------------------------------------------------// //-- Protected methods --// //------------------------------------------------------------------------// - @Override - protected void saveRow(HydrologyRowModel row) { - if (row.isValid()) { - CaracteristicMap caracteristicMap = getModel().getCaracteristicMap(); - Preconditions.checkNotNull(caracteristicMap); +// @Override +// protected void saveRow(HydrologyRowModel row) { +// if (row.isValid()) { +// CaracteristicMap caracteristicMap = getModel().getCaracteristicMap(); +// Preconditions.checkNotNull(caracteristicMap); +// +// Map<Type, Caracteristic> caracteristics = availableGlobalCaracteristics.get(row.getKey()); +// CaracteristicMap map = new CaracteristicMap(); +// for (Type type : caracteristics.keySet()) { +// Serializable value = null; +// switch (type) { +// case START: +// value = row.getGearShootingStartValue(); +// break; +// case END: +// value = row.getGearShootingEndValue(); +// break; +// case AVERAGE: +// value = row.getAverageValue(); +// } +// map.put(caracteristics.get(type), value); +// } +// caracteristicMap.putAll(map); +// } +// } - Map<Type, Caracteristic> caracteristics = availableGlobalCaracteristics.get(row.getKey()); - CaracteristicMap map = new CaracteristicMap(); - for (Type type : caracteristics.keySet()) { - Serializable value = null; - switch (type) { - case START: - value = row.getGearShootingStartValue(); - break; - case END: - value = row.getGearShootingEndValue(); - break; - case AVERAGE: - value = row.getAverageValue(); - } - map.put(caracteristics.get(type), value); - } - caracteristicMap.putAll(map); - } - } - } Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/fishing/hydrology/HydrologyTabUIModel.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/fishing/hydrology/HydrologyTabUIModel.java 2013-01-30 12:31:40 UTC (rev 267) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/fishing/hydrology/HydrologyTabUIModel.java 2013-01-30 12:38:14 UTC (rev 268) @@ -25,10 +25,10 @@ */ import fr.ifremer.tutti.ui.swing.content.operation.fishing.CaracteristicTabUIModel; -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; +import static org.nuiton.i18n.I18n.n_; + /** * @author kmorin * @since 0.3 @@ -36,11 +36,9 @@ public class HydrologyTabUIModel extends CaracteristicTabUIModel<HydrologyRowModel, HydrologyTabUIModel> { private static final long serialVersionUID = 1L; - - private static final Log log = LogFactory.getLog(HydrologyTabUIModel.class); - public static final String TITLE = "tutti.label.tab.fishingOperation.hydrology"; - + public static final String TITLE = n_("tutti.label.tab.fishingOperation.hydrology"); + @Override public String getTitle() { return TITLE; Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/fishing/hydrology/HydrologyTableModel.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/fishing/hydrology/HydrologyTableModel.java 2013-01-30 12:31:40 UTC (rev 267) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/fishing/hydrology/HydrologyTableModel.java 2013-01-30 12:38:14 UTC (rev 268) @@ -44,21 +44,26 @@ n_("tutti.table.fishing.hydrology.header.key"), n_("tutti.table.fishing.hydrology.header.key")); - public static final ColumnIdentifier<HydrologyRowModel> GEAR_SHOOTING_START_VALUE = ColumnIdentifier.newId( - HydrologyRowModel.PROPERTY_GEAR_SHOOTING_START_VALUE, - n_("tutti.table.fishing.hydrology.header.gearShootingStartValue"), - n_("tutti.table.fishing.hydrology.header.gearShootingStartValue")); + public static final ColumnIdentifier<HydrologyRowModel> VALUE = ColumnIdentifier.newId( + HydrologyRowModel.PROPERTY_VALUE, + n_("tutti.table.fishing.hydrology.header.value"), + n_("tutti.table.fishing.hydrology.header.value")); - public static final ColumnIdentifier<HydrologyRowModel> GEAR_SHOOTING_END_VALUE = ColumnIdentifier.newId( - HydrologyRowModel.PROPERTY_GEAR_SHOOTING_END_VALUE, - n_("tutti.table.fishing.hydrology.header.gearShootingEndValue"), - n_("tutti.table.fishing.hydrology.header.gearShootingEndValue")); +// public static final ColumnIdentifier<HydrologyRowModel> GEAR_SHOOTING_START_VALUE = ColumnIdentifier.newId( +// HydrologyRowModel.PROPERTY_GEAR_SHOOTING_START_VALUE, +// n_("tutti.table.fishing.hydrology.header.gearShootingStartValue"), +// n_("tutti.table.fishing.hydrology.header.gearShootingStartValue")); +// +// public static final ColumnIdentifier<HydrologyRowModel> GEAR_SHOOTING_END_VALUE = ColumnIdentifier.newId( +// HydrologyRowModel.PROPERTY_GEAR_SHOOTING_END_VALUE, +// n_("tutti.table.fishing.hydrology.header.gearShootingEndValue"), +// n_("tutti.table.fishing.hydrology.header.gearShootingEndValue")); +// +// public static final ColumnIdentifier<HydrologyRowModel> AVERAGE_VALUE = ColumnIdentifier.newId( +// HydrologyRowModel.PROPERTY_AVERAGE_VALUE, +// n_("tutti.table.fishing.hydrology.header.averageValue"), +// n_("tutti.table.fishing.hydrology.header.averageValue")); - public static final ColumnIdentifier<HydrologyRowModel> AVERAGE_VALUE = ColumnIdentifier.newId( - HydrologyRowModel.PROPERTY_AVERAGE_VALUE, - n_("tutti.table.fishing.hydrology.header.averageValue"), - n_("tutti.table.fishing.hydrology.header.averageValue")); - public HydrologyTableModel(TableColumnModel columnModel) { super(columnModel, false, false); setNoneEditableCols(KEY); Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/protocol/EditProtocolUIHandler.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/protocol/EditProtocolUIHandler.java 2013-01-30 12:31:40 UTC (rev 267) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/protocol/EditProtocolUIHandler.java 2013-01-30 12:38:14 UTC (rev 268) @@ -25,13 +25,8 @@ */ import com.google.common.base.Preconditions; -import com.google.common.collect.ArrayListMultimap; -import com.google.common.collect.BiMap; -import com.google.common.collect.HashBiMap; import com.google.common.collect.Lists; -import com.google.common.collect.Multimap; import fr.ifremer.tutti.persistence.entities.TuttiEntities; -import fr.ifremer.tutti.persistence.entities.data.SampleCategoryEnum; import fr.ifremer.tutti.persistence.entities.protocol.SpeciesProtocol; import fr.ifremer.tutti.persistence.entities.protocol.TuttiProtocol; import fr.ifremer.tutti.persistence.entities.referential.Caracteristic; @@ -40,10 +35,8 @@ import fr.ifremer.tutti.ui.swing.MainUIHandler; import fr.ifremer.tutti.ui.swing.TuttiUI; import fr.ifremer.tutti.ui.swing.content.home.ImportProtocolAction; -import fr.ifremer.tutti.ui.swing.util.HydrologicCaracteristicUtil; import fr.ifremer.tutti.ui.swing.util.TuttiBeanMonitor; import fr.ifremer.tutti.ui.swing.util.table.AbstractTuttiTableUIHandler; -import fr.ifremer.tutti.ui.swing.util.table.ColumnIdentifier; import jaxx.runtime.swing.editor.bean.BeanDoubleList; import jaxx.runtime.validator.swing.SwingValidator; import org.apache.commons.collections.CollectionUtils; @@ -52,7 +45,6 @@ import org.jdesktop.swingx.JXTable; import org.jdesktop.swingx.table.DefaultTableColumnModelExt; -import java.util.Collection; import java.util.List; import java.util.Map; @@ -78,24 +70,11 @@ protected Map<String, Caracteristic> allLengthStepPmfm; - protected Multimap<String, String> hydroCaracteristics; +// protected Multimap<String, String> hydroCaracteristics; - /** - * Mapping between columns and sample category - * (used to define the {@link TuttiProtocol#sampleCategoryOrder}). - * - * @since 0.3 - */ - private final BiMap<ColumnIdentifier<EditProtocolSpeciesRowModel>, SampleCategoryEnum> columToSampleCategory; - public EditProtocolUIHandler(TuttiUI parentUi, EditProtocolUI ui) { super(parentUi.getHandler().getContext()); this.ui = ui; - columToSampleCategory = HashBiMap.create(SampleCategoryEnum.values().length - 1); - columToSampleCategory.put(EditProtocolSpeciesTableModel.SIZE_ENABLED, SampleCategoryEnum.size); - columToSampleCategory.put(EditProtocolSpeciesTableModel.SEX_ENABLED, SampleCategoryEnum.sex); - columToSampleCategory.put(EditProtocolSpeciesTableModel.MATURITY_ENABLED, SampleCategoryEnum.maturity); - columToSampleCategory.put(EditProtocolSpeciesTableModel.AGE_ENABLED, SampleCategoryEnum.age); } //------------------------------------------------------------------------// @@ -129,7 +108,10 @@ @Override - protected void onRowValidStateChanged(int rowIndex, EditProtocolSpeciesRowModel row, Boolean oldValue, Boolean newValue) { + protected void onRowValidStateChanged(int rowIndex, + EditProtocolSpeciesRowModel row, + Boolean oldValue, + Boolean newValue) { super.onRowValidStateChanged(rowIndex, row, oldValue, newValue); if (row != null && row.isModify() && newValue != null && newValue) { @@ -179,12 +161,12 @@ allLengthStepPmfm = TuttiEntities.splitById( persistenceService.getAllCaracteristic()); - hydroCaracteristics = ArrayListMultimap.create(); - for (Caracteristic caracteristic : - persistenceService.getAllCaracteristic()) { - String name = HydrologicCaracteristicUtil.getGlobalName(caracteristic.getName()); - hydroCaracteristics.put(name, caracteristic.getId()); - } +// hydroCaracteristics = ArrayListMultimap.create(); +// for (Caracteristic caracteristic : +// persistenceService.getAllCaracteristic()) { +// String name = HydrologicCaracteristicUtil.getGlobalName(caracteristic.getName()); +// hydroCaracteristics.put(name, caracteristic.getId()); +// } } @Override @@ -265,19 +247,11 @@ addBooleanColumnToModel(columnModel, EditProtocolSpeciesTableModel.COUNT_IF_NO_FREQUENCY_ENABLED, table); addBooleanColumnToModel(columnModel, EditProtocolSpeciesTableModel.CALCIFY_SAMPLE_ENABLED, table); - Map<SampleCategoryEnum, ColumnIdentifier<EditProtocolSpeciesRowModel>> sampleCategoryToColumn = columToSampleCategory.inverse(); + addBooleanColumnToModel(columnModel, EditProtocolSpeciesTableModel.SIZE_ENABLED, table); + addBooleanColumnToModel(columnModel, EditProtocolSpeciesTableModel.SEX_ENABLED, table); + addBooleanColumnToModel(columnModel, EditProtocolSpeciesTableModel.MATURITY_ENABLED, table); + addBooleanColumnToModel(columnModel, EditProtocolSpeciesTableModel.AGE_ENABLED, table); - List<SampleCategoryEnum> sampleCategoryOrder = model.getSampleCategoryOrder(); - if (sampleCategoryOrder != null) { - for (SampleCategoryEnum sampleOrder : sampleCategoryOrder) { - - ColumnIdentifier<EditProtocolSpeciesRowModel> columnIdentifier = sampleCategoryToColumn.get(sampleOrder); - if (columnIdentifier != null) { - addBooleanColumnToModel(columnModel, columnIdentifier, table); - } - } - } - EditProtocolSpeciesTableModel tableModel = new EditProtocolSpeciesTableModel(columnModel); table.setModel(tableModel); @@ -329,28 +303,34 @@ model.getEnvironmentPmfmId()); // init hydro pmfm double list - List<Caracteristic> selection = Lists.newArrayList(); - Collection<String> availableCaracteristicNames = hydroCaracteristics.keySet(); - List<Caracteristic> availableCaracteristics = Lists.newArrayList(); - for (String name : availableCaracteristicNames) { - Caracteristic caracteristic = HydrologicCaracteristicUtil.createGlobalCaracteristic(name, null); - availableCaracteristics.add(caracteristic); - } - List<String> hydrologyPmfm = model.getHydrologyPmfmId(); - if (hydrologyPmfm != null) { - for (String caracteristicName : availableCaracteristicNames) { - Collection<String> ids = hydroCaracteristics.get(caracteristicName); - for (String caracteristicId : hydrologyPmfm) { - if (ids.contains(caracteristicId)) { - Caracteristic caracteristic = HydrologicCaracteristicUtil.createGlobalCaracteristic(caracteristicName, null); - selection.add(caracteristic); - break; - } - } - } - } - initBeanList(ui.getHydrologyList(), availableCaracteristics, selection); + List<Caracteristic> hydroPmfm = + persistenceService.getAllCaracteristic(); + initDoubleList(ui.getHydrologyList(), + hydroPmfm, + model.getHydrologyPmfmId()); +// List<Caracteristic> selection = Lists.newArrayList(); +// Collection<String> availableCaracteristicNames = hydroCaracteristics.keySet(); +// List<Caracteristic> availableCaracteristics = Lists.newArrayList(); +// for (String name : availableCaracteristicNames) { +// Caracteristic caracteristic = HydrologicCaracteristicUtil.createGlobalCaracteristic(name, null); +// availableCaracteristics.add(caracteristic); +// } +// List<String> hydrologyPmfm = model.getHydrologyPmfmId(); +// if (hydrologyPmfm != null) { +// for (String caracteristicName : availableCaracteristicNames) { +// Collection<String> ids = hydroCaracteristics.get(caracteristicName); +// for (String caracteristicId : hydrologyPmfm) { +// if (ids.contains(caracteristicId)) { +// Caracteristic caracteristic = HydrologicCaracteristicUtil.createGlobalCaracteristic(caracteristicName, null); +// selection.add(caracteristic); +// break; +// } +// } +// } +// } +// initBeanList(ui.getHydrologyList(), availableCaracteristics, selection); + // if new protocol can already cancel his creation model.setModify(model.isCreate()); } @@ -403,14 +383,10 @@ getTableModel().fireTableRowsDeleted(rowIndex, rowIndex); } - public Multimap<String, String> getHydroCaracteristics() { - return hydroCaracteristics; - } +// public Multimap<String, String> getHydroCaracteristics() { +// return hydroCaracteristics; +// } - public BiMap<ColumnIdentifier<EditProtocolSpeciesRowModel>, SampleCategoryEnum> getColumToSampleCategory() { - return columToSampleCategory; - } - //------------------------------------------------------------------------// //-- Internal methods --// //------------------------------------------------------------------------// Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/protocol/EditProtocolUIModel.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/protocol/EditProtocolUIModel.java 2013-01-30 12:31:40 UTC (rev 267) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/protocol/EditProtocolUIModel.java 2013-01-30 12:38:14 UTC (rev 268) @@ -25,7 +25,6 @@ */ import com.google.common.collect.Lists; -import fr.ifremer.tutti.persistence.entities.data.SampleCategoryEnum; import fr.ifremer.tutti.persistence.entities.protocol.TuttiProtocol; import fr.ifremer.tutti.persistence.entities.referential.Caracteristic; import fr.ifremer.tutti.ui.swing.util.table.AbstractTuttiTableUIModel; @@ -54,8 +53,6 @@ public static final String PROPERTY_HYDROLOGY_PMFM_ID = "hydrologyPmfmId"; - public static final String PROPERTY_SAMPLE_CATEGORY_ORDER = "sampleCategoryOrder"; - public static final String PROPERTY_REMOVE_SPECIES_ENABLED = "removeSpeciesEnabled"; public static final String PROPERTY_IMPORTED = "imported"; @@ -72,13 +69,6 @@ protected List<String> hydrologyPmfmId; - protected List<SampleCategoryEnum> sampleCategoryOrder = Lists.newArrayList( - SampleCategoryEnum.sortedUnsorted, - SampleCategoryEnum.size, - SampleCategoryEnum.sex, - SampleCategoryEnum.maturity, - SampleCategoryEnum.age); - protected boolean imported; /** @@ -185,16 +175,6 @@ setHydrologyPmfmId(ids); } - public List<SampleCategoryEnum> getSampleCategoryOrder() { - return sampleCategoryOrder; - } - - public void setSampleCategoryOrder(List<SampleCategoryEnum> sampleCategoryOrder) { - Object oldValue = getSampleCategoryOrder(); - this.sampleCategoryOrder = sampleCategoryOrder; - firePropertyChange(PROPERTY_SAMPLE_CATEGORY_ORDER, oldValue, sampleCategoryOrder); - } - public boolean isRemoveSpeciesEnabled() { return removeSpeciesEnabled; } Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/protocol/SaveProtocolAction.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/protocol/SaveProtocolAction.java 2013-01-30 12:31:40 UTC (rev 267) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/protocol/SaveProtocolAction.java 2013-01-30 12:38:14 UTC (rev 268) @@ -25,36 +25,28 @@ * #L% */ -import com.google.common.collect.BiMap; import com.google.common.collect.Lists; -import com.google.common.collect.Maps; -import com.google.common.collect.Multimap; import fr.ifremer.tutti.persistence.entities.TuttiEntities; -import fr.ifremer.tutti.persistence.entities.data.SampleCategoryEnum; import fr.ifremer.tutti.persistence.entities.protocol.SpeciesProtocol; import fr.ifremer.tutti.persistence.entities.protocol.TuttiProtocol; import fr.ifremer.tutti.service.PersistenceService; import fr.ifremer.tutti.ui.swing.AbstractTuttiAction; import fr.ifremer.tutti.ui.swing.TuttiScreen; import fr.ifremer.tutti.ui.swing.TuttiUIContext; -import fr.ifremer.tutti.ui.swing.util.table.ColumnIdentifier; -import java.awt.event.ActionEvent; -import java.util.List; -import java.util.Map; -import javax.swing.table.TableColumn; -import javax.swing.table.TableColumnModel; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; +import java.awt.event.ActionEvent; +import java.util.List; + import static org.nuiton.i18n.I18n._; /** - * * @author kmorin <kmorin(a)codelutin.com> * @since 1.0 */ public class SaveProtocolAction extends AbstractTuttiAction<EditProtocolUIModel, EditProtocolUIHandler> { - + /** Logger. */ private static final Log log = LogFactory.getLog(SaveProtocolAction.class); @@ -75,7 +67,8 @@ EditProtocolUIModel model = getModel(); TuttiUIContext context = getContext(); EditProtocolUIHandler handler = getHandler(); - PersistenceService persistenceService = context.getService(PersistenceService.class); + PersistenceService persistenceService = + context.getService(PersistenceService.class); TuttiProtocol bean = model.toBean(); @@ -90,41 +83,6 @@ } bean.setSpecies(protocols); - // split the hydro grouped pmfm - List<String> hydroPmfm = bean.getHydrologyPmfmId(); - List<String> allIds = Lists.newArrayList(); - Multimap<String, String> hydroCaracteristics = handler.getHydroCaracteristics(); - if (hydroPmfm != null) { - for (String id : hydroPmfm) { - allIds.addAll(hydroCaracteristics.get(id)); - } - } - bean.setHydrologyPmfmId(allIds); - - // find out sampling order - - TableColumnModel columnModel = handler.getTable().getColumnModel(); - int columnCount = columnModel.getColumnCount(); - Map<Integer, SampleCategoryEnum> sampleCategoryOrders = Maps.newTreeMap(); - - BiMap<ColumnIdentifier<EditProtocolSpeciesRowModel>,SampleCategoryEnum> columToSampleCategory = handler.getColumToSampleCategory(); - for (int i = 0; i < columnCount; i++) { - - TableColumn column = columnModel.getColumn(i); - ColumnIdentifier<EditProtocolSpeciesRowModel> identifier = (ColumnIdentifier<EditProtocolSpeciesRowModel>) column.getIdentifier(); - SampleCategoryEnum sampleCategory = columToSampleCategory.get(identifier); - if (sampleCategory != null) { - - // found a sample category, keep it - sampleCategoryOrders.put(i, sampleCategory); - } - } - - List<SampleCategoryEnum> sampleOrder = - Lists.newArrayList(sampleCategoryOrders.values()); - - bean.setSampleCategoryOrder(sampleOrder); - TuttiProtocol saved; log.info("bean id : " + bean.getId()); if (TuttiEntities.isNew(bean)) { @@ -139,5 +97,5 @@ context.setScreen(TuttiScreen.SELECT_CRUISE); } - + } Modified: trunk/tutti-ui-swing/src/main/resources/fr/ifremer/tutti/ui/swing/content/cruise/EditCruiseUIModel-error-validation.xml =================================================================== --- trunk/tutti-ui-swing/src/main/resources/fr/ifremer/tutti/ui/swing/content/cruise/EditCruiseUIModel-error-validation.xml 2013-01-30 12:31:40 UTC (rev 267) +++ trunk/tutti-ui-swing/src/main/resources/fr/ifremer/tutti/ui/swing/content/cruise/EditCruiseUIModel-error-validation.xml 2013-01-30 12:38:14 UTC (rev 268) @@ -45,9 +45,9 @@ </field-validator> </field> - <field name="trawlNet"> + <field name="multirigNumber"> <field-validator type="required" short-circuit="true"> - <message>tutti.validator.error.cruise.trawlNet.required</message> + <message>tutti.validator.error.cruise.multirigNumber.required</message> </field-validator> </field> Modified: trunk/tutti-ui-swing/src/main/resources/fr/ifremer/tutti/ui/swing/content/operation/EditFishingOperationUIModel-edit-error-validation.xml =================================================================== --- trunk/tutti-ui-swing/src/main/resources/fr/ifremer/tutti/ui/swing/content/operation/EditFishingOperationUIModel-edit-error-validation.xml 2013-01-30 12:31:40 UTC (rev 267) +++ trunk/tutti-ui-swing/src/main/resources/fr/ifremer/tutti/ui/swing/content/operation/EditFishingOperationUIModel-edit-error-validation.xml 2013-01-30 12:38:14 UTC (rev 268) @@ -54,7 +54,7 @@ </field> - <field name="trawlNetNumber"> + <field name="multirigAggregation"> <field-validator type="required" short-circuit="true"> <message> Modified: trunk/tutti-ui-swing/src/main/resources/fr/ifremer/tutti/ui/swing/content/operation/EditFishingOperationUIModel-validate-error-validation.xml =================================================================== --- trunk/tutti-ui-swing/src/main/resources/fr/ifremer/tutti/ui/swing/content/operation/EditFishingOperationUIModel-validate-error-validation.xml 2013-01-30 12:31:40 UTC (rev 267) +++ trunk/tutti-ui-swing/src/main/resources/fr/ifremer/tutti/ui/swing/content/operation/EditFishingOperationUIModel-validate-error-validation.xml 2013-01-30 12:38:14 UTC (rev 268) @@ -54,7 +54,7 @@ </field> - <field name="trawlNetNumber"> + <field name="multirigAggregation"> <field-validator type="required" short-circuit="true"> <message> Modified: trunk/tutti-ui-swing/src/main/resources/i18n/tutti-ui-swing_fr_FR.properties =================================================================== --- trunk/tutti-ui-swing/src/main/resources/i18n/tutti-ui-swing_fr_FR.properties 2013-01-30 12:31:40 UTC (rev 267) +++ trunk/tutti-ui-swing/src/main/resources/i18n/tutti-ui-swing_fr_FR.properties 2013-01-30 12:38:14 UTC (rev 268) @@ -135,10 +135,10 @@ tutti.label.cruise.beginDate=Date de début tutti.label.cruise.country=Pays tutti.label.cruise.endDate=Date de fin +tutti.label.cruise.multirigNumber=Nombre de poches tutti.label.cruise.name=Nom tutti.label.cruise.program=Série tutti.label.cruise.surveyPart=Série partielle -tutti.label.cruise.trawlNet=Nombre de poches tutti.label.cruise.year=Année tutti.label.filterSpeciesBatchMode.label=Filtre tutti.label.filterSpeciesBatchMode.label.tip=Pour filtrer les lots @@ -168,12 +168,12 @@ tutti.label.fishingOperation.gearShootingStart=Début de traine tutti.label.fishingOperation.gearTime=Heure tutti.label.fishingOperation.location=Localité +tutti.label.fishingOperation.multirigAggregation=Numéro de poche tutti.label.fishingOperation.other=Autres caractéristiques tutti.label.fishingOperation.stationNumber=Code Station tutti.label.fishingOperation.strata=Strate tutti.label.fishingOperation.subStrata=Sous strate tutti.label.fishingOperation.trawlDistance=Distance chalutée -tutti.label.fishingOperation.trawlNetNumber=Numéro de poche tutti.label.fishingOperation.vessel=Navire tutti.label.frequencyConfiguration.lengthStepCaracteristic=Type de mesure tutti.label.frequencyConfiguration.maxStep=Classe max @@ -271,6 +271,7 @@ tutti.table.fishing.hydrology.header.gearShootingEndValue=Fin de traîne tutti.table.fishing.hydrology.header.gearShootingStartValue=Début de traîne tutti.table.fishing.hydrology.header.key=Caractéristique +tutti.table.fishing.hydrology.header.value=Valeur tutti.table.macrowaste.batch.header.comment=Commentaire tutti.table.macrowaste.batch.header.file=Pièces jointes tutti.table.macrowaste.batch.header.macroWasteCategory=Catégorie @@ -353,9 +354,9 @@ tutti.validator.error.cruise.gear.required=Au moins un engin doit être sélectionné tutti.validator.error.cruise.headOfMission.required=Au moins un chef de mission doit être sélectionné tutti.validator.error.cruise.headOfSortRoom.required=Au moins un responsable de salle de tri doit être sélectionné +tutti.validator.error.cruise.multirigNumber.required=Le nombre de poche est obligatoire tutti.validator.error.cruise.name.required=Le nom de la campagne est obligatoire tutti.validator.error.cruise.program.required=La série est obligatoire -tutti.validator.error.cruise.trawlNet.required=Le nombre de poche est obligatoire tutti.validator.error.cruise.vessel.required=Au moins un bateau doit être sélectionné tutti.validator.error.cruise.year.required=L'année est obligatoire tutti.validator.error.fishingOperation.date.required=La date du fishingOperation est obligatoire

1 0

r267 - in trunk/tutti-service/src/main: java/fr/ifremer/tutti/service resources/i18n
by tchemit＠users.forge.codelutin.com 30 Jan '13

30 Jan '13

Author: tchemit Date: 2013-01-30 13:31:40 +0100 (Wed, 30 Jan 2013) New Revision: 267 Url: http://forge.codelutin.com/projects/tutti/repository/revisions/267 Log: fix decoration Modified: trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/DecoratorService.java trunk/tutti-service/src/main/resources/i18n/tutti-service_fr_FR.properties Modified: trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/DecoratorService.java =================================================================== --- trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/DecoratorService.java 2013-01-30 11:29:37 UTC (rev 266) +++ trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/DecoratorService.java 2013-01-30 12:31:40 UTC (rev 267) @@ -104,7 +104,7 @@ registerMultiJXPathDecorator(Program.class, "${name}$s", SEPARATOR, " - "); registerMultiJXPathDecorator(Cruise.class, "${name}$s", SEPARATOR, " - "); registerMultiJXPathDecorator(TuttiProtocol.class, "${name}$s", SEPARATOR, " - "); - registerMultiJXPathDecorator(FishingOperation.class, "${stationNumber}$s#${fishingOperationNumber}$s#${trawlNetNumber}$s#${gearShootingStartDate}$td/%3$tm/%3$tY", SEPARATOR, " - "); + registerMultiJXPathDecorator(FishingOperation.class, "${stationNumber}$s#${fishingOperationNumber}$s#${multirigAggregation}$s#${gearShootingStartDate}$td/%4$tm/%4$tY", SEPARATOR, " - "); registerMultiJXPathDecorator(Zone.class, "${label}$s#${name}$s", SEPARATOR, " - "); registerMultiJXPathDecorator(Vessel.class, "${name}$s#${internalRegistrationCode}$s", SEPARATOR, " - "); registerMultiJXPathDecorator(Country.class, "${label}$s#${name}$s", SEPARATOR, " - "); @@ -161,7 +161,8 @@ n_("tutti.property.sortedUnsortedCategory"); n_("tutti.property.macroWasteCategory"); n_("tutti.property.attachment"); - n_("tutti.property.trawlNetNumber"); + n_("tutti.property.multirigAggregation"); + n_("tutti.property.caracteristic"); } } Modified: trunk/tutti-service/src/main/resources/i18n/tutti-service_fr_FR.properties =================================================================== --- trunk/tutti-service/src/main/resources/i18n/tutti-service_fr_FR.properties 2013-01-30 11:29:37 UTC (rev 266) +++ trunk/tutti-service/src/main/resources/i18n/tutti-service_fr_FR.properties 2013-01-30 12:31:40 UTC (rev 267) @@ -4,6 +4,7 @@ tutti.config.license.organizationName=Nom de l'organisation dans la licence tutti.config.tmp.directory=Répertoire temporaire utilisée par l'application (est nettoyé à chaque démarrage de l'application) tutti.property.attachment=Pièce jointe +tutti.property.caracteristic=Caractéristique tutti.property.codeMemo=Code Memo tutti.property.country=Pays tutti.property.cruise=Campagne @@ -20,6 +21,7 @@ tutti.property.macroWasteCategory=Type de macro déchet tutti.property.matrixName=Support tutti.property.methodName=Méthode +tutti.property.multirigAggregation=Numéro de poche tutti.property.name=Nom tutti.property.parameterName=Paramètre tutti.property.program=Série de campagne @@ -28,7 +30,6 @@ tutti.property.species=Espèce tutti.property.stationNumber=Numéro de station tutti.property.strata=Strate d'association -tutti.property.trawlNetNumber=Numéro de poche tutti.property.user=Utilisateur tutti.property.vessel=Navire tutti.property.zone=Zone

1 0

r266 - in trunk/tutti-persistence-adagio/src: main/java/fr/ifremer/tutti/persistence/service test/java/fr/ifremer/tutti/persistence/service
by blavenier＠users.forge.codelutin.com 30 Jan '13

30 Jan '13

Author: blavenier Date: 2013-01-30 12:29:37 +0100 (Wed, 30 Jan 2013) New Revision: 266 Url: http://forge.codelutin.com/projects/tutti/repository/revisions/266 Log: - Fix somme unit test failure - skip some PSFM in getAllCaracteristic result (skip protected PSFM, used for stationNumber, trawlDistance, etc.) Modified: trunk/tutti-persistence-adagio/src/main/java/fr/ifremer/tutti/persistence/service/FishingOperationPersistenceServiceImpl.java trunk/tutti-persistence-adagio/src/main/java/fr/ifremer/tutti/persistence/service/ReferentialPersistenceServiceImpl.java trunk/tutti-persistence-adagio/src/test/java/fr/ifremer/tutti/persistence/service/FishingOperationPersistenceServiceTest.java trunk/tutti-persistence-adagio/src/test/java/fr/ifremer/tutti/persistence/service/ReferentialPersistenceServiceTest.java Modified: trunk/tutti-persistence-adagio/src/main/java/fr/ifremer/tutti/persistence/service/FishingOperationPersistenceServiceImpl.java =================================================================== --- trunk/tutti-persistence-adagio/src/main/java/fr/ifremer/tutti/persistence/service/FishingOperationPersistenceServiceImpl.java 2013-01-30 10:53:51 UTC (rev 265) +++ trunk/tutti-persistence-adagio/src/main/java/fr/ifremer/tutti/persistence/service/FishingOperationPersistenceServiceImpl.java 2013-01-30 11:29:37 UTC (rev 266) @@ -170,14 +170,22 @@ if (fishingOperation.getFishingOperationNumber() == null) { fishingOperation.setFishingOperationNumber(fishingOperationRankOrder); } + + // Start date time + Timestamp startDateTime = (Timestamp)source[colIndex++]; + fishingOperation.setGearShootingStartDate(convertDatabase2UI(startDateTime)); // Station number String stationNumber = (String)source[colIndex++]; - fishingOperation.setStationNumber(stationNumber); + if (stationNumber != null) { + fishingOperation.setStationNumber(stationNumber); + } // Trawl number net Float trawlNetNumber = (Float)source[colIndex++]; - fishingOperation.setTrawlNetNumber(trawlNetNumber.intValue()); + if (trawlNetNumber != null) { + fishingOperation.setTrawlNetNumber(trawlNetNumber.intValue()); + } fishingOperations.add(fishingOperation); } @@ -243,21 +251,23 @@ String miscData = (String)source[colIndex++]; // Retrieve recorder persons - int recorderPersonsIndex = miscData.indexOf(MISC_DATA_RECORDER_PERSONS_TAG); - if (recorderPersonsIndex != -1) { - String recorderPersonsStr = miscData.substring(recorderPersonsIndex + MISC_DATA_RECORDER_PERSONS_TAG.length()).trim(); - miscData = miscData.substring(0, recorderPersonsIndex); - if (!recorderPersonsStr.isEmpty()) { - String[] recorderPersonsArray = recorderPersonsStr.split(","); - List<Person> persons = new ArrayList<Person>(); - for (int i = 0; i < recorderPersonsArray.length; i++) { - String personId = recorderPersonsArray[i]; - Person person = referentialService.getPerson(Integer.valueOf(personId)); - persons.add(person); + if (miscData != null && !miscData.isEmpty()) { + int recorderPersonsIndex = miscData.indexOf(MISC_DATA_RECORDER_PERSONS_TAG); + if (recorderPersonsIndex != -1) { + String recorderPersonsStr = miscData.substring(recorderPersonsIndex + MISC_DATA_RECORDER_PERSONS_TAG.length()).trim(); + miscData = miscData.substring(0, recorderPersonsIndex); + if (!recorderPersonsStr.isEmpty()) { + String[] recorderPersonsArray = recorderPersonsStr.split(","); + List<Person> persons = new ArrayList<Person>(); + for (int i = 0; i < recorderPersonsArray.length; i++) { + String personId = recorderPersonsArray[i]; + Person person = referentialService.getPerson(Integer.valueOf(personId)); + persons.add(person); + } + result.setSaisisseur(persons); } - result.setSaisisseur(persons); - } - } + } + } // Comment : if (miscData != null && !miscData.isEmpty()) { @@ -439,7 +449,9 @@ Integer qualitativeValueId = (Integer)source[colIndex++]; // Trawl net number - if (enumeration.PMFM_ID_MULTIRIG_AGGREGATION.equals(pmfmId)) { + if (enumeration.PMFM_ID_MULTIRIG_AGGREGATION.equals(pmfmId) + && alphanumericalValue != null + && alphanumericalValue.matches("\\d+")) { // TODO TC : passer la propriété trawlNetNumber en String result.setTrawlNetNumber(Integer.valueOf(alphanumericalValue)); } Modified: trunk/tutti-persistence-adagio/src/main/java/fr/ifremer/tutti/persistence/service/ReferentialPersistenceServiceImpl.java =================================================================== --- trunk/tutti-persistence-adagio/src/main/java/fr/ifremer/tutti/persistence/service/ReferentialPersistenceServiceImpl.java 2013-01-30 10:53:51 UTC (rev 265) +++ trunk/tutti-persistence-adagio/src/main/java/fr/ifremer/tutti/persistence/service/ReferentialPersistenceServiceImpl.java 2013-01-30 11:29:37 UTC (rev 266) @@ -387,8 +387,12 @@ List<Caracteristic> result = Lists.newArrayList(); while (sources.hasNext()) { Object[] source = sources.next(); - Caracteristic target = loadCaracteristic(source); - result.add(target); + Integer pmfmId = (Integer)source[0]; + // Skip some protected PSFM + if (!isProtectedCaracteristic(pmfmId)) { + Caracteristic target = loadCaracteristic(source); + result.add(target); + } } return result; } @@ -578,5 +582,20 @@ newStatus.setName(status.getName()); entity.setStatus(newStatus); } + + /** + * Return true if the pmfm should NOT be used for caracteristics lists + * (i.e. because used somewhere when storing some properties into the database) + * @param pmfmId + * @return + */ + protected boolean isProtectedCaracteristic(Integer pmfmId) { + return pmfmId.equals(enumeration.PMFM_ID_MULTIRIG_AGGREGATION) + || pmfmId.equals(enumeration.PMFM_ID_MULTIRIG_NUMBER) + || pmfmId.equals(enumeration.PMFM_ID_STATION_NUMBER) + || pmfmId.equals(enumeration.PMFM_ID_RECTILINEAR_OPERATION) + || pmfmId.equals(enumeration.PMFM_ID_HAUL_VALID) + || pmfmId.equals(enumeration.PMFM_ID_TRAWL_DISTANCE); + } } Modified: trunk/tutti-persistence-adagio/src/test/java/fr/ifremer/tutti/persistence/service/FishingOperationPersistenceServiceTest.java =================================================================== --- trunk/tutti-persistence-adagio/src/test/java/fr/ifremer/tutti/persistence/service/FishingOperationPersistenceServiceTest.java 2013-01-30 10:53:51 UTC (rev 265) +++ trunk/tutti-persistence-adagio/src/test/java/fr/ifremer/tutti/persistence/service/FishingOperationPersistenceServiceTest.java 2013-01-30 11:29:37 UTC (rev 266) @@ -45,6 +45,7 @@ import org.junit.ClassRule; import org.junit.Ignore; import org.junit.Test; +import org.springframework.beans.factory.annotation.Autowired; import org.springframework.dao.DataIntegrityViolationException; import com.google.common.collect.Lists; @@ -55,7 +56,6 @@ * @author tchemit <chemit(a)codelutin.com> * @since 0.3 */ -@Ignore public class FishingOperationPersistenceServiceTest { @ClassRule @@ -71,6 +71,8 @@ protected Cruise cruise = null; + @Autowired(required = true) + protected TuttiEnumerationFile enumeration; @Before public void setUp() throws Exception { @@ -82,9 +84,10 @@ } @Test - @Ignore public void getAllFishingOperation(/*String cruiseId*/) { - + List<FishingOperation> fishingOperations = service.getAllFishingOperation(dbResource.getFixtures().cruiseId()); + assertNotNull(fishingOperations); + assertTrue(fishingOperations.size() > 1); } @Test @@ -134,13 +137,16 @@ else if (caracteristic.getCaracteristicType() == CaracteristicType.TEXT) { value = "some text"; } - else if (caracteristic.getCaracteristicType() == CaracteristicType.QUALITATIVE) { - // Choose the first qualitative value - value = caracteristic.getQualitativeValue(0).getId(); + else if (caracteristic.getCaracteristicType() == CaracteristicType.QUALITATIVE + && caracteristic.getQualitativeValue(0) != null) { + // Choose the first qualitative value + value = caracteristic.getQualitativeValue(0).getId(); } - environmentCaracteristics.put(caracteristic, value); - if (environmentValuesOneEntry.size() == 0) { - environmentValuesOneEntry.put(caracteristic, value); + if (value != null) { + environmentCaracteristics.put(caracteristic, value); + if (environmentValuesOneEntry.size() == 0) { + environmentValuesOneEntry.put(caracteristic, value); + } } } @@ -156,13 +162,16 @@ else if (caracteristic.getCaracteristicType() == CaracteristicType.TEXT) { value = "some text"; } - else if (caracteristic.getCaracteristicType() == CaracteristicType.QUALITATIVE) { + else if (caracteristic.getCaracteristicType() == CaracteristicType.QUALITATIVE + && caracteristic.getQualitativeValue(0)!= null) { // Choose the first qualitative value value = caracteristic.getQualitativeValue(0).getId(); } - gearShootingCaracteristics.put(caracteristic, value); - if (gearShootingCaracteristicsOneEntry.size() == 0) { - gearShootingCaracteristicsOneEntry.put(caracteristic, value); + if (value != null) { + gearShootingCaracteristics.put(caracteristic, value); + if (gearShootingCaracteristicsOneEntry.size() == 0) { + gearShootingCaracteristicsOneEntry.put(caracteristic, value); + } } } @@ -400,4 +409,6 @@ public void saveFishingOperation(/*FishingOperation bean*/) { } + + } Modified: trunk/tutti-persistence-adagio/src/test/java/fr/ifremer/tutti/persistence/service/ReferentialPersistenceServiceTest.java =================================================================== --- trunk/tutti-persistence-adagio/src/test/java/fr/ifremer/tutti/persistence/service/ReferentialPersistenceServiceTest.java 2013-01-30 10:53:51 UTC (rev 265) +++ trunk/tutti-persistence-adagio/src/test/java/fr/ifremer/tutti/persistence/service/ReferentialPersistenceServiceTest.java 2013-01-30 11:29:37 UTC (rev 266) @@ -254,7 +254,7 @@ public void getAllCaracteristic() { List<Caracteristic> result = service.getAllCaracteristic(); Assert.assertNotNull(result); - Assert.assertEquals(488, result.size()); + Assert.assertEquals(482, result.size()); persistList(Caracteristic.class, ReferentialPersistenceServiceDevImpl.CaracteristicEnum.All.name(), result); assertSize(result, storage.getAllCaracteristic()); }

1 0

r265 - trunk/tutti-persistence-adagio/src/main/java/fr/ifremer/tutti/persistence/service
by blavenier＠users.forge.codelutin.com 30 Jan '13

30 Jan '13

Author: blavenier Date: 2013-01-30 11:53:51 +0100 (Wed, 30 Jan 2013) New Revision: 265 Url: http://forge.codelutin.com/projects/tutti/repository/revisions/265 Log: - Remove unused enumeration Modified: trunk/tutti-persistence-adagio/src/main/java/fr/ifremer/tutti/persistence/service/TuttiEnumerationFile.java Modified: trunk/tutti-persistence-adagio/src/main/java/fr/ifremer/tutti/persistence/service/TuttiEnumerationFile.java =================================================================== --- trunk/tutti-persistence-adagio/src/main/java/fr/ifremer/tutti/persistence/service/TuttiEnumerationFile.java 2013-01-30 10:39:43 UTC (rev 264) +++ trunk/tutti-persistence-adagio/src/main/java/fr/ifremer/tutti/persistence/service/TuttiEnumerationFile.java 2013-01-30 10:53:51 UTC (rev 265) @@ -164,10 +164,6 @@ @Value("${DepartmentId.UNKNOWN_RECORDER_DEPARTMENT}") public final Integer DEPARTMENT_ID_UNKNOWN_RECORDER_DEPARTMENT = null; - @Value("${VesselPersonRoleId.CRUISE_MANAGER}") - public final Integer VESSEL_PERSON_ROLE_ID_CRUISE_MANAGER = null; - - @Value("${PmfmId.AGE}") public final Integer PMFM_ID_AGE = null;

1 0

r264 - in trunk/tutti-persistence-adagio: . src/main/java/fr/ifremer/tutti/persistence/service src/main/resources src/test/java/fr/ifremer/tutti/persistence/service
by blavenier＠users.forge.codelutin.com 30 Jan '13

30 Jan '13

Author: blavenier Date: 2013-01-30 11:39:43 +0100 (Wed, 30 Jan 2013) New Revision: 264 Url: http://forge.codelutin.com/projects/tutti/repository/revisions/264 Log: ref refs #1920: [Persistence] Adagio Donnees thematiques - Change some PSFM ID in enumerations - Cruise : Add storage of managers and sort room managers (in FishingTrip.comments) - FishingOperation : Add storage of recorder persons (in Operation.comments) - FishingOperation : change 'name' content, to only use '<gearLabel><fishingOperationNumber>' as usual in Harmonie - FishingOperation : implements getAllFishingOperation to only retrieve mandatory properties (for combo) - Queries : speed up query on vessels, add fetch profile (for speciesBatchs) Modified: trunk/tutti-persistence-adagio/ trunk/tutti-persistence-adagio/src/main/java/fr/ifremer/tutti/persistence/service/AbstractPersistenceService.java trunk/tutti-persistence-adagio/src/main/java/fr/ifremer/tutti/persistence/service/CruisePersistenceServiceImpl.java trunk/tutti-persistence-adagio/src/main/java/fr/ifremer/tutti/persistence/service/FishingOperationPersistenceServiceImpl.java trunk/tutti-persistence-adagio/src/main/java/fr/ifremer/tutti/persistence/service/ProgramPersistenceServiceImpl.java trunk/tutti-persistence-adagio/src/main/java/fr/ifremer/tutti/persistence/service/SpeciesBatchPersistenceServiceImpl.java trunk/tutti-persistence-adagio/src/main/java/fr/ifremer/tutti/persistence/service/TuttiEnumerationFile.java trunk/tutti-persistence-adagio/src/main/resources/queries-override.hbm.xml trunk/tutti-persistence-adagio/src/main/resources/tutti-db-conf.properties trunk/tutti-persistence-adagio/src/main/resources/tutti-db-enumerations.properties trunk/tutti-persistence-adagio/src/test/java/fr/ifremer/tutti/persistence/service/CruisePersistenceServiceTest.java trunk/tutti-persistence-adagio/src/test/java/fr/ifremer/tutti/persistence/service/FishingOperationPersistenceServiceTest.java trunk/tutti-persistence-adagio/src/test/java/fr/ifremer/tutti/persistence/service/SpeciesBatchPersistenceServiceTest.java Property changes on: trunk/tutti-persistence-adagio ___________________________________________________________________ Modified: svn:ignore - target *.ipr *.iml *.iws .idea .classpath .project + target *.ipr *.iml *.iws .idea .classpath .project .settings Modified: trunk/tutti-persistence-adagio/src/main/java/fr/ifremer/tutti/persistence/service/AbstractPersistenceService.java =================================================================== --- trunk/tutti-persistence-adagio/src/main/java/fr/ifremer/tutti/persistence/service/AbstractPersistenceService.java 2013-01-30 09:56:33 UTC (rev 263) +++ trunk/tutti-persistence-adagio/src/main/java/fr/ifremer/tutti/persistence/service/AbstractPersistenceService.java 2013-01-30 10:39:43 UTC (rev 264) @@ -78,7 +78,14 @@ Object result = query.uniqueResult(); return (Object[]) result; } + + protected <T> T queryUniqueTyped(String queryName, Object... params) { + Query query = createQuery(queryName, params); + Object result = query.uniqueResult(); + return (T) result; + } + protected Iterator<Object[]> queryList(String queryName, Object... params) { Query query = createQuery(queryName, params); @@ -122,4 +129,13 @@ T load = (T) getCurrentSession().load(clazz, id); return load; } + + protected int queryUpdate(String queryName, Object... params) { + + Query query = createQuery(queryName, params); + + int result = query.executeUpdate(); + return result; + } + } Modified: trunk/tutti-persistence-adagio/src/main/java/fr/ifremer/tutti/persistence/service/CruisePersistenceServiceImpl.java =================================================================== --- trunk/tutti-persistence-adagio/src/main/java/fr/ifremer/tutti/persistence/service/CruisePersistenceServiceImpl.java 2013-01-30 09:56:33 UTC (rev 263) +++ trunk/tutti-persistence-adagio/src/main/java/fr/ifremer/tutti/persistence/service/CruisePersistenceServiceImpl.java 2013-01-30 10:39:43 UTC (rev 264) @@ -25,6 +25,7 @@ */ import java.sql.Timestamp; +import java.util.ArrayList; import java.util.Calendar; import java.util.Date; import java.util.GregorianCalendar; @@ -86,12 +87,12 @@ protected static String CRUISE_MISC_DATA_VESSELS_TAG = "#VESSELS="; - protected static String CRUISE_MISC_DATA_GEARS_TAG = "#GEARS="; - - protected static String CRUISE_MISC_DATA_TRAWL_NET_TAG = "#TRAWL_NET="; + protected static String CRUISE_MISC_DATA_MANAGERS_TAG = "#MANAGERS="; + protected static String CRUISE_MISC_DATA_SORT_MANAGERS_TAG = "#SORT_MANAGERS="; + @Autowired(required = true) - protected ReferentialPersistenceService referentielService; + protected ReferentialPersistenceService referentialService; @Autowired(required = true) protected ProgramPersistenceService programService; @@ -186,53 +187,21 @@ result.setEndDate((Date) source[7]); String vesselCode = (String) source[8]; - Vessel vessel = referentielService.getVessel(vesselCode); + Vessel vessel = referentialService.getVessel(vesselCode); result.setVessel(Lists.newArrayList(vessel)); Integer managerId = (Integer) source[9]; if (managerId != null && managerId.equals(enumeration.PERSON_ID_UNKNOWN_RECORDER_PERSON)) { result.setHeadOfMission(null); } else { - Person manager = referentielService.getPerson(managerId); + Person manager = referentialService.getPerson(managerId); result.setHeadOfMission(Lists.newArrayList(manager)); } - - + result.setComment((String) source[10]); String miscData = (String) source[11]; if (miscData != null && miscData.length() > 0) { - - // Retrieve trawl net - int trawlNetIndex = miscData.indexOf(CRUISE_MISC_DATA_TRAWL_NET_TAG); - if (trawlNetIndex != -1) { - String trawlNetStr = miscData.substring(trawlNetIndex + CRUISE_MISC_DATA_TRAWL_NET_TAG.length()).trim(); - miscData = miscData.substring(0, trawlNetIndex); - if (!trawlNetStr.isEmpty()) { - result.setTrawlNet(Integer.valueOf(trawlNetStr)); - } - } - - // Retrieve gears : - int gearTagIndex = miscData.indexOf(CRUISE_MISC_DATA_GEARS_TAG); - if (gearTagIndex == -1) { - result.setGear(null); - } else { - String gearIdsStr = miscData.substring(gearTagIndex + CRUISE_MISC_DATA_GEARS_TAG.length()).trim(); - miscData = miscData.substring(0, gearTagIndex); - if (gearIdsStr.isEmpty()) { - result.setGear(null); - } else { - List<Gear> gears = Lists.newArrayList(); - String[] gearIds = gearIdsStr.split(","); - for (int i = 0; i < gearIds.length; i++) { - Integer gearId = Integer.valueOf(gearIds[i]); - gears.add(referentielService.getGear(gearId)); - } - result.setGear(gears); - } - } - // Retrieve secondary vessels : int vesselTagIndex = miscData.indexOf(CRUISE_MISC_DATA_VESSELS_TAG); if (vesselTagIndex != -1) { @@ -242,25 +211,56 @@ String[] vesselCodes = vesselCodesStr.split(","); for (int i = 0; i < vesselCodes.length; i++) { vesselCode = vesselCodes[i]; - result.addVessel(referentielService.getVessel(vesselCode)); + result.addVessel(referentialService.getVessel(vesselCode)); } } } - } - + // Retrieve cruise managers + int managersIndex = miscData.indexOf(CRUISE_MISC_DATA_MANAGERS_TAG); + if (managersIndex != -1) { + String managersStr = miscData.substring(managersIndex + CRUISE_MISC_DATA_MANAGERS_TAG.length()).trim(); + miscData = miscData.substring(0, managersIndex); + if (!managersStr.isEmpty()) { + String[] managersArray = managersStr.split(","); + for (int i = 0; i < managersArray.length; i++) { + String personId = managersArray[i]; + Person person = referentialService.getPerson(Integer.valueOf(personId)); + result.getHeadOfMission().add(person); + } + } + } + + // Retrieve sort room managers + int sortManagersIndex = miscData.indexOf(CRUISE_MISC_DATA_SORT_MANAGERS_TAG); + if (sortManagersIndex != -1) { + String sortManagersStr = miscData.substring(sortManagersIndex + CRUISE_MISC_DATA_SORT_MANAGERS_TAG.length()).trim(); + miscData = miscData.substring(0, sortManagersIndex); + if (!sortManagersStr.isEmpty()) { + String[] managersArray = sortManagersStr.split(","); + List<Person> persons = new ArrayList<Person>(); + for (int i = 0; i < managersArray.length; i++) { + String personId = managersArray[i]; + Person person = referentialService.getPerson(Integer.valueOf(personId)); + persons.add(person); + } + result.setHeadOfSortRoom(persons); + } + } + } + // get secondary gears from fishingOperation (first load from Allegro DB only) if (result.getGear() == null) { Iterator<Object[]> list = queryList( "allCruiseGears", "cruiseId", IntegerType.INSTANCE, Integer.valueOf(id), - "pmfmIdTrawlNet", IntegerType.INSTANCE, enumeration.PMFM_ID_TRAWL_NET); + "pmfmIdTrawlNet", IntegerType.INSTANCE, enumeration.PMFM_ID_MULTIRIG_NUMBER); List<Gear> gears = Lists.newArrayList(); int maxTrawlNetFound = 0; while (list.hasNext()) { Object[] gearRow = list.next(); - Gear target = referentielService.getGear((Integer) gearRow[0]); + Gear target = referentialService.getGear((Integer) gearRow[0]); Float trawlNet = (Float) gearRow[1]; if (trawlNet != null && trawlNet.intValue() > maxTrawlNetFound) { maxTrawlNetFound = trawlNet.intValue(); @@ -269,7 +269,7 @@ } result.setGear(gears); if (maxTrawlNetFound > 0) { - result.setTrawlNet(maxTrawlNetFound); + result.setTrawlNet(maxTrawlNetFound); } } return result; @@ -316,10 +316,8 @@ } } else { fishingTrip = (ObservedFishingTrip)target.getFishingTrips().iterator().next(); - } + } - - // Name if (copyIfNull && source.getName() == null) { target.setName(null); @@ -333,7 +331,36 @@ } else if (source.getName() != null && source.getProgram().getId() != null) { target.setProgram(programDao.load(source.getProgram().getId())); } + + // Sort Room Managers + if (copyIfNull && (source.getHeadOfSortRoom() == null || source.getHeadOfSortRoom().size() == 0)) { + target.setManagerPerson(null); + } else if (source.getHeadOfSortRoom() != null && source.getHeadOfSortRoom().size() > 0) { + List<Person> persons = source.getHeadOfSortRoom(); + miscDataBuffer.append(CRUISE_MISC_DATA_SORT_MANAGERS_TAG); + for (int i = 0; i < persons.size(); i++) { + if (i > 0) miscDataBuffer.append(','); + miscDataBuffer.append(persons.get(i).getId()); + } + } + + // Managers + if (copyIfNull && (source.getHeadOfMission() == null || source.getHeadOfMission().size() == 0)) { + target.setManagerPerson(null); + } else if (source.getHeadOfMission() != null && source.getHeadOfMission().size() > 0) { + List<Person> persons = source.getHeadOfMission(); + target.setManagerPerson(personDao.load(Integer.valueOf(persons.get(0).getId()))); + if (persons.size() > 1) { + //throw new UnsupportedOperationException("Cruise could not yet support more than one vessel."); + miscDataBuffer.append(CRUISE_MISC_DATA_MANAGERS_TAG); + for (int i = 1; i < persons.size(); i++) { + if (i > 1) miscDataBuffer.append(','); + miscDataBuffer.append(persons.get(i).getId()); + } + } + } + // Vessel if (copyIfNull && (source.getVessel() == null || source.getVessel().size() == 0)) { target.setProgram(null); @@ -394,14 +421,11 @@ if (copyIfNull && (source.getHeadOfMission() == null || source.getHeadOfMission().size() == 0)) { target.setComments(null); } else if (source.getHeadOfMission() != null && source.getHeadOfMission().size() > 0) { - if (source.getHeadOfMission().size() == 1) { + if (source.getHeadOfMission().size() > 0) { Person managerPerson = source.getHeadOfMission().get(0); if (managerPerson.getId() != null) { target.setManagerPerson(personDao.load(Integer.valueOf(managerPerson.getId()))); } - } else { - // TODO : comment gérer dans le modèle Adagio plus d'un manager ? - throw new UnsupportedOperationException("Cruise could not yet support more than one manager person."); } } @@ -453,11 +477,9 @@ } // Gear - if (copyIfNull && source.isGearEmpty()) { - miscDataBuffer.append(CRUISE_MISC_DATA_GEARS_TAG); + if (copyIfNull && source.isGearEmpty() && fishingTrip.getGearPhysicalFeatures() != null) { + fishingTrip.getGearPhysicalFeatures().clear(); } else if (!source.isGearEmpty()) { - //throw new UnsupportedOperationException("Cruise could not yet support gears storage."); - miscDataBuffer.append(CRUISE_MISC_DATA_GEARS_TAG); for (int i = 0; i < source.getGear().size(); i++) { Gear gear = source.getGear().get(i); GearPhysicalFeatures guf = getGearPhysicalfeatures(fishingTrip, Integer.valueOf(gear.getId()), true); @@ -471,27 +493,14 @@ // Trawl net (store in Gear Physical features) if (copyIfNull && source.getTrawlNet() == null) { - removeGearPhysicalMeasurement(guf, enumeration.PMFM_ID_TRAWL_NET); + removeGearPhysicalMeasurement(guf, enumeration.PMFM_ID_MULTIRIG_NUMBER); } else { - setGearPhysicalMeasurement(target, guf, enumeration.PMFM_ID_TRAWL_NET, Float.valueOf(source.getTrawlNet()), null, null); + setGearPhysicalMeasurement(target, guf, enumeration.PMFM_ID_MULTIRIG_NUMBER, Float.valueOf(source.getTrawlNet()), null, null); } - - // TODO BLA : à supprimer : - if (i > 0) miscDataBuffer.append(','); - miscDataBuffer.append(source.getGear().get(i).getId()); } - } + } - // Trawl net (store in misc data) - if (copyIfNull && source.getTrawlNet() == null) { - miscDataBuffer.append(CRUISE_MISC_DATA_TRAWL_NET_TAG); - } else if (source.getTrawlNet() != null) { - //throw new UnsupportedOperationException("Cruise could not yet support gears storage."); - miscDataBuffer.append(CRUISE_MISC_DATA_TRAWL_NET_TAG); - miscDataBuffer.append(source.getTrawlNet()); - } - // Save miscDataBuffer into fishing trip comments, because it's not used in Allegro fishingTrip.setComments(miscDataBuffer.toString()); } @@ -518,11 +527,7 @@ GearPhysicalFeatures gearPhysicalFeature = GearPhysicalFeatures.Factory.newInstance(); gearPhysicalFeature.setFishingTrip(fishingTrip); - fr.ifremer.adagio.core.dao.referential.gear.Gear gear = (fr.ifremer.adagio.core.dao.referential.gear.Gear)getCurrentSession().load(GearImpl.class, gearId); - //fr.ifremer.adagio.core.dao.referential.gear.Gear gear = gearDao.load(gearId); - //if (gear == null) { - // throw new DataRetrievalFailureException("Gear not found with id=" + gearId); - //} + fr.ifremer.adagio.core.dao.referential.gear.Gear gear = (fr.ifremer.adagio.core.dao.referential.gear.Gear)getCurrentSession().load(GearImpl.class, gearId); gearPhysicalFeature.setGear(gear); if (fishingTrip.getGearPhysicalFeatures() == null) { fishingTrip.setGearPhysicalFeatures(Lists.newArrayList(gearPhysicalFeature)); @@ -603,4 +608,22 @@ return gearPhysicalMeasurement; } + + protected List<Person> getCruisePersonsByRole(String cruiseId, Integer vesselPersonRole) { + Iterator<Object[]> list = queryList( + "allCruiseManagers", + "cruiseId", IntegerType.INSTANCE, Integer.valueOf(cruiseId), + "vesselPersonRoleId", IntegerType.INSTANCE, vesselPersonRole); + + List<Person> persons = Lists.newArrayList(); + int maxTrawlNetFound = 0; + while (list.hasNext()) { + Object[] source = list.next(); + Person target = new Person(); + + persons.add(target); + } + + return persons; + } } Modified: trunk/tutti-persistence-adagio/src/main/java/fr/ifremer/tutti/persistence/service/FishingOperationPersistenceServiceImpl.java =================================================================== --- trunk/tutti-persistence-adagio/src/main/java/fr/ifremer/tutti/persistence/service/FishingOperationPersistenceServiceImpl.java 2013-01-30 09:56:33 UTC (rev 263) +++ trunk/tutti-persistence-adagio/src/main/java/fr/ifremer/tutti/persistence/service/FishingOperationPersistenceServiceImpl.java 2013-01-30 10:39:43 UTC (rev 264) @@ -46,9 +46,12 @@ import org.springframework.dao.DataRetrievalFailureException; import org.springframework.stereotype.Service; +import com.google.common.base.Preconditions; import com.google.common.collect.Lists; import com.google.common.collect.Sets; +import fr.ifremer.adagio.core.dao.data.batch.CatchBatch; +import fr.ifremer.adagio.core.dao.data.batch.denormalized.DenormalizedBatch; import fr.ifremer.adagio.core.dao.data.fishingArea.FishingArea; import fr.ifremer.adagio.core.dao.data.fishingArea.FishingArea2RegulationLocation; import fr.ifremer.adagio.core.dao.data.fishingArea.FishingArea2RegulationLocationPK; @@ -83,6 +86,7 @@ import fr.ifremer.tutti.persistence.entities.referential.Caracteristic; import fr.ifremer.tutti.persistence.entities.referential.CaracteristicType; import fr.ifremer.tutti.persistence.entities.referential.FishingOperationLocation; +import fr.ifremer.tutti.persistence.entities.referential.Person; /** * @author tchemit <chemit(a)codelutin.com> @@ -117,24 +121,75 @@ protected static Float DEFAULT_EMPTY_LONGITUDE = 0.0001f; - protected static String FISHING_OPERATION_NAME_SEPARATOR = " - "; + protected static String MISC_DATA_RECORDER_PERSONS_TAG = "#REC_PERSONS="; protected Calendar calendar = new GregorianCalendar(); @Override public List<FishingOperation> getAllFishingOperation(String cruiseId) { - return null; + Preconditions.checkNotNull(cruiseId); + + Iterator<Object[]> list = queryList( + "allFishingOperations", + "cruiseId", IntegerType.INSTANCE, Integer.valueOf(cruiseId) + ); + + List<FishingOperation> fishingOperations = new ArrayList<FishingOperation>(); + int fishingOperationRankOrder = 0; + while (list.hasNext()) { + Object[] source = list.next(); + fishingOperationRankOrder++; + + FishingOperation fishingOperation = new FishingOperation(); + int colIndex =0; + + // Id + fishingOperation.setId(((Integer)source[colIndex++]).toString()); + + // Fishing operation number : trying to retrieve from name + String name = (String)source[colIndex++]; + String gearLabel = (String)source[colIndex++]; + String fishingOperationNumberStr = null; + if (name != null && !name.isEmpty()) { + if (gearLabel != null && !gearLabel.isEmpty() + && name.startsWith(gearLabel)) { + fishingOperationNumberStr = name.substring(gearLabel.length()); + } + else { + fishingOperationNumberStr = name; + } + if (fishingOperationNumberStr.matches("\\d+")) { + fishingOperation.setFishingOperationNumber(Integer.valueOf(fishingOperationNumberStr)); + } + else { + // TODO BL : invalid op.name format : log ? + } + } + + // If not found, compute it using a counter (see "order by startDateTime" in HQL query) + if (fishingOperation.getFishingOperationNumber() == null) { + fishingOperation.setFishingOperationNumber(fishingOperationRankOrder); + } + + // Station number + String stationNumber = (String)source[colIndex++]; + fishingOperation.setStationNumber(stationNumber); + + // Trawl number net + Float trawlNetNumber = (Float)source[colIndex++]; + fishingOperation.setTrawlNetNumber(trawlNetNumber.intValue()); + + fishingOperations.add(fishingOperation); + } + return fishingOperations; } @Override public FishingOperation getFishingOperation(String id) { + Preconditions.checkNotNull(id); Object[] source = queryUnique( "fishingOperation", "fishingOperationId", IntegerType.INSTANCE, Integer.valueOf(id), - "pmfmIdTrawlDistance", IntegerType.INSTANCE, enumeration.PMFM_ID_TRAWL_DISTANCE, - "pmfmIdRectilinearOperation", IntegerType.INSTANCE, enumeration.PMFM_ID_RECTILINEAR_OPERATION, - "pmfmIdHaulValid", IntegerType.INSTANCE, enumeration.PMFM_ID_HAUL_VALID, - "pmfmIdTrawlNetNumber", IntegerType.INSTANCE, enumeration.PMFM_ID_TRAWL_NET_NUMBER, "locationLevelIdStrata", IntegerType.INSTANCE, enumeration.LOCATION_LEVEL_ID_STRATA, "locationLevelIdSubStrata", IntegerType.INSTANCE, enumeration.LOCATION_LEVEL_ID_SUB_STRATA, "locationLevelIdLocalite", IntegerType.INSTANCE, enumeration.LOCATION_LEVEL_ID_LOCALITE @@ -151,39 +206,63 @@ int colIndex=0; - // Name = StationNumber - FishingOperationNumber - TrawlNetNumber + // Name = <GearLabel><FishingOperationNumber> String name = (String)source[colIndex++]; - if (name != null) { - String[] nameInfos = name.split(FISHING_OPERATION_NAME_SEPARATOR); - if (nameInfos.length == 3) { - // Station number - result.setStationNumber(nameInfos[0]); - - // Fishing operation number - if (nameInfos[1].length() == 0) { - result.setFishingOperationNumber(null); - } - else { - result.setFishingOperationNumber(Integer.valueOf(nameInfos[1])); - } - // Trawl net number - if (nameInfos[2].length() == 0) { - result.setTrawlNetNumber(null); - } - else { - result.setTrawlNetNumber(Integer.valueOf(nameInfos[2])); - } + String gearLabel = (String)source[colIndex++]; + + String fishingOperationNumberStr = null; + if (name != null && !name.isEmpty()) { + if (gearLabel != null && !gearLabel.isEmpty() + && name.startsWith(gearLabel)) { + fishingOperationNumberStr = name.substring(gearLabel.length()); } + else { + fishingOperationNumberStr = name; + } + if (fishingOperationNumberStr.matches("\\d+")) { + result.setFishingOperationNumber(Integer.valueOf(fishingOperationNumberStr)); + } } + // If not found, compute it using a counter (see "order by startDateTime" in HQL query) + if (result.getFishingOperationNumber() == null) { + Integer fishingOperationRankOrder = queryUniqueTyped( + "fishingOperationRankOrder", + "fishingOperationId", IntegerType.INSTANCE, Integer.valueOf(id) + ); + result.setFishingOperationNumber(fishingOperationRankOrder); + } + // Start date result.setGearShootingStartDate(convertDatabase2UI((Timestamp) source[colIndex++])); // End date result.setGearShootingEndDate(convertDatabase2UI((Timestamp) source[colIndex++])); + // Misc data + String miscData = (String)source[colIndex++]; + + // Retrieve recorder persons + int recorderPersonsIndex = miscData.indexOf(MISC_DATA_RECORDER_PERSONS_TAG); + if (recorderPersonsIndex != -1) { + String recorderPersonsStr = miscData.substring(recorderPersonsIndex + MISC_DATA_RECORDER_PERSONS_TAG.length()).trim(); + miscData = miscData.substring(0, recorderPersonsIndex); + if (!recorderPersonsStr.isEmpty()) { + String[] recorderPersonsArray = recorderPersonsStr.split(","); + List<Person> persons = new ArrayList<Person>(); + for (int i = 0; i < recorderPersonsArray.length; i++) { + String personId = recorderPersonsArray[i]; + Person person = referentialService.getPerson(Integer.valueOf(personId)); + persons.add(person); + } + result.setSaisisseur(persons); + } + } + // Comment : - result.setComment((String) source[colIndex++]); + if (miscData != null && !miscData.isEmpty()) { + result.setComment(miscData); + } // Gear : Integer gearId = (Integer)source[colIndex++]; @@ -215,24 +294,6 @@ result.setGearShootingEndLongitude(DEFAULT_EMPTY_LONGITUDE.equals(endVesselPosition.getLongitude())?null:endVesselPosition.getLongitude()); } - // Trawl distance - result.setTrawlDistance((Float)source[colIndex++]); - - // Rectilinear operation ? - result.setFishingOperationRectiligne(enumeration.QUALITATIVE_RECTILINEAR_OPERATION_YES.equals((Integer)source[colIndex++])); - - // Haul valid ? - Integer haulValidQualitativeId = (Integer)source[colIndex++]; - //if (haulValidQualitativeId != null) { - // result.setFishingOperationValid((enumeration.QUALITATIVE_HAUL_VALID_YES.equals(haulValidQualitativeId))); - //} - - // Trawl net number (override the value found in the OP name) - Float trawlNetNumber = (Float)source[colIndex++]; - if (trawlNetNumber != null) { - result.setTrawlNetNumber(trawlNetNumber.intValue()); - } - // Strata : Integer strataId = (Integer)source[colIndex++]; if (strataId != null) { @@ -270,12 +331,10 @@ @Override public FishingOperation createFishingOperation(FishingOperation bean) { - if (bean == null) { - throw new IllegalArgumentException("fishingOperation could not be null"); - } - if (bean.getCruise() == null || bean.getCruise().getId() == null) { - throw new IllegalArgumentException("fishingOperation.getCruise() could not be null"); - } + Preconditions.checkNotNull(bean); + Preconditions.checkNotNull(bean.getCruise()); + Preconditions.checkNotNull(bean.getCruise().getId()); + getCurrentSession().setFlushMode(FlushMode.COMMIT); fr.ifremer.adagio.core.dao.data.operation.FishingOperation fishingOperation = fr.ifremer.adagio.core.dao.data.operation.FishingOperation.Factory.newInstance(); beanToEntity(bean, fishingOperation, true); @@ -287,15 +346,11 @@ @Override public FishingOperation saveFishingOperation(FishingOperation bean) { - if (bean == null) { - throw new IllegalArgumentException("fishingOperation could not be null"); - } - if (bean.getId() == null || bean.getId().isEmpty()) { - throw new IllegalArgumentException("fishingOperation.id could not be null"); - } - if (bean.getCruise() == null || bean.getCruise().getId() == null) { - throw new IllegalArgumentException("fishingOperation.getCruise() could not be null"); - } + Preconditions.checkNotNull(bean); + Preconditions.checkNotNull(bean.getId()); + Preconditions.checkNotNull(bean.getCruise()); + Preconditions.checkNotNull(bean.getCruise().getId()); + getCurrentSession().clear(); getCurrentSession().setFlushMode(FlushMode.COMMIT); fr.ifremer.adagio.core.dao.data.operation.FishingOperation fishingOperation = fishingOperationDao.load(Integer.valueOf(bean.getId())); @@ -383,9 +438,10 @@ String alphanumericalValue = (String)source[colIndex++]; Integer qualitativeValueId = (Integer)source[colIndex++]; - // Trawl distance - if (enumeration.PMFM_ID_TRAWL_NET_NUMBER.equals(pmfmId)) { - result.setTrawlNetNumber(numericalValue.intValue()); + // Trawl net number + if (enumeration.PMFM_ID_MULTIRIG_AGGREGATION.equals(pmfmId)) { + // TODO TC : passer la propriété trawlNetNumber en String + result.setTrawlNetNumber(Integer.valueOf(alphanumericalValue)); } // Gear Shooting Caracteristics @@ -411,6 +467,8 @@ } protected void beanToEntity(FishingOperation source, fr.ifremer.adagio.core.dao.data.operation.FishingOperation target, boolean copyIfNull) { + StringBuffer nameBuffer = new StringBuffer(); + // Retrieve entities : FishingTrip and ScientificCruise ScientificCruise scientificCruise = null; FishingTrip fishingTrip = target.getFishingTrip(); @@ -494,6 +552,7 @@ } else { gearPhysicalFeatures.getOperations().add(target); } + nameBuffer.append(source.getGear().getLabel()); } // Retrieve entities : Fishing Area @@ -510,63 +569,53 @@ } else { fishingArea = gearUseFeatures.getFishingAreas().iterator().next(); // Reset all other fishing areas - } + } + // Retrieve entities : CatchBatch + /*CatchBatch catchBatch = target.getCatchBatch(); + if (catchBatch == null) { + catchBatch = CatchBatch.Factory.newInstance(); + catchBatch.setFishingOperation(target); + target.setCatchBatch(catchBatch); + }*/ + // Retrieve trawl net, from Gear physical features int trawlNet = 1; // default value - GearPhysicalMeasurement gpmTrawlNet = measurementService.getGearPhysicalMeasurement(gearPhysicalFeatures, enumeration.PMFM_ID_TRAWL_NET); + GearPhysicalMeasurement gpmTrawlNet = measurementService.getGearPhysicalMeasurement(gearPhysicalFeatures, enumeration.PMFM_ID_MULTIRIG_NUMBER); if (gpmTrawlNet != null && gpmTrawlNet.getNumericalValue() != null) { trawlNet = gpmTrawlNet.getNumericalValue().intValue(); - } + } - StringBuffer nameBuffer = new StringBuffer(); - // StationNumber if (copyIfNull && source.getStationNumber() == null) { - //setVesselUseMeasurement(scientificCruise, vesselUseFeatures, enumeration.PMFM_ID_STATION_NUMBER, null, "", null); + // Nothing to do : will be removed using the list notChangedVesselUseMeasurements } else if (source.getStationNumber() != null) { VesselUseMeasurement vum = setVesselUseMeasurement(scientificCruise, vesselUseFeatures, enumeration.PMFM_ID_STATION_NUMBER, null, source.getStationNumber(), null); notChangedVesselUseMeasurements.remove(vum); - - nameBuffer.append(source.getStationNumber()); } // OP N° if (copyIfNull && source.getFishingOperationNumber() == null) { // Leave empty in the name buffer - if (nameBuffer.length() > 0) { - nameBuffer.append(FISHING_OPERATION_NAME_SEPARATOR); - } } else if (source.getFishingOperationNumber() != null) { - if (nameBuffer.length() > 0) { - nameBuffer.append(FISHING_OPERATION_NAME_SEPARATOR); - } nameBuffer.append(source.getFishingOperationNumber()); - } - + } + target.setName(nameBuffer.toString()); + // Trawl net number if (copyIfNull && source.getTrawlNetNumber() == null) { // Nothing to do : will be removed later, using notChangedGearUseMeasurements - if (nameBuffer.length() > 0) { - nameBuffer.append(FISHING_OPERATION_NAME_SEPARATOR); - } } else if (source.getTrawlNetNumber() != null) { + // TODO TC : change the property into String + // TODO BLA : Then parse the String and validate content if (source.getTrawlNetNumber().intValue() > trawlNet) { throw new DataIntegrityViolationException("An operation could not have a 'trawl net number' greater than 'trawl net' defined in the cruise."); } // Store into Gear Use Features - GearUseMeasurement gum = setGearUseMeasurement(scientificCruise, gearUseFeatures, enumeration.PMFM_ID_TRAWL_NET_NUMBER, Float.valueOf(source.getTrawlNetNumber()), null, null); - notChangedGearUseMeasurements.remove(gum); - - // Store into the name attribute : - if (nameBuffer.length() > 0) { - nameBuffer.append(FISHING_OPERATION_NAME_SEPARATOR); - } - nameBuffer.append(source.getTrawlNetNumber()); + GearUseMeasurement gum = setGearUseMeasurement(scientificCruise, gearUseFeatures, enumeration.PMFM_ID_MULTIRIG_AGGREGATION, null, source.getTrawlNetNumber().toString(), null); + notChangedGearUseMeasurements.remove(gum); } - target.setName(nameBuffer.toString()); - // Start date : if (copyIfNull && source.getGearShootingStartDate() == null) { target.setStartDateTime(null); @@ -607,18 +656,11 @@ // Operation is valid ? if (copyIfNull && source.getFishingOperationValid() == null) { - removeVesselUseMeasurement(vesselUseFeatures, enumeration.PMFM_ID_HAUL_VALID); + // Nothing to do : will be removed later, using notChangedVesselUseMeasurements } else if (source.getFishingOperationValid() != null) { VesselUseMeasurement vum = setVesselUseMeasurement(scientificCruise, vesselUseFeatures, enumeration.PMFM_ID_HAUL_VALID, null, null, source.getFishingOperationValid().booleanValue()?enumeration.QUALITATIVE_HAUL_VALID_YES:enumeration.QUALITATIVE_HAUL_VALID_NO); notChangedVesselUseMeasurements.remove(vum); } - - // Comment - if (copyIfNull && source.getComment() == null) { - target.setComments(null); - } else if (source.getComment() != null) { - target.setComments(source.getComment()); - } // Vessel target.setVessel(fishingTrip.getVessel()); @@ -757,8 +799,32 @@ } } - // Removed unecessary Vessel Use Measurement + // Recorder persons + StringBuffer miscDataBuffer = new StringBuffer(); + if (copyIfNull && (source.getSaisisseur() == null || source.getSaisisseur().size() == 0)) { + miscDataBuffer.append(MISC_DATA_RECORDER_PERSONS_TAG); + } else if (source.getSaisisseur() != null && source.getSaisisseur().size() > 0) { + List<Person> persons = source.getSaisisseur(); + miscDataBuffer.append(MISC_DATA_RECORDER_PERSONS_TAG); + for (int i = 0; i < persons.size(); i++) { + if (i > 0) miscDataBuffer.append(','); + miscDataBuffer.append(persons.get(i).getId()); + } + } + // Store misc data into comments + if (copyIfNull && source.getComment() == null) { + // Store only misc data : + target.setComments(miscDataBuffer.toString()); + } else if (source.getComment() != null) { + // Store comment + misc data + target.setComments(source.getComment() + miscDataBuffer.toString()); + } + + // ---------------------------------------------------------------- + // Removed unecessary *UseMeasurement : --- + // ---------------------------------------------------------------- + // Gear shooting Caracteristics CaracteristicMap gearShootingCaracteristics = source.getGearShootingCaracteristics(); if (copyIfNull && gearShootingCaracteristics == null || gearShootingCaracteristics.size() == 0) { @@ -783,6 +849,10 @@ } } + // ---------------------------------------------------------------- + // Fishing Area : Strata, substrata, localite --- + // ---------------------------------------------------------------- + // Fishing Area : Integer statisticalLocationId = null; if (source.getGearShootingStartLatitude() != null && source.getGearShootingStartLongitude() != null) { @@ -980,16 +1050,6 @@ return vesselUseMeasurement; } - protected void removeVesselUseMeasurement(VesselUseFeatures vesselUseFeatures, - Integer pmfmId) { - VesselUseMeasurement vesselUseMeasurement = getVesselUseMeasurement(null, vesselUseFeatures, pmfmId, false); - if (vesselUseMeasurement == null) { - return; - } - vesselUseFeatures.getVesselUseMeasurements().remove(vesselUseMeasurement); - // TOBO BLa : vérifier qu'il ne faut pas dao.delete() en plus - } - protected VesselUseMeasurement setVesselUseMeasurement(ScientificCruise scientificCruise, VesselUseFeatures vesselUseFeatures, Integer pmfmId, Float numericalValue, @@ -1043,7 +1103,14 @@ measurement.setNumericalValue((Float)value); } else if (caracteristic.getCaracteristicType() == CaracteristicType.QUALITATIVE) { - QualitativeValue qv = (QualitativeValue)getCurrentSession().load(QualitativeValueImpl.class, Integer.valueOf((String)value)); + Integer qvId = null; + if (value instanceof Integer) { + qvId = (Integer)value; + } + else { + qvId = Integer.valueOf(value.toString()); + } + QualitativeValue qv = load(QualitativeValueImpl.class, qvId); measurement.setQualitativeValue(qv); } } @@ -1109,13 +1176,17 @@ return gearUseMeasurement; } - protected void removeGearUseMeasurement(GearUseFeatures gearUseFeatures, - Integer pmfmId) { - GearUseMeasurement gearUseMeasurement = getGearUseMeasurement(null, gearUseFeatures, pmfmId, false); - if (gearUseMeasurement == null) { - return; - } - gearUseFeatures.getGearUseMeasurements().remove(gearUseMeasurement); - // TOBO BLa : vérifier qu'il ne faut pas dao.delete() en plus + protected DenormalizedBatch getDenormalizedBatch(Integer fishingOperationId) { + Iterator<DenormalizedBatch> list = queryListTyped( + "fishingOperationBatchs", + "fishingOperationId", IntegerType.INSTANCE, Integer.valueOf(fishingOperationId) + ); + + CaracteristicMap environmentCaracteristics = new CaracteristicMap(); + while (list.hasNext()) { + DenormalizedBatch batch = list.next(); + System.out.println(batch.getTreeIndent() + batch.getSortingValuesText()); + } + return null; } } Modified: trunk/tutti-persistence-adagio/src/main/java/fr/ifremer/tutti/persistence/service/ProgramPersistenceServiceImpl.java =================================================================== --- trunk/tutti-persistence-adagio/src/main/java/fr/ifremer/tutti/persistence/service/ProgramPersistenceServiceImpl.java 2013-01-30 09:56:33 UTC (rev 263) +++ trunk/tutti-persistence-adagio/src/main/java/fr/ifremer/tutti/persistence/service/ProgramPersistenceServiceImpl.java 2013-01-30 10:39:43 UTC (rev 264) @@ -67,6 +67,8 @@ "program", "programCode", StringType.INSTANCE, id); + if (source == null) return null; + Program result = new Program(); result.setId((String) source[0]); result.setName((String) source[1]); Modified: trunk/tutti-persistence-adagio/src/main/java/fr/ifremer/tutti/persistence/service/SpeciesBatchPersistenceServiceImpl.java =================================================================== --- trunk/tutti-persistence-adagio/src/main/java/fr/ifremer/tutti/persistence/service/SpeciesBatchPersistenceServiceImpl.java 2013-01-30 09:56:33 UTC (rev 263) +++ trunk/tutti-persistence-adagio/src/main/java/fr/ifremer/tutti/persistence/service/SpeciesBatchPersistenceServiceImpl.java 2013-01-30 10:39:43 UTC (rev 264) @@ -24,48 +24,192 @@ * #L% */ -import fr.ifremer.tutti.persistence.entities.data.SpeciesBatch; -import fr.ifremer.tutti.persistence.entities.data.SpeciesBatchFrequency; +import java.io.Serializable; +import java.util.HashSet; +import java.util.Iterator; +import java.util.List; +import java.util.Set; + +import javax.annotation.Resource; + import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; +import org.hibernate.FlushMode; +import org.hibernate.type.IntegerType; +import org.springframework.dao.DataIntegrityViolationException; +import org.springframework.dao.DataRetrievalFailureException; import org.springframework.stereotype.Service; -import java.util.List; +import com.google.common.base.Preconditions; +import com.google.common.collect.Sets; +import fr.ifremer.adagio.core.dao.administration.user.DepartmentImpl; +import fr.ifremer.adagio.core.dao.data.batch.Batch; +import fr.ifremer.adagio.core.dao.data.batch.BatchImpl; +import fr.ifremer.adagio.core.dao.data.batch.CatchBatch; +import fr.ifremer.adagio.core.dao.data.batch.CatchBatchDao; +import fr.ifremer.adagio.core.dao.data.batch.CatchBatchImpl; +import fr.ifremer.adagio.core.dao.data.batch.SortingBatch; +import fr.ifremer.adagio.core.dao.data.batch.SortingBatchDao; +import fr.ifremer.adagio.core.dao.data.batch.denormalized.DenormalizedBatch; +import fr.ifremer.adagio.core.dao.data.batch.denormalized.DenormalizedBatchDao; +import fr.ifremer.adagio.core.dao.data.batch.denormalized.DenormalizedBatchImpl; +import fr.ifremer.adagio.core.dao.data.measure.Measurement; +import fr.ifremer.adagio.core.dao.data.measure.QuantificationMeasurement; +import fr.ifremer.adagio.core.dao.data.measure.SortingMeasurement; +import fr.ifremer.adagio.core.dao.data.measure.VesselUseMeasurement; +import fr.ifremer.adagio.core.dao.data.operation.FishingOperationImpl; +import fr.ifremer.adagio.core.dao.data.survey.scientificCruise.ScientificCruise; +import fr.ifremer.adagio.core.dao.data.vessel.feature.use.VesselUseFeatures; +import fr.ifremer.adagio.core.dao.referential.QualityFlagImpl; +import fr.ifremer.adagio.core.dao.referential.pmfm.PmfmImpl; +import fr.ifremer.adagio.core.dao.referential.pmfm.QualitativeValue; +import fr.ifremer.adagio.core.dao.referential.pmfm.QualitativeValueImpl; +import fr.ifremer.adagio.core.dao.referential.taxon.ReferenceTaxon; +import fr.ifremer.adagio.core.dao.referential.taxon.ReferenceTaxonImpl; +import fr.ifremer.adagio.core.dao.technical.synchronization.SynchronizationStatus; +import fr.ifremer.tutti.persistence.entities.data.FishingOperation; +import fr.ifremer.tutti.persistence.entities.data.SampleCategoryEnum; +import fr.ifremer.tutti.persistence.entities.data.SpeciesBatch; +import fr.ifremer.tutti.persistence.entities.data.SpeciesBatchFrequency; +import fr.ifremer.tutti.persistence.entities.referential.Caracteristic; +import fr.ifremer.tutti.persistence.entities.referential.CaracteristicType; +import fr.ifremer.tutti.persistence.entities.referential.Species; + /** * @author tchemit <chemit(a)codelutin.com> * @since 0.3 */ @Service("speciesBatchPersistenceService") -public class SpeciesBatchPersistenceServiceImpl extends AbstractPersistenceService implements SpeciesBatchPersistenceService { +public class SpeciesBatchPersistenceServiceImpl extends + AbstractPersistenceService implements SpeciesBatchPersistenceService { /** Logger. */ - private static final Log log = - LogFactory.getLog(SpeciesBatchPersistenceServiceImpl.class); + private static final Log log = LogFactory + .getLog(SpeciesBatchPersistenceServiceImpl.class); + @Resource(name = "referentialPersistenceService") + protected ReferentialPersistenceService referentialService; + + @Resource(name = "denormalizedBatchDao") + protected DenormalizedBatchDao denormalizedBatchDao; + + @Resource(name = "sortingBatchDao") + protected SortingBatchDao sortingBatchDao; + + @Resource(name = "catchBatchDao") + protected CatchBatchDao catchBatchDao; + @Override public List<SpeciesBatch> getAllRootSpeciesBatch(String fishingOperationId) { - return null; + return null; } @Override public List<SpeciesBatch> getAllSpeciesBatch(String fishingOperationId) { - return null; + return null; } @Override public SpeciesBatch getSpeciesBatch(String id) { - return null; + Object[] source = queryUnique("speciesBatch", + "batchId", IntegerType.INSTANCE, Integer.valueOf(id)); + + if (source == null) { + throw new DataRetrievalFailureException("Could not retrieve speciesBatch with id=" + id); + } + SpeciesBatch result = new SpeciesBatch(); + result.setId(id); + + int colIndex = 0; + // Individual count + result.setNumber((Integer)source[colIndex++]); + + // Weight & sampleCategory Weight + Float sampleWeight = (Float)source[colIndex++]; + Float samplingRatio = (Float)source[colIndex++]; + String samplingRatioText = (String)source[colIndex++]; + if (samplingRatio == null) { + result.setWeight(sampleWeight); + } + else { + String startStr = sampleWeight.toString().replace(',', '.') + "/"; + if (samplingRatioText != null && samplingRatioText.startsWith(startStr)) { + String weightStr = samplingRatioText.substring(startStr.length()); + if (weightStr != null && !weightStr.isEmpty()) { + result.setSampleCategoryWeight(sampleWeight); + result.setWeight(Float.parseFloat(weightStr)); + } + } + } + + // Comments + result.setComment((String)source[colIndex++]); + + // Sample category type + Integer pmfmId = (Integer)source[colIndex++]; + if (pmfmId != null) { + SampleCategoryEnum sampleCategory = pmfmId2SampleCategory(pmfmId); + result.setSampleCategoryType(sampleCategory); + } + + // Sample category value + Integer qvValue = (Integer)source[colIndex++]; + Float numValue = (Float)source[colIndex++]; + String alphaValue = (String)source[colIndex++]; + Serializable value = (qvValue!=null)?qvValue.toString():((numValue!=null)?numValue:alphaValue); + result.setSampleCategoryValue(value); + + // Species + Integer referenceTaxonId = (Integer)source[colIndex++]; + if (referenceTaxonId !=null) { + Species species = new Species(); + species.setId(referenceTaxonId.toString()); + result.setSpecies(species); + } + + return result; } @Override - public SpeciesBatch createSpeciesBatch(SpeciesBatch bean, String parentBatchId) { - return null; + public SpeciesBatch createSpeciesBatch(SpeciesBatch bean, + String parentBatchId) { + Preconditions.checkNotNull(bean); + Preconditions.checkArgument(bean.getId() == null); + Preconditions.checkNotNull(bean.getSpecies()); + Preconditions.checkNotNull(bean.getSpecies().getId()); + + SortingBatch batch = SortingBatch.Factory.newInstance(); + beanToEntity(bean, batch, parentBatchId, true); + batch = sortingBatchDao.create(batch); + + // DenormalizedBatch denormalizedBatch = + // DenormalizedBatch.Factory.newInstance(); + // denormalizedBatch.setId((long)batch.getId()); + // beanToEntity(bean, denormalizedBatch, parentBatchId, true); + // denormalizedBatchDao.create(denormalizedBatch); + + bean.setId(String.valueOf(batch.getId())); + return bean; } @Override public SpeciesBatch saveSpeciesBatch(SpeciesBatch bean) { - return null; + Preconditions.checkNotNull(bean); + Preconditions.checkNotNull(bean.getId()); + + getCurrentSession().clear(); + getCurrentSession().enableFetchProfile("batch-with-measurements"); + getCurrentSession().setFlushMode(FlushMode.COMMIT); + SortingBatch batch = sortingBatchDao.load(Integer.valueOf(bean.getId())); + String parentBatchId = null; + if (bean.getParentBatch() != null) { + parentBatchId=bean.getParentBatch().getId(); + } + beanToEntity(bean, batch, parentBatchId, true); + sortingBatchDao.update(batch); + getCurrentSession().flush(); + return bean; } @Override @@ -77,12 +221,450 @@ } @Override - public List<SpeciesBatchFrequency> getAllSpeciesBatchFrequency(String speciesBatchId) { - return null; + public List<SpeciesBatchFrequency> getAllSpeciesBatchFrequency( + String speciesBatchId) { + return null; } @Override - public List<SpeciesBatchFrequency> saveSpeciesBatchFrequency(String speciesBatchId, List<SpeciesBatchFrequency> frequencies) { - return null; + public List<SpeciesBatchFrequency> saveSpeciesBatchFrequency( + String speciesBatchId, List<SpeciesBatchFrequency> frequencies) { + return null; } + + // ------------------------------------------------------------------------// + // -- Internal methods --// + // ------------------------------------------------------------------------// + protected void beanToEntity(SpeciesBatch source, SortingBatch target, String parentBatchId, boolean copyIfNull) { + Preconditions.checkNotNull(source.getFishingOperation()); + Preconditions.checkNotNull(source.getFishingOperation().getId()); + + // Retrieve recorder department + // TODO BLA : prendre le service du 1er saisisseur ? + Integer recorderDepartmentId = enumeration.DEPARTMENT_ID_UNKNOWN_RECORDER_DEPARTMENT; + + // Retrieve entity Root batch + Integer fishingOperationId = Integer.valueOf(source.getFishingOperation().getId()); + Integer rootBatchId = getRootBatchId(fishingOperationId); + if (rootBatchId == null) { + CatchBatch rootBatch = CatchBatch.Factory.newInstance(); + rootBatch.setFishingOperation(load(FishingOperationImpl.class, fishingOperationId)); + rootBatch.setQualityFlag(load(QualityFlagImpl.class, enumeration.QUALITY_FLAG_CODE_NOT_QUALIFIED)); + rootBatch.setRankOrder((short)1); + rootBatch.setSynchronizationStatus(SynchronizationStatus.DIRTY.getValue()); + rootBatch = catchBatchDao.create(rootBatch); + rootBatchId = rootBatch.getId(); + target.setRootBatch(rootBatch); + + //fr.ifremer.adagio.core.dao.data.operation.FishingOperation operation = load(FishingOperationImpl.class, fishingOperationId); + //operation.setCatchBatch(rootBatch); + getCurrentSession().flush(); + int rowUpdated = queryUpdate("updateFishingOperationCatchBatch", + "fishingOperationId", IntegerType.INSTANCE, fishingOperationId, + "catchBatchId", IntegerType.INSTANCE, rootBatchId); + if (rowUpdated == 0) { + throw new DataIntegrityViolationException("Could not attach catch batch to the given operation : operation was not found."); + } + } + else { + target.setRootBatch(load(CatchBatchImpl.class, Integer.valueOf(rootBatchId))); + } + + // Parent batch + Integer targetParentBatchId = null;; + if (parentBatchId == null || parentBatchId.isEmpty()) { + targetParentBatchId = rootBatchId; + } + else { + targetParentBatchId = Integer.valueOf(parentBatchId); + } + if (copyIfNull && targetParentBatchId == null) { + target.setParentBatch(null); + } + else if (targetParentBatchId != null){ + target.setParentBatch(load(BatchImpl.class, targetParentBatchId)); + } + + // RankOrder + if (target.getRankOrder() == null) { + short rankOrder = (short)1; + if (source.getParentBatch() != null && source.getParentBatch().getChildBatchs() != null) { + // TODO BL : vérifier cela (est-ce que l'item est ajouté à son père AVANT d'être passé au service ?) + rankOrder = (short)source.getParentBatch().getChildBatchs().size(); + } + target.setRankOrder(rankOrder); + } + + // Create lists to store all updates, then remove not updated items + Set<QuantificationMeasurement> notChangedQuantificationMeasurements = new HashSet<QuantificationMeasurement>(); + if (target.getQuantificationMeasurements() != null) { + notChangedQuantificationMeasurements.addAll(target.getQuantificationMeasurements()); + } + Set<SortingMeasurement> notChangedSortingMeasurements = new HashSet<SortingMeasurement>(); + if (target.getSortingMeasurements() != null) { + notChangedSortingMeasurements.addAll(target.getSortingMeasurements()); + } + + // Weight or SampleCategoryWeight + if (copyIfNull && source.getWeight() == null) { + // Nothing to do : will be removed later, using notChangedSortingMeasurements + } + else if (source.getSampleCategoryWeight() != null){ + QuantificationMeasurement quantificationMeasurement = setQuantificationMeasurement(target, enumeration.PMFM_ID_WEIGHT_MEASURED, recorderDepartmentId, source.getSampleCategoryWeight(), true); + notChangedQuantificationMeasurements.remove(quantificationMeasurement); + } + else if (source.getWeight() != null){ + QuantificationMeasurement quantificationMeasurement = setQuantificationMeasurement(target, enumeration.PMFM_ID_WEIGHT_MEASURED, recorderDepartmentId, source.getWeight(), true); + notChangedQuantificationMeasurements.remove(quantificationMeasurement); + } + + // Sampling Ratio + if (copyIfNull && (source.getSampleCategoryWeight() == null || source.getWeight() == null)) { + target.setSamplingRatio(null); + target.setSamplingRatioText(null); + } + else if (source.getSampleCategoryWeight() != null && source.getWeight() != null) { + String samplingRatioText = source.getSampleCategoryWeight() + "/" + source.getWeight(); + samplingRatioText = samplingRatioText.replaceAll(",", "."); + target.setSamplingRatioText(samplingRatioText); + target.setSamplingRatio(source.getSampleCategoryWeight().floatValue() / source.getWeight().floatValue()); + } + + // SampleCategoryWeight + if (copyIfNull && (source.getSampleCategoryType() == null || source.getSampleCategoryValue() == null)) { + // Nothing to do : will be removed later, using notChangedSortingMeasurements + } + else if (source.getSampleCategoryType() != null && source.getSampleCategoryValue() != null) { + SortingMeasurement sortingMeasurement = setSortingMeasurement(target, recorderDepartmentId, source.getSampleCategoryType(), source.getSampleCategoryValue()); + notChangedSortingMeasurements.remove(sortingMeasurement); + } + + // Individual count + if (copyIfNull && source.getNumber() == null) { + target.setIndividualCount(null); + } + else if (source.getNumber() != null){ + target.setIndividualCount(source.getNumber()); + } + + // Species + if (copyIfNull && (source.getSpecies() == null || parentBatchId != null)) { + target.setReferenceTaxon(null); + } + else if (source.getSpecies() != null && parentBatchId == null){ + ReferenceTaxon referenceTaxon = load(ReferenceTaxonImpl.class, Integer.valueOf(source.getSpecies().getId())); + target.setReferenceTaxon(referenceTaxon); + } + + // QualityFlag + if (source.isSpeciesToConfirm()) { + target.setQualityFlag(load(QualityFlagImpl.class, enumeration.QUALITY_FLAG_CODE_DOUBTFUL)); + } + else { + target.setQualityFlag(load(QualityFlagImpl.class, enumeration.QUALITY_FLAG_CODE_NOT_QUALIFIED)); + } + + // Comments + if (copyIfNull && source.getComment() == null) { + target.setComments(null); + } + else if (source.getComment() != null){ + target.setComments(source.getComment()); + } + + // Removed not changed measurements (in sorting and quantification measurement lists) + if (target.getQuantificationMeasurements() != null && notChangedQuantificationMeasurements.size() > 0) { + for (QuantificationMeasurement qm : notChangedQuantificationMeasurements) { + target.getQuantificationMeasurements().remove(qm); + } + } + if (target.getSortingMeasurements() != null && notChangedSortingMeasurements.size() > 0) { + for (SortingMeasurement sm : notChangedSortingMeasurements) { + target.getSortingMeasurements().remove(sm); + } + } + } + + protected void beanToEntity(SpeciesBatch source, DenormalizedBatch target, + String parentBatchId, boolean copyIfNull) { + + // Parent batch + if (copyIfNull && parentBatchId == null) { + target.setParentBatch(null); + ; + } else if (parentBatchId != null) { + target.setParentBatch(load(DenormalizedBatchImpl.class, + Integer.valueOf(parentBatchId))); + } + + // Weight + if (copyIfNull && source.getWeight() == null) { + target.setWeight(null); + } else if (source.getWeight() != null) { + target.setWeight(source.getWeight()); + } + + // SampleCategoryWeight + if (copyIfNull + && (source.getSampleCategoryWeight() == null || source + .getWeight() == null)) { + target.setSamplingRatio(null); + target.setSamplingRatioText(null); + } else if (source.getSampleCategoryWeight() != null + && source.getWeight() != null) { + String samplingRatioText = source.getSampleCategoryWeight() + "/" + + source.getWeight(); + samplingRatioText = samplingRatioText.replaceAll(",", "."); + target.setSamplingRatioText(samplingRatioText); + target.setSamplingRatio(source.getSampleCategoryWeight() + .floatValue() / source.getWeight().floatValue()); + } + + // Rank order + if (copyIfNull && source.getNumber() == null) { + target.setRankOrder(null); + target.setFlatRankOrder(null); + } else if (source.getNumber() != null) { + target.setRankOrder(Short.valueOf(source.getNumber().toString())); + } + + // Flat rank order + target.setFlatRankOrder(target.getRankOrder()); + + // Tree level + if (parentBatchId == null) { + // TODO BLA : à confirmer une fois l'arbre d'échantillonnage créé + target.setTreeLevel((short) 2); + } else { + short treeLevel = 1; + SpeciesBatch item = source; + do { + treeLevel++; + item = item.getParentBatch(); + } while (item != null); + target.setTreeLevel(treeLevel); + } + + // Species + if (copyIfNull && source.getSpecies() == null) { + target.setReferenceTaxon(null); + target.setInheritedReferenceTaxon(null); + } else if (source.getSpecies() != null) { + ReferenceTaxon referenceTaxon = load(ReferenceTaxonImpl.class, + Integer.valueOf(source.getSpecies().getId())); + if (source.getParentBatch() == null) { + target.setReferenceTaxon(referenceTaxon); + // TODO BLA : vérifier que sous Allegro on affecte aussi + // inherited quand + // une valeur non héritée a été saisie. + target.setInheritedReferenceTaxon(referenceTaxon); + } else { + target.setInheritedReferenceTaxon(referenceTaxon); + target.setReferenceTaxon(null); + } + } + + // QualityFlag (using SpeciesToConfirm) + if (source.isSpeciesToConfirm()) { + target.setQualityFlag(load(QualityFlagImpl.class, + enumeration.QUALITY_FLAG_CODE_DOUBTFUL)); + } else { + target.setQualityFlag(load(QualityFlagImpl.class, + enumeration.QUALITY_FLAG_CODE_NOT_QUALIFIED)); + } + + // Comments + if (copyIfNull && source.getComment() == null) { + target.setComments(null); + } else if (source.getComment() != null) { + target.setComments(source.getComment()); + } + + // Other mandatory properties : + target.setIsLanding(false); + target.setIsDiscard(false); + } + + public Integer getRootBatchId(Integer fishingOperationId) { + Integer catchBatchId = queryUniqueTyped("fishingOperationCatchBatch", + "fishingOperationId", IntegerType.INSTANCE, fishingOperationId); + return catchBatchId; + } + + protected QuantificationMeasurement setQuantificationMeasurement( + Batch batch, Integer pmfmId, Integer recorderDepartmentId, + Float weightValue, boolean isReferenceSorting) { + QuantificationMeasurement quantificationMeasurement = getQuantificationMeasurement( + batch, pmfmId, recorderDepartmentId, true); + + quantificationMeasurement.setNumericalValue(weightValue); + quantificationMeasurement + .setIsReferenceQuantification(isReferenceSorting); + return quantificationMeasurement; + } + + protected QuantificationMeasurement getQuantificationMeasurement( + Batch batch, Integer pmfmId, Integer recorderDepartmentId, + boolean createIfNotExists) { + QuantificationMeasurement quantificationMeasurement = null; + if (batch.getQuantificationMeasurements() != null) { + for (Iterator iterator = batch + .getQuantificationMeasurements().iterator(); iterator + .hasNext();) { + QuantificationMeasurement qm = (QuantificationMeasurement) iterator + .next(); + if (pmfmId.equals(qm.getPmfm().getId())) { + quantificationMeasurement = qm; + break; + } + } + } + if (quantificationMeasurement == null) { + if (!createIfNotExists) { + return null; + } + quantificationMeasurement = QuantificationMeasurement.Factory + .newInstance(); + quantificationMeasurement.setBatch(batch); + if (batch.getQuantificationMeasurements() == null) { + batch.setQuantificationMeasurements(Sets + .newHashSet(quantificationMeasurement)); + } else { + batch.getQuantificationMeasurements().add( + quantificationMeasurement); + } + quantificationMeasurement.setQualityFlag(load( + QualityFlagImpl.class, + enumeration.QUALITY_FLAG_CODE_NOT_QUALIFIED)); + quantificationMeasurement.setDepartment(load(DepartmentImpl.class, + recorderDepartmentId)); + quantificationMeasurement.setPmfm(load(PmfmImpl.class, pmfmId)); + } + + return quantificationMeasurement; + } + + protected void setMeasurement(Measurement measurement, Caracteristic caracteristic, Serializable value) { + if (caracteristic.getCaracteristicType() == CaracteristicType.TEXT) { + measurement.setAlphanumericalValue((String)value); + } + else if (caracteristic.getCaracteristicType() == CaracteristicType.NUMBER) { + measurement.setNumericalValue((Float)value); + } + else if (caracteristic.getCaracteristicType() == CaracteristicType.QUALITATIVE) { + Integer qvId = null; + if (value instanceof Integer) { + qvId = (Integer)value; + } + else { + qvId = Integer.valueOf(value.toString()); + } + QualitativeValue qv = load(QualitativeValueImpl.class, qvId); + measurement.setQualitativeValue(qv); + } + } + + protected SortingMeasurement setSortingMeasurement( + SortingBatch sortingBatch, Integer recorderDepartmentId, + SampleCategoryEnum sampleCategory, Serializable value) { + Preconditions.checkNotNull(sampleCategory); + Preconditions.checkNotNull(value); + + Integer pmfmId = sampleCategory2PmfmId(sampleCategory); + + Caracteristic caracteristic = referentialService.getCaracteristic(pmfmId); + SortingMeasurement sortingMeasurement = getSortingMeasurement( + sortingBatch, pmfmId, recorderDepartmentId, true); + setMeasurement(sortingMeasurement, caracteristic, value); + return sortingMeasurement; + } + + protected SortingMeasurement getSortingMeasurement( + SortingBatch sortingBatch, Integer pmfmId, Integer recorderDepartmentId, + boolean createIfNotExists) { + SortingMeasurement sortingMeasurement = null; + if (sortingBatch.getSortingMeasurements() != null) { + for (Iterator iterator = sortingBatch + .getSortingMeasurements().iterator(); iterator + .hasNext();) { + SortingMeasurement qm = (SortingMeasurement) iterator + .next(); + if (pmfmId.equals(qm.getPmfm().getId())) { + sortingMeasurement = qm; + break; + } + } + } + if (sortingMeasurement == null) { + if (!createIfNotExists) { + return null; + } + sortingMeasurement = SortingMeasurement.Factory + .newInstance(); + sortingMeasurement.setSortingBatch(sortingBatch); + if (sortingBatch.getSortingMeasurements() == null) { + sortingBatch.setSortingMeasurements(Sets + .newHashSet(sortingMeasurement)); + sortingMeasurement.setRankOrder(1); + } else { + sortingBatch.getSortingMeasurements().add( + sortingMeasurement); + sortingMeasurement.setRankOrder(sortingBatch.getSortingMeasurements().size()); + } + sortingMeasurement.setQualityFlag(load( + QualityFlagImpl.class, + enumeration.QUALITY_FLAG_CODE_NOT_QUALIFIED)); + sortingMeasurement.setDepartment(load(DepartmentImpl.class, + recorderDepartmentId)); + sortingMeasurement.setPmfm(load(PmfmImpl.class, pmfmId)); + } + + return sortingMeasurement; + } + + protected Integer sampleCategory2PmfmId(SampleCategoryEnum sampleCategory) { + Integer pmfmId = null; + if (sampleCategory == SampleCategoryEnum.sortedUnsorted) { + pmfmId = enumeration.PMFM_ID_SORTED_UNSORTED; + } + else if (sampleCategory == SampleCategoryEnum.size) { + pmfmId = enumeration.PMFM_ID_SIZE_CATEGORY; + } + else if (sampleCategory == SampleCategoryEnum.maturity) { + pmfmId = enumeration.PMFM_ID_MATURITY; + } + else if (sampleCategory == SampleCategoryEnum.sex) { + pmfmId = enumeration.PMFM_ID_SEX; + } + else if (sampleCategory == SampleCategoryEnum.age) { + pmfmId = enumeration.PMFM_ID_AGE; + } + if (pmfmId == null) { + throw new IllegalArgumentException("Unable to find corresponding PMFM.ID for sampleCategory : " + sampleCategory.name()); + } + return pmfmId; + } + + protected SampleCategoryEnum pmfmId2SampleCategory(Integer pmfmId) { + SampleCategoryEnum sampleCategory = null; + if (pmfmId.intValue() == enumeration.PMFM_ID_SORTED_UNSORTED.intValue()) { + sampleCategory = SampleCategoryEnum.sortedUnsorted; + } + else if (enumeration.PMFM_ID_SIZE_CATEGORY.equals(pmfmId)) { + sampleCategory = SampleCategoryEnum.size; + } + else if (enumeration.PMFM_ID_MATURITY.equals(pmfmId)) { + sampleCategory = SampleCategoryEnum.maturity; + } + else if (enumeration.PMFM_ID_SEX.equals(pmfmId)) { + sampleCategory = SampleCategoryEnum.sex; + } + else if (enumeration.PMFM_ID_AGE.equals(pmfmId)) { + sampleCategory = SampleCategoryEnum.age; + } + if (sampleCategory == null) { + throw new IllegalArgumentException("Unable to find corresponding SampleCategoryEnum for PMFM.ID : " + pmfmId); + } + return sampleCategory; + } } Modified: trunk/tutti-persistence-adagio/src/main/java/fr/ifremer/tutti/persistence/service/TuttiEnumerationFile.java =================================================================== --- trunk/tutti-persistence-adagio/src/main/java/fr/ifremer/tutti/persistence/service/TuttiEnumerationFile.java 2013-01-30 09:56:33 UTC (rev 263) +++ trunk/tutti-persistence-adagio/src/main/java/fr/ifremer/tutti/persistence/service/TuttiEnumerationFile.java 2013-01-30 10:39:43 UTC (rev 264) @@ -125,6 +125,9 @@ @Value("${QualityFlagCode.NOTQUALIFIED}") public final String QUALITY_FLAG_CODE_NOT_QUALIFIED = null; + @Value("${QualityFlagCode.DOUBTFUL}") + public final String QUALITY_FLAG_CODE_DOUBTFUL = null; + @Value("${PmfmId.STATION_NUMBER}") public final Integer PMFM_ID_STATION_NUMBER = null; @@ -149,12 +152,25 @@ @Value("${QualitativeValueId.HAUL_VALID_NO}") public final Integer QUALITATIVE_HAUL_VALID_NO = null; - @Value("${PmfmId.TRAWL_NET}") - public final Integer PMFM_ID_TRAWL_NET = null; + @Value("${PmfmId.MULTIRIG_NUMBER}") + public final Integer PMFM_ID_MULTIRIG_NUMBER = null; - @Value("${PmfmId.TRAWL_NET_NUMBER}") - public final Integer PMFM_ID_TRAWL_NET_NUMBER = null; + @Value("${PmfmId.MULTIRIG_AGGREGATION}") + public final Integer PMFM_ID_MULTIRIG_AGGREGATION = null; + @Value("${PmfmId.WEIGHT_MEASURED}") + public final Integer PMFM_ID_WEIGHT_MEASURED = null; + + @Value("${DepartmentId.UNKNOWN_RECORDER_DEPARTMENT}") + public final Integer DEPARTMENT_ID_UNKNOWN_RECORDER_DEPARTMENT = null; + + @Value("${VesselPersonRoleId.CRUISE_MANAGER}") + public final Integer VESSEL_PERSON_ROLE_ID_CRUISE_MANAGER = null; + + + @Value("${PmfmId.AGE}") + public final Integer PMFM_ID_AGE = null; + public void init() { Field[] declaredFields = getClass().getDeclaredFields(); Modified: trunk/tutti-persistence-adagio/src/main/resources/queries-override.hbm.xml =================================================================== --- trunk/tutti-persistence-adagio/src/main/resources/queries-override.hbm.xml 2013-01-30 09:56:33 UTC (rev 263) +++ trunk/tutti-persistence-adagio/src/main/resources/queries-override.hbm.xml 2013-01-30 10:39:43 UTC (rev 264) @@ -27,10 +27,6 @@ "http://www.hibernate.org/dtd/hibernate-mapping-3.0.dtd"> <hibernate-mapping> -  -  -  -    @@ -168,27 +164,44 @@ <query-param name="cruiseId" type="java.lang.Integer"/> </query> + <query cacheable="true" name="allFishingOperations"> + <![CDATA[ + SELECT + o.id AS id, + o.name AS name, + guf.gear.label AS gearLabel, + o.startDateTime AS startDateTime, + (select vum.alphanumericalValue from VesselUseMeasurementImpl vum where vum.vesselUseFeatures.id = vuf.id and vum.pmfm.id=1243) AS stationNumber, + (select gum.numericalValue from GearUseMeasurementImpl gum where gum.gearUseFeatures.id = guf.id and gum.pmfm.id=953) AS trawNetNumber + FROM + FishingOperationImpl o + LEFT OUTER JOIN o.gearUseFeatures guf + LEFT OUTER JOIN o.vesselUseFeatures vuf + WHERE + o.fishingTrip.scientificCruise.id=:cruiseId + ORDER BY + o.startDateTime + ]]> + <query-param name="cruiseId" type="java.lang.Integer"/> + </query> + <query cacheable="true" name="fishingOperation"> <![CDATA[ SELECT - o.name as name, - max(o.startDateTime) as startDateTime, - max(o.endDateTime) as endDateTime, - max(o.comments) as comments, - max(guf.gear.id) as gearId, - (select vp_start from VesselPositionImpl vp_start where vp_start.operation.id = o.id and vp_start.dateTime = o.startDateTime) as startVesselPosition, - (select vp_end from VesselPositionImpl vp_end where vp_end.operation.id = o.id and vp_end.dateTime = o.endDateTime) as endVesselPosition, - (select vum.numericalValue from VesselUseMeasurementImpl vum where vum.vesselUseFeatures.id=vuf.id and vum.pmfm.id=:pmfmIdTrawlDistance) as trawlDistance, - (select vum2.qualitativeValue.id from VesselUseMeasurementImpl vum2 where vum2.vesselUseFeatures.id=vuf.id and vum2.pmfm.id=:pmfmIdRectilinearOperation) as rectilinearQualitativeId, - (select vum3.qualitativeValue.id from VesselUseMeasurementImpl vum3 where vum3.vesselUseFeatures.id=vuf.id and vum3.pmfm.id=:pmfmIdHaulValid) as haulValidQualitativeId, - (select gum.numericalValue from GearUseMeasurementImpl gum where gum.gearUseFeatures.id=guf.id and gum.pmfm.id=:pmfmIdTrawlNetNumber) as trawlNetNumber, + o.name AS name, + max(guf.gear.label) AS gearLabel, + max(o.startDateTime) AS startDateTime, + max(o.endDateTime) AS endDateTime, + max(o.comments) AS comments, + max(guf.gear.id) AS gearId, + (select vp_start from VesselPositionImpl vp_start where vp_start.operation.id = o.id and vp_start.dateTime = o.startDateTime) AS startVesselPosition, + (select vp_end from VesselPositionImpl vp_end where vp_end.operation.id = o.id and vp_end.dateTime = o.endDateTime) AS endVesselPosition, max(case when (rl.locationLevel.id = :locationLevelIdStrata) then rl.id else null end) AS strataId, max(case when (rl.locationLevel.id = :locationLevelIdSubStrata) then rl.id else null end) AS subStrataId, max(case when (rl.locationLevel.id = :locationLevelIdLocalite) then rl.id else null end) AS localiteId FROM FishingOperationImpl o INNER JOIN o.gearUseFeatures guf - INNER JOIN o.vesselUseFeatures vuf LEFT OUTER JOIN guf.fishingAreas fa LEFT OUTER JOIN fa.regulationLocation fa2rl LEFT OUTER JOIN fa2rl.id.location rl @@ -197,12 +210,28 @@ GROUP BY o.name ]]> <query-param name="fishingOperationId" type="java.lang.Integer"/> - <query-param name="pmfmIdTrawlDistance" type="java.lang.Integer"/> - <query-param name="pmfmIdRectilinearOperation" type="java.lang.Integer"/> - <query-param name="pmfmIdHaulValid" type="java.lang.Integer"/> - <query-param name="pmfmIdTrawlNetNumber" type="java.lang.Integer"/> + <query-param name="locationLevelIdStrata" type="java.lang.Integer"/> + <query-param name="locationLevelIdSubStrata" type="java.lang.Integer"/> + <query-param name="locationLevelIdLocalite" type="java.lang.Integer"/> </query> + <query cacheable="true" name="fishingOperationRankOrder"> + <![CDATA[ + SELECT + count(o1.id)+1 as fishingOperationRankOrder + FROM + FishingOperationImpl o1, + FishingOperationImpl o2 + WHERE + o1.fishingTrip.id=o2.fishingTrip.id + and o1.startDateTime < o2.startDateTime + and o2.id = :fishingOperationId + ]]> + <query-param name="fishingOperationId" type="java.lang.Integer"/> + </query> + + + <query cacheable="true" name="fishingOperationEnvironment"> <![CDATA[ SELECT @@ -214,7 +243,7 @@ VesselUseFeaturesImpl vuf join vuf.vesselUseMeasurements vum WHERE - vuf.operation = :fishingOperationId + vuf.operation.id = :fishingOperationId ]]> <query-param name="fishingOperationId" type="java.lang.Integer"/> </query> @@ -230,10 +259,75 @@ GearUseFeaturesImpl guf join guf.gearUseMeasurements gum WHERE - guf.operation = :fishingOperationId + guf.operation.id = :fishingOperationId ]]> <query-param name="fishingOperationId" type="java.lang.Integer"/> </query> + + <query name="updateFishingOperationCatchBatch"> + <![CDATA[ + UPDATE FishingOperationImpl o + SET o.catchBatch.id=:catchBatchId + WHERE + o.id=:fishingOperationId + ]]> + <query-param name="fishingOperationId" type="java.lang.Integer"/> + <query-param name="catchBatchId" type="java.lang.Integer"/> + </query> + + <query cacheable="true" name="fishingOperationCatchBatch"> + <![CDATA[ + SELECT + cb.id + FROM + CatchBatchImpl cb + WHERE + cb.fishingOperation.id = :fishingOperationId + ]]> + <query-param name="fishingOperationId" type="java.lang.Integer"/> + </query> + +  + + <query cacheable="true" name="speciesBatch"> + <![CDATA[ + SELECT + b.individualCount AS individualCount, + qm.numericalValue AS weight, + b.samplingRatio AS samplingRatio, + b.samplingRatioText AS samplingRatioText, + b.comments AS comments, + sm.pmfm.id as pmfmId, + sm.qualitativeValue.id as qvValue, + sm.numericalValue AS numValue, + sm.alphanumericalValue AS alphaValue, + b.referenceTaxon.id as referenceTaxonId + FROM + SortingBatchImpl b + LEFT OUTER JOIN b.sortingMeasurements sm + LEFT OUTER JOIN b.quantificationMeasurements qm + WHERE + b.id = :batchId + AND ( + qm is null + OR qm.isReferenceQuantification=true + ) + ]]> + <query-param name="batchId" type="java.lang.Integer"/> + </query> +   @@ -398,22 +492,12 @@ WHERE v.vesselType.id = :vesselTypeId AND v.status.code IN (:statusValidCode, :statusTemporaryCode) - AND vrp.vesselRegistrationPeriodPk.startDateTime = - ( - SELECT MAX(vrp2.vesselRegistrationPeriodPk.startDateTime) - FROM VesselRegistrationPeriodImpl vrp2 WHERE - vrp2.vesselRegistrationPeriodPk.vessel.code = v.code - AND (vrp2.vesselRegistrationPeriodPk.startDateTime <= :refDate OR :refDate IS NULL) - GROUP BY vrp2.vesselRegistrationPeriodPk.vessel.code + AND NOT(coalesce(vrp.endDateTime, '2999-12-31 00:00:00') < coalesce(:refDate,sysdate) + OR vrp.vesselRegistrationPeriodPk.startDateTime > coalesce(:refDate,sysdate) ) - AND vf.startDateTime = - ( - SELECT MAX(vf2.startDateTime) - FROM VesselFeaturesImpl vf2 WHERE - vf2.vessel.code = v.code - AND (vf2.startDateTime <= :refDate OR :refDate IS NULL) - GROUP BY vf2.vessel.code - ) + AND NOT(coalesce(vf.endDateTime, '2999-12-31 00:00:00') < coalesce(:refDate,sysdate) + OR vf.startDateTime > coalesce(:refDate,sysdate) + ) ]]> <query-param name="vesselTypeId" type="java.lang.Integer"/> <query-param name="refDate" type="java.util.Date"/> @@ -596,4 +680,20 @@ <query-param name="statusTemporaryCode" type="java.lang.String"/> </query> +  +  +  + + +  +  +  + + <fetch-profile name="batch-with-measurements"> + <fetch entity="CatchBatchImpl" association="quantificationMeasurements" style="join"/> + <fetch entity="SortingBatchImpl" association="sortingMeasurements" style="join"/> + <fetch entity="SortingBatchImpl" association="quantificationMeasurements" style="join"/> + </fetch-profile> + + </hibernate-mapping> Modified: trunk/tutti-persistence-adagio/src/main/resources/tutti-db-conf.properties =================================================================== --- trunk/tutti-persistence-adagio/src/main/resources/tutti-db-conf.properties 2013-01-30 09:56:33 UTC (rev 263) +++ trunk/tutti-persistence-adagio/src/main/resources/tutti-db-conf.properties 2013-01-30 10:39:43 UTC (rev 264) @@ -43,4 +43,5 @@ hibernate.use_sql_comments=${tutti.persistence.hibernate.useSqlComment} hibernate.generate_statistics=false hibernate.query.substitutions=true 1, false 0 -hibernate.hbm2ddl.auto=none \ No newline at end of file +hibernate.hbm2ddl.auto=none +hibernate.default_batch_fetch_size=1 \ No newline at end of file Modified: trunk/tutti-persistence-adagio/src/main/resources/tutti-db-enumerations.properties =================================================================== --- trunk/tutti-persistence-adagio/src/main/resources/tutti-db-enumerations.properties 2013-01-30 09:56:33 UTC (rev 263) +++ trunk/tutti-persistence-adagio/src/main/resources/tutti-db-enumerations.properties 2013-01-30 10:39:43 UTC (rev 264) @@ -318,6 +318,7 @@ PmfmId.SEX=196 PmfmId.SIZE_CATEGORY=198 PmfmId.SORTED_UNSORTED=200 +PmfmId.AGE=1430 # Catégorie maturité PmfmId.MATURITY=174 @@ -342,15 +343,19 @@ # TODO A creer (dans les enumerations Allegro) QualitativeValueId.RECTILINEAR_OPERATION_NO=278 -# TODO A creer (dans les enumerations Allegro) # PSFM "Nombre de poche" d'un chalut (écran campagne) -PmfmId.TRAWL_NET=953 +PmfmId.MULTIRIG_NUMBER=1420 +# PSFM "Liste des poches observées" (écran opération) +PmfmId.MULTIRIG_AGGREGATION=1424 # TODO A creer (dans les enumerations Allegro) -# PSFM "Numero de la poche" (écran opération) -## ATTENTION : à modifier quand Vincent aura créé le PSFM -PmfmId.TRAWL_NET_NUMBER=953 +# PSFM "Poids - observation par une observateur" (écran captures, onglet espèce, benthos, etc) +PmfmId.WEIGHT_MEASURED=220 #TODO A creer (dans les enumerations Allegro) # (20=observateur volant, 95=Administrateur SIH) -> L'avantage du 20 est qu'il est inactif (=20), donc plus facilement detectable PersonId.UNKNOWN_RECORDER_PERSON=20 + +#TODO A creer (dans les enumerations Allegro) +# 181=PDG-RBE (à confirmer par Vincent) +DepartmentId.UNKNOWN_RECORDER_DEPARTMENT=181 Modified: trunk/tutti-persistence-adagio/src/test/java/fr/ifremer/tutti/persistence/service/CruisePersistenceServiceTest.java =================================================================== --- trunk/tutti-persistence-adagio/src/test/java/fr/ifremer/tutti/persistence/service/CruisePersistenceServiceTest.java 2013-01-30 09:56:33 UTC (rev 263) +++ trunk/tutti-persistence-adagio/src/test/java/fr/ifremer/tutti/persistence/service/CruisePersistenceServiceTest.java 2013-01-30 10:39:43 UTC (rev 264) @@ -128,8 +128,12 @@ cruise.setComment("My comments on cruise"); - Person managerPerson = referentialService.getAllPerson().get(0); - cruise.setHeadOfMission(Lists.newArrayList(managerPerson)); + List<Person> allPersons = referentialService.getAllPerson(); + Person managerPerson1 = allPersons.get(0); + Person managerPerson2 = allPersons.get(1); + cruise.setHeadOfMission(Lists.newArrayList(managerPerson1, managerPerson2)); + + cruise.setHeadOfSortRoom(Lists.newArrayList(managerPerson2)); List<Vessel> vessels = Lists.newArrayList(); vessels.add(referentialService.getAllScientificVessel().get(0)); @@ -162,8 +166,12 @@ calendar.set(Calendar.MILLISECOND, 0); assertEquals(calendar.getTime(), reloadedCruise.getEndDate()); assertEquals(cruise.getTrawlNet(), reloadedCruise.getTrawlNet()); + assertNotNull(reloadedCruise.getHeadOfMission()); + assertEquals(cruise.getHeadOfMission().size(), reloadedCruise.getHeadOfMission().size()); + assertNotNull(reloadedCruise.getHeadOfSortRoom()); + assertEquals(cruise.getHeadOfSortRoom().size(), reloadedCruise.getHeadOfSortRoom().size()); - // ----------------------------------------------------------------------------- + // ----------------------------------------------------------------------------- // 2. Test with only mandatory properties // ----------------------------------------------------------------------------- createdCruise.setId(null); Modified: trunk/tutti-persistence-adagio/src/test/java/fr/ifremer/tutti/persistence/service/FishingOperationPersistenceServiceTest.java =================================================================== --- trunk/tutti-persistence-adagio/src/test/java/fr/ifremer/tutti/persistence/service/FishingOperationPersistenceServiceTest.java 2013-01-30 09:56:33 UTC (rev 263) +++ trunk/tutti-persistence-adagio/src/test/java/fr/ifremer/tutti/persistence/service/FishingOperationPersistenceServiceTest.java 2013-01-30 10:39:43 UTC (rev 264) @@ -39,6 +39,7 @@ import fr.ifremer.tutti.persistence.entities.referential.CaracteristicType; import fr.ifremer.tutti.persistence.entities.referential.FishingOperationLocation; import fr.ifremer.tutti.persistence.entities.referential.Gear; +import fr.ifremer.tutti.persistence.entities.referential.Person; import org.junit.Before; import org.junit.ClassRule; @@ -83,7 +84,7 @@ @Test @Ignore public void getAllFishingOperation(/*String cruiseId*/) { - + } @Test @@ -94,7 +95,9 @@ @Test public void createFishingOperation(/*FishingOperation bean*/) { - // ----------------------------------------------------------------------------- + List<Person> allPersons = referentialService.getAllPerson(); + + // ----------------------------------------------------------------------------- // Prepare data and other entities // ----------------------------------------------------------------------------- Calendar calendar = new GregorianCalendar(); @@ -232,6 +235,17 @@ localite.setId(dbResource.getFixtures().localite()); fishingOperation.setLocation(localite); + fishingOperation.setSaisisseur(Lists.newArrayList(allPersons.get(0), allPersons.get(1))); + + // Capture + fishingOperation.setCatchTotalWeight(100f); + // note : poids vrac caroussel (thalassa) (init par pupitri) (vrac trie) ou bien "poids trié fournie par la table de tri (Sum(Si) + //fishingOperation.setCatchTotalSortedCarousselWeight(20f); + // note : poids trie par la balance tremis (thalassa) (init par pupitri) + //fishingOperation.setCatchTotalSortedTremisWeight(10f); + //fishingOperation.setCatchTotalUnsortedWeight(15f); + + // Store fishing operation into database : createdFishingOperation = service.createFishingOperation(fishingOperation); assertNotNull("Fishing operation ID must not be null after creation in database", createdFishingOperation); @@ -271,6 +285,12 @@ assertNotNull(reloadedFishingOperation.getLocation()); assertNotNull(reloadedFishingOperation.getLocation().getId()); assertEquals(fishingOperation.getLocation().getId(), reloadedFishingOperation.getLocation().getId()); + + //TODO BL : move into CatchBacth + //assertEquals(fishingOperation.getCatchTotalWeight(), reloadedFishingOperation.getCatchTotalWeight()); + + assertNotNull(reloadedFishingOperation.getSaisisseur()); + assertEquals(fishingOperation.getSaisisseur().size(), reloadedFishingOperation.getSaisisseur().size()); // ----------------------------------------------------------------------------- // 3. Test : Modified: trunk/tutti-persistence-adagio/src/test/java/fr/ifremer/tutti/persistence/service/SpeciesBatchPersistenceServiceTest.java =================================================================== --- trunk/tutti-persistence-adagio/src/test/java/fr/ifremer/tutti/persistence/service/SpeciesBatchPersistenceServiceTest.java 2013-01-30 09:56:33 UTC (rev 263) +++ trunk/tutti-persistence-adagio/src/test/java/fr/ifremer/tutti/persistence/service/SpeciesBatchPersistenceServiceTest.java 2013-01-30 10:39:43 UTC (rev 264) @@ -24,32 +24,91 @@ * #L% */ +import java.util.Calendar; +import java.util.Date; +import java.util.GregorianCalendar; +import java.util.List; + import fr.ifremer.tutti.persistence.DatabaseResource; +import fr.ifremer.tutti.persistence.entities.data.Cruise; +import fr.ifremer.tutti.persistence.entities.data.FishingOperation; +import fr.ifremer.tutti.persistence.entities.data.SampleCategoryEnum; +import fr.ifremer.tutti.persistence.entities.data.SpeciesBatch; +import fr.ifremer.tutti.persistence.entities.referential.Caracteristic; +import fr.ifremer.tutti.persistence.entities.referential.Species; + import org.junit.Before; import org.junit.ClassRule; import org.junit.Ignore; import org.junit.Test; +import static org.junit.Assert.*; /** * @author tchemit <chemit(a)codelutin.com> * @since 0.3 */ -@Ignore public class SpeciesBatchPersistenceServiceTest { @ClassRule public static final DatabaseResource dbResource = new DatabaseResource(); protected SpeciesBatchPersistenceService service; + + protected CruisePersistenceService cruiseService; + protected FishingOperationPersistenceService fishingOperationService; + protected ReferentialPersistenceService referentialService; + protected Cruise cruise; + protected FishingOperation fishingOperation; + protected List<Species> species; + @Before public void setUp() throws Exception { service = TuttiPersistenceServiceLocator.getSpeciesBatchPersistenceService(); + cruiseService = TuttiPersistenceServiceLocator.getCruisePersistenceService(); + fishingOperationService = TuttiPersistenceServiceLocator.getFishingOperationPersistenceService(); + referentialService = TuttiPersistenceServiceLocator.getReferentialPersistenceService(); + + cruise = cruiseService.getCruise(dbResource.getFixtures().cruiseId()); + cruise.setId(null); + Calendar calendar = new GregorianCalendar(); + cruise.setBeginDate(calendar.getTime()); + cruise.setYear(calendar.get(Calendar.YEAR)); + calendar.add(Calendar.MONTH, 1); // add one month + cruise.setEndDate(calendar.getTime()); + cruise = cruiseService.createCruise(cruise); + + List<FishingOperation> fishingOperations = fishingOperationService.getAllFishingOperation(dbResource.getFixtures().cruiseId()); + assertNotNull(fishingOperations); + assertTrue(fishingOperations.size() > 0); + fishingOperation = fishingOperations.get(0); + fishingOperation = fishingOperationService.getFishingOperation(fishingOperation.getId()); + fishingOperation.setId(null); + fishingOperation.setCruise(cruise); + calendar.setTime(new Date()); + calendar.set(Calendar.HOUR_OF_DAY, 1); + calendar.set(Calendar.MILLISECOND, 0); + fishingOperation.setGearShootingStartDate(calendar.getTime()); + calendar.setTime(new Date()); + calendar.set(Calendar.HOUR_OF_DAY, 10); + calendar.set(Calendar.MILLISECOND, 0); + fishingOperation.setGearShootingEndDate(calendar.getTime()); + + fishingOperation = fishingOperationService.createFishingOperation(fishingOperation); + + species = referentialService.getAllSpecies(); + assertNotNull(species); + assertTrue(species.size() > 2); } @Test + @Ignore public void getAllRootSpeciesBatch(/*String fishingOperationId*/) { + List<SpeciesBatch> speciesBatch = service.getAllRootSpeciesBatch(fishingOperation.getId()); + assertNotNull(speciesBatch); + assertTrue(speciesBatch.size() > 0); + } @Test @@ -64,7 +123,107 @@ @Test public void createSpeciesBatch(/*SpeciesBatch bean, String parentBatchId*/) { + Caracteristic sortedUnsortedPMFM = referentialService.getSortedUnsortedCaracteristic(); + String horsVracQualitativeValueId = sortedUnsortedPMFM.getQualitativeValue(0).getId(); + String vracQualitativeValueId = sortedUnsortedPMFM.getQualitativeValue(1).getId(); + Species taxon1 = species.get(0); + Species taxon2 = species.get(1); + Caracteristic sexPMFM = referentialService.getSexCaracteristic(); + String maleQualitativeValueId = sexPMFM.getQualitativeValue(1).getId(); + String femaleQualitativeValueId = sexPMFM.getQualitativeValue(2).getId(); + SpeciesBatch esp1Batch = null; + SpeciesBatch batch = null; + SpeciesBatch createdBatch = null; + SpeciesBatch reloadedBatch = null; + + // ----------------------------------------------------------------------------- + // 1. Test with only mandatory properties + // ----------------------------------------------------------------------------- + // batch : "ESP1 - Vrac/5" + batch = new SpeciesBatch(); + batch.setFishingOperation(fishingOperation); + batch.setSpecies(taxon1); + batch.setSampleCategoryType(SampleCategoryEnum.sortedUnsorted); + batch.setSampleCategoryValue(vracQualitativeValueId); + batch.setWeight(5f); + + createdBatch = service.createSpeciesBatch(batch, null); + assertNotNull(createdBatch); + assertNotNull(createdBatch.getId()); + reloadedBatch = service.getSpeciesBatch(createdBatch.getId()); + assertNotNull(reloadedBatch); + assertNull(reloadedBatch.getFishingOperation()); + assertEquals(createdBatch.getId(), reloadedBatch.getId()); + assertEquals(batch.getWeight(), reloadedBatch.getWeight()); + assertEquals(batch.getNumber(), reloadedBatch.getNumber()); + assertEquals(batch.getComment(), reloadedBatch.getComment()); + assertEquals(batch.getSampleCategoryType(), reloadedBatch.getSampleCategoryType()); + assertEquals(batch.getSampleCategoryValue(), reloadedBatch.getSampleCategoryValue()); + assertNotNull(reloadedBatch.getSpecies()); + assertEquals(batch.getSpecies().getId(), reloadedBatch.getSpecies().getId()); + // Save ESP1 batch + esp1Batch = reloadedBatch; + + // ----------------------------------------------------------------------------- + // 2. Test child "Male/2" + // ----------------------------------------------------------------------------- + // Batch : ESP1 - Vrac/5 Male/2 ss-ech/1 Nombre/7 + batch.setId(null); + batch.setParentBatch(esp1Batch); + batch.setSpecies(taxon1); + batch.setComment("ESP1 - Vrac/5 Male/2 ss-ech/1 Nombre/7"); + batch.setWeight(2f); + batch.setSampleCategoryType(SampleCategoryEnum.sex); + batch.setSampleCategoryValue(maleQualitativeValueId); + batch.setSampleCategoryWeight(1f); + batch.setNumber(7); + + createdBatch = service.createSpeciesBatch(batch, batch.getParentBatch().getId()); + assertNotNull(createdBatch); + assertNotNull(createdBatch.getId()); + reloadedBatch = service.getSpeciesBatch(createdBatch.getId()); + assertNotNull(reloadedBatch); + assertNull(reloadedBatch.getParentBatch()); + assertEquals(batch.getNumber(), reloadedBatch.getNumber()); + assertEquals(batch.getSampleCategoryType(), reloadedBatch.getSampleCategoryType()); + assertEquals(batch.getSampleCategoryValue(), reloadedBatch.getSampleCategoryValue()); + assertEquals(batch.getWeight(), reloadedBatch.getWeight()); + assertEquals(batch.getSampleCategoryWeight(), reloadedBatch.getSampleCategoryWeight()); + + // ----------------------------------------------------------------------------- + // 3. Test child "Female/2" + // ----------------------------------------------------------------------------- + // Batch : ESP1 - Vrac/5 Female/3 Nombre/14 + batch.setId(null); + batch.setParentBatch(esp1Batch); + batch.setSpecies(taxon1); + batch.setComment("ESP1 - Vrac/5 Female/3 Nombre/14"); + batch.setWeight(3f); + batch.setSampleCategoryType(SampleCategoryEnum.sex); + batch.setSampleCategoryValue(femaleQualitativeValueId); + batch.setSampleCategoryWeight(null); + batch.setNumber(14); + + createdBatch = service.createSpeciesBatch(batch, batch.getParentBatch().getId()); + assertNotNull(createdBatch); + assertNotNull(createdBatch.getId()); + reloadedBatch = service.getSpeciesBatch(createdBatch.getId()); + assertNotNull(reloadedBatch); + assertNull(reloadedBatch.getParentBatch()); + assertEquals(batch.getNumber(), reloadedBatch.getNumber()); + assertEquals(batch.getSampleCategoryType(), reloadedBatch.getSampleCategoryType()); + assertEquals(batch.getSampleCategoryValue(), reloadedBatch.getSampleCategoryValue()); + assertEquals(batch.getWeight(), reloadedBatch.getWeight()); + assertEquals(batch.getSampleCategoryWeight(), reloadedBatch.getSampleCategoryWeight()); + + + /* + reloadedBatch.setSampleCategoryWeight(1.5f); + reloadedBatch.setParentBatch(createdBatch.getParentBatch()); + reloadedBatch.setFishingOperation(fishingOperation); + service.saveSpeciesBatch(reloadedBatch); + */ } @Test

1 0

r263 - in trunk: tutti-persistence/src/main/xmi tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/protocol
by tchemit＠users.forge.codelutin.com 30 Jan '13

30 Jan '13

Author: tchemit Date: 2013-01-30 10:56:33 +0100 (Wed, 30 Jan 2013) New Revision: 263 Url: http://forge.codelutin.com/projects/tutti/repository/revisions/263 Log: fix build + begin to improve protocol (to do the pmfm import) Modified: trunk/tutti-persistence/src/main/xmi/tutti-persistence.zargo trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/EditFishingOperationUIHandler.java trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/SpeciesBatchUIHandler.java trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/protocol/EditProtocolUIHandler.java trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/protocol/EditProtocolUIModel.java Modified: trunk/tutti-persistence/src/main/xmi/tutti-persistence.zargo =================================================================== (Binary files differ) Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/EditFishingOperationUIHandler.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/EditFishingOperationUIHandler.java 2013-01-30 09:13:40 UTC (rev 262) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/EditFishingOperationUIHandler.java 2013-01-30 09:56:33 UTC (rev 263) @@ -288,18 +288,18 @@ //init gear shooting GearShootingTabUIModel gearShootingModel = ui.getGearShootingTabContent().getModel(); - gearShootingModel.setAvailableCaracteristics(persistenceService.getAllFishingOperationGearCaracteristic()); + gearShootingModel.setAvailableCaracteristics(persistenceService.getAllCaracteristic()); setCustomTab(1, gearShootingModel); //init environment EnvironmentTabUIModel environmentModel = ui.getEnvironmentTabContent().getModel(); - environmentModel.setAvailableCaracteristics(persistenceService.getAllFishingOperationEnvironmentCaracteristic()); + environmentModel.setAvailableCaracteristics(persistenceService.getAllCaracteristic()); setCustomTab(2, environmentModel); //init hydrology HydrologyTabUIModel hydrologyModel = ui.getHydrologyTabContent().getModel(); - hydrologyModel.setAvailableCaracteristics(persistenceService.getAllFishingOperationHydrologicCaracteristic()); + hydrologyModel.setAvailableCaracteristics(persistenceService.getAllCaracteristic()); setCustomTab(3, hydrologyModel); if (TuttiUIContext.VALIDATION_CONTEXT_VALIDATE.equals(model.getValidationContext())) { Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/SpeciesBatchUIHandler.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/SpeciesBatchUIHandler.java 2013-01-30 09:13:40 UTC (rev 262) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/SpeciesBatchUIHandler.java 2013-01-30 09:56:33 UTC (rev 263) @@ -394,10 +394,10 @@ model.setTableViewMode(TableViewMode.ALL); ui.setContextValue(model); + //TODO Use protocol values if exists ? PersistenceService service = context.getService(PersistenceService.class); - List<Caracteristic> lengthCaracterics = - service.getAllSpeciesLengthStepCaracteristic(); + List<Caracteristic> lengthCaracterics = service.getAllCaracteristic(); FREQUENCY_LENGTH_CONTEXT_ENTRY.setContextValue(ui, lengthCaracterics); } Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/protocol/EditProtocolUIHandler.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/protocol/EditProtocolUIHandler.java 2013-01-30 09:13:40 UTC (rev 262) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/protocol/EditProtocolUIHandler.java 2013-01-30 09:56:33 UTC (rev 263) @@ -52,18 +52,12 @@ import org.jdesktop.swingx.JXTable; import org.jdesktop.swingx.table.DefaultTableColumnModelExt; -import javax.swing.event.ChangeEvent; -import javax.swing.event.ListSelectionEvent; -import javax.swing.event.TableColumnModelEvent; -import javax.swing.event.TableColumnModelListener; import java.util.Collection; import java.util.List; import java.util.Map; /** - * TODO - * * @author tchemit <chemit(a)codelutin.com> * @since 0.3 */ @@ -183,11 +177,11 @@ model.setProtocolNames(protocolNames); allLengthStepPmfm = TuttiEntities.splitById( - persistenceService.getAllSpeciesLengthStepCaracteristic()); + persistenceService.getAllCaracteristic()); hydroCaracteristics = ArrayListMultimap.create(); for (Caracteristic caracteristic : - persistenceService.getAllFishingOperationHydrologicCaracteristic()) { + persistenceService.getAllCaracteristic()) { String name = HydrologicCaracteristicUtil.getGlobalName(caracteristic.getName()); hydroCaracteristics.put(name, caracteristic.getId()); } @@ -324,12 +318,12 @@ // init gear pmfm double list List<Caracteristic> gearPmfm = - persistenceService.getAllFishingOperationGearCaracteristic(); + persistenceService.getAllCaracteristic(); initDoubleList(ui.getGearList(), gearPmfm, model.getGearPmfmId()); // init environement pmfm double list List<Caracteristic> environmentPmfm = - persistenceService.getAllFishingOperationEnvironmentCaracteristic(); + persistenceService.getAllCaracteristic(); initDoubleList(ui.getEnvironmentList(), environmentPmfm, model.getEnvironmentPmfmId()); Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/protocol/EditProtocolUIModel.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/protocol/EditProtocolUIModel.java 2013-01-30 09:13:40 UTC (rev 262) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/protocol/EditProtocolUIModel.java 2013-01-30 09:56:33 UTC (rev 263) @@ -46,6 +46,8 @@ public static final String PROPERTY_NAME = "name"; + public static final String PROPERTY_LENGTH_CLASSES_PMFM_ID = "lengthClassesPmfmId"; + public static final String PROPERTY_GEAR_PMFM_ID = "gearPmfmId"; public static final String PROPERTY_ENVIRONMENT_PMFM_ID = "environmentPmfmId"; @@ -55,13 +57,15 @@ public static final String PROPERTY_SAMPLE_CATEGORY_ORDER = "sampleCategoryOrder"; public static final String PROPERTY_REMOVE_SPECIES_ENABLED = "removeSpeciesEnabled"; - + public static final String PROPERTY_IMPORTED = "imported"; protected String name; protected String comment; + protected List<String> lengthClassesPmfmId; + protected List<String> gearPmfmId; protected List<String> environmentPmfmId; @@ -74,7 +78,7 @@ SampleCategoryEnum.sex, SampleCategoryEnum.maturity, SampleCategoryEnum.age); - + protected boolean imported; /** @@ -117,6 +121,16 @@ firePropertyChange(PROPERTY_COMMENT, oldValue, comment); } + public List<String> getLengthClassesPmfmId() { + return lengthClassesPmfmId; + } + + public void setLengthClassesPmfmId(List<String> lengthClassesPmfmId) { + Object oldValue = getLengthClassesPmfmId(); + this.lengthClassesPmfmId = lengthClassesPmfmId; + firePropertyChange(PROPERTY_LENGTH_CLASSES_PMFM_ID, oldValue, lengthClassesPmfmId); + } + public List<String> getGearPmfmId() { return gearPmfmId; } @@ -212,5 +226,5 @@ this.imported = imported; firePropertyChange(PROPERTY_IMPORTED, oldValue, imported); } - + } \ No newline at end of file

1 0

r262 - in trunk: tutti-service/src/main/resources/i18n tutti-ui-swing/src/main/resources/icons
by tchemit＠users.forge.codelutin.com 30 Jan '13

30 Jan '13

Author: tchemit Date: 2013-01-30 10:13:40 +0100 (Wed, 30 Jan 2013) New Revision: 262 Url: http://forge.codelutin.com/projects/tutti/repository/revisions/262 Log: add misggin svn properties + reformat i18n Modified: trunk/tutti-service/src/main/resources/i18n/tutti-service_fr_FR.properties trunk/tutti-ui-swing/src/main/resources/icons/action-allegro.png trunk/tutti-ui-swing/src/main/resources/icons/action-calendar.png trunk/tutti-ui-swing/src/main/resources/icons/action-coordinates.png trunk/tutti-ui-swing/src/main/resources/icons/action-cruise.png trunk/tutti-ui-swing/src/main/resources/icons/action-filter.png trunk/tutti-ui-swing/src/main/resources/icons/action-gear.png trunk/tutti-ui-swing/src/main/resources/icons/action-location.png trunk/tutti-ui-swing/src/main/resources/icons/action-person.png trunk/tutti-ui-swing/src/main/resources/icons/action-prelevements.png trunk/tutti-ui-swing/src/main/resources/icons/action-program.png trunk/tutti-ui-swing/src/main/resources/icons/action-psfm.png trunk/tutti-ui-swing/src/main/resources/icons/action-samplingOperation.png trunk/tutti-ui-swing/src/main/resources/icons/action-time.png trunk/tutti-ui-swing/src/main/resources/icons/action-vessel.png Modified: trunk/tutti-service/src/main/resources/i18n/tutti-service_fr_FR.properties =================================================================== --- trunk/tutti-service/src/main/resources/i18n/tutti-service_fr_FR.properties 2013-01-30 09:13:11 UTC (rev 261) +++ trunk/tutti-service/src/main/resources/i18n/tutti-service_fr_FR.properties 2013-01-30 09:13:40 UTC (rev 262) @@ -16,7 +16,6 @@ tutti.property.genusSpecies=Nom scientifique tutti.property.internalRegistrationCode=Immatriculation internationale tutti.property.label=Code -tutti.property.trawlNetNumber=Numéro de poche tutti.property.lastName=Nom de Famille tutti.property.macroWasteCategory=Type de macro déchet tutti.property.matrixName=Support @@ -29,6 +28,7 @@ tutti.property.species=Espèce tutti.property.stationNumber=Numéro de station tutti.property.strata=Strate d'association +tutti.property.trawlNetNumber=Numéro de poche tutti.property.user=Utilisateur tutti.property.vessel=Navire tutti.property.zone=Zone Property changes on: trunk/tutti-ui-swing/src/main/resources/icons/action-allegro.png ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: trunk/tutti-ui-swing/src/main/resources/icons/action-calendar.png ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: trunk/tutti-ui-swing/src/main/resources/icons/action-coordinates.png ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: trunk/tutti-ui-swing/src/main/resources/icons/action-cruise.png ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: trunk/tutti-ui-swing/src/main/resources/icons/action-filter.png ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: trunk/tutti-ui-swing/src/main/resources/icons/action-gear.png ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: trunk/tutti-ui-swing/src/main/resources/icons/action-location.png ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: trunk/tutti-ui-swing/src/main/resources/icons/action-person.png ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: trunk/tutti-ui-swing/src/main/resources/icons/action-prelevements.png ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: trunk/tutti-ui-swing/src/main/resources/icons/action-program.png ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: trunk/tutti-ui-swing/src/main/resources/icons/action-psfm.png ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: trunk/tutti-ui-swing/src/main/resources/icons/action-samplingOperation.png ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: trunk/tutti-ui-swing/src/main/resources/icons/action-time.png ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: trunk/tutti-ui-swing/src/main/resources/icons/action-vessel.png ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL

1 0