This is an automated email from the git hooks/post-receive script. New commit to branch develop in repository echobase. See http://git.codelutin.com/echobase.git commit b81ab5bc6f4d48f48e71e24ff92b777377eaef06 Merge: cdde5a7 41a5a73 Author: Tony CHEMIT <chemit@codelutin.com> Date: Wed Jan 21 18:08:23 2015 +0100 fixes #6513 .../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(-) -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.