branch feature/8085 created (now 2c117e6)
This is an automated email from the git hooks/post-receive script. New change to branch feature/8085 in repository tutti. See http://git.codelutin.com/tutti.git at 2c117e6 ajout de l'onglet de psfm de maturité + branchement dans la table espèce (fixes #8085) This branch includes the following new commits: new c866d7b ajoute de la liste des psfm de maturite dans le protocol (refs #8085) new 38c4627 multiplicité non prise en compte (refs #8063) new 60722cc ajout des nouvelles methodes au modele (refs #8085) new 2c117e6 ajout de l'onglet de psfm de maturité + branchement dans la table espèce (fixes #8085) The 4 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 2c117e6f87ccc13d106749e5c102c0dc6fc3a55d Author: Kevin Morin <morin@codelutin.com> Date: Tue Mar 8 19:09:11 2016 +0100 ajout de l'onglet de psfm de maturité + branchement dans la table espèce (fixes #8085) commit 60722cc6f9835f3bd2a389ec33013c4646364452 Author: Kevin Morin <morin@codelutin.com> Date: Tue Mar 8 18:26:17 2016 +0100 ajout des nouvelles methodes au modele (refs #8085) commit 38c4627c9cc9f2a1425b3e009145a1a8ddac7a30 Author: Kevin Morin <morin@codelutin.com> Date: Tue Mar 8 18:21:07 2016 +0100 multiplicité non prise en compte (refs #8063) commit c866d7b2413d6c1f5ae048d803d24d3993be05ed Author: Kevin Morin <morin@codelutin.com> Date: Tue Mar 8 18:14:49 2016 +0100 ajoute de la liste des psfm de maturite dans le protocol (refs #8085) -- 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/8085 in repository tutti. See http://git.codelutin.com/tutti.git commit c866d7b2413d6c1f5ae048d803d24d3993be05ed Author: Kevin Morin <morin@codelutin.com> Date: Tue Mar 8 18:14:49 2016 +0100 ajoute de la liste des psfm de maturite dans le protocol (refs #8085) --- .../src/main/xmi/tutti-persistence.zargo | Bin 62341 -> 62408 bytes 1 file changed, 0 insertions(+), 0 deletions(-) diff --git a/tutti-persistence/src/main/xmi/tutti-persistence.zargo b/tutti-persistence/src/main/xmi/tutti-persistence.zargo index 0224e4f..f2c93b4 100644 Binary files a/tutti-persistence/src/main/xmi/tutti-persistence.zargo and b/tutti-persistence/src/main/xmi/tutti-persistence.zargo differ -- 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/8085 in repository tutti. See http://git.codelutin.com/tutti.git commit 38c4627c9cc9f2a1425b3e009145a1a8ddac7a30 Author: Kevin Morin <morin@codelutin.com> Date: Tue Mar 8 18:21:07 2016 +0100 multiplicité non prise en compte (refs #8063) --- .../src/main/xmi/tutti-persistence.properties | 1 + .../src/main/xmi/tutti-persistence.zargo | Bin 62408 -> 62423 bytes 2 files changed, 1 insertion(+) diff --git a/tutti-persistence/src/main/xmi/tutti-persistence.properties b/tutti-persistence/src/main/xmi/tutti-persistence.properties index 0431cee..9606d6f 100644 --- a/tutti-persistence/src/main/xmi/tutti-persistence.properties +++ b/tutti-persistence/src/main/xmi/tutti-persistence.properties @@ -42,6 +42,7 @@ fr.ifremer.tutti.persistence.entities.data.BenthosBatch.attribute.childBatchs.st fr.ifremer.tutti.persistence.entities.protocol.TuttiProtocol.attribute.caracteristicMapping.stereotype=ordered fr.ifremer.tutti.persistence.entities.protocol.TuttiProtocol.attribute.individualObservationPmfmId.stereotype=ordered fr.ifremer.tutti.persistence.entities.protocol.TuttiProtocol.attribute.lengthClassesPmfmId.stereotype=ordered +fr.ifremer.tutti.persistence.entities.protocol.TuttiProtocol.attribute.maturityPmfmId.stereotype=ordered fr.ifremer.tutti.persistence.entities.protocol.TuttiProtocol.attribute.species.stereotype=ordered fr.ifremer.tutti.persistence.entities.protocol.TuttiProtocol.attribute.benthos.stereotype=ordered diff --git a/tutti-persistence/src/main/xmi/tutti-persistence.zargo b/tutti-persistence/src/main/xmi/tutti-persistence.zargo index f2c93b4..158c0a7 100644 Binary files a/tutti-persistence/src/main/xmi/tutti-persistence.zargo and b/tutti-persistence/src/main/xmi/tutti-persistence.zargo differ -- 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/8085 in repository tutti. See http://git.codelutin.com/tutti.git commit 60722cc6f9835f3bd2a389ec33013c4646364452 Author: Kevin Morin <morin@codelutin.com> Date: Tue Mar 8 18:26:17 2016 +0100 ajout des nouvelles methodes au modele (refs #8085) --- .../content/protocol/EditProtocolUIModel.java | 69 +++++++++++++++++++++- 1 file changed, 67 insertions(+), 2 deletions(-) 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 b6f4df7..f55436c 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 @@ -290,6 +290,11 @@ public class EditProtocolUIModel extends AbstractTuttiBeanUIModel<TuttiProtocol, setIndividualObservationPmfmId(ids); } + public void setMaturityPmfm(List<Caracteristic> maturityPmfm) { + List<String> ids = Lists.newArrayList(TuttiEntities.collecIds(maturityPmfm)); + setMaturityPmfmId(ids); + } + public Collection<EditProtocolCaracteristicsRowModel> getCaracteristicMappingRows() { return caracteristicMappingRows.values(); } @@ -570,6 +575,17 @@ public class EditProtocolUIModel extends AbstractTuttiBeanUIModel<TuttiProtocol, } @Override + public List<String> getMaturityPmfmId() { + return editObject.getMaturityPmfmId(); + } + + @Override + public void setMaturityPmfmId(List<String> maturityPmfmId) { + editObject.setMaturityPmfmId(maturityPmfmId); + firePropertyChange(PROPERTY_MATURITY_PMFM_ID, null, maturityPmfmId); + } + + @Override public List<CaracteristicMappingRow> getCaracteristicMapping() { return editObject.getCaracteristicMapping(); } @@ -726,6 +742,57 @@ public class EditProtocolUIModel extends AbstractTuttiBeanUIModel<TuttiProtocol, } @Override + public void addMaturityPmfmId(String maturityPmfmId) { + editObject.addMaturityPmfmId(maturityPmfmId); + firePropertyChange(PROPERTY_MATURITY_PMFM_ID, null, getMaturityPmfmId()); + } + + @Override + public void addAllMaturityPmfmId(Collection<String> maturityPmfmId) { + editObject.addAllMaturityPmfmId(maturityPmfmId); + firePropertyChange(PROPERTY_MATURITY_PMFM_ID, null, getMaturityPmfmId()); + } + + @Override + public boolean containsAllMaturityPmfmId(Collection<String> maturityPmfmId) { + return editObject.containsAllMaturityPmfmId(maturityPmfmId); + } + + @Override + public boolean containsMaturityPmfmId(String maturityPmfmId) { + return editObject.containsMaturityPmfmId(maturityPmfmId); + } + + @Override + public String getMaturityPmfmId(int index) { + return editObject.getMaturityPmfmId(index); + } + + @Override + public boolean isMaturityPmfmIdEmpty() { + return editObject.isMaturityPmfmIdEmpty(); + } + + @Override + public boolean removeAllMaturityPmfmId(Collection<String> maturityPmfmId) { + boolean result = editObject.removeAllMaturityPmfmId(maturityPmfmId); + firePropertyChange(PROPERTY_MATURITY_PMFM_ID, null, getMaturityPmfmId()); + return result; + } + + @Override + public boolean removeMaturityPmfmId(String maturityPmfmId) { + boolean result = editObject.removeMaturityPmfmId(maturityPmfmId); + firePropertyChange(PROPERTY_MATURITY_PMFM_ID, null, getMaturityPmfmId()); + return result; + } + + @Override + public int sizeMaturityPmfmId() { + return editObject.sizeMaturityPmfmId(); + } + + @Override public SpeciesProtocol getSpecies(int index) { return editObject.getSpecies(index); } @@ -1048,8 +1115,6 @@ public class EditProtocolUIModel extends AbstractTuttiBeanUIModel<TuttiProtocol, firePropertyChanged(TuttiProtocol.PROPERTY_USE_CALCIFIED_PIECE_SAMPLING, oldValue, useCalcifiedPieceSampling); } - - public int numberOfRows(String column) { int result = 0; MutableInt mutableInt = numberOfRowsByColumn.get(column); -- 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/8085 in repository tutti. See http://git.codelutin.com/tutti.git commit 2c117e6f87ccc13d106749e5c102c0dc6fc3a55d Author: Kevin Morin <morin@codelutin.com> Date: Tue Mar 8 19:09:11 2016 +0100 ajout de l'onglet de psfm de maturité + branchement dans la table espèce (fixes #8085) --- .../filtered-resources/tutti-help-fr.properties | 26 +----------- .../ui/swing/content/protocol/EditProtocolUI.jaxx | 4 ++ .../ui/swing/content/protocol/EditProtocolUI.jcss | 15 ++++--- .../content/protocol/EditProtocolUIHandler.java | 48 ++++++++++++++++++---- .../resources/i18n/tutti-ui-swing_en_GB.properties | 1 + .../resources/i18n/tutti-ui-swing_fr_FR.properties | 1 + 6 files changed, 57 insertions(+), 38 deletions(-) diff --git a/tutti-ui-swing/src/main/filtered-resources/tutti-help-fr.properties b/tutti-ui-swing/src/main/filtered-resources/tutti-help-fr.properties index a9e9087..e990a30 100644 --- a/tutti-ui-swing/src/main/filtered-resources/tutti-help-fr.properties +++ b/tutti-ui-swing/src/main/filtered-resources/tutti-help-fr.properties @@ -1,28 +1,5 @@ -### -# #%L -# Tutti :: UI -# $Id:$ -# $HeadURL:$ -# %% -# Copyright (C) 2012 - 2016 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% -### #Generated by org.nuiton.jaxx.plugin.GenerateHelpIdsMojo -#Fri Feb 26 15:28:11 CET 2016 +#Tue Mar 08 18:29:34 CET 2016 tutti.config.help=config.html tutti.createAccidentalBatch.action.cancel.help=editFishingOperation.html\#captureCapturesAccidentellesActions tutti.createAccidentalBatch.action.saveAndClose.help=editFishingOperation.html\#captureCapturesAccidentellesActions @@ -279,6 +256,7 @@ tutti.editProtocol.field.comment.help=editProtocol.html\#fields tutti.editProtocol.field.gearUseFeature.help=editProtocol.html\#fieldsCaracteristics tutti.editProtocol.field.individualObservation.help=editProtocol.html\#fieldsCaracteristics tutti.editProtocol.field.lengthClasses.help=editProtocol.html\#fieldsCaracteristics +tutti.editProtocol.field.maturity.help= tutti.editProtocol.field.name.help=editProtocol.html\#fields tutti.editProtocol.field.species.help=editProtocol.html\#fieldsSpecies tutti.editProtocol.field.useCalcifiedPieceSampling.help= diff --git a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/protocol/EditProtocolUI.jaxx b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/protocol/EditProtocolUI.jaxx index b30c73f..aaa9b40 100644 --- a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/protocol/EditProtocolUI.jaxx +++ b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/protocol/EditProtocolUI.jaxx @@ -131,6 +131,10 @@ <BeanDoubleList id='individualObservationList' genericType='Caracteristic'/> </tab> + <tab title='tutti.editProtocol.tab.caracteristic.maturity'> + <BeanDoubleList id='maturityList' + genericType='Caracteristic'/> + </tab> <tab title='tutti.editProtocol.tab.caracteristic.mapping'> <Table fill='both'> diff --git a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/protocol/EditProtocolUI.jcss b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/protocol/EditProtocolUI.jcss index daad976..fd159ee 100644 --- a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/protocol/EditProtocolUI.jcss +++ b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/protocol/EditProtocolUI.jcss @@ -6,15 +6,15 @@ * %% * 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 + * 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 + * + * 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% @@ -74,7 +74,7 @@ JTextField { #saveWarning { actionIcon: warning; border: {new javax.swing.border.EmptyBorder(5, 10, 5, 10)}; -} +} #caracteristicMappingComboBox { enabled: {!caracteristicMappingComboBox.isEmpty()}; @@ -159,6 +159,11 @@ JTextField { _help: {"tutti.editProtocol.field.lengthClasses.help"}; } +#maturityList { + property: maturityPmfm; + _help: {"tutti.editProtocol.field.maturity.help"}; +} + #cpsTabbedPane { visible: {model.isUseCalcifiedPieceSampling()}; } 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 d1fb51e..ea31f8d 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 @@ -382,8 +382,8 @@ public class EditProtocolUIHandler extends AbstractTuttiUIHandler<EditProtocolUI EditProtocolSpeciesTableModel.SURVEY_CODE_ID); speciesSurveyCodeColumn.setSortable(true); - addLengthClassesColumnToModel(columnModel, model.getLengthClassesPmfmId(), table); - addPmfmColumnToModel(columnModel, EditProtocolSpeciesTableModel.MATURITY_PMFM_ID); + addLengthClassesColumnToModel(columnModel, model.getLengthClassesPmfmId()); + addMaturityColumnToModel(columnModel, model.getMaturityPmfmId()); addPmfmColumnToModel(columnModel, EditProtocolSpeciesTableModel.CALCIFIED_PIECES_SAMPLING_TYPE_PMFM_ID); addBooleanColumnToModel(columnModel, EditProtocolSpeciesTableModel.WEIGHT_ENABLED, table); @@ -445,8 +445,8 @@ public class EditProtocolUIHandler extends AbstractTuttiUIHandler<EditProtocolUI EditProtocolSpeciesTableModel.SURVEY_CODE_ID); speciesSurveyCodeColumn.setSortable(true); - addLengthClassesColumnToModel(columnModel, model.getLengthClassesPmfmId(), table); - addPmfmColumnToModel(columnModel, EditProtocolSpeciesTableModel.MATURITY_PMFM_ID); + addLengthClassesColumnToModel(columnModel, model.getLengthClassesPmfmId()); + addMaturityColumnToModel(columnModel, model.getMaturityPmfmId()); addPmfmColumnToModel(columnModel, EditProtocolSpeciesTableModel.CALCIFIED_PIECES_SAMPLING_TYPE_PMFM_ID); addBooleanColumnToModel(columnModel, EditProtocolSpeciesTableModel.WEIGHT_ENABLED, table); @@ -501,6 +501,11 @@ public class EditProtocolUIHandler extends AbstractTuttiUIHandler<EditProtocolUI Lists.newArrayList(model.getCaracteristics()), model.getIndividualObservationPmfmId()); + initDoubleList(EditProtocolUIModel.PROPERTY_MATURITY_PMFM_ID, + this.ui.getMaturityList(), + Lists.newArrayList(model.getCaracteristics()), + model.getMaturityPmfmId()); + // init caracteristics mappingtable { JXTable caracteristicsMappingTable = getCaracteristicsMappingTable(); @@ -1121,7 +1126,7 @@ public class EditProtocolUIHandler extends AbstractTuttiUIHandler<EditProtocolUI widget.getHandler().addFilter(caracteristic -> !getModel().isCaracteristicUsedInMapping(caracteristic)); } - protected void selectLengthClasses(List<String> ids, JComboBox comboBox) { + protected void selectCaracteristics(List<String> ids, JComboBox comboBox) { Map<String, Caracteristic> allCaracteristic = getModel().getAllCaracteristic(); List<Caracteristic> selection = Lists.newArrayList(); @@ -1141,8 +1146,7 @@ public class EditProtocolUIHandler extends AbstractTuttiUIHandler<EditProtocolUI } protected void addLengthClassesColumnToModel(TableColumnModel model, - List<String> selectedIds, - JTable table) { + List<String> selectedIds) { Decorator<Caracteristic> decorator = getDecorator(Caracteristic.class, null); @@ -1151,11 +1155,11 @@ public class EditProtocolUIHandler extends AbstractTuttiUIHandler<EditProtocolUI getModel().addPropertyChangeListener(EditProtocolUIModel.PROPERTY_LENGTH_CLASSES_PMFM_ID, evt -> { List<String> ids = (List<String>) evt.getNewValue(); - selectLengthClasses(ids, comboBox); + selectCaracteristics(ids, comboBox); }); comboBox.setRenderer(newListCellRender(decorator)); - selectLengthClasses(selectedIds, comboBox); + selectCaracteristics(selectedIds, comboBox); ObjectToStringConverter converter = BeanUIUtil.newDecoratedObjectToStringConverter(decorator); BeanUIUtil.decorate(comboBox, converter); ComboBoxCellEditor editor = new ComboBoxCellEditor(comboBox); @@ -1166,6 +1170,32 @@ public class EditProtocolUIHandler extends AbstractTuttiUIHandler<EditProtocolUI EditProtocolSpeciesTableModel.LENGTH_STEP_PMFM_ID); } + protected void addMaturityColumnToModel(TableColumnModel model, + List<String> selectedIds) { + + Decorator<Caracteristic> decorator = + getDecorator(Caracteristic.class, null); + + final JComboBox comboBox = new JComboBox(); + + getModel().addPropertyChangeListener(EditProtocolUIModel.PROPERTY_MATURITY_PMFM_ID, evt -> { + List<String> ids = (List<String>) evt.getNewValue(); + selectCaracteristics(ids, comboBox); + }); + + comboBox.setRenderer(newListCellRender(decorator)); + + selectCaracteristics(selectedIds, comboBox); + ObjectToStringConverter converter = BeanUIUtil.newDecoratedObjectToStringConverter(decorator); + BeanUIUtil.decorate(comboBox, converter); + ComboBoxCellEditor editor = new ComboBoxCellEditor(comboBox); + + addColumnToModel(model, + editor, + newTableCellRender(decorator), + EditProtocolSpeciesTableModel.MATURITY_PMFM_ID); + } + protected void addPmfmColumnToModel(TableColumnModel model, ColumnIdentifier<EditProtocolSpeciesRowModel> column) { 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 41933d8..69528c3 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 @@ -1167,6 +1167,7 @@ tutti.editProtocol.tab.caracteristic.gearUseFeature= tutti.editProtocol.tab.caracteristic.individualObservation= tutti.editProtocol.tab.caracteristic.lengthClasses= tutti.editProtocol.tab.caracteristic.mapping= +tutti.editProtocol.tab.caracteristic.maturity= tutti.editProtocol.tab.caracteristic.vesselUseFeature= tutti.editProtocol.tab.cps= tutti.editProtocol.tab.info= 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 238069b..732bc5c 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 @@ -1109,6 +1109,7 @@ tutti.editProtocol.tab.caracteristic=Caractéristiques tutti.editProtocol.tab.caracteristic.individualObservation=Observations individuelles tutti.editProtocol.tab.caracteristic.lengthClasses=Classes de taille tutti.editProtocol.tab.caracteristic.mapping=Caractéristiques du trait +tutti.editProtocol.tab.caracteristic.maturity=Maturité 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 -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.
participants (1)
-
codelutin.com scm