- Observe-commits - mailman.cloud.codelutin.com

[Git][ultreiaio/ird-observe][develop-7.x] [jgitflow-maven-plugin]updating poms for 7.6.4-SNAPSHOT development[skip ci]
by Tony CHEMIT 22 Jun '20

22 Jun '20

Tony CHEMIT pushed to branch develop-7.x at ultreiaio / ird-observe Commits: d1d3eb1a by Tony Chemit at 2020-06-22T16:56:43+02:00 [jgitflow-maven-plugin]updating poms for 7.6.4-SNAPSHOT development[skip ci] - - - - - 16 changed files: - client-configuration/pom.xml - client-core/pom.xml - client-runner/pom.xml - dto/pom.xml - observe-i18n/pom.xml - 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: ===================================== client-configuration/pom.xml ===================================== @@ -26,7 +26,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>ird-observe</artifactId> - <version>7.6.3-SNAPSHOT</version> + <version>7.6.4-SNAPSHOT</version> </parent> <artifactId>client-configuration</artifactId> ===================================== client-core/pom.xml ===================================== @@ -26,7 +26,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>ird-observe</artifactId> - <version>7.6.3-SNAPSHOT</version> + <version>7.6.4-SNAPSHOT</version> </parent> <artifactId>client-core</artifactId> ===================================== client-runner/pom.xml ===================================== @@ -26,7 +26,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>ird-observe</artifactId> - <version>7.6.3-SNAPSHOT</version> + <version>7.6.4-SNAPSHOT</version> </parent> <artifactId>client-runner</artifactId> ===================================== dto/pom.xml ===================================== @@ -27,7 +27,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>ird-observe</artifactId> - <version>7.6.3-SNAPSHOT</version> + <version>7.6.4-SNAPSHOT</version> </parent> <artifactId>dto</artifactId> ===================================== observe-i18n/pom.xml ===================================== @@ -26,7 +26,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>ird-observe</artifactId> - <version>7.6.3-SNAPSHOT</version> + <version>7.6.4-SNAPSHOT</version> </parent> <artifactId>observe-i18n</artifactId> ===================================== observe/pom.xml ===================================== @@ -26,7 +26,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>ird-observe</artifactId> - <version>7.6.3-SNAPSHOT</version> + <version>7.6.4-SNAPSHOT</version> </parent> <artifactId>observe</artifactId> ===================================== persistence/pom.xml ===================================== @@ -26,7 +26,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>ird-observe</artifactId> - <version>7.6.3-SNAPSHOT</version> + <version>7.6.4-SNAPSHOT</version> </parent> <artifactId>persistence</artifactId> ===================================== pom.xml ===================================== @@ -31,7 +31,7 @@ <groupId>fr.ird.observe</groupId> <artifactId>ird-observe</artifactId> - <version>7.6.3-SNAPSHOT</version> + <version>7.6.4-SNAPSHOT</version> <packaging>pom</packaging> <name>ObServe :: Pom</name> ===================================== server-configuration/pom.xml ===================================== @@ -26,7 +26,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>ird-observe</artifactId> - <version>7.6.3-SNAPSHOT</version> + <version>7.6.4-SNAPSHOT</version> </parent> <artifactId>server-configuration</artifactId> @@ -119,7 +119,7 @@ <dependency> <groupId>fr.ird.observe</groupId> <artifactId>services</artifactId> - <version>7.6.3-SNAPSHOT</version> + <version>7.6.4-SNAPSHOT</version> <scope>compile</scope> </dependency> ===================================== server-core/pom.xml ===================================== @@ -27,7 +27,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>ird-observe</artifactId> - <version>7.6.3-SNAPSHOT</version> + <version>7.6.4-SNAPSHOT</version> </parent> <artifactId>server-core</artifactId> ===================================== server-runner/pom.xml ===================================== @@ -27,7 +27,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>ird-observe</artifactId> - <version>7.6.3-SNAPSHOT</version> + <version>7.6.4-SNAPSHOT</version> </parent> <artifactId>server-runner</artifactId> ===================================== services-client/pom.xml ===================================== @@ -27,7 +27,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>ird-observe</artifactId> - <version>7.6.3-SNAPSHOT</version> + <version>7.6.4-SNAPSHOT</version> </parent> <artifactId>services-client</artifactId> ===================================== services-local/pom.xml ===================================== @@ -27,7 +27,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>ird-observe</artifactId> - <version>7.6.3-SNAPSHOT</version> + <version>7.6.4-SNAPSHOT</version> </parent> <artifactId>services-local</artifactId> ===================================== services/pom.xml ===================================== @@ -27,7 +27,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>ird-observe</artifactId> - <version>7.6.3-SNAPSHOT</version> + <version>7.6.4-SNAPSHOT</version> </parent> <artifactId>services</artifactId> ===================================== test/pom.xml ===================================== @@ -26,7 +26,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>ird-observe</artifactId> - <version>7.6.3-SNAPSHOT</version> + <version>7.6.4-SNAPSHOT</version> </parent> <artifactId>test</artifactId> ===================================== validation/pom.xml ===================================== @@ -26,7 +26,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>ird-observe</artifactId> - <version>7.6.3-SNAPSHOT</version> + <version>7.6.4-SNAPSHOT</version> </parent> <artifactId>validation</artifactId> View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/commit/d1d3eb1a0c17e90f0265012d5… -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/commit/d1d3eb1a0c17e90f0265012d5… You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-observe][develop-7.x] 6 commits: LL / Opération de pêche / Composition globale / Avançons / Longueur bas de...
by Tony CHEMIT 22 Jun '20

22 Jun '20

Tony CHEMIT pushed to branch develop-7.x at ultreiaio / ird-observe Commits: 5b68f7c9 by Tony Chemit at 2020-06-22T16:47:36+02:00 LL / Opération de pêche / Composition globale / Avançons / Longueur bas de ligne : ce champ était facultatif et est devenu obligatoire - Closes #1494 - - - - - fc97d938 by Tony Chemit at 2020-06-22T16:47:38+02:00 [PS] Rappel de la dernière espèce utilisée dans la saisie des échantillons non cible - Closes #1528 - - - - - f6f31f9c by Tony Chemit at 2020-06-22T16:47:38+02:00 Remove usage of Guava collections instance methods - - - - - f98fc3ac by Tony Chemit at 2020-06-22T16:47:38+02:00 Fix gitlab build badge - - - - - 3f49bb58 by Tony Chemit at 2020-06-22T16:47:38+02:00 update pom - - - - - 4437ecc0 by Tony Chemit at 2020-06-22T16:47:38+02:00 [LL] Activité, Capture, Enregistreur de profondeur Le raccourci clavier MAJ+TAB (focus arrière) ne fonctionne plus - Closes #1530 - - - - - 30 changed files: - README.md - client-configuration/pom.xml - client-configuration/src/main/java/fr/ird/observe/client/configuration/ClientConfig.java - client-configuration/src/main/resources/observe-log4j2.xml - client-core/pom.xml - client-core/src/main/java/fr/ird/observe/client/db/ObserveDataSourcesManager.java - client-core/src/main/java/fr/ird/observe/client/ui/ObserveCommon.jcss - client-core/src/main/java/fr/ird/observe/client/ui/actions/content/LonglineDetailCompositionGenerateAllSectionsAction.java - client-core/src/main/java/fr/ird/observe/client/ui/actions/main/menu/config/ShowConfigAction.java - client-core/src/main/java/fr/ird/observe/client/ui/admin/AdminTabUIInitializer.java - client-core/src/main/java/fr/ird/observe/client/ui/admin/report/ReportUIHandler.java - client-core/src/main/java/fr/ird/observe/client/ui/admin/synchronize/referential/legacy/SynchronizeUIHandler.java - client-core/src/main/java/fr/ird/observe/client/ui/admin/synchronize/referential/ng/ReferentialReplaceUI.jaxx - client-core/src/main/java/fr/ird/observe/client/ui/admin/synchronize/referential/ng/ReferentialReplaceUIHandler.java - client-core/src/main/java/fr/ird/observe/client/ui/admin/validate/ValidateModel.java - client-core/src/main/java/fr/ird/observe/client/ui/admin/validate/ValidationMessageTableModel.java - client-core/src/main/java/fr/ird/observe/client/ui/content/Common.jcss - client-core/src/main/java/fr/ird/observe/client/ui/content/ContentUIHandler.java - client-core/src/main/java/fr/ird/observe/client/ui/content/ContentUIInitializer.java - client-core/src/main/java/fr/ird/observe/client/ui/content/ObserveLayoutFocusTraversalPolicy.java - client-core/src/main/java/fr/ird/observe/client/ui/content/data/CommonTable.jcss - client-core/src/main/java/fr/ird/observe/client/ui/content/data/longline/ActivityLonglineUI.jaxx - client-core/src/main/java/fr/ird/observe/client/ui/content/data/longline/BaitsCompositionUI.jaxx - client-core/src/main/java/fr/ird/observe/client/ui/content/data/longline/BranchlineUI.jaxx - client-core/src/main/java/fr/ird/observe/client/ui/content/data/longline/BranchlinesCompositionUI.jaxx - client-core/src/main/java/fr/ird/observe/client/ui/content/data/longline/CatchLonglineUI.jaxx - client-core/src/main/java/fr/ird/observe/client/ui/content/data/longline/CatchLonglineUIHandler.java - client-core/src/main/java/fr/ird/observe/client/ui/content/data/longline/EncounterUI.jaxx - client-core/src/main/java/fr/ird/observe/client/ui/content/data/longline/FloatlinesCompositionUI.jaxx - client-core/src/main/java/fr/ird/observe/client/ui/content/data/longline/GearUseFeaturesLonglineUI.jaxx The diff was not included because it is too large. View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/compare/e786f45a26109f2afc4cfe31… -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/compare/e786f45a26109f2afc4cfe31… You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-observe][develop-7.x] [PS] Rappel de la dernière espèce utilisée dans la saisie des échantillons non cible - Closes #1528
by Tony CHEMIT 18 Jun '20

18 Jun '20

Tony CHEMIT pushed to branch develop-7.x at ultreiaio / ird-observe Commits: e786f45a by Tony Chemit at 2020-06-18T14:17:16+02:00 [PS] Rappel de la dernière espèce utilisée dans la saisie des échantillons non cible - Closes #1528 - - - - - 1 changed file: - client-core/src/main/java/fr/ird/observe/client/ui/content/data/seine/NonTargetSampleUIHandler.java Changes: ===================================== client-core/src/main/java/fr/ird/observe/client/ui/content/data/seine/NonTargetSampleUIHandler.java ===================================== @@ -21,7 +21,6 @@ */ package fr.ird.observe.client.ui.content.data.seine; -import com.google.common.collect.Lists; import fr.ird.observe.client.constants.AcquisitionMode; import fr.ird.observe.client.db.ClientDataContext; import fr.ird.observe.client.ui.content.ContentMode; @@ -49,6 +48,7 @@ import javax.swing.table.DefaultTableCellRenderer; import java.awt.Component; import java.awt.Container; import java.util.Collection; +import java.util.Collections; import java.util.LinkedList; import java.util.List; import java.util.Optional; @@ -112,7 +112,6 @@ public class NonTargetSampleUIHandler extends AbstractSampleUIHandler<NonTargetS return getDataContext().getSelectedSetId(); } - @SuppressWarnings("unchecked") @Override protected void onSelectedRowChanged(int editingRow, NonTargetLengthDto bean, @@ -131,50 +130,77 @@ public class NonTargetSampleUIHandler extends AbstractSampleUIHandler<NonTargetS SpeciesReference species = bean.getSpecies(); NonTargetSampleUI ui = getUi(); - if (log.isDebugEnabled()) { - log.debug("selected species " + species); - } - List<SpeciesReference> availableEspeces; + log.debug("selected species " + species); + + List<SpeciesReference> availableSpecies; JComponent requestFocus; - Optional<SizeMeasureTypeReference> sizeMeasureType; + Optional<SizeMeasureTypeReference> sizeMeasureType=Optional.empty(); if (create) { + Optional<SizeMeasureTypeReference> defaultSizeMeasureType; + + boolean unsetSpecies = true; if (model.isCreate()) { // on passe le mode de saisie en count - ui.getAcquisitionModeGroup().setSelectedValue(null); - ui.getAcquisitionModeGroup().setSelectedValue(AcquisitionMode.byEffectif); + AcquisitionMode acquisitionMode = AcquisitionMode.byEffectif; + + if (editingRow > 0) { + unsetSpecies = false; + // get previous row + NonTargetLengthDto editBean = model.getValueAt(editingRow - 1); + // get previous species + species = editBean.getSpecies(); + // get previous acquisition mode + acquisitionMode = AcquisitionMode.valueOf(editBean.getAcquisitionMode()); + // get previous size measure type + sizeMeasureType = Optional.ofNullable(editBean.getSizeMeasureType()); + } + + updateAcquisitionMode0(acquisitionMode); + } - availableEspeces = getModel().getReferentialReferences(NonTargetLengthDto.PROPERTY_SPECIES); + availableSpecies = getModel().getReferentialReferences(NonTargetLengthDto.PROPERTY_SPECIES); + + // get default size measure type + defaultSizeMeasureType = getSpeciesDefaultSizeMeasureType(species); + + if (unsetSpecies) { + // unset species (this will not set again species in widget) + species = null; + sizeMeasureType = defaultSizeMeasureType; + requestFocus = ui.getSpecies(); + } else { + requestFocus = ui.getLength(); + } // on utilise le code par defaut de l'espèce - sizeMeasureType = getSpeciesDefaultSizeMeasureType(species); - getUi().getModel().setDefaultSizeMeasureType(sizeMeasureType.orElse(null)); + ui.getModel().setDefaultSizeMeasureType(defaultSizeMeasureType.orElse(null)); - requestFocus = ui.getSpecies(); } else { requestFocus = ui.getCount(); // on passe le mode de saisie - int acquisitionMode = bean.getAcquisitionMode(); - AcquisitionMode enumValue = - AcquisitionMode.valueOf(acquisitionMode); - ui.getAcquisitionModeGroup().setSelectedValue(null); - ui.getAcquisitionModeGroup().setSelectedValue(enumValue); - - availableEspeces = Lists.newArrayList(species); + updateAcquisitionMode0(AcquisitionMode.valueOf(bean.getAcquisitionMode())); + availableSpecies = Collections.singletonList(species); + species = null; sizeMeasureType = Optional.ofNullable(bean.getSizeMeasureType()); } ui.getSizeMeasureType().setSelectedItem(null); - sizeMeasureType.ifPresent(sizeMeasureTypeDtoReferentialReference -> ui.getSizeMeasureType().setSelectedItem(sizeMeasureTypeDtoReferentialReference)); + sizeMeasureType.ifPresent(ui.getSizeMeasureType()::setSelectedItem); - ui.getSpecies().setData(availableEspeces); + ui.getSpecies().setData(availableSpecies); + if (species != null) { + log.info(String.format("Will set species : %s", species)); + ui.getSpecies().setSelectedItem(null); + ui.getSpecies().setSelectedItem(species); + } UIHelper.askFocus(requestFocus); tableEditBean.addPropertyChangeListener(NonTargetLengthDto.PROPERTY_WEIGHT, weightChanged); @@ -351,6 +377,11 @@ public class NonTargetSampleUIHandler extends AbstractSampleUIHandler<NonTargetS } + private void updateAcquisitionMode0(AcquisitionMode acquisitionMode) { + ui.getAcquisitionModeGroup().setSelectedValue(null); + ui.getAcquisitionModeGroup().setSelectedValue(acquisitionMode); + } + class TablePopupSupport extends AutotSelectRowAndShowPopupActionSupport { private final NonTargetSampleUI ui; View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/commit/e786f45a26109f2afc4cfe315… -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/commit/e786f45a26109f2afc4cfe315… You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-observe][develop-7.x] LL / Opération de pêche / Composition globale / Avançons / Longueur bas de...
by Tony CHEMIT 18 Jun '20

18 Jun '20

Tony CHEMIT pushed to branch develop-7.x at ultreiaio / ird-observe Commits: 50c0ab47 by Tony Chemit at 2020-06-18T11:37:03+02:00 LL / Opération de pêche / Composition globale / Avançons / Longueur bas de ligne : ce champ était facultatif et est devenu obligatoire - Closes #1494 - - - - - 1 changed file: - dto/src/main/models/Observe.model Changes: ===================================== dto/src/main/models/Observe.model ===================================== @@ -150,7 +150,7 @@ basket + {*:1} fr.ird.observe.dto.data.longline.BasketReference data.longline.BranchlinesComposition > data.Data | references=topTypeLabel,tracelineTypeLabel,length,proportion length + {*:1} Float | notNull strictlyPositiveNumber proportion + {*:1} Integer | notNull strictlyPositiveNumber -tracelineLength + {*:1} Float | notNull strictlyPositiveNumber +tracelineLength + {*:1} Float | strictlyPositiveNumber topType {*:0..1} fr.ird.observe.dto.referential.longline.LineTypeReference | notNull tracelineType {*:0..1} fr.ird.observe.dto.referential.longline.LineTypeReference | notNull View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/commit/50c0ab472d0c265e36e897f00… -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/commit/50c0ab472d0c265e36e897f00… You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-observe][pages] Site checkin for project ObServe :: Pom
by Tony CHEMIT 03 Jun '20

03 Jun '20

Tony CHEMIT pushed to branch pages at ultreiaio / ird-observe Commits: 6a0ddd6e by 166231 at 2020-06-03T14:10:40+00:00 Site checkin for project ObServe :: Pom - - - - - 11 changed files: - administration-web.html - architecture-logicielle.html - img/architecture.svg - − img/logo-small.png - img/logo.png - img/logo_ird.png - index.html - install-serverPG.html - install.html - + referential-filter.html - synchro-referential.html Changes: ===================================== administration-web.html ===================================== @@ -1,6 +1,6 @@ <!DOCTYPE html>  <html xmlns="http://www.w3.org/1999/xhtml" lang="fr"> @@ -18,7 +18,7 @@ <div class="container-fluid"> <header> <div id="banner"> - <div class="pull-left"><a href="index.html" id="bannerLeft"><img src="./img/logo-small.png" alt="ObServe :: Pom"/></a></div> + <div class="pull-left"><a href="index.html" id="bannerLeft"><img src="./img/logo.png" alt="ObServe :: Pom"/></a></div> <div class="pull-right"><a href="index.html" id="bannerRight"><img src="./img/logo_ird.png" alt="ObServe :: Pom"/></a></div> <div class="clear"><hr/></div> </div> @@ -27,8 +27,8 @@ <ul class="breadcrumb"> <li class=""><a href="https://ultreiaio.gitlab.io/ird-observe/index.html" class="externalLink" title="ObServe :: Pom">ObServe :: Pom</a><span class="divider">»</span></li> <li class="active ">Installation de lapplication web</li> - <li id="publishDate" class="pull-right"><span class="divider">|</span> Dernière publication: 2020-05-26</li> - <li id="projectVersion" class="pull-right"><span class="divider">|</span>Version: 7.6.2</li> + <li id="publishDate" class="pull-right"><span class="divider">|</span> Dernière publication: 2020-06-03</li> + <li id="projectVersion" class="pull-right"><span class="divider">|</span>Version: 8.0-RC-7</li> <li class="pull-right"><span class="divider">|</span> <a href="http://ultreia.io" class="externalLink" title="Ultreia.io">Ultreia.io</a></li> <li class="pull-right"><a href="https://gitlab.com/ultreiaio/ird-observe" class="externalLink" title="GitLab">GitLab</a></li> @@ -46,6 +46,7 @@ <li class="active"><a href="#"><span class="none"></span>Administration Web</a></li> <li><a href="https://gitlab.com/ultreiaio/ird-observe/blob/develop/CHANGELOG.md" class="externalLink" title="Historique des versions"><span class="none"></span>Historique des versions</a></li> <li><a href="./config-report.html" title="Configuration"><span class="none"></span>Configuration</a></li> + <li><a href="./referential-filter.html" title="Filtrage des référentiels"><span class="none"></span>Filtrage des référentiels</a></li> <li><a href="./synchro-referential.html" title="Synchronisation référentiel avancée"><span class="none"></span>Synchronisation référentiel avancée</a></li> <li class="nav-header">Modélisation</li> <li><a href="https://gitlab.com/ultreiaio/ird-observe/raw/develop/doc/modelisation/zargo…" class="externalLink" title="Fichier argoUML (commun) v7"><span class="none"></span>Fichier argoUML (commun) v7</a></li> @@ -71,7 +72,7 @@ <div class="clear"></div> <div class="clear"></div> <div class="clear"></div> -<a href="http://jaxx.nuiton.org" title="JAXX" class="builtBy"><img class="builtBy" alt="JAXX" src="./img/jaxx-logo.png" width="120" /></a> +<a href="https://ultreiaio.gitlab.io/jaxx" title="JAXX" class="builtBy"><img class="builtBy" alt="JAXX" src="./img/jaxx-logo.png" width="120" /></a> <a href="http://topia.nuiton.org" title="ToPIA" class="builtBy"><img class="builtBy" alt="ToPIA" src="./img/topia-logo.png" width="120" /></a> <a href="http://argouml.tigris.org/" title="ArgoUML" class="builtBy"><img class="builtBy" alt="ArgoUML" src="./img/argouml-logo.png" width="120" /></a> </div> @@ -102,8 +103,8 @@ <div class="source"><pre class="prettyprint linenums"> /var/local/observeweb/{contextPath} |-- databases.yml # configuration des bases de données |-- log - | `-- observeweb-7.6.2.log # logs de l'application - |-- observeweb-log4j2.xml # configuration des logs + | `-- observeweb-8.0-RC-7.log # logs de l'application + |-- observeweb-log4j.conf # configuration des logs |-- temp # répertoire temporaire `-- users.yml # configuration des utilisateurs </pre></div></div> @@ -190,6 +191,13 @@ <div class="source"> <div class="source"><pre class="prettyprint linenums"> http://localhost:8080/observeweb/admin/resetAuthenticationTokens?adminApiKe… (ou la clef que vous avez configuré) +</pre></div></div> + +<p>Par défaut le proxy_ajp a un timeout de 5 minutes, il faut augmenter cette valeur sinon les appels dépassant ce temps seront rejettés.</p> +<p>Dans le fichier de configuration <code>httpd.conf</code> ajouter la ligne : (timeout de 1200 secondes = 20 minutes)</p> + +<div class="source"> +<div class="source"><pre class="prettyprint linenums">ProxyTimeout 1200 </pre></div></div> </main> </div> ===================================== architecture-logicielle.html ===================================== @@ -1,6 +1,6 @@ <!DOCTYPE html>  <html xmlns="http://www.w3.org/1999/xhtml" lang="fr"> @@ -18,7 +18,7 @@ <div class="container-fluid"> <header> <div id="banner"> - <div class="pull-left"><a href="index.html" id="bannerLeft"><img src="./img/logo-small.png" alt="ObServe :: Pom"/></a></div> + <div class="pull-left"><a href="index.html" id="bannerLeft"><img src="./img/logo.png" alt="ObServe :: Pom"/></a></div> <div class="pull-right"><a href="index.html" id="bannerRight"><img src="./img/logo_ird.png" alt="ObServe :: Pom"/></a></div> <div class="clear"><hr/></div> </div> @@ -27,8 +27,8 @@ <ul class="breadcrumb"> <li class=""><a href="https://ultreiaio.gitlab.io/ird-observe/index.html" class="externalLink" title="ObServe :: Pom">ObServe :: Pom</a><span class="divider">»</span></li> <li class="active ">Architecture logicielle dObServe</li> - <li id="publishDate" class="pull-right"><span class="divider">|</span> Dernière publication: 2020-05-26</li> - <li id="projectVersion" class="pull-right"><span class="divider">|</span>Version: 7.6.2</li> + <li id="publishDate" class="pull-right"><span class="divider">|</span> Dernière publication: 2020-06-03</li> + <li id="projectVersion" class="pull-right"><span class="divider">|</span>Version: 8.0-RC-7</li> <li class="pull-right"><span class="divider">|</span> <a href="http://ultreia.io" class="externalLink" title="Ultreia.io">Ultreia.io</a></li> <li class="pull-right"><a href="https://gitlab.com/ultreiaio/ird-observe" class="externalLink" title="GitLab">GitLab</a></li> @@ -46,6 +46,7 @@ <li><a href="administration-web.html" title="Administration Web"><span class="none"></span>Administration Web</a></li> <li><a href="https://gitlab.com/ultreiaio/ird-observe/blob/develop/CHANGELOG.md" class="externalLink" title="Historique des versions"><span class="none"></span>Historique des versions</a></li> <li><a href="./config-report.html" title="Configuration"><span class="none"></span>Configuration</a></li> + <li><a href="./referential-filter.html" title="Filtrage des référentiels"><span class="none"></span>Filtrage des référentiels</a></li> <li><a href="./synchro-referential.html" title="Synchronisation référentiel avancée"><span class="none"></span>Synchronisation référentiel avancée</a></li> <li class="nav-header">Modélisation</li> <li><a href="https://gitlab.com/ultreiaio/ird-observe/raw/develop/doc/modelisation/zargo…" class="externalLink" title="Fichier argoUML (commun) v7"><span class="none"></span>Fichier argoUML (commun) v7</a></li> @@ -71,7 +72,7 @@ <div class="clear"></div> <div class="clear"></div> <div class="clear"></div> -<a href="http://jaxx.nuiton.org" title="JAXX" class="builtBy"><img class="builtBy" alt="JAXX" src="./img/jaxx-logo.png" width="120" /></a> +<a href="https://ultreiaio.gitlab.io/jaxx" title="JAXX" class="builtBy"><img class="builtBy" alt="JAXX" src="./img/jaxx-logo.png" width="120" /></a> <a href="http://topia.nuiton.org" title="ToPIA" class="builtBy"><img class="builtBy" alt="ToPIA" src="./img/topia-logo.png" width="120" /></a> <a href="http://argouml.tigris.org/" title="ArgoUML" class="builtBy"><img class="builtBy" alt="ArgoUML" src="./img/argouml-logo.png" width="120" /></a> </div> ===================================== img/architecture.svg ===================================== @@ -9,12 +9,10 @@ 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>. ===================================== img/logo-small.png deleted ===================================== Binary files a/img/logo-small.png and /dev/null differ ===================================== img/logo.png ===================================== Binary files a/img/logo.png and b/img/logo.png differ ===================================== img/logo_ird.png ===================================== Binary files a/img/logo_ird.png and b/img/logo_ird.png differ ===================================== index.html ===================================== @@ -1,6 +1,6 @@ <!DOCTYPE html>  <html xmlns="http://www.w3.org/1999/xhtml" lang="fr"> @@ -18,7 +18,7 @@ <div class="container-fluid"> <header> <div id="banner"> - <div class="pull-left"><a href="index.html" id="bannerLeft"><img src="./img/logo-small.png" alt="ObServe :: Pom"/></a></div> + <div class="pull-left"><a href="index.html" id="bannerLeft"><img src="./img/logo.png" alt="ObServe :: Pom"/></a></div> <div class="pull-right"><a href="index.html" id="bannerRight"><img src="./img/logo_ird.png" alt="ObServe :: Pom"/></a></div> <div class="clear"><hr/></div> </div> @@ -27,8 +27,8 @@ <ul class="breadcrumb"> <li class=""><a href="https://ultreiaio.gitlab.io/ird-observe/index.html" class="externalLink" title="ObServe :: Pom">ObServe :: Pom</a><span class="divider">»</span></li> <li class="active ">ObServe</li> - <li id="publishDate" class="pull-right"><span class="divider">|</span> Dernière publication: 2020-05-26</li> - <li id="projectVersion" class="pull-right"><span class="divider">|</span>Version: 7.6.2</li> + <li id="publishDate" class="pull-right"><span class="divider">|</span> Dernière publication: 2020-06-03</li> + <li id="projectVersion" class="pull-right"><span class="divider">|</span>Version: 8.0-RC-7</li> <li class="pull-right"><span class="divider">|</span> <a href="http://ultreia.io" class="externalLink" title="Ultreia.io">Ultreia.io</a></li> <li class="pull-right"><a href="https://gitlab.com/ultreiaio/ird-observe" class="externalLink" title="GitLab">GitLab</a></li> @@ -46,6 +46,7 @@ <li><a href="administration-web.html" title="Administration Web"><span class="none"></span>Administration Web</a></li> <li><a href="https://gitlab.com/ultreiaio/ird-observe/blob/develop/CHANGELOG.md" class="externalLink" title="Historique des versions"><span class="none"></span>Historique des versions</a></li> <li><a href="./config-report.html" title="Configuration"><span class="none"></span>Configuration</a></li> + <li><a href="./referential-filter.html" title="Filtrage des référentiels"><span class="none"></span>Filtrage des référentiels</a></li> <li><a href="./synchro-referential.html" title="Synchronisation référentiel avancée"><span class="none"></span>Synchronisation référentiel avancée</a></li> <li class="nav-header">Modélisation</li> <li><a href="https://gitlab.com/ultreiaio/ird-observe/raw/develop/doc/modelisation/zargo…" class="externalLink" title="Fichier argoUML (commun) v7"><span class="none"></span>Fichier argoUML (commun) v7</a></li> @@ -87,7 +88,7 @@ <div class="clear"></div> <div class="clear"></div> <div class="clear"></div> -<a href="http://jaxx.nuiton.org" title="JAXX" class="builtBy"><img class="builtBy" alt="JAXX" src="./img/jaxx-logo.png" width="120" /></a> +<a href="https://ultreiaio.gitlab.io/jaxx" title="JAXX" class="builtBy"><img class="builtBy" alt="JAXX" src="./img/jaxx-logo.png" width="120" /></a> <a href="http://topia.nuiton.org" title="ToPIA" class="builtBy"><img class="builtBy" alt="ToPIA" src="./img/topia-logo.png" width="120" /></a> <a href="http://argouml.tigris.org/" title="ArgoUML" class="builtBy"><img class="builtBy" alt="ArgoUML" src="./img/argouml-logo.png" width="120" /></a> </div> ===================================== install-serverPG.html ===================================== @@ -1,6 +1,6 @@ <!DOCTYPE html>  <html xmlns="http://www.w3.org/1999/xhtml" lang="fr"> @@ -18,7 +18,7 @@ <div class="container-fluid"> <header> <div id="banner"> - <div class="pull-left"><a href="index.html" id="bannerLeft"><img src="./img/logo-small.png" alt="ObServe :: Pom"/></a></div> + <div class="pull-left"><a href="index.html" id="bannerLeft"><img src="./img/logo.png" alt="ObServe :: Pom"/></a></div> <div class="pull-right"><a href="index.html" id="bannerRight"><img src="./img/logo_ird.png" alt="ObServe :: Pom"/></a></div> <div class="clear"><hr/></div> </div> @@ -27,8 +27,8 @@ <ul class="breadcrumb"> <li class=""><a href="https://ultreiaio.gitlab.io/ird-observe/index.html" class="externalLink" title="ObServe :: Pom">ObServe :: Pom</a><span class="divider">»</span></li> <li class="active ">Installation du serveur Obstuna</li> - <li id="publishDate" class="pull-right"><span class="divider">|</span> Dernière publication: 2020-05-26</li> - <li id="projectVersion" class="pull-right"><span class="divider">|</span>Version: 7.6.2</li> + <li id="publishDate" class="pull-right"><span class="divider">|</span> Dernière publication: 2020-06-03</li> + <li id="projectVersion" class="pull-right"><span class="divider">|</span>Version: 8.0-RC-7</li> <li class="pull-right"><span class="divider">|</span> <a href="http://ultreia.io" class="externalLink" title="Ultreia.io">Ultreia.io</a></li> <li class="pull-right"><a href="https://gitlab.com/ultreiaio/ird-observe" class="externalLink" title="GitLab">GitLab</a></li> @@ -46,6 +46,7 @@ <li><a href="administration-web.html" title="Administration Web"><span class="none"></span>Administration Web</a></li> <li><a href="https://gitlab.com/ultreiaio/ird-observe/blob/develop/CHANGELOG.md" class="externalLink" title="Historique des versions"><span class="none"></span>Historique des versions</a></li> <li><a href="./config-report.html" title="Configuration"><span class="none"></span>Configuration</a></li> + <li><a href="./referential-filter.html" title="Filtrage des référentiels"><span class="none"></span>Filtrage des référentiels</a></li> <li><a href="./synchro-referential.html" title="Synchronisation référentiel avancée"><span class="none"></span>Synchronisation référentiel avancée</a></li> <li class="nav-header">Modélisation</li> <li><a href="https://gitlab.com/ultreiaio/ird-observe/raw/develop/doc/modelisation/zargo…" class="externalLink" title="Fichier argoUML (commun) v7"><span class="none"></span>Fichier argoUML (commun) v7</a></li> @@ -71,7 +72,7 @@ <div class="clear"></div> <div class="clear"></div> <div class="clear"></div> -<a href="http://jaxx.nuiton.org" title="JAXX" class="builtBy"><img class="builtBy" alt="JAXX" src="./img/jaxx-logo.png" width="120" /></a> +<a href="https://ultreiaio.gitlab.io/jaxx" title="JAXX" class="builtBy"><img class="builtBy" alt="JAXX" src="./img/jaxx-logo.png" width="120" /></a> <a href="http://topia.nuiton.org" title="ToPIA" class="builtBy"><img class="builtBy" alt="ToPIA" src="./img/topia-logo.png" width="120" /></a> <a href="http://argouml.tigris.org/" title="ArgoUML" class="builtBy"><img class="builtBy" alt="ArgoUML" src="./img/argouml-logo.png" width="120" /></a> </div> ===================================== install.html ===================================== @@ -1,6 +1,6 @@ <!DOCTYPE html>  <html xmlns="http://www.w3.org/1999/xhtml" lang="fr"> @@ -18,7 +18,7 @@ <div class="container-fluid"> <header> <div id="banner"> - <div class="pull-left"><a href="index.html" id="bannerLeft"><img src="./img/logo-small.png" alt="ObServe :: Pom"/></a></div> + <div class="pull-left"><a href="index.html" id="bannerLeft"><img src="./img/logo.png" alt="ObServe :: Pom"/></a></div> <div class="pull-right"><a href="index.html" id="bannerRight"><img src="./img/logo_ird.png" alt="ObServe :: Pom"/></a></div> <div class="clear"><hr/></div> </div> @@ -27,8 +27,8 @@ <ul class="breadcrumb"> <li class=""><a href="https://ultreiaio.gitlab.io/ird-observe/index.html" class="externalLink" title="ObServe :: Pom">ObServe :: Pom</a><span class="divider">»</span></li> <li class="active ">Installation dObServe</li> - <li id="publishDate" class="pull-right"><span class="divider">|</span> Dernière publication: 2020-05-26</li> - <li id="projectVersion" class="pull-right"><span class="divider">|</span>Version: 7.6.2</li> + <li id="publishDate" class="pull-right"><span class="divider">|</span> Dernière publication: 2020-06-03</li> + <li id="projectVersion" class="pull-right"><span class="divider">|</span>Version: 8.0-RC-7</li> <li class="pull-right"><span class="divider">|</span> <a href="http://ultreia.io" class="externalLink" title="Ultreia.io">Ultreia.io</a></li> <li class="pull-right"><a href="https://gitlab.com/ultreiaio/ird-observe" class="externalLink" title="GitLab">GitLab</a></li> @@ -46,6 +46,7 @@ <li><a href="administration-web.html" title="Administration Web"><span class="none"></span>Administration Web</a></li> <li><a href="https://gitlab.com/ultreiaio/ird-observe/blob/develop/CHANGELOG.md" class="externalLink" title="Historique des versions"><span class="none"></span>Historique des versions</a></li> <li><a href="./config-report.html" title="Configuration"><span class="none"></span>Configuration</a></li> + <li><a href="./referential-filter.html" title="Filtrage des référentiels"><span class="none"></span>Filtrage des référentiels</a></li> <li><a href="./synchro-referential.html" title="Synchronisation référentiel avancée"><span class="none"></span>Synchronisation référentiel avancée</a></li> <li class="nav-header">Modélisation</li> <li><a href="https://gitlab.com/ultreiaio/ird-observe/raw/develop/doc/modelisation/zargo…" class="externalLink" title="Fichier argoUML (commun) v7"><span class="none"></span>Fichier argoUML (commun) v7</a></li> @@ -71,7 +72,7 @@ <div class="clear"></div> <div class="clear"></div> <div class="clear"></div> -<a href="http://jaxx.nuiton.org" title="JAXX" class="builtBy"><img class="builtBy" alt="JAXX" src="./img/jaxx-logo.png" width="120" /></a> +<a href="https://ultreiaio.gitlab.io/jaxx" title="JAXX" class="builtBy"><img class="builtBy" alt="JAXX" src="./img/jaxx-logo.png" width="120" /></a> <a href="http://topia.nuiton.org" title="ToPIA" class="builtBy"><img class="builtBy" alt="ToPIA" src="./img/topia-logo.png" width="120" /></a> <a href="http://argouml.tigris.org/" title="ArgoUML" class="builtBy"><img class="builtBy" alt="ArgoUML" src="./img/argouml-logo.png" width="120" /></a> </div> ===================================== referential-filter.html ===================================== @@ -0,0 +1,280 @@ +<!DOCTYPE html> + +<html xmlns="http://www.w3.org/1999/xhtml" lang="fr"> + <head> + <meta charset="UTF-8" /> + <meta name="viewport" content="width=device-width, initial-scale=1" /> + <meta name="generator" content="Apache Maven Doxia Site Renderer 1.9.2" /> + <title>ObServe :: Pom – List of specialized referential filters used in GUI</title> + <link rel="stylesheet" href="./css/apache-maven-fluido-1.8.min.css" /> + <link rel="stylesheet" href="./css/site.css" /> + <link rel="stylesheet" href="./css/print.css" media="print" /> + <script src="./js/apache-maven-fluido-1.8.min.js"></script> + </head> + <body class="topBarDisabled"> + <div class="container-fluid"> + <header> + <div id="banner"> + <div class="pull-left"><a href="index.html" id="bannerLeft"><img src="./img/logo.png" alt="ObServe :: Pom"/></a></div> + <div class="pull-right"><a href="index.html" id="bannerRight"><img src="./img/logo_ird.png" alt="ObServe :: Pom"/></a></div> + <div class="clear"><hr/></div> + </div> + + <div id="breadcrumbs"> + <ul class="breadcrumb"> + <li class=""><a href="https://ultreiaio.gitlab.io/ird-observe/index.html" class="externalLink" title="ObServe :: Pom">ObServe :: Pom</a><span class="divider">»</span></li> + <li class="active ">List of specialized referential filters used in GUI</li> + <li id="publishDate" class="pull-right"><span class="divider">|</span> Dernière publication: 2020-06-03</li> + <li id="projectVersion" class="pull-right"><span class="divider">|</span>Version: 8.0-RC-7</li> + <li class="pull-right"><span class="divider">|</span> +<a href="http://ultreia.io" class="externalLink" title="Ultreia.io">Ultreia.io</a></li> + <li class="pull-right"><a href="https://gitlab.com/ultreiaio/ird-observe" class="externalLink" title="GitLab">GitLab</a></li> + </ul> + </div> + </header> + <div class="row-fluid"> + <header id="leftColumn" class="span2"> + <nav class="well sidebar-nav"> + <ul class="nav nav-list"> + <li class="nav-header">Utilisateur</li> + <li><a href="index.html" title="Accueil"><span class="none"></span>Accueil</a></li> + <li><a href="install.html" title="Installation"><span class="none"></span>Installation</a></li> + <li><a href="install-serverPG.html" title="Administration Obstuna"><span class="none"></span>Administration Obstuna</a></li> + <li><a href="administration-web.html" title="Administration Web"><span class="none"></span>Administration Web</a></li> + <li><a href="https://gitlab.com/ultreiaio/ird-observe/blob/develop/CHANGELOG.md" class="externalLink" title="Historique des versions"><span class="none"></span>Historique des versions</a></li> + <li><a href="./config-report.html" title="Configuration"><span class="none"></span>Configuration</a></li> + <li><a href="./referential-filter.html" title="Filtrage des référentiels"><span class="none"></span>Filtrage des référentiels</a></li> + <li><a href="./synchro-referential.html" title="Synchronisation référentiel avancée"><span class="none"></span>Synchronisation référentiel avancée</a></li> + <li class="nav-header">Modélisation</li> + <li><a href="https://gitlab.com/ultreiaio/ird-observe/raw/develop/doc/modelisation/zargo…" class="externalLink" title="Fichier argoUML (commun) v7"><span class="none"></span>Fichier argoUML (commun) v7</a></li> + <li><a href="https://gitlab.com/ultreiaio/ird-observe/raw/develop/doc/modelisation/zargo…" class="externalLink" title="Fichier argoUML (Seine) v7"><span class="none"></span>Fichier argoUML (Seine) v7</a></li> + <li><a href="https://gitlab.com/ultreiaio/ird-observe/raw/develop/doc/modelisation/zargo…" class="externalLink" title="Fichier argoUML (Palangre) v7"><span class="none"></span>Fichier argoUML (Palangre) v7</a></li> + <li><a href="https://gitlab.com/ultreiaio/ird-observe/raw/develop/doc/modelisation/zargo…" class="externalLink" title="Fichier argoUML (commun) v5"><span class="none"></span>Fichier argoUML (commun) v5</a></li> + <li><a href="https://gitlab.com/ultreiaio/ird-observe/raw/develop/doc/modelisation/zargo…" class="externalLink" title="Fichier argoUML (Seine) v5"><span class="none"></span>Fichier argoUML (Seine) v5</a></li> + <li><a href="https://gitlab.com/ultreiaio/ird-observe/raw/develop/doc/modelisation/zargo…" class="externalLink" title="Fichier argoUML (Palangre) v5"><span class="none"></span>Fichier argoUML (Palangre) v5</a></li> + <li><a href="https://gitlab.com/ultreiaio/ird-observe/raw/develop/doc/modelisation/obser…" class="externalLink" title="Modèle physique"><span class="none"></span>Modèle physique</a></li> + <li class="nav-header">Documentation sur le projet</li> + <li><a href="project-info.html" title="Info Projet"><span class="icon-chevron-right"></span>Info Projet</a></li> + <li><a href="project-reports.html" title="Rapports Projet"><span class="icon-chevron-right"></span>Rapports Projet</a></li> + </ul> + </nav> + <div class="well sidebar-nav"> +<form id="search-form" action="https://www.google.com/search" method="get" > + <input value="ultreiaio.gitlab.io/ird-observe" name="sitesearch" type="hidden"/> + <input class="search-query" name="q" id="query" type="text" /> +</form> +<script>asyncJs( 'https://cse.google.com/brand?form=search-form' )</script> + <hr /> + <div id="poweredBy"> + <div class="clear"></div> + <div class="clear"></div> + <div class="clear"></div> +<a href="https://ultreiaio.gitlab.io/jaxx" title="JAXX" class="builtBy"><img class="builtBy" alt="JAXX" src="./img/jaxx-logo.png" width="120" /></a> +<a href="http://topia.nuiton.org" title="ToPIA" class="builtBy"><img class="builtBy" alt="ToPIA" src="./img/topia-logo.png" width="120" /></a> +<a href="http://argouml.tigris.org/" title="ArgoUML" class="builtBy"><img class="builtBy" alt="ArgoUML" src="./img/argouml-logo.png" width="120" /></a> + </div> + </div> + </header> + <main id="bodyColumn" class="span10" > +<h1>List of specialized referential filters used in GUI</h1> +<p>This document enumerates all specialized referential filters used in data source forms.</p><section> +<h2><a name="Data_PS"></a>Data PS</h2><section> +<h3><a name="Common_Trip"></a>Common Trip</h3> +<ul> + +<li>CAPTAIN:</li> +</ul> +<p><code>Person filter on captain flag</code></p> +<ul> + +<li>OBSERVER:</li> +</ul> +<p><code>Person filter on observer flag</code></p> +<ul> + +<li>DATA_ENTRY_OPERATOR:</li> +</ul> +<p><code>Person filter on dataEntryOperator flag</code></p> +<ul> + +<li>VESSEL:</li> +</ul> +<p><code>Vessel filter on vessel type within config[vesselType.seine.common.trip]</code></p></section><section> +<h3><a name="Observation_Activity"></a>Observation Activity</h3> +<p>See how to make generic accessibility to Add Set (Add new flag <code>allowSet</code>)</p></section><section> +<h3><a name="Observation_TargetCatch"></a>Observation TargetCatch</h3> +<ul> + +<li>SPECIES:</li> +</ul> +<p><code>Species filter on trip ocean and within config[speciesList.seine.observation.targetCatch]</code></p></section><section> +<h3><a name="Observation_TargetDiscardCatch"></a>Observation TargetDiscardCatch</h3> +<ul> + +<li>SPECIES:</li> +</ul> +<p><code>Species filter on trip ocean and within config[speciesList.seine.observation.targetCatch]</code></p></section><section> +<h3><a name="Observation_TargetSample"></a>Observation TargetSample</h3> +<ul> + +<li>SPECIES:</li> +</ul> +<p><code>Species filter on all species in Set targetCatches and discarded</code></p> +<ul> + +<li>SIZE_MEASURE_TYPE:</li> +</ul> +<p><code>SizeMeasureType filter on config[sizeMeasureType.seine.observation.targetSample] (LD1 or LF)</code></p></section><section> +<h3><a name="Observation_NonTargetCatchRelease"></a>Observation NonTargetCatchRelease</h3> +<ul> + +<li>SPECIES:</li> +</ul> +<p><code>Species filter on all species in NonTargetCatch where SpeciesGroup within config[speciesGroup.seine.observation.nonTargetCatchRelease]</code></p> +<p>FIXME add it</p></section><section> +<h3><a name="Observation_NonTargetCatch"></a>Observation NonTargetCatch</h3> +<ul> + +<li>SPECIES:</li> +</ul> +<p><code>Species filter on trip ocean and within config[speciesList.seine.observation.nonTargetCatch]</code></p></section><section> +<h3><a name="Observation_NonTargetSample"></a>Observation NonTargetSample</h3> +<ul> + +<li>SPECIES:</li> +</ul> +<p><code>Species filter on NonTargetCatch species</code></p> +<ul> + +<li>SPECIES_FATE:</li> +</ul> +<p><code>SpeciesFate filter on NonTargetCatch species fate</code></p></section><section> +<h3><a name="Observation_ObjectSchoolEstimate"></a>Observation ObjectSchoolEstimate</h3> +<ul> + +<li>SPECIES:</li> +</ul> +<p><code>Species filter on config[speciesList.seine.observation.objectSchoolEstimate]</code></p></section><section> +<h3><a name="Observation_SchoolEstimate"></a>Observation SchoolEstimate</h3> +<ul> + +<li>SPECIES:</li> +</ul> +<p><code>Species filter on trip ocean and within config[speciesList.seine.observation.schoolEstimate]</code></p></section><section> +<h3><a name="Observation_ObjectObservedSpecies"></a>Observation ObjectObservedSpecies</h3> +<ul> + +<li>SPECIES:</li> +</ul> +<p><code>Species filter on config[speciesList.seine.observation.objectObservedSpecies]</code></p></section></section><section> +<h2><a name="Longline"></a>Longline</h2><section> +<h3><a name="Common_Trip"></a>Common Trip</h3> +<ul> + +<li>CAPTAIN:</li> +</ul> +<p><code>Person filter on captain flag</code></p> +<ul> + +<li>OBSERVER:</li> +</ul> +<p><code>Person filter on observer flag</code></p> +<ul> + +<li>OBSERVATIONS_DATA_ENTRY_OPERATOR:</li> +</ul> +<p><code>Person filter on dataEntryOperator flag</code></p> +<ul> + +<li>LOGBOOK_DATA_ENTRY_OPERATOR:</li> +</ul> +<p><code>Person filter on dataEntryOperator flag</code></p> +<ul> + +<li>VESSEL:</li> +</ul> +<p><code>Vessel filter on vessel type within config[vesselType.longline.common.trip]</code></p> +<ul> + +<li>SPECIES:</li> +</ul> +<p><code>Species filter on trip ocean and within config[speciesList.longline.common.trip]</code></p></section><section> +<h3><a name="Observation_Activity"></a>Observation Activity</h3> +<p>See how to make generic accessibility to Add Set (Add new flag <code>allowSet</code>)</p></section><section> +<h3><a name="Observation_Catch"></a>Observation Catch</h3> +<ul> + +<li>SPECIES_CATCH:</li> +</ul> +<p><code>Species filter on trip ocean and within config[speciesList.longline.observation.catch]</code></p> +<p>FIXME rename to LlObservationCatchSpeciesId</p> +<ul> + +<li>PREDATOR:</li> +</ul> +<p><code>Species filter on trip ocean and within config[speciesList.longline.depredator]</code></p></section><section> +<h3><a name="Observation_Encounter"></a>Observation Encounter</h3> +<ul> + +<li>SPECIES:</li> +</ul> +<p><code>Species filter on config[speciesList.longline.observation.encounter]</code></p></section><section> +<h3><a name="Observation_Tdr"></a>Observation Tdr</h3> +<ul> + +<li>SPECIES:</li> +</ul> +<p><code>Species filter on trip ocean and within config[speciesList.longline.observation.catch]</code></p></section><section> +<h3><a name="Landing"></a>Landing</h3> +<ul> + +<li>PERSON:</li> +</ul> +<p><code>Person filter on dataSource flag</code></p> +<ul> + +<li>VESSEL:</li> +</ul> +<p><code>Vessel filter on vessel type within config[vesselType.longline.landing]</code></p></section><section> +<h3><a name="LandingPart"></a>LandingPart</h3> +<ul> + +<li>SPECIES:</li> +</ul> +<p><code>Species filter on trip ocean and within config[speciesList.longline.landing]</code></p></section><section> +<h3><a name="Logbook_Activity"></a>Logbook Activity</h3> +<p>See how to make generic accessibility to Add Set (Add new flag <code>allowSet</code>)</p></section><section> +<h3><a name="Logbook_Sample"></a>Logbook Sample</h3> +<ul> + +<li>SPECIES:</li> +</ul> +<p><code>Species filter on trip ocean and within config[speciesList.longline.logbook.sample]</code></p></section><section> +<h3><a name="Logbook_Catch"></a>Logbook Catch</h3> +<ul> + +<li>SPECIES_CATCH:</li> +</ul> +<p><code>Species filter on trip ocean and within config[sepeciesList.longline.logbook.catch]</code></p> +<ul> + +<li>PREDATOR:</li> +</ul> +<p><code>Species filter on trip ocean and within config[sepeciesList.longline.depredator]</code></p></section></section> + </main> + </div> + </div> + <hr/> + <footer> + <div class="container-fluid"> + <div class="row-fluid"> + <p>Copyright © 2008–2020<a href="http://www.ird.fr/">IRD</a>. +.</p> + </div> + </div> + </footer> + </body> +</html> \ No newline at end of file ===================================== synchro-referential.html ===================================== @@ -1,6 +1,6 @@ <!DOCTYPE html>  <html xmlns="http://www.w3.org/1999/xhtml" lang="fr"> @@ -18,7 +18,7 @@ <div class="container-fluid"> <header> <div id="banner"> - <div class="pull-left"><a href="index.html" id="bannerLeft"><img src="./img/logo-small.png" alt="ObServe :: Pom"/></a></div> + <div class="pull-left"><a href="index.html" id="bannerLeft"><img src="./img/logo.png" alt="ObServe :: Pom"/></a></div> <div class="pull-right"><a href="index.html" id="bannerRight"><img src="./img/logo_ird.png" alt="ObServe :: Pom"/></a></div> <div class="clear"><hr/></div> </div> @@ -27,8 +27,8 @@ <ul class="breadcrumb"> <li class=""><a href="https://ultreiaio.gitlab.io/ird-observe/index.html" class="externalLink" title="ObServe :: Pom">ObServe :: Pom</a><span class="divider">»</span></li> <li class="active ">Synchronisation avancée du référentiel</li> - <li id="publishDate" class="pull-right"><span class="divider">|</span> Dernière publication: 2020-05-26</li> - <li id="projectVersion" class="pull-right"><span class="divider">|</span>Version: 7.6.2</li> + <li id="publishDate" class="pull-right"><span class="divider">|</span> Dernière publication: 2020-06-03</li> + <li id="projectVersion" class="pull-right"><span class="divider">|</span>Version: 8.0-RC-7</li> <li class="pull-right"><span class="divider">|</span> <a href="http://ultreia.io" class="externalLink" title="Ultreia.io">Ultreia.io</a></li> <li class="pull-right"><a href="https://gitlab.com/ultreiaio/ird-observe" class="externalLink" title="GitLab">GitLab</a></li> @@ -46,6 +46,7 @@ <li><a href="administration-web.html" title="Administration Web"><span class="none"></span>Administration Web</a></li> <li><a href="https://gitlab.com/ultreiaio/ird-observe/blob/develop/CHANGELOG.md" class="externalLink" title="Historique des versions"><span class="none"></span>Historique des versions</a></li> <li><a href="./config-report.html" title="Configuration"><span class="none"></span>Configuration</a></li> + <li><a href="./referential-filter.html" title="Filtrage des référentiels"><span class="none"></span>Filtrage des référentiels</a></li> <li><a href="./synchro-referential.html" title="Synchronisation référentiel avancée"><span class="none"></span>Synchronisation référentiel avancée</a></li> <li class="nav-header">Modélisation</li> <li><a href="https://gitlab.com/ultreiaio/ird-observe/raw/develop/doc/modelisation/zargo…" class="externalLink" title="Fichier argoUML (commun) v7"><span class="none"></span>Fichier argoUML (commun) v7</a></li> @@ -71,7 +72,7 @@ <div class="clear"></div> <div class="clear"></div> <div class="clear"></div> -<a href="http://jaxx.nuiton.org" title="JAXX" class="builtBy"><img class="builtBy" alt="JAXX" src="./img/jaxx-logo.png" width="120" /></a> +<a href="https://ultreiaio.gitlab.io/jaxx" title="JAXX" class="builtBy"><img class="builtBy" alt="JAXX" src="./img/jaxx-logo.png" width="120" /></a> <a href="http://topia.nuiton.org" title="ToPIA" class="builtBy"><img class="builtBy" alt="ToPIA" src="./img/topia-logo.png" width="120" /></a> <a href="http://argouml.tigris.org/" title="ArgoUML" class="builtBy"><img class="builtBy" alt="ArgoUML" src="./img/argouml-logo.png" width="120" /></a> </div> View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/commit/6a0ddd6e93ea3a689a1def4a6… -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/commit/6a0ddd6e93ea3a689a1def4a6… You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-observe][develop] Change to version 8.0.0
by Tony CHEMIT 03 Jun '20

03 Jun '20

Tony CHEMIT pushed to branch develop at ultreiaio / ird-observe Commits: 7b136730 by Tony Chemit at 2020-06-03T15:31:45+02:00 Change to version 8.0.0 - - - - - 26 changed files: - client-configuration/pom.xml - client-core/pom.xml - client-datasource-actions/pom.xml - client-datasource-editor-api/pom.xml - client-datasource-editor-common/pom.xml - client-datasource-editor-common/src/main/i18n/getters/java.getter - client-datasource-editor-ll/pom.xml - client-datasource-editor-ps/pom.xml - client-runner/pom.xml - dto-spi/pom.xml - dto/pom.xml - observe-i18n/pom.xml - observe/pom.xml - persistence-spi/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-validation/pom.xml - services/pom.xml - test-config/pom.xml - test/pom.xml - validation/pom.xml Changes: ===================================== client-configuration/pom.xml ===================================== @@ -24,7 +24,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>ird-observe</artifactId> - <version>8.0-RC-8-SNAPSHOT</version> + <version>8.0.0-SNAPSHOT</version> </parent> <artifactId>client-configuration</artifactId> ===================================== client-core/pom.xml ===================================== @@ -24,7 +24,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>ird-observe</artifactId> - <version>8.0-RC-8-SNAPSHOT</version> + <version>8.0.0-SNAPSHOT</version> </parent> <artifactId>client-core</artifactId> ===================================== client-datasource-actions/pom.xml ===================================== @@ -24,7 +24,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>ird-observe</artifactId> - <version>8.0-RC-8-SNAPSHOT</version> + <version>8.0.0-SNAPSHOT</version> </parent> <artifactId>client-datasource-actions</artifactId> ===================================== client-datasource-editor-api/pom.xml ===================================== @@ -24,7 +24,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>ird-observe</artifactId> - <version>8.0-RC-8-SNAPSHOT</version> + <version>8.0.0-SNAPSHOT</version> </parent> <artifactId>client-datasource-editor-api</artifactId> ===================================== client-datasource-editor-common/pom.xml ===================================== @@ -24,7 +24,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>ird-observe</artifactId> - <version>8.0-RC-8-SNAPSHOT</version> + <version>8.0.0-SNAPSHOT</version> </parent> <artifactId>client-datasource-editor-common</artifactId> ===================================== client-datasource-editor-common/src/main/i18n/getters/java.getter ===================================== @@ -13,7 +13,6 @@ observe.content.map.export.chooseFile.title observe.content.map.export.success observe.content.map.miles observe.content.map.north -observe.content.map.showLogbook observe.content.map.showObservation observe.content.map.south observe.content.map.west ===================================== client-datasource-editor-ll/pom.xml ===================================== @@ -24,7 +24,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>ird-observe</artifactId> - <version>8.0-RC-8-SNAPSHOT</version> + <version>8.0.0-SNAPSHOT</version> </parent> <artifactId>client-datasource-editor-ll</artifactId> ===================================== client-datasource-editor-ps/pom.xml ===================================== @@ -24,7 +24,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>ird-observe</artifactId> - <version>8.0-RC-8-SNAPSHOT</version> + <version>8.0.0-SNAPSHOT</version> </parent> <artifactId>client-datasource-editor-ps</artifactId> ===================================== client-runner/pom.xml ===================================== @@ -24,7 +24,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>ird-observe</artifactId> - <version>8.0-RC-8-SNAPSHOT</version> + <version>8.0.0-SNAPSHOT</version> </parent> <artifactId>client-runner</artifactId> ===================================== dto-spi/pom.xml ===================================== @@ -25,7 +25,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>ird-observe</artifactId> - <version>8.0-RC-8-SNAPSHOT</version> + <version>8.0.0-SNAPSHOT</version> </parent> <artifactId>dto-spi</artifactId> ===================================== dto/pom.xml ===================================== @@ -25,7 +25,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>ird-observe</artifactId> - <version>8.0-RC-8-SNAPSHOT</version> + <version>8.0.0-SNAPSHOT</version> </parent> <artifactId>dto</artifactId> ===================================== observe-i18n/pom.xml ===================================== @@ -24,7 +24,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>ird-observe</artifactId> - <version>8.0-RC-8-SNAPSHOT</version> + <version>8.0.0-SNAPSHOT</version> </parent> <artifactId>observe-i18n</artifactId> ===================================== observe/pom.xml ===================================== @@ -24,7 +24,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>ird-observe</artifactId> - <version>8.0-RC-8-SNAPSHOT</version> + <version>8.0.0-SNAPSHOT</version> </parent> <artifactId>observe</artifactId> ===================================== persistence-spi/pom.xml ===================================== @@ -24,7 +24,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>ird-observe</artifactId> - <version>8.0-RC-8-SNAPSHOT</version> + <version>8.0.0-SNAPSHOT</version> </parent> <artifactId>persistence-spi</artifactId> ===================================== persistence/pom.xml ===================================== @@ -24,7 +24,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>ird-observe</artifactId> - <version>8.0-RC-8-SNAPSHOT</version> + <version>8.0.0-SNAPSHOT</version> </parent> <artifactId>persistence</artifactId> ===================================== pom.xml ===================================== @@ -29,7 +29,7 @@ <groupId>fr.ird.observe</groupId> <artifactId>ird-observe</artifactId> - <version>8.0-RC-8-SNAPSHOT</version> + <version>8.0.0-SNAPSHOT</version> <packaging>pom</packaging> <name>ObServe :: Pom</name> ===================================== server-configuration/pom.xml ===================================== @@ -24,7 +24,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>ird-observe</artifactId> - <version>8.0-RC-8-SNAPSHOT</version> + <version>8.0.0-SNAPSHOT</version> </parent> <artifactId>server-configuration</artifactId> ===================================== server-core/pom.xml ===================================== @@ -25,7 +25,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>ird-observe</artifactId> - <version>8.0-RC-8-SNAPSHOT</version> + <version>8.0.0-SNAPSHOT</version> </parent> <artifactId>server-core</artifactId> ===================================== server-runner/pom.xml ===================================== @@ -25,7 +25,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>ird-observe</artifactId> - <version>8.0-RC-8-SNAPSHOT</version> + <version>8.0.0-SNAPSHOT</version> </parent> <artifactId>server-runner</artifactId> ===================================== services-client/pom.xml ===================================== @@ -25,7 +25,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>ird-observe</artifactId> - <version>8.0-RC-8-SNAPSHOT</version> + <version>8.0.0-SNAPSHOT</version> </parent> <artifactId>services-client</artifactId> ===================================== services-local/pom.xml ===================================== @@ -25,7 +25,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>ird-observe</artifactId> - <version>8.0-RC-8-SNAPSHOT</version> + <version>8.0.0-SNAPSHOT</version> </parent> <artifactId>services-local</artifactId> ===================================== services-validation/pom.xml ===================================== @@ -25,7 +25,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>ird-observe</artifactId> - <version>8.0-RC-8-SNAPSHOT</version> + <version>8.0.0-SNAPSHOT</version> </parent> <artifactId>services-validation</artifactId> ===================================== services/pom.xml ===================================== @@ -27,7 +27,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>ird-observe</artifactId> - <version>8.0-RC-8-SNAPSHOT</version> + <version>8.0.0-SNAPSHOT</version> </parent> <artifactId>services</artifactId> ===================================== test-config/pom.xml ===================================== @@ -24,7 +24,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>ird-observe</artifactId> - <version>8.0-RC-8-SNAPSHOT</version> + <version>8.0.0-SNAPSHOT</version> </parent> <artifactId>test-config</artifactId> ===================================== test/pom.xml ===================================== @@ -24,7 +24,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>ird-observe</artifactId> - <version>8.0-RC-8-SNAPSHOT</version> + <version>8.0.0-SNAPSHOT</version> </parent> <artifactId>test</artifactId> ===================================== validation/pom.xml ===================================== @@ -24,7 +24,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>ird-observe</artifactId> - <version>8.0-RC-8-SNAPSHOT</version> + <version>8.0.0-SNAPSHOT</version> </parent> <artifactId>validation</artifactId> View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/commit/7b136730abb486c7016b15f40… -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/commit/7b136730abb486c7016b15f40… You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-observe] Deleted branch release/8.0-RC-7
by Tony CHEMIT 03 Jun '20

03 Jun '20

Tony CHEMIT deleted branch release/8.0-RC-7 at ultreiaio / ird-observe -- You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-observe] Pushed new tag v8.0-RC-7
by Tony CHEMIT 03 Jun '20

03 Jun '20

Tony CHEMIT pushed new tag v8.0-RC-7 at ultreiaio / ird-observe -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/tree/v8.0-RC-7 You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-observe][release/8.0-RC-7] [jgitflow-maven-plugin]updating poms for branch'release/8.0-RC-7' with...
by Tony CHEMIT 03 Jun '20

03 Jun '20

Tony CHEMIT pushed to branch release/8.0-RC-7 at ultreiaio / ird-observe Commits: 27d1f81e by Tony Chemit at 2020-06-03T15:12:15+02:00 [jgitflow-maven-plugin]updating poms for branch'release/8.0-RC-7' with non-snapshot versions[skip ci] - - - - - 25 changed files: - client-configuration/pom.xml - client-core/pom.xml - client-datasource-actions/pom.xml - client-datasource-editor-api/pom.xml - client-datasource-editor-common/pom.xml - client-datasource-editor-ll/pom.xml - client-datasource-editor-ps/pom.xml - client-runner/pom.xml - dto-spi/pom.xml - dto/pom.xml - observe-i18n/pom.xml - observe/pom.xml - persistence-spi/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-validation/pom.xml - services/pom.xml - test-config/pom.xml - test/pom.xml - validation/pom.xml Changes: ===================================== client-configuration/pom.xml ===================================== @@ -24,7 +24,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>ird-observe</artifactId> - <version>8.0-RC-7-SNAPSHOT</version> + <version>8.0-RC-7</version> </parent> <artifactId>client-configuration</artifactId> ===================================== client-core/pom.xml ===================================== @@ -24,7 +24,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>ird-observe</artifactId> - <version>8.0-RC-7-SNAPSHOT</version> + <version>8.0-RC-7</version> </parent> <artifactId>client-core</artifactId> ===================================== client-datasource-actions/pom.xml ===================================== @@ -24,7 +24,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>ird-observe</artifactId> - <version>8.0-RC-7-SNAPSHOT</version> + <version>8.0-RC-7</version> </parent> <artifactId>client-datasource-actions</artifactId> ===================================== client-datasource-editor-api/pom.xml ===================================== @@ -24,7 +24,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>ird-observe</artifactId> - <version>8.0-RC-7-SNAPSHOT</version> + <version>8.0-RC-7</version> </parent> <artifactId>client-datasource-editor-api</artifactId> ===================================== client-datasource-editor-common/pom.xml ===================================== @@ -24,7 +24,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>ird-observe</artifactId> - <version>8.0-RC-7-SNAPSHOT</version> + <version>8.0-RC-7</version> </parent> <artifactId>client-datasource-editor-common</artifactId> ===================================== client-datasource-editor-ll/pom.xml ===================================== @@ -24,7 +24,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>ird-observe</artifactId> - <version>8.0-RC-7-SNAPSHOT</version> + <version>8.0-RC-7</version> </parent> <artifactId>client-datasource-editor-ll</artifactId> ===================================== client-datasource-editor-ps/pom.xml ===================================== @@ -24,7 +24,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>ird-observe</artifactId> - <version>8.0-RC-7-SNAPSHOT</version> + <version>8.0-RC-7</version> </parent> <artifactId>client-datasource-editor-ps</artifactId> ===================================== client-runner/pom.xml ===================================== @@ -24,7 +24,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>ird-observe</artifactId> - <version>8.0-RC-7-SNAPSHOT</version> + <version>8.0-RC-7</version> </parent> <artifactId>client-runner</artifactId> ===================================== dto-spi/pom.xml ===================================== @@ -25,7 +25,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>ird-observe</artifactId> - <version>8.0-RC-7-SNAPSHOT</version> + <version>8.0-RC-7</version> </parent> <artifactId>dto-spi</artifactId> ===================================== dto/pom.xml ===================================== @@ -25,7 +25,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>ird-observe</artifactId> - <version>8.0-RC-7-SNAPSHOT</version> + <version>8.0-RC-7</version> </parent> <artifactId>dto</artifactId> ===================================== observe-i18n/pom.xml ===================================== @@ -24,7 +24,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>ird-observe</artifactId> - <version>8.0-RC-7-SNAPSHOT</version> + <version>8.0-RC-7</version> </parent> <artifactId>observe-i18n</artifactId> ===================================== observe/pom.xml ===================================== @@ -24,7 +24,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>ird-observe</artifactId> - <version>8.0-RC-7-SNAPSHOT</version> + <version>8.0-RC-7</version> </parent> <artifactId>observe</artifactId> ===================================== persistence-spi/pom.xml ===================================== @@ -24,7 +24,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>ird-observe</artifactId> - <version>8.0-RC-7-SNAPSHOT</version> + <version>8.0-RC-7</version> </parent> <artifactId>persistence-spi</artifactId> ===================================== persistence/pom.xml ===================================== @@ -24,7 +24,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>ird-observe</artifactId> - <version>8.0-RC-7-SNAPSHOT</version> + <version>8.0-RC-7</version> </parent> <artifactId>persistence</artifactId> ===================================== pom.xml ===================================== @@ -29,7 +29,7 @@ <groupId>fr.ird.observe</groupId> <artifactId>ird-observe</artifactId> - <version>8.0-RC-7-SNAPSHOT</version> + <version>8.0-RC-7</version> <packaging>pom</packaging> <name>ObServe :: Pom</name> ===================================== server-configuration/pom.xml ===================================== @@ -24,7 +24,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>ird-observe</artifactId> - <version>8.0-RC-7-SNAPSHOT</version> + <version>8.0-RC-7</version> </parent> <artifactId>server-configuration</artifactId> ===================================== server-core/pom.xml ===================================== @@ -25,7 +25,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>ird-observe</artifactId> - <version>8.0-RC-7-SNAPSHOT</version> + <version>8.0-RC-7</version> </parent> <artifactId>server-core</artifactId> ===================================== server-runner/pom.xml ===================================== @@ -25,7 +25,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>ird-observe</artifactId> - <version>8.0-RC-7-SNAPSHOT</version> + <version>8.0-RC-7</version> </parent> <artifactId>server-runner</artifactId> ===================================== services-client/pom.xml ===================================== @@ -25,7 +25,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>ird-observe</artifactId> - <version>8.0-RC-7-SNAPSHOT</version> + <version>8.0-RC-7</version> </parent> <artifactId>services-client</artifactId> ===================================== services-local/pom.xml ===================================== @@ -25,7 +25,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>ird-observe</artifactId> - <version>8.0-RC-7-SNAPSHOT</version> + <version>8.0-RC-7</version> </parent> <artifactId>services-local</artifactId> ===================================== services-validation/pom.xml ===================================== @@ -25,7 +25,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>ird-observe</artifactId> - <version>8.0-RC-7-SNAPSHOT</version> + <version>8.0-RC-7</version> </parent> <artifactId>services-validation</artifactId> ===================================== services/pom.xml ===================================== @@ -27,7 +27,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>ird-observe</artifactId> - <version>8.0-RC-7-SNAPSHOT</version> + <version>8.0-RC-7</version> </parent> <artifactId>services</artifactId> ===================================== test-config/pom.xml ===================================== @@ -24,7 +24,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>ird-observe</artifactId> - <version>8.0-RC-7-SNAPSHOT</version> + <version>8.0-RC-7</version> </parent> <artifactId>test-config</artifactId> ===================================== test/pom.xml ===================================== @@ -24,7 +24,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>ird-observe</artifactId> - <version>8.0-RC-7-SNAPSHOT</version> + <version>8.0-RC-7</version> </parent> <artifactId>test</artifactId> ===================================== validation/pom.xml ===================================== @@ -24,7 +24,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>ird-observe</artifactId> - <version>8.0-RC-7-SNAPSHOT</version> + <version>8.0-RC-7</version> </parent> <artifactId>validation</artifactId> View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/commit/27d1f81ea933fba85ebf81fa3… -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/commit/27d1f81ea933fba85ebf81fa3… You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-observe][master] 43 commits: [jgitflow-maven-plugin]updating poms for 8.0-RC-7-SNAPSHOT development[skip ci]
by Tony CHEMIT 03 Jun '20

03 Jun '20

Tony CHEMIT pushed to branch master at ultreiaio / ird-observe Commits: e8b17b90 by tchemit at 2020-04-18T10:46:23+02:00 [jgitflow-maven-plugin]updating poms for 8.0-RC-7-SNAPSHOT development[skip ci] - - - - - a3a58584 by tchemit at 2020-04-18T10:55:06+02:00 [jgitflow-maven-plugin]updating develop poms to master versions to avoid merge conflicts[skip ci] - - - - - 470f585a by tchemit at 2020-04-18T10:55:06+02:00 [jgitflow-maven-plugin]merging 'master' into 'develop' - - - - - db2683bc by tchemit at 2020-04-18T10:55:07+02:00 [jgitflow-maven-plugin]Updating develop poms back to pre merge state[skip ci] - - - - - 32b2d2ca by tchemit at 2020-04-18T11:12:13+02:00 improve ci - - - - - de1041b9 by Tony Chemit at 2020-05-10T08:57:07+02:00 update pom - - - - - 110d6cd0 by Tony Chemit at 2020-05-10T08:57:09+02:00 Fichiers de traductions manquants - Closes #1478 - - - - - dd5eadd9 by Tony Chemit at 2020-05-10T08:57:09+02:00 Absence du gestionnaire de connexions - Closes #1476 - - - - - f47515ed by Tony Chemit at 2020-05-10T11:14:02+02:00 Dans le gestionnaire de connexions, un bouton 'dupliquer le profil' serait pratique - Closes #1477 - - - - - c4485e34 by Tony Chemit at 2020-05-10T11:50:51+02:00 Quelques améliorations dans le gestionnaire de connexion - Closes #1479 - - - - - 033aecf1 by Tony Chemit at 2020-05-10T11:50:52+02:00 L'écran de gestion des connexions pourrait être présenté en partage horizontal - Closes #1480 - - - - - f1aa53a0 by Tony Chemit at 2020-05-10T11:50:52+02:00 UI référentiel liste d'affichage d'espèces non classée - Closes #1474 - - - - - 3183afba by Tony Chemit at 2020-05-10T11:50:52+02:00 simplify how to deploy demo war - - - - - 34f5d1f4 by Tony Chemit at 2020-05-10T23:36:39+02:00 Comportement sidérant d'H2 - Closes #1463 - - - - - 6fc013e0 by Tony Chemit at 2020-05-12T12:00:18+02:00 remove bad unsued imports (breaks java 11 build) - - - - - 4577d39a by Tony Chemit at 2020-05-12T12:00:35+02:00 now build with java 11 image - - - - - c0682285 by Tony Chemit at 2020-05-12T12:20:16+02:00 Use last pom (to use java 11) - - - - - b6d281e9 by Tony Chemit at 2020-05-12T14:14:57+02:00 improve ci jobs tags - - - - - 4e7dc5b7 by Tony Chemit at 2020-05-12T14:18:07+02:00 improve ci jobs tags (remove them!) - - - - - cb0ab1b3 by Tony Chemit at 2020-05-12T17:38:05+02:00 Les assistants create, update, update-security (et drop ?) devraient exiger que le compte fourni soit superuser - Closes #1481 - - - - - 27f5f925 by Tony Chemit at 2020-05-15T09:38:16+02:00 Impossible d'éditer un référentiel :( - Closes #1486 - - - - - 93b95077 by Tony Chemit at 2020-05-15T11:01:52+02:00 Ne pas sauvegarder automatiquement la base locale lors d'une action longue - Close #1487 - - - - - 1ae23adb by Tony Chemit at 2020-05-15T11:15:21+02:00 [SYNCHRO MAREES] L'assistant demande un remplacement de code manquant, même si celui-ci n'est pas utilisé par les données (Improve generator code) - See #1432 - - - - - b3e8d3f6 by Tony Chemit at 2020-05-15T11:17:06+02:00 [SYNCHRO MAREES] L'assistant demande un remplacement de code manquant, même si celui-ci n'est pas utilisé par les données (Use usage service (do not take account of modification of referential inside antoher referential) - See #1432 - - - - - 06d206c7 by Tony Chemit at 2020-05-15T12:42:46+02:00 Only generate templates when model is init. - - - - - 4557a0e8 by Tony Chemit at 2020-05-17T20:43:11+02:00 [SYNCHRO MAREES] L'assistant demande un remplacement de code manquant, même si celui-ci n'est pas utilisé par les données - Closes #1432 (Rethink Usage support from topia-extension) - - - - - 43d79e6a by Tony Chemit at 2020-05-17T20:43:11+02:00 fix if parent file is null (should find out how does that happens) - - - - - 8e064dac by Tony Chemit at 2020-05-18T11:44:45+02:00 Version de base dans tms_version - Closes #1485 - - - - - 30d8a319 by Tony Chemit at 2020-05-21T08:11:32+02:00 La suppression d'une marée pourrait être permise même si le formulaire n'est pas parfaitement conforme - Closes #1482 - - - - - 7ca788e7 by Tony Chemit at 2020-05-21T14:16:47+02:00 update changelog [skip ci] - - - - - 3c6f6c90 by Tony Chemit at 2020-05-21T14:20:04+02:00 First flush of better local data source error handling at closing, or loading - - - - - d1554b7b by Tony Chemit at 2020-05-23T13:52:09+02:00 Nom et version de l'application Web - Closes #1490 - - - - - 58fcf955 by Tony Chemit at 2020-05-23T14:02:19+02:00 Erreur migration base centrale 7.3 -> 7.6 - Closes #1489 - - - - - 4e5bf0b5 by Tony Chemit at 2020-05-23T14:13:53+02:00 update changed [skip ci] - - - - - 67f119df by Tony Chemit at 2020-05-26T14:06:14+02:00 Migration des trip.comment vers trip.homeid incorrecte - Closes #1492 - - - - - 9e222809 by Tony Chemit at 2020-05-26T14:06:16+02:00 update changed [skip ci] - - - - - 8ffde8fd by Tony Chemit at 2020-05-26T14:31:02+02:00 update pom - - - - - 5c24fb35 by Tony Chemit at 2020-06-03T14:16:32+02:00 Reprise après corruption de base locale - Closes #1447 - - - - - 9354d060 by Tony Chemit at 2020-06-03T14:27:12+02:00 update changelog [skip ci] - - - - - 5e036e45 by Tony Chemit at 2020-06-03T14:59:19+02:00 update pom - - - - - 5d5a4af2 by Tony Chemit at 2020-06-03T15:11:55+02:00 [jgitflow-maven-plugin]updating poms for 8.0-RC-7 branch with snapshot versions[skip ci] - - - - - 27d1f81e by Tony Chemit at 2020-06-03T15:12:15+02:00 [jgitflow-maven-plugin]updating poms for branch'release/8.0-RC-7' with non-snapshot versions[skip ci] - - - - - 348dff15 by Tony Chemit at 2020-06-03T15:18:42+02:00 [jgitflow-maven-plugin]merging 'release/8.0-RC-7' into 'master' - - - - - 30 changed files: - .gitlab-ci.yml - CHANGELOG.md - client-configuration/pom.xml - client-configuration/src/main/config/Client.ini - client-configuration/src/main/i18n/getters/config.getter - client-configuration/src/main/java/fr/ird/observe/client/configuration/ClientConfig.java - client-configuration/src/main/resources/observe-log4j2.xml - client-core/pom.xml - client-core/src/main/i18n/getters/java.getter - + client-core/src/main/i18n/templates/initStorage_en_GB.ftl - + client-core/src/main/i18n/templates/initStorage_es_ES.ftl - + client-core/src/main/i18n/templates/initStorage_fr_FR.ftl - + client-core/src/main/java/fr/ird/observe/client/action/api/ActionContext.java - + client-core/src/main/java/fr/ird/observe/client/action/api/ActionStep.java - + client-core/src/main/java/fr/ird/observe/client/action/api/ActionStepInputState.java - + client-core/src/main/java/fr/ird/observe/client/action/api/ActionStepOutputState.java - + client-core/src/main/java/fr/ird/observe/client/action/api/ActionWithSteps.java - + client-core/src/main/java/fr/ird/observe/client/action/api/FeedBackBuilder.java - client-core/src/main/java/fr/ird/observe/client/datasource/api/ObserveSwingDataSource.java - client-core/src/main/java/fr/ird/observe/client/main/MainUIModel.java - client-core/src/main/java/fr/ird/observe/client/main/ObserveMainUI.jaxx - client-core/src/main/java/fr/ird/observe/client/main/ObserveMainUI.jcss - + client-core/src/main/java/fr/ird/observe/client/main/actions/OpenLastFeedBackAction.java - client-core/src/main/java/fr/ird/observe/client/main/body/ClientConfigUI.java - client-core/src/main/java/fr/ird/observe/client/util/ObserveKeyStrokesSupport.java - client-core/src/main/resources/fr/ird/observe/client/ui/ObserveCommon.jcss - client-datasource-actions/pom.xml - client-datasource-actions/src/main/java/fr/ird/observe/client/datasource/actions/AdminUIHandler.java - client-datasource-actions/src/main/java/fr/ird/observe/client/datasource/actions/longline/pairing/tree/ActivityLonglinePairingTreeTableModel.java - client-datasource-actions/src/main/java/fr/ird/observe/client/datasource/actions/save/SaveLocalModel.java The diff was not included because it is too large. View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/compare/3319d524b9ada195f7b76e5b… -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/compare/3319d524b9ada195f7b76e5b… You're receiving this email because of your account on gitlab.com.

1 0