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

r1360 - in trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches: benthos species
by tchemit＠users.forge.codelutin.com Nov. 17, 2013

Nov. 17, 2013

Author: tchemit Date: 2013-11-17 18:39:59 +0100 (Sun, 17 Nov 2013) New Revision: 1360 Url: http://forge.codelutin.com/projects/tutti/repository/revisions/1360 Log: fixes #3808: [CAPTURE] erreur suite suppression d'un lot esp?\195?\168ce et fermeture de l'?\195?\169cran de saisie. A analyser Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/benthos/RemoveBenthosBatchAction.java trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/benthos/RemoveBenthosSubBatchAction.java trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/RemoveSpeciesBatchAction.java trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/RemoveSpeciesSubBatchAction.java Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/benthos/RemoveBenthosBatchAction.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/benthos/RemoveBenthosBatchAction.java 2013-11-17 17:12:02 UTC (rev 1359) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/benthos/RemoveBenthosBatchAction.java 2013-11-17 17:39:59 UTC (rev 1360) @@ -31,8 +31,6 @@ import fr.ifremer.tutti.ui.swing.util.TuttiUIUtil; import fr.ifremer.tutti.ui.swing.util.action.AbstractTuttiAction; import jaxx.runtime.SwingUtil; -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; import org.jdesktop.swingx.JXTable; import javax.swing.JOptionPane; @@ -48,10 +46,6 @@ */ public class RemoveBenthosBatchAction extends AbstractTuttiAction<BenthosBatchUIModel, BenthosBatchUI, BenthosBatchUIHandler> { - /** Logger. */ - private static final Log log = - LogFactory.getLog(RemoveBenthosBatchAction.class); - /** * Selected row to treat. * @@ -59,6 +53,13 @@ */ protected int rowIndex; + /** + * Rows to delete after all. + * + * @since 2.10 + */ + protected Set<BenthosBatchRowModel> rowToRemove; + public RemoveBenthosBatchAction(BenthosBatchUIHandler handler) { super(handler, false); } @@ -115,21 +116,10 @@ } // collect of rows to remove from model - Set<BenthosBatchRowModel> rowToRemove = Sets.newHashSet(); + rowToRemove = Sets.newHashSet(); rowToRemove.add(selectedBatch); handler.collectChildren(selectedBatch, rowToRemove); - -//FIXME TC-2013-10-14 Comment this line, don't see the point -// table.clearSelection(); - - // remove all rows from the model - getModel().getRows().removeAll(rowToRemove); - -// // refresh table from parent batch row index to the end -// tableModel.fireTableDataChanged(); -// -// TuttiUIUtil.selectFirstCellOnFirstRowAndStopEditing(table); } @Override @@ -138,6 +128,9 @@ JXTable table = handler.getTable(); + // remove all rows from the model + getModel().getRows().removeAll(rowToRemove); + // refresh table from parent batch row index to the end handler.getTableModel().fireTableDataChanged(); Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/benthos/RemoveBenthosSubBatchAction.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/benthos/RemoveBenthosSubBatchAction.java 2013-11-17 17:12:02 UTC (rev 1359) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/benthos/RemoveBenthosSubBatchAction.java 2013-11-17 17:39:59 UTC (rev 1360) @@ -53,6 +53,20 @@ */ protected int rowIndex; + /** + * Rows to delete after all. + * + * @since 2.10 + */ + protected Set<BenthosBatchRowModel> rowToRemove; + + /** + * Parent batch of rows to delete. + * + * @since 2.10 + */ + protected BenthosBatchRowModel parentBatch; + public RemoveBenthosSubBatchAction(BenthosBatchUIHandler handler) { super(handler, false); } @@ -87,7 +101,7 @@ Preconditions.checkState(rowIndex != -1, "Cant remove sub batch if no batch selected"); - BenthosBatchRowModel parentBatch = handler.getTableModel().getEntry(rowIndex); + parentBatch = handler.getTableModel().getEntry(rowIndex); Preconditions.checkState(!TuttiEntities.isNew(parentBatch), "Can't remove sub batch if batch is not persisted"); @@ -96,30 +110,9 @@ persistenceService.deleteSpeciesSubBatch(parentBatch.getId()); // collect of rows to remove from model - Set<BenthosBatchRowModel> rowToRemove = Sets.newHashSet(); + rowToRemove = Sets.newHashSet(); handler.collectChildren(parentBatch, rowToRemove); - -//FIXME TC-2013-10-14 Comment this line, don't see the point -// table.clearSelection(); - - // remove all rows from the model - getModel().getRows().removeAll(rowToRemove); - - // remove childs from parent batch - parentBatch.setChildBatch(null); - -// // refresh table from parent batch row index to the end -// handler.getTableModel().fireTableDataChanged(); -// -// // select parent batch row -// AbstractSelectTableAction.doSelectCell(table, rowIndex, 0); -// -// if (table.isEditing()) { -// -// // but no edit it -// table.getCellEditor().stopCellEditing(); -// } } @Override @@ -128,6 +121,12 @@ JXTable table = handler.getTable(); + // remove all rows from the model + getModel().getRows().removeAll(rowToRemove); + + // remove childs from parent batch + parentBatch.setChildBatch(null); + // refresh table from parent batch row index to the end handler.getTableModel().fireTableDataChanged(); Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/RemoveSpeciesBatchAction.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/RemoveSpeciesBatchAction.java 2013-11-17 17:12:02 UTC (rev 1359) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/RemoveSpeciesBatchAction.java 2013-11-17 17:39:59 UTC (rev 1360) @@ -31,8 +31,6 @@ import fr.ifremer.tutti.ui.swing.util.TuttiUIUtil; import fr.ifremer.tutti.ui.swing.util.action.AbstractTuttiAction; import jaxx.runtime.SwingUtil; -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; import org.jdesktop.swingx.JXTable; import javax.swing.JOptionPane; @@ -48,9 +46,12 @@ */ public class RemoveSpeciesBatchAction extends AbstractTuttiAction<SpeciesBatchUIModel, SpeciesBatchUI, SpeciesBatchUIHandler> { - /** Logger. */ - private static final Log log = - LogFactory.getLog(RemoveSpeciesBatchAction.class); + /** + * Rows to delete after all. + * + * @since 2.10 + */ + protected Set<SpeciesBatchRowModel> rowToRemove; public RemoveSpeciesBatchAction(SpeciesBatchUIHandler handler) { super(handler, false); @@ -85,6 +86,7 @@ "Cant remove batch if no batch selected"); SpeciesBatchTableModel tableModel = handler.getTableModel(); + SpeciesBatchRowModel selectedBatch = tableModel.getEntry(rowIndex); Preconditions.checkState(!TuttiEntities.isNew(selectedBatch), @@ -106,32 +108,10 @@ } // collect of rows to remove from model - Set<SpeciesBatchRowModel> rowToRemove = Sets.newHashSet(); + rowToRemove = Sets.newHashSet(); rowToRemove.add(selectedBatch); handler.collectChildren(selectedBatch, rowToRemove); - -//FIXME TC-2013-10-14 Comment this line, don't see the point -// table.clearSelection(); - - // remove all rows from the model - getModel().getRows().removeAll(rowToRemove); - -// // refresh table from parent batch row index to the end -// tableModel.fireTableDataChanged(); -// -// if (!getModel().getRows().isEmpty()) { -// -// // select first row -// AbstractSelectTableAction.doSelectCell(table, 0, 0); -// -// } -// -// if (table.isEditing()) { -// -// // but no edit it -// table.getCellEditor().stopCellEditing(); -// } } @Override @@ -140,6 +120,9 @@ JXTable table = handler.getTable(); + // remove all rows from the model + getModel().getRows().removeAll(rowToRemove); + // refresh table from parent batch row index to the end handler.getTableModel().fireTableDataChanged(); Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/RemoveSpeciesSubBatchAction.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/RemoveSpeciesSubBatchAction.java 2013-11-17 17:12:02 UTC (rev 1359) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/RemoveSpeciesSubBatchAction.java 2013-11-17 17:39:59 UTC (rev 1360) @@ -53,6 +53,20 @@ */ protected int rowIndex; + /** + * Rows to delete after all. + * + * @since 2.10 + */ + protected Set<SpeciesBatchRowModel> rowToRemove; + + /** + * Parent batch of rows to delete. + * + * @since 2.10 + */ + protected SpeciesBatchRowModel parentBatch; + public RemoveSpeciesSubBatchAction(SpeciesBatchUIHandler handler) { super(handler, false); } @@ -87,8 +101,9 @@ Preconditions.checkState(rowIndex != -1, "Cant remove sub batch if no batch selected"); - SpeciesBatchRowModel parentBatch = handler.getTableModel().getEntry(rowIndex); + parentBatch = handler.getTableModel().getEntry(rowIndex); + Preconditions.checkState(!TuttiEntities.isNew(parentBatch), "Can't remove sub batch if batch is not persisted"); @@ -96,38 +111,24 @@ persistenceService.deleteSpeciesSubBatch(parentBatch.getId()); // collect of rows to remove from model - Set<SpeciesBatchRowModel> rowToRemove = Sets.newHashSet(); + rowToRemove = Sets.newHashSet(); + handler.collectChildren(parentBatch, rowToRemove); + } -//FIXME TC-2013-10-14 Comment this line, don't see the point -// table.clearSelection(); + @Override + public void postSuccessAction() { + super.postSuccessAction(); + JXTable table = handler.getTable(); + // remove all rows from the model getModel().getRows().removeAll(rowToRemove); // remove childs from parent batch parentBatch.setChildBatch(null); -// // refresh table from parent batch row index to the end -// handler.getTableModel().fireTableDataChanged(); -// -// // select parent batch row -// TuttiUIUtil.selectFirstCellOnRow(table, rowIndex); -// -// if (table.isEditing()) { -// -// // but no edit it -// table.getCellEditor().stopCellEditing(); -// } - } - - @Override - public void postSuccessAction() { - super.postSuccessAction(); - - JXTable table = handler.getTable(); - // refresh table from parent batch row index to the end handler.getTableModel().fireTableDataChanged();

1 0

r1359 - trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches
by tchemit＠users.forge.codelutin.com Nov. 17, 2013

Nov. 17, 2013

Author: tchemit Date: 2013-11-17 18:12:02 +0100 (Sun, 17 Nov 2013) New Revision: 1359 Url: http://forge.codelutin.com/projects/tutti/repository/revisions/1359 Log: fixes #3822: Am?\195?\169liorer l'affichage lors de l'?\195?\169l?\195?\169vation des poids Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/ComputeBatchWeightsAction.java Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/ComputeBatchWeightsAction.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/ComputeBatchWeightsAction.java 2013-11-17 17:10:15 UTC (rev 1358) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/ComputeBatchWeightsAction.java 2013-11-17 17:12:02 UTC (rev 1359) @@ -59,7 +59,7 @@ protected final WeightCleaningService cleaningService; public ComputeBatchWeightsAction(EditCatchesUIHandler handler) { - super(handler, false); + super(handler, true); cleaningService = getContext().getWeightCleaningService(); }

1 0

r1358 - in trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches: benthos species
by tchemit＠users.forge.codelutin.com Nov. 17, 2013

Nov. 17, 2013

Author: tchemit Date: 2013-11-17 18:10:15 +0100 (Sun, 17 Nov 2013) New Revision: 1358 Url: http://forge.codelutin.com/projects/tutti/repository/revisions/1358 Log: fixes #3821: [CAPTURES] Poids sous-?\195?\169chantillon?\195?\169 calcul?\195?\169 non converti Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/benthos/BenthosBatchRowModel.java trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/SpeciesBatchRowModel.java Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/benthos/BenthosBatchRowModel.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/benthos/BenthosBatchRowModel.java 2013-11-17 17:09:27 UTC (rev 1357) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/benthos/BenthosBatchRowModel.java 2013-11-17 17:10:15 UTC (rev 1358) @@ -249,6 +249,7 @@ // convert weight setWeight(weightUnit.fromEntity(getWeight())); + setComputedWeight(weightUnit.fromEntity(getComputedWeight())); } @Override Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/SpeciesBatchRowModel.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/SpeciesBatchRowModel.java 2013-11-17 17:09:27 UTC (rev 1357) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/SpeciesBatchRowModel.java 2013-11-17 17:10:15 UTC (rev 1358) @@ -214,6 +214,7 @@ // convert weight setWeight(weightUnit.fromEntity(getWeight())); + setComputedWeight(weightUnit.fromEntity(getComputedWeight())); } @Override

1 0

r1357 - in trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing: content/operation/catches/benthos/frequency content/operation/catches/species/frequency util/attachment
by tchemit＠users.forge.codelutin.com Nov. 17, 2013

Nov. 17, 2013

Author: tchemit Date: 2013-11-17 18:09:27 +0100 (Sun, 17 Nov 2013) New Revision: 1357 Url: http://forge.codelutin.com/projects/tutti/repository/revisions/1357 Log: fixes #3780: [CAPTURE] probleme d'affichage de la valeur d'un nombre : ?\195?\169criture blanc sur blanc Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/benthos/frequency/BenthosFrequencyCellComponent.java trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/frequency/SpeciesFrequencyCellComponent.java trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/attachment/AttachmentCellRenderer.java Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/benthos/frequency/BenthosFrequencyCellComponent.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/benthos/frequency/BenthosFrequencyCellComponent.java 2013-11-17 16:35:25 UTC (rev 1356) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/benthos/frequency/BenthosFrequencyCellComponent.java 2013-11-17 17:09:27 UTC (rev 1357) @@ -356,6 +356,7 @@ int row, int column) { + component.setForeground(Color.BLACK); TuttiComputedOrNotData<Integer> data = (TuttiComputedOrNotData<Integer>) value; BenthosFrequencyCellComponent result = (BenthosFrequencyCellComponent) component.getTableCellRendererComponent(table, value, isSelected, hasFocus, row, column); Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/frequency/SpeciesFrequencyCellComponent.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/frequency/SpeciesFrequencyCellComponent.java 2013-11-17 16:35:25 UTC (rev 1356) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/frequency/SpeciesFrequencyCellComponent.java 2013-11-17 17:09:27 UTC (rev 1357) @@ -355,7 +355,7 @@ boolean hasFocus, int row, int column) { - + component.setForeground(Color.BLACK); TuttiComputedOrNotData<Integer> data = (TuttiComputedOrNotData<Integer>) value; SpeciesFrequencyCellComponent result = (SpeciesFrequencyCellComponent) component.getTableCellRendererComponent(table, value, isSelected, hasFocus, row, column); Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/attachment/AttachmentCellRenderer.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/attachment/AttachmentCellRenderer.java 2013-11-17 16:35:25 UTC (rev 1356) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/attachment/AttachmentCellRenderer.java 2013-11-17 17:09:27 UTC (rev 1357) @@ -33,6 +33,7 @@ import javax.swing.JTable; import javax.swing.UIManager; import javax.swing.table.DefaultTableCellRenderer; +import java.awt.Color; import java.awt.Font; import java.util.List; @@ -115,6 +116,7 @@ setText(textValue); setToolTipText(toolTipTextValue); setBackground(null); + setForeground(Color.BLACK); if (isSelected) { setFont(selectedFont);

1 0

r1356 - in trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/individualobservation: . create
by tchemit＠users.forge.codelutin.com Nov. 17, 2013

Nov. 17, 2013

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();

1 0

r1355 - in trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches: benthos/frequency species/frequency
by tchemit＠users.forge.codelutin.com Nov. 16, 2013

Nov. 16, 2013

Author: tchemit Date: 2013-11-16 08:20:13 +0100 (Sat, 16 Nov 2013) New Revision: 1355 Url: http://forge.codelutin.com/projects/tutti/repository/revisions/1355 Log: refs #3807: [CAPTURE] mensurations, non r?\195?\169initialisation des champs taile min et max entre deux ouverture de l'?\195?\169cran... Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/benthos/frequency/BenthosFrequencyUIHandler.java trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/frequency/SpeciesFrequencyUIHandler.java Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/benthos/frequency/BenthosFrequencyUIHandler.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/benthos/frequency/BenthosFrequencyUIHandler.java 2013-11-15 15:43:25 UTC (rev 1354) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/benthos/frequency/BenthosFrequencyUIHandler.java 2013-11-16 07:20:13 UTC (rev 1355) @@ -510,6 +510,8 @@ model.setTotalNumber(null); model.setTotalWeight(null); model.setSimpleCount(null); + model.setMinStep(null); + model.setMaxStep(null); frequencyEditor = editor; Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/frequency/SpeciesFrequencyUIHandler.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/frequency/SpeciesFrequencyUIHandler.java 2013-11-15 15:43:25 UTC (rev 1354) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/frequency/SpeciesFrequencyUIHandler.java 2013-11-16 07:20:13 UTC (rev 1355) @@ -507,6 +507,8 @@ model.setTotalNumber(null); model.setTotalWeight(null); model.setSimpleCount(null); + model.setMinStep(null); + model.setMaxStep(null); frequencyEditor = editor;

1 0

r1354 - trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/spatial
by tchemit＠users.forge.codelutin.com Nov. 15, 2013

Nov. 15, 2013

Author: tchemit Date: 2013-11-15 16:43:25 +0100 (Fri, 15 Nov 2013) New Revision: 1354 Url: http://forge.codelutin.com/projects/tutti/repository/revisions/1354 Log: fixes #3796: [CAPTURE] lat long, visiblement il aime pas quand je cr?\195?\169?\195?\169 un nouveau trait avec le nouveau formatage des lat long Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/spatial/DmsCoordinate.java Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/spatial/DmsCoordinate.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/spatial/DmsCoordinate.java 2013-11-15 10:03:35 UTC (rev 1353) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/spatial/DmsCoordinate.java 2013-11-15 15:43:25 UTC (rev 1354) @@ -207,7 +207,7 @@ } } - if (d == 0) { + if (d != null && d == 0) { d = null; } degree = d;

1 0

r1353 - in trunk/tutti-service/src: main/java/fr/ifremer/tutti/service/export test/java/fr/ifremer/tutti/service/export
by tchemit＠users.forge.codelutin.com Nov. 15, 2013

Nov. 15, 2013

Author: tchemit Date: 2013-11-15 11:03:35 +0100 (Fri, 15 Nov 2013) New Revision: 1353 Url: http://forge.codelutin.com/projects/tutti/repository/revisions/1353 Log: fixes #3817: [EXPORT GENERIQUE] id_operation et NumOrdre_Station ?\195?\160 renommer partout en Code_station et Numero_trait Modified: trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/export/AccidentalCatchExportModel.java trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/export/CatchExportModel.java trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/export/IndividualObservationExportModel.java trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/export/MarineLitterExportModel.java trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/export/ParameterExportModel.java trunk/tutti-service/src/test/java/fr/ifremer/tutti/service/export/TuttiExportService2Test.java trunk/tutti-service/src/test/java/fr/ifremer/tutti/service/export/TuttiExportServiceTest.java Modified: trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/export/AccidentalCatchExportModel.java =================================================================== --- trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/export/AccidentalCatchExportModel.java 2013-11-12 09:47:43 UTC (rev 1352) +++ trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/export/AccidentalCatchExportModel.java 2013-11-15 10:03:35 UTC (rev 1353) @@ -74,8 +74,8 @@ newColumnForExport("Serie", Cruise.PROPERTY_PROGRAM, Program.PROPERTY_NAME); newColumnForExport("Serie_Partielle", Cruise.PROPERTY_SURVEY_PART); newNullableColumnForExport("Engin", FishingOperation.PROPERTY_GEAR + "." + Gear.PROPERTY_NAME); - newColumnForExport("Id_Operation", FishingOperation.PROPERTY_STATION_NUMBER); - newColumnForExport("NumOrdre_Station", FishingOperation.PROPERTY_FISHING_OPERATION_NUMBER, TuttiCsvUtil.INTEGER); + newColumnForExport("Code_station", FishingOperation.PROPERTY_STATION_NUMBER); + newColumnForExport("Numero_Trait", FishingOperation.PROPERTY_FISHING_OPERATION_NUMBER, TuttiCsvUtil.INTEGER); newColumnForExport("Poche", FishingOperation.PROPERTY_MULTIRIG_AGGREGATION); newColumnForExport("Navire", Cruise.PROPERTY_VESSEL, TuttiCsvUtil.VESSEL_VALUE_FORMATTER); Modified: trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/export/CatchExportModel.java =================================================================== --- trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/export/CatchExportModel.java 2013-11-12 09:47:43 UTC (rev 1352) +++ trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/export/CatchExportModel.java 2013-11-15 10:03:35 UTC (rev 1353) @@ -68,8 +68,8 @@ newColumnForExport("Serie", Cruise.PROPERTY_PROGRAM, Program.PROPERTY_NAME); newColumnForExport("Serie_Partielle", Cruise.PROPERTY_SURVEY_PART); newNullableColumnForExport("Engin", FishingOperation.PROPERTY_GEAR + "." + Gear.PROPERTY_NAME); - newColumnForExport("Id_Operation", FishingOperation.PROPERTY_STATION_NUMBER); - newColumnForExport("NumOrdre_Station", FishingOperation.PROPERTY_FISHING_OPERATION_NUMBER, TuttiCsvUtil.INTEGER); + newColumnForExport("Code_station", FishingOperation.PROPERTY_STATION_NUMBER); + newColumnForExport("Numero_Trait", FishingOperation.PROPERTY_FISHING_OPERATION_NUMBER, TuttiCsvUtil.INTEGER); newColumnForExport("Poche", FishingOperation.PROPERTY_MULTIRIG_AGGREGATION); newColumnForExport("Navire", Cruise.PROPERTY_VESSEL, TuttiCsvUtil.VESSEL_VALUE_FORMATTER); newColumnForExport("Taxon", SpeciesBatch.PROPERTY_SPECIES + "." + Species.PROPERTY_REFERENCE_TAXON_ID, TuttiCsvUtil.INTEGER); Modified: trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/export/IndividualObservationExportModel.java =================================================================== --- trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/export/IndividualObservationExportModel.java 2013-11-12 09:47:43 UTC (rev 1352) +++ trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/export/IndividualObservationExportModel.java 2013-11-15 10:03:35 UTC (rev 1353) @@ -74,8 +74,8 @@ newColumnForExport("Serie", Cruise.PROPERTY_PROGRAM, Program.PROPERTY_NAME); newColumnForExport("Serie_Partielle", Cruise.PROPERTY_SURVEY_PART); newNullableColumnForExport("Engin", FishingOperation.PROPERTY_GEAR + "." + Gear.PROPERTY_NAME); - newColumnForExport("Id_Operation", FishingOperation.PROPERTY_STATION_NUMBER); - newColumnForExport("NumOrdre_Station", FishingOperation.PROPERTY_FISHING_OPERATION_NUMBER, TuttiCsvUtil.INTEGER); + newColumnForExport("Code_station", FishingOperation.PROPERTY_STATION_NUMBER); + newColumnForExport("Numero_Trait", FishingOperation.PROPERTY_FISHING_OPERATION_NUMBER, TuttiCsvUtil.INTEGER); newColumnForExport("Poche", FishingOperation.PROPERTY_MULTIRIG_AGGREGATION); newColumnForExport("Navire", Cruise.PROPERTY_VESSEL, TuttiCsvUtil.VESSEL_VALUE_FORMATTER); Modified: trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/export/MarineLitterExportModel.java =================================================================== --- trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/export/MarineLitterExportModel.java 2013-11-12 09:47:43 UTC (rev 1352) +++ trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/export/MarineLitterExportModel.java 2013-11-15 10:03:35 UTC (rev 1353) @@ -52,8 +52,8 @@ newColumnForExport("Serie", Cruise.PROPERTY_PROGRAM, Program.PROPERTY_NAME); newColumnForExport("Serie_Partielle", Cruise.PROPERTY_SURVEY_PART); newNullableColumnForExport("Engin", FishingOperation.PROPERTY_GEAR + "." + Gear.PROPERTY_NAME); - newColumnForExport("Id_Operation", FishingOperation.PROPERTY_STATION_NUMBER); - newColumnForExport("NumOrdre_Station", FishingOperation.PROPERTY_FISHING_OPERATION_NUMBER, TuttiCsvUtil.INTEGER); + newColumnForExport("Code_station", FishingOperation.PROPERTY_STATION_NUMBER); + newColumnForExport("Numero_Trait", FishingOperation.PROPERTY_FISHING_OPERATION_NUMBER, TuttiCsvUtil.INTEGER); newColumnForExport("Poche", FishingOperation.PROPERTY_MULTIRIG_AGGREGATION); newColumnForExport("Navire", Cruise.PROPERTY_VESSEL, TuttiCsvUtil.VESSEL_VALUE_FORMATTER); Modified: trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/export/ParameterExportModel.java =================================================================== --- trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/export/ParameterExportModel.java 2013-11-12 09:47:43 UTC (rev 1352) +++ trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/export/ParameterExportModel.java 2013-11-15 10:03:35 UTC (rev 1353) @@ -50,8 +50,8 @@ newColumnForExport("Annee", Cruise.PROPERTY_BEGIN_DATE, TuttiCsvUtil.YEAR); newColumnForExport("Serie", Cruise.PROPERTY_PROGRAM, Program.PROPERTY_NAME); newColumnForExport("Serie_Partielle", Cruise.PROPERTY_SURVEY_PART); - newColumnForExport("Id_Operation", FishingOperation.PROPERTY_STATION_NUMBER); - newColumnForExport("NumOrdre_Station", FishingOperation.PROPERTY_FISHING_OPERATION_NUMBER, TuttiCsvUtil.INTEGER); + newColumnForExport("Code_station", FishingOperation.PROPERTY_STATION_NUMBER); + newColumnForExport("Numero_Trait", FishingOperation.PROPERTY_FISHING_OPERATION_NUMBER, TuttiCsvUtil.INTEGER); newColumnForExport("Poche", FishingOperation.PROPERTY_MULTIRIG_AGGREGATION); newColumnForExport("Code_PMFM", ParameterExportRow.PROPERTY_CARACTERISTIC, Caracteristic.PROPERTY_ID); Modified: trunk/tutti-service/src/test/java/fr/ifremer/tutti/service/export/TuttiExportService2Test.java =================================================================== --- trunk/tutti-service/src/test/java/fr/ifremer/tutti/service/export/TuttiExportService2Test.java 2013-11-12 09:47:43 UTC (rev 1352) +++ trunk/tutti-service/src/test/java/fr/ifremer/tutti/service/export/TuttiExportService2Test.java 2013-11-15 10:03:35 UTC (rev 1353) @@ -147,7 +147,7 @@ URL url = new URL(urlPrefix + "accidentalCatch.csv"); ServiceDbResource.assertFileContent("accidentalCatch export:\n", url, - "Annee;Serie;Serie_Partielle;Engin;Id_Operation;NumOrdre_Station;Poche;Navire;BatchId;ReferenceTaxonId;ReferenceTaxonName;Commentaire;CaracteristicId;CaracteristicValue"); + "Annee;Serie;Serie_Partielle;Engin;Code_station;Numero_Trait;Poche;Navire;BatchId;ReferenceTaxonId;ReferenceTaxonName;Commentaire;CaracteristicId;CaracteristicValue"); } @@ -191,7 +191,7 @@ URL url = new URL(urlPrefix + "individualObservation.csv"); ServiceDbResource.assertFileContent("individualObservation export:\n", url, - "Annee;Serie;Serie_Partielle;Engin;Id_Operation;NumOrdre_Station;Poche;Navire;BatchId;ReferenceTaxonId;ReferenceTaxonName;Commentaire;CaracteristicId;CaracteristicValue"); + "Annee;Serie;Serie_Partielle;Engin;Code_station;Numero_Trait;Poche;Navire;BatchId;ReferenceTaxonId;ReferenceTaxonName;Commentaire;CaracteristicId;CaracteristicValue"); } @@ -201,7 +201,7 @@ URL url = new URL("jar:" + exportFile.toURI().toURL() + "!/exportCruise-" + CRUISE_ID + "/catch.csv"); ServiceDbResource.assertFileContent("Catch export:\n", url, - "Annee;Serie;Serie_Partielle;Engin;Id_Operation;NumOrdre_Station;Poche;Navire;Taxon;Nom_scientifique;Commentaire;V_HV;Num_Ordre_V_HV_H2;Tot_V_HV;Ech_V_HV;Type_Volume_Poids_V_HV;Unite_Volume_Poids_V_HV;Class_Tri_;Num_Ordre_Class_Tri__H2;Tot_Class_Tri_;Ech_Class_Tri_;Type_Volume_Poids_Class_Tri_;Unite_Volume_Poids_Class_Tri_;Sexe;Num_Ordre_Sexe_H2;Tot_Sexe;Ech_Sexe;Type_Volume_Poids_Sexe;Unite_Volume_Poids_Sexe;Maturité;Num_Ordre_Maturité_H2;Tot_Maturité;Ech_Maturité;Type_Volume_Poids_Maturité;Unite_Volume_Poids_Maturité;Age;Num_Ordre_Age_H2;Tot_Age;Ech_Age;Type_Volume_Poids_Age;Unite_Volume_Poids_Age;Code_Longueur;Libelle_Longueur;Taille;NumOrdre_Taille_H2;Poids_Classe_Taille;Unite_Taille;Precision_Mesure;Nbr;Poids_Reference;Coef_Elev_Espece_Capture\n" + + "Annee;Serie;Serie_Partielle;Engin;Code_station;Numero_Trait;Poche;Navire;Taxon;Nom_scientifique;Commentaire;V_HV;Num_Ordre_V_HV_H2;Tot_V_HV;Ech_V_HV;Type_Volume_Poids_V_HV;Unite_Volume_Poids_V_HV;Class_Tri_;Num_Ordre_Class_Tri__H2;Tot_Class_Tri_;Ech_Class_Tri_;Type_Volume_Poids_Class_Tri_;Unite_Volume_Poids_Class_Tri_;Sexe;Num_Ordre_Sexe_H2;Tot_Sexe;Ech_Sexe;Type_Volume_Poids_Sexe;Unite_Volume_Poids_Sexe;Maturité;Num_Ordre_Maturité_H2;Tot_Maturité;Ech_Maturité;Type_Volume_Poids_Maturité;Unite_Volume_Poids_Maturité;Age;Num_Ordre_Age_H2;Tot_Age;Ech_Age;Type_Volume_Poids_Age;Unite_Volume_Poids_Age;Code_Longueur;Libelle_Longueur;Taille;NumOrdre_Taille_H2;Poids_Classe_Taille;Unite_Taille;Precision_Mesure;Nbr;Poids_Reference;Coef_Elev_Espece_Capture\n" + "2013;test elevation;1;OTB 20/28.10;B;2;1;278970;1938;Agonus cataphractus;Trait B-2-1 AGONCAT-vrac 80;Vrac;1;80.0;;Poids;kg;NA;;;;;kg;NA;;;;;kg;NA;;;;;kg;NA;;;;;kg;;;;;;;;;80.0;3.5;\n" + "2013;test elevation;1;OTB 20/28.10;B;2;1;278970;1358;Alosa alosa;Trait B-2-1 ALOSALO Vrac|Trait B-2-1 ALOSALO Vrac - Male 60;Vrac;2;;;Poids;kg;NA;;;;;kg;Mâle;1;60.0;;Poids;kg;NA;;;;;kg;NA;;;;;kg;;;;;;;;;60.0;5.8333335;\n" + "2013;test elevation;1;OTB 20/28.10;B;2;1;278970;1358;Alosa alosa;Trait B-2-1 ALOSALO Vrac|Trait B-2-1 ALOSALO Vrac - Femelle 40.0;Vrac;2;;;Poids;kg;NA;;;;;kg;Femelle;2;40.0;;Poids;kg;NA;;;;;kg;NA;;;;;kg;;;;;;;;;40.0;8.75;\n" + @@ -243,7 +243,7 @@ URL url = new URL(urlPrefix + "marineLitter.csv"); ServiceDbResource.assertFileContent("marineLitter export:\n", url, - "Annee;Serie;Serie_Partielle;Engin;Id_Operation;NumOrdre_Station;Poche;Navire;MarineLitterCategory;MarineLitterSizeCategory;Number;Weight;Commentaire\n" + + "Annee;Serie;Serie_Partielle;Engin;Code_station;Numero_Trait;Poche;Navire;MarineLitterCategory;MarineLitterSizeCategory;Number;Weight;Commentaire\n" + "2013;test elevation;1;OTB 20/28.10;B;2;1;278970;L1 PLASTIQUE;A: <5*5 cm= 25 cm2;10;;\"Trait B-2-1 Macro dechet L1 Plastique (nb 10)\n" + "\n" + "avec \n" + @@ -257,7 +257,7 @@ URL url = new URL(urlPrefix + "parameter.csv"); ServiceDbResource.assertFileContent("parameter export:\n", url, - "Annee;Serie;Serie_Partielle;Id_Operation;NumOrdre_Station;Poche;Code_PMFM;Libelle_PMFm;Valeur"); + "Annee;Serie;Serie_Partielle;Code_station;Numero_Trait;Poche;Code_PMFM;Libelle_PMFm;Valeur"); } } Modified: trunk/tutti-service/src/test/java/fr/ifremer/tutti/service/export/TuttiExportServiceTest.java =================================================================== --- trunk/tutti-service/src/test/java/fr/ifremer/tutti/service/export/TuttiExportServiceTest.java 2013-11-12 09:47:43 UTC (rev 1352) +++ trunk/tutti-service/src/test/java/fr/ifremer/tutti/service/export/TuttiExportServiceTest.java 2013-11-15 10:03:35 UTC (rev 1353) @@ -89,7 +89,7 @@ "2013;Campagne CGFS;;A;2;1;GOV 19.7/25.9;278970;11/05/2013 08:00:00;;;11/05/2013 08:23:00;;;23;Strate 1D;NA;Localité 1D2;?;N;;NA;NA;NA;Robert BELLAIL|Herve BARONE;;OP2;0.0;Y;0.0;Y;0.0;Y;0.0;Y;;?;;?;0.0;Y;0.0;Y;0.0;Y;0.0;Y;0.0;Y;0.0;Y;0.0;Y;0.0;Y;0.0;Y;0.0;Y;0.0;Y;0.0;Y;0.0;Y;"; public static final String PARAMETER_CONTENT = - "Annee;Serie;Serie_Partielle;Id_Operation;NumOrdre_Station;Poche;Code_PMFM;Libelle_PMFm;Valeur\n" + + "Annee;Serie;Serie_Partielle;Code_station;Numero_Trait;Poche;Code_PMFM;Libelle_PMFm;Valeur\n" + "2013;Campagne CGFS;;A;1;1;1164;Catégorie UE - produit/lot - totale - Diffusion par une Halle à marée;Cat UE10;\n" + "2013;Campagne CGFS;;A;1;1;1302;(Gross Tonnage) : augmentation de tonnage accordée pour des raisons de sécurité - navire - totale - Déclaration d'un professionnel;10.0;\n" + "2013;Campagne CGFS;;A;1;1;194;\"Etat de la mer - masse d'eau, eau brute - totale - Observation par un observateur\";\"2 - belle, vagues de 0.1 à 0.5 mètres\";\n" + @@ -99,7 +99,7 @@ "2013;Campagne CGFS;;A;2;1;308;Nombre d'engin - engin - totale - Déclaration d'un professionnel;2.0;"; public static final String CATCH_CONTENT = - "Annee;Serie;Serie_Partielle;Engin;Id_Operation;NumOrdre_Station;Poche;Navire;Taxon;Nom_scientifique;Commentaire;V_HV;Num_Ordre_V_HV_H2;Tot_V_HV;Ech_V_HV;Type_Volume_Poids_V_HV;Unite_Volume_Poids_V_HV;Class_Tri_;Num_Ordre_Class_Tri__H2;Tot_Class_Tri_;Ech_Class_Tri_;Type_Volume_Poids_Class_Tri_;Unite_Volume_Poids_Class_Tri_;Sexe;Num_Ordre_Sexe_H2;Tot_Sexe;Ech_Sexe;Type_Volume_Poids_Sexe;Unite_Volume_Poids_Sexe;Maturité;Num_Ordre_Maturité_H2;Tot_Maturité;Ech_Maturité;Type_Volume_Poids_Maturité;Unite_Volume_Poids_Maturité;Age;Num_Ordre_Age_H2;Tot_Age;Ech_Age;Type_Volume_Poids_Age;Unite_Volume_Poids_Age;Code_Longueur;Libelle_Longueur;Taille;NumOrdre_Taille_H2;Poids_Classe_Taille;Unite_Taille;Precision_Mesure;Nbr;Poids_Reference;Coef_Elev_Espece_Capture\n" + + "Annee;Serie;Serie_Partielle;Engin;Code_station;Numero_Trait;Poche;Navire;Taxon;Nom_scientifique;Commentaire;V_HV;Num_Ordre_V_HV_H2;Tot_V_HV;Ech_V_HV;Type_Volume_Poids_V_HV;Unite_Volume_Poids_V_HV;Class_Tri_;Num_Ordre_Class_Tri__H2;Tot_Class_Tri_;Ech_Class_Tri_;Type_Volume_Poids_Class_Tri_;Unite_Volume_Poids_Class_Tri_;Sexe;Num_Ordre_Sexe_H2;Tot_Sexe;Ech_Sexe;Type_Volume_Poids_Sexe;Unite_Volume_Poids_Sexe;Maturité;Num_Ordre_Maturité_H2;Tot_Maturité;Ech_Maturité;Type_Volume_Poids_Maturité;Unite_Volume_Poids_Maturité;Age;Num_Ordre_Age_H2;Tot_Age;Ech_Age;Type_Volume_Poids_Age;Unite_Volume_Poids_Age;Code_Longueur;Libelle_Longueur;Taille;NumOrdre_Taille_H2;Poids_Classe_Taille;Unite_Taille;Precision_Mesure;Nbr;Poids_Reference;Coef_Elev_Espece_Capture\n" + "2013;Campagne CGFS;;GOV 19.7/25.9;A;1;1;278970;11242;Aaptos;|||;Vrac;1;100.0;;Poids;kg;G - Gros;1;80.0;;Poids;kg;Mâle;1;30.0;;Poids;kg;1 - Stade 1;1;10.0;5.0;Poids;kg;NA;;;;;kg;307;Longueur totale (LT) - individu - totale - Mesure au 1/2 cm par un observateur;10.0;1;;cm;0.5;5;5.0;20.0;\n" + "2013;Campagne CGFS;;GOV 19.7/25.9;A;1;1;278970;11242;Aaptos;|||;Vrac;1;100.0;;Poids;kg;G - Gros;1;80.0;;Poids;kg;Mâle;1;30.0;;Poids;kg;1 - Stade 1;1;10.0;5.0;Poids;kg;NA;;;;;kg;307;Longueur totale (LT) - individu - totale - Mesure au 1/2 cm par un observateur;10.5;2;;cm;0.5;2;5.0;20.0;\n" + "2013;Campagne CGFS;;GOV 19.7/25.9;A;1;1;278970;11242;Aaptos;|||;Vrac;1;100.0;;Poids;kg;G - Gros;1;80.0;;Poids;kg;Mâle;1;30.0;;Poids;kg;1 - Stade 1;1;10.0;5.0;Poids;kg;NA;;;;;kg;307;Longueur totale (LT) - individu - totale - Mesure au 1/2 cm par un observateur;11.0;3;;cm;0.5;1;5.0;20.0;\n" + @@ -111,7 +111,7 @@ "2013;Campagne CGFS;;GOV 19.7/25.9;A;1;1;278970;11242;Aaptos;;Hors Vrac;1;20.0;;Poids;kg;NA;;;;;kg;NA;;;;;kg;NA;;;;;kg;NA;;;;;kg;;;;;;;;2;20.0;1.0;"; public static final String CATCH_CONTENT_2 = - "Annee;Serie;Serie_Partielle;Engin;Id_Operation;NumOrdre_Station;Poche;Navire;Taxon;Nom_scientifique;Commentaire;V_HV;Num_Ordre_V_HV_H2;Tot_V_HV;Ech_V_HV;Type_Volume_Poids_V_HV;Unite_Volume_Poids_V_HV;Class_Tri_;Num_Ordre_Class_Tri__H2;Tot_Class_Tri_;Ech_Class_Tri_;Type_Volume_Poids_Class_Tri_;Unite_Volume_Poids_Class_Tri_;Sexe;Num_Ordre_Sexe_H2;Tot_Sexe;Ech_Sexe;Type_Volume_Poids_Sexe;Unite_Volume_Poids_Sexe;Maturité;Num_Ordre_Maturité_H2;Tot_Maturité;Ech_Maturité;Type_Volume_Poids_Maturité;Unite_Volume_Poids_Maturité;Age;Num_Ordre_Age_H2;Tot_Age;Ech_Age;Type_Volume_Poids_Age;Unite_Volume_Poids_Age;Code_Longueur;Libelle_Longueur;Taille;NumOrdre_Taille_H2;Poids_Classe_Taille;Unite_Taille;Precision_Mesure;Nbr;Poids_Reference;Coef_Elev_Espece_Capture\n" + + "Annee;Serie;Serie_Partielle;Engin;Code_station;Numero_Trait;Poche;Navire;Taxon;Nom_scientifique;Commentaire;V_HV;Num_Ordre_V_HV_H2;Tot_V_HV;Ech_V_HV;Type_Volume_Poids_V_HV;Unite_Volume_Poids_V_HV;Class_Tri_;Num_Ordre_Class_Tri__H2;Tot_Class_Tri_;Ech_Class_Tri_;Type_Volume_Poids_Class_Tri_;Unite_Volume_Poids_Class_Tri_;Sexe;Num_Ordre_Sexe_H2;Tot_Sexe;Ech_Sexe;Type_Volume_Poids_Sexe;Unite_Volume_Poids_Sexe;Maturité;Num_Ordre_Maturité_H2;Tot_Maturité;Ech_Maturité;Type_Volume_Poids_Maturité;Unite_Volume_Poids_Maturité;Age;Num_Ordre_Age_H2;Tot_Age;Ech_Age;Type_Volume_Poids_Age;Unite_Volume_Poids_Age;Code_Longueur;Libelle_Longueur;Taille;NumOrdre_Taille_H2;Poids_Classe_Taille;Unite_Taille;Precision_Mesure;Nbr;Poids_Reference;Coef_Elev_Espece_Capture\n" + "2010;Campagne CGFS;;GOV 19.7/25.9;20;20;1;278970;365;Aequipecten opercularis;taxon;Vrac;1;0.005;0.005;Poids;kg;NA;;;;;kg;NA;;;;;kg;NA;;;;;kg;NA;;;;;kg;;;;;;;;1;0.005;1.0;\n" + "2010;Campagne CGFS;;GOV 19.7/25.9;20;20;1;278970;491;Alloteuthis;taxon;Vrac;2;0.004;0.004;Poids;kg;NA;;;;;kg;NA;;;;;kg;NA;;;;;kg;NA;;;;;kg;;;;;;;;1;0.004;1.0;\n" + "2010;Campagne CGFS;;GOV 19.7/25.9;20;20;1;278970;300;Buccinum undatum;taxon;Vrac;3;0.015;0.015;Poids;kg;NA;;;;;kg;NA;;;;;kg;NA;;;;;kg;NA;;;;;kg;;;;;;;;1;0.015;1.0;\n" + @@ -143,12 +143,12 @@ "2010;Campagne CGFS;;GOV 19.7/25.9;20;20;1;278970;1662;Trachurus trachurus;taxon|categorie_individu;Vrac;15;;;Poids;kg;G - Gros;2;0.13;0.13;Poids;kg;NA;;;;;kg;NA;;;;;kg;NA;;;;;kg;306;Longueur totale (LT) - individu - totale - Mesure au cm par un observateur;23.0;1;;cm;1.0;1;0.13;1009.6154;"; public static final String MARINE_LITTER_CONTENT = - "Annee;Serie;Serie_Partielle;Engin;Id_Operation;NumOrdre_Station;Poche;Navire;MarineLitterCategory;MarineLitterSizeCategory;Number;Weight;Commentaire\n" + + "Annee;Serie;Serie_Partielle;Engin;Code_station;Numero_Trait;Poche;Navire;MarineLitterCategory;MarineLitterSizeCategory;Number;Weight;Commentaire\n" + "2013;Campagne CGFS;;GOV 19.7/25.9;A;1;1;278970;L1 PLASTIQUE;A: <5*5 cm= 25 cm2;2;5.0;S1;\n" + "2013;Campagne CGFS;;GOV 19.7/25.9;A;1;1;278970;L1a Sacs;B: <10*10 cm= 100 cm2;3;1.0;S2;"; public static final String INDIVIDUAL_OBSERVATION_CONTENT = - "Annee;Serie;Serie_Partielle;Engin;Id_Operation;NumOrdre_Station;Poche;Navire;BatchId;ReferenceTaxonId;ReferenceTaxonName;Commentaire;CaracteristicId;CaracteristicValue\n" + + "Annee;Serie;Serie_Partielle;Engin;Code_station;Numero_Trait;Poche;Navire;BatchId;ReferenceTaxonId;ReferenceTaxonName;Commentaire;CaracteristicId;CaracteristicValue\n" + "2013;Campagne CGFS;;GOV 19.7/25.9;A;1;1;278970;100000;11242;Aaptos;P1;220;0.1;\n" + "2013;Campagne CGFS;;GOV 19.7/25.9;A;1;1;278970;100000;11242;Aaptos;P1;1433;307;\n" + "2013;Campagne CGFS;;GOV 19.7/25.9;A;1;1;278970;100000;11242;Aaptos;P1;307;10.0;\n" + @@ -159,7 +159,7 @@ "2013;Campagne CGFS;;GOV 19.7/25.9;A;1;1;278970;100000;11242;Aaptos;P1;1388;5.0;"; public static final String ACCIDENTAL_CATCH_CONTENT = - "Annee;Serie;Serie_Partielle;Engin;Id_Operation;NumOrdre_Station;Poche;Navire;BatchId;ReferenceTaxonId;ReferenceTaxonName;Commentaire;CaracteristicId;CaracteristicValue\n" + + "Annee;Serie;Serie_Partielle;Engin;Code_station;Numero_Trait;Poche;Navire;BatchId;ReferenceTaxonId;ReferenceTaxonName;Commentaire;CaracteristicId;CaracteristicValue\n" + "2013;Campagne CGFS;;GOV 19.7/25.9;A;1;1;278970;100001;3835;Abalistes;;1393;Rejet mort;\n" + "2013;Campagne CGFS;;GOV 19.7/25.9;A;1;1;278970;100001;3835;Abalistes;;196;Femelle;\n" + "2013;Campagne CGFS;;GOV 19.7/25.9;A;1;1;278970;100001;3835;Abalistes;;220;10.0;\n" +

1 0

r1352 - trunk
by tchemit＠users.forge.codelutin.com Nov. 12, 2013

Nov. 12, 2013

Author: tchemit Date: 2013-11-12 10:47:43 +0100 (Tue, 12 Nov 2013) New Revision: 1352 Url: http://forge.codelutin.com/projects/tutti/repository/revisions/1352 Log: fix report update Modified: trunk/pom.xml Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2013-11-12 09:33:26 UTC (rev 1351) +++ trunk/pom.xml 2013-11-12 09:47:43 UTC (rev 1352) @@ -171,7 +171,7 @@ <dbVersion>2013.08.22</dbVersion>  - <reportVersion>2013.11.02</reportVersion> + <reportVersion>2013.11.10</reportVersion> </properties>

1 0

[ANN] - Tutti 2.9 released
by forge.codelutin.com Release Notification Nov. 12, 2013

Nov. 12, 2013

The Tutti team is pleased to announce the tutti-2.9 release! Outil de saisie de données d'opérations et de captures au cours des campagnes halieutiques. Documentation of the project can be found here: http://forge.codelutin.com/projects/tutti Changes ------- Changes in this version include: New features: o Mise en place d'un module de rapports birt Issue: 3755. Thanks to Tony Chemit. Resolved by tchemit. o [PROTOCOLE] probleme import toutes les carctéristiques : ça marche pas Issue: 3688. Thanks to Vincent BADTS. Resolved by tchemit. Fixed Bugs: o [PROTOCOLE] probleme Ajout espèce 1545 GADIARG Issue: 3747. Thanks to Tony Chemit. Resolved by tchemit. o [OPERATION] une erreur à analyser Issue: 3741. Thanks to Vincent BADTS. Resolved by tchemit. o [PROTOCOLE] la suppression d'une ligne dans le tableau espèces du protocole ne fonctionne pas (ça marche pour le benthos) Issue: 3739. Thanks to Vincent BADTS. Resolved by tchemit. o [CAPTURE] le bouton pièces jointe dans l'onglet résumé n'est plus accessible Issue: 3740. Thanks to Vincent BADTS. Resolved by tchemit. Changes: o [TECH] Updates jaxx to 2.5.30 Issue: 3763. Thanks to Tony Chemit. Resolved by tchemit. o [TECH] Updates mavenpom to 4.3 Issue: 3765. Thanks to Tony Chemit. Resolved by tchemit. Downloads --------- For a manual installation, you can download files here: http://forge.codelutin.com/projects/tutti/files * tutti-2.9-full-linux-i586.zip - http://forge.codelutin.com/attachments/download/1227 * tutti-2.9-full-windows-i586.zip - http://forge.codelutin.com/attachments/download/1228 Maven artifacts --------------- Artifacts are deployed in nuiton maven repository http://maven.nuiton.org/other-releases/ Have fun! -Tutti team

1 0