This is an automated email from the git hooks/post-receive script. New commit to branch feature/8013 in repository tutti. See http://git.codelutin.com/tutti.git commit 09d849d26d8d7f810b99bb8b2baba4387bbd8d91 Author: Kevin Morin <morin@codelutin.com> Date: Tue Feb 23 15:09:14 2016 +0100 - suppression des colonnes dénombrement et pièces caclifiées - ajout de la colonne type de piece calcifiée refs #8013 --- .gitignore | 12 ++--- .../src/main/xmi/tutti-persistence.zargo | Bin 62183 -> 62126 bytes .../entities/protocol/TuttiProtocolsTest.java | 14 ------ .../ProtocolPersistenceServiceReadTest.java | 6 --- .../catches/ValidateCruiseOperationsService.java | 4 +- .../ifremer/tutti/service/protocol/SpeciesRow.java | 16 ------- .../protocol/ProtocolImportExportServiceTest.java | 30 ------------ .../create/CreateBenthosBatchUIHandler.java | 2 +- .../create/CreateSpeciesBatchUIHandler.java | 2 +- .../protocol/EditProtocolSpeciesRowModel.java | 51 ++++++++++----------- .../protocol/EditProtocolSpeciesTableModel.java | 17 ++----- .../content/protocol/EditProtocolUIHandler.java | 24 ++++------ .../resources/i18n/tutti-ui-swing_en_GB.properties | 2 + .../resources/i18n/tutti-ui-swing_fr_FR.properties | 2 + 14 files changed, 52 insertions(+), 130 deletions(-) diff --git a/.gitignore b/.gitignore index 64dc679..e21865b 100644 --- a/.gitignore +++ b/.gitignore @@ -1,15 +1,15 @@ /atlassian-ide-plugin.xml /.idea -/*/.idea +/**/.idea /target -/*/target/ +/**/target/ /*.iml -/*/*.iml +/**/*.iml /*.ipr -/*/*.ipr +/**/*.ipr /*.iws -/*/*.iws +/**/*.iws /tutti-service/src/test/data /tutti-persistence/src/test/data /*~ -/*/*~ \ No newline at end of file +/**/*~ \ No newline at end of file diff --git a/tutti-persistence/src/main/xmi/tutti-persistence.zargo b/tutti-persistence/src/main/xmi/tutti-persistence.zargo index d725495..99a27b0 100644 Binary files a/tutti-persistence/src/main/xmi/tutti-persistence.zargo and b/tutti-persistence/src/main/xmi/tutti-persistence.zargo differ diff --git a/tutti-persistence/src/test/java/fr/ifremer/tutti/persistence/entities/protocol/TuttiProtocolsTest.java b/tutti-persistence/src/test/java/fr/ifremer/tutti/persistence/entities/protocol/TuttiProtocolsTest.java index 4b6f5cd..172113d 100644 --- a/tutti-persistence/src/test/java/fr/ifremer/tutti/persistence/entities/protocol/TuttiProtocolsTest.java +++ b/tutti-persistence/src/test/java/fr/ifremer/tutti/persistence/entities/protocol/TuttiProtocolsTest.java @@ -207,8 +207,6 @@ public class TuttiProtocolsTest { Assert.assertEquals("BAR", sp1.getSpeciesSurveyCode()); Assert.assertEquals("1394", sp1.getLengthStepPmfmId()); Assert.assertFalse(sp1.containsMandatorySampleCategoryId(AGE)); - Assert.assertTrue(sp1.isCalcifySampleEnabled()); - Assert.assertFalse(sp1.isCountIfNoFrequencyEnabled()); Assert.assertTrue(sp1.containsMandatorySampleCategoryId(MATURITY)); Assert.assertTrue(sp1.containsMandatorySampleCategoryId(SEX)); Assert.assertFalse(sp1.containsMandatorySampleCategoryId(SIZE)); @@ -221,8 +219,6 @@ public class TuttiProtocolsTest { Assert.assertEquals("CHIN", sp2.getSpeciesSurveyCode()); Assert.assertEquals("323", sp2.getLengthStepPmfmId()); Assert.assertTrue(sp2.containsMandatorySampleCategoryId(AGE)); - Assert.assertTrue(sp2.isCalcifySampleEnabled()); - Assert.assertTrue(sp2.isCountIfNoFrequencyEnabled()); Assert.assertTrue(sp2.containsMandatorySampleCategoryId(MATURITY)); Assert.assertTrue(sp2.containsMandatorySampleCategoryId(SEX)); Assert.assertTrue(sp2.containsMandatorySampleCategoryId(SIZE)); @@ -237,8 +233,6 @@ public class TuttiProtocolsTest { Assert.assertEquals("BAR", b1.getSpeciesSurveyCode()); Assert.assertEquals("1394", b1.getLengthStepPmfmId()); Assert.assertFalse(b1.containsMandatorySampleCategoryId(AGE)); - Assert.assertTrue(b1.isCalcifySampleEnabled()); - Assert.assertFalse(b1.isCountIfNoFrequencyEnabled()); Assert.assertTrue(b1.containsMandatorySampleCategoryId(MATURITY)); Assert.assertTrue(b1.containsMandatorySampleCategoryId(SEX)); Assert.assertFalse(b1.containsMandatorySampleCategoryId(SIZE)); @@ -251,8 +245,6 @@ public class TuttiProtocolsTest { Assert.assertEquals("CHIN", b2.getSpeciesSurveyCode()); Assert.assertEquals("323", b2.getLengthStepPmfmId()); Assert.assertTrue(b2.containsMandatorySampleCategoryId(AGE)); - Assert.assertTrue(b2.isCalcifySampleEnabled()); - Assert.assertTrue(b2.isCountIfNoFrequencyEnabled()); Assert.assertTrue(b2.containsMandatorySampleCategoryId(MATURITY)); Assert.assertTrue(b2.containsMandatorySampleCategoryId(SEX)); Assert.assertTrue(b2.containsMandatorySampleCategoryId(SIZE)); @@ -281,7 +273,6 @@ public class TuttiProtocolsTest { sp1.setSpeciesReferenceTaxonId(11242); sp1.setSpeciesSurveyCode("BAR"); sp1.setLengthStepPmfmId("1394"); - sp1.setCalcifySampleEnabled(true); sp1.addMandatorySampleCategoryId(MATURITY); sp1.addMandatorySampleCategoryId(SEX); sp1.setWeightEnabled(true); @@ -294,8 +285,6 @@ public class TuttiProtocolsTest { sp2.setSpeciesSurveyCode("CHIN"); sp2.setLengthStepPmfmId("323"); sp2.addMandatorySampleCategoryId(AGE); - sp2.setCalcifySampleEnabled(true); - sp2.setCountIfNoFrequencyEnabled(true); sp2.addMandatorySampleCategoryId(MATURITY); sp2.addMandatorySampleCategoryId(SEX); sp2.addMandatorySampleCategoryId(SIZE); @@ -309,7 +298,6 @@ public class TuttiProtocolsTest { b1.setSpeciesReferenceTaxonId(11242); b1.setSpeciesSurveyCode("BAR"); b1.setLengthStepPmfmId("1394"); - b1.setCalcifySampleEnabled(true); b1.addMandatorySampleCategoryId(MATURITY); b1.addMandatorySampleCategoryId(SEX); b1.setWeightEnabled(true); @@ -322,8 +310,6 @@ public class TuttiProtocolsTest { b2.setSpeciesSurveyCode("CHIN"); b2.setLengthStepPmfmId("323"); b2.addMandatorySampleCategoryId(AGE); - b2.setCalcifySampleEnabled(true); - b2.setCountIfNoFrequencyEnabled(true); b2.addMandatorySampleCategoryId(MATURITY); b2.addMandatorySampleCategoryId(SEX); b2.addMandatorySampleCategoryId(SIZE); diff --git a/tutti-persistence/src/test/java/fr/ifremer/tutti/persistence/service/ProtocolPersistenceServiceReadTest.java b/tutti-persistence/src/test/java/fr/ifremer/tutti/persistence/service/ProtocolPersistenceServiceReadTest.java index 6829a01..c9fccad 100644 --- a/tutti-persistence/src/test/java/fr/ifremer/tutti/persistence/service/ProtocolPersistenceServiceReadTest.java +++ b/tutti-persistence/src/test/java/fr/ifremer/tutti/persistence/service/ProtocolPersistenceServiceReadTest.java @@ -109,7 +109,6 @@ public class ProtocolPersistenceServiceReadTest { sp1.setSpeciesReferenceTaxonId(11242); sp1.setSpeciesSurveyCode("BAR"); sp1.setLengthStepPmfmId("1394"); - sp1.setCalcifySampleEnabled(true); sp1.addMandatorySampleCategoryId(MATURITY); sp1.addMandatorySampleCategoryId(SEX); sp1.setWeightEnabled(true); @@ -122,8 +121,6 @@ public class ProtocolPersistenceServiceReadTest { sp2.setSpeciesSurveyCode("CHIN"); sp2.setLengthStepPmfmId("323"); sp2.addMandatorySampleCategoryId(AGE); - sp2.setCalcifySampleEnabled(true); - sp2.setCountIfNoFrequencyEnabled(true); sp2.addMandatorySampleCategoryId(MATURITY); sp2.addMandatorySampleCategoryId(SEX); sp2.addMandatorySampleCategoryId(SIZE); @@ -137,7 +134,6 @@ public class ProtocolPersistenceServiceReadTest { b1.setSpeciesReferenceTaxonId(11242); b1.setSpeciesSurveyCode("BAR"); b1.setLengthStepPmfmId("1394"); - b1.setCalcifySampleEnabled(true); b1.addMandatorySampleCategoryId(MATURITY); b1.addMandatorySampleCategoryId(SEX); b1.setWeightEnabled(true); @@ -150,8 +146,6 @@ public class ProtocolPersistenceServiceReadTest { b2.setSpeciesSurveyCode("CHIN"); b2.setLengthStepPmfmId("323"); b2.addMandatorySampleCategoryId(AGE); - b2.setCalcifySampleEnabled(true); - b2.setCountIfNoFrequencyEnabled(true); b2.addMandatorySampleCategoryId(MATURITY); b2.addMandatorySampleCategoryId(SEX); b2.addMandatorySampleCategoryId(SIZE); diff --git a/tutti-service/src/main/java/fr/ifremer/tutti/service/catches/ValidateCruiseOperationsService.java b/tutti-service/src/main/java/fr/ifremer/tutti/service/catches/ValidateCruiseOperationsService.java index 79fd8e2..91084b8 100644 --- a/tutti-service/src/main/java/fr/ifremer/tutti/service/catches/ValidateCruiseOperationsService.java +++ b/tutti-service/src/main/java/fr/ifremer/tutti/service/catches/ValidateCruiseOperationsService.java @@ -455,7 +455,7 @@ public class ValidateCruiseOperationsService extends AbstractTuttiService { browsingBatch = browsingBatch.getParentBatch(); } result = mandatoryCategories.isEmpty() && - (!speciesProtocol.isCountIfNoFrequencyEnabled() + (speciesProtocol.getLengthStepPmfmId() != null || CollectionUtils.isNotEmpty(frequencies) || batch.getNumber() != null); } @@ -561,7 +561,7 @@ public class ValidateCruiseOperationsService extends AbstractTuttiService { browsingBatch = browsingBatch.getParentBatch(); } result = mandatoryCategories.isEmpty() && - (!speciesProtocol.isCountIfNoFrequencyEnabled() + (speciesProtocol.getLengthStepPmfmId() != null || CollectionUtils.isNotEmpty(frequencies) || batch.getNumber() != null); } diff --git a/tutti-service/src/main/java/fr/ifremer/tutti/service/protocol/SpeciesRow.java b/tutti-service/src/main/java/fr/ifremer/tutti/service/protocol/SpeciesRow.java index 59a9aa6..011cf5f 100644 --- a/tutti-service/src/main/java/fr/ifremer/tutti/service/protocol/SpeciesRow.java +++ b/tutti-service/src/main/java/fr/ifremer/tutti/service/protocol/SpeciesRow.java @@ -177,22 +177,6 @@ public class SpeciesRow implements Serializable { delegate.setWeightEnabled(weightEnabled); } - public boolean isCountIfNoFrequencyEnabled() { - return delegate.isCountIfNoFrequencyEnabled(); - } - - public void setCountIfNoFrequencyEnabled(boolean countIfNoFrequencyEnabled) { - delegate.setCountIfNoFrequencyEnabled(countIfNoFrequencyEnabled); - } - - public boolean isCalcifySampleEnabled() { - return delegate.isCalcifySampleEnabled(); - } - - public void setCalcifySampleEnabled(boolean calcifySampleEnabled) { - delegate.setCalcifySampleEnabled(calcifySampleEnabled); - } - public boolean isMadeFromAReferentTaxon() { return delegate.isMadeFromAReferentTaxon(); } diff --git a/tutti-service/src/test/java/fr/ifremer/tutti/service/protocol/ProtocolImportExportServiceTest.java b/tutti-service/src/test/java/fr/ifremer/tutti/service/protocol/ProtocolImportExportServiceTest.java index f066012..4c7d6bc 100644 --- a/tutti-service/src/test/java/fr/ifremer/tutti/service/protocol/ProtocolImportExportServiceTest.java +++ b/tutti-service/src/test/java/fr/ifremer/tutti/service/protocol/ProtocolImportExportServiceTest.java @@ -226,7 +226,6 @@ public class ProtocolImportExportServiceTest { sp1.setSpeciesReferenceTaxonId(11242); sp1.setSpeciesSurveyCode("cruiseCode1"); sp1.setLengthStepPmfmId("1394"); - sp1.setCalcifySampleEnabled(true); sp1.addMandatorySampleCategoryId(MATURITY); sp1.addMandatorySampleCategoryId(SEX); sp1.setWeightEnabled(true); @@ -241,8 +240,6 @@ public class ProtocolImportExportServiceTest { sp2.setSpeciesReferenceTaxonId(3835); sp2.setLengthStepPmfmId("323"); sp2.addMandatorySampleCategoryId(AGE); - sp2.setCalcifySampleEnabled(true); - sp2.setCountIfNoFrequencyEnabled(true); sp2.addMandatorySampleCategoryId(MATURITY); sp2.addMandatorySampleCategoryId(SEX); sp2.addMandatorySampleCategoryId(SIZE); @@ -256,7 +253,6 @@ public class ProtocolImportExportServiceTest { bp1.setSpeciesSurveyCode("cruiseCode1"); bp1.setSpeciesReferenceTaxonId(11242); bp1.setLengthStepPmfmId("1394"); - bp1.setCalcifySampleEnabled(true); bp1.addMandatorySampleCategoryId(MATURITY); bp1.addMandatorySampleCategoryId(SEX); bp1.setWeightEnabled(true); @@ -268,8 +264,6 @@ public class ProtocolImportExportServiceTest { bp2.setSpeciesReferenceTaxonId(3835); bp2.setLengthStepPmfmId("323"); bp2.addMandatorySampleCategoryId(AGE); - bp2.setCalcifySampleEnabled(true); - bp2.setCountIfNoFrequencyEnabled(true); bp2.addMandatorySampleCategoryId(MATURITY); bp2.addMandatorySampleCategoryId(SEX); bp2.addMandatorySampleCategoryId(SIZE); @@ -320,8 +314,6 @@ public class ProtocolImportExportServiceTest { Assert.assertEquals("cruiseCode1", sp1.getSpeciesSurveyCode()); Assert.assertEquals("1394", sp1.getLengthStepPmfmId()); Assert.assertFalse(sp1.containsMandatorySampleCategoryId(AGE)); - Assert.assertTrue(sp1.isCalcifySampleEnabled()); - Assert.assertFalse(sp1.isCountIfNoFrequencyEnabled()); Assert.assertTrue(sp1.containsMandatorySampleCategoryId(MATURITY)); Assert.assertTrue(sp1.containsMandatorySampleCategoryId(SEX)); Assert.assertFalse(sp1.containsMandatorySampleCategoryId(SIZE)); @@ -342,8 +334,6 @@ public class ProtocolImportExportServiceTest { Assert.assertEquals(3835, sp2.getSpeciesReferenceTaxonId(), 0); Assert.assertEquals("323", sp2.getLengthStepPmfmId()); Assert.assertTrue(sp2.containsMandatorySampleCategoryId(AGE)); - Assert.assertTrue(sp2.isCalcifySampleEnabled()); - Assert.assertTrue(sp2.isCountIfNoFrequencyEnabled()); Assert.assertTrue(sp2.containsMandatorySampleCategoryId(MATURITY)); Assert.assertTrue(sp2.containsMandatorySampleCategoryId(SEX)); Assert.assertTrue(sp2.containsMandatorySampleCategoryId(SIZE)); @@ -361,8 +351,6 @@ public class ProtocolImportExportServiceTest { Assert.assertEquals("cruiseCode1", b1.getSpeciesSurveyCode()); Assert.assertEquals("1394", b1.getLengthStepPmfmId()); Assert.assertFalse(b1.containsMandatorySampleCategoryId(AGE)); - Assert.assertTrue(b1.isCalcifySampleEnabled()); - Assert.assertFalse(b1.isCountIfNoFrequencyEnabled()); Assert.assertTrue(b1.containsMandatorySampleCategoryId(MATURITY)); Assert.assertTrue(b1.containsMandatorySampleCategoryId(SEX)); Assert.assertFalse(b1.containsMandatorySampleCategoryId(SIZE)); @@ -377,8 +365,6 @@ public class ProtocolImportExportServiceTest { Assert.assertEquals(3835, b2.getSpeciesReferenceTaxonId(), 0); Assert.assertEquals("323", b2.getLengthStepPmfmId()); Assert.assertTrue(b2.containsMandatorySampleCategoryId(AGE)); - Assert.assertTrue(b2.isCalcifySampleEnabled()); - Assert.assertTrue(b2.isCountIfNoFrequencyEnabled()); Assert.assertTrue(b2.containsMandatorySampleCategoryId(MATURITY)); Assert.assertTrue(b2.containsMandatorySampleCategoryId(SEX)); Assert.assertTrue(b2.containsMandatorySampleCategoryId(SIZE)); @@ -497,8 +483,6 @@ public class ProtocolImportExportServiceTest { Assert.assertEquals("cruiseCode1", sp1.getSpeciesSurveyCode()); Assert.assertEquals("2", sp1.getLengthStepPmfmId()); Assert.assertTrue(sp1.containsMandatorySampleCategoryId(AGE)); - Assert.assertTrue(sp1.isCalcifySampleEnabled()); - Assert.assertTrue(sp1.isCountIfNoFrequencyEnabled()); Assert.assertTrue(sp1.containsMandatorySampleCategoryId(MATURITY)); Assert.assertTrue(sp1.containsMandatorySampleCategoryId(SEX)); Assert.assertTrue(sp1.containsMandatorySampleCategoryId(SIZE)); @@ -520,8 +504,6 @@ public class ProtocolImportExportServiceTest { Assert.assertNull(sp2.getSpeciesSurveyCode()); Assert.assertNull(sp2.getLengthStepPmfmId()); Assert.assertTrue(sp2.containsMandatorySampleCategoryId(AGE)); - Assert.assertTrue(sp2.isCalcifySampleEnabled()); - Assert.assertTrue(sp2.isCountIfNoFrequencyEnabled()); Assert.assertFalse(sp2.containsMandatorySampleCategoryId(MATURITY)); Assert.assertTrue(sp2.containsMandatorySampleCategoryId(SEX)); Assert.assertFalse(sp2.containsMandatorySampleCategoryId(SIZE)); @@ -552,8 +534,6 @@ public class ProtocolImportExportServiceTest { sp1.addMandatorySampleCategoryId(MATURITY); sp1.addMandatorySampleCategoryId(SEX); sp1.setWeightEnabled(true); - sp1.setCountIfNoFrequencyEnabled(true); - sp1.setCalcifySampleEnabled(true); sp1.setLengthStepPmfmId("2"); sp1.setRtpMale(Rtps.newRtp(1f, 2f)); sp1.setRtpFemale(Rtps.newRtp(2f, 3f)); @@ -569,8 +549,6 @@ public class ProtocolImportExportServiceTest { sp2.removeMandatorySampleCategoryId(MATURITY); sp2.addMandatorySampleCategoryId(SEX); sp2.setWeightEnabled(true); - sp2.setCalcifySampleEnabled(true); - sp2.setCountIfNoFrequencyEnabled(true); sp2.setLengthStepPmfmId(null); protocol.addSpecies(sp2); @@ -607,8 +585,6 @@ public class ProtocolImportExportServiceTest { Assert.assertEquals("cruiseCode1", sp1.getSpeciesSurveyCode()); Assert.assertEquals("2", sp1.getLengthStepPmfmId()); Assert.assertTrue(sp1.containsMandatorySampleCategoryId(AGE)); - Assert.assertTrue(sp1.isCalcifySampleEnabled()); - Assert.assertTrue(sp1.isCountIfNoFrequencyEnabled()); Assert.assertTrue(sp1.containsMandatorySampleCategoryId(MATURITY)); Assert.assertTrue(sp1.containsMandatorySampleCategoryId(SEX)); Assert.assertTrue(sp1.containsMandatorySampleCategoryId(SIZE)); @@ -623,8 +599,6 @@ public class ProtocolImportExportServiceTest { Assert.assertNull(sp2.getSpeciesSurveyCode()); Assert.assertNull(sp2.getLengthStepPmfmId()); Assert.assertTrue(sp2.containsMandatorySampleCategoryId(AGE)); - Assert.assertTrue(sp2.isCalcifySampleEnabled()); - Assert.assertTrue(sp2.isCountIfNoFrequencyEnabled()); Assert.assertFalse(sp2.containsMandatorySampleCategoryId(MATURITY)); Assert.assertTrue(sp2.containsMandatorySampleCategoryId(SEX)); Assert.assertFalse(sp2.containsMandatorySampleCategoryId(SIZE)); @@ -659,8 +633,6 @@ public class ProtocolImportExportServiceTest { sp1.addMandatorySampleCategoryId(MATURITY); sp1.addMandatorySampleCategoryId(SEX); sp1.setWeightEnabled(true); - sp1.setCountIfNoFrequencyEnabled(true); - sp1.setCalcifySampleEnabled(true); sp1.setLengthStepPmfmId("2"); protocol.addBenthos(sp1); @@ -674,8 +646,6 @@ public class ProtocolImportExportServiceTest { sp2.removeMandatorySampleCategoryId(MATURITY); sp2.addMandatorySampleCategoryId(SEX); sp2.setWeightEnabled(true); - sp2.setCalcifySampleEnabled(true); - sp2.setCountIfNoFrequencyEnabled(true); sp2.setLengthStepPmfmId(null); sp2.setRtpFemale(Rtps.newRtp(22f, 33f)); diff --git a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/benthos/create/CreateBenthosBatchUIHandler.java b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/benthos/create/CreateBenthosBatchUIHandler.java index 426bbd9..4d63da0 100644 --- a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/benthos/create/CreateBenthosBatchUIHandler.java +++ b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/benthos/create/CreateBenthosBatchUIHandler.java @@ -168,7 +168,7 @@ public class CreateBenthosBatchUIHandler extends AbstractTuttiTableUIHandler<Spl if (speciesProtocol != null) { if (speciesProtocol.getLengthStepPmfmId() != null) { frequencyMode = CreateBenthosBatchUIModel.SpeciesProtocolFrequencyMode.MEASURE; - } else if (speciesProtocol.isCountIfNoFrequencyEnabled()) { + } else { frequencyMode = CreateBenthosBatchUIModel.SpeciesProtocolFrequencyMode.COUNT; } } diff --git a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/create/CreateSpeciesBatchUIHandler.java b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/create/CreateSpeciesBatchUIHandler.java index f0abfb2..7781ff3 100644 --- a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/create/CreateSpeciesBatchUIHandler.java +++ b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/create/CreateSpeciesBatchUIHandler.java @@ -167,7 +167,7 @@ public class CreateSpeciesBatchUIHandler extends AbstractTuttiTableUIHandler<Spl if (speciesProtocol != null) { if (speciesProtocol.getLengthStepPmfmId() != null) { frequencyMode = CreateSpeciesBatchUIModel.SpeciesProtocolFrequencyMode.MEASURE; - } else if (speciesProtocol.isCountIfNoFrequencyEnabled()) { + } else { frequencyMode = CreateSpeciesBatchUIModel.SpeciesProtocolFrequencyMode.COUNT; } } diff --git a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/protocol/EditProtocolSpeciesRowModel.java b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/protocol/EditProtocolSpeciesRowModel.java index 6c9f6d0..efde9b4 100644 --- a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/protocol/EditProtocolSpeciesRowModel.java +++ b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/protocol/EditProtocolSpeciesRowModel.java @@ -53,12 +53,10 @@ public class EditProtocolSpeciesRowModel extends AbstractTuttiBeanUIModel<Specie public static final String PROPERTY_WEIGHT_ENABLED = "weightEnabled"; - public static final String PROPERTY_COUNT_IF_NO_FREQUENCY_ENABLED = "countIfNoFrequencyEnabled"; - - public static final String PROPERTY_CALCIFY_SAMPLE_ENABLED = "calcifySampleEnabled"; - public static final String PROPERTY_MATURITY_PMFM = "maturityPmfm"; + public static final String PROPERTY_CALCIFIED_PIECES_SAMPLING_TYPE_PMFM = "calcifiedPiecesSamplingTypePmfm"; + public static final String PROPERTY_USE_RTP = "useRtp"; protected Species species; @@ -79,6 +77,8 @@ public class EditProtocolSpeciesRowModel extends AbstractTuttiBeanUIModel<Specie protected Caracteristic maturityPmfm; + protected Caracteristic calcifiedPiecesSamplingTypePmfm; + protected Rtp rtpMale; protected Rtp rtpFemale; @@ -162,30 +162,6 @@ public class EditProtocolSpeciesRowModel extends AbstractTuttiBeanUIModel<Specie } @Override - public boolean isCountIfNoFrequencyEnabled() { - return countIfNoFrequencyEnabled; - } - - @Override - public void setCountIfNoFrequencyEnabled(boolean countIfNoFrequencyEnabled) { - Object oldValue = isCountIfNoFrequencyEnabled(); - this.countIfNoFrequencyEnabled = countIfNoFrequencyEnabled; - firePropertyChange(PROPERTY_COUNT_IF_NO_FREQUENCY_ENABLED, oldValue, countIfNoFrequencyEnabled); - } - - @Override - public boolean isCalcifySampleEnabled() { - return calcifySampleEnabled; - } - - @Override - public void setCalcifySampleEnabled(boolean calcifySampleEnabled) { - Object oldValue = isCalcifySampleEnabled(); - this.calcifySampleEnabled = calcifySampleEnabled; - firePropertyChange(PROPERTY_CALCIFY_SAMPLE_ENABLED, oldValue, calcifySampleEnabled); - } - - @Override public Float getLengthStep() { return null; } @@ -300,6 +276,25 @@ public class EditProtocolSpeciesRowModel extends AbstractTuttiBeanUIModel<Specie firePropertyChange(PROPERTY_MATURITY_PMFM, oldValue, maturityPmfm); } + @Override + public String getCalcifiedPiecesSamplingTypePmfmId() { + return calcifiedPiecesSamplingTypePmfm != null ? calcifiedPiecesSamplingTypePmfm.getId() : null; + } + + @Override + public void setCalcifiedPiecesSamplingTypePmfmId(String calcifiedPiecesSamplingTypePmfmId) { + } + + public Caracteristic getCalcifiedPiecesSamplingTypePmfm() { + return calcifiedPiecesSamplingTypePmfm; + } + + public void setCalcifiedPiecesSamplingTypePmfm(Caracteristic calcifiedPiecesSamplingTypePmfm) { + Object oldValue = getCalcifiedPiecesSamplingTypePmfm(); + this.calcifiedPiecesSamplingTypePmfm = calcifiedPiecesSamplingTypePmfm; + firePropertyChange(PROPERTY_CALCIFIED_PIECES_SAMPLING_TYPE_PMFM, oldValue, calcifiedPiecesSamplingTypePmfm); + } + public boolean isUseRtp() { return withRtpFemale() && withRtpMale() && withRtpUndefined(); } diff --git a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/protocol/EditProtocolSpeciesTableModel.java b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/protocol/EditProtocolSpeciesTableModel.java index eceb7c7..f47e924 100644 --- a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/protocol/EditProtocolSpeciesTableModel.java +++ b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/protocol/EditProtocolSpeciesTableModel.java @@ -61,16 +61,6 @@ public class EditProtocolSpeciesTableModel extends AbstractApplicationTableModel n("tutti.editProtocol.table.header.weight"), n("tutti.editProtocol.table.header.weight.tip")); - public static final ColumnIdentifier<EditProtocolSpeciesRowModel> COUNT_IF_NO_FREQUENCY_ENABLED = ColumnIdentifier.newId( - EditProtocolSpeciesRowModel.PROPERTY_COUNT_IF_NO_FREQUENCY_ENABLED, - n("tutti.editProtocol.table.header.countIfNoFrequency"), - n("tutti.editProtocol.table.header.countIfNoFrequency.tip")); - - public static final ColumnIdentifier<EditProtocolSpeciesRowModel> CALCIFY_SAMPLE_ENABLED = ColumnIdentifier.newId( - EditProtocolSpeciesRowModel.PROPERTY_CALCIFY_SAMPLE_ENABLED, - n("tutti.editProtocol.table.header.calcifySample"), - n("tutti.editProtocol.table.header.calcifySample.tip")); - public static final ColumnIdentifier<EditProtocolSpeciesRowModel> INDIVIDUAL_OBSERVATION_ENABLED = ColumnIdentifier.newId( EditProtocolSpeciesRowModel.PROPERTY_INDIVIDUAL_OBSERVATION_ENABLED, n("tutti.editProtocol.table.header.individualObservation"), @@ -81,6 +71,11 @@ public class EditProtocolSpeciesTableModel extends AbstractApplicationTableModel n("tutti.editProtocol.table.header.maturity"), n("tutti.editProtocol.table.header.maturity.tip")); + public static final ColumnIdentifier<EditProtocolSpeciesRowModel> CALCIFIED_PIECES_SAMPLING_TYPE_PMFM_ID = ColumnIdentifier.newId( + EditProtocolSpeciesRowModel.PROPERTY_CALCIFIED_PIECES_SAMPLING_TYPE_PMFM, + n("tutti.editProtocol.table.header.calcifiedPiecesSamplingType"), + n("tutti.editProtocol.table.header.calcifiedPiecesSamplingType.tip")); + public static final ColumnIdentifier<EditProtocolSpeciesRowModel> USE_RTP = ColumnIdentifier.newId( EditProtocolSpeciesRowModel.PROPERTY_USE_RTP, n("tutti.editProtocol.table.header.useRtp"), @@ -107,8 +102,6 @@ public class EditProtocolSpeciesTableModel extends AbstractApplicationTableModel result.setMandatorySampleCategoryId(mandatoryIds); result.setWeightEnabled(true); - result.setCountIfNoFrequencyEnabled(true); - result.setCalcifySampleEnabled(true); result.setValid(true); result.addPropertyChangeListener(EditProtocolSpeciesRowModel.PROPERTY_LENGTH_STEP_PMFM, diff --git a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/protocol/EditProtocolUIHandler.java b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/protocol/EditProtocolUIHandler.java index bb7640b..e22cfd2 100644 --- a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/protocol/EditProtocolUIHandler.java +++ b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/protocol/EditProtocolUIHandler.java @@ -383,7 +383,6 @@ public class EditProtocolUIHandler extends AbstractTuttiUIHandler<EditProtocolUI addLengthClassesColumnToModel(columnModel, model.getLengthClassesPmfmId(), table); addBooleanColumnToModel(columnModel, EditProtocolSpeciesTableModel.WEIGHT_ENABLED, table); - addBooleanColumnToModel(columnModel, EditProtocolSpeciesTableModel.COUNT_IF_NO_FREQUENCY_ENABLED, table); for (SampleCategoryModelEntry sampleCategoryModelEntry : sampleCategoryModel.getCategory()) { @@ -402,12 +401,12 @@ public class EditProtocolUIHandler extends AbstractTuttiUIHandler<EditProtocolUI addBooleanColumnToModel(columnModel, identifier, table); } - addBooleanColumnToModel(columnModel, EditProtocolSpeciesTableModel.CALCIFY_SAMPLE_ENABLED, table); - - addMaturityColumnToModel(columnModel, table); + addPmfmColumnToModel(columnModel, EditProtocolSpeciesTableModel.MATURITY_PMFM_ID); addIndividualObservationColumnToModel(columnModel, table); + addPmfmColumnToModel(columnModel, EditProtocolSpeciesTableModel.CALCIFIED_PIECES_SAMPLING_TYPE_PMFM_ID); + addColumnToModel(columnModel, RtpCellEditor.newEditor(ui), new RtpCellRenderer(), @@ -449,7 +448,6 @@ public class EditProtocolUIHandler extends AbstractTuttiUIHandler<EditProtocolUI addLengthClassesColumnToModel(columnModel, model.getLengthClassesPmfmId(), table); addBooleanColumnToModel(columnModel, EditProtocolSpeciesTableModel.WEIGHT_ENABLED, table); - addBooleanColumnToModel(columnModel, EditProtocolSpeciesTableModel.COUNT_IF_NO_FREQUENCY_ENABLED, table); for (SampleCategoryModelEntry sampleCategoryModelEntry : sampleCategoryModel.getCategory()) { @@ -468,12 +466,12 @@ public class EditProtocolUIHandler extends AbstractTuttiUIHandler<EditProtocolUI addBooleanColumnToModel(columnModel, identifier, table); } - addBooleanColumnToModel(columnModel, EditProtocolSpeciesTableModel.CALCIFY_SAMPLE_ENABLED, table); - - addMaturityColumnToModel(columnModel, table); + addPmfmColumnToModel(columnModel, EditProtocolSpeciesTableModel.MATURITY_PMFM_ID); addIndividualObservationColumnToModel(columnModel, table); + addPmfmColumnToModel(columnModel, EditProtocolSpeciesTableModel.CALCIFIED_PIECES_SAMPLING_TYPE_PMFM_ID); + addColumnToModel(columnModel, RtpCellEditor.newEditor(ui), new RtpCellRenderer(), @@ -1104,9 +1102,7 @@ public class EditProtocolUIHandler extends AbstractTuttiUIHandler<EditProtocolUI EditProtocolSpeciesTableModel tableModel = (EditProtocolSpeciesTableModel) table.getModel(); EditProtocolSpeciesRowModel selectedRow = tableModel.getRows().get(table.convertRowIndexToModel(table.getSelectedRow())); Caracteristic lengthStepPmfm = selectedRow.getLengthStepPmfm(); - boolean withLengthStepPmfm = lengthStepPmfm != null; - selectedRow.setCountIfNoFrequencyEnabled(withLengthStepPmfm); - if (!withLengthStepPmfm) { + if (lengthStepPmfm == null) { selectedRow.setIndividualObservationEnabled(false); } } @@ -1123,8 +1119,8 @@ public class EditProtocolUIHandler extends AbstractTuttiUIHandler<EditProtocolUI EditProtocolSpeciesTableModel.LENGTH_STEP_PMFM_ID); } - protected void addMaturityColumnToModel(TableColumnModel model, - JTable table) { + protected void addPmfmColumnToModel(TableColumnModel model, + ColumnIdentifier<EditProtocolSpeciesRowModel> column) { Decorator<Caracteristic> decorator = getDecorator(Caracteristic.class, null); @@ -1148,7 +1144,7 @@ public class EditProtocolUIHandler extends AbstractTuttiUIHandler<EditProtocolUI addColumnToModel(model, editor, newTableCellRender(decorator), - EditProtocolSpeciesTableModel.MATURITY_PMFM_ID); + column); } protected void initTable(final JXTable table, diff --git a/tutti-ui-swing/src/main/resources/i18n/tutti-ui-swing_en_GB.properties b/tutti-ui-swing/src/main/resources/i18n/tutti-ui-swing_en_GB.properties index 9a53100..1f79785 100644 --- a/tutti-ui-swing/src/main/resources/i18n/tutti-ui-swing_en_GB.properties +++ b/tutti-ui-swing/src/main/resources/i18n/tutti-ui-swing_en_GB.properties @@ -1156,6 +1156,8 @@ tutti.editProtocol.tab.cps= tutti.editProtocol.tab.info= tutti.editProtocol.tab.species= tutti.editProtocol.tab.zone= +tutti.editProtocol.table.header.calcifiedPiecesSamplingType= +tutti.editProtocol.table.header.calcifiedPiecesSamplingType.tip= tutti.editProtocol.table.header.calcifySample= tutti.editProtocol.table.header.calcifySample.tip= tutti.editProtocol.table.header.caracteristics.importFileColumn= diff --git a/tutti-ui-swing/src/main/resources/i18n/tutti-ui-swing_fr_FR.properties b/tutti-ui-swing/src/main/resources/i18n/tutti-ui-swing_fr_FR.properties index 48c069d..3fa0322 100644 --- a/tutti-ui-swing/src/main/resources/i18n/tutti-ui-swing_fr_FR.properties +++ b/tutti-ui-swing/src/main/resources/i18n/tutti-ui-swing_fr_FR.properties @@ -1103,6 +1103,8 @@ tutti.editProtocol.tab.cps=Prélèvement de pièces calcifiées tutti.editProtocol.tab.info=Informations générales tutti.editProtocol.tab.species=Espèces tutti.editProtocol.tab.zone=Zones +tutti.editProtocol.table.header.calcifiedPiecesSamplingType= +tutti.editProtocol.table.header.calcifiedPiecesSamplingType.tip= tutti.editProtocol.table.header.calcifySample=Prélèvement de pièces calcifiées tutti.editProtocol.table.header.calcifySample.tip=Prélèvement de pièces calcifiées (pour les données individuelles) tutti.editProtocol.table.header.caracteristics.importFileColumn=Colonne du fichier d'import -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.