Tony CHEMIT pushed to branch master-7.x at ultreiaio / ird-observe
Commits:
-
01d70a89
by tchemit at 2019-02-08T13:38:38Z
-
7f2172a2
by tchemit at 2019-02-08T13:45:27Z
-
5f829902
by tchemit at 2019-02-08T13:45:27Z
-
8ce89995
by tchemit at 2019-02-08T13:45:28Z
-
15146695
by tchemit at 2019-02-13T11:09:37Z
-
7f028ae1
by tchemit at 2019-02-13T13:15:01Z
-
a4a2eb7f
by tchemit at 2019-02-13T13:22:16Z
-
eb1a6dd5
by tchemit at 2019-02-13T15:38:37Z
-
3ae3e01e
by tchemit at 2019-02-14T13:11:19Z
-
de8269ea
by tchemit at 2019-02-14T13:11:36Z
-
19f0cd67
by tchemit at 2019-02-14T17:14:51Z
-
a1ce16a2
by tchemit at 2019-02-14T17:14:52Z
-
072a1983
by tchemit at 2019-02-14T17:14:52Z
-
ad7f65ec
by tchemit at 2019-02-14T17:14:52Z
-
9cbe3530
by tchemit at 2019-02-16T12:52:21Z
-
6c45d906
by tchemit at 2019-02-18T09:43:49Z
-
bb313a37
by tchemit at 2019-02-18T10:02:31Z
-
f2b67ccc
by tchemit at 2019-02-18T10:09:02Z
30 changed files:
- client-configuration/pom.xml
- client-core/pom.xml
- client-core/src/main/java/fr/ird/observe/client/ui/admin/save/SaveLocalModel.java
- client-core/src/main/java/fr/ird/observe/client/ui/admin/save/SaveLocalUI.jcss
- client-core/src/main/java/fr/ird/observe/client/ui/admin/save/SaveLocalUIHandler.java
- client-core/src/main/java/fr/ird/observe/client/ui/content/data/longline/GearUseFeaturesLonglineUIHandler.java
- client-core/src/main/java/fr/ird/observe/client/ui/content/data/seine/GearUseFeaturesSeineUIHandler.java
- client-core/src/main/java/fr/ird/observe/client/ui/content/table/ContentTableUIHandler.java
- client-core/src/main/java/fr/ird/observe/client/ui/storage/StorageUIModel.java
- client-core/src/main/java/fr/ird/observe/client/ui/storage/tabs/BackupUI.jcss
- client-core/src/main/java/fr/ird/observe/client/ui/storage/tabs/BackupUIHandler.java
- client-core/src/main/java/fr/ird/observe/client/ui/tree/navigation/NavigationTreeCellRenderer.java
- client-runner/pom.xml
- dto/pom.xml
- dto/src/main/java/fr/ird/observe/dto/referential/SpeciesGroupHelper.java
- observe-i18n/pom.xml
- observe-i18n/src/main/i18n/translations/observe_en_GB.properties
- observe-i18n/src/main/i18n/translations/observe_es_ES.properties
- observe-i18n/src/main/i18n/translations/observe_fr_FR.properties
- observe/pom.xml
- persistence/pom.xml
- pom.xml
- server-configuration/pom.xml
- server-core/pom.xml
- server-runner/pom.xml
- services-client/pom.xml
- services-local/pom.xml
- services/pom.xml
- test/pom.xml
- validation/pom.xml
Changes:
| ... | ... | @@ -26,7 +26,7 @@ |
| 26 | 26 |
<parent>
|
| 27 | 27 |
<groupId>fr.ird.observe</groupId>
|
| 28 | 28 |
<artifactId>ird-observe</artifactId>
|
| 29 |
- <version>7.0.3</version>
|
|
| 29 |
+ <version>7.0.4</version>
|
|
| 30 | 30 |
</parent>
|
| 31 | 31 |
|
| 32 | 32 |
<artifactId>client-configuration</artifactId>
|
| ... | ... | @@ -26,7 +26,7 @@ |
| 26 | 26 |
<parent>
|
| 27 | 27 |
<groupId>fr.ird.observe</groupId>
|
| 28 | 28 |
<artifactId>ird-observe</artifactId>
|
| 29 |
- <version>7.0.3</version>
|
|
| 29 |
+ <version>7.0.4</version>
|
|
| 30 | 30 |
</parent>
|
| 31 | 31 |
|
| 32 | 32 |
<artifactId>client-core</artifactId>
|
| ... | ... | @@ -26,6 +26,7 @@ import fr.ird.observe.client.configuration.ClientConfig; |
| 26 | 26 |
import fr.ird.observe.client.ui.admin.AdminActionModel;
|
| 27 | 27 |
import fr.ird.observe.client.ui.admin.AdminStep;
|
| 28 | 28 |
import fr.ird.observe.client.ui.admin.AdminUIModel;
|
| 29 |
+import org.apache.commons.lang3.StringUtils;
|
|
| 29 | 30 |
import org.apache.logging.log4j.Logger;
|
| 30 | 31 |
import org.apache.logging.log4j.LogManager;
|
| 31 | 32 |
import org.nuiton.jaxx.runtime.swing.wizard.ext.WizardState;
|
| ... | ... | @@ -35,6 +36,8 @@ import java.io.File; |
| 35 | 36 |
import java.util.HashSet;
|
| 36 | 37 |
import java.util.Set;
|
| 37 | 38 |
|
| 39 |
+import static fr.ird.observe.client.ui.storage.StorageUIModel.SQL_GZ_EXTENSION;
|
|
| 40 |
+ |
|
| 38 | 41 |
/**
|
| 39 | 42 |
* Le modèle d'une opération d'export de données observers.
|
| 40 | 43 |
*
|
| ... | ... | @@ -45,6 +48,8 @@ public class SaveLocalModel extends AdminActionModel { |
| 45 | 48 |
|
| 46 | 49 |
public static final String BACKUP_FILE_PROPERTY_NAME = "backupFile";
|
| 47 | 50 |
|
| 51 |
+ public static final String BACKUP_FILE_NAME_PROPERTY_NAME = "backupFileName";
|
|
| 52 |
+ |
|
| 48 | 53 |
public static final String DO_BACKUP_PROPERTY_NAME = "doBackup";
|
| 49 | 54 |
|
| 50 | 55 |
public static final String CAN_SAVE_LOCAL_PROPERTY_NAME = "canSaveLocal";
|
| ... | ... | @@ -99,11 +104,17 @@ public class SaveLocalModel extends AdminActionModel { |
| 99 | 104 |
return backupFile;
|
| 100 | 105 |
}
|
| 101 | 106 |
|
| 107 |
+ public String getBackupFileName() {
|
|
| 108 |
+ return StringUtils.removeEnd(backupFile.getName(), SQL_GZ_EXTENSION);
|
|
| 109 |
+ }
|
|
| 110 |
+ |
|
| 102 | 111 |
public void setBackupFile(File backupFile) {
|
| 103 | 112 |
boolean canSave = isCanSaveLocal();
|
| 104 | 113 |
File oldValue = this.backupFile;
|
| 114 |
+ String oldBackupFileName = getBackupFileName();
|
|
| 105 | 115 |
this.backupFile = backupFile;
|
| 106 | 116 |
firePropertyChange(BACKUP_FILE_PROPERTY_NAME, oldValue, backupFile);
|
| 117 |
+ firePropertyChange(BACKUP_FILE_NAME_PROPERTY_NAME, oldBackupFileName, getBackupFileName());
|
|
| 107 | 118 |
firePropertyChange(CAN_SAVE_LOCAL_PROPERTY_NAME, canSave, isCanSaveLocal());
|
| 108 | 119 |
}
|
| 109 | 120 |
|
| ... | ... | @@ -125,9 +136,11 @@ public class SaveLocalModel extends AdminActionModel { |
| 125 | 136 |
public boolean isCanSaveLocal() {
|
| 126 | 137 |
boolean validate = !doBackup ||
|
| 127 | 138 |
backupFile != null &&
|
| 128 |
- !backupFile.exists() &&
|
|
| 129 |
- backupFile.getName().endsWith(".sql.gz") &&
|
|
| 130 |
- backupFile.getParentFile().exists();
|
|
| 139 |
+ !backupFile.exists() && backupFile.getParentFile().exists() && backupFile.getName().endsWith(SQL_GZ_EXTENSION);
|
|
| 140 |
+ if (validate) {
|
|
| 141 |
+ String filename = getBackupFileName();
|
|
| 142 |
+ validate = !filename.isEmpty() && !filename.contains(".");
|
|
| 143 |
+ };
|
|
| 131 | 144 |
|
| 132 | 145 |
if (log.isDebugEnabled()) {
|
| 133 | 146 |
log.debug("can save ? " + validate);
|
| ... | ... | @@ -75,7 +75,7 @@ |
| 75 | 75 |
|
| 76 | 76 |
#filenameText {
|
| 77 | 77 |
enabled:{stepModel.isDoBackup()};
|
| 78 |
- text:{stepModel.getBackupFile().getName()};
|
|
| 78 |
+ text:{stepModel.getBackupFileName()};
|
|
| 79 | 79 |
}
|
| 80 | 80 |
|
| 81 | 81 |
#startAction {
|
| ... | ... | @@ -26,6 +26,7 @@ import fr.ird.observe.client.ui.ObserveKeyStrokes; |
| 26 | 26 |
import fr.ird.observe.client.ui.admin.AdminStep;
|
| 27 | 27 |
import fr.ird.observe.client.ui.admin.AdminTabUIHandler;
|
| 28 | 28 |
import fr.ird.observe.client.ui.admin.synchronize.referential.legacy.SynchronizeModel;
|
| 29 |
+import fr.ird.observe.client.ui.storage.StorageUIModel;
|
|
| 29 | 30 |
import fr.ird.observe.client.ui.util.UIHelper;
|
| 30 | 31 |
import fr.ird.observe.services.service.actions.synchro.referential.legacy.UnidirectionalReferentialSynchronizeContext;
|
| 31 | 32 |
import fr.ird.observe.services.service.sql.AddSqlScriptProducerRequest;
|
| ... | ... | @@ -106,7 +107,7 @@ public class SaveLocalUIHandler extends AdminTabUIHandler<SaveLocalUI> implement |
| 106 | 107 |
}
|
| 107 | 108 |
|
| 108 | 109 |
public void changeFilename(String filename) {
|
| 109 |
- getUi().getStepModel().setBackupFile(new File(getUi().directoryText.getText(), filename));
|
|
| 110 |
+ getUi().getStepModel().setBackupFile(new File(ui.getDirectoryText().getText(), filename + StorageUIModel.SQL_GZ_EXTENSION));
|
|
| 110 | 111 |
}
|
| 111 | 112 |
|
| 112 | 113 |
public void doStartAction() {
|
| ... | ... | @@ -165,10 +165,15 @@ public class GearUseFeaturesLonglineUIHandler extends ContentTableUIHandler<Trip |
| 165 | 165 |
}
|
| 166 | 166 |
|
| 167 | 167 |
private void selectCell(GearUseFeaturesLonglineUI ui, int selectedColumn, int selectedRow) {
|
| 168 |
+ if (selectedRow >= ui.getMeasurementsTableModel().getRowCount()) {
|
|
| 169 |
+ return;
|
|
| 170 |
+ }
|
|
| 168 | 171 |
SwingUtilities.invokeLater(() -> {
|
| 169 | 172 |
cellEditorAdjusting = true;
|
| 170 | 173 |
try {
|
| 171 | 174 |
JTables.doSelectCell(ui.getMeasurementsTable(), selectedRow, selectedColumn);
|
| 175 |
+ } catch (Exception e) {
|
|
| 176 |
+ log.error("Can't select row " + selectedRow, e);
|
|
| 172 | 177 |
} finally {
|
| 173 | 178 |
cellEditorAdjusting = false;
|
| 174 | 179 |
}
|
| ... | ... | @@ -165,10 +165,17 @@ public class GearUseFeaturesSeineUIHandler extends ContentTableUIHandler<TripSei |
| 165 | 165 |
}
|
| 166 | 166 |
|
| 167 | 167 |
private void selectCell(GearUseFeaturesSeineUI ui, int selectedColumn, int selectedRow) {
|
| 168 |
+ if (selectedRow >= ui.getMeasurementsTableModel().getRowCount()) {
|
|
| 169 |
+ return;
|
|
| 170 |
+ }
|
|
| 168 | 171 |
SwingUtilities.invokeLater(() -> {
|
| 169 | 172 |
cellEditorAdjusting = true;
|
| 170 | 173 |
try {
|
| 171 |
- JTables.doSelectCell(ui.getMeasurementsTable(), selectedRow, selectedColumn);
|
|
| 174 |
+ try {
|
|
| 175 |
+ JTables.doSelectCell(ui.getMeasurementsTable(), selectedRow, selectedColumn);
|
|
| 176 |
+ } catch (Exception e) {
|
|
| 177 |
+ log.error("Can't select row " + selectedRow, e);
|
|
| 178 |
+ }
|
|
| 172 | 179 |
} finally {
|
| 173 | 180 |
cellEditorAdjusting = false;
|
| 174 | 181 |
}
|
| ... | ... | @@ -331,7 +331,7 @@ public abstract class ContentTableUIHandler<E extends IdDto, D extends IdDto, U |
| 331 | 331 |
|
| 332 | 332 |
U ui = getUi();
|
| 333 | 333 |
|
| 334 |
- if (getModel().isModified() || getModel().isCanSaveRow()) {
|
|
| 334 |
+ if (!getTableModel().isEmpty() && (getModel().isModified() || getModel().isCanSaveRow())) {
|
|
| 335 | 335 |
|
| 336 | 336 |
// flush modified line to model
|
| 337 | 337 |
getTableModel().updateRowFromEditBean();
|
| ... | ... | @@ -92,6 +92,7 @@ public class StorageUIModel extends WizardModel<StorageStep> { |
| 92 | 92 |
public static final String CREATION_MODE_PROPERTY_NAME = "creationMode";
|
| 93 | 93 |
public static final String DO_BACKUP_PROPERTY_NAME = "doBackup";
|
| 94 | 94 |
public static final String BACKUP_FILE_PROPERTY_NAME = "backupFile";
|
| 95 |
+ public static final String BACKUP_FILE_NAME_PROPERTY_NAME = "backupFileName";
|
|
| 95 | 96 |
public static final String DUMP_FILE_PROPERTY_NAME = "dumpFile";
|
| 96 | 97 |
public static final String LOCAL_STORAGE_EXIST_PROPERTY_NAME = "localStorageExist";
|
| 97 | 98 |
public static final String USE_SSL_PROPERTY_NAME = "useSsl";
|
| ... | ... | @@ -117,6 +118,7 @@ public class StorageUIModel extends WizardModel<StorageStep> { |
| 117 | 118 |
private static final String CAN_USE_REMOTE_SERVICE_PROPERTY_NAME = "canUseRemoteService";
|
| 118 | 119 |
private static final String CAN_USE_SERVER_SERVICE_PROPERTY_NAME = "canUseServerService";
|
| 119 | 120 |
private static final char[] EMPTY_PASSWORD = new char[0];
|
| 121 |
+ public static final String SQL_GZ_EXTENSION = ".sql.gz";
|
|
| 120 | 122 |
|
| 121 | 123 |
// private static final String LOGIN_REFERENTIEL = "referentiel";
|
| 122 | 124 |
private final ProgressModel progressModel = new ProgressModel();
|
| ... | ... | @@ -991,7 +993,11 @@ public class StorageUIModel extends WizardModel<StorageStep> { |
| 991 | 993 |
|
| 992 | 994 |
break;
|
| 993 | 995 |
case BACKUP:
|
| 994 |
- validate = !doBackup || backupFile != null && !backupFile.exists() && backupFile.getName().endsWith(".sql.gz");
|
|
| 996 |
+ validate = !doBackup || backupFile != null && !backupFile.exists() && backupFile.getName().endsWith(SQL_GZ_EXTENSION);
|
|
| 997 |
+ if (validate) {
|
|
| 998 |
+ String filename = getBackupFileName();
|
|
| 999 |
+ validate = !filename.isEmpty() && !filename.contains(".");
|
|
| 1000 |
+ }
|
|
| 995 | 1001 |
break;
|
| 996 | 1002 |
case SELECT_DATA:
|
| 997 | 1003 |
// chemit 20100525 : aucune contrainte dans ce cas
|
| ... | ... | @@ -1149,10 +1155,15 @@ public class StorageUIModel extends WizardModel<StorageStep> { |
| 1149 | 1155 |
return backupFile;
|
| 1150 | 1156 |
}
|
| 1151 | 1157 |
|
| 1158 |
+ public String getBackupFileName() {
|
|
| 1159 |
+ return StringUtils.removeEnd(backupFile.getName(),SQL_GZ_EXTENSION);
|
|
| 1160 |
+ }
|
|
| 1152 | 1161 |
public void setBackupFile(File backupFile) {
|
| 1153 | 1162 |
File oldValue = this.backupFile;
|
| 1163 |
+ String oldBackupFileName = getBackupFileName();
|
|
| 1154 | 1164 |
this.backupFile = backupFile;
|
| 1155 | 1165 |
firePropertyChange(BACKUP_FILE_PROPERTY_NAME, oldValue, backupFile);
|
| 1166 |
+ firePropertyChange(BACKUP_FILE_NAME_PROPERTY_NAME, oldBackupFileName, getBackupFileName());
|
|
| 1156 | 1167 |
validate();
|
| 1157 | 1168 |
}
|
| 1158 | 1169 |
|
| ... | ... | @@ -50,5 +50,5 @@ |
| 50 | 50 |
|
| 51 | 51 |
#filenameText {
|
| 52 | 52 |
enabled:{model.isDoBackup()};
|
| 53 |
- text:{model.getBackupFile().getName()};
|
|
| 53 |
+ text:{model.getBackupFileName()};
|
|
| 54 | 54 |
}
|
| ... | ... | @@ -24,7 +24,9 @@ package fr.ird.observe.client.ui.storage.tabs; |
| 24 | 24 |
|
| 25 | 25 |
import fr.ird.observe.client.ui.ObserveKeyStrokes;
|
| 26 | 26 |
import fr.ird.observe.client.ui.storage.StorageStep;
|
| 27 |
+import fr.ird.observe.client.ui.storage.StorageUIModel;
|
|
| 27 | 28 |
import fr.ird.observe.client.ui.util.UIHelper;
|
| 29 |
+import org.apache.commons.lang3.StringUtils;
|
|
| 28 | 30 |
import org.nuiton.jaxx.runtime.spi.UIHandler;
|
| 29 | 31 |
|
| 30 | 32 |
import javax.swing.AbstractAction;
|
| ... | ... | @@ -90,7 +92,7 @@ public class BackupUIHandler extends StorageTabUIHandler<BackupUI> implements UI |
| 90 | 92 |
}
|
| 91 | 93 |
|
| 92 | 94 |
public void changeFilename(String filename) {
|
| 93 |
- ui.getModel().setBackupFile(new File(ui.getDirectoryText().getText(), filename));
|
|
| 95 |
+ ui.getModel().setBackupFile(new File(ui.getDirectoryText().getText(), filename + StorageUIModel.SQL_GZ_EXTENSION));
|
|
| 94 | 96 |
}
|
| 95 | 97 |
|
| 96 | 98 |
}
|
| ... | ... | @@ -33,6 +33,7 @@ import javax.swing.JTree; |
| 33 | 33 |
import javax.swing.tree.DefaultTreeCellRenderer;
|
| 34 | 34 |
import java.awt.Color;
|
| 35 | 35 |
import java.awt.Component;
|
| 36 |
+import java.awt.Dimension;
|
|
| 36 | 37 |
|
| 37 | 38 |
/**
|
| 38 | 39 |
* Created on 14/11/16.
|
| ... | ... | @@ -86,6 +87,17 @@ public class NavigationTreeCellRenderer extends DefaultTreeCellRenderer implemen |
| 86 | 87 |
JLabel comp = (JLabel) super.getTreeCellRendererComponent(tree, text, sel, expanded, leaf, row, hasFocus);
|
| 87 | 88 |
comp.setToolTipText(text);
|
| 88 | 89 |
comp.setIcon(icon);
|
| 90 |
+ Dimension size = comp.getPreferredSize();
|
|
| 91 |
+ double height = size.getHeight();
|
|
| 92 |
+ if (icon != null) {
|
|
| 93 |
+ int iconHeight = icon.getIconHeight();
|
|
| 94 |
+ if (height > 2 * iconHeight) {
|
|
| 95 |
+ log.error(String.format("Size is amazing: %s for node: %s", size, text));
|
|
| 96 |
+ Dimension newSize = new Dimension((int) size.getWidth(), iconHeight + 2);
|
|
| 97 |
+ comp.setSize(newSize);
|
|
| 98 |
+ comp.setPreferredSize(newSize);
|
|
| 99 |
+ }
|
|
| 100 |
+ }
|
|
| 89 | 101 |
return comp;
|
| 90 | 102 |
}
|
| 91 | 103 |
|
| ... | ... | @@ -26,7 +26,7 @@ |
| 26 | 26 |
<parent>
|
| 27 | 27 |
<groupId>fr.ird.observe</groupId>
|
| 28 | 28 |
<artifactId>ird-observe</artifactId>
|
| 29 |
- <version>7.0.3</version>
|
|
| 29 |
+ <version>7.0.4</version>
|
|
| 30 | 30 |
</parent>
|
| 31 | 31 |
|
| 32 | 32 |
<artifactId>client-runner</artifactId>
|
| ... | ... | @@ -27,7 +27,7 @@ |
| 27 | 27 |
<parent>
|
| 28 | 28 |
<groupId>fr.ird.observe</groupId>
|
| 29 | 29 |
<artifactId>ird-observe</artifactId>
|
| 30 |
- <version>7.0.3</version>
|
|
| 30 |
+ <version>7.0.4</version>
|
|
| 31 | 31 |
</parent>
|
| 32 | 32 |
|
| 33 | 33 |
<artifactId>dto</artifactId>
|
| ... | ... | @@ -28,9 +28,9 @@ import java.util.List; |
| 28 | 28 |
public class SpeciesGroupHelper extends GeneratedSpeciesGroupHelper {
|
| 29 | 29 |
//FIXME PROTECTED-ID
|
| 30 | 30 |
public static final List<String> SPECIES_GROUP_IDS = Arrays.asList(
|
| 31 |
- "fr.ird.referential.common.SpeciesGroup#1445863056144#0.9820877553253712",
|
|
| 32 |
- "fr.ird.referential.common.SpeciesGroup#1239832683690#0.24333033683679461",
|
|
| 33 |
- "fr.ird.referential.common.SpeciesGroup#1446014286433#0.6480183366605247",
|
|
| 34 |
- "fr.ird.referential.common.SpeciesGroup#1239832683689#0.7120116158620075"
|
|
| 31 |
+ "fr.ird.observe.entities.referentiel.SpeciesGroup#1445863056144#0.9820877553253712",
|
|
| 32 |
+ "fr.ird.observe.entities.referentiel.SpeciesGroup#1239832683690#0.24333033683679461",
|
|
| 33 |
+ "fr.ird.observe.entities.referentiel.SpeciesGroup#1446014286433#0.6480183366605247",
|
|
| 34 |
+ "fr.ird.observe.entities.referentiel.SpeciesGroup#1239832683689#0.7120116158620075"
|
|
| 35 | 35 |
);
|
| 36 | 36 |
}
|
| ... | ... | @@ -26,7 +26,7 @@ |
| 26 | 26 |
<parent>
|
| 27 | 27 |
<groupId>fr.ird.observe</groupId>
|
| 28 | 28 |
<artifactId>ird-observe</artifactId>
|
| 29 |
- <version>7.0.3</version>
|
|
| 29 |
+ <version>7.0.4</version>
|
|
| 30 | 30 |
</parent>
|
| 31 | 31 |
|
| 32 | 32 |
<artifactId>observe-i18n</artifactId>
|
| ... | ... | @@ -916,14 +916,14 @@ observe.common.NonTargetCatchReleasingTimeDto.type=Releasing time |
| 916 | 916 |
observe.common.NonTargetCatchReleasingTimeDto.types=Releasing time
|
| 917 | 917 |
observe.common.NonTargetLengthDto.comment=Non target sample comment
|
| 918 | 918 |
observe.common.NonTargetLengthDto.count=Count
|
| 919 |
-observe.common.NonTargetLengthDto.length=Length
|
|
| 919 |
+observe.common.NonTargetLengthDto.length=Length (cm)
|
|
| 920 | 920 |
observe.common.NonTargetLengthDto.picturesReferences=Pictures references
|
| 921 | 921 |
observe.common.NonTargetLengthDto.table.count=Count
|
| 922 | 922 |
observe.common.NonTargetLengthDto.table.count.tip=Count
|
| 923 | 923 |
observe.common.NonTargetLengthDto.table.gender=Sex
|
| 924 | 924 |
observe.common.NonTargetLengthDto.table.gender.tip=Sex
|
| 925 | 925 |
observe.common.NonTargetLengthDto.table.length=Length
|
| 926 |
-observe.common.NonTargetLengthDto.table.length.tip=Length
|
|
| 926 |
+observe.common.NonTargetLengthDto.table.length.tip=Length (cm)
|
|
| 927 | 927 |
observe.common.NonTargetLengthDto.table.meanWeight=Indiv. Weight
|
| 928 | 928 |
observe.common.NonTargetLengthDto.table.meanWeight.tip=Individual weight (en Kg)
|
| 929 | 929 |
observe.common.NonTargetLengthDto.table.nonTargetSpecies=Species
|
| ... | ... | @@ -916,14 +916,14 @@ observe.common.NonTargetCatchReleasingTimeDto.type=Hora de liberación de fauna |
| 916 | 916 |
observe.common.NonTargetCatchReleasingTimeDto.types=Horas de liberación de fauna accesoria
|
| 917 | 917 |
observe.common.NonTargetLengthDto.comment=Comentarios sobre el muestreo de fauna accesoria
|
| 918 | 918 |
observe.common.NonTargetLengthDto.count=Número
|
| 919 |
-observe.common.NonTargetLengthDto.length=Talla
|
|
| 919 |
+observe.common.NonTargetLengthDto.length=Talla (cm)
|
|
| 920 | 920 |
observe.common.NonTargetLengthDto.picturesReferences=Referencia foto
|
| 921 | 921 |
observe.common.NonTargetLengthDto.table.count=Número
|
| 922 | 922 |
observe.common.NonTargetLengthDto.table.count.tip=Número de ejemplares medidos
|
| 923 | 923 |
observe.common.NonTargetLengthDto.table.gender=Sexo
|
| 924 | 924 |
observe.common.NonTargetLengthDto.table.gender.tip=Sexo
|
| 925 | 925 |
observe.common.NonTargetLengthDto.table.length=Talla
|
| 926 |
-observe.common.NonTargetLengthDto.table.length.tip=Talla
|
|
| 926 |
+observe.common.NonTargetLengthDto.table.length.tip=Talla (cm)
|
|
| 927 | 927 |
observe.common.NonTargetLengthDto.table.meanWeight=Peso indiv.
|
| 928 | 928 |
observe.common.NonTargetLengthDto.table.meanWeight.tip=Peso del individuo (en Kg)
|
| 929 | 929 |
observe.common.NonTargetLengthDto.table.nonTargetSpecies=Especie
|
| ... | ... | @@ -590,7 +590,7 @@ observe.common.DataDto.captain=Capitaine |
| 590 | 590 |
observe.common.DataDto.dataQuality=Qualité de donnée
|
| 591 | 591 |
observe.common.DataDto.departureHarbour=Port de départ
|
| 592 | 592 |
observe.common.DataDto.depthRecorder=Enregistreur de profondeur
|
| 593 |
-observe.common.DataDto.endDate=Date de début
|
|
| 593 |
+observe.common.DataDto.endDate=Date de fin
|
|
| 594 | 594 |
observe.common.DataDto.haulingIdentifier=Virage
|
| 595 | 595 |
observe.common.DataDto.hookLost=Hameçon perdu
|
| 596 | 596 |
observe.common.DataDto.landingHarbour=Port d'arrivée
|
| ... | ... | @@ -599,7 +599,7 @@ observe.common.DataDto.observer=Observateur |
| 599 | 599 |
observe.common.DataDto.program=Programme
|
| 600 | 600 |
observe.common.DataDto.settingIdentifier=Filage
|
| 601 | 601 |
observe.common.DataDto.speciesFate=Devenir espèce
|
| 602 |
-observe.common.DataDto.startDate=Date de fin
|
|
| 602 |
+observe.common.DataDto.startDate=Date de début
|
|
| 603 | 603 |
observe.common.DataDto.timer=Horloge
|
| 604 | 604 |
observe.common.DataDto.timerTimeOnBoard=Horodatage de montée à bord
|
| 605 | 605 |
observe.common.DataDto.traceCutOff=Bas de ligne coupé
|
| ... | ... | @@ -916,14 +916,14 @@ observe.common.NonTargetCatchReleasingTimeDto.type=Moment de la libération |
| 916 | 916 |
observe.common.NonTargetCatchReleasingTimeDto.types=Moments de la libération
|
| 917 | 917 |
observe.common.NonTargetLengthDto.comment=Commentaire de l’échantillonnage faune
|
| 918 | 918 |
observe.common.NonTargetLengthDto.count=Nombre
|
| 919 |
-observe.common.NonTargetLengthDto.length=Longueur hors tout
|
|
| 919 |
+observe.common.NonTargetLengthDto.length=Taille (cm)
|
|
| 920 | 920 |
observe.common.NonTargetLengthDto.picturesReferences=Référence photo
|
| 921 | 921 |
observe.common.NonTargetLengthDto.table.count=Effectif
|
| 922 | 922 |
observe.common.NonTargetLengthDto.table.count.tip=Effectif
|
| 923 | 923 |
observe.common.NonTargetLengthDto.table.gender=Sexe
|
| 924 | 924 |
observe.common.NonTargetLengthDto.table.gender.tip=Sexe
|
| 925 |
-observe.common.NonTargetLengthDto.table.length=Longueur
|
|
| 926 |
-observe.common.NonTargetLengthDto.table.length.tip=Longueur
|
|
| 925 |
+observe.common.NonTargetLengthDto.table.length=Taille
|
|
| 926 |
+observe.common.NonTargetLengthDto.table.length.tip=Taille (cm)
|
|
| 927 | 927 |
observe.common.NonTargetLengthDto.table.meanWeight=Poids ind.
|
| 928 | 928 |
observe.common.NonTargetLengthDto.table.meanWeight.tip=Poids individuel (en Kg)
|
| 929 | 929 |
observe.common.NonTargetLengthDto.table.nonTargetSpecies=Espèce faune
|
| ... | ... | @@ -26,7 +26,7 @@ |
| 26 | 26 |
<parent>
|
| 27 | 27 |
<groupId>fr.ird.observe</groupId>
|
| 28 | 28 |
<artifactId>ird-observe</artifactId>
|
| 29 |
- <version>7.0.3</version>
|
|
| 29 |
+ <version>7.0.4</version>
|
|
| 30 | 30 |
</parent>
|
| 31 | 31 |
|
| 32 | 32 |
<artifactId>observe</artifactId>
|
| ... | ... | @@ -26,7 +26,7 @@ |
| 26 | 26 |
<parent>
|
| 27 | 27 |
<groupId>fr.ird.observe</groupId>
|
| 28 | 28 |
<artifactId>ird-observe</artifactId>
|
| 29 |
- <version>7.0.3</version>
|
|
| 29 |
+ <version>7.0.4</version>
|
|
| 30 | 30 |
</parent>
|
| 31 | 31 |
|
| 32 | 32 |
<artifactId>persistence</artifactId>
|
| ... | ... | @@ -26,12 +26,12 @@ |
| 26 | 26 |
<parent>
|
| 27 | 27 |
<groupId>io.ultreia.maven</groupId>
|
| 28 | 28 |
<artifactId>pom</artifactId>
|
| 29 |
- <version>2019.8.8</version>
|
|
| 29 |
+ <version>2019.8.11</version>
|
|
| 30 | 30 |
</parent>
|
| 31 | 31 |
|
| 32 | 32 |
<groupId>fr.ird.observe</groupId>
|
| 33 | 33 |
<artifactId>ird-observe</artifactId>
|
| 34 |
- <version>7.0.3</version>
|
|
| 34 |
+ <version>7.0.4</version>
|
|
| 35 | 35 |
<packaging>pom</packaging>
|
| 36 | 36 |
|
| 37 | 37 |
<name>ObServe :: Pom</name>
|
| ... | ... | @@ -26,7 +26,7 @@ |
| 26 | 26 |
<parent>
|
| 27 | 27 |
<groupId>fr.ird.observe</groupId>
|
| 28 | 28 |
<artifactId>ird-observe</artifactId>
|
| 29 |
- <version>7.0.3</version>
|
|
| 29 |
+ <version>7.0.4</version>
|
|
| 30 | 30 |
</parent>
|
| 31 | 31 |
|
| 32 | 32 |
<artifactId>server-configuration</artifactId>
|
| ... | ... | @@ -27,7 +27,7 @@ |
| 27 | 27 |
<parent>
|
| 28 | 28 |
<groupId>fr.ird.observe</groupId>
|
| 29 | 29 |
<artifactId>ird-observe</artifactId>
|
| 30 |
- <version>7.0.3</version>
|
|
| 30 |
+ <version>7.0.4</version>
|
|
| 31 | 31 |
</parent>
|
| 32 | 32 |
|
| 33 | 33 |
<artifactId>server-core</artifactId>
|
| ... | ... | @@ -27,7 +27,7 @@ |
| 27 | 27 |
<parent>
|
| 28 | 28 |
<groupId>fr.ird.observe</groupId>
|
| 29 | 29 |
<artifactId>ird-observe</artifactId>
|
| 30 |
- <version>7.0.3</version>
|
|
| 30 |
+ <version>7.0.4</version>
|
|
| 31 | 31 |
</parent>
|
| 32 | 32 |
|
| 33 | 33 |
<artifactId>server-runner</artifactId>
|
| ... | ... | @@ -27,7 +27,7 @@ |
| 27 | 27 |
<parent>
|
| 28 | 28 |
<groupId>fr.ird.observe</groupId>
|
| 29 | 29 |
<artifactId>ird-observe</artifactId>
|
| 30 |
- <version>7.0.3</version>
|
|
| 30 |
+ <version>7.0.4</version>
|
|
| 31 | 31 |
</parent>
|
| 32 | 32 |
|
| 33 | 33 |
<artifactId>services-client</artifactId>
|
| ... | ... | @@ -27,7 +27,7 @@ |
| 27 | 27 |
<parent>
|
| 28 | 28 |
<groupId>fr.ird.observe</groupId>
|
| 29 | 29 |
<artifactId>ird-observe</artifactId>
|
| 30 |
- <version>7.0.3</version>
|
|
| 30 |
+ <version>7.0.4</version>
|
|
| 31 | 31 |
</parent>
|
| 32 | 32 |
|
| 33 | 33 |
<artifactId>services-local</artifactId>
|
| ... | ... | @@ -27,7 +27,7 @@ |
| 27 | 27 |
<parent>
|
| 28 | 28 |
<groupId>fr.ird.observe</groupId>
|
| 29 | 29 |
<artifactId>ird-observe</artifactId>
|
| 30 |
- <version>7.0.3</version>
|
|
| 30 |
+ <version>7.0.4</version>
|
|
| 31 | 31 |
</parent>
|
| 32 | 32 |
|
| 33 | 33 |
<artifactId>services</artifactId>
|
| ... | ... | @@ -26,7 +26,7 @@ |
| 26 | 26 |
<parent>
|
| 27 | 27 |
<groupId>fr.ird.observe</groupId>
|
| 28 | 28 |
<artifactId>ird-observe</artifactId>
|
| 29 |
- <version>7.0.3</version>
|
|
| 29 |
+ <version>7.0.4</version>
|
|
| 30 | 30 |
</parent>
|
| 31 | 31 |
|
| 32 | 32 |
<artifactId>test</artifactId>
|
| ... | ... | @@ -26,7 +26,7 @@ |
| 26 | 26 |
<parent>
|
| 27 | 27 |
<groupId>fr.ird.observe</groupId>
|
| 28 | 28 |
<artifactId>ird-observe</artifactId>
|
| 29 |
- <version>7.0.3</version>
|
|
| 29 |
+ <version>7.0.4</version>
|
|
| 30 | 30 |
</parent>
|
| 31 | 31 |
|
| 32 | 32 |
<artifactId>validation</artifactId>
|