Tony CHEMIT pushed to branch develop at ultreiaio / ird-observe

Commits:

8 changed files:

Changes:

  • 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
    372 372 
             return ObserveSwingApplicationContext.get().getDecoratorService();
    373 373 
         }
    374 374
    375 
    -    public void destroyUI() {
    375 
    +    void destroyUI() {
    376 376 
             UIHelper.removeAllDataBindings(getUi());
    377 377 
             getModel().destroy();
    378 378 
             UIHelper.destroy(getUi());
    ... ... @@ -411,9 +411,13 @@ public abstract class ContentUIHandler<E extends IdDto, U extends ContentUI<E, U
    411 411
    412 412 
             grabFocusOnForm();
    413 413
    414 
    +        fixFormSize();
    415 
    +    }
    416 
    +
    417 
    +    protected void fixFormSize() {
    418 
    +
    414 419 
             // we want to see the hole form on screen
    415 420 
             ui.setMinimumSize(ui.getPreferredSize());
    416 
    -
    417 421 
         }
    418 422
    419 423 
         /**
    ... ... @@ -1000,7 +1004,7 @@ public abstract class ContentUIHandler<E extends IdDto, U extends ContentUI<E, U
    1000 1004 
             list.putClientProperty("data", data);
    1001 1005 
         }
    1002 1006
    1003 
    -    protected <R extends ReferentialDtoReference> void updateReferentialBeanListHeader(Class<R> dtoClass, BeanListHeader<R> list) {
    1007 
    +    private <R extends ReferentialDtoReference> void updateReferentialBeanListHeader(Class<R> dtoClass, BeanListHeader<R> list) {
    1004 1008
    1005 1009 
             Boolean noLoad = (Boolean) list.getClientProperty(ObserveContentUI.CLIENT_PROPERTY_LIST_NO_LOAD);
    1006 1010
    ... ... @@ -1057,7 +1061,7 @@ public abstract class ContentUIHandler<E extends IdDto, U extends ContentUI<E, U
    1057 1061
    1058 1062 
         }
    1059 1063
    1060 
    -    protected <R extends ReferentialDtoReference> void updateReferentialBeanComboBox(Class<R> dtoClass, BeanComboBox<R> comboBox) {
    1064 
    +    private <R extends ReferentialDtoReference> void updateReferentialBeanComboBox(Class<R> dtoClass, BeanComboBox<R> comboBox) {
    1061 1065
    1062 1066 
             Boolean noLoad = (Boolean) comboBox.getClientProperty(ObserveContentUI.CLIENT_PROPERTY_LIST_NO_LOAD);
    1063 1067 
             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
    1193 1197 
             boolean isReferential = ReferentialDto.class.isAssignableFrom(getBeanType());
    1194 1198 
             if (isReferential) {
    1195 1199 
                 content.add(new JLabel(t("observe.common.Dto.topiaCreateDate")));
    1196 
    -            JTextField comp =(JTextField) new JTextField(dateFormat.format(bean.getCreateDate()));
    1200 
    +            JTextField comp = new JTextField(dateFormat.format(bean.getCreateDate()));
    1197 1201 
                 comp.setEditable(false);
    1198 1202 
                 comp.addFocusListener(l);
    1199 1203 
                 content.add(comp);

  • client/src/main/java/fr/ird/observe/client/ui/content/FormManager.java
    1 
    +package fr.ird.observe.client.ui.content;
    2 
    +
    3 
    +/**
    4 
    + * Created by tchemit on 06/09/17.
    5 
    + *
    6 
    + * @author Tony Chemit - dev@tchemit.fr
    7 
    + * @since 7.0
    8 
    + * TODO
    9 
    + */
    10 
    +public class FormManager {
    11 
    +
    12 
    +
    13 
    +    public void loadForm(ContentUIModel model) {
    14 
    +
    15 
    +
    16 
    +    }
    17 
    +}

  • client/src/main/java/fr/ird/observe/client/ui/content/data/seine/NonTargetCatchReleaseUI.jcss
    ... ... @@ -20,6 +20,10 @@
    20 20 
      * #L%
    21 21 
      */
    22 22
    23 
    +#hideFormInformation {
    24 
    +  text:"observe.common.NonTargetCatchReleaseDto.message.cantAdd";
    25 
    +}
    26 
    +
    23 27 
     #statesContent {
    24 28 
       border:{new TitledBorder(t("observe.common.NonTargetCatchReleaseDto.status"))};
    25 29 
     }

  • 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;
    23 23
    24 24 
     import fr.ird.observe.client.constants.AcquisitionMode;
    25 25 
     import fr.ird.observe.client.db.constants.DataContextType;
    26 
    +import fr.ird.observe.client.ui.content.ContentMode;
    26 27 
     import fr.ird.observe.client.ui.content.table.ContentTableUIHandler;
    27 28 
     import fr.ird.observe.client.ui.util.UIHelper;
    28 29 
     import fr.ird.observe.client.ui.util.table.AutotSelectRowAndShowPopupActionSupport;
    30 
    +import fr.ird.observe.dto.data.seine.NonTargetCatchReleaseDto;
    29 31 
     import fr.ird.observe.dto.data.seine.NonTargetCatchReleaseStatus;
    32 
    +import fr.ird.observe.dto.data.seine.SetSeineDto;
    33 
    +import fr.ird.observe.dto.data.seine.SetSeineNonTargetCatchReleaseDto;
    34 
    +import fr.ird.observe.dto.data.seine.SetSeineNonTargetCatchReleaseHelper;
    30 35 
     import fr.ird.observe.dto.form.Form;
    31 36 
     import fr.ird.observe.dto.reference.ReferentialDtoReferenceSet;
    32 37 
     import fr.ird.observe.dto.referential.SexReference;
    ... ... @@ -34,9 +39,6 @@ import fr.ird.observe.dto.referential.SpeciesGroupDto;
    34 39 
     import fr.ird.observe.dto.referential.SpeciesGroupReleaseModeReference;
    35 40 
     import fr.ird.observe.dto.referential.SpeciesReference;
    36 41 
     import fr.ird.observe.dto.result.SaveResultDto;
    37 
    -import fr.ird.observe.dto.data.seine.NonTargetCatchReleaseDto;
    38 
    -import fr.ird.observe.dto.data.seine.SetSeineNonTargetCatchReleaseDto;
    39 
    -import fr.ird.observe.dto.data.seine.SetSeineNonTargetCatchReleaseHelper;
    40 42 
     import java.beans.PropertyChangeListener;
    41 43 
     import java.util.ArrayList;
    42 44 
     import java.util.Collections;
    ... ... @@ -56,9 +58,11 @@ import org.apache.commons.logging.Log;
    56 58 
     import org.apache.commons.logging.LogFactory;
    57 59 
     import org.nuiton.jaxx.runtime.spi.UIHandler;
    58 60 
     import org.nuiton.jaxx.widgets.hidor.HidorButton;
    61 
    +import org.nuiton.validator.NuitonValidatorScope;
    59 62
    60 63
    61 64 
     import static org.nuiton.i18n.I18n.n;
    65 
    +import static org.nuiton.i18n.I18n.t;
    62 66
    63 67 
     /**
    64 68 
      * @author Tony Chemit - dev@tchemit.fr
    ... ... @@ -90,7 +94,6 @@ public class NonTargetCatchReleaseUIHandler extends ContentTableUIHandler<SetSei
    90 94 
             addReferentialFilter(NonTargetCatchReleaseDto.PROPERTY_SPECIES, incomingReferences -> {
    91 95 
                 ReferentialDtoReferenceSet<SpeciesReference> sampleSpecies = getNonTargetCatchReleaseService().getSampleSpecies(getSelectedParentId());
    92 96 
                 return new LinkedList<>(sampleSpecies.toSet());
    93 
    -//            return ReferentialDtoReferences.filterEnabled(result);
    94 97 
             });
    95 98 
         }
    96 99
    ... ... @@ -258,6 +261,21 @@ public class NonTargetCatchReleaseUIHandler extends ContentTableUIHandler<SetSei
    258 261 
             getModel().setForm(form);
    259 262 
             SetSeineNonTargetCatchReleaseHelper.copySetSeineNonTargetCatchReleaseDto(form.getObject(), getBean());
    260 263
    264 
    +        boolean showData = !getModel().getReferentialReferences(NonTargetCatchReleaseDto.PROPERTY_SPECIES).isEmpty();
    265 
    +
    266 
    +        getModel().setShowData(showData);
    267 
    +
    268 
    +        if (getModel().isUpdatingMode() && !showData) {
    269 
    +
    270 
    +            getModel().setMode(ContentMode.READ);
    271 
    +
    272 
    +            removeAllMessages(ui);
    273 
    +
    274 
    +            addMessage(getUi(),
    275 
    +                       NuitonValidatorScope.INFO,
    276 
    +                       getTypeI18nKey(SetSeineDto.class),
    277 
    +                       t("observe.common.SetSeineDto.message.no.nonTargetCatchRelease"));
    278 
    +        }
    261 279 
         }
    262 280
    263 281 
         public void moveCatchLonglineUp() {

  • 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;
    40 40 
     import fr.ird.observe.dto.data.seine.TargetCatchDto;
    41 41 
     import fr.ird.observe.dto.referential.SpeciesReference;
    42 42 
     import fr.ird.observe.dto.referential.seine.WeightCategoryReference;
    43 
    +import java.awt.Dimension;
    43 44 
     import java.awt.Rectangle;
    44 45 
     import java.beans.PropertyChangeListener;
    45 46 
     import java.io.Serializable;
    ... ... @@ -49,6 +50,7 @@ import javax.swing.JButton;
    49 50 
     import javax.swing.JMenuItem;
    50 51 
     import javax.swing.JPopupMenu;
    51 52 
     import javax.swing.JScrollPane;
    53 
    +import javax.swing.JSplitPane;
    52 54 
     import javax.swing.JTable;
    53 55 
     import javax.swing.ListSelectionModel;
    54 56 
     import javax.swing.SwingUtilities;
    ... ... @@ -214,6 +216,23 @@ public abstract class ContentTableUIHandler<E extends IdDto, D extends IdDto, U
    214 216 
         protected abstract void loadEditBean(String beanId);
    215 217
    216 218 
         @Override
    219 
    +    protected void fixFormSize() {
    220 
    +
    221 
    +        if (getModel().isShowData()) {
    222 
    +            super.fixFormSize();
    223 
    +        } else {
    224 
    +
    225 
    +            // we want to see the hole form on screen
    226 
    +            Dimension preferredSize = ui.getPreferredSize();
    227 
    +
    228 
    +            JSplitPane parentContainer = ui.getParentContainer(JSplitPane.class);
    229 
    +            ui.setMinimumSize(new Dimension(preferredSize.width, parentContainer.getPreferredSize().height-200));
    230 
    +
    231 
    +//            parentContainer.getRightComponent().setMinimumSize(new Dimension(preferredSize.width, 200));
    232 
    +        }
    233 
    +    }
    234 
    +
    235 
    +    @Override
    217 236 
         public void afterInit(U ui) {
    218 237
    219 238 
             ContentTableUIInitializer<E, D, U> uiInitializer = new ContentTableUIInitializer<>(ui);
    ... ... @@ -276,6 +295,8 @@ public abstract class ContentTableUIHandler<E extends IdDto, D extends IdDto, U
    276 295 
             }
    277 296
    278 297 
             updateSaveAction(false);
    298 
    +
    299 
    +        fixFormSize();
    279 300 
         }
    280 301
    281 302 
         @Override

  • client/src/main/resources/i18n/client_en_GB.properties
    ... ... @@ -746,6 +746,7 @@ observe.common.NonTargetCatchDto.table.well.tip=Well
    746 746 
     observe.common.NonTargetCatchDto.totalCountComputed.computed.tip=Count was computed (%s)
    747 747 
     observe.common.NonTargetCatchDto.totalCountComputed.observed.tip=Count was observed
    748 748 
     observe.common.NonTargetCatchDto.well=Well
    749 
    +observe.common.NonTargetCatchReleaseDto.message.cantAdd=<html><body><strong>Can not add non target catch release</strong>(no sensible non target catch)</body></html>
    749 750 
     observe.common.NonTargetCatchReleaseDto.table.comment=Com
    750 751 
     observe.common.NonTargetCatchReleaseDto.table.comment.tip=Comment
    751 752 
     observe.common.NonTargetCatchReleaseDto.table.deleteExtraMessage=Blablah
    ... ... @@ -933,6 +934,7 @@ observe.common.SetSeineDto.generalTab=General caracteristics
    933 934 
     observe.common.SetSeineDto.measurementsTab=Measurements
    934 935 
     observe.common.SetSeineDto.message.creating=Set in in editing mode.
    935 936 
     observe.common.SetSeineDto.message.information.schoolType=School type
    937 
    +observe.common.SetSeineDto.message.no.nonTargetCatchRelease=No non target catch released.  "TODO
    936 938 
     observe.common.SetSeineDto.message.no.nonTargetDiscarded=Set has no non target discarded catches.
    937 939 
     observe.common.SetSeineDto.message.no.targetCatch=To sample target catches, you need at least one catch.
    938 940 
     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
    ... ... @@ -746,6 +746,7 @@ observe.common.NonTargetCatchDto.table.well.tip=Cuba
    746 746 
     observe.common.NonTargetCatchDto.totalCountComputed.computed.tip=El número estimado se calculo
    747 747 
     observe.common.NonTargetCatchDto.totalCountComputed.observed.tip=El número estimado se observo
    748 748 
     observe.common.NonTargetCatchDto.well=Cuba
    749 
    +observe.common.NonTargetCatchReleaseDto.message.cantAdd=<html><body><strong>Impossible d'ajouter des libération</strong>(pas de faune accessoire sensible)</body></html> \#TODO
    749 750 
     observe.common.NonTargetCatchReleaseDto.table.comment=Com \#TODO
    750 751 
     observe.common.NonTargetCatchReleaseDto.table.comment.tip=Commentaire \#TODO
    751 752 
     observe.common.NonTargetCatchReleaseDto.table.deleteExtraMessage=Blabla \#TODO
    ... ... @@ -933,6 +934,7 @@ observe.common.SetSeineDto.generalTab=Características generales
    933 934 
     observe.common.SetSeineDto.measurementsTab=Parámetros
    934 935 
     observe.common.SetSeineDto.message.creating=Lance en proceso de creación.
    935 936 
     observe.common.SetSeineDto.message.information.schoolType=Tipo de banco calculado a partir de los sistemas observados de su actividad.
    937 
    +observe.common.SetSeineDto.message.no.nonTargetCatchRelease=Aucune faune accessoire sensible renseignée dans les faunes accessoires capturées. \#TODO
    936 938 
     observe.common.SetSeineDto.message.no.nonTargetDiscarded=El lance no tiene descarte de fauna.
    937 939 
     observe.common.SetSeineDto.message.no.targetCatch=Para los muestreos de atunes capturados, se necesita al menos una captura.
    938 940 
     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
    ... ... @@ -746,6 +746,7 @@ observe.common.NonTargetCatchDto.table.well.tip=Numéro de cuve
    746 746 
     observe.common.NonTargetCatchDto.totalCountComputed.computed.tip=Le nombre estimé a été calculé (%s)
    747 747 
     observe.common.NonTargetCatchDto.totalCountComputed.observed.tip=Le nombre estimé a été observé
    748 748 
     observe.common.NonTargetCatchDto.well=Cuve
    749 
    +observe.common.NonTargetCatchReleaseDto.message.cantAdd=<html><body><strong>Impossible d'ajouter des libération</strong>(pas de faune accessoire sensible)</body></html>
    749 750 
     observe.common.NonTargetCatchReleaseDto.table.comment=Com
    750 751 
     observe.common.NonTargetCatchReleaseDto.table.comment.tip=Commentaire
    751 752 
     observe.common.NonTargetCatchReleaseDto.table.deleteExtraMessage=Blabla
    ... ... @@ -933,6 +934,7 @@ observe.common.SetSeineDto.generalTab=Caractéristiques générales
    933 934 
     observe.common.SetSeineDto.measurementsTab=Mesures
    934 935 
     observe.common.SetSeineDto.message.creating=La calée est en cours de création.
    935 936 
     observe.common.SetSeineDto.message.information.schoolType=Type de banc
    937 
    +observe.common.SetSeineDto.message.no.nonTargetCatchRelease=Aucune faune accessoire sensible renseignée dans les faunes accessoires capturées.
    936 938 
     observe.common.SetSeineDto.message.no.nonTargetDiscarded=La calée n'a pas de rejet de faune
    937 939 
     observe.common.SetSeineDto.message.no.targetCatch=Pour échantilloner les thons capturés, il faut au moins une capture.
    938 940 
     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.
    You're receiving this email because of your account on gitlab.com. If you'd like to receive fewer emails, you can adjust your notification settings.