branch feature/8164 updated (02b99a7 -> ffb26da)
This is an automated email from the git hooks/post-receive script. New change to branch feature/8164 in repository tutti. See https://gitlab.nuiton.org/codelutin/tutti.git omits 02b99a7 ajout des colonnes de code campagne et de nom scientifique (fixes #8164) adds 9ed3662 correction du redimensionnement (fixes #8162) adds 17ba06f livrable #8162 Merge branch 'feature/8162' into develop adds 379048b correction de la conversion gramme -> unité de la conf (fixes #8189) adds eacf9aa Amélioration javadoc adds 3051429 Ajout d'une nouvelle méthode de conversion qui semble fonctionner adds 563c3b6 Amélioration de la méthode de convertion adds 68fe8e2 Merge branch 'feature/8189' into 'develop' adds bfbdf45 suppression du separateur de la conf, sinon on ne peut pas récupérer les ids des précédents code si le séparateur change (enfin on pourrait mais c'est plus compliqué) (refs #8192) adds dadc607 utilisation d'un objet pour gérer le code de prélèvement (fixes #8192) adds 9e9dbf7 livrable #8192 Merge branch 'feature/8192' into develop adds 189803c l'arrondi du poids rendait le poids négatif positif... d'où le poids total qui ne faisait qu'augmenter (fixes #8146) adds c03c492 fix merge adds 8edb8bd livrable #8146 Merge branch 'feature/8146' into develop new ffb26da ajout des colonnes de code campagne et de nom scientifique (fixes #8164) This update added new revisions after undoing existing revisions. That is to say, some revisions that were in the old version of the branch are not in the new version. This situation occurs when a user --force pushes a change and generates a repository containing something like this: * -- * -- B -- O -- O -- O (02b99a7) \ N -- N -- N refs/heads/feature/8164 (ffb26da) You should already have received notification emails for all of the O revisions, and so the following emails describe only the N revisions from the common base, B. Any revisions marked "omits" are not gone; other references still refer to them. Any revisions marked "discards" are gone forever. The 1 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "adds" were already present in the repository and have only been added to this reference. Detailed log of new commits: commit ffb26daf0b6ac8215b8e487934c7d8016802adb1 Author: Kevin Morin <morin@codelutin.com> Date: Tue Mar 29 17:24:47 2016 +0200 ajout des colonnes de code campagne et de nom scientifique (fixes #8164) Summary of changes: .../java/fr/ifremer/tutti/TuttiConfiguration.java | 4 -- .../fr/ifremer/tutti/TuttiConfigurationOption.java | 8 --- .../java/fr/ifremer/tutti/type/WeightUnit.java | 6 -- .../main/java/fr/ifremer/tutti/util/Weights.java | 72 ++++++++++++++++++---- .../ifremer/tutti/service/PersistenceService.java | 4 +- .../fr/ifremer/tutti/service/TuttiDataContext.java | 4 +- .../CruiseSamplingCache.java | 9 ++- .../CruiseSamplingCacheLoader.java | 2 +- .../CruiseSamplingInternalCache.java | 2 +- .../tutti/service/sampling/SamplingCodePrefix.java | 54 ++++++++++++++++ .../{samplingCache => sampling}/SamplingEvent.java | 2 +- .../SamplingListener.java | 2 +- .../content/actions/EditCatchesSupportAction.java | 2 +- .../swing/content/config/TuttiConfigUIHandler.java | 3 - .../IndividualObservationBatchRowModel.java | 43 ++----------- .../IndividualObservationBatchTableModel.java | 22 +++++-- .../SampleCodeEditionPopupUI.jaxx | 4 +- .../SampleCodeEditionPopupUI.jcss | 2 +- .../SampleCodeEditionPopupUIHandler.java | 3 +- .../SampleCodeEditionPopupUIModel.java | 7 ++- .../SamplingCodeCellEditor.java | 4 +- .../frequency/IndividualObservationUICache.java | 6 +- .../frequency/SpeciesFrequencyRowModel.java | 23 ++++++- .../frequency/SpeciesFrequencyTableModel.java | 40 ++++++------ .../species/frequency/SpeciesFrequencyUI.jaxx | 20 +++--- .../frequency/SpeciesFrequencyUIHandler.java | 40 +++++++----- .../species/frequency/SpeciesFrequencyUIModel.java | 7 ++- .../frequency/actions/DeleteSampleCodeAction.java | 2 +- .../frequency/actions/EditSampleCodeAction.java | 6 +- .../tutti/ui/swing/util/WideDataComboBoxUI.java | 49 +++++++++++++++ 30 files changed, 301 insertions(+), 151 deletions(-) rename tutti-service/src/main/java/fr/ifremer/tutti/service/{samplingCache => sampling}/CruiseSamplingCache.java (98%) rename tutti-service/src/main/java/fr/ifremer/tutti/service/{samplingCache => sampling}/CruiseSamplingCacheLoader.java (99%) rename tutti-service/src/main/java/fr/ifremer/tutti/service/{samplingCache => sampling}/CruiseSamplingInternalCache.java (99%) create mode 100644 tutti-service/src/main/java/fr/ifremer/tutti/service/sampling/SamplingCodePrefix.java rename tutti-service/src/main/java/fr/ifremer/tutti/service/{samplingCache => sampling}/SamplingEvent.java (98%) rename tutti-service/src/main/java/fr/ifremer/tutti/service/{samplingCache => sampling}/SamplingListener.java (95%) create mode 100644 tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/WideDataComboBoxUI.java -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.
This is an automated email from the git hooks/post-receive script. New commit to branch feature/8164 in repository tutti. See https://gitlab.nuiton.org/codelutin/tutti.git commit ffb26daf0b6ac8215b8e487934c7d8016802adb1 Author: Kevin Morin <morin@codelutin.com> Date: Tue Mar 29 17:24:47 2016 +0200 ajout des colonnes de code campagne et de nom scientifique (fixes #8164) --- .../protocol/CalcifiedPiecesSamplingRow.java | 6 +++++ .../protocol/CalcifiedPiecesSamplingRowModel.java | 29 ++++++++++++++++++++-- 2 files changed, 33 insertions(+), 2 deletions(-) diff --git a/tutti-service/src/main/java/fr/ifremer/tutti/service/protocol/CalcifiedPiecesSamplingRow.java b/tutti-service/src/main/java/fr/ifremer/tutti/service/protocol/CalcifiedPiecesSamplingRow.java index 5a144e8..542e080 100644 --- a/tutti-service/src/main/java/fr/ifremer/tutti/service/protocol/CalcifiedPiecesSamplingRow.java +++ b/tutti-service/src/main/java/fr/ifremer/tutti/service/protocol/CalcifiedPiecesSamplingRow.java @@ -38,6 +38,12 @@ public class CalcifiedPiecesSamplingRow implements Serializable { public static final String PROPERTY_SPECIES = "species"; + public static final String PROPERTY_REFTAX = "reftax"; + + public static final String PROPERTY_SURVEY_CODE = "surveyCode"; + + public static final String PROPERTY_SCIENTIFIC_NAME = "scientificName"; + public static final String PROPERTY_MIN_SIZE = "minSize"; public static final String PROPERTY_MAX_SIZE = "maxSize"; diff --git a/tutti-service/src/main/java/fr/ifremer/tutti/service/protocol/CalcifiedPiecesSamplingRowModel.java b/tutti-service/src/main/java/fr/ifremer/tutti/service/protocol/CalcifiedPiecesSamplingRowModel.java index d44b84e..3379dca 100644 --- a/tutti-service/src/main/java/fr/ifremer/tutti/service/protocol/CalcifiedPiecesSamplingRowModel.java +++ b/tutti-service/src/main/java/fr/ifremer/tutti/service/protocol/CalcifiedPiecesSamplingRowModel.java @@ -45,7 +45,8 @@ public class CalcifiedPiecesSamplingRowModel extends AbstractTuttiImportExportMo CalcifiedPiecesSamplingRowModel result = new CalcifiedPiecesSamplingRowModel(separator); - result.newColumnForExport(CalcifiedPiecesSamplingRow.PROPERTY_SPECIES, + result.newColumnForExport(CalcifiedPiecesSamplingRow.PROPERTY_REFTAX, + CalcifiedPiecesSamplingRow.PROPERTY_SPECIES, new ValueFormatter<Species>() { @Override @@ -54,6 +55,26 @@ public class CalcifiedPiecesSamplingRowModel extends AbstractTuttiImportExportMo } }); + result.newColumnForExport(CalcifiedPiecesSamplingRow.PROPERTY_SURVEY_CODE, + CalcifiedPiecesSamplingRow.PROPERTY_SPECIES, + new ValueFormatter<Species>() { + + @Override + public String format(Species species) { + return String.valueOf(species.getSurveyCode()); + } + }); + + result.newColumnForExport(CalcifiedPiecesSamplingRow.PROPERTY_SCIENTIFIC_NAME, + CalcifiedPiecesSamplingRow.PROPERTY_SPECIES, + new ValueFormatter<Species>() { + + @Override + public String format(Species species) { + return String.valueOf(species.getName()); + } + }); + result.newColumnForExport(CalcifiedPiecesSamplingRow.PROPERTY_MATURITY, TuttiCsvUtil.BOOLEAN); result.newColumnForExport(CalcifiedPiecesSamplingRow.PROPERTY_SEX, TuttiCsvUtil.PRIMITIVE_BOOLEAN); result.newColumnForExport(CalcifiedPiecesSamplingRow.PROPERTY_MIN_SIZE, TuttiCsvUtil.PRIMITIVE_INTEGER); @@ -71,7 +92,8 @@ public class CalcifiedPiecesSamplingRowModel extends AbstractTuttiImportExportMo CalcifiedPiecesSamplingRowModel result = new CalcifiedPiecesSamplingRowModel(separator); - result.newForeignKeyColumn(CalcifiedPiecesSamplingRow.PROPERTY_SPECIES, + result.newForeignKeyColumn(CalcifiedPiecesSamplingRow.PROPERTY_REFTAX, + CalcifiedPiecesSamplingRow.PROPERTY_SPECIES, Species.class, Species.PROPERTY_REFERENCE_TAXON_ID, allSpecies); @@ -84,6 +106,9 @@ public class CalcifiedPiecesSamplingRowModel extends AbstractTuttiImportExportMo result.newMandatoryColumn(CalcifiedPiecesSamplingRow.PROPERTY_OPERATION_LIMITATION, TuttiCsvUtil.INTEGER); result.newMandatoryColumn(CalcifiedPiecesSamplingRow.PROPERTY_ZONE_LIMITATION, TuttiCsvUtil.INTEGER); + result.newIgnoredColumn(CalcifiedPiecesSamplingRow.PROPERTY_SURVEY_CODE); + result.newIgnoredColumn(CalcifiedPiecesSamplingRow.PROPERTY_SCIENTIFIC_NAME); + return result; } -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.
participants (1)
-
codelutin.com scm