Tony CHEMIT pushed to branch develop at ultreiaio / ird-observe Commits: daec5f00 by Tony CHEMIT at 2017-09-06T23:46:08+02:00 Ne pas afficher le formulaire des faune accessoire sensibles libérées si aucune espèce ne convient - - - - - 8 changed files: - client/src/main/java/fr/ird/observe/client/ui/content/ContentUIHandler.java - + client/src/main/java/fr/ird/observe/client/ui/content/FormManager.java - client/src/main/java/fr/ird/observe/client/ui/content/data/seine/NonTargetCatchReleaseUI.jcss - client/src/main/java/fr/ird/observe/client/ui/content/data/seine/NonTargetCatchReleaseUIHandler.java - client/src/main/java/fr/ird/observe/client/ui/content/table/ContentTableUIHandler.java - client/src/main/resources/i18n/client_en_GB.properties - client/src/main/resources/i18n/client_es_ES.properties - client/src/main/resources/i18n/client_fr_FR.properties Changes: ===================================== client/src/main/java/fr/ird/observe/client/ui/content/ContentUIHandler.java ===================================== --- a/client/src/main/java/fr/ird/observe/client/ui/content/ContentUIHandler.java +++ b/client/src/main/java/fr/ird/observe/client/ui/content/ContentUIHandler.java @@ -372,7 +372,7 @@ public abstract class ContentUIHandler<E extends IdDto, U extends ContentUI<E, U return ObserveSwingApplicationContext.get().getDecoratorService(); } - public void destroyUI() { + void destroyUI() { UIHelper.removeAllDataBindings(getUi()); getModel().destroy(); UIHelper.destroy(getUi()); @@ -411,9 +411,13 @@ public abstract class ContentUIHandler<E extends IdDto, U extends ContentUI<E, U grabFocusOnForm(); + fixFormSize(); + } + + protected void fixFormSize() { + // we want to see the hole form on screen ui.setMinimumSize(ui.getPreferredSize()); - } /** @@ -1000,7 +1004,7 @@ public abstract class ContentUIHandler<E extends IdDto, U extends ContentUI<E, U list.putClientProperty("data", data); } - protected <R extends ReferentialDtoReference> void updateReferentialBeanListHeader(Class<R> dtoClass, BeanListHeader<R> list) { + private <R extends ReferentialDtoReference> void updateReferentialBeanListHeader(Class<R> dtoClass, BeanListHeader<R> list) { Boolean noLoad = (Boolean) list.getClientProperty(ObserveContentUI.CLIENT_PROPERTY_LIST_NO_LOAD); @@ -1057,7 +1061,7 @@ public abstract class ContentUIHandler<E extends IdDto, U extends ContentUI<E, U } - protected <R extends ReferentialDtoReference> void updateReferentialBeanComboBox(Class<R> dtoClass, BeanComboBox<R> comboBox) { + private <R extends ReferentialDtoReference> void updateReferentialBeanComboBox(Class<R> dtoClass, BeanComboBox<R> comboBox) { Boolean noLoad = (Boolean) comboBox.getClientProperty(ObserveContentUI.CLIENT_PROPERTY_LIST_NO_LOAD); Boolean forceLoadComboBox = (Boolean) comboBox.getClientProperty(ObserveContentUI.CLIENT_PROPERTY_FORCE_LOAD); @@ -1193,7 +1197,7 @@ public abstract class ContentUIHandler<E extends IdDto, U extends ContentUI<E, U boolean isReferential = ReferentialDto.class.isAssignableFrom(getBeanType()); if (isReferential) { content.add(new JLabel(t("observe.common.Dto.topiaCreateDate"))); - JTextField comp =(JTextField) new JTextField(dateFormat.format(bean.getCreateDate())); + JTextField comp = new JTextField(dateFormat.format(bean.getCreateDate())); comp.setEditable(false); comp.addFocusListener(l); content.add(comp); ===================================== client/src/main/java/fr/ird/observe/client/ui/content/FormManager.java ===================================== --- /dev/null +++ b/client/src/main/java/fr/ird/observe/client/ui/content/FormManager.java @@ -0,0 +1,17 @@ +package fr.ird.observe.client.ui.content; + +/** + * Created by tchemit on 06/09/17. + * + * @author Tony Chemit - dev@tchemit.fr + * @since 7.0 + * TODO + */ +public class FormManager { + + + public void loadForm(ContentUIModel model) { + + + } +} ===================================== client/src/main/java/fr/ird/observe/client/ui/content/data/seine/NonTargetCatchReleaseUI.jcss ===================================== --- a/client/src/main/java/fr/ird/observe/client/ui/content/data/seine/NonTargetCatchReleaseUI.jcss +++ b/client/src/main/java/fr/ird/observe/client/ui/content/data/seine/NonTargetCatchReleaseUI.jcss @@ -20,6 +20,10 @@ * #L% */ +#hideFormInformation { + text:"observe.common.NonTargetCatchReleaseDto.message.cantAdd"; +} + #statesContent { border:{new TitledBorder(t("observe.common.NonTargetCatchReleaseDto.status"))}; } ===================================== client/src/main/java/fr/ird/observe/client/ui/content/data/seine/NonTargetCatchReleaseUIHandler.java ===================================== --- a/client/src/main/java/fr/ird/observe/client/ui/content/data/seine/NonTargetCatchReleaseUIHandler.java +++ b/client/src/main/java/fr/ird/observe/client/ui/content/data/seine/NonTargetCatchReleaseUIHandler.java @@ -23,10 +23,15 @@ package fr.ird.observe.client.ui.content.data.seine; import fr.ird.observe.client.constants.AcquisitionMode; import fr.ird.observe.client.db.constants.DataContextType; +import fr.ird.observe.client.ui.content.ContentMode; import fr.ird.observe.client.ui.content.table.ContentTableUIHandler; import fr.ird.observe.client.ui.util.UIHelper; import fr.ird.observe.client.ui.util.table.AutotSelectRowAndShowPopupActionSupport; +import fr.ird.observe.dto.data.seine.NonTargetCatchReleaseDto; import fr.ird.observe.dto.data.seine.NonTargetCatchReleaseStatus; +import fr.ird.observe.dto.data.seine.SetSeineDto; +import fr.ird.observe.dto.data.seine.SetSeineNonTargetCatchReleaseDto; +import fr.ird.observe.dto.data.seine.SetSeineNonTargetCatchReleaseHelper; import fr.ird.observe.dto.form.Form; import fr.ird.observe.dto.reference.ReferentialDtoReferenceSet; import fr.ird.observe.dto.referential.SexReference; @@ -34,9 +39,6 @@ import fr.ird.observe.dto.referential.SpeciesGroupDto; import fr.ird.observe.dto.referential.SpeciesGroupReleaseModeReference; import fr.ird.observe.dto.referential.SpeciesReference; import fr.ird.observe.dto.result.SaveResultDto; -import fr.ird.observe.dto.data.seine.NonTargetCatchReleaseDto; -import fr.ird.observe.dto.data.seine.SetSeineNonTargetCatchReleaseDto; -import fr.ird.observe.dto.data.seine.SetSeineNonTargetCatchReleaseHelper; import java.beans.PropertyChangeListener; import java.util.ArrayList; import java.util.Collections; @@ -56,9 +58,11 @@ import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.nuiton.jaxx.runtime.spi.UIHandler; import org.nuiton.jaxx.widgets.hidor.HidorButton; +import org.nuiton.validator.NuitonValidatorScope; import static org.nuiton.i18n.I18n.n; +import static org.nuiton.i18n.I18n.t; /** * @author Tony Chemit - dev@tchemit.fr @@ -90,7 +94,6 @@ public class NonTargetCatchReleaseUIHandler extends ContentTableUIHandler<SetSei addReferentialFilter(NonTargetCatchReleaseDto.PROPERTY_SPECIES, incomingReferences -> { ReferentialDtoReferenceSet<SpeciesReference> sampleSpecies = getNonTargetCatchReleaseService().getSampleSpecies(getSelectedParentId()); return new LinkedList<>(sampleSpecies.toSet()); -// return ReferentialDtoReferences.filterEnabled(result); }); } @@ -258,6 +261,21 @@ public class NonTargetCatchReleaseUIHandler extends ContentTableUIHandler<SetSei getModel().setForm(form); SetSeineNonTargetCatchReleaseHelper.copySetSeineNonTargetCatchReleaseDto(form.getObject(), getBean()); + boolean showData = !getModel().getReferentialReferences(NonTargetCatchReleaseDto.PROPERTY_SPECIES).isEmpty(); + + getModel().setShowData(showData); + + if (getModel().isUpdatingMode() && !showData) { + + getModel().setMode(ContentMode.READ); + + removeAllMessages(ui); + + addMessage(getUi(), + NuitonValidatorScope.INFO, + getTypeI18nKey(SetSeineDto.class), + t("observe.common.SetSeineDto.message.no.nonTargetCatchRelease")); + } } public void moveCatchLonglineUp() { ===================================== client/src/main/java/fr/ird/observe/client/ui/content/table/ContentTableUIHandler.java ===================================== --- a/client/src/main/java/fr/ird/observe/client/ui/content/table/ContentTableUIHandler.java +++ b/client/src/main/java/fr/ird/observe/client/ui/content/table/ContentTableUIHandler.java @@ -40,6 +40,7 @@ import fr.ird.observe.dto.data.seine.ActivitySeineDto; import fr.ird.observe.dto.data.seine.TargetCatchDto; import fr.ird.observe.dto.referential.SpeciesReference; import fr.ird.observe.dto.referential.seine.WeightCategoryReference; +import java.awt.Dimension; import java.awt.Rectangle; import java.beans.PropertyChangeListener; import java.io.Serializable; @@ -49,6 +50,7 @@ import javax.swing.JButton; import javax.swing.JMenuItem; import javax.swing.JPopupMenu; import javax.swing.JScrollPane; +import javax.swing.JSplitPane; import javax.swing.JTable; import javax.swing.ListSelectionModel; import javax.swing.SwingUtilities; @@ -214,6 +216,23 @@ public abstract class ContentTableUIHandler<E extends IdDto, D extends IdDto, U protected abstract void loadEditBean(String beanId); @Override + protected void fixFormSize() { + + if (getModel().isShowData()) { + super.fixFormSize(); + } else { + + // we want to see the hole form on screen + Dimension preferredSize = ui.getPreferredSize(); + + JSplitPane parentContainer = ui.getParentContainer(JSplitPane.class); + ui.setMinimumSize(new Dimension(preferredSize.width, parentContainer.getPreferredSize().height-200)); + +// parentContainer.getRightComponent().setMinimumSize(new Dimension(preferredSize.width, 200)); + } + } + + @Override public void afterInit(U ui) { ContentTableUIInitializer<E, D, U> uiInitializer = new ContentTableUIInitializer<>(ui); @@ -276,6 +295,8 @@ public abstract class ContentTableUIHandler<E extends IdDto, D extends IdDto, U } updateSaveAction(false); + + fixFormSize(); } @Override ===================================== client/src/main/resources/i18n/client_en_GB.properties ===================================== --- a/client/src/main/resources/i18n/client_en_GB.properties +++ b/client/src/main/resources/i18n/client_en_GB.properties @@ -746,6 +746,7 @@ observe.common.NonTargetCatchDto.table.well.tip=Well observe.common.NonTargetCatchDto.totalCountComputed.computed.tip=Count was computed (%s) observe.common.NonTargetCatchDto.totalCountComputed.observed.tip=Count was observed observe.common.NonTargetCatchDto.well=Well +observe.common.NonTargetCatchReleaseDto.message.cantAdd=<html><body><strong>Can not add non target catch release</strong>(no sensible non target catch)</body></html> observe.common.NonTargetCatchReleaseDto.table.comment=Com observe.common.NonTargetCatchReleaseDto.table.comment.tip=Comment observe.common.NonTargetCatchReleaseDto.table.deleteExtraMessage=Blablah @@ -933,6 +934,7 @@ observe.common.SetSeineDto.generalTab=General caracteristics observe.common.SetSeineDto.measurementsTab=Measurements observe.common.SetSeineDto.message.creating=Set in in editing mode. observe.common.SetSeineDto.message.information.schoolType=School type +observe.common.SetSeineDto.message.no.nonTargetCatchRelease=No non target catch released. "TODO observe.common.SetSeineDto.message.no.nonTargetDiscarded=Set has no non target discarded catches. observe.common.SetSeineDto.message.no.targetCatch=To sample target catches, you need at least one catch. observe.common.SetSeineDto.message.no.targetDiscarded=To sample discarded target catches, you need at least one discarded catch brought on deck. ===================================== client/src/main/resources/i18n/client_es_ES.properties ===================================== --- a/client/src/main/resources/i18n/client_es_ES.properties +++ b/client/src/main/resources/i18n/client_es_ES.properties @@ -746,6 +746,7 @@ observe.common.NonTargetCatchDto.table.well.tip=Cuba observe.common.NonTargetCatchDto.totalCountComputed.computed.tip=El número estimado se calculo observe.common.NonTargetCatchDto.totalCountComputed.observed.tip=El número estimado se observo observe.common.NonTargetCatchDto.well=Cuba +observe.common.NonTargetCatchReleaseDto.message.cantAdd=<html><body><strong>Impossible d'ajouter des libération</strong>(pas de faune accessoire sensible)</body></html> \#TODO observe.common.NonTargetCatchReleaseDto.table.comment=Com \#TODO observe.common.NonTargetCatchReleaseDto.table.comment.tip=Commentaire \#TODO observe.common.NonTargetCatchReleaseDto.table.deleteExtraMessage=Blabla \#TODO @@ -933,6 +934,7 @@ observe.common.SetSeineDto.generalTab=Características generales observe.common.SetSeineDto.measurementsTab=Parámetros observe.common.SetSeineDto.message.creating=Lance en proceso de creación. observe.common.SetSeineDto.message.information.schoolType=Tipo de banco calculado a partir de los sistemas observados de su actividad. +observe.common.SetSeineDto.message.no.nonTargetCatchRelease=Aucune faune accessoire sensible renseignée dans les faunes accessoires capturées. \#TODO observe.common.SetSeineDto.message.no.nonTargetDiscarded=El lance no tiene descarte de fauna. observe.common.SetSeineDto.message.no.targetCatch=Para los muestreos de atunes capturados, se necesita al menos una captura. observe.common.SetSeineDto.message.no.targetDiscarded=Para muestreos de atunes, se necesita al menos un descarte de atún izado a bordo. ===================================== client/src/main/resources/i18n/client_fr_FR.properties ===================================== --- a/client/src/main/resources/i18n/client_fr_FR.properties +++ b/client/src/main/resources/i18n/client_fr_FR.properties @@ -746,6 +746,7 @@ observe.common.NonTargetCatchDto.table.well.tip=Numéro de cuve observe.common.NonTargetCatchDto.totalCountComputed.computed.tip=Le nombre estimé a été calculé (%s) observe.common.NonTargetCatchDto.totalCountComputed.observed.tip=Le nombre estimé a été observé observe.common.NonTargetCatchDto.well=Cuve +observe.common.NonTargetCatchReleaseDto.message.cantAdd=<html><body><strong>Impossible d'ajouter des libération</strong>(pas de faune accessoire sensible)</body></html> observe.common.NonTargetCatchReleaseDto.table.comment=Com observe.common.NonTargetCatchReleaseDto.table.comment.tip=Commentaire observe.common.NonTargetCatchReleaseDto.table.deleteExtraMessage=Blabla @@ -933,6 +934,7 @@ observe.common.SetSeineDto.generalTab=Caractéristiques générales observe.common.SetSeineDto.measurementsTab=Mesures observe.common.SetSeineDto.message.creating=La calée est en cours de création. observe.common.SetSeineDto.message.information.schoolType=Type de banc +observe.common.SetSeineDto.message.no.nonTargetCatchRelease=Aucune faune accessoire sensible renseignée dans les faunes accessoires capturées. observe.common.SetSeineDto.message.no.nonTargetDiscarded=La calée n'a pas de rejet de faune observe.common.SetSeineDto.message.no.targetCatch=Pour échantilloner les thons capturés, il faut au moins une capture. observe.common.SetSeineDto.message.no.targetDiscarded=Pour échantilloner les thons, il faut au moins un rejet de thon monté sur le pont. View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/commit/daec5f008e259bfaa09de50ce8f1... --- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/commit/daec5f008e259bfaa09de50ce8f1... You're receiving this email because of your account on gitlab.com.