branch feature/7930 updated (883d7c6 -> b2d9145)
This is an automated email from the git hooks/post-receive script. New change to branch feature/7930 in repository tutti. See http://git.codelutin.com/tutti.git from 883d7c6 creation de l'onglet d'edition de l'algo de prelevement de pieces calcifiees (refs #7930) new b2d9145 combo de selection de l'espece + ajout de lignes dans le tableau + possibilité de splitter une ligne (refs #7930) 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 b2d9145b0d53fa6c115127a2e93b328fcb70993f Author: Kevin Morin <morin@codelutin.com> Date: Fri Feb 5 14:09:11 2016 +0100 combo de selection de l'espece + ajout de lignes dans le tableau + possibilité de splitter une ligne (refs #7930) Summary of changes: pom.xml | 4 + .../fr/ifremer/tutti/service/DecoratorService.java | 39 +++++++ .../resources/i18n/tutti-service_en_GB.properties | 4 + .../resources/i18n/tutti-service_fr_FR.properties | 4 + .../content/protocol/EditProtocolUIModel.java | 15 +++ .../CalcifiedPiecesSamplingEditorRowModel.java | 20 +++- .../CalcifiedPiecesSamplingEditorTableModel.java | 25 +++++ .../CalcifiedPiecesSamplingEditorUI.jaxx | 7 +- .../CalcifiedPiecesSamplingEditorUI.jcss | 20 ++++ .../CalcifiedPiecesSamplingEditorUIHandler.java | 113 +++++++++++++++++++++ .../actions/AddSpeciesAction.java | 25 +++++ .../actions/SplitSpeciesAction.java | 60 +++++++++++ .../resources/i18n/tutti-ui-swing_en_GB.properties | 4 + .../resources/i18n/tutti-ui-swing_fr_FR.properties | 4 + 14 files changed, 339 insertions(+), 5 deletions(-) create mode 100644 tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/protocol/calcifiedpiecessampling/actions/SplitSpeciesAction.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/7930 in repository tutti. See http://git.codelutin.com/tutti.git commit b2d9145b0d53fa6c115127a2e93b328fcb70993f Author: Kevin Morin <morin@codelutin.com> Date: Fri Feb 5 14:09:11 2016 +0100 combo de selection de l'espece + ajout de lignes dans le tableau + possibilité de splitter une ligne (refs #7930) --- pom.xml | 4 + .../fr/ifremer/tutti/service/DecoratorService.java | 39 +++++++ .../resources/i18n/tutti-service_en_GB.properties | 4 + .../resources/i18n/tutti-service_fr_FR.properties | 4 + .../content/protocol/EditProtocolUIModel.java | 15 +++ .../CalcifiedPiecesSamplingEditorRowModel.java | 20 +++- .../CalcifiedPiecesSamplingEditorTableModel.java | 25 +++++ .../CalcifiedPiecesSamplingEditorUI.jaxx | 7 +- .../CalcifiedPiecesSamplingEditorUI.jcss | 20 ++++ .../CalcifiedPiecesSamplingEditorUIHandler.java | 113 +++++++++++++++++++++ .../actions/AddSpeciesAction.java | 25 +++++ .../actions/SplitSpeciesAction.java | 60 +++++++++++ .../resources/i18n/tutti-ui-swing_en_GB.properties | 4 + .../resources/i18n/tutti-ui-swing_fr_FR.properties | 4 + 14 files changed, 339 insertions(+), 5 deletions(-) diff --git a/pom.xml b/pom.xml index fb1ca02..a0988a1 100644 --- a/pom.xml +++ b/pom.xml @@ -121,6 +121,8 @@ <projectId>tutti</projectId> + <javaVersion>1.8</javaVersion> + <!-- libraries version --> <nuitonI18nVersion>3.3</nuitonI18nVersion> <nuitonValidatorVersion>3.0</nuitonValidatorVersion> @@ -158,6 +160,8 @@ <!-- Where are deployed software components --> <distroUrl>https://nexus.nuiton.org/nexus/content/repositories/other-releases</distroUrl> + + </properties> <repositories> diff --git a/tutti-service/src/main/java/fr/ifremer/tutti/service/DecoratorService.java b/tutti-service/src/main/java/fr/ifremer/tutti/service/DecoratorService.java index 77c3f6a..e7aaf49 100644 --- a/tutti-service/src/main/java/fr/ifremer/tutti/service/DecoratorService.java +++ b/tutti-service/src/main/java/fr/ifremer/tutti/service/DecoratorService.java @@ -80,6 +80,10 @@ public class DecoratorService extends AbstractTuttiService { public static final String SEPARATOR = "#"; + public static final String MATURITY = "maturity"; + + public static final String SHORT_MATURITY = "shortMaturity"; + public static final Comparator<FishingOperation> FISHING_OPERATION_COMPARATOR_BY_GEAR_SHOOTING_START_DATE = new Comparator<FishingOperation>() { @Override public int compare(FishingOperation o1, FishingOperation o2) { @@ -87,6 +91,7 @@ public class DecoratorService extends AbstractTuttiService { } }; + /** Delegate decorator provider. */ protected DecoratorProvider decoratorProvider; @@ -156,6 +161,8 @@ public class DecoratorService extends AbstractTuttiService { } }); registerDecorator(SPACE_EVERY_3_DIGIT, new SpaceEvery3DigitDecorator()); + registerDecorator(MATURITY, new MaturityDecorator(false)); + registerDecorator(SHORT_MATURITY, new MaturityDecorator(true)); registerDecorator(new VesselDecorator()); registerDecorator(new ProgramDecorator()); registerTuttiDecorator(Program.class, ONLY_NAME, "${name}$s", SEPARATOR, " - "); @@ -426,4 +433,36 @@ public class DecoratorService extends AbstractTuttiService { } } } + + public static class MaturityDecorator extends Decorator<Boolean> { + + protected boolean shortRendering; + + protected MaturityDecorator(boolean shortRendering) { + super(Boolean.class); + this.shortRendering = shortRendering; + } + + @Override + public String toString(Object bean) { + String result; + + if (bean == null) { + result = ""; + + } else { + + Boolean maturity = (Boolean) bean; + + if (shortRendering) { + result = maturity ? t("tutti.maturity.mature.short") : t("tutti.maturity.immature.short"); + + } else { + result = maturity ? t("tutti.maturity.mature") : t("tutti.maturity.immature"); + } + } + + return result; + } + } } diff --git a/tutti-service/src/main/resources/i18n/tutti-service_en_GB.properties b/tutti-service/src/main/resources/i18n/tutti-service_en_GB.properties index 2b30977..fa432d4 100644 --- a/tutti-service/src/main/resources/i18n/tutti-service_en_GB.properties +++ b/tutti-service/src/main/resources/i18n/tutti-service_en_GB.properties @@ -13,6 +13,10 @@ tutti.error.messages= tutti.error.species.not.in.protocol= tutti.fatal.messages= tutti.io.mkDir.error= +tutti.maturity.immature= +tutti.maturity.immature.short= +tutti.maturity.mature= +tutti.maturity.mature.short= tutti.pdf.export.missing.species.code= tutti.property.attachment= tutti.property.caracteristic= diff --git a/tutti-service/src/main/resources/i18n/tutti-service_fr_FR.properties b/tutti-service/src/main/resources/i18n/tutti-service_fr_FR.properties index 76332e6..2b2727f 100644 --- a/tutti-service/src/main/resources/i18n/tutti-service_fr_FR.properties +++ b/tutti-service/src/main/resources/i18n/tutti-service_fr_FR.properties @@ -8,6 +8,10 @@ tutti.csv.import.error.on.row=Des erreurs ont été détectées à la ligne %s \ tutti.error.messages=Erreurs \:\n %s tutti.fatal.messages=Erreurs critiques \:\n %s tutti.io.mkDir.error=Erreur à la création du dossier %s +tutti.maturity.immature=Immature +tutti.maturity.immature.short=I +tutti.maturity.mature=Mature +tutti.maturity.mature.short=M tutti.pdf.export.missing.species.code=Une espèce (referenceId %s, nom scientifique %s) n'a ni code campagne, ni code refTax. tutti.property.attachment=Pièce jointe tutti.property.caracteristic=Caractéristique diff --git a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/protocol/EditProtocolUIModel.java b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/protocol/EditProtocolUIModel.java index 84b1f81..af261a1 100644 --- a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/protocol/EditProtocolUIModel.java +++ b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/protocol/EditProtocolUIModel.java @@ -35,6 +35,7 @@ import fr.ifremer.tutti.persistence.entities.protocol.TuttiProtocol; import fr.ifremer.tutti.persistence.entities.protocol.TuttiProtocols; import fr.ifremer.tutti.persistence.entities.referential.Caracteristic; import fr.ifremer.tutti.persistence.entities.referential.Species; +import fr.ifremer.tutti.ui.swing.content.protocol.calcifiedpiecessampling.CalcifiedPiecesSamplingEditorRowModel; import fr.ifremer.tutti.ui.swing.util.AbstractTuttiBeanUIModel; import org.apache.commons.lang3.mutable.MutableInt; import org.nuiton.util.beans.Binder; @@ -78,6 +79,8 @@ public class EditProtocolUIModel extends AbstractTuttiBeanUIModel<TuttiProtocol, public static final String PROPERTY_CLEANED = "cleaned"; + public static final String PROPERTY_CSP_ROWS = "cspRows"; + /** * Delegate edit object. * @@ -155,6 +158,8 @@ public class EditProtocolUIModel extends AbstractTuttiBeanUIModel<TuttiProtocol, protected List<EditProtocolSpeciesRowModel> benthosRow; + protected List<CalcifiedPiecesSamplingEditorRowModel> cspRows; + protected static Binder<EditProtocolUIModel, TuttiProtocol> toBeanBinder = BinderFactory.newBinder(EditProtocolUIModel.class, TuttiProtocol.class); @@ -249,6 +254,16 @@ public class EditProtocolUIModel extends AbstractTuttiBeanUIModel<TuttiProtocol, firePropertyChange(PROPERTY_BENTHOS_ROW, oldValue, benthosRow); } + public List<CalcifiedPiecesSamplingEditorRowModel> getCspRows() { + return cspRows; + } + + public void setCspRows(List<CalcifiedPiecesSamplingEditorRowModel> cspRows) { + Object oldValue = getCspRows(); + this.cspRows = cspRows; + firePropertyChange(PROPERTY_CSP_ROWS, oldValue, cspRows); + } + public boolean isRemoveSpeciesEnabled() { return removeSpeciesEnabled; } diff --git a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/protocol/calcifiedpiecessampling/CalcifiedPiecesSamplingEditorRowModel.java b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/protocol/calcifiedpiecessampling/CalcifiedPiecesSamplingEditorRowModel.java index 3edea71..a808c7f 100644 --- a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/protocol/calcifiedpiecessampling/CalcifiedPiecesSamplingEditorRowModel.java +++ b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/protocol/calcifiedpiecessampling/CalcifiedPiecesSamplingEditorRowModel.java @@ -16,17 +16,21 @@ public class CalcifiedPiecesSamplingEditorRowModel extends AbstractSerializableB public static final String PROPERTY_MAX_SIZE = "maxSize"; + public static final String PROPERTY_MATURITY = "maturity"; + protected Species species; protected int minSize; - protected int maxSize; + protected Integer maxSize; + + protected Boolean maturity; - public int getMaxSize() { + public Integer getMaxSize() { return maxSize; } - public void setMaxSize(int maxSize) { + public void setMaxSize(Integer maxSize) { Object oldValue = getMaxSize(); this.maxSize = maxSize; firePropertyChange(PROPERTY_MAX_SIZE, oldValue, maxSize); @@ -51,4 +55,14 @@ public class CalcifiedPiecesSamplingEditorRowModel extends AbstractSerializableB this.species = species; firePropertyChange(PROPERTY_SPECIES, oldValue, species); } + + public Boolean getMaturity() { + return maturity; + } + + public void setMaturity(Boolean maturity) { + Object oldValue = getMaturity(); + this.maturity = maturity; + firePropertyChange(PROPERTY_MATURITY, oldValue, maturity); + } } diff --git a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/protocol/calcifiedpiecessampling/CalcifiedPiecesSamplingEditorTableModel.java b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/protocol/calcifiedpiecessampling/CalcifiedPiecesSamplingEditorTableModel.java index a9fb747..25c8064 100644 --- a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/protocol/calcifiedpiecessampling/CalcifiedPiecesSamplingEditorTableModel.java +++ b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/protocol/calcifiedpiecessampling/CalcifiedPiecesSamplingEditorTableModel.java @@ -1,9 +1,13 @@ package fr.ifremer.tutti.ui.swing.content.protocol.calcifiedpiecessampling; +import com.google.common.collect.Lists; +import fr.ifremer.tutti.persistence.entities.referential.Species; import org.jdesktop.swingx.table.TableColumnModelExt; import org.nuiton.jaxx.application.swing.table.AbstractApplicationTableModel; import org.nuiton.jaxx.application.swing.table.ColumnIdentifier; +import java.util.List; + import static org.nuiton.i18n.I18n.n; /** @@ -27,12 +31,33 @@ public class CalcifiedPiecesSamplingEditorTableModel extends AbstractApplication n("tutti.editCps.table.header.maxSize.field"), n("tutti.editCps.table.header.maxSize.field.tip")); + public static final ColumnIdentifier<CalcifiedPiecesSamplingEditorRowModel> MATURITY = ColumnIdentifier.newId( + CalcifiedPiecesSamplingEditorRowModel.PROPERTY_MATURITY, + n("tutti.editCps.table.header.maturity.field"), + n("tutti.editCps.table.header.maturity.field.tip")); + public CalcifiedPiecesSamplingEditorTableModel(TableColumnModelExt columnModel) { super(columnModel, false, false); + setNoneEditableCols(SPECIES, MAX_SIZE, MATURITY); } @Override public CalcifiedPiecesSamplingEditorRowModel createNewRow() { return new CalcifiedPiecesSamplingEditorRowModel(); } + + /** + * Return the list of used species in the table (used to fill the + * comparator cache for species sort) + * + * @return the list of used species in the table. + * @since 2.8 + */ + public List<Species> getSpeciesList() { + List<Species> result = Lists.newArrayList(); + for (CalcifiedPiecesSamplingEditorRowModel row : rows) { + result.add(row.getSpecies()); + } + return result; + } } diff --git a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/protocol/calcifiedpiecessampling/CalcifiedPiecesSamplingEditorUI.jaxx b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/protocol/calcifiedpiecessampling/CalcifiedPiecesSamplingEditorUI.jaxx index 7e9bba5..7cffb53 100644 --- a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/protocol/calcifiedpiecessampling/CalcifiedPiecesSamplingEditorUI.jaxx +++ b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/protocol/calcifiedpiecessampling/CalcifiedPiecesSamplingEditorUI.jaxx @@ -2,8 +2,9 @@ implements='fr.ifremer.tutti.ui.swing.util.TuttiUI<EditProtocolUIModel, CalcifiedPiecesSamplingEditorUIHandler>'> <import> - fr.ifremer.tutti.persistence.entities.referential.Species + fr.ifremer.tutti.persistence.entities.referential.Species + fr.ifremer.tutti.ui.swing.content.protocol.EditProtocolSpeciesRowModel fr.ifremer.tutti.ui.swing.content.protocol.EditProtocolUIModel fr.ifremer.tutti.ui.swing.util.TuttiUI fr.ifremer.tutti.ui.swing.util.TuttiUIUtil @@ -12,7 +13,6 @@ org.jdesktop.swingx.JXTable - </import> <script><
codelutin.com scm