This is an automated email from the git hooks/post-receive script. New change to branch develop in repository echobase. See http://git.codelutin.com/echobase.git from cdde5a7 [jgitflow-maven-plugin]Updating develop poms back to pre merge state new 514f408 utilisation d'une classe helper pour chaque entite new 0a55d61 mis en place filtrage des indicateurs a exporter par voyage new 2a33130 utilisation des nouveau helper d'entities new bee7476 pas de calcul de zone au depart new 6309fb7 amelioration code new 7bd2f31 correction javascript new 41a5a73 fix api new b81ab5b fixes #6513 The 8 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "adds" were already present in the repository and have only been added to this reference. Detailed log of new commits: commit b81ab5bc6f4d48f48e71e24ff92b777377eaef06 Merge: cdde5a7 41a5a73 Author: Tony CHEMIT <chemit@codelutin.com> Date: Wed Jan 21 18:08:23 2015 +0100 fixes #6513 commit 41a5a73b17fcf48791ac6735f5f403481df7e824 Author: Tony CHEMIT <chemit@codelutin.com> Date: Wed Jan 21 18:08:04 2015 +0100 fix api commit 7bd2f31d8698c5dd910ca5da416bc44b11678306 Author: Tony CHEMIT <chemit@codelutin.com> Date: Wed Jan 21 18:05:47 2015 +0100 correction javascript commit 6309fb7481f61a43114a85795385efd8cc0e0252 Author: Tony CHEMIT <chemit@codelutin.com> Date: Wed Jan 21 18:04:06 2015 +0100 amelioration code commit bee747698d8a1fd8bd9f906ca926ffa0a5b3bc4f Author: Tony CHEMIT <chemit@codelutin.com> Date: Wed Jan 21 18:03:47 2015 +0100 pas de calcul de zone au depart commit 2a331301d0436f43c416a9213a1fd7a0432e0363 Author: Tony CHEMIT <chemit@codelutin.com> Date: Wed Jan 21 17:16:17 2015 +0100 utilisation des nouveau helper d'entities commit 0a55d6167f1ba35fea568974370a0c7521da87b5 Author: Tony CHEMIT <chemit@codelutin.com> Date: Wed Jan 21 17:16:03 2015 +0100 mis en place filtrage des indicateurs a exporter par voyage commit 514f408b63a8ce30bbd4a34d3576d45de7486adc Author: Tony CHEMIT <chemit@codelutin.com> Date: Wed Jan 21 17:15:25 2015 +0100 utilisation d'une classe helper pour chaque entite Summary of changes: .../fr/ifremer/echobase/EchoBaseFunctions.java | 371 --------------------- .../fr/ifremer/echobase/EchoBasePredicates.java | 190 ----------- .../fr/ifremer/echobase/entities/ImportLogs.java | 26 ++ .../fr/ifremer/echobase/entities/data/Cells.java | 68 ++++ .../echobase/entities/data/DataProcessings.java | 18 + .../ifremer/echobase/entities/data/Echotypes.java | 37 ++ .../ifremer/echobase/entities/data/Operations.java | 47 +++ .../fr/ifremer/echobase/entities/data/Results.java | 18 + .../ifremer/echobase/entities/data/Transects.java | 19 ++ .../ifremer/echobase/entities/data/VoyageImpl.java | 8 +- .../fr/ifremer/echobase/entities/data/Voyages.java | 18 + .../entities/references/AcousticInstruments.java | 26 ++ .../entities/references/AgeCategories.java | 18 + .../entities/references/AreaOfOperations.java | 18 + .../echobase/entities/references/CellMethods.java | 18 + .../echobase/entities/references/CellTypes.java | 80 +++++ .../entities/references/DataMetadatas.java | 18 + .../entities/references/DataQualities.java | 25 ++ .../echobase/entities/references/DataTypes.java | 18 + .../entities/references/DepthStratums.java | 18 + .../entities/references/EchotypeCategories.java | 18 + .../entities/references/GearMetadatas.java | 18 + .../echobase/entities/references/Gears.java | 21 ++ .../echobase/entities/references/Missions.java | 18 + .../entities/references/OperationEvents.java | 18 + .../entities/references/OperationMetadatas.java | 18 + .../entities/references/ReferenceDatumTypes.java | 18 + .../entities/references/ReferenceDatums.java | 18 + .../entities/references/SampleDataTypes.java | 25 ++ .../entities/references/SexCategories.java | 18 + .../entities/references/SizeCategories.java | 27 ++ .../echobase/entities/references/Species2.java | 8 + .../entities/references/SpeciesCategories.java | 29 ++ .../echobase/entities/references/Stratas.java | 18 + .../echobase/entities/references/VesselTypes.java | 18 + .../echobase/entities/references/Vessels.java | 18 + .../echobase/services/service/CoserIndicators.java | 32 ++ .../services/service/UserDbPersistenceService.java | 86 ++++- .../service/importdata/AcousticImportService.java | 13 +- .../service/importdata/CatchesImportService.java | 21 +- .../service/importdata/CommonAllImportService.java | 4 +- .../importdata/CommonTransectImportService.java | 7 +- .../importdata/CommonTransitImportService.java | 4 +- .../service/importdata/OperationImportService.java | 19 +- .../importdata/ResultsEsduCellImportService.java | 25 +- .../ResultsMapFishCellImportService.java | 19 +- .../ResultsMapOtherCellImportService.java | 10 +- .../importdata/ResultsRegionCellImportService.java | 31 +- .../importdata/ResultsVoyageImportService.java | 20 +- .../importdata/AbstractImportDataServiceIT.java | 4 +- .../echobase/ui/actions/dbeditor/GetEntities.java | 4 +- .../echobase/ui/actions/exportCoser/Configure.java | 45 +-- .../GetAvailableIndicatorsForMission.java | 78 +++++ .../main/resources/config/struts-exportCoser.xml | 6 + .../webapp/WEB-INF/jsp/exportCoser/configure.jsp | 7 + echobase-ui/src/main/webapp/js/gridHelper.js | 68 +++- 56 files changed, 1186 insertions(+), 684 deletions(-) delete mode 100644 echobase-domain/src/main/java/fr/ifremer/echobase/EchoBaseFunctions.java delete mode 100644 echobase-domain/src/main/java/fr/ifremer/echobase/EchoBasePredicates.java create mode 100644 echobase-domain/src/main/java/fr/ifremer/echobase/entities/ImportLogs.java create mode 100644 echobase-domain/src/main/java/fr/ifremer/echobase/entities/data/Cells.java create mode 100644 echobase-domain/src/main/java/fr/ifremer/echobase/entities/data/DataProcessings.java create mode 100644 echobase-domain/src/main/java/fr/ifremer/echobase/entities/data/Echotypes.java create mode 100644 echobase-domain/src/main/java/fr/ifremer/echobase/entities/data/Operations.java create mode 100644 echobase-domain/src/main/java/fr/ifremer/echobase/entities/data/Results.java create mode 100644 echobase-domain/src/main/java/fr/ifremer/echobase/entities/data/Transects.java create mode 100644 echobase-domain/src/main/java/fr/ifremer/echobase/entities/data/Voyages.java create mode 100644 echobase-domain/src/main/java/fr/ifremer/echobase/entities/references/AcousticInstruments.java create mode 100644 echobase-domain/src/main/java/fr/ifremer/echobase/entities/references/AgeCategories.java create mode 100644 echobase-domain/src/main/java/fr/ifremer/echobase/entities/references/AreaOfOperations.java create mode 100644 echobase-domain/src/main/java/fr/ifremer/echobase/entities/references/CellMethods.java create mode 100644 echobase-domain/src/main/java/fr/ifremer/echobase/entities/references/CellTypes.java create mode 100644 echobase-domain/src/main/java/fr/ifremer/echobase/entities/references/DataMetadatas.java create mode 100644 echobase-domain/src/main/java/fr/ifremer/echobase/entities/references/DataQualities.java create mode 100644 echobase-domain/src/main/java/fr/ifremer/echobase/entities/references/DataTypes.java create mode 100644 echobase-domain/src/main/java/fr/ifremer/echobase/entities/references/DepthStratums.java create mode 100644 echobase-domain/src/main/java/fr/ifremer/echobase/entities/references/EchotypeCategories.java create mode 100644 echobase-domain/src/main/java/fr/ifremer/echobase/entities/references/GearMetadatas.java create mode 100644 echobase-domain/src/main/java/fr/ifremer/echobase/entities/references/Gears.java create mode 100644 echobase-domain/src/main/java/fr/ifremer/echobase/entities/references/Missions.java create mode 100644 echobase-domain/src/main/java/fr/ifremer/echobase/entities/references/OperationEvents.java create mode 100644 echobase-domain/src/main/java/fr/ifremer/echobase/entities/references/OperationMetadatas.java create mode 100644 echobase-domain/src/main/java/fr/ifremer/echobase/entities/references/ReferenceDatumTypes.java create mode 100644 echobase-domain/src/main/java/fr/ifremer/echobase/entities/references/ReferenceDatums.java create mode 100644 echobase-domain/src/main/java/fr/ifremer/echobase/entities/references/SampleDataTypes.java create mode 100644 echobase-domain/src/main/java/fr/ifremer/echobase/entities/references/SexCategories.java create mode 100644 echobase-domain/src/main/java/fr/ifremer/echobase/entities/references/SizeCategories.java create mode 100644 echobase-domain/src/main/java/fr/ifremer/echobase/entities/references/SpeciesCategories.java create mode 100644 echobase-domain/src/main/java/fr/ifremer/echobase/entities/references/Stratas.java create mode 100644 echobase-domain/src/main/java/fr/ifremer/echobase/entities/references/VesselTypes.java create mode 100644 echobase-domain/src/main/java/fr/ifremer/echobase/entities/references/Vessels.java create mode 100644 echobase-services/src/main/java/fr/ifremer/echobase/services/service/CoserIndicators.java create mode 100644 echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/exportCoser/GetAvailableIndicatorsForMission.java -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.