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

r625 - in trunk/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence: . service
by tchemit＠users.forge.codelutin.com 15 Mar '13

15 Mar '13

Author: tchemit Date: 2013-03-15 01:23:55 +0100 (Fri, 15 Mar 2013) New Revision: 625 Url: http://forge.codelutin.com/projects/tutti/repository/revisions/625 Log: add getAgeCaracteristic method in persistence layer Modified: trunk/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/TuttiPersistence.java trunk/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/TuttiPersistenceImpl.java trunk/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/TuttiPersistenceNoDbImpl.java trunk/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/service/ReferentialPersistenceService.java trunk/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/service/ReferentialPersistenceServiceImpl.java Modified: trunk/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/TuttiPersistence.java =================================================================== --- trunk/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/TuttiPersistence.java 2013-03-14 17:54:16 UTC (rev 624) +++ trunk/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/TuttiPersistence.java 2013-03-15 00:23:55 UTC (rev 625) @@ -203,6 +203,8 @@ Caracteristic getMaturityCaracteristic(); + Caracteristic getAgeCaracteristic(); + Caracteristic getMacroWasteCategoryCaracteristic(); Caracteristic getMacroWasteSizeCategoryCaracteristic(); Modified: trunk/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/TuttiPersistenceImpl.java =================================================================== --- trunk/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/TuttiPersistenceImpl.java 2013-03-14 17:54:16 UTC (rev 624) +++ trunk/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/TuttiPersistenceImpl.java 2013-03-15 00:23:55 UTC (rev 625) @@ -286,6 +286,11 @@ } @Override + public Caracteristic getAgeCaracteristic() { + return referentialService.getAgeCaracteristic(); + } + + @Override public Caracteristic getMacroWasteCategoryCaracteristic() { return referentialService.getMacroWasteCategoryCaracteristic(); } Modified: trunk/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/TuttiPersistenceNoDbImpl.java =================================================================== --- trunk/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/TuttiPersistenceNoDbImpl.java 2013-03-14 17:54:16 UTC (rev 624) +++ trunk/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/TuttiPersistenceNoDbImpl.java 2013-03-15 00:23:55 UTC (rev 625) @@ -155,6 +155,11 @@ } @Override + public Caracteristic getAgeCaracteristic() { + throw new RuntimeException("method not implemented"); + } + + @Override public Caracteristic getMacroWasteCategoryCaracteristic() { throw new RuntimeException("method not implemented"); } Modified: trunk/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/service/ReferentialPersistenceService.java =================================================================== --- trunk/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/service/ReferentialPersistenceService.java 2013-03-14 17:54:16 UTC (rev 624) +++ trunk/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/service/ReferentialPersistenceService.java 2013-03-15 00:23:55 UTC (rev 625) @@ -193,6 +193,8 @@ Caracteristic getMaturityCaracteristic(); + Caracteristic getAgeCaracteristic(); + Caracteristic getMacroWasteCategoryCaracteristic(); Caracteristic getMacroWasteSizeCategoryCaracteristic(); Modified: trunk/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/service/ReferentialPersistenceServiceImpl.java =================================================================== --- trunk/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/service/ReferentialPersistenceServiceImpl.java 2013-03-14 17:54:16 UTC (rev 624) +++ trunk/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/service/ReferentialPersistenceServiceImpl.java 2013-03-15 00:23:55 UTC (rev 625) @@ -531,6 +531,13 @@ } @Override + public Caracteristic getAgeCaracteristic() { + Integer pmfmId = enumeration.PMFM_ID_AGE; + Caracteristic result = thisService.getCaracteristic(pmfmId); + return result; + } + + @Override public Caracteristic getMacroWasteCategoryCaracteristic() { Integer pmfmId = enumeration.PMFM_ID_MARINE_LITTER_TYPE; Caracteristic result = thisService.getCaracteristic(pmfmId);

1 0

r624 - trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/protocol
by kmorin＠users.forge.codelutin.com 14 Mar '13

14 Mar '13

Author: kmorin Date: 2013-03-14 18:54:16 +0100 (Thu, 14 Mar 2013) New Revision: 624 Url: http://forge.codelutin.com/projects/tutti/repository/revisions/624 Log: debug remove selected row Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/protocol/RemoveSpeciesProtocolAction.java Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/protocol/RemoveSpeciesProtocolAction.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/protocol/RemoveSpeciesProtocolAction.java 2013-03-14 16:58:31 UTC (rev 623) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/protocol/RemoveSpeciesProtocolAction.java 2013-03-14 17:54:16 UTC (rev 624) @@ -29,6 +29,7 @@ import fr.ifremer.tutti.persistence.entities.TuttiEntities; import fr.ifremer.tutti.persistence.entities.referential.Species; import fr.ifremer.tutti.ui.swing.util.action.AbstractTuttiAction; +import fr.ifremer.tutti.ui.swing.util.table.AbstractSelectTableAction; import jaxx.runtime.swing.editor.bean.BeanFilterableComboBox; import java.util.Collections; @@ -75,6 +76,7 @@ // all the species without a reftax code will be at the end Collections.sort(model.getAllSynonyms(), TuttiEntities.SPECIES_BY_NAME_COMPARATOR); + handler.getTable().clearSelection(); // remove the row from the model(do it after treating the comboBox which can be long) tableModel.removeRow(rowIndex);

1 0

r623 - in trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing: content/operation/catches/species content/operation/catches/species/frequency util/table
by kmorin＠users.forge.codelutin.com 14 Mar '13

14 Mar '13

Author: kmorin Date: 2013-03-14 17:58:31 +0100 (Thu, 14 Mar 2013) New Revision: 623 Url: http://forge.codelutin.com/projects/tutti/repository/revisions/623 Log: fixes #2054 [CAPTURE] - Tableau et largeur des colonnes - Mauvaise visualisation quand libell?\195?\169 trop long Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/SampleCategoryComponent.java trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/frequency/FrequencyCellComponent.java trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/table/AbstractTuttiTableUIHandler.java Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/SampleCategoryComponent.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/SampleCategoryComponent.java 2013-03-14 16:14:31 UTC (rev 622) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/SampleCategoryComponent.java 2013-03-14 16:58:31 UTC (rev 623) @@ -44,6 +44,7 @@ import java.awt.event.FocusEvent; import java.awt.event.FocusListener; import java.io.Serializable; +import javax.swing.JComponent; import jaxx.runtime.JAXXUtil; /** @@ -224,13 +225,11 @@ String text = null; if (sampleCategory != null) { C categoryValue = sampleCategory.getCategoryValue(); - if (categoryValue == null) { - text = ""; - } else { + if (categoryValue != null) { Float number = sampleCategory.getCategoryWeight(); Float computedNumber = sampleCategory.getComputedWeight(); - text = "<html>" + categoryDecorator.toString(categoryValue) + " /"; + text = "<html><span style='white-space: nowrap;'>" + categoryDecorator.toString(categoryValue) + " /"; if (sampleCategory.isSubSample()) { text += "/"; @@ -253,16 +252,20 @@ text += "-"; } - text += "</html>"; + text += "</span></html>"; } } - return delegate.getTableCellRendererComponent(table, - text, - isSelected, - hasFocus, - row, - column); + JComponent result = + (JComponent) delegate.getTableCellRendererComponent(table, + text, + isSelected, + hasFocus, + row, + column); + result.setToolTipText(text); + + return result; } } } Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/frequency/FrequencyCellComponent.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/frequency/FrequencyCellComponent.java 2013-03-14 16:14:31 UTC (rev 622) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/frequency/FrequencyCellComponent.java 2013-03-14 16:58:31 UTC (rev 623) @@ -93,6 +93,7 @@ text = " - "; } setText(text); + setToolTipText(text); } public static TableCellRenderer newRender(Color computedDataColor) { Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/table/AbstractTuttiTableUIHandler.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/table/AbstractTuttiTableUIHandler.java 2013-03-14 16:14:31 UTC (rev 622) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/table/AbstractTuttiTableUIHandler.java 2013-03-14 16:58:31 UTC (rev 623) @@ -468,7 +468,7 @@ Preconditions.checkNotNull(decorator); - DecoratorTableCellRenderer result = new DecoratorTableCellRenderer(decorator); + DecoratorTableCellRenderer result = new DecoratorTableCellRenderer(decorator, true); return result; }

1 0

r622 - in trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing: content/operation/catches util util/editor
by kmorin＠users.forge.codelutin.com 14 Mar '13

14 Mar '13

Author: kmorin Date: 2013-03-14 17:14:31 +0100 (Thu, 14 Mar 2013) New Revision: 622 Url: http://forge.codelutin.com/projects/tutti/repository/revisions/622 Log: fixes #2048 [ERGO] - Saisie des champs num?\195?\169riques : d?\195?\169cimales en plus et s?\195?\169parateur Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/EditCatchesUI.css trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/TuttiUIUtil.java trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/editor/TuttiComputedOrNotDataEditorHandler.java trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/editor/TuttiComputedOrNotDataTableCell.java Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/EditCatchesUI.css =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/EditCatchesUI.css 2013-03-14 16:04:51 UTC (rev 621) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/EditCatchesUI.css 2013-03-14 16:14:31 UTC (rev 622) @@ -171,11 +171,9 @@ } #speciesTotalSortedWeightField { - text: {getStringValue(model.getSpeciesTotalSortedWeight() != null ? - model.getSpeciesTotalSortedWeight() : - model.getSpeciesTotalSortedComputedWeight() != null ? - new java.text.DecimalFormat("#.###").format(model.getSpeciesTotalSortedComputedWeight()) : - null)}; + text: {model.getSpeciesTotalSortedWeight() != null ? + getStringValue(model.getSpeciesTotalSortedWeight()) : + getWeightStringValue(model.getSpeciesTotalSortedComputedWeight())}; _computed: true; } Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/TuttiUIUtil.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/TuttiUIUtil.java 2013-03-14 16:04:51 UTC (rev 621) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/TuttiUIUtil.java 2013-03-14 16:14:31 UTC (rev 622) @@ -202,15 +202,38 @@ return distanceText; } - protected static DecimalFormat weightDecimalFormat = new DecimalFormat("0.0##"); + private static DecimalFormatSymbols symbols; + public static DecimalFormatSymbols getDecimalFormatSymbols() { + if (symbols == null) { + symbols = new DecimalFormatSymbols(); + symbols.setDecimalSeparator('.'); + symbols.setGroupingSeparator(' '); + } + return symbols; + } + + private static DecimalFormat decimalFormat; + + public static DecimalFormat getDecimalFormat(int minDecimal, int maxDecimal) { + if (decimalFormat == null) { + decimalFormat = new DecimalFormat(); + decimalFormat.setDecimalFormatSymbols(getDecimalFormatSymbols()); + decimalFormat.setGroupingUsed(false); + } + decimalFormat.setMinimumFractionDigits(minDecimal); + decimalFormat.setMaximumFractionDigits(maxDecimal); + return decimalFormat; + } + public static String getWeightStringValue(Float weight) { String textValue; if (weight != null) { + DecimalFormat weightDecimalFormat = getDecimalFormat(1, 3); textValue = weightDecimalFormat.format(weight); } else { - textValue = JAXXUtil.getStringValue(weight); + textValue = ""; } return textValue; } Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/editor/TuttiComputedOrNotDataEditorHandler.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/editor/TuttiComputedOrNotDataEditorHandler.java 2013-03-14 16:04:51 UTC (rev 621) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/editor/TuttiComputedOrNotDataEditorHandler.java 2013-03-14 16:14:31 UTC (rev 622) @@ -27,6 +27,7 @@ import fr.ifremer.tutti.ui.swing.util.TuttiComputedOrNotData; import fr.ifremer.tutti.ui.swing.util.TuttiUI; +import fr.ifremer.tutti.ui.swing.util.TuttiUIUtil; import jaxx.runtime.JAXXUtil; import jaxx.runtime.swing.editor.NumberEditorHandler; import org.apache.commons.logging.Log; @@ -124,8 +125,8 @@ Number computedData = bean.getComputedData(); if (editor.isUseFloat() && decimalNumber != null && computedData != null) { - String format = "0.0" + StringUtils.repeat("#", decimalNumber - 1); - modelText = new DecimalFormat(format).format(computedData); + DecimalFormat decimalFormat = TuttiUIUtil.getDecimalFormat(1, decimalNumber); + modelText = decimalFormat.format(computedData); } else { modelText = JAXXUtil.getStringValue(computedData); } Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/editor/TuttiComputedOrNotDataTableCell.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/editor/TuttiComputedOrNotDataTableCell.java 2013-03-14 16:04:51 UTC (rev 621) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/editor/TuttiComputedOrNotDataTableCell.java 2013-03-14 16:14:31 UTC (rev 622) @@ -26,6 +26,7 @@ import fr.ifremer.tutti.ui.swing.util.TuttiComputedOrNotData; import fr.ifremer.tutti.ui.swing.util.TuttiUI; +import fr.ifremer.tutti.ui.swing.util.TuttiUIUtil; import jaxx.runtime.JAXXUtil; import javax.swing.AbstractCellEditor; @@ -220,9 +221,8 @@ foreground = computedDataColor; if (useFloat && decimalNumber != null && dataValue != null) { - String format = "0.0" + StringUtils.repeat("#", decimalNumber - 1); - text = JAXXUtil.getStringValue( - new DecimalFormat(format).format(dataValue)); + DecimalFormat decimalFormat = TuttiUIUtil.getDecimalFormat(1, decimalNumber); + text = JAXXUtil.getStringValue(decimalFormat.format(dataValue)); } else { text = JAXXUtil.getStringValue(dataValue); }

1 0

r621 - trunk/src/site/rst
by blavenier＠users.forge.codelutin.com 14 Mar '13

14 Mar '13

Author: blavenier Date: 2013-03-14 17:04:51 +0100 (Thu, 14 Mar 2013) New Revision: 621 Url: http://forge.codelutin.com/projects/tutti/repository/revisions/621 Log: Update the documentation on mapping UI/BDD : - add PMFM properties used for batch weights - add some warnings, to update the UML model Modified: trunk/src/site/rst/mapping.rst Modified: trunk/src/site/rst/mapping.rst =================================================================== --- trunk/src/site/rst/mapping.rst 2013-03-14 15:33:53 UTC (rev 620) +++ trunk/src/site/rst/mapping.rst 2013-03-14 16:04:51 UTC (rev 621) @@ -54,7 +54,7 @@ En écriture : pas de stockage (car doit logiquement être compatible avec ScientificCruise.departureDateTime) Série partielle - ScientificCruise.fishingTrip.surveyMeasurement (SURVEY_MEASUREMENT.ALPHA_NUMERICAL_VALUE, avec PMFM_FK=<PMFM_ID_SURVEY_PART>) + ScientificCruise.fishingTrip.surveyMeasurement (SURVEY_MEASUREMENT.ALPHA_NUMERICAL_VALUE, avec PMFM_FK=<PmfmId.SURVEY_PART>) Name ScientificCruise.name (SCIENTIFIC_CRUISE.NAME) @@ -77,7 +77,7 @@ Navire(s) Le premier navire dans le liste est stocké dans ScientificCruise.vessel (SCIENTIFIC_CRUISE.VESSEL_FK). Les navires suivants sont stockés dans ScientificCruise.fishingTrip.comments - derrière la balise : #VESSELS=<liste_des_IDs> + derrière la balise : "#VESSELS=<liste_des_IDs>" Il n'est pas certain qu'il soit nécessaire de stocker cette liste ailleurs, dans la mesure où elle peut être calculée à partir de la liste des navires associés à chaque opération (voir "Opération > Navire" ci-dessous), comme c'est le cas actuellement à l'ouverture d'une campagne de données historiques. @@ -88,13 +88,15 @@ Chef(s) de mission La première personne de la liste est stockée sous ScientificCruise.manager (SCIENTIFIC_CRUISE.MANAGER_PERSON_FK) En v1, les identifiant des personnes suivantes sont stockées dans ScientificCruise.fishingTrip.comments - derrière la balise : #MANAGERS=<liste_des_IDs> + derrière la balise : "#MANAGERS=<liste_des_IDs>" En v2, ce stockage devra se faire dans ScientificCruise.fishingTrip.vesselPersonFeatures avec un VesselPersonRole.id=<responsable_de_campagne> + **WARNING** : modèle UML + synchronisation Allegro à mettre à jour pour pouvoir importer/exporter VesselPersonFeatures et les tables liées Responsable(s) de salle de tri En v1, tous les identifiants des personnes sélectionnées sont stockées dans ScientificCruise.fishingTrip.comments - derrière la balise : #SORT_MANAGERS=<liste_des_IDs> + derrière la balise : "#SORT_MANAGERS=<liste_des_IDs>" En v2, ce stockage devra se faire dans ScientificCruise.fishingTrip.vesselPersonFeatures avec un VesselPersonRole.id=<responsable_salle_de_tri> + **WARNING** : modèle UML + synchronisation Allegro à mettre à jour pour pouvoir importer/exporter VesselPersonFeatures et les tables liées Commentaire ScientificCruise.comments (SCIENTIFIC_CRUISE.COMMENTS) @@ -103,13 +105,14 @@ ~~~~~ Code Station - Operation.vesselUseFeatures.vesselUseMeasurement (VESSEL_USE_MEASUREMENT.ALPHANUMERICAL_VALUE avec PMFM_FK=<PMFM_ID_STATION_NUMBER>) + Operation.vesselUseFeatures.vesselUseMeasurement (VESSEL_USE_MEASUREMENT.ALPHANUMERICAL_VALUE avec PMFM_FK=<PmfmId.STATION_NUMBER>) Numéro de trait Operation.name (OPERATION.NAME) : ajouté à la fin du "name", derrière le code de l'engin, pour rester compatible avec le format des données historiques. Numéro de poche - Operation.gearUseFeatures.gearUseMeasurement (GEAR_USE_MEASUREMENT.ALPHANUMERICAL_VALUE avec PMFM_FK=<PMFM_ID_MULTIRIG_AGGREGATION>) + Liste des poches observées + Operation.gearUseFeatures.gearUseMeasurement (GEAR_USE_MEASUREMENT.ALPHANUMERICAL_VALUE avec PMFM_FK=<PmfmId.MULTIRIG_AGGREGATION>) Strate Operation.gearUseFeatures.fishingArea.regulationLocation (FISHING_AREA2REG_LOCATION.LOCATION_FK associé au FISHING_AREA de l'opération) @@ -136,18 +139,19 @@ Operation.endDateTime et Operation.fishingEndDateTime (OPERATION.END_DATE_TIME et OPERATION.FISHING_END_DATE_TIME) Trait rectiligne - Operation.vesselUseFeatures.vesselUseMeasurement (VESSEL_USE_MEASUREMENT.QUALITATIVE_VALUE_FK avec PMFM_FK=<PMFM_ID_RECTILINEAR_OPERATION>) + Operation.vesselUseFeatures.vesselUseMeasurement (VESSEL_USE_MEASUREMENT.QUALITATIVE_VALUE_FK avec PMFM_FK=<PmfmId.RECTILINEAR_OPERATION>) Distance chalutée - Operation.vesselUseFeatures.vesselUseMeasurement (VESSEL_USE_MEASUREMENT.NUMERICAL_VALUE avec PMFM_FK=<PMFM_ID_TRAWL_DISTANCE>) + Operation.vesselUseFeatures.vesselUseMeasurement (VESSEL_USE_MEASUREMENT.NUMERICAL_VALUE avec PMFM_FK=<PmfmId.TRAWL_DISTANCE>) Trait valide ou invalide - Operation.vesselUseFeatures.vesselUseMeasurement (VESSEL_USE_MEASUREMENT.QUALITATIVE_VALUE_FK avec PMFM_FK=<PMFM_ID_HAUL_VALID>) + Operation.vesselUseFeatures.vesselUseMeasurement (VESSEL_USE_MEASUREMENT.QUALITATIVE_VALUE_FK avec PMFM_FK=<PmfmId.HAUL_VALID>) Saisisseur(s) En v1, les identifiant des personnes suivantes sont stockées dans ScientificCruise.fishingTrip.comments derrière la balise : #MANAGERS=<liste_des_IDs> En v2, ce stockage devra se faire dans ScientificCruise.fishingTrip.vesselPersonFeatures avec un VesselPersonRole.id=<responsable_de_campagne> + **WARNING** : modèle UML + synchronisation Allegro à mettre à jour pour pouvoir importer/exporter VesselPersonFeatures et les tables liées Navire Si le navire est identique au premier de la liste de la campagne : Operation.vessel (OPERATION.VESSEL_FK) @@ -172,71 +176,74 @@ Valeur Operation.gearUseFeatures.vesselUseMeasurement (GEAR_USE_MEASUREMENT.xxx - en fonction du type de PSFM : NUMERICAL_VALUE, ALPHANUMERICAL_VALUE ou QUALITATIVE_VALUE_FK) - En v2 (à confirmer), informations dispatcher dans différent onglet, en fonction du PSFM trouvé dans le protocole + **WARNING** : En v2 (version à confirmer), informations dispatcher dans différent onglet, en fonction du PSFM trouvé dans le protocole Capture > Résumé ~~~~~~~~~~~~~~~~ Poids TOTAL Lot "Capture" (BATCH avec IS_CATCH_BATCH=1) - CatchBatch.quantificationMeasurement.numericalValue (QUANTIFICATION_MEASUREMENT.NUMERICAL_VALUE avec IS_REFERENT=1) + Stocké uniquement si non calculé + CatchBatch.quantificationMeasurement.numericalValue (QUANTIFICATION_MEASUREMENT.NUMERICAL_VALUE avec IS_REFERENT=1 et PMFM_FK=<PmfmId.WEIGHT_OBSERVED>) Poids total VRAC Lot "Capture > Vrac" - Batch.quantificationMeasurement.numericalValue (QUANTIFICATION_MEASUREMENT.NUMERICAL_VALUE avec IS_REFERENT=1) + Batch.quantificationMeasurement.numericalValue (QUANTIFICATION_MEASUREMENT.NUMERICAL_VALUE avec IS_REFERENT=1 et PMFM_FK=<PmfmId.WEIGHT_OBSERVED>) Poids total HORS VRAC Lot "Capture > Hors Vrac" - Batch.quantificationMeasurement.numericalValue (QUANTIFICATION_MEASUREMENT.NUMERICAL_VALUE avec IS_REFERENT=1) + Batch.quantificationMeasurement.numericalValue (QUANTIFICATION_MEASUREMENT.NUMERICAL_VALUE avec IS_REFERENT=1 et PMFM_FK=<PmfmId.WEIGHT_OBSERVED>) Poids total NON TRIE Lot "Capture > Non trié" - Batch.quantificationMeasurement.numericalValue (QUANTIFICATION_MEASUREMENT.NUMERICAL_VALUE avec IS_REFERENT=1) + Batch.quantificationMeasurement.numericalValue (QUANTIFICATION_MEASUREMENT.NUMERICAL_VALUE avec IS_REFERENT=1 et PMFM_FK=<PmfmId.WEIGHT_OBSERVED>) Espèce > Poids TOTAL Sommme des poids des lots "Capture > xxx > Espèce" - Batch.quantificationMeasurement.numericalValue (QUANTIFICATION_MEASUREMENT.NUMERICAL_VALUE avec IS_REFERENT=1) + Batch.quantificationMeasurement.numericalValue (QUANTIFICATION_MEASUREMENT.NUMERICAL_VALUE avec IS_REFERENT=1 et PMFM_FK=<PmfmId.WEIGHT_OBSERVED>) Espèce > Poids total VRAC Lot "Capture > Vrac > Espèce" - Batch.quantificationMeasurement.numericalValue (QUANTIFICATION_MEASUREMENT.NUMERICAL_VALUE avec IS_REFERENT=1) + Batch.quantificationMeasurement.numericalValue (QUANTIFICATION_MEASUREMENT.NUMERICAL_VALUE avec IS_REFERENT=1 et PMFM_FK=<PmfmId.WEIGHT_OBSERVED>) Espèce > Poids total VRAC trié Calculé par tutti ? utile seulement si Thalassa ? Espèce > Poids total HORS VRAC TRIE Lot "Capture > Hors Vrac > Espèce" - Batch.quantificationMeasurement.numericalValue (QUANTIFICATION_MEASUREMENT.NUMERICAL_VALUE avec IS_REFERENT=1) + Batch.quantificationMeasurement.numericalValue (QUANTIFICATION_MEASUREMENT.NUMERICAL_VALUE avec IS_REFERENT=1 et PMFM_FK=<PmfmId.WEIGHT_OBSERVED>) Benthos > Poids TOTAL Sommme des poids des lots "Capture > xxx > Benthos" - Batch.quantificationMeasurement.numericalValue (QUANTIFICATION_MEASUREMENT.NUMERICAL_VALUE avec IS_REFERENT=1) + Batch.quantificationMeasurement.numericalValue (QUANTIFICATION_MEASUREMENT.NUMERICAL_VALUE avec IS_REFERENT=1 et PMFM_FK=<PmfmId.WEIGHT_OBSERVED>) Benthos > Poids total VRAC Lot "Capture > Vrac > Benthos" - Batch.quantificationMeasurement.numericalValue (QUANTIFICATION_MEASUREMENT.NUMERICAL_VALUE avec IS_REFERENT=1) + Batch.quantificationMeasurement.numericalValue (QUANTIFICATION_MEASUREMENT.NUMERICAL_VALUE avec IS_REFERENT=1 et PMFM_FK=<PmfmId.WEIGHT_OBSERVED>) Benthos > Poids total VRAC trié Calculé par tutti ? utile seulement si Thalassa ? Benthos > Poids total HORS VRAC TRIE Lot "Capture > Hors Vrac > Benthos" - Batch.quantificationMeasurement.numericalValue (QUANTIFICATION_MEASUREMENT.NUMERICAL_VALUE avec IS_REFERENT=1) + Batch.quantificationMeasurement.numericalValue (QUANTIFICATION_MEASUREMENT.NUMERICAL_VALUE avec IS_REFERENT=1 et PMFM_FK=<PmfmId.WEIGHT_OBSERVED>) Capture > Espèces ~~~~~~~~~~~~~~~~~ Espèce > Poids total VRAC Lot "Capture > Vrac > Espèce" - Batch.quantificationMeasurement.numericalValue (QUANTIFICATION_MEASUREMENT.NUMERICAL_VALUE avec IS_REFERENT=1) + Batch.quantificationMeasurement.numericalValue (QUANTIFICATION_MEASUREMENT.NUMERICAL_VALUE avec IS_REFERENT=1 et PMFM_FK=<PmfmId.WEIGHT_OBSERVED>) Poids inerte trié Lot "Capture > Vrac > Espèce > [TAXON_INERT]" - Batch.quantificationMeasurement.numericalValue (QUANTIFICATION_MEASUREMENT.NUMERICAL_VALUE avec IS_REFERENT=1) + Batch.referenceTaxon = [TAXON_INERT] (BATCH.REFERENCE_TAXON_FK=<ReferenceTaxonId.INERT>) + Batch.quantificationMeasurement.numericalValue (QUANTIFICATION_MEASUREMENT.NUMERICAL_VALUE avec IS_REFERENT=1 et PMFM_FK=<PmfmId.WEIGHT_OBSERVED>) + **WARNING** : le taxon référent "Inerte" n'existe pas encore, il faut le créé (action Ifremer/J.Martin ?) Poids vivant non détaillé trié Lot "Capture > Vrac > Espèce > Biota" - Batch.quantificationMeasurement.numericalValue (QUANTIFICATION_MEASUREMENT.NUMERICAL_VALUE avec IS_REFERENT=1) + Batch.quantificationMeasurement.numericalValue (QUANTIFICATION_MEASUREMENT.NUMERICAL_VALUE avec IS_REFERENT=1 et PMFM_FK=<PmfmId.WEIGHT_OBSERVED>) Tableau Chaque ligne du tableau est stockée sous la forme d'un lot (Batch) positionné @@ -249,7 +256,7 @@ Tableau > V/HV Vrac ou Hors Vrac : Batch.sortingMeasurement.qualitativeValue (SORTING_MEASUREMENT.QUALITATIVE_VALUE_FK avec PMFM_FK=<PmfmId.SORTED_UNSORTED>) - Poids : Batch.quantificationMeasurement.numericalValue (QUANTIFICATION_MEASUREMENT.NUMERICAL_VALUE avec IS_REFERENT=1) + Poids : Batch.quantificationMeasurement.numericalValue (QUANTIFICATION_MEASUREMENT.NUMERICAL_VALUE avec IS_REFERENT=1 et PMFM_FK=<PmfmId.WEIGHT_OBSERVED>) Tableau > Class. Tri Batch.sortingMeasurement.qualitativeValue (SORTING_MEASUREMENT.QUALITATIVE_VALUE_FK avec PMFM_FK=<PmfmId.SIZE_CATEGORY>) @@ -283,14 +290,15 @@ MeasurementFile.path : chemin du fichier (copier dans un répertoire, puis stocké en relatif ?) MeasurementFile.name : nom MeasurementFile.comments : commentaire + **WARNING** : modification de modèle à faire pour pouvoir avoir MEASUREMENT_FILE.PMFM_FK=null Mensuration > Type de mesure Dupliqué pour chaque lot de mensuration créé (un lot pour chaque taille saisie) Batch.sortingMeasurement.pmfm (SORTING_MEASUREMENT.PMFM_FK) Mensuration > Pas de la classe de taille - Non stocké (devrait dépendre de PSFM.precision ?) - Peut-etre peut on le calculé par analyse des mensuration saisie ? Et si aucune mesure prendre la précision du PSFM ? + **WARNING** : Non stocké, devrait dépendre de PSFM.precision ? + Peut-etre peut-on le calculer par analyse des mensurations saisies ? (et si aucune mesure prendre la précision du PSFM) Mensuration > Tableau Chaque ligne du tableau de mensuration est stocké sous la forme d'un lot

1 0

r620 - in trunk/tutti-ui-swing/src/main: filtered-resources java/fr/ifremer/tutti/ui/swing/content/cruise java/fr/ifremer/tutti/ui/swing/content/program java/fr/ifremer/tutti/ui/swing/content/protocol resources/i18n
by kmorin＠users.forge.codelutin.com 14 Mar '13

14 Mar '13

Author: kmorin Date: 2013-03-14 16:33:53 +0100 (Thu, 14 Mar 2013) New Revision: 620 Url: http://forge.codelutin.com/projects/tutti/repository/revisions/620 Log: fixes #2134 [ERGO] Remplacer les boutons Annuler par Fermer Removed: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/cruise/CancelEditCruiseAction.java trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/program/CancelEditProgramAction.java trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/protocol/CancelEditProtocolAction.java Modified: trunk/tutti-ui-swing/src/main/filtered-resources/tutti-help-en.properties trunk/tutti-ui-swing/src/main/filtered-resources/tutti-help-fr.properties trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/cruise/EditCruiseUI.css trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/cruise/EditCruiseUI.jaxx trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/cruise/EditCruiseUIHandler.java trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/program/EditProgramUI.css trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/program/EditProgramUI.jaxx trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/protocol/EditProtocolUI.css trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/protocol/EditProtocolUI.jaxx trunk/tutti-ui-swing/src/main/resources/i18n/tutti-ui-swing_en_GB.properties trunk/tutti-ui-swing/src/main/resources/i18n/tutti-ui-swing_fr_FR.properties Modified: trunk/tutti-ui-swing/src/main/filtered-resources/tutti-help-en.properties =================================================================== --- trunk/tutti-ui-swing/src/main/filtered-resources/tutti-help-en.properties 2013-03-14 14:45:03 UTC (rev 619) +++ trunk/tutti-ui-swing/src/main/filtered-resources/tutti-help-en.properties 2013-03-14 15:33:53 UTC (rev 620) @@ -1,5 +1,5 @@ #Generated by org.nuiton.jaxx.plugin.GenerateHelpIdsMojo -#Thu Mar 14 10:50:53 CET 2013 +#Thu Mar 14 16:24:20 CET 2013 tuttihelp.createSpeciesBatch.action.addSpecies.help=createSpeciesBatch.html\#actions tuttihelp.createSpeciesBatch.field.batchWeightField.help=createSpeciesBatch.html\#fields tuttihelp.createSpeciesBatch.field.sortedUnsortedCategoryComboBox.help=createSpeciesBatch.html\#fields @@ -36,6 +36,7 @@ tuttihelp.editCatchBatch.field.speciesTotalWeight.help=editCatchBatch.html\#fields tuttihelp.editCatchBatch.help=editCatchBatch.html tuttihelp.editCruise.action.cancel.help=editCruise.html\#actions +tuttihelp.editCruise.action.close.help= tuttihelp.editCruise.action.generateName.help=editCruise.html\#actions tuttihelp.editCruise.action.save.help=editCruise.html\#actions tuttihelp.editCruise.field.beginDate.help=editCruise.html\#fields @@ -92,6 +93,7 @@ tuttihelp.editProgram.help=editProgram.html tuttihelp.editProtocol.action.addSpeciesProtocol.help=editProtocol.html\#actions tuttihelp.editProtocol.action.cancelEditProtocol.help=editProtocol.html\#actions +tuttihelp.editProtocol.action.closeEditProtocol.help= tuttihelp.editProtocol.action.exportProtocolAllCaracteristic.help=editProtocol.html\#actions tuttihelp.editProtocol.action.exportProtocolCaracteristic.tip=editProtocol.html\#actions tuttihelp.editProtocol.action.exportProtocolSpecies.help=editProtocol.html\#actions Modified: trunk/tutti-ui-swing/src/main/filtered-resources/tutti-help-fr.properties =================================================================== --- trunk/tutti-ui-swing/src/main/filtered-resources/tutti-help-fr.properties 2013-03-14 14:45:03 UTC (rev 619) +++ trunk/tutti-ui-swing/src/main/filtered-resources/tutti-help-fr.properties 2013-03-14 15:33:53 UTC (rev 620) @@ -1,5 +1,5 @@ #Generated by org.nuiton.jaxx.plugin.GenerateHelpIdsMojo -#Thu Mar 14 10:50:53 CET 2013 +#Thu Mar 14 16:24:20 CET 2013 tuttihelp.createSpeciesBatch.action.addSpecies.help=createSpeciesBatch.html\#actions tuttihelp.createSpeciesBatch.field.batchWeightField.help=createSpeciesBatch.html\#fields tuttihelp.createSpeciesBatch.field.sortedUnsortedCategoryComboBox.help=createSpeciesBatch.html\#fields @@ -36,6 +36,7 @@ tuttihelp.editCatchBatch.field.speciesTotalWeight.help=editCatchBatch.html\#fields tuttihelp.editCatchBatch.help=editCatchBatch.html tuttihelp.editCruise.action.cancel.help=editCruise.html\#actions +tuttihelp.editCruise.action.close.help= tuttihelp.editCruise.action.generateName.help=editCruise.html\#actions tuttihelp.editCruise.action.save.help=editCruise.html\#actions tuttihelp.editCruise.field.beginDate.help=editCruise.html\#fields @@ -92,6 +93,7 @@ tuttihelp.editProgram.help=editProgram.html tuttihelp.editProtocol.action.addSpeciesProtocol.help=editProtocol.html\#actions tuttihelp.editProtocol.action.cancelEditProtocol.help=editProtocol.html\#actions +tuttihelp.editProtocol.action.closeEditProtocol.help= tuttihelp.editProtocol.action.exportProtocolAllCaracteristic.help=editProtocol.html\#actions tuttihelp.editProtocol.action.exportProtocolCaracteristic.tip=editProtocol.html\#actions tuttihelp.editProtocol.action.exportProtocolSpecies.help=editProtocol.html\#actions Deleted: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/cruise/CancelEditCruiseAction.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/cruise/CancelEditCruiseAction.java 2013-03-14 14:45:03 UTC (rev 619) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/cruise/CancelEditCruiseAction.java 2013-03-14 15:33:53 UTC (rev 620) @@ -1,44 +0,0 @@ -package fr.ifremer.tutti.ui.swing.content.cruise; - -/* - * #%L - * Tutti :: UI - * $Id$ - * $HeadURL$ - * %% - * Copyright (C) 2012 - 2013 Ifremer - * %% - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as - * published by the Free Software Foundation, either version 3 of the - * License, or (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public - * License along with this program. If not, see - * <http://www.gnu.org/licenses/gpl-3.0.html>. - * #L% - */ - -import fr.ifremer.tutti.ui.swing.TuttiScreen; -import fr.ifremer.tutti.ui.swing.content.AbstractChangeScreenAction; -import fr.ifremer.tutti.ui.swing.content.MainUIHandler; - -/** - * Cancels the edition of a cruise. - * - * @author tchemit <chemit(a)codelutin.com> - * @since 1.0 - */ -public class CancelEditCruiseAction extends AbstractChangeScreenAction { - - public CancelEditCruiseAction(MainUIHandler handler) { - super(handler, true, TuttiScreen.SELECT_CRUISE); - setSkipCheckCurrentScreen(true); - } - -} \ No newline at end of file Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/cruise/EditCruiseUI.css =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/cruise/EditCruiseUI.css 2013-03-14 14:45:03 UTC (rev 619) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/cruise/EditCruiseUI.css 2013-03-14 15:33:53 UTC (rev 620) @@ -234,13 +234,13 @@ _help: {"tuttihelp.editCruise.action.save.help"}; } -#cancelButton { +#closeButton { actionIcon: cancel; - text: "tutti.action.cancelEditCruise"; - toolTipText: "tuttihelp.editCruise.action.cancelEditCruise.tip"; + text: "tutti.action.closeEditCruise"; + toolTipText: "tuttihelp.editCruise.action.closeEditCruise.tip"; mnemonic: A; - _tuttiAction: {CancelEditCruiseAction.class}; - _help: {"tuttihelp.editCruise.action.cancel.help"}; + _tuttiAction: {fr.ifremer.tutti.ui.swing.content.SelectCruiseAction.class}; + _help: {"tuttihelp.editCruise.action.close.help"}; } #generateNameButton { Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/cruise/EditCruiseUI.jaxx =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/cruise/EditCruiseUI.jaxx 2013-03-14 14:45:03 UTC (rev 619) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/cruise/EditCruiseUI.jaxx 2013-03-14 15:33:53 UTC (rev 620) @@ -224,7 +224,7 @@ <row> <cell columns='6'> <JPanel layout='{new GridLayout(1, 0)}'> - <JButton id='cancelButton'/> + <JButton id='closeButton'/> <JButton id='saveButton'/> </JPanel> </cell> Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/cruise/EditCruiseUIHandler.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/cruise/EditCruiseUIHandler.java 2013-03-14 14:45:03 UTC (rev 619) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/cruise/EditCruiseUIHandler.java 2013-03-14 15:33:53 UTC (rev 620) @@ -219,11 +219,11 @@ SwingValidator validator = ui.getValidator(); listenValidatorValid(validator, model); + model.setVesselType(VesselTypeEnum.SCIENTIFIC); + // if new fishingOperation can already cancel his creation model.setModify(model.isCreate()); - model.setVesselType(VesselTypeEnum.SCIENTIFIC); - registerValidators(validator); } Deleted: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/program/CancelEditProgramAction.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/program/CancelEditProgramAction.java 2013-03-14 14:45:03 UTC (rev 619) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/program/CancelEditProgramAction.java 2013-03-14 15:33:53 UTC (rev 620) @@ -1,44 +0,0 @@ -package fr.ifremer.tutti.ui.swing.content.program; - -/* - * #%L - * Tutti :: UI - * $Id$ - * $HeadURL$ - * %% - * Copyright (C) 2012 - 2013 Ifremer - * %% - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as - * published by the Free Software Foundation, either version 3 of the - * License, or (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public - * License along with this program. If not, see - * <http://www.gnu.org/licenses/gpl-3.0.html>. - * #L% - */ - -import fr.ifremer.tutti.ui.swing.TuttiScreen; -import fr.ifremer.tutti.ui.swing.content.AbstractChangeScreenAction; -import fr.ifremer.tutti.ui.swing.content.MainUIHandler; - -/** - * Cancels the edition of a program - * - * @author tchemit <chemit(a)codelutin.com> - * @since 1.0 - */ -public class CancelEditProgramAction extends AbstractChangeScreenAction { - - public CancelEditProgramAction(MainUIHandler handler) { - super(handler, true, TuttiScreen.SELECT_CRUISE); - setSkipCheckCurrentScreen(true); - } - -} \ No newline at end of file Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/program/EditProgramUI.css =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/program/EditProgramUI.css 2013-03-14 14:45:03 UTC (rev 619) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/program/EditProgramUI.css 2013-03-14 15:33:53 UTC (rev 620) @@ -82,11 +82,11 @@ _help: {"tuttihelp.editProgram.action.saveProgram.help"}; } -#cancelButton { +#closeButton { actionIcon: cancel; - text: "tutti.action.cancelEditProgram"; - toolTipText: "tuttihelp.editProgram.action.cancelEditProgram.tip"; + text: "tutti.action.closeEditProgram"; + toolTipText: "tuttihelp.editProgram.action.closeEditProgram.tip"; mnemonic: A; - _tuttiAction: {CancelEditProgramAction.class}; + _tuttiAction: {fr.ifremer.tutti.ui.swing.content.SelectCruiseAction.class}; _help: {"tuttihelp.editProgram.action.cancelProgram.help"}; } Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/program/EditProgramUI.jaxx =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/program/EditProgramUI.jaxx 2013-03-14 14:45:03 UTC (rev 619) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/program/EditProgramUI.jaxx 2013-03-14 15:33:53 UTC (rev 620) @@ -109,7 +109,7 @@ <row anchor='south'> <cell columns='2'> <JPanel layout='{new GridLayout(1, 0)}'> - <JButton id='cancelButton'/> + <JButton id='closeButton'/> <JButton id='saveButton'/> </JPanel> </cell> Deleted: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/protocol/CancelEditProtocolAction.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/protocol/CancelEditProtocolAction.java 2013-03-14 14:45:03 UTC (rev 619) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/protocol/CancelEditProtocolAction.java 2013-03-14 15:33:53 UTC (rev 620) @@ -1,44 +0,0 @@ -package fr.ifremer.tutti.ui.swing.content.protocol; - -/* - * #%L - * Tutti :: UI - * $Id$ - * $HeadURL$ - * %% - * Copyright (C) 2012 - 2013 Ifremer - * %% - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as - * published by the Free Software Foundation, either version 3 of the - * License, or (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public - * License along with this program. If not, see - * <http://www.gnu.org/licenses/gpl-3.0.html>. - * #L% - */ - -import fr.ifremer.tutti.ui.swing.TuttiScreen; -import fr.ifremer.tutti.ui.swing.content.AbstractChangeScreenAction; -import fr.ifremer.tutti.ui.swing.content.MainUIHandler; - -/** - * Cancels the edition of a protocol - * - * @author tchemit <chemit(a)codelutin.com> - * @since 1.0 - */ -public class CancelEditProtocolAction extends AbstractChangeScreenAction { - - public CancelEditProtocolAction(MainUIHandler handler) { - super(handler, true, TuttiScreen.SELECT_CRUISE); - setSkipCheckCurrentScreen(true); - } - -} \ No newline at end of file Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/protocol/EditProtocolUI.css =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/protocol/EditProtocolUI.css 2013-03-14 14:45:03 UTC (rev 619) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/protocol/EditProtocolUI.css 2013-03-14 15:33:53 UTC (rev 620) @@ -84,13 +84,13 @@ _help: {"tuttihelp.editProtocol.action.saveProtocol.help"}; } -#cancelButton { +#closeButton { actionIcon: cancel; - text: "tutti.action.cancelEditProtocol"; - toolTipText: "tuttihelp.editProtocol.action.cancelEditProtocol.tip"; + text: "tutti.action.closeEditProtocol"; + toolTipText: "tuttihelp.editProtocol.action.closeEditProtocol.tip"; mnemonic: A; - _tuttiAction: {CancelEditProtocolAction.class}; - _help: {"tuttihelp.editProtocol.action.cancelEditProtocol.help"}; + _tuttiAction: {fr.ifremer.tutti.ui.swing.content.SelectCruiseAction.class}; + _help: {"tuttihelp.editProtocol.action.closeEditProtocol.help"}; } #speciesComboBox { Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/protocol/EditProtocolUI.jaxx =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/protocol/EditProtocolUI.jaxx 2013-03-14 14:45:03 UTC (rev 619) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/protocol/EditProtocolUI.jaxx 2013-03-14 15:33:53 UTC (rev 620) @@ -184,7 +184,7 @@ <JLabel id='saveWarning' constraints='BorderLayout.CENTER'/> </JPanel> <JPanel layout='{new GridLayout(1, 0)}' constraints='BorderLayout.SOUTH'> - <JButton id='cancelButton'/> + <JButton id='closeButton'/> <JButton id='saveButton'/> </JPanel> Modified: trunk/tutti-ui-swing/src/main/resources/i18n/tutti-ui-swing_en_GB.properties =================================================================== --- trunk/tutti-ui-swing/src/main/resources/i18n/tutti-ui-swing_en_GB.properties 2013-03-14 14:45:03 UTC (rev 619) +++ trunk/tutti-ui-swing/src/main/resources/i18n/tutti-ui-swing_en_GB.properties 2013-03-14 15:33:53 UTC (rev 620) @@ -28,6 +28,9 @@ tutti.action.closeAttachment.tip= tutti.action.closeCommentEditor.tip= tutti.action.closeDb= +tutti.action.closeEditCruise= +tutti.action.closeEditProgram= +tutti.action.closeEditProtocol= tutti.action.comment.tip= tutti.action.computeWeights= tutti.action.computeWeights.error.incoherentCategoryWeight= @@ -581,6 +584,7 @@ tuttihelp.editCatchBatch.field.speciesTotalUnsortedWeight.tip= tuttihelp.editCatchBatch.field.speciesTotalWeight.tip= tuttihelp.editCruise.action.cancelEditCruise.tip= +tuttihelp.editCruise.action.closeEditCruise.tip= tuttihelp.editCruise.action.generateName.tip= tuttihelp.editCruise.action.saveCruise.tip= tuttihelp.editCruise.field.beginDate.tip= @@ -626,12 +630,14 @@ tuttihelp.editFishingOperation.gearShootingStartLongitude.tip= tuttihelp.editFishingOperation.list.recorderPerson.tip= tuttihelp.editProgram.action.cancelEditProgram.tip= +tuttihelp.editProgram.action.closeEditProgram.tip= tuttihelp.editProgram.action.saveProgram.tip= tuttihelp.editProgram.field.comment.tip= tuttihelp.editProgram.field.name.tip= tuttihelp.editProgram.field.zone.tip= tuttihelp.editProtocol.action.addSpeciesProtocol.tip= tuttihelp.editProtocol.action.cancelEditProtocol.tip= +tuttihelp.editProtocol.action.closeEditProtocol.tip= tuttihelp.editProtocol.action.exportProtocolAllCaracteristic.tip= tuttihelp.editProtocol.action.exportProtocolCaracteristic.tip= tuttihelp.editProtocol.action.exportProtocolSpecies.tip= Modified: trunk/tutti-ui-swing/src/main/resources/i18n/tutti-ui-swing_fr_FR.properties =================================================================== --- trunk/tutti-ui-swing/src/main/resources/i18n/tutti-ui-swing_fr_FR.properties 2013-03-14 14:45:03 UTC (rev 619) +++ trunk/tutti-ui-swing/src/main/resources/i18n/tutti-ui-swing_fr_FR.properties 2013-03-14 15:33:53 UTC (rev 620) @@ -28,6 +28,9 @@ tutti.action.closeAttachment.tip=Fermer la fenêtre des pièces-jointes tutti.action.closeCommentEditor.tip=Fermer la fenêtre des commentaires tutti.action.closeDb=Fermer +tutti.action.closeEditCruise=Fermer +tutti.action.closeEditProgram=Fermer +tutti.action.closeEditProtocol=Fermer tutti.action.comment.tip=Commentaire tutti.action.computeWeights=Elever les poids tutti.action.computeWeights.error.incoherentCategoryWeight=Le poids total des mensurations est supérieur au poids de la catégorie @@ -580,7 +583,7 @@ tuttihelp.editCatchBatch.field.speciesTotalSortedWeight.tip= tuttihelp.editCatchBatch.field.speciesTotalUnsortedWeight.tip= tuttihelp.editCatchBatch.field.speciesTotalWeight.tip= -tuttihelp.editCruise.action.cancelEditCruise.tip= +tuttihelp.editCruise.action.closeEditCruise.tip= tuttihelp.editCruise.action.generateName.tip= tuttihelp.editCruise.action.saveCruise.tip= tuttihelp.editCruise.field.beginDate.tip= @@ -625,13 +628,13 @@ tuttihelp.editFishingOperation.field.vessel.tip= tuttihelp.editFishingOperation.gearShootingStartLongitude.tip= tuttihelp.editFishingOperation.list.recorderPerson.tip= -tuttihelp.editProgram.action.cancelEditProgram.tip=Annuler l'édition (ou la création) de la série de campagne +tuttihelp.editProgram.action.closeEditProgram.tip=Annuler l'édition (ou la création) de la série de campagne tuttihelp.editProgram.action.saveProgram.tip=Enregistrer la série de campagne tuttihelp.editProgram.field.comment.tip= tuttihelp.editProgram.field.name.tip= tuttihelp.editProgram.field.zone.tip= tuttihelp.editProtocol.action.addSpeciesProtocol.tip=Ajouter une espèce au protocole -tuttihelp.editProtocol.action.cancelEditProtocol.tip= +tuttihelp.editProtocol.action.closeEditProtocol.tip= tuttihelp.editProtocol.action.exportProtocolAllCaracteristic.tip=Exporter toutes les caractéristiques (sans les affecter à un écran) tuttihelp.editProtocol.action.exportProtocolCaracteristic.tip=Exporter les caractéristiques du protocole tuttihelp.editProtocol.action.exportProtocolSpecies.tip=Exporter les espèces du protocole

1 0

r619 - in trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species: . frequency
by kmorin＠users.forge.codelutin.com 14 Mar '13

14 Mar '13

Author: kmorin Date: 2013-03-14 15:45:03 +0100 (Thu, 14 Mar 2013) New Revision: 619 Url: http://forge.codelutin.com/projects/tutti/repository/revisions/619 Log: - refs #2104 pas de la classe de taille absent du protocole - debug selection after row deletion 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/RemoveSpeciesSubBatchAction.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/species/RemoveSpeciesBatchAction.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/RemoveSpeciesBatchAction.java 2013-03-14 12:47:49 UTC (rev 618) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/RemoveSpeciesBatchAction.java 2013-03-14 14:45:03 UTC (rev 619) @@ -105,21 +105,21 @@ handler.collectChildren(selectedBatch, rowToRemove); + 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); - } else { - table.clearSelection(); } - // refresh table from parent batch row index to the end - tableModel.fireTableDataChanged(); - if (table.isEditing()) { // but no edit it 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-03-14 12:47:49 UTC (rev 618) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/RemoveSpeciesSubBatchAction.java 2013-03-14 14:45:03 UTC (rev 619) @@ -78,6 +78,8 @@ handler.collectChildren(parentBatch, rowToRemove); + table.clearSelection(); + // remove all rows from the model getModel().getRows().removeAll(rowToRemove); 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-03-14 12:47:49 UTC (rev 618) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/frequency/SpeciesFrequencyUIHandler.java 2013-03-14 14:45:03 UTC (rev 619) @@ -201,12 +201,20 @@ } + Caracteristic modelCaracteristic = model.getLengthStepCaracteristic(); initBeanFilterableComboBox(ui.getLengthStepCaracteristicComboBox(), lengthStepCaracterics, - model.getLengthStepCaracteristic()); + modelCaracteristic); - //TODO Should it come from PROTOCOL or config ? - model.setStep(.5f); + // get precision from the pmfm + Float precision = null; + if (modelCaracteristic != null) { + precision = model.getLengthStepCaracteristic().getPrecision(); + } + if (precision == null) { + precision = .5f; + } + model.setStep(precision); model.setMinStep(10f); model.setMaxStep(20f); @@ -235,6 +243,15 @@ Caracteristic newValue = (Caracteristic) evt.getNewValue(); for (SpeciesFrequencyRowModel rowModel : getModel().getRows()) { rowModel.setLengthStepCaracteristic(newValue); + // get precision from the pmfm + Float precision = null; + if (newValue != null) { + precision = newValue.getPrecision(); + } + if (precision == null) { + precision = .5f; + } + getModel().setStep(precision); recomputeRowValidState(rowModel); } ui.getValidator().doValidate();

1 0

r618 - in trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing: . content/operation/catches/species content/operation/catches/species/split util util/action
by kmorin＠users.forge.codelutin.com 14 Mar '13

14 Mar '13

Author: kmorin Date: 2013-03-14 13:47:49 +0100 (Thu, 14 Mar 2013) New Revision: 618 Url: http://forge.codelutin.com/projects/tutti/repository/revisions/618 Log: fixes #2103 [PROTOCOLE] - Gestion du code campagne des esp?\195?\168ces Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/TuttiDataContext.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 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/SpeciesBatchUIHandler.java trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/split/AddSpeciesAction.java trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/split/CreateSpeciesBatchUIHandler.java trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/AbstractTuttiUIHandler.java trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/action/AbstractTuttiAction.java Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/TuttiDataContext.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/TuttiDataContext.java 2013-03-14 12:47:17 UTC (rev 617) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/TuttiDataContext.java 2013-03-14 12:47:49 UTC (rev 618) @@ -99,6 +99,7 @@ @Override public void propertyChange(PropertyChangeEvent evt) { protocol = null; + resetSpecies(); } }); } @@ -160,7 +161,7 @@ if (log.isInfoEnabled()) { log.info("Loading allSpecies"); } - species = service.getAllSpecies(); + species = service.getAllSpecies(protocol); } return species; } @@ -170,7 +171,7 @@ if (log.isInfoEnabled()) { log.info("Loading allReferentSpecies"); } - referentSpecies = service.getAllReferentSpecies(); + referentSpecies = service.getAllReferentSpecies(protocol); } return referentSpecies; } 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-03-14 12:47:17 UTC (rev 617) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/RemoveSpeciesBatchAction.java 2013-03-14 12:47:49 UTC (rev 618) @@ -103,7 +103,7 @@ Set<SpeciesBatchRowModel> rowToRemove = Sets.newHashSet(selectedBatch); - handler.collectChilds(selectedBatch, rowToRemove); + handler.collectChildren(selectedBatch, rowToRemove); // remove all rows from the model getModel().getRows().removeAll(rowToRemove); 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-03-14 12:47:17 UTC (rev 617) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/RemoveSpeciesSubBatchAction.java 2013-03-14 12:47:49 UTC (rev 618) @@ -76,7 +76,7 @@ // collect of rows to remove from model Set<SpeciesBatchRowModel> rowToRemove = Sets.newHashSet(); - handler.collectChilds(parentBatch, rowToRemove); + handler.collectChildren(parentBatch, rowToRemove); // remove all rows from the model getModel().getRows().removeAll(rowToRemove); 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-03-14 12:47:17 UTC (rev 617) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/SpeciesBatchRowModel.java 2013-03-14 12:47:49 UTC (rev 618) @@ -30,6 +30,7 @@ import fr.ifremer.tutti.persistence.entities.data.SampleCategoryEnum; import fr.ifremer.tutti.persistence.entities.data.SpeciesBatch; import fr.ifremer.tutti.persistence.entities.data.SpeciesBatchFrequency; +import fr.ifremer.tutti.persistence.entities.protocol.TuttiProtocol; import fr.ifremer.tutti.persistence.entities.referential.CaracteristicQualitativeValue; import fr.ifremer.tutti.persistence.entities.referential.Species; import fr.ifremer.tutti.ui.swing.content.operation.catches.species.frequency.SpeciesFrequencyRowModel; Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/SpeciesBatchUIHandler.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/SpeciesBatchUIHandler.java 2013-03-14 12:47:17 UTC (rev 617) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/SpeciesBatchUIHandler.java 2013-03-14 12:47:49 UTC (rev 618) @@ -41,6 +41,7 @@ import fr.ifremer.tutti.persistence.entities.referential.Caracteristic; import fr.ifremer.tutti.persistence.entities.referential.CaracteristicQualitativeValue; import fr.ifremer.tutti.persistence.entities.referential.Species; +import fr.ifremer.tutti.service.DecoratorService; import fr.ifremer.tutti.ui.swing.content.operation.AbstractTuttiBatchTableUIHandler; import fr.ifremer.tutti.ui.swing.content.operation.catches.EditCatchesUI; import fr.ifremer.tutti.ui.swing.content.operation.catches.EditCatchesUIHandler; @@ -240,7 +241,7 @@ if (log.isDebugEnabled()) { log.debug("Loaded root batch " + - decorate(rootRow.getSpecies()) + " - " + + decorate(rootRow.getSpecies(), DecoratorService.FROM_PROTOCOL) + " - " + decorate(rootRow.getSortedUnsortedCategoryValue())); } } @@ -437,9 +438,6 @@ // use only the referent here, if the user needs a synonym, he will // click on the button to select another species - List<Species> speciesList = getDataContext().getReferentSpecies(); - - SPECIES_REFERENT_CONTEXT_ENTRY.setContextValue(ui, speciesList); FREQUENCY_LENGTH_CONTEXT_ENTRY.setContextValue(ui, lengthCaracterics); } @@ -454,8 +452,7 @@ List<SampleCategoryType> samplingOrder; - List<Species> speciesUniverse = - SPECIES_REFERENT_CONTEXT_ENTRY.getContextValue(ui); + List<Species> speciesUniverse = getDataContext().getReferentSpecies(); List<Species> allSpecies; @@ -491,6 +488,7 @@ for (SpeciesProtocol protocolSpecy : protocol.getSpecies()) { String taxonId = String.valueOf(protocolSpecy.getSpeciesReferenceTaxonId()); Species species = map.get(taxonId); + species.setSurveyCode(protocolSpecy.getSpeciesSurveyCode()); allSpecies.add(species); speciesSampleCategories.put(species, SampleCategoryType.sortedUnsorted); @@ -553,7 +551,7 @@ addColumnToModel(columnModel, null, - newTableCellRender(Species.class), + newTableCellRender(Species.class, DecoratorService.FROM_PROTOCOL), SpeciesBatchTableModel.SPECIES); } @@ -1050,14 +1048,14 @@ model.setCreateMelagEnabled(enableCreateMelag); } - public void collectChilds(SpeciesBatchRowModel row, + public void collectChildren(SpeciesBatchRowModel row, Set<SpeciesBatchRowModel> collectedRows) { if (!row.isBatchLeaf()) { for (SpeciesBatchRowModel batchChild : row.getChildBatch()) { collectedRows.add(batchChild); - collectChilds(batchChild, collectedRows); + collectChildren(batchChild, collectedRows); } } } @@ -1076,6 +1074,15 @@ SpeciesBatchRowModel newRow = new SpeciesBatchRowModel(aBatch, frequencies, attachments); + // set the surveycode, do it only on the parent, + // the species of the parent is set to the children in loadBatchRow + if (parentRow == null && context.isProtocolFilled()) { + // get the surveycode from the species list of the model + int i = getModel().getAllSpecies().indexOf(newRow.getSpecies()); + if (i > -1) { + newRow.setSpecies(getModel().getAllSpecies().get(i)); + } + } SampleCategoryEnum sampleCategoryEnum = aBatch.getSampleCategoryType(); Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/split/AddSpeciesAction.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/split/AddSpeciesAction.java 2013-03-14 12:47:17 UTC (rev 617) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/split/AddSpeciesAction.java 2013-03-14 12:47:49 UTC (rev 618) @@ -28,6 +28,7 @@ import com.google.common.collect.Lists; import fr.ifremer.tutti.persistence.entities.TuttiEntities; import fr.ifremer.tutti.persistence.entities.referential.Species; +import fr.ifremer.tutti.service.DecoratorService; import fr.ifremer.tutti.ui.swing.util.action.AbstractTuttiAction; import java.util.List; @@ -81,12 +82,12 @@ List<Species> availableSpecies = Lists.newArrayList(model.getAvailableSpecies()); if (!selectedSpecies.isReferenceTaxon()) { - String decoratedSynonym = decorate(selectedSpecies); + String decoratedSynonym = decorate(selectedSpecies, DecoratorService.FROM_PROTOCOL); List<Species> referents = referentSpecies; Map<String, Species> referentsById = TuttiEntities.splitByTaxonId(referents); String taxonId = String.valueOf(selectedSpecies.getReferenceTaxonId()); selectedSpecies = referentsById.get(taxonId); - String decoratedReferent = decorate(selectedSpecies); + String decoratedReferent = decorate(selectedSpecies, DecoratorService.FROM_PROTOCOL); sendMessage(_("tutti.flash.information.species.replaced", decoratedSynonym, decoratedReferent)); } Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/split/CreateSpeciesBatchUIHandler.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/split/CreateSpeciesBatchUIHandler.java 2013-03-14 12:47:17 UTC (rev 617) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/split/CreateSpeciesBatchUIHandler.java 2013-03-14 12:47:49 UTC (rev 618) @@ -30,6 +30,7 @@ import fr.ifremer.tutti.persistence.entities.referential.Caracteristic; import fr.ifremer.tutti.persistence.entities.referential.CaracteristicQualitativeValue; import fr.ifremer.tutti.persistence.entities.referential.Species; +import fr.ifremer.tutti.service.DecoratorService; import fr.ifremer.tutti.ui.swing.content.operation.catches.EditCatchesUI; import fr.ifremer.tutti.ui.swing.content.operation.catches.EditCatchesUIHandler; import fr.ifremer.tutti.ui.swing.content.operation.catches.species.SelectSpeciesUI; @@ -98,11 +99,10 @@ initUI(ui); - boolean protocolFilled = context.isProtocolFilled(); - initBeanFilterableComboBox(ui.getSpeciesComboBox(), Lists.<Species>newArrayList(), - null); + null, + DecoratorService.FROM_PROTOCOL); Caracteristic caracteristic = persistenceService.getSortedUnsortedCaracteristic(); Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/AbstractTuttiUIHandler.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/AbstractTuttiUIHandler.java 2013-03-14 12:47:17 UTC (rev 617) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/AbstractTuttiUIHandler.java 2013-03-14 12:47:49 UTC (rev 618) @@ -704,9 +704,13 @@ } protected String decorate(Object object) { + return decorate(object, null); + } + + protected String decorate(Object object, String context) { String result = ""; if (object != null) { - getDecorator(object.getClass(), null).toString(object); + getDecorator(object.getClass(), context).toString(object); } return result; } Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/action/AbstractTuttiAction.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/action/AbstractTuttiAction.java 2013-03-14 12:47:17 UTC (rev 617) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/action/AbstractTuttiAction.java 2013-03-14 12:47:49 UTC (rev 618) @@ -158,6 +158,10 @@ return getDecorator(object.getClass(), null).toString(object); } + protected String decorate(Object object, String context) { + return getDecorator(object.getClass(), context).toString(object); + } + //FIXME-TC Is this working ? protected void test(final Runnable r) throws InterruptedException { SwingUtilities.invokeLater(new Runnable() {

1 0

r617 - trunk/tutti-service/src/main/java/fr/ifremer/tutti/service
by kmorin＠users.forge.codelutin.com 14 Mar '13

14 Mar '13

Author: kmorin Date: 2013-03-14 13:47:17 +0100 (Thu, 14 Mar 2013) New Revision: 617 Url: http://forge.codelutin.com/projects/tutti/repository/revisions/617 Log: fixes #2103 [PROTOCOLE] - Gestion du code campagne des esp?\195?\168ces Modified: trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/DecoratorService.java trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/PersistenceService.java Modified: trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/DecoratorService.java =================================================================== --- trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/DecoratorService.java 2013-03-14 12:47:04 UTC (rev 616) +++ trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/DecoratorService.java 2013-03-14 12:47:17 UTC (rev 617) @@ -67,6 +67,8 @@ public static final String CARACTERISTIC_WITH_UNIT = "withUnit"; + public static final String FROM_PROTOCOL = "fromProtocol"; + public static final String BY_NAME = "byName"; public static final String SEPARATOR = "#"; @@ -124,6 +126,7 @@ registerDecorator(new ProgramDecorator()); registerDecorator(new SpeciesDecorator()); + registerDecorator(FROM_PROTOCOL, new SpeciesFromProtocolDecorator()); registerTuttiDecorator(Caracteristic.class, CARACTERISTIC_WITH_UNIT, "${parameterName}$s#${matrixName}$s#${fractionName}$s#${methodName}$s (${unit}$s)", SEPARATOR, " - "); } @@ -178,6 +181,24 @@ private static final long serialVersionUID = 1L; public SpeciesDecorator() throws IllegalArgumentException, NullPointerException { + super(Species.class, "${refTaxCode}$s#${name}$s", DecoratorService.SEPARATOR, " - "); + } + + @Override + protected Object onNullValue(Species bean, String token) { + Object result = null; + if ("refTaxCode".equals(token)) { + result = _("tutti.propety.no.species.speciesCode"); + } + return result; + } + } + + public static class SpeciesFromProtocolDecorator extends TuttiDecorator<Species> implements Cloneable { + + private static final long serialVersionUID = 1L; + + public SpeciesFromProtocolDecorator() throws IllegalArgumentException, NullPointerException { super(Species.class, "${surveyCode}$s#${name}$s", DecoratorService.SEPARATOR, " - "); } Modified: trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/PersistenceService.java =================================================================== --- trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/PersistenceService.java 2013-03-14 12:47:04 UTC (rev 616) +++ trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/PersistenceService.java 2013-03-14 12:47:17 UTC (rev 617) @@ -316,6 +316,11 @@ } @Override + public List<Species> getAllReferentSpecies(TuttiProtocol protocol) { + return driver.getAllReferentSpecies(protocol); + } + + @Override public List<Caracteristic> getAllCaracteristic() { return driver.getAllCaracteristic(); }

1 0

r616 - trunk/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence
by kmorin＠users.forge.codelutin.com 14 Mar '13

14 Mar '13

Author: kmorin Date: 2013-03-14 13:47:04 +0100 (Thu, 14 Mar 2013) New Revision: 616 Url: http://forge.codelutin.com/projects/tutti/repository/revisions/616 Log: fixes #2103 [PROTOCOLE] - Gestion du code campagne des esp?\195?\168ces Modified: trunk/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/TuttiPersistence.java trunk/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/TuttiPersistenceImpl.java trunk/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/TuttiPersistenceNoDbImpl.java Modified: trunk/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/TuttiPersistence.java =================================================================== --- trunk/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/TuttiPersistence.java 2013-03-14 10:03:48 UTC (rev 615) +++ trunk/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/TuttiPersistence.java 2013-03-14 12:47:04 UTC (rev 616) @@ -174,6 +174,16 @@ List<Species> getAllSpecies(TuttiProtocol protocol); /** + * Get all {@code referent} species with no {@link Species#surveyCode} + * filled by optional protocol. + * + * @param protocol optional protocol to fill some species cruisecode. + * @return all species with no {@code surveyCode} filled at all. + * @since 1.1 + */ + List<Species> getAllReferentSpecies(TuttiProtocol protocol); + + /** * @return all caracteristics of the system. * @since 1.0 */ Modified: trunk/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/TuttiPersistenceImpl.java =================================================================== --- trunk/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/TuttiPersistenceImpl.java 2013-03-14 10:03:48 UTC (rev 615) +++ trunk/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/TuttiPersistenceImpl.java 2013-03-14 12:47:04 UTC (rev 616) @@ -218,6 +218,18 @@ @Override public List<Species> getAllSpecies(TuttiProtocol protocol) { List<Species> result = referentialService.getAllSpecies(); + setSpeciesSurveyCode(result, protocol); + return result; + } + + @Override + public List<Species> getAllReferentSpecies(TuttiProtocol protocol) { + List<Species> result = referentialService.getAllReferentSpecies(); + setSpeciesSurveyCode(result, protocol); + return result; + } + + protected void setSpeciesSurveyCode(List<Species> speciesList, TuttiProtocol protocol) { if (protocol != null && !protocol.isSpeciesEmpty()) { Map<Integer, String> surveyCodeByTaxonId = Maps.newTreeMap(); @@ -230,13 +242,12 @@ surveyCodeByTaxonId.put(taxonId, surveyCode); } } - for (Species species : result) { + for (Species species : speciesList) { Integer taxonId = species.getReferenceTaxonId(); String surveyCode = surveyCodeByTaxonId.get(taxonId); species.setSurveyCode(surveyCode); } } - return result; } @Override Modified: trunk/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/TuttiPersistenceNoDbImpl.java =================================================================== --- trunk/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/TuttiPersistenceNoDbImpl.java 2013-03-14 10:03:48 UTC (rev 615) +++ trunk/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/TuttiPersistenceNoDbImpl.java 2013-03-14 12:47:04 UTC (rev 616) @@ -120,6 +120,11 @@ } @Override + public List<Species> getAllReferentSpecies(TuttiProtocol protocol) { + throw new RuntimeException("method not implemented"); + } + + @Override public List<Caracteristic> getAllCaracteristic() { throw new RuntimeException("method not implemented"); }

1 0