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

[Git][ultreiaio/ird-observe][develop] Enregistrement de FOB -> chagement d'onglet intempestif - Closes #1505
by Tony CHEMIT 24 Jun '20

24 Jun '20

Tony CHEMIT pushed to branch develop at ultreiaio / ird-observe Commits: a76c2911 by Tony Chemit at 2020-06-24T19:04:50+02:00 Enregistrement de FOB -> chagement d'onglet intempestif - Closes #1505 - - - - - 5 changed files: - client-datasource-editor-api/src/main/java/fr/ird/observe/client/datasource/editor/content/ContentUIHandler.java - client-datasource-editor-api/src/main/java/fr/ird/observe/client/datasource/editor/content/data/edit/ContentEditUI.jaxx - client-datasource-editor-api/src/main/java/fr/ird/observe/client/datasource/editor/content/data/edit/actions/SaveActionSupport.java - client-datasource-editor-api/src/main/java/fr/ird/observe/client/datasource/editor/content/data/open/ContentOpenableUI.jaxx - client-datasource-editor-api/src/main/java/fr/ird/observe/client/datasource/editor/content/ref/ContentReferenceUI.jaxx Changes: ===================================== client-datasource-editor-api/src/main/java/fr/ird/observe/client/datasource/editor/content/ContentUIHandler.java ===================================== @@ -459,7 +459,14 @@ public abstract class ContentUIHandler<U extends ContentUI> implements ObserveSe // dettach all validators uninstallValidators(); } - + public void resetFromPreviousUi(U ui) { + if (tabbedPaneValidator != null) { + JTabbedPane mainTabbedPane = (JTabbedPane) ui.getObjectById(JaxxObjectInitializer.MAIN_TABBED_PANE); + if (mainTabbedPane != null) { + SwingUtilities.invokeLater(() -> ((JTabbedPane) this.ui.getObjectById(JaxxObjectInitializer.MAIN_TABBED_PANE)).setSelectedIndex((mainTabbedPane).getSelectedIndex())); + } + } + } final void destroyUI() { if (ui == null) { return; ===================================== client-datasource-editor-api/src/main/java/fr/ird/observe/client/datasource/editor/content/data/edit/ContentEditUI.jaxx ===================================== @@ -42,6 +42,10 @@ @Override public abstract ObserveSwingValidator<D> getValidator(); +public void resetFromPreviousUi(U previousUi) { + getHandler().resetFromPreviousUi(previousUi); +} + ]]> </script> ===================================== client-datasource-editor-api/src/main/java/fr/ird/observe/client/datasource/editor/content/data/edit/actions/SaveActionSupport.java ===================================== @@ -24,6 +24,7 @@ package fr.ird.observe.client.datasource.editor.content.data.edit.actions; import fr.ird.observe.client.datasource.api.ObserveDataSourcesManagerApplicationComponent; import fr.ird.observe.client.datasource.editor.content.ContentMode; +import fr.ird.observe.client.datasource.editor.content.ContentUI; import fr.ird.observe.client.datasource.editor.content.actions.ContentUIActionSupport; import fr.ird.observe.client.datasource.editor.content.data.edit.ContentEditUI; import fr.ird.observe.client.datasource.editor.content.data.edit.ContentEditUIModel; @@ -116,6 +117,9 @@ public abstract class SaveActionSupport<D extends DataDto, R extends DataDtoRefe // on sélectionne le nouveau noeud tree.selectSafeNode(node); + @SuppressWarnings({"RedundantExplicitVariableType", "unchecked"}) U newUi = (U) getDataSourceEditor().getContentUIManager().getSelectedContentUI(); + newUi.resetFromPreviousUi(ui); + } else { // on repaint le noeud et ses enfants ===================================== client-datasource-editor-api/src/main/java/fr/ird/observe/client/datasource/editor/content/data/open/ContentOpenableUI.jaxx ===================================== @@ -43,6 +43,10 @@ @Override public abstract ObserveSwingValidator<D> getValidator(); +public void resetFromPreviousUi(U previousUi) { + getHandler().resetFromPreviousUi(previousUi); +} + ]]> </script> ===================================== client-datasource-editor-api/src/main/java/fr/ird/observe/client/datasource/editor/content/ref/ContentReferenceUI.jaxx ===================================== @@ -77,6 +77,10 @@ public abstract NormalTextEditor getUri(); @Override public abstract ContentReferenceUIHandler<E, R, U> getHandler(); +public void resetFromPreviousUi(U previousUi) { + getHandler().resetFromPreviousUi(previousUi); +} + public void decorateUniqueKeyTable(JTable table, TableCellRenderer renderer, JScrollPane pane) { View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/commit/a76c291106d973d040c2406dd… -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/commit/a76c291106d973d040c2406dd… You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-observe][develop] FOB enregistré non disponible immédiatement dans la popup de sélection d'objet...
by Tony CHEMIT 24 Jun '20

24 Jun '20

Tony CHEMIT pushed to branch develop at ultreiaio / ird-observe Commits: 5139d387 by Tony Chemit at 2020-06-24T18:12:45+02:00 FOB enregistré non disponible immédiatement dans la popup de sélection d'objet prédéfini - Closes #1504 - - - - - 5 changed files: - client-configuration/src/main/java/fr/ird/observe/client/datasource/dcp/FloatingObjectPresetsManager.java - client-core/src/main/java/fr/ird/observe/client/datasource/api/ObserveSwingDataSource.java - client-datasource-editor-ps/src/main/java/fr/ird/observe/client/datasource/editor/content/data/ps/observation/FloatingObjectUIHandler.java - client-datasource-editor-ps/src/main/java/fr/ird/observe/client/datasource/editor/content/data/ps/observation/actions/ActivityUIAddFloatingObject.java - client-datasource-editor-ps/src/main/java/fr/ird/observe/client/datasource/editor/content/data/ps/observation/actions/FloatingObjectUIAddFloatingObjectPreset.java Changes: ===================================== client-configuration/src/main/java/fr/ird/observe/client/datasource/dcp/FloatingObjectPresetsManager.java ===================================== @@ -84,11 +84,11 @@ public class FloatingObjectPresetsManager { switch (model) { case ps_observation: directory = config.getDcpPsObservationPresetsDirectory().toPath(); - map = this.psObservation; + map = getPsObservationPresets(); break; case ps_logbook: directory = config.getDcpPsLogbookPresetsDirectory().toPath(); - map = this.psLogbook; + map = getPsLogbookPresets(); break; default: throw new IllegalStateException("Can't deal with model: " + model); @@ -119,6 +119,14 @@ public class FloatingObjectPresetsManager { } public Set<FloatingObjectPreset> getPsObservation() { + return ImmutableSet.copyOf(getPsObservationPresets().values()); + } + + public Set<FloatingObjectPreset> getPsLogbook() { + return ImmutableSet.copyOf(getPsLogbookPresets().values()); + } + + public Map<Path, FloatingObjectPreset> getPsObservationPresets() { if (psObservation == null) { log.info("Loading ps observation dcp presets..."); try { @@ -129,10 +137,10 @@ public class FloatingObjectPresetsManager { psObservation = new TreeMap<>(); } } - return ImmutableSet.copyOf(psObservation.values()); + return psObservation; } - public Set<FloatingObjectPreset> getPsLogbook() { + public Map<Path, FloatingObjectPreset> getPsLogbookPresets() { if (psLogbook == null) { log.info("Loading ps logbook dcp presets..."); try { @@ -143,22 +151,16 @@ public class FloatingObjectPresetsManager { psLogbook = new TreeMap<>(); } } - return ImmutableSet.copyOf(psLogbook.values()); - } - - public Map<Path, FloatingObjectPreset> getPsObservationL() { - return psObservation; - } - - public Map<Path, FloatingObjectPreset> getPsLogbookL() { return psLogbook; } - public void setPsObservation(Map<Path, FloatingObjectPreset> psObservation) { - this.psObservation = psObservation; + public void setPsObservationPresets(Map<Path, FloatingObjectPreset> psObservationPresets) { + this.psObservation = psObservationPresets; + log.info(String.format("Set %d ps observation dcp presets.", psObservationPresets.size())); } - public void setPsLogbook(Map<Path, FloatingObjectPreset> psLogbook) { - this.psLogbook = psLogbook; + public void setPsLogbookPresets(Map<Path, FloatingObjectPreset> psLogbookPresets) { + this.psLogbook = psLogbookPresets; + log.info(String.format("Set %d ps logbook dcp presets.", psLogbookPresets.size())); } } ===================================== client-core/src/main/java/fr/ird/observe/client/datasource/api/ObserveSwingDataSource.java ===================================== @@ -643,8 +643,14 @@ public class ObserveSwingDataSource extends ObserveServicesProviderSupport imple public void sanitize(BoundedRangeModel progressModel, FloatingObjectPresetsManager dataSource) { int size = dataSource.size(); log.info(String.format("Will sanitize %d preset(s).", size)); - sanitize(dataSource.getPsObservationL(), progressModel); - sanitize(dataSource.getPsLogbookL(), progressModel); + { + Map<Path, FloatingObjectPreset> sanitize = sanitize(dataSource.getPsObservationPresets(), progressModel); + dataSource.setPsObservationPresets(sanitize); + } + { + Map<Path, FloatingObjectPreset> sanitize = sanitize(dataSource.getPsLogbookPresets(), progressModel); + dataSource.setPsLogbookPresets(sanitize); + } log.info(String.format("Found %d safe preset(s).", dataSource.size())); } ===================================== client-datasource-editor-ps/src/main/java/fr/ird/observe/client/datasource/editor/content/data/ps/observation/FloatingObjectUIHandler.java ===================================== @@ -21,7 +21,7 @@ */ package fr.ird.observe.client.datasource.editor.content.data.ps.observation; -import fr.ird.observe.client.datasource.dcp.FloatingObjectPresetsManagerApplicationComponent; +import fr.ird.observe.client.datasource.dcp.WithFloatingObjectPresetsManager; import fr.ird.observe.client.datasource.editor.content.data.edit.ContentEditUIHandler; import fr.ird.observe.client.datasource.editor.content.data.edit.ContentEditUILayoutFocusTraversalPolicy; import fr.ird.observe.client.datasource.editor.content.data.ps.observation.dcp.FloatingObjectPartsTreeTableModel; @@ -65,7 +65,7 @@ import static io.ultreia.java4all.i18n.I18n.t; * @author Tony Chemit - dev(a)tchemit.fr * @since 1.0 */ -public class FloatingObjectUIHandler extends ContentEditUIHandler<FloatingObjectDto, FloatingObjectReference, FloatingObjectUI> implements UIHandler<FloatingObjectUI> { +public class FloatingObjectUIHandler extends ContentEditUIHandler<FloatingObjectDto, FloatingObjectReference, FloatingObjectUI> implements UIHandler<FloatingObjectUI>, WithFloatingObjectPresetsManager { private static final Logger log = LogManager.getLogger(FloatingObjectUIHandler.class); private static final Icon ICON_NOT_A_REFERENCE = SwingUtil.createImageIcon("star-empty.png"); @@ -97,18 +97,13 @@ public class FloatingObjectUIHandler extends ContentEditUIHandler<FloatingObject FloatingObjectPreset newValue = (FloatingObjectPreset) e.getNewValue(); ui.getFloatingObjectReferenceActions().removeAll(); ui.getAddFloatingObjectPreset().setEnabled(newValue == null); -// ui.getEditFloatingObjectReference().setEnabled(newValue != null); -// ui.getRemoveFloatingObjectReference().setEnabled(newValue != null); if (newValue == null) { ui.getFloatingObjectReferenceLabel().setIcon(ICON_NOT_A_REFERENCE); ui.getFloatingObjectReferenceLabel().setText(t("observe.data.ps.observation.FloatingObject.not.a.reference")); ui.getFloatingObjectReferenceActions().add(ui.getAddFloatingObjectPreset()); -// ui.getEditFloatingObjectReference().setEnabled(false); } else { ui.getFloatingObjectReferenceLabel().setIcon(ICON_IS_A_REFERENCE); ui.getFloatingObjectReferenceLabel().setText(t("observe.data.ps.observation.FloatingObject.is.a.reference", newValue.getLabel(getDecoratorService().getReferentialLocale()))); -// ui.getFloatingObjectReferenceActions().add(ui.getEditFloatingObjectReference()); -// ui.getFloatingObjectReferenceActions().add(ui.getRemoveFloatingObjectReference()); } }); @@ -161,7 +156,7 @@ public class FloatingObjectUIHandler extends ContentEditUIHandler<FloatingObject Optional<FloatingObjectPreset> floatingObjectReference; if (dcpId == null) { - floatingObjectReference = Optional.ofNullable(FloatingObjectPresetsManagerApplicationComponent.value().getReferenceToUse()); + floatingObjectReference = Optional.ofNullable(getFloatingObjectPresetsManager().getReferenceToUse()); form = getPsObservationFloatingObjectService().preCreate(activityId, floatingObjectReference.orElse(null)); } else { form = getPsObservationFloatingObjectService().loadForm(dcpId); ===================================== client-datasource-editor-ps/src/main/java/fr/ird/observe/client/datasource/editor/content/data/ps/observation/actions/ActivityUIAddFloatingObject.java ===================================== @@ -24,14 +24,15 @@ package fr.ird.observe.client.datasource.editor.content.data.ps.observation.acti import fr.ird.observe.client.ClientUIContext; import fr.ird.observe.client.datasource.dcp.FloatingObjectPresetsManager; -import fr.ird.observe.client.datasource.dcp.FloatingObjectPresetsManagerApplicationComponent; +import fr.ird.observe.client.datasource.dcp.WithFloatingObjectPresetsManager; import fr.ird.observe.client.datasource.editor.DataSourceEditor; import fr.ird.observe.client.datasource.editor.content.ObservePsKeyStrokes; import fr.ird.observe.client.datasource.editor.content.actions.ContentUIActionSupport; import fr.ird.observe.client.datasource.editor.content.data.ps.observation.ActivityUI; import fr.ird.observe.client.datasource.editor.tree.navigation.NavigationTree; import fr.ird.observe.dto.data.ps.dcp.FloatingObjectPreset; -import fr.ird.observe.dto.decoration.DecoratorServiceApplicationComponent; +import fr.ird.observe.dto.data.ps.dcp.FloatingObjectPresetModel; +import fr.ird.observe.dto.decoration.WithDecoratorService; import fr.ird.observe.navigation.tree.MultipleReferenceContainerNode; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; @@ -57,7 +58,7 @@ import static io.ultreia.java4all.i18n.I18n.t; * @author Tony Chemit - dev(a)tchemit.fr * @since 6.0 */ -public class ActivityUIAddFloatingObject extends ContentUIActionSupport<ActivityUI> { +public class ActivityUIAddFloatingObject extends ContentUIActionSupport<ActivityUI> implements WithFloatingObjectPresetsManager { private static final Logger log = LogManager.getLogger(ActivityUIAddFloatingObject.class); @@ -65,9 +66,22 @@ public class ActivityUIAddFloatingObject extends ContentUIActionSupport<Activity super(t("observe.data.ps.observation.Activity.action.addFloatingObject"), t("observe.data.ps.observation.Activity.action.addFloatingObject.tip"), "add", ObservePsKeyStrokes.KEY_STROKE_ADD_DCP); } - public static boolean choosePreset() { - FloatingObjectPresetsManager floatingObjectPresetsManager = FloatingObjectPresetsManagerApplicationComponent.value(); - Set<FloatingObjectPreset> psObservation = floatingObjectPresetsManager.getPsObservation(); + @Override + protected void doActionPerformed(ActionEvent e, ActivityUI ui) { + + boolean doContinue = choosePreset(); + if (!doContinue) { + return; + } + + NavigationTree tree = getDataSourceEditor().getNavigationUI().getTree(); + MultipleReferenceContainerNode<?, ?> parentNode = (MultipleReferenceContainerNode<?, ?>) tree.getSelectedNode(); + doCreate(getDataSourceEditor(), parentNode); + } + + boolean choosePreset() { + FloatingObjectPresetsManager floatingObjectPresetsManager = getFloatingObjectPresetsManager(); + Set<FloatingObjectPreset> psObservation = floatingObjectPresetsManager.getPresets(FloatingObjectPresetModel.ps_observation); if (!psObservation.isEmpty()) { JPanel userConfigs = new JPanel(new GridLayout(0, 2)); @@ -97,29 +111,16 @@ public class ActivityUIAddFloatingObject extends ContentUIActionSupport<Activity return true; } - @Override - protected void doActionPerformed(ActionEvent e, ActivityUI ui) { - - boolean doContinue = choosePreset(); - if (!doContinue) { - return; - } - - NavigationTree tree = getDataSourceEditor().getNavigationUI().getTree(); - MultipleReferenceContainerNode<?, ?> parentNode = (MultipleReferenceContainerNode<?, ?>) tree.getSelectedNode(); - doCreate(getDataSourceEditor(), parentNode); - } - - public static void doCreate(DataSourceEditor editor, MultipleReferenceContainerNode<?, ?> parentNode) { + void doCreate(DataSourceEditor editor, MultipleReferenceContainerNode<?, ?> parentNode) { try { NavigationTree tree = editor.getNavigationUI().getTree(); tree.addUnsavedNode(parentNode); } finally { - FloatingObjectPresetsManagerApplicationComponent.value().setReferenceToUse(null); + getFloatingObjectPresetsManager().setReferenceToUse(null); } } - private static class UsePresetAction extends AbstractAction { + private static class UsePresetAction extends AbstractAction implements WithDecoratorService { private final FloatingObjectPreset preset; private final KeyStroke keyStroke; @@ -129,7 +130,7 @@ public class ActivityUIAddFloatingObject extends ContentUIActionSupport<Activity this.preset = Objects.requireNonNull(preset); this.keyStroke = Objects.requireNonNull(KeyStroke.getKeyStroke("F" + index)); putValue(ActivityUIAddFloatingObject.class.getName(), getClass().getName() + "_" + index); - putValue(NAME, DecoratorServiceApplicationComponent.value().getDecoratorByType(preset.getClass()).toString(preset)); + putValue(NAME, getDecoratorService().getDecoratorByType(preset.getClass()).toString(preset)); } public void install(JButton parent, JOptionPane pane) { @@ -144,7 +145,6 @@ public class ActivityUIAddFloatingObject extends ContentUIActionSupport<Activity public void actionPerformed(ActionEvent e) { log.info(String.format("Choose dcp preset: %s", preset.getLabel1())); pane.setValue(preset); -// Objects.requireNonNull(SwingUtilities.getAncestorOfClass(Dialog.class, pane)).setVisible(false); } } } ===================================== client-datasource-editor-ps/src/main/java/fr/ird/observe/client/datasource/editor/content/data/ps/observation/actions/FloatingObjectUIAddFloatingObjectPreset.java ===================================== @@ -24,11 +24,11 @@ package fr.ird.observe.client.datasource.editor.content.data.ps.observation.acti import fr.ird.observe.client.ClientUIContext; import fr.ird.observe.client.datasource.dcp.FloatingObjectPresetsManager; -import fr.ird.observe.client.datasource.dcp.FloatingObjectPresetsManagerApplicationComponent; +import fr.ird.observe.client.datasource.dcp.WithFloatingObjectPresetsManager; import fr.ird.observe.client.datasource.dcp.presets.observation.FloatingObjectPresetUI; import fr.ird.observe.client.datasource.dcp.presets.observation.FloatingObjectPresetUIModel; -import fr.ird.observe.client.datasource.editor.content.actions.ContentUIActionSupport; import fr.ird.observe.client.datasource.editor.content.ObservePsKeyStrokes; +import fr.ird.observe.client.datasource.editor.content.actions.ContentUIActionSupport; import fr.ird.observe.client.datasource.editor.content.data.ps.observation.FloatingObjectUI; import fr.ird.observe.dto.data.ps.dcp.FloatingObjectPreset; import io.ultreia.java4all.application.context.ApplicationContext; @@ -52,7 +52,7 @@ import static io.ultreia.java4all.i18n.I18n.t; * * @author Tony Chemit - dev(a)tchemit.fr */ -public class FloatingObjectUIAddFloatingObjectPreset extends ContentUIActionSupport<FloatingObjectUI> { +public class FloatingObjectUIAddFloatingObjectPreset extends ContentUIActionSupport<FloatingObjectUI> implements WithFloatingObjectPresetsManager { private static final Logger log = LogManager.getLogger(FloatingObjectUIAddFloatingObjectPreset.class); @@ -101,7 +101,7 @@ public class FloatingObjectUIAddFloatingObjectPreset extends ContentUIActionSupp if (model.getBuoy2() != null) { model.setBuoy2(configPanel.getBuoy2().getModel().toBean()); } - FloatingObjectPresetsManager floatingObjectPresetsManager = FloatingObjectPresetsManagerApplicationComponent.value(); + FloatingObjectPresetsManager floatingObjectPresetsManager = getFloatingObjectPresetsManager(); floatingObjectPresetsManager.add(model); ui.getModel().setReference(model); } View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/commit/5139d387cad1a0510c6cd947a… -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/commit/5139d387cad1a0510c6cd947a… You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-observe][develop] 4 commits: [LL][Logbook] opération de pêche / décimaux : gestion de la virgule - Closes #1527
by Tony CHEMIT 24 Jun '20

24 Jun '20

Tony CHEMIT pushed to branch develop at ultreiaio / ird-observe Commits: 6730aa38 by Tony Chemit at 2020-06-24T17:21:57+02:00 [LL][Logbook] opération de pêche / décimaux : gestion de la virgule - Closes #1527 - - - - - 0b2a9f6c by Tony Chemit at 2020-06-24T17:22:07+02:00 Impossible de changer deux fois la langue - Closes #1539 - - - - - 252cb6a0 by Tony Chemit at 2020-06-24T17:22:07+02:00 Impossible d'afficher le `À propos` - Closes #1540 - - - - - c88625b1 by Tony Chemit at 2020-06-24T17:22:33+02:00 Disfonctionnement de raccourcis - Closes #1497 - - - - - 5 changed files: - client-configuration/src/main/java/fr/ird/observe/client/configuration/ClientConfig.java - client-core/src/main/java/fr/ird/observe/client/main/ObserveMainUI.jaxx - client-core/src/main/java/fr/ird/observe/client/main/ObserveMainUIHandler.java - client-datasource-editor-api/src/main/java/fr/ird/observe/client/datasource/editor/DataSourceEditorBodyContent.java - pom.xml Changes: ===================================== client-configuration/src/main/java/fr/ird/observe/client/configuration/ClientConfig.java ===================================== @@ -133,7 +133,7 @@ public class ClientConfig extends GeneratedClientConfig implements TemplateGener ClientConfigOption.OBSTUNA_CAN_MIGRATE.getKey(), }; - private final SimpleDateFormat dateFormat = new SimpleDateFormat(); + private final SimpleDateFormat dateFormat = new SimpleDateFormat("dd/MM/yyyy HH:mm z"); /** * un drapeau pour savoir s'il faut lancer l'interface graphique. Cette * valeur peut être programmées lors des actions. @@ -426,7 +426,7 @@ public class ClientConfig extends GeneratedClientConfig implements TemplateGener } public String getApplicationName() { - return get().getOption(ApplicationConfig.APP_NAME); + return get().getOption("application.name"); } @Override ===================================== client-core/src/main/java/fr/ird/observe/client/main/ObserveMainUI.jaxx ===================================== @@ -90,12 +90,6 @@ public void destroy() { handler.destroy(); } -@Override -protected void finalize() throws Throwable { - super.finalize(); - destroy(); -} - ]]> </script> ===================================== client-core/src/main/java/fr/ird/observe/client/main/ObserveMainUIHandler.java ===================================== @@ -34,10 +34,10 @@ import fr.ird.observe.client.util.busy.BusyModel; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; import org.nuiton.jaxx.runtime.spi.UIHandler; +import org.nuiton.jaxx.runtime.swing.action.JAXXObjectActionSupport; import org.nuiton.jaxx.widgets.error.ErrorDialogUI; import javax.swing.JComponent; -import javax.swing.KeyStroke; import java.awt.KeyboardFocusManager; import java.util.Locale; @@ -92,6 +92,7 @@ public class ObserveMainUIHandler implements UIHandler<ObserveMainUI>, WithClien ErrorDialogUI.init(ui); BusyModel busyModel = getClientUIContext().getBusyModel(); + JAXXObjectActionSupport.makeActionsEnabledOnlyIfMenuItemParentIsOpened(ui.getJMenuBar()); ObserveKeyStrokesSupport.addKeyStrokeFromMnemonic(ui); @@ -101,7 +102,6 @@ public class ObserveMainUIHandler implements UIHandler<ObserveMainUI>, WithClien BusyLayerUI.create(ui, busyModel); ui.getMenu().setEnabled(!busyModel.isBusy()); - ui.getMenuLanguage().setAccelerator(KeyStroke.getKeyStroke("pressed L")); reload(model, getClientConfig(), busyModel); ===================================== client-datasource-editor-api/src/main/java/fr/ird/observe/client/datasource/editor/DataSourceEditorBodyContent.java ===================================== @@ -50,6 +50,7 @@ import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; import javax.swing.BoundedRangeModel; +import java.beans.PropertyChangeListener; import java.util.Set; import java.util.function.Supplier; @@ -64,6 +65,7 @@ public class DataSourceEditorBodyContent extends MainUIBodyContent<DataSourceEdi private static final Logger log = LogManager.getLogger(DataSourceEditorBodyContent.class); + private final PropertyChangeListener reload; private DataSourceEditorMenu editorMenu; private DataSourceEditorNavigationMenu navigationMenu; private ObserveSwingDataSource dataSource; @@ -71,6 +73,7 @@ public class DataSourceEditorBodyContent extends MainUIBodyContent<DataSourceEdi public DataSourceEditorBodyContent() { super(1, DataSourceEditor.class); setSupplier(SingletonSupplier.of(createSupplier())); + this.reload = e -> reload(); } private Supplier<DataSourceEditor> createSupplier() { @@ -92,24 +95,15 @@ public class DataSourceEditorBodyContent extends MainUIBodyContent<DataSourceEdi editorMenu.getUiModel().init(); navigationMenu.getUiModel().init(); - - getClientUIContext().getBusyModel().addPropertyChangeListener(BusyModel.BUSY_PROPERTY_NAME, evt -> reload()); + mainUI.getBusyModel().addPropertyChangeListener(BusyModel.BUSY_PROPERTY_NAME, reload); ShowDataSourcePresetsAction.init(mainUI, mainUI.getShowDataSourcePresets(), ShowDataSourcePresetsAction.class); } -// @Override -// public void uninstall(ObserveMainUI mainUI) { -// super.uninstall(mainUI); -// if (dataSource != null && dataSource.isOpen()) { -// log.info("Closing main data source.."); -// try { -// dataSource.close(); -// } finally { -// setDataSource(null); -// getObserveDataSourcesManager().setMainDataSource(null); -// } -// } -// } + @Override + public void uninstall(ObserveMainUI mainUI) { + super.uninstall(mainUI); + mainUI.getBusyModel().removePropertyChangeListener(BusyModel.BUSY_PROPERTY_NAME, reload); + } @Override public void show(ObserveMainUI mainUI) { ===================================== pom.xml ===================================== @@ -24,7 +24,7 @@ <parent> <groupId>io.ultreia.maven</groupId> <artifactId>pom</artifactId> - <version>2020.32</version> + <version>2020.33</version> </parent> <groupId>fr.ird.observe</groupId> @@ -170,7 +170,7 @@   - +    View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/compare/0ef7cc91e4a2bf49bfc655ff… -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/compare/0ef7cc91e4a2bf49bfc655ff… You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-observe][develop] 4 commits: [LL][Logbook] opération de pêche / décimaux : gestion de la virgule - See #1527
by Tony CHEMIT 24 Jun '20

24 Jun '20

Tony CHEMIT pushed to branch develop at ultreiaio / ird-observe Commits: c939688b by Tony Chemit at 2020-06-22T19:57:18+02:00 [LL][Logbook] opération de pêche / décimaux : gestion de la virgule - See #1527 - - - - - 22cd5e4b by Tony Chemit at 2020-06-24T16:07:52+02:00 Impossible de changer deux fois la langue - Closes #1539 - - - - - 68ed0fc8 by Tony Chemit at 2020-06-24T16:07:54+02:00 Impossible d'afficher le `À propos` - Closes #1540 - - - - - 0ef7cc91 by Tony Chemit at 2020-06-24T16:24:41+02:00 Disfonctionnement de raccourcis - Closes #1497 - - - - - 5 changed files: - client-configuration/src/main/java/fr/ird/observe/client/configuration/ClientConfig.java - client-core/src/main/java/fr/ird/observe/client/main/ObserveMainUI.jaxx - client-core/src/main/java/fr/ird/observe/client/main/ObserveMainUIHandler.java - client-datasource-editor-api/src/main/java/fr/ird/observe/client/datasource/editor/DataSourceEditorBodyContent.java - pom.xml Changes: ===================================== client-configuration/src/main/java/fr/ird/observe/client/configuration/ClientConfig.java ===================================== @@ -133,7 +133,7 @@ public class ClientConfig extends GeneratedClientConfig implements TemplateGener ClientConfigOption.OBSTUNA_CAN_MIGRATE.getKey(), }; - private final SimpleDateFormat dateFormat = new SimpleDateFormat(); + private final SimpleDateFormat dateFormat = new SimpleDateFormat("dd/MM/yyyy HH:mm z"); /** * un drapeau pour savoir s'il faut lancer l'interface graphique. Cette * valeur peut être programmées lors des actions. @@ -426,7 +426,7 @@ public class ClientConfig extends GeneratedClientConfig implements TemplateGener } public String getApplicationName() { - return get().getOption(ApplicationConfig.APP_NAME); + return get().getOption("application.name"); } @Override ===================================== client-core/src/main/java/fr/ird/observe/client/main/ObserveMainUI.jaxx ===================================== @@ -90,12 +90,6 @@ public void destroy() { handler.destroy(); } -@Override -protected void finalize() throws Throwable { - super.finalize(); - destroy(); -} - ]]> </script> ===================================== client-core/src/main/java/fr/ird/observe/client/main/ObserveMainUIHandler.java ===================================== @@ -34,10 +34,10 @@ import fr.ird.observe.client.util.busy.BusyModel; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; import org.nuiton.jaxx.runtime.spi.UIHandler; +import org.nuiton.jaxx.runtime.swing.action.JAXXObjectActionSupport; import org.nuiton.jaxx.widgets.error.ErrorDialogUI; import javax.swing.JComponent; -import javax.swing.KeyStroke; import java.awt.KeyboardFocusManager; import java.util.Locale; @@ -92,6 +92,7 @@ public class ObserveMainUIHandler implements UIHandler<ObserveMainUI>, WithClien ErrorDialogUI.init(ui); BusyModel busyModel = getClientUIContext().getBusyModel(); + JAXXObjectActionSupport.makeActionsEnabledOnlyIfMenuItemParentIsOpened(ui.getJMenuBar()); ObserveKeyStrokesSupport.addKeyStrokeFromMnemonic(ui); @@ -101,7 +102,6 @@ public class ObserveMainUIHandler implements UIHandler<ObserveMainUI>, WithClien BusyLayerUI.create(ui, busyModel); ui.getMenu().setEnabled(!busyModel.isBusy()); - ui.getMenuLanguage().setAccelerator(KeyStroke.getKeyStroke("pressed L")); reload(model, getClientConfig(), busyModel); ===================================== client-datasource-editor-api/src/main/java/fr/ird/observe/client/datasource/editor/DataSourceEditorBodyContent.java ===================================== @@ -50,6 +50,7 @@ import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; import javax.swing.BoundedRangeModel; +import java.beans.PropertyChangeListener; import java.util.Set; import java.util.function.Supplier; @@ -64,6 +65,7 @@ public class DataSourceEditorBodyContent extends MainUIBodyContent<DataSourceEdi private static final Logger log = LogManager.getLogger(DataSourceEditorBodyContent.class); + private final PropertyChangeListener reload; private DataSourceEditorMenu editorMenu; private DataSourceEditorNavigationMenu navigationMenu; private ObserveSwingDataSource dataSource; @@ -71,6 +73,7 @@ public class DataSourceEditorBodyContent extends MainUIBodyContent<DataSourceEdi public DataSourceEditorBodyContent() { super(1, DataSourceEditor.class); setSupplier(SingletonSupplier.of(createSupplier())); + this.reload = e -> reload(); } private Supplier<DataSourceEditor> createSupplier() { @@ -92,24 +95,15 @@ public class DataSourceEditorBodyContent extends MainUIBodyContent<DataSourceEdi editorMenu.getUiModel().init(); navigationMenu.getUiModel().init(); - - getClientUIContext().getBusyModel().addPropertyChangeListener(BusyModel.BUSY_PROPERTY_NAME, evt -> reload()); + mainUI.getBusyModel().addPropertyChangeListener(BusyModel.BUSY_PROPERTY_NAME, reload); ShowDataSourcePresetsAction.init(mainUI, mainUI.getShowDataSourcePresets(), ShowDataSourcePresetsAction.class); } -// @Override -// public void uninstall(ObserveMainUI mainUI) { -// super.uninstall(mainUI); -// if (dataSource != null && dataSource.isOpen()) { -// log.info("Closing main data source.."); -// try { -// dataSource.close(); -// } finally { -// setDataSource(null); -// getObserveDataSourcesManager().setMainDataSource(null); -// } -// } -// } + @Override + public void uninstall(ObserveMainUI mainUI) { + super.uninstall(mainUI); + mainUI.getBusyModel().removePropertyChangeListener(BusyModel.BUSY_PROPERTY_NAME, reload); + } @Override public void show(ObserveMainUI mainUI) { ===================================== pom.xml ===================================== @@ -24,7 +24,7 @@ <parent> <groupId>io.ultreia.maven</groupId> <artifactId>pom</artifactId> - <version>2020.32</version> + <version>2020.33</version> </parent> <groupId>fr.ird.observe</groupId> @@ -170,7 +170,7 @@   - +    View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/compare/c71281ce7807243daeaa7d9e… -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/compare/c71281ce7807243daeaa7d9e… You're receiving this email because of your account on gitlab.com.

1 0

[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