Author: tchemit Date: 2013-11-17 17:35:25 +0100 (Sun, 17 Nov 2013) New Revision: 1356 Url: http://forge.codelutin.com/projects/tutti/repository/revisions/1356 Log: fixes #3806: [CAPTURE] mauvaise recopie des lots vers donn?\195?\169es individuelles Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/individualobservation/IndividualObservationBatchUIHandler.java trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/individualobservation/create/CreateIndividualObservationBatchUIModel.java Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/individualobservation/IndividualObservationBatchUIHandler.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/individualobservation/IndividualObservationBatchUIHandler.java 2013-11-16 07:20:13 UTC (rev 1355) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/individualobservation/IndividualObservationBatchUIHandler.java 2013-11-17 16:35:25 UTC (rev 1356) @@ -523,6 +523,10 @@ CaracteristicMap defaultCaracteristics = new CaracteristicMap(); defaultCaracteristics.putAll(model.getCaracteristics()); + List<Caracteristic> defaultCaracteristic = + Lists.newArrayList(model.getDefaultCaracteristic()); + defaultCaracteristic.addAll(defaultCaracteristics.keySet()); + for (SpeciesBatchRowModel leaf : leafs) { CaracteristicMap batchCaracteristics = new CaracteristicMap(); @@ -536,7 +540,7 @@ // not using this category continue; } - if (defaultCaracteristics.containsKey(sampleCategory.getCategoryDef().getCaracteristic())) { + if (defaultCaracteristic.contains(sampleCategory.getCategoryDef().getCaracteristic())) { // use default caracteristics defaultCaracteristics.put(sampleCategory.getCategoryDef().getCaracteristic(), @@ -599,27 +603,22 @@ // create a row for each frequency - int nbRow = TuttiEntities.getValueOrComputedValue(frequency.getNumber(), 0); + int nbRow = TuttiEntities.getValueOrComputedValue( + frequency.getNumber(), 0); Float weight = null; if (nbRow == 1) { // apply also weight found weight = frequency.getWeight(); + if (weight != null) { - if (weight == null) { - - // try to get it from batch - weight = TuttiEntities.getValueOrComputedValue( - leaf.getWeight(), - leaf.getFinestCategory().getCategoryWeight()); + // convert weight units + weight = speciesWeightUnit.toEntity(weight); + weight = weightUnit.fromEntity(weight); } - // convert weight units - weight = speciesWeightUnit.toEntity(weight); - weight = weightUnit.fromEntity(weight); } - for (int i = 0; i < nbRow; i++) { IndividualObservationBatchRowModel newRow = tableModel.createNewRow(); newRow.setSpecies(species); @@ -628,8 +627,7 @@ newRow.setLengthStepCaracteristic(frequency.getLengthStepCaracteristic()); newRow.getCaracteristics().putAll(batchCaracteristics); -// //FIXME Keep this ? -// newRow.getDefaultCaracteristics().putAll(defaultCaracteristics); + newRow.getDefaultCaracteristics().putAll(defaultCaracteristics); rowsToCreate.add(newRow); } Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/individualobservation/create/CreateIndividualObservationBatchUIModel.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/individualobservation/create/CreateIndividualObservationBatchUIModel.java 2013-11-16 07:20:13 UTC (rev 1355) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/individualobservation/create/CreateIndividualObservationBatchUIModel.java 2013-11-17 16:35:25 UTC (rev 1356) @@ -171,7 +171,6 @@ editObject.setCaracteristics(caracteristics); firePropertyChanged(IndividualObservationBatch.PROPERTY_CARACTERISTICS, null, caracteristics); - } public List<Species> getAvailableSpecies() { @@ -214,6 +213,10 @@ firePropertyChanged(PROPERTY_CREATE_FROM_BATCH, oldValue, createFromBatch); } + public List<Caracteristic> getDefaultCaracteristic() { + return defaultCaracteristic; + } + @Override protected IndividualObservationBatch newEntity() { return IndividualObservationBatchs.newIndividualObservationBatch();