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

[Git][ultreiaio/ird-observe][develop] update changelog [skip ci]
by Tony CHEMIT 22 Jun '20

22 Jun '20

Tony CHEMIT pushed to branch develop at ultreiaio / ird-observe Commits: c71281ce by Tony Chemit at 2020-06-22T19:15:49+02:00 update changelog [skip ci] - - - - - 1 changed file: - CHANGELOG.md Changes: ===================================== CHANGELOG.md ===================================== @@ -1,7 +1,7 @@ # ObServe changelog * Author [Tony Chemit](mailto:dev@tchemit.fr) - * Last generated at 2020-06-03 14:26. + * Last generated at 2020-06-22 19:14. ## Version [8.0-RC-7](https://gitlab.com/ultreiaio/ird-observe/milestones/161) @@ -235,6 +235,16 @@ * [[Evolution 1181]](https://gitlab.com/ultreiaio/ird-observe/issues/1181) **Ajouter un champ vessel.lloydid** (Thanks to Tony CHEMIT) (Reported by Pascal Cauquil) * [[Evolution 1183]](https://gitlab.com/ultreiaio/ird-observe/issues/1183) **[V8][DATA MODEL] Transformer Vessel.fleetcountry (int4) en topiaid** (Thanks to Tony CHEMIT) (Reported by Pascal Cauquil) +## Version [7.6.3](https://gitlab.com/ultreiaio/ird-observe/milestones/165) + +**Closed at 2020-06-22.** + + +### Issues + * [[Anomalie 1494]](https://gitlab.com/ultreiaio/ird-observe/issues/1494) **LL / Opération de pêche / Composition globale / Avançons / Longueur bas de ligne : ce champ était facultatif et est devenu obligatoire** (Thanks to Tony CHEMIT) (Reported by Pascal Cauquil) + * [[Anomalie 1530]](https://gitlab.com/ultreiaio/ird-observe/issues/1530) **[LL] Activité, Capture, Enregistreur de profondeur Le raccourci clavier MAJ+TAB (focus arrière) ne fonctionne plus** (Thanks to Tony CHEMIT) (Reported by Tony CHEMIT) + * [[Evolution 1528]](https://gitlab.com/ultreiaio/ird-observe/issues/1528) **[PS] Rappel de la dernière espèce utilisée dans la saisie des échantillons non cible** (Thanks to Pascal Cauquil) (Reported by Pascal Cauquil) + ## Version [7.6.2](https://gitlab.com/ultreiaio/ird-observe/milestones/164) **Closed at 2020-05-26.** View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/commit/c71281ce7807243daeaa7d9e7… -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/commit/c71281ce7807243daeaa7d9e7… You're receiving this email because of your account on gitlab.com.

1 0

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

22 Jun '20

Tony CHEMIT pushed to branch develop at ultreiaio / ird-observe Commits: 430861f4 by Tony Chemit at 2020-06-22T19:07:10+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-datasource-editor-ps/src/main/java/fr/ird/observe/client/datasource/editor/content/data/ps/observation/NonTargetSampleUIHandler.java Changes: ===================================== client-datasource-editor-ps/src/main/java/fr/ird/observe/client/datasource/editor/content/data/ps/observation/NonTargetSampleUIHandler.java ===================================== @@ -220,36 +220,71 @@ public class NonTargetSampleUIHandler extends AbstractSampleUIHandler<NonTargetS SpeciesReference species = bean.getSpecies(); log.debug(prefix + "selected species " + species); - List<SpeciesReference> availableEspeces; + 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().getReferenceCache().getReferentialReferences(NonTargetLengthDto.PROPERTY_SPECIES); - // on utilise le code par defaut de l'espèce - sizeMeasureType = getSpeciesDefaultSizeMeasureType(species); - ui.getModel().setDefaultSizeMeasureType(sizeMeasureType.orElse(null)); - requestFocus = ui.getSpecies(); + + availableSpecies = getModel().getReferenceCache().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(); + } + + // use default size measure type + ui.getModel().setDefaultSizeMeasureType(defaultSizeMeasureType.orElse(null)); + } 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 = Collections.singletonList(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(availableSpecies); + if (species != null) { + log.info(String.format("Will set species : %s", species)); + ui.getSpecies().setSelectedItem(null); + ui.getSpecies().setSelectedItem(species); + } - ui.getSpecies().setData(availableEspeces); setFormFocusOwner(requestFocus); tableEditBean.addPropertyChangeListener(NonTargetLengthDto.PROPERTY_WEIGHT, weightChanged); @@ -382,6 +417,10 @@ public class NonTargetSampleUIHandler extends AbstractSampleUIHandler<NonTargetS } } + private void updateAcquisitionMode0(AcquisitionMode acquisitionMode) { + ui.getAcquisitionModeGroup().setSelectedValue(null); + ui.getAcquisitionModeGroup().setSelectedValue(acquisitionMode); + } } View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/commit/430861f4d7044283bf1010812… -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/commit/430861f4d7044283bf1010812… You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-observe][develop] [LL] Activité, Capture, Enregistreur de profondeur Le raccourci clavier...
by Tony CHEMIT 22 Jun '20

22 Jun '20

Tony CHEMIT pushed to branch develop at ultreiaio / ird-observe Commits: e820ba0b by Tony Chemit at 2020-06-22T18:50:37+02:00 [LL] Activité, Capture, Enregistreur de profondeur Le raccourci clavier MAJ+TAB (focus arrière) ne fonctionne plus - Closes #1530 - - - - - 30 changed files: - client-configuration/src/main/resources/observe-log4j2.xml - client-core/pom.xml - client-core/src/main/java/fr/ird/observe/client/datasource/api/ObserveDataSourcesManager.java - client-core/src/main/java/fr/ird/observe/client/main/body/ClientConfigUI.java - client-core/src/main/java/fr/ird/observe/client/util/JaxxObjectInitializer.java - client-core/src/main/java/fr/ird/observe/client/util/UIHelper.java - client-core/src/main/java/fr/ird/observe/client/util/treetable/BeanFilterableComboBoxCellEditor.java → client-core/src/main/java/fr/ird/observe/client/util/treetable/JaxxComboBoxCellEditor.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/longline/pairing/tree/ActivityLonglinePairingTreeTable.java - client-datasource-actions/src/main/java/fr/ird/observe/client/datasource/actions/report/ReportUIHandler.java - client-datasource-editor-api/pom.xml - client-datasource-editor-api/src/main/java/fr/ird/observe/client/datasource/editor/content/ContentUIInitializer.java - client-datasource-editor-api/src/main/java/fr/ird/observe/client/datasource/editor/content/data/open/actions/MoveSingleActionSupport.java - client-datasource-editor-api/src/main/java/fr/ird/observe/client/datasource/editor/content/ref/usage/UsageForDeleteUI.jaxx - client-datasource-editor-api/src/main/java/fr/ird/observe/client/datasource/editor/content/ref/usage/UsageForDeleteUIHandler.java - client-datasource-editor-api/src/main/java/fr/ird/observe/client/datasource/editor/content/ref/usage/UsageForDesactivateUI.jaxx - client-datasource-editor-api/src/main/java/fr/ird/observe/client/datasource/editor/content/ref/usage/UsageForDesactivateUIHandler.java - client-datasource-editor-api/src/main/java/fr/ird/observe/client/datasource/editor/content/ref/usage/UsageForDisplayUIHandler.java - client-datasource-editor-api/src/main/java/fr/ird/observe/client/datasource/editor/content/ref/usage/UsageUIHandlerSupport.java - client-datasource-editor-api/src/main/java/fr/ird/observe/client/datasource/editor/content/spi/ContentUIReferenceCache.java - client-datasource-editor-api/src/main/java/fr/ird/observe/client/datasource/editor/content/ui/ObserveLayoutFocusTraversalPolicy.java - client-datasource-editor-common/pom.xml - client-datasource-editor-common/src/main/i18n/getters/java.getter - client-datasource-editor-common/src/main/java/fr/ird/observe/client/datasource/editor/content/ref/common/GearCaracteristicUI.jaxx - client-datasource-editor-common/src/main/java/fr/ird/observe/client/datasource/editor/content/ref/common/HarbourUI.jaxx - client-datasource-editor-common/src/main/java/fr/ird/observe/client/datasource/editor/content/ref/common/LengthLengthParameterUI.jaxx - client-datasource-editor-common/src/main/java/fr/ird/observe/client/datasource/editor/content/ref/common/LengthWeightParameterUI.jaxx - client-datasource-editor-common/src/main/java/fr/ird/observe/client/datasource/editor/content/ref/common/OrganismUI.jaxx - client-datasource-editor-common/src/main/java/fr/ird/observe/client/datasource/editor/content/ref/common/PersonUI.jaxx The diff was not included because it is too large. View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/commit/e820ba0b43dd66eb2d6b4bcc7… -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/commit/e820ba0b43dd66eb2d6b4bcc7… 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 22 Jun '20

22 Jun '20

Tony CHEMIT pushed to branch pages at ultreiaio / ird-observe Commits: 2ac3715a by 166231 at 2020-06-22T16:01:23+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.png" alt="ObServe :: Pom"/></a></div> + <div class="pull-left"><a href="index.html" id="bannerLeft"><img src="./img/logo-small.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-06-03</li> - <li id="projectVersion" class="pull-right"><span class="divider">|</span>Version: 8.0-RC-7</li> + <li id="publishDate" class="pull-right"><span class="divider">|</span> Dernière publication: 2020-06-22</li> + <li id="projectVersion" class="pull-right"><span class="divider">|</span>Version: 7.6.3</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,7 +46,6 @@ <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> @@ -72,7 +71,7 @@ <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://jaxx.nuiton.org" 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> @@ -103,8 +102,8 @@ <div class="source"><pre class="prettyprint linenums"> /var/local/observeweb/{contextPath} |-- databases.yml # configuration des bases de données |-- log - | `-- observeweb-8.0-RC-7.log # logs de l'application - |-- observeweb-log4j.conf # configuration des logs + | `-- observeweb-7.6.3.log # logs de l'application + |-- observeweb-log4j2.xml # configuration des logs |-- temp # répertoire temporaire `-- users.yml # configuration des utilisateurs </pre></div></div> @@ -191,13 +190,6 @@ <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.png" alt="ObServe :: Pom"/></a></div> + <div class="pull-left"><a href="index.html" id="bannerLeft"><img src="./img/logo-small.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-06-03</li> - <li id="projectVersion" class="pull-right"><span class="divider">|</span>Version: 8.0-RC-7</li> + <li id="publishDate" class="pull-right"><span class="divider">|</span> Dernière publication: 2020-06-22</li> + <li id="projectVersion" class="pull-right"><span class="divider">|</span>Version: 7.6.3</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,7 +46,6 @@ <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> @@ -72,7 +71,7 @@ <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://jaxx.nuiton.org" 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,10 +9,12 @@ 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 ===================================== Binary files /dev/null and b/img/logo-small.png 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.png" alt="ObServe :: Pom"/></a></div> + <div class="pull-left"><a href="index.html" id="bannerLeft"><img src="./img/logo-small.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-06-03</li> - <li id="projectVersion" class="pull-right"><span class="divider">|</span>Version: 8.0-RC-7</li> + <li id="publishDate" class="pull-right"><span class="divider">|</span> Dernière publication: 2020-06-22</li> + <li id="projectVersion" class="pull-right"><span class="divider">|</span>Version: 7.6.3</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,7 +46,6 @@ <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> @@ -88,7 +87,7 @@ <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://jaxx.nuiton.org" 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.png" alt="ObServe :: Pom"/></a></div> + <div class="pull-left"><a href="index.html" id="bannerLeft"><img src="./img/logo-small.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-06-03</li> - <li id="projectVersion" class="pull-right"><span class="divider">|</span>Version: 8.0-RC-7</li> + <li id="publishDate" class="pull-right"><span class="divider">|</span> Dernière publication: 2020-06-22</li> + <li id="projectVersion" class="pull-right"><span class="divider">|</span>Version: 7.6.3</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,7 +46,6 @@ <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> @@ -72,7 +71,7 @@ <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://jaxx.nuiton.org" 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.png" alt="ObServe :: Pom"/></a></div> + <div class="pull-left"><a href="index.html" id="bannerLeft"><img src="./img/logo-small.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-06-03</li> - <li id="projectVersion" class="pull-right"><span class="divider">|</span>Version: 8.0-RC-7</li> + <li id="publishDate" class="pull-right"><span class="divider">|</span> Dernière publication: 2020-06-22</li> + <li id="projectVersion" class="pull-right"><span class="divider">|</span>Version: 7.6.3</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,7 +46,6 @@ <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> @@ -72,7 +71,7 @@ <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://jaxx.nuiton.org" 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 deleted ===================================== @@ -1,280 +0,0 @@ -<!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.png" alt="ObServe :: Pom"/></a></div> + <div class="pull-left"><a href="index.html" id="bannerLeft"><img src="./img/logo-small.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-06-03</li> - <li id="projectVersion" class="pull-right"><span class="divider">|</span>Version: 8.0-RC-7</li> + <li id="publishDate" class="pull-right"><span class="divider">|</span> Dernière publication: 2020-06-22</li> + <li id="projectVersion" class="pull-right"><span class="divider">|</span>Version: 7.6.3</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,7 +46,6 @@ <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> @@ -72,7 +71,7 @@ <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://jaxx.nuiton.org" 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/2ac3715ac199d34980e780d55… -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/commit/2ac3715ac199d34980e780d55… You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-observe] Deleted branch release/7.6.3
by Tony CHEMIT 22 Jun '20

22 Jun '20

Tony CHEMIT deleted branch release/7.6.3 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 v7.6.3
by Tony CHEMIT 22 Jun '20

22 Jun '20

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

1 0

[Git][ultreiaio/ird-observe][release/7.6.3] [jgitflow-maven-plugin]updating poms for branch'release/7.6.3' with non-snapshot versions[skip ci]
by Tony CHEMIT 22 Jun '20

22 Jun '20

Tony CHEMIT pushed to branch release/7.6.3 at ultreiaio / ird-observe Commits: 02a9f88f by Tony Chemit at 2020-06-22T16:57:07+02:00 [jgitflow-maven-plugin]updating poms for branch'release/7.6.3' with non-snapshot versions[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.3</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.3</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.3</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.3</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.3</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.3</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.3</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.3</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.3</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.3</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.3</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.3</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.3</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.3</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.3</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.3</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.3</version> </parent> <artifactId>validation</artifactId> View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/commit/02a9f88f156b22c452647b417… -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/commit/02a9f88f156b22c452647b417… You're receiving this email because of your account on gitlab.com.

1 0

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

22 Jun '20

Tony CHEMIT pushed to branch master-7.x at ultreiaio / ird-observe Commits: 5dc95d40 by Tony Chemit at 2020-05-26T11:21:35+02:00 [jgitflow-maven-plugin]updating poms for 7.6.3-SNAPSHOT development[skip ci] - - - - - eb421cf4 by Tony Chemit at 2020-05-26T11:31:20+02:00 [jgitflow-maven-plugin]updating develop poms to master versions to avoid merge conflicts[skip ci] - - - - - 4c106017 by Tony Chemit at 2020-05-26T11:31:20+02:00 [jgitflow-maven-plugin]merging 'master-7.x' into 'develop-7.x' - - - - - 90635d4a by Tony Chemit at 2020-05-26T11:31:21+02:00 [jgitflow-maven-plugin]Updating develop poms back to pre merge state[skip ci] - - - - - 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 - - - - - 02a9f88f by Tony Chemit at 2020-06-22T16:57:07+02:00 [jgitflow-maven-plugin]updating poms for branch'release/7.6.3' with non-snapshot versions[skip ci] - - - - - ea5d6752 by Tony Chemit at 2020-06-22T17:15:30+02:00 [jgitflow-maven-plugin]merging 'release/7.6.3' into 'master-7.x' - - - - - 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/5709e42f45c4c74bc44981c5… -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/compare/5709e42f45c4c74bc44981c5… You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-observe][develop-7.x] 5 commits: [jgitflow-maven-plugin]updating poms for branch'release/7.6.3' with non-snapshot versions[skip ci]
by Tony CHEMIT 22 Jun '20

22 Jun '20

Tony CHEMIT pushed to branch develop-7.x at ultreiaio / ird-observe Commits: 02a9f88f by Tony Chemit at 2020-06-22T16:57:07+02:00 [jgitflow-maven-plugin]updating poms for branch'release/7.6.3' with non-snapshot versions[skip ci] - - - - - ea5d6752 by Tony Chemit at 2020-06-22T17:15:30+02:00 [jgitflow-maven-plugin]merging 'release/7.6.3' into 'master-7.x' - - - - - ba13c2ae by Tony Chemit at 2020-06-22T17:15:32+02:00 [jgitflow-maven-plugin]updating develop poms to master versions to avoid merge conflicts[skip ci] - - - - - cc6c62b1 by Tony Chemit at 2020-06-22T17:15:32+02:00 [jgitflow-maven-plugin]merging 'master-7.x' into 'develop-7.x' - - - - - ee51e70a by Tony Chemit at 2020-06-22T17:15:32+02:00 [jgitflow-maven-plugin]Updating develop poms back to pre merge state[skip ci] - - - - - 0 changed files: Changes: View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/compare/d1d3eb1a0c17e90f0265012d… -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/compare/d1d3eb1a0c17e90f0265012d… You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-observe] Pushed new branch release/7.6.3
by Tony CHEMIT 22 Jun '20

22 Jun '20

Tony CHEMIT pushed new branch release/7.6.3 at ultreiaio / ird-observe -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/tree/release/7.6.3 You're receiving this email because of your account on gitlab.com.

1 0