Author: tchemit Date: 2013-04-04 07:49:42 +0200 (Thu, 04 Apr 2013) New Revision: 724 Url: http://forge.codelutin.com/projects/tutti/repository/revisions/724 Log: refs #2227: [CAPTURE] Revoir la structure de l'arbre d'?\195?\169chantillonage (fix SpeciesBatch) Modified: trunk/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/service/batch/BatchPersistenceHelper.java Modified: trunk/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/service/batch/BatchPersistenceHelper.java =================================================================== --- trunk/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/service/batch/BatchPersistenceHelper.java 2013-04-03 18:25:40 UTC (rev 723) +++ trunk/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/service/batch/BatchPersistenceHelper.java 2013-04-04 05:49:42 UTC (rev 724) @@ -347,17 +347,6 @@ if (sortingMeasurements != null) { sortingMeasurements.removeAll(notChangedSortingMeasurements); } -// 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 setBatchParents(SpeciesBatch source, @@ -388,18 +377,11 @@ } Integer qualitativeValueId = convertSampleCategoryValueIntoQualitativeId(source.getSampleCategoryValue()); - //FIXME-TC Should have PMFM_ID_SORTING_TYPE > PMFM_ID_SORTING_TYPE_2 > pmfmId ? -// parentBatch = catchBatchDao.getSortingBatch(catchBatch.getChildBatchs(), -// BATCH_PMFM_ID, pmfmId, qualitativeValueId, -// BATCH_PMFM_ID, enumeration.PMFM_ID_SORTING_TYPE, batchPmfmId, -// BATCH_PMFM_ID, enumeration.PMFM_ID_SORTING_TYPE_2, enumeration.QUALITATIVE_ID_SORTING_TYPE_2_ALIVE_ITEMIZED); parentBatch = catchBatchDao.getSortingBatch(catchBatch.getChildBatchs(), + BATCH_PMFM_ID, pmfmId, qualitativeValueId, // vrac | hors vrac BATCH_PMFM_ID, enumeration.PMFM_ID_SORTING_TYPE, batchPmfmId, // species | Benthos - BATCH_PMFM_ID, enumeration.PMFM_ID_SORTING_TYPE_2, enumeration.QUALITATIVE_ID_SORTING_TYPE_2_ALIVE_ITEMIZED, // vivant trié - BATCH_PMFM_ID, pmfmId, qualitativeValueId); // vrac | hors vrac - -// // Parent Batch -// target.setParentBatch(parentBatch); + BATCH_PMFM_ID, enumeration.PMFM_ID_SORTING_TYPE_2, enumeration.QUALITATIVE_ID_SORTING_TYPE_2_ALIVE_ITEMIZED // vivant trié + ); } @@ -487,17 +469,6 @@ if (sortingMeasurements != null) { sortingMeasurements.removeAll(notChangedSortingMeasurements); } - -// 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 Integer convertSampleCategoryValueIntoQualitativeId(Serializable value) {