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

[Git][ultreiaio/ird-observe][develop] 7 commits: [V7-V8] Ajustement du modèle - Part 3 - Closes #1438
by Tony CHEMIT 29 Mar '20

29 Mar '20

Tony CHEMIT pushed to branch develop at ultreiaio / ird-observe Commits: b8253407 by tchemit at 2020-03-29T11:19:01+02:00 [V7-V8] Ajustement du modèle - Part 3 - Closes #1438 - - - - - 753ea025 by tchemit at 2020-03-29T11:19:08+02:00 add fixme - - - - - f499486e by tchemit at 2020-03-29T11:19:34+02:00 More detail when can't get last update date - - - - - 70408597 by tchemit at 2020-03-29T11:19:53+02:00 bind species on TargetCatch - - - - - eb101b74 by tchemit at 2020-03-29T11:30:31+02:00 [SFA] LL / Logbooks / Samples : modification d'espèce (application sur les autres formulaires) - Closes #1453 - - - - - 46fb786f by tchemit at 2020-03-29T12:43:01+02:00 Improve some i18n keys - - - - - 33db59d9 by tchemit at 2020-03-29T13:26:42+02:00 Ajouter l'icone de l'application lors du lancement de l'application en mode autre - Closes #1459 - - - - - 29 changed files: - client-core/src/main/java/fr/ird/observe/client/main/ObserveMainUI.jcss - client-core/src/main/java/fr/ird/observe/client/main/ObserveMainUIHandler.java - client-core/src/main/java/fr/ird/observe/client/util/UIHelper.java - 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/wizard/RemoteUILauncher.java - client-datasource-editor-ps/src/main/i18n/getters/java.getter - client-datasource-editor-ps/src/main/i18n/getters/jaxx.getter - client-datasource-editor-ps/src/main/java/fr/ird/observe/client/datasource/editor/content/data/ps/observation/NonTargetCatchUIHandler.java - client-datasource-editor-ps/src/main/java/fr/ird/observe/client/datasource/editor/content/data/ps/observation/NonTargetSampleUIHandler.java - client-datasource-editor-ps/src/main/java/fr/ird/observe/client/datasource/editor/content/data/ps/observation/ObjectObservedSpeciesUIHandler.java - client-datasource-editor-ps/src/main/java/fr/ird/observe/client/datasource/editor/content/data/ps/observation/ObjectSchoolEstimateUIHandler.java - client-datasource-editor-ps/src/main/java/fr/ird/observe/client/datasource/editor/content/data/ps/observation/SchoolEstimateUI.jcss - client-datasource-editor-ps/src/main/java/fr/ird/observe/client/datasource/editor/content/data/ps/observation/SchoolEstimateUIHandler.java - client-datasource-editor-ps/src/main/java/fr/ird/observe/client/datasource/editor/content/data/ps/observation/TargetCatchUI.jcss - client-datasource-editor-ps/src/main/java/fr/ird/observe/client/datasource/editor/content/data/ps/observation/TargetCatchUIHandler.java - client-datasource-editor-ps/src/main/java/fr/ird/observe/client/datasource/editor/content/data/ps/observation/TargetDiscardCatchUI.jcss - client-datasource-editor-ps/src/main/java/fr/ird/observe/client/datasource/editor/content/data/ps/observation/TargetDiscardCatchUIHandler.java - client-datasource-editor-ps/src/main/java/fr/ird/observe/client/datasource/editor/content/data/ps/observation/TargetSampleUIHandler.java - observe-i18n/src/main/i18n/translations/observe_en_GB.properties - observe-i18n/src/main/i18n/translations/observe_es_ES.properties - observe-i18n/src/main/i18n/translations/observe_fr_FR.properties - persistence/src/main/java/fr/ird/observe/entities/data/ps/observation/TargetCatchImpl.java - persistence/src/main/resources/db/migration/7.4/03_rename_referential-H2.sql - persistence/src/main/resources/db/migration/7.4/03_rename_referential-PG.sql - services-local/src/main/java/fr/ird/observe/services/local/service/referential/ReferentialServiceLocal.java - test/src/main/resources/db/8.0-RC-2/dataForTestLongline.sql.gz - test/src/main/resources/db/8.0-RC-2/dataForTestSeine.sql.gz - test/src/main/resources/db/8.0-RC-2/referentiel.sql.gz - test/src/main/resources/fixtures/validate-service-seine-trips.properties Changes: ===================================== client-core/src/main/java/fr/ird/observe/client/main/ObserveMainUI.jcss ===================================== @@ -22,7 +22,6 @@ #mainFrame { defaultCloseOperation: "do_nothing_on_close"; - iconImage: {SwingUtil.createImageIcon("logo.png").getImage()}; } #menu { ===================================== client-core/src/main/java/fr/ird/observe/client/main/ObserveMainUIHandler.java ===================================== @@ -74,6 +74,7 @@ public class ObserveMainUIHandler implements UIHandler<ObserveMainUI>, WithClien @Override public void afterInit(ObserveMainUI ui) { + UIHelper.addApplicationIcon(ui); getClientUIContext().setMainUI(ui); ui.getMainUIBodyContentManager().install(); KeyboardFocusManager.getCurrentKeyboardFocusManager().addKeyEventDispatcher(keyEventDispatcher = new MainUIKeyEventDispatcher(ui.getModel())); ===================================== client-core/src/main/java/fr/ird/observe/client/util/UIHelper.java ===================================== @@ -61,7 +61,9 @@ import javax.swing.table.TableCellEditor; import javax.swing.table.TableCellRenderer; import java.awt.Color; import java.awt.Component; +import java.awt.Container; import java.awt.Toolkit; +import java.awt.Window; import java.awt.datatransfer.Clipboard; import java.awt.datatransfer.StringSelection; import java.awt.event.KeyEvent; @@ -86,6 +88,10 @@ public class UIHelper extends SwingUtil { public static final PropertyChangeListener LOG_PROPERTY_CHANGE_LISTENER = new LogPropertyChanged(); public static final String NO_PACK = "NoPack"; + public static void addApplicationIcon(Window window) { + window.setIconImage(createImageIcon("logo.png").getImage()); + } + public static void handlingError(String message, Exception e) { if (log.isErrorEnabled()) { ===================================== client-datasource-editor-api/src/main/java/fr/ird/observe/client/datasource/editor/content/ContentUIHandler.java ===================================== @@ -218,6 +218,7 @@ public abstract class ContentUIHandler<U extends ContentUI> implements ObserveSe break; case 1: // wil reset ui + //FIXME If checking from closing, we should do nothing ? ui.resetEdit(); break; } @@ -241,6 +242,7 @@ public abstract class ContentUIHandler<U extends ContentUI> implements ObserveSe break; case 0: // wil reset ui + //FIXME If checking from closing, we should do nothing ? ui.resetEdit(); break; } ===================================== client-datasource-editor-api/src/main/java/fr/ird/observe/client/datasource/editor/wizard/RemoteUILauncher.java ===================================== @@ -23,6 +23,7 @@ package fr.ird.observe.client.datasource.editor.wizard; import fr.ird.observe.client.constants.DbMode; import fr.ird.observe.client.datasource.editor.wizard.tabs.SecurityModel; +import fr.ird.observe.client.util.UIHelper; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; import org.nuiton.jaxx.runtime.JAXXContext; @@ -87,6 +88,7 @@ public abstract class RemoteUILauncher extends StorageUILauncher { model.setSteps(steps.toArray(new StorageStep[0])); ui.setSize(800, 600); + UIHelper.addApplicationIcon(ui); } @Override ===================================== client-datasource-editor-ps/src/main/i18n/getters/java.getter ===================================== @@ -67,10 +67,10 @@ observe.data.ps.observation.NonTargetCatch.table.meanWeight observe.data.ps.observation.NonTargetCatch.table.meanWeight.tip observe.data.ps.observation.NonTargetCatch.table.reasonForDiscard observe.data.ps.observation.NonTargetCatch.table.reasonForDiscard.tip +observe.data.ps.observation.NonTargetCatch.table.species +observe.data.ps.observation.NonTargetCatch.table.species.tip observe.data.ps.observation.NonTargetCatch.table.speciesFate observe.data.ps.observation.NonTargetCatch.table.speciesFate.tip -observe.data.ps.observation.NonTargetCatch.table.speciesFaune -observe.data.ps.observation.NonTargetCatch.table.speciesFaune.tip observe.data.ps.observation.NonTargetCatch.table.totalCount observe.data.ps.observation.NonTargetCatch.table.totalCount.tip observe.data.ps.observation.NonTargetCatch.table.well @@ -100,16 +100,16 @@ observe.data.ps.observation.NonTargetLength.table.length observe.data.ps.observation.NonTargetLength.table.length.tip observe.data.ps.observation.NonTargetLength.table.meanWeight observe.data.ps.observation.NonTargetLength.table.meanWeight.tip -observe.data.ps.observation.NonTargetLength.table.nonTargetSpecies -observe.data.ps.observation.NonTargetLength.table.nonTargetSpecies.tip observe.data.ps.observation.NonTargetLength.table.picturesReferences observe.data.ps.observation.NonTargetLength.table.picturesReferences.tip observe.data.ps.observation.NonTargetLength.table.sizeMeasureType observe.data.ps.observation.NonTargetLength.table.sizeMeasureType.tip +observe.data.ps.observation.NonTargetLength.table.species +observe.data.ps.observation.NonTargetLength.table.species.tip observe.data.ps.observation.ObjectObservedSpecies.table.count observe.data.ps.observation.ObjectObservedSpecies.table.count.tip -observe.data.ps.observation.ObjectObservedSpecies.table.speciesFaune -observe.data.ps.observation.ObjectObservedSpecies.table.speciesFaune.tip +observe.data.ps.observation.ObjectObservedSpecies.table.species +observe.data.ps.observation.ObjectObservedSpecies.table.species.tip observe.data.ps.observation.ObjectObservedSpecies.table.speciesStatus observe.data.ps.observation.ObjectObservedSpecies.table.speciesStatus.tip observe.data.ps.observation.Route.action.moves @@ -124,8 +124,8 @@ observe.data.ps.observation.Sample.weight.computed.tip observe.data.ps.observation.Sample.weight.observed.tip observe.data.ps.observation.SchoolEstimate.table.meanWeight observe.data.ps.observation.SchoolEstimate.table.meanWeight.tip -observe.data.ps.observation.SchoolEstimate.table.speciesThon -observe.data.ps.observation.SchoolEstimate.table.speciesThon.tip +observe.data.ps.observation.SchoolEstimate.table.species +observe.data.ps.observation.SchoolEstimate.table.species.tip observe.data.ps.observation.SchoolEstimate.table.weight observe.data.ps.observation.SchoolEstimate.table.weight.tip observe.data.ps.observation.Set.message.no.nonTargetCatchRelease @@ -136,8 +136,8 @@ observe.data.ps.observation.Set.schoolType.not.fill observe.data.ps.observation.TargetCatch.message.table.will.delete.targetLength observe.data.ps.observation.TargetCatch.table.comment observe.data.ps.observation.TargetCatch.table.comment.tip -observe.data.ps.observation.TargetCatch.table.speciesThon -observe.data.ps.observation.TargetCatch.table.speciesThon.tip +observe.data.ps.observation.TargetCatch.table.species +observe.data.ps.observation.TargetCatch.table.species.tip observe.data.ps.observation.TargetCatch.table.weight observe.data.ps.observation.TargetCatch.table.weight.tip observe.data.ps.observation.TargetCatch.table.weightCategory @@ -151,8 +151,8 @@ observe.data.ps.observation.TargetDiscard.table.comment observe.data.ps.observation.TargetDiscard.table.comment.tip observe.data.ps.observation.TargetDiscard.table.reasonForDiscard observe.data.ps.observation.TargetDiscard.table.reasonForDiscard.tip +observe.data.ps.observation.TargetDiscard.table.species observe.data.ps.observation.TargetDiscard.table.species.tip -observe.data.ps.observation.TargetDiscard.table.speciesThon observe.data.ps.observation.TargetDiscard.table.weight observe.data.ps.observation.TargetDiscard.table.weight.tip observe.data.ps.observation.TargetDiscard.table.weightCategory @@ -167,8 +167,8 @@ observe.data.ps.observation.TargetLength.table.sex observe.data.ps.observation.TargetLength.table.sex.tip observe.data.ps.observation.TargetLength.table.sizeMeasureType observe.data.ps.observation.TargetLength.table.sizeMeasureType.tip -observe.data.ps.observation.TargetLength.table.speciesThon -observe.data.ps.observation.TargetLength.table.speciesThon.tip +observe.data.ps.observation.TargetLength.table.species +observe.data.ps.observation.TargetLength.table.species.tip observe.data.ps.observation.TargetLength.table.totalWeight observe.data.ps.observation.TargetLength.table.totalWeight.tip observe.menu.navigation.action.move.activity ===================================== client-datasource-editor-ps/src/main/i18n/getters/jaxx.getter ===================================== @@ -158,7 +158,7 @@ observe.data.ps.observation.Sample.weight observe.data.ps.observation.SchoolEstimate.action.create observe.data.ps.observation.SchoolEstimate.action.create.tip observe.data.ps.observation.SchoolEstimate.meanWeight -observe.data.ps.observation.SchoolEstimate.table.speciesThon.tip +observe.data.ps.observation.SchoolEstimate.table.species.tip observe.data.ps.observation.SchoolEstimate.title observe.data.ps.observation.SchoolEstimate.totalWeight observe.data.ps.observation.Set.currentDirection @@ -186,7 +186,7 @@ observe.data.ps.observation.TargetCatch.broughtOnDeckInformation observe.data.ps.observation.TargetCatch.catchWeight observe.data.ps.observation.TargetCatch.reasonForDiscard observe.data.ps.observation.TargetCatch.table.deleteExtraMessage -observe.data.ps.observation.TargetCatch.table.speciesThon.tip +observe.data.ps.observation.TargetCatch.table.species.tip observe.data.ps.observation.TargetCatch.table.weightCategory.tip observe.data.ps.observation.TargetCatch.table.well.tip observe.data.ps.observation.TargetCatch.targetCatchCompositionEstimatedByObserver ===================================== client-datasource-editor-ps/src/main/java/fr/ird/observe/client/datasource/editor/content/data/ps/observation/NonTargetCatchUIHandler.java ===================================== @@ -141,8 +141,8 @@ public class NonTargetCatchUIHandler extends ContentTableUIHandler<SetNonTargetC UIHelper.fixTableColumnWidth(table, 7, 50); UIHelper.setI18nTableHeaderRenderer( table, - n("observe.data.ps.observation.NonTargetCatch.table.speciesFaune"), - n("observe.data.ps.observation.NonTargetCatch.table.speciesFaune.tip"), + n("observe.data.ps.observation.NonTargetCatch.table.species"), + n("observe.data.ps.observation.NonTargetCatch.table.species.tip"), n("observe.data.ps.observation.NonTargetCatch.table.speciesFate"), n("observe.data.ps.observation.NonTargetCatch.table.speciesFate.tip"), n("observe.data.ps.observation.NonTargetCatch.table.reasonForDiscard"), ===================================== client-datasource-editor-ps/src/main/java/fr/ird/observe/client/datasource/editor/content/data/ps/observation/NonTargetSampleUIHandler.java ===================================== @@ -160,8 +160,8 @@ public class NonTargetSampleUIHandler extends AbstractSampleUIHandler<NonTargetS UIHelper.setI18nTableHeaderRenderer( table, - n("observe.data.ps.observation.NonTargetLength.table.nonTargetSpecies"), - n("observe.data.ps.observation.NonTargetLength.table.nonTargetSpecies.tip"), + n("observe.data.ps.observation.NonTargetLength.table.species"), + n("observe.data.ps.observation.NonTargetLength.table.species.tip"), n("observe.data.ps.observation.NonTargetLength.table.sizeMeasureType"), n("observe.data.ps.observation.NonTargetLength.table.sizeMeasureType.tip"), n("observe.data.ps.observation.NonTargetLength.table.length"), ===================================== client-datasource-editor-ps/src/main/java/fr/ird/observe/client/datasource/editor/content/data/ps/observation/ObjectObservedSpeciesUIHandler.java ===================================== @@ -69,8 +69,8 @@ public class ObjectObservedSpeciesUIHandler extends ContentTableUIHandler<Floati JTable table = getUi().getTable(); UIHelper.setI18nTableHeaderRenderer(table, - n("observe.data.ps.observation.ObjectObservedSpecies.table.speciesFaune"), - n("observe.data.ps.observation.ObjectObservedSpecies.table.speciesFaune.tip"), + n("observe.data.ps.observation.ObjectObservedSpecies.table.species"), + n("observe.data.ps.observation.ObjectObservedSpecies.table.species.tip"), n("observe.data.ps.observation.ObjectObservedSpecies.table.speciesStatus"), n("observe.data.ps.observation.ObjectObservedSpecies.table.speciesStatus.tip"), n("observe.data.ps.observation.ObjectObservedSpecies.table.count"), ===================================== client-datasource-editor-ps/src/main/java/fr/ird/observe/client/datasource/editor/content/data/ps/observation/ObjectSchoolEstimateUIHandler.java ===================================== @@ -67,8 +67,8 @@ public class ObjectSchoolEstimateUIHandler extends ContentTableUIHandler<Floatin JTable table = getUi().getTable(); UIHelper.setI18nTableHeaderRenderer(table, - n("observe.data.ps.observation.SchoolEstimate.table.speciesThon"), - n("observe.data.ps.observation.SchoolEstimate.table.speciesThon.tip"), + n("observe.data.ps.observation.SchoolEstimate.table.species"), + n("observe.data.ps.observation.SchoolEstimate.table.species.tip"), n("observe.data.ps.observation.SchoolEstimate.table.weight"), n("observe.data.ps.observation.SchoolEstimate.table.weight.tip")); ===================================== client-datasource-editor-ps/src/main/java/fr/ird/observe/client/datasource/editor/content/data/ps/observation/SchoolEstimateUI.jcss ===================================== @@ -21,9 +21,5 @@ */ #speciesLabel { - toolTipText:"observe.data.ps.observation.SchoolEstimate.table.speciesThon.tip"; -} - -#species { - enabled:{!tableModel.isEditable() || !model.isRowSaved()}; + toolTipText:"observe.data.ps.observation.SchoolEstimate.table.species.tip"; } ===================================== client-datasource-editor-ps/src/main/java/fr/ird/observe/client/datasource/editor/content/data/ps/observation/SchoolEstimateUIHandler.java ===================================== @@ -40,7 +40,6 @@ import javax.swing.JTable; import javax.swing.table.DefaultTableCellRenderer; import java.awt.Component; import java.awt.Container; -import java.util.Collections; import java.util.List; import java.util.Set; import java.util.stream.Collectors; @@ -64,31 +63,24 @@ public class SchoolEstimateUIHandler extends ContentTableUIHandler<SetSchoolEsti ContentTableModel<SetSchoolEstimateDto, SchoolEstimateDto> model = getTableModel(); if (!model.isEditable()) { - // rien a faire return; } - SchoolEstimateUI ui = getUi(); - List<SpeciesReference> availableEspeces; JComponent requestFocus; - + List<SpeciesReference> listSpeciesUsed = model.getColumnValues(0); + Set<String> listSpeciesIdUsed = listSpeciesUsed.stream().map(ReferentialDtoReference::getId).collect(Collectors.toSet()); + List<SpeciesReference> references = getModel().getReferenceCache().getReferentialReferences(SchoolEstimateDto.PROPERTY_SPECIES); + List<SpeciesReference> availableSpecies = DtoReferenceCollection.filterNotContains(references, listSpeciesIdUsed); if (create) { - List<SpeciesReference> references = getModel().getReferenceCache().getReferentialReferences(SchoolEstimateDto.PROPERTY_SPECIES); - - List<SpeciesReference> listSpeciesUsed = model.getColumnValues(0); - - Set<String> listSpeciesIdUsed = listSpeciesUsed.stream().map(ReferentialDtoReference::getId).collect(Collectors.toSet()); - - availableEspeces = DtoReferenceCollection.filterNotContains(references, listSpeciesIdUsed); - requestFocus = ui.getSpecies(); } else { - SpeciesReference species = bean.getSpecies(); - availableEspeces = Collections.singletonList(species); + if (bean.getSpecies() != null) { + availableSpecies.add(bean.getSpecies()); + } requestFocus = ui.getTotalWeight(); } - ui.getSpecies().setData(availableEspeces); + ui.getSpecies().setData(availableSpecies); setFormFocusOwner(requestFocus); } @@ -98,8 +90,8 @@ public class SchoolEstimateUIHandler extends ContentTableUIHandler<SetSchoolEsti UIHelper.setI18nTableHeaderRenderer( table, - n("observe.data.ps.observation.SchoolEstimate.table.speciesThon"), - n("observe.data.ps.observation.SchoolEstimate.table.speciesThon.tip"), + n("observe.data.ps.observation.SchoolEstimate.table.species"), + n("observe.data.ps.observation.SchoolEstimate.table.species.tip"), n("observe.data.ps.observation.SchoolEstimate.table.weight"), n("observe.data.ps.observation.SchoolEstimate.table.weight.tip"), n("observe.data.ps.observation.SchoolEstimate.table.meanWeight"), ===================================== client-datasource-editor-ps/src/main/java/fr/ird/observe/client/datasource/editor/content/data/ps/observation/TargetCatchUI.jcss ===================================== @@ -25,25 +25,14 @@ } #speciesLabel { - toolTipText:"observe.data.ps.observation.TargetCatch.table.speciesThon.tip"; -} - -#species { - enabled:{!tableModel.isEditable() || !model.isRowSaved()}; + toolTipText:"observe.data.ps.observation.TargetCatch.table.species.tip"; } #weightCategoryLabel { toolTipText:"observe.data.ps.observation.TargetCatch.table.weightCategory.tip"; } -#weightCategory { - enabled:{!tableModel.isEditable() || !model.isRowSaved()}; -} - #wellLabel { toolTipText:"observe.data.ps.observation.TargetCatch.table.well.tip"; } -#well { - enabled:{!tableModel.isEditable() || !model.isRowSaved()}; -} ===================================== client-datasource-editor-ps/src/main/java/fr/ird/observe/client/datasource/editor/content/data/ps/observation/TargetCatchUIHandler.java ===================================== @@ -135,11 +135,9 @@ public class TargetCatchUIHandler extends ContentTableUIHandler<SetTargetCatchDt log.debug("response : " + reponse); } boolean canContinue = false; - switch (reponse) { - case 0: + if (reponse == 0) { // wil reset ui - canContinue = true; - break; + canContinue = true; } if (!canContinue) { return false; @@ -182,13 +180,15 @@ public class TargetCatchUIHandler extends ContentTableUIHandler<SetTargetCatchDt // au singleton de sa valeur correspondante dans le bean // puisque dans ce mode, pas possibilite de modifier de cette // valeur (clef metier) + ui.getSpecies().setSelectedItem(null); ui.getSpecies().setSelectedItem(species); - ui.getWeightCategory().setData(Collections.singletonList(weightCategory)); +// ui.getWeightCategory().setData(Collections.singletonList(weightCategory)); ui.getWeightCategory().setSelectedItem(weightCategory); requestFocus = ui.getCatchWeight(); } + if (log.isDebugEnabled()) { log.debug("selected weightCategory " + weightCategory); log.debug("selected species " + species); @@ -207,8 +207,8 @@ public class TargetCatchUIHandler extends ContentTableUIHandler<SetTargetCatchDt UIHelper.setI18nTableHeaderRenderer( table, - n("observe.data.ps.observation.TargetCatch.table.speciesThon"), - n("observe.data.ps.observation.TargetCatch.table.speciesThon.tip"), + n("observe.data.ps.observation.TargetCatch.table.species"), + n("observe.data.ps.observation.TargetCatch.table.species.tip"), n("observe.data.ps.observation.TargetCatch.table.weightCategory"), n("observe.data.ps.observation.TargetCatch.table.weightCategory.tip"), n("observe.data.ps.observation.TargetCatch.table.well"), @@ -265,9 +265,6 @@ public class TargetCatchUIHandler extends ContentTableUIHandler<SetTargetCatchDt protected void loadEditBean(String beanId) { Form<SetTargetCatchDto> form = getPsObservationTargetCatchService().loadForm(beanId, false); getModel().openForm(form); -// loadReferentialReferenceSetsInModel(form); -// getModel().setForm(form); -// SetTargetCatchHelper.copySetTargetCatchDto(form.getObject(), getBean()); } @Override ===================================== client-datasource-editor-ps/src/main/java/fr/ird/observe/client/datasource/editor/content/data/ps/observation/TargetDiscardCatchUI.jcss ===================================== @@ -28,18 +28,10 @@ toolTipText:"observe.data.ps.observation.TargetDiscard.table.species.tip"; } -#species { - enabled:{!tableModel.isEditable() || !model.isRowSaved()}; -} - #weightCategoryLabel { toolTipText:"observe.data.ps.observation.TargetDiscard.table.weightCategory.tip"; } -#weightCategory { - enabled:{!tableModel.isEditable() || !model.isRowSaved()}; -} - #reasonForDiscardLabel { toolTipText:"observe.data.ps.observation.TargetDiscard.table.reasonForDiscard.tip"; } ===================================== client-datasource-editor-ps/src/main/java/fr/ird/observe/client/datasource/editor/content/data/ps/observation/TargetDiscardCatchUIHandler.java ===================================== @@ -218,10 +218,16 @@ public class TargetDiscardCatchUIHandler extends ContentTableUIHandler<SetTarget // au singleton de sa valeur correspondante dans le bean // puisque dans ce mode, pas possibilite de modifier de cette // valeur (clef metier) + + // on recalcule la liste des speciess disponibles + List<SpeciesReference> availableSpecies = buildSpeciesList(weightCategory); + ui.getSpecies().setData(availableSpecies); + + ui.getSpecies().setSelectedItem(null); ui.getSpecies().setSelectedItem(species); - ui.getWeightCategory().setData(Collections.singletonList(weightCategory)); +// ui.getWeightCategory().setData(Collections.singletonList(weightCategory)); ui.getWeightCategory().setSelectedItem(weightCategory); - ui.getReasonForDiscard().setData(Collections.singletonList(reasonForDiscard)); +// ui.getReasonForDiscard().setData(Collections.singletonList(reasonForDiscard)); ui.getReasonForDiscard().setSelectedItem(reasonForDiscard); requestFocus = ui.getCatchWeight(); @@ -239,7 +245,7 @@ public class TargetDiscardCatchUIHandler extends ContentTableUIHandler<SetTarget UIHelper.setI18nTableHeaderRenderer( table, - n("observe.data.ps.observation.TargetDiscard.table.speciesThon"), + n("observe.data.ps.observation.TargetDiscard.table.species"), n("observe.data.ps.observation.TargetDiscard.table.species.tip"), n("observe.data.ps.observation.TargetDiscard.table.weightCategory"), n("observe.data.ps.observation.TargetDiscard.table.weightCategory.tip"), @@ -362,7 +368,6 @@ public class TargetDiscardCatchUIHandler extends ContentTableUIHandler<SetTarget } - @SuppressWarnings("unchecked") private List<ReasonForDiscardReference> buildReasonFordiscardList() { return getModel().getReferenceCache().getReferentialReferences(TargetCatchDto.PROPERTY_REASON_FOR_DISCARD); } @@ -382,9 +387,6 @@ public class TargetDiscardCatchUIHandler extends ContentTableUIHandler<SetTarget protected void loadEditBean(String beanId) { Form<SetTargetCatchDto> form = getPsObservationTargetCatchService().loadForm(beanId, true); getModel().openForm(form); -// loadReferentialReferenceSetsInModel(form); -// getModel().setForm(form); -// SetTargetCatchHelper.copySetTargetCatchDto(form.getObject(), getBean()); } @Override ===================================== client-datasource-editor-ps/src/main/java/fr/ird/observe/client/datasource/editor/content/data/ps/observation/TargetSampleUIHandler.java ===================================== @@ -157,8 +157,8 @@ public class TargetSampleUIHandler<U extends ContentTableUI<TargetSampleDto, Tar UIHelper.setI18nTableHeaderRenderer( table, - n("observe.data.ps.observation.TargetLength.table.speciesThon"), - n("observe.data.ps.observation.TargetLength.table.speciesThon.tip"), + n("observe.data.ps.observation.TargetLength.table.species"), + n("observe.data.ps.observation.TargetLength.table.species.tip"), n("observe.data.ps.observation.TargetLength.table.sex"), n("observe.data.ps.observation.TargetLength.table.sex.tip"), n("observe.data.ps.observation.TargetLength.table.sizeMeasureType"), ===================================== observe-i18n/src/main/i18n/translations/observe_en_GB.properties ===================================== @@ -2005,10 +2005,10 @@ observe.data.ps.observation.NonTargetCatch.table.meanWeight=Mean weight observe.data.ps.observation.NonTargetCatch.table.meanWeight.tip=Mean weight (in Kg) observe.data.ps.observation.NonTargetCatch.table.reasonForDiscard=Reason for discard observe.data.ps.observation.NonTargetCatch.table.reasonForDiscard.tip=Reason for discard +observe.data.ps.observation.NonTargetCatch.table.species=Species +observe.data.ps.observation.NonTargetCatch.table.species.tip=non target species observe.data.ps.observation.NonTargetCatch.table.speciesFate=Species fate observe.data.ps.observation.NonTargetCatch.table.speciesFate.tip=Species fate -observe.data.ps.observation.NonTargetCatch.table.speciesFaune=Species -observe.data.ps.observation.NonTargetCatch.table.speciesFaune.tip=non target species observe.data.ps.observation.NonTargetCatch.table.totalCount=Count observe.data.ps.observation.NonTargetCatch.table.totalCount.tip=Estimated count observe.data.ps.observation.NonTargetCatch.table.well=Well @@ -2064,12 +2064,12 @@ observe.data.ps.observation.NonTargetLength.table.length=Length observe.data.ps.observation.NonTargetLength.table.length.tip=Length observe.data.ps.observation.NonTargetLength.table.meanWeight=Indiv. Weight observe.data.ps.observation.NonTargetLength.table.meanWeight.tip=Individual weight (en Kg) -observe.data.ps.observation.NonTargetLength.table.nonTargetSpecies=Species -observe.data.ps.observation.NonTargetLength.table.nonTargetSpecies.tip=Non target species observe.data.ps.observation.NonTargetLength.table.picturesReferences=Pictures references observe.data.ps.observation.NonTargetLength.table.picturesReferences.tip=Pictures references observe.data.ps.observation.NonTargetLength.table.sizeMeasureType=Measure type observe.data.ps.observation.NonTargetLength.table.sizeMeasureType.tip=Size measure type +observe.data.ps.observation.NonTargetLength.table.species=Species +observe.data.ps.observation.NonTargetLength.table.species.tip=Non target species observe.data.ps.observation.NonTargetLength.tagNumber=Sample number observe.data.ps.observation.NonTargetLength.title=Non target lengths observe.data.ps.observation.NonTargetLength.type=Non target length @@ -2092,8 +2092,8 @@ observe.data.ps.observation.ObjectObservedSpecies.species=Species observe.data.ps.observation.ObjectObservedSpecies.speciesStatus=Species status observe.data.ps.observation.ObjectObservedSpecies.table.count=Count observe.data.ps.observation.ObjectObservedSpecies.table.count.tip=Count -observe.data.ps.observation.ObjectObservedSpecies.table.speciesFaune=Species -observe.data.ps.observation.ObjectObservedSpecies.table.speciesFaune.tip=Object observed species +observe.data.ps.observation.ObjectObservedSpecies.table.species=Species +observe.data.ps.observation.ObjectObservedSpecies.table.species.tip=Object observed species observe.data.ps.observation.ObjectObservedSpecies.table.speciesStatus=Status observe.data.ps.observation.ObjectObservedSpecies.table.speciesStatus.tip=Species status observe.data.ps.observation.ObjectObservedSpecies.title=Object observed species @@ -2155,8 +2155,8 @@ observe.data.ps.observation.SchoolEstimate.meanWeight=Mean weight observe.data.ps.observation.SchoolEstimate.species=Species observe.data.ps.observation.SchoolEstimate.table.meanWeight=Mean weight (in Kg) observe.data.ps.observation.SchoolEstimate.table.meanWeight.tip=Mean weight (in Kg) -observe.data.ps.observation.SchoolEstimate.table.speciesThon=Species -observe.data.ps.observation.SchoolEstimate.table.speciesThon.tip=Target species +observe.data.ps.observation.SchoolEstimate.table.species=Species +observe.data.ps.observation.SchoolEstimate.table.species.tip=Target species observe.data.ps.observation.SchoolEstimate.table.weight=Weight (in t) observe.data.ps.observation.SchoolEstimate.table.weight.tip=Weight (in t) observe.data.ps.observation.SchoolEstimate.title=School estimate @@ -2213,8 +2213,8 @@ observe.data.ps.observation.TargetCatch.species=Species observe.data.ps.observation.TargetCatch.table.comment=Com observe.data.ps.observation.TargetCatch.table.comment.tip=comment observe.data.ps.observation.TargetCatch.table.deleteExtraMessage=\nDeleting a target catch will delete all the sample for this species. -observe.data.ps.observation.TargetCatch.table.speciesThon=Species -observe.data.ps.observation.TargetCatch.table.speciesThon.tip=Targt species +observe.data.ps.observation.TargetCatch.table.species=Species +observe.data.ps.observation.TargetCatch.table.species.tip=Targt species observe.data.ps.observation.TargetCatch.table.weight=Weight (in t) observe.data.ps.observation.TargetCatch.table.weight.tip=Weight (in t) observe.data.ps.observation.TargetCatch.table.weightCategory=Weight category @@ -2237,8 +2237,8 @@ observe.data.ps.observation.TargetDiscard.table.comment.tip=Comment observe.data.ps.observation.TargetDiscard.table.deleteExtraMessage=\nDeleting a discarded target catch will delete all the sample for this species. observe.data.ps.observation.TargetDiscard.table.reasonForDiscard=Reason for discard observe.data.ps.observation.TargetDiscard.table.reasonForDiscard.tip=Reason for discard +observe.data.ps.observation.TargetDiscard.table.species=Species observe.data.ps.observation.TargetDiscard.table.species.tip=Target discarded species -observe.data.ps.observation.TargetDiscard.table.speciesThon=Species observe.data.ps.observation.TargetDiscard.table.weight=Weight (in t) observe.data.ps.observation.TargetDiscard.table.weight.tip=Weight (in t) observe.data.ps.observation.TargetDiscard.table.weightCategory=Weight category @@ -2262,8 +2262,8 @@ observe.data.ps.observation.TargetLength.table.sex=Sex observe.data.ps.observation.TargetLength.table.sex.tip=Sex observe.data.ps.observation.TargetLength.table.sizeMeasureType=Measure type observe.data.ps.observation.TargetLength.table.sizeMeasureType.tip=Measure type (LF or LD1) -observe.data.ps.observation.TargetLength.table.speciesThon=Species -observe.data.ps.observation.TargetLength.table.speciesThon.tip=Target sample species +observe.data.ps.observation.TargetLength.table.species=Species +observe.data.ps.observation.TargetLength.table.species.tip=Target sample species observe.data.ps.observation.TargetLength.table.totalWeight=Total weight (in t) observe.data.ps.observation.TargetLength.table.totalWeight.tip=Total weight (in t) observe.data.ps.observation.TargetLength.tagNumber=Tag number ===================================== observe-i18n/src/main/i18n/translations/observe_es_ES.properties ===================================== @@ -2005,10 +2005,10 @@ observe.data.ps.observation.NonTargetCatch.table.meanWeight=Peso medio observe.data.ps.observation.NonTargetCatch.table.meanWeight.tip=Peso medio (en Kg) observe.data.ps.observation.NonTargetCatch.table.reasonForDiscard=Razón del descarte observe.data.ps.observation.NonTargetCatch.table.reasonForDiscard.tip=Razón del descarte +observe.data.ps.observation.NonTargetCatch.table.species=Especie +observe.data.ps.observation.NonTargetCatch.table.species.tip=Especie observe.data.ps.observation.NonTargetCatch.table.speciesFate=Devenir observe.data.ps.observation.NonTargetCatch.table.speciesFate.tip=Devenir de la fauna -observe.data.ps.observation.NonTargetCatch.table.speciesFaune=Especie -observe.data.ps.observation.NonTargetCatch.table.speciesFaune.tip=Especie observe.data.ps.observation.NonTargetCatch.table.totalCount=Número observe.data.ps.observation.NonTargetCatch.table.totalCount.tip=Número estimado observe.data.ps.observation.NonTargetCatch.table.well=Cuba @@ -2064,12 +2064,12 @@ observe.data.ps.observation.NonTargetLength.table.length=Talla observe.data.ps.observation.NonTargetLength.table.length.tip=Talla observe.data.ps.observation.NonTargetLength.table.meanWeight=Peso observe.data.ps.observation.NonTargetLength.table.meanWeight.tip=Peso del individuo -observe.data.ps.observation.NonTargetLength.table.nonTargetSpecies=Especie -observe.data.ps.observation.NonTargetLength.table.nonTargetSpecies.tip=Especie observe.data.ps.observation.NonTargetLength.table.picturesReferences=Ref. foto observe.data.ps.observation.NonTargetLength.table.picturesReferences.tip=Referencia foto observe.data.ps.observation.NonTargetLength.table.sizeMeasureType=Typo de medida observe.data.ps.observation.NonTargetLength.table.sizeMeasureType.tip=Typo de medida +observe.data.ps.observation.NonTargetLength.table.species=Especie +observe.data.ps.observation.NonTargetLength.table.species.tip=Especie observe.data.ps.observation.NonTargetLength.tagNumber=Numéro d'échantillon \#TODO observe.data.ps.observation.NonTargetLength.title=Longitudes (cm inf.) observe.data.ps.observation.NonTargetLength.type=Longitud (cm inf.) @@ -2092,8 +2092,8 @@ observe.data.ps.observation.ObjectObservedSpecies.species=Especie observe.data.ps.observation.ObjectObservedSpecies.speciesStatus=Estado de especie observe.data.ps.observation.ObjectObservedSpecies.table.count=Número observe.data.ps.observation.ObjectObservedSpecies.table.count.tip=Número -observe.data.ps.observation.ObjectObservedSpecies.table.speciesFaune=Especie -observe.data.ps.observation.ObjectObservedSpecies.table.speciesFaune.tip=Especie +observe.data.ps.observation.ObjectObservedSpecies.table.species=Especie +observe.data.ps.observation.ObjectObservedSpecies.table.species.tip=Especie observe.data.ps.observation.ObjectObservedSpecies.table.speciesStatus=Estado observe.data.ps.observation.ObjectObservedSpecies.table.speciesStatus.tip=Estado observe.data.ps.observation.ObjectObservedSpecies.title=Fauna observada @@ -2155,8 +2155,8 @@ observe.data.ps.observation.SchoolEstimate.meanWeight=Peso medio (en Kg) observe.data.ps.observation.SchoolEstimate.species=Especie observe.data.ps.observation.SchoolEstimate.table.meanWeight=Peso medio (en Kg) observe.data.ps.observation.SchoolEstimate.table.meanWeight.tip=Peso medio (en Kg) -observe.data.ps.observation.SchoolEstimate.table.speciesThon=Especie -observe.data.ps.observation.SchoolEstimate.table.speciesThon.tip=Especie de atún (no se puede modificar una vez se haya creado la estimación) +observe.data.ps.observation.SchoolEstimate.table.species=Especie +observe.data.ps.observation.SchoolEstimate.table.species.tip=Especie de atún (no se puede modificar una vez se haya creado la estimación) observe.data.ps.observation.SchoolEstimate.table.weight=Peso (en t) observe.data.ps.observation.SchoolEstimate.table.weight.tip=Peso (en t) observe.data.ps.observation.SchoolEstimate.title=Estimación del banco @@ -2213,8 +2213,8 @@ observe.data.ps.observation.TargetCatch.species=Especie observe.data.ps.observation.TargetCatch.table.comment=Comentario observe.data.ps.observation.TargetCatch.table.comment.tip=Comentario observe.data.ps.observation.TargetCatch.table.deleteExtraMessage=\nLa eliminación de una captura de atún puede provocar la eliminación de muestreo(s) sobre la especie. -observe.data.ps.observation.TargetCatch.table.speciesThon=Atún puesto en tanque -observe.data.ps.observation.TargetCatch.table.speciesThon.tip=Atún puesto en tanque +observe.data.ps.observation.TargetCatch.table.species=Atún puesto en tanque +observe.data.ps.observation.TargetCatch.table.species.tip=Atún puesto en tanque observe.data.ps.observation.TargetCatch.table.weight=Peso (en t) observe.data.ps.observation.TargetCatch.table.weight.tip=Peso (en t) observe.data.ps.observation.TargetCatch.table.weightCategory=Categoría de peso @@ -2237,8 +2237,8 @@ observe.data.ps.observation.TargetDiscard.table.comment.tip=Comentario observe.data.ps.observation.TargetDiscard.table.deleteExtraMessage=\nLa eliminación de un rechazo de atún puede provocar la eliminación de muestreo(s) sobre la especie. observe.data.ps.observation.TargetDiscard.table.reasonForDiscard=Razon de descarte observe.data.ps.observation.TargetDiscard.table.reasonForDiscard.tip=Razon de descarte +observe.data.ps.observation.TargetDiscard.table.species=Especie de atún observe.data.ps.observation.TargetDiscard.table.species.tip=Especie de atún -observe.data.ps.observation.TargetDiscard.table.speciesThon=Especie de atún observe.data.ps.observation.TargetDiscard.table.weight=Peso observe.data.ps.observation.TargetDiscard.table.weight.tip=Peso (en t) observe.data.ps.observation.TargetDiscard.table.weightCategory=Categoría de peso @@ -2262,8 +2262,8 @@ observe.data.ps.observation.TargetLength.table.sex=Sexo observe.data.ps.observation.TargetLength.table.sex.tip=Sexo observe.data.ps.observation.TargetLength.table.sizeMeasureType=Tipo de medición observe.data.ps.observation.TargetLength.table.sizeMeasureType.tip=El tipo de medición utilizado (LF ou LD1) -observe.data.ps.observation.TargetLength.table.speciesThon=Especie de atún -observe.data.ps.observation.TargetLength.table.speciesThon.tip=Especie de atún +observe.data.ps.observation.TargetLength.table.species=Especie de atún +observe.data.ps.observation.TargetLength.table.species.tip=Especie de atún observe.data.ps.observation.TargetLength.table.totalWeight=Peso tot. observe.data.ps.observation.TargetLength.table.totalWeight.tip=Peso total (en t) observe.data.ps.observation.TargetLength.tagNumber=Numéro échantillon \#TODO ===================================== observe-i18n/src/main/i18n/translations/observe_fr_FR.properties ===================================== @@ -2005,10 +2005,10 @@ observe.data.ps.observation.NonTargetCatch.table.meanWeight=Poids moy observe.data.ps.observation.NonTargetCatch.table.meanWeight.tip=Poids moyen (en Kg) observe.data.ps.observation.NonTargetCatch.table.reasonForDiscard=Raison rejet observe.data.ps.observation.NonTargetCatch.table.reasonForDiscard.tip=Raison rejet +observe.data.ps.observation.NonTargetCatch.table.species=Espèce de faune +observe.data.ps.observation.NonTargetCatch.table.species.tip=Espèce de faune observe.data.ps.observation.NonTargetCatch.table.speciesFate=Devenir observe.data.ps.observation.NonTargetCatch.table.speciesFate.tip=Devenir faune -observe.data.ps.observation.NonTargetCatch.table.speciesFaune=Espèce de faune -observe.data.ps.observation.NonTargetCatch.table.speciesFaune.tip=Espèce de faune observe.data.ps.observation.NonTargetCatch.table.totalCount=Nombre observe.data.ps.observation.NonTargetCatch.table.totalCount.tip=Nombre estimé observe.data.ps.observation.NonTargetCatch.table.well=Cuve @@ -2064,12 +2064,12 @@ observe.data.ps.observation.NonTargetLength.table.length=Longueur observe.data.ps.observation.NonTargetLength.table.length.tip=Longueur observe.data.ps.observation.NonTargetLength.table.meanWeight=Poids ind.. observe.data.ps.observation.NonTargetLength.table.meanWeight.tip=Poids individuel (en Kg) -observe.data.ps.observation.NonTargetLength.table.nonTargetSpecies=Espèce faune -observe.data.ps.observation.NonTargetLength.table.nonTargetSpecies.tip=Espèce faune observe.data.ps.observation.NonTargetLength.table.picturesReferences=Ref photo observe.data.ps.observation.NonTargetLength.table.picturesReferences.tip=référence photo observe.data.ps.observation.NonTargetLength.table.sizeMeasureType=Type de mensuration observe.data.ps.observation.NonTargetLength.table.sizeMeasureType.tip=Le type de mensuration utilisé (LF ou LD1) +observe.data.ps.observation.NonTargetLength.table.species=Espèce faune +observe.data.ps.observation.NonTargetLength.table.species.tip=Espèce faune observe.data.ps.observation.NonTargetLength.tagNumber=Id marque observe.data.ps.observation.NonTargetLength.title=Longueurs (cm inf.) observe.data.ps.observation.NonTargetLength.type=Longueur (cm inf.) @@ -2092,8 +2092,8 @@ observe.data.ps.observation.ObjectObservedSpecies.species=Espèce observe.data.ps.observation.ObjectObservedSpecies.speciesStatus=Statut faune observée observe.data.ps.observation.ObjectObservedSpecies.table.count=Nombre observe.data.ps.observation.ObjectObservedSpecies.table.count.tip=Nombre -observe.data.ps.observation.ObjectObservedSpecies.table.speciesFaune=Espèce de faune -observe.data.ps.observation.ObjectObservedSpecies.table.speciesFaune.tip=Espèce de faune +observe.data.ps.observation.ObjectObservedSpecies.table.species=Espèce de faune +observe.data.ps.observation.ObjectObservedSpecies.table.species.tip=Espèce de faune observe.data.ps.observation.ObjectObservedSpecies.table.speciesStatus=Statut Espèce observe.data.ps.observation.ObjectObservedSpecies.table.speciesStatus.tip=Statut Espèce observe.data.ps.observation.ObjectObservedSpecies.title=Faune observée @@ -2155,8 +2155,8 @@ observe.data.ps.observation.SchoolEstimate.meanWeight=Poids moyen (en Kg) observe.data.ps.observation.SchoolEstimate.species=Espèce observe.data.ps.observation.SchoolEstimate.table.meanWeight=Poids moyen (en Kg) observe.data.ps.observation.SchoolEstimate.table.meanWeight.tip=Poids moyen (en Kg) -observe.data.ps.observation.SchoolEstimate.table.speciesThon=Espèce de thon -observe.data.ps.observation.SchoolEstimate.table.speciesThon.tip=Espèce de thon (ne peut pas être modifié une fois l'estimation crée) +observe.data.ps.observation.SchoolEstimate.table.species=Espèce de thon +observe.data.ps.observation.SchoolEstimate.table.species.tip=Espèce de thon (ne peut pas être modifié une fois l'estimation crée) observe.data.ps.observation.SchoolEstimate.table.weight=Poids (en t) observe.data.ps.observation.SchoolEstimate.table.weight.tip=Poids (en t) observe.data.ps.observation.SchoolEstimate.title=Estimation banc @@ -2213,8 +2213,8 @@ observe.data.ps.observation.TargetCatch.species=Espèce observe.data.ps.observation.TargetCatch.table.comment=Com observe.data.ps.observation.TargetCatch.table.comment.tip=Commentaire observe.data.ps.observation.TargetCatch.table.deleteExtraMessage=\nLe fait de supprimer une capture thon peut entrainer la suppression d'échantillonnage(s) sur l'espèce. -observe.data.ps.observation.TargetCatch.table.speciesThon=Thon mis en cuve -observe.data.ps.observation.TargetCatch.table.speciesThon.tip=Thon mis en cuve +observe.data.ps.observation.TargetCatch.table.species=Thon mis en cuve +observe.data.ps.observation.TargetCatch.table.species.tip=Thon mis en cuve observe.data.ps.observation.TargetCatch.table.weight=Poids (en t) observe.data.ps.observation.TargetCatch.table.weight.tip=Poids (en t) observe.data.ps.observation.TargetCatch.table.weightCategory=Catégorie de poids @@ -2237,8 +2237,8 @@ observe.data.ps.observation.TargetDiscard.table.comment.tip=Commentaire observe.data.ps.observation.TargetDiscard.table.deleteExtraMessage=\nLe fait de supprimer un rejet de thon peut entrainer la suppression d'échantillonnage(s) sur l'espèce. observe.data.ps.observation.TargetDiscard.table.reasonForDiscard=Raison rejet observe.data.ps.observation.TargetDiscard.table.reasonForDiscard.tip=Raison rejet +observe.data.ps.observation.TargetDiscard.table.species=Espèce de thon observe.data.ps.observation.TargetDiscard.table.species.tip=Espèce de thon -observe.data.ps.observation.TargetDiscard.table.speciesThon=Espèce de thon observe.data.ps.observation.TargetDiscard.table.weight=Poids observe.data.ps.observation.TargetDiscard.table.weight.tip=Poids (en t) observe.data.ps.observation.TargetDiscard.table.weightCategory=Catégorie de poids @@ -2262,8 +2262,8 @@ observe.data.ps.observation.TargetLength.table.sex=Sexe observe.data.ps.observation.TargetLength.table.sex.tip=Sexe observe.data.ps.observation.TargetLength.table.sizeMeasureType=Type de mensuration observe.data.ps.observation.TargetLength.table.sizeMeasureType.tip=Le type de mensuration utilisé (LF ou LD1) -observe.data.ps.observation.TargetLength.table.speciesThon=Espèce de thon -observe.data.ps.observation.TargetLength.table.speciesThon.tip=Espèce de thon +observe.data.ps.observation.TargetLength.table.species=Espèce de thon +observe.data.ps.observation.TargetLength.table.species.tip=Espèce de thon observe.data.ps.observation.TargetLength.table.totalWeight=Poids tot. observe.data.ps.observation.TargetLength.table.totalWeight.tip=Poids total (en t) observe.data.ps.observation.TargetLength.tagNumber=Numéro échantillon ===================================== persistence/src/main/java/fr/ird/observe/entities/data/ps/observation/TargetCatchImpl.java ===================================== @@ -21,6 +21,8 @@ */ package fr.ird.observe.entities.data.ps.observation; +import fr.ird.observe.dto.data.DataDto; +import fr.ird.observe.dto.referential.ReferentialLocale; import fr.ird.observe.entities.referential.common.Species; import org.nuiton.util.NumberUtil; @@ -51,4 +53,13 @@ public class TargetCatchImpl extends TargetCatchAbstract { super.setCatchWeight(catchWeight); } + @Override + public <D extends DataDto> void toDto(ReferentialLocale referentialLocale, D dto) { + super.toDto(referentialLocale, dto); + + if (dto instanceof fr.ird.observe.dto.data.ps.observation.TargetCatchDto) { + fr.ird.observe.dto.data.ps.observation.TargetCatchDto dto1 = (fr.ird.observe.dto.data.ps.observation.TargetCatchDto) dto; + dto1.setSpecies(java.util.Optional.ofNullable(getSpecies()).map(e-> e.toReference(referentialLocale)).orElse(null)); + } + } } ===================================== persistence/src/main/resources/db/migration/7.4/03_rename_referential-H2.sql ===================================== @@ -43,5 +43,5 @@ CREATE INDEX idx_observe_longline_catch_stomachFullness ON observe_longline.catc DROP TABLE observe_longline.Healthness; DROP TABLE observe_longline.StomacFullness; -UPDATE observe_common.LASTUPDATEDATE SET TYPE = REPLACE(TYPE, 'referentiel.longline.Healthness', 'referential.longline.HealthStatus'); -UPDATE observe_common.LASTUPDATEDATE SET TYPE = REPLACE(TYPE, 'referentiel.longline.StomacFullness', 'referential.longline.StomachFullness'); \ No newline at end of file +UPDATE observe_common.LASTUPDATEDATE SET TYPE = REPLACE(TYPE, 'referentiel.longline.Healthness', 'referentiel.longline.HealthStatus'); +UPDATE observe_common.LASTUPDATEDATE SET TYPE = REPLACE(TYPE, 'referentiel.longline.StomacFullness', 'referentiel.longline.StomachFullness'); \ No newline at end of file ===================================== persistence/src/main/resources/db/migration/7.4/03_rename_referential-PG.sql ===================================== @@ -43,4 +43,4 @@ DROP TABLE observe_longline.Healthness CASCADE; DROP TABLE observe_longline.StomacFullness CASCADE; UPDATE observe_common.LASTUPDATEDATE SET TYPE = REPLACE(TYPE, 'referentiel.longline.Healthness', 'referentiel.longline.HealthStatus'); -UPDATE observe_common.LASTUPDATEDATE SET TYPE = REPLACE(TYPE, 'referentiel.longline.StomachFullness', 'referentiel.longline.StomachFullness'); \ No newline at end of file +UPDATE observe_common.LASTUPDATEDATE SET TYPE = REPLACE(TYPE, 'referentiel.longline.StomacFullness', 'referentiel.longline.StomachFullness'); \ No newline at end of file ===================================== services-local/src/main/java/fr/ird/observe/services/local/service/referential/ReferentialServiceLocal.java ===================================== @@ -57,6 +57,7 @@ import fr.ird.observe.spi.map.ImmutableTypedMap; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; import org.nuiton.topia.persistence.TopiaDao; +import org.nuiton.topia.persistence.TopiaException; import org.nuiton.topia.persistence.metadata.TopiaMetadataEntity; import org.nuiton.topia.persistence.metadata.TopiaMetadataModel; import org.nuiton.topia.persistence.script.SqlScriptConsumer; @@ -314,8 +315,12 @@ public class ReferentialServiceLocal extends ObserveServiceLocal implements Refe ReferentialDtoEntityContext<D, ?, E, ?> dtoEntityContext = DbModelHelper.fromReferentialDtoWeak(dtoType); Class<E> entityType = dtoEntityContext.toEntityType(); ObserveTopiaPersistenceContext persistenceContext = serviceContext.getTopiaPersistenceContext(); - Date lastUpdateDate = persistenceContext.getLastUpdateDate(entityType); - return Optional.ofNullable(lastUpdateDate); + try { + Date lastUpdateDate = persistenceContext.getLastUpdateDate(entityType); + return Optional.ofNullable(lastUpdateDate); + } catch (Exception e) { + throw new TopiaException(String.format("Can't find last update date for type: %s", entityType.getName())); + } } private <D extends ReferentialDto, E extends ReferentialEntity<D, ?>> Form<D> referentialEntityToForm(ReferentialDtoEntityContext<D, ?, E, ?> spi, E entity) { ===================================== test/src/main/resources/db/8.0-RC-2/dataForTestLongline.sql.gz ===================================== Binary files a/test/src/main/resources/db/8.0-RC-2/dataForTestLongline.sql.gz and b/test/src/main/resources/db/8.0-RC-2/dataForTestLongline.sql.gz differ ===================================== test/src/main/resources/db/8.0-RC-2/dataForTestSeine.sql.gz ===================================== Binary files a/test/src/main/resources/db/8.0-RC-2/dataForTestSeine.sql.gz and b/test/src/main/resources/db/8.0-RC-2/dataForTestSeine.sql.gz differ ===================================== test/src/main/resources/db/8.0-RC-2/referentiel.sql.gz ===================================== Binary files a/test/src/main/resources/db/8.0-RC-2/referentiel.sql.gz and b/test/src/main/resources/db/8.0-RC-2/referentiel.sql.gz differ ===================================== test/src/main/resources/fixtures/validate-service-seine-trips.properties ===================================== @@ -28,5 +28,4 @@ NonTargetCatchDto=3 NonTargetLengthDto=3 TargetLengthDto=1 FloatingObjectDto=1 -FloatingObjectPartDto=1 -TargetCatchDto=1 +FloatingObjectPartDto=1 \ No newline at end of file View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/compare/16203a30a6d40f66bbf2be9d… -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/compare/16203a30a6d40f66bbf2be9d… You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-observe][develop] 7 commits: Fix topia persistence createDate is missing on create time (don't know what does that changed...)
by Tony CHEMIT 28 Mar '20

28 Mar '20

Tony CHEMIT pushed to branch develop at ultreiaio / ird-observe Commits: e354df86 by tchemit at 2020-03-28T12:54:59+01:00 Fix topia persistence createDate is missing on create time (don't know what does that changed...) - - - - - 07549970 by tchemit at 2020-03-28T12:55:26+01:00 [SFA] LL / Logbooks / Samples : mode de saisie par défaut - Closes #1452 - - - - - 1dae508c by tchemit at 2020-03-28T12:55:26+01:00 [SFA] LL / Logbooks / Captures - Closes #1451 - - - - - b18757a6 by tchemit at 2020-03-28T12:55:26+01:00 [SFA] LL/Logbook/Trips/activity date by default - Closes #1449 - - - - - fd5417d6 by tchemit at 2020-03-28T13:09:51+01:00 Let's lastUpdateDate a real topia timestamp - - - - - 82ee050f by tchemit at 2020-03-28T13:10:29+01:00 add v7 migrations - - - - - 16203a30 by tchemit at 2020-03-28T15:09:05+01:00 Réusinage de la table transmittingbuoy - Closes #1456 - - - - - 30 changed files: - client-datasource-editor-api/src/main/java/fr/ird/observe/client/datasource/editor/content/data/table/ContentTableUIModel.java - client-datasource-editor-ll/src/main/i18n/getters/java.getter - client-datasource-editor-ll/src/main/java/fr/ird/observe/client/datasource/editor/content/data/ll/logbook/CatchUIHandler.java - client-datasource-editor-ll/src/main/java/fr/ird/observe/client/datasource/editor/content/data/ll/logbook/CatchUIModel.java - client-datasource-editor-ll/src/main/java/fr/ird/observe/client/datasource/editor/content/data/ll/logbook/SamplePartUIHandler.java - client-datasource-editor-ps/src/main/i18n/getters/jaxx.getter - client-datasource-editor-ps/src/main/java/fr/ird/observe/client/datasource/dcp/presets/observation/FloatingObjectBuoyPresetUI.jaxx - client-datasource-editor-ps/src/main/java/fr/ird/observe/client/datasource/dcp/presets/observation/FloatingObjectBuoyPresetUI.jcss - client-datasource-editor-ps/src/main/java/fr/ird/observe/client/datasource/dcp/presets/observation/FloatingObjectBuoyPresetUIModel.java - client-datasource-editor-ps/src/main/java/fr/ird/observe/client/datasource/dcp/presets/observation/FloatingObjectPresetUIHandler.java - client-datasource-editor-ps/src/main/java/fr/ird/observe/client/datasource/dcp/presets/observation/UIHandlerSupport.java - client-datasource-editor-ps/src/main/java/fr/ird/observe/client/datasource/editor/content/data/ps/observation/FloatingObjectUI.jaxx - client-datasource-editor-ps/src/main/java/fr/ird/observe/client/datasource/editor/content/data/ps/observation/FloatingObjectUI.jcss - client-datasource-editor-ps/src/main/java/fr/ird/observe/client/datasource/editor/content/data/ps/observation/FloatingObjectUIModel.java - dto/src/main/java/fr/ird/observe/dto/data/ps/dcp/FloatingObjectBuoyPreset.java - dto/src/main/java/fr/ird/observe/dto/data/ps/dcp/FloatingObjectPreset.java - dto/src/main/java/fr/ird/observe/dto/data/ps/observation/TransmittingBuoyDto.java - dto/src/main/java/fr/ird/observe/dto/decoration/init/DataPsObservationModelDecoratorInitializer.java - dto/src/main/models/Observe-20-data-ps-observation.model - dto/src/test/java/fr/ird/observe/dto/data/ps/dcp/FloatingObjectPresetStorageTest.java - dto/src/test/resources/fr/ird/observe/dto/data/ps/dcp/01_preset.yml - dto/src/test/resources/fr/ird/observe/dto/data/ps/dcp/02_preset.yml - observe-i18n/src/main/i18n/translations/observe_en_GB.properties - observe-i18n/src/main/i18n/translations/observe_es_ES.properties - observe-i18n/src/main/i18n/translations/observe_fr_FR.properties - persistence/src/main/java/fr/ird/observe/entities/data/ps/observation/FloatingObjectImpl.java - + persistence/src/main/java/fr/ird/observe/entities/migration/DataSourceMigrationForVersion_7_5.java - persistence/src/main/models/Observe-00-common.model - persistence/src/main/models/Observe-20-data-ps-observation.model - + persistence/src/main/resources/db/migration/7.5/01_migrate_TransmittingBuoyOperation_brand-H2.sql The diff was not included because it is too large. View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/compare/8faa6ceba9388cb83c4ba64e… -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/compare/8faa6ceba9388cb83c4ba64e… You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-observe][develop-7.x] Réusinage de la table transmittingbuoy - Closes #1456
by Tony CHEMIT 28 Mar '20

28 Mar '20

Tony CHEMIT pushed to branch develop-7.x at ultreiaio / ird-observe Commits: 0b0ed727 by tchemit at 2020-03-28T09:45:16+01:00 Réusinage de la table transmittingbuoy - Closes #1456 - - - - - 19 changed files: - client-core/src/main/i18n/getters/jaxx.getter - client-core/src/main/java/fr/ird/observe/client/ui/content/data/seine/FloatingObjectTransmittingBuoyOperationUI.jaxx - client-core/src/main/java/fr/ird/observe/client/ui/content/data/seine/FloatingObjectTransmittingBuoyOperationUI.jcss - client-core/src/main/java/fr/ird/observe/client/ui/content/data/seine/FloatingObjectTransmittingBuoyOperationUIHandler.java - dto/src/main/java/fr/ird/observe/binder/data/seine/TransmittingBuoyDtoReferenceBinder.java - dto/src/main/java/fr/ird/observe/dto/decoration/DecoratorService.java - dto/src/main/models/Observe.model - persistence/src/main/java/fr/ird/observe/binder/data/seine/TransmittingBuoyEntityDtoBinder.java - persistence/src/main/java/fr/ird/observe/binder/data/seine/TransmittingBuoyEntityReferenceBinder.java - + persistence/src/main/java/fr/ird/observe/persistence/migration/DataSourceMigrationForVersion_7_5.java - persistence/src/main/models/Observe.model - + persistence/src/main/resources/db/migration/7.5/01_migrate_TransmittingBuoyOperation_brand-H2.sql - + persistence/src/main/resources/db/migration/7.5/01_migrate_TransmittingBuoyOperation_brand-PG.sql - pom.xml - + test/src/main/resources/db/7.5/dataForTestLongline.sql.gz - + test/src/main/resources/db/7.5/dataForTestSeine.sql.gz - + test/src/main/resources/db/7.5/empty_h2.sql.gz - + test/src/main/resources/db/7.5/empty_pg.sql.gz - + test/src/main/resources/db/7.5/referentiel.sql.gz Changes: ===================================== client-core/src/main/i18n/getters/jaxx.getter ===================================== @@ -639,7 +639,6 @@ observe.common.TdrDto.serialNo observe.common.TdrDto.speciesTab observe.common.TdrDto.timestampTab observe.common.TdrDto.title -observe.common.TransmittingBuoyDto.brand observe.common.TransmittingBuoyDto.noBuoy observe.common.TransmittingBuoyDto.ownership observe.common.TransmittingBuoyDto.title ===================================== client-core/src/main/java/fr/ird/observe/client/ui/content/data/seine/FloatingObjectTransmittingBuoyOperationUI.jaxx ===================================== @@ -177,11 +177,8 @@ </cell> </row> <row> - <cell anchor='west'> - <JLabel id='brand1Label'/> - </cell> - <cell anchor='east' weightx="1" fill="both"> - <JTextField id='brand1' onKeyReleased='transmittingBuoy1.setBrand(brand1.getText())'/> + <cell columns='2' fill="both" weighty="1"> + <JComment id='comment1'/> </cell> </row> </Table> @@ -239,11 +236,8 @@ </cell> </row> <row> - <cell anchor='west'> - <JLabel id='brand2Label'/> - </cell> - <cell anchor='east' weightx="1" fill="both"> - <JTextField id='brand2' onKeyReleased='transmittingBuoy2.setBrand(brand2.getText())'/> + <cell columns='2' weighty="1"> + <JComment id='comment2'/> </cell> </row> </Table> ===================================== client-core/src/main/java/fr/ird/observe/client/ui/content/data/seine/FloatingObjectTransmittingBuoyOperationUI.jcss ===================================== @@ -20,6 +20,10 @@ * #L% */ +JComment { + i18nProperty:comment; +} + #model { editable:true; modified:{validator.isChanged() || validatorBalise1.isChanged() || validatorBalise2.isChanged()}; @@ -106,12 +110,8 @@ text:{getStringValue(transmittingBuoy1.getCode())}; } -#brand1Label { - text:"observe.common.TransmittingBuoyDto.brand"; -} - -#brand1 { - text:{getStringValue(transmittingBuoy1.getBrand())}; +#comment1 { + model:{getTransmittingBuoy1()}; } #transmittingBuoyOperation2Label { @@ -176,12 +176,8 @@ text:{getStringValue(transmittingBuoy2.getCode())}; } -#brand2Label { - text:"observe.common.TransmittingBuoyDto.brand"; -} - -#brand2 { - text:{getStringValue(transmittingBuoy2.getBrand())}; +#comment2 { + model:{getTransmittingBuoy2()}; } #reset { ===================================== client-core/src/main/java/fr/ird/observe/client/ui/content/data/seine/FloatingObjectTransmittingBuoyOperationUIHandler.java ===================================== @@ -163,8 +163,8 @@ public class FloatingObjectTransmittingBuoyOperationUIHandler extends ContentUIH FloatingObjectTransmittingBuoyOperationUI.BINDING_OWNERSHIP2_SELECTED_ITEM, FloatingObjectTransmittingBuoyOperationUI.BINDING_TRANSMITTING_BUOY_TYPE1_SELECTED_ITEM, FloatingObjectTransmittingBuoyOperationUI.BINDING_TRANSMITTING_BUOY_TYPE2_SELECTED_ITEM, - FloatingObjectTransmittingBuoyOperationUI.BINDING_BRAND1_TEXT, - FloatingObjectTransmittingBuoyOperationUI.BINDING_BRAND2_TEXT, +// FloatingObjectTransmittingBuoyOperationUI.BINDING_COMMENT1_TEXT, +// FloatingObjectTransmittingBuoyOperationUI.BINDING_COMMENT2_TEXT, FloatingObjectTransmittingBuoyOperationUI.BINDING_COUNTRY1_SELECTED_ITEM, FloatingObjectTransmittingBuoyOperationUI.BINDING_COUNTRY2_SELECTED_ITEM, FloatingObjectTransmittingBuoyOperationUI.BINDING_VESSEL1_SELECTED_ITEM, @@ -198,8 +198,6 @@ public class FloatingObjectTransmittingBuoyOperationUIHandler extends ContentUIH FloatingObjectTransmittingBuoyOperationUI.BINDING_CODE2_TEXT, FloatingObjectTransmittingBuoyOperationUI.BINDING_OWNERSHIP1_SELECTED_ITEM, FloatingObjectTransmittingBuoyOperationUI.BINDING_OWNERSHIP2_SELECTED_ITEM, - FloatingObjectTransmittingBuoyOperationUI.BINDING_BRAND1_TEXT, - FloatingObjectTransmittingBuoyOperationUI.BINDING_BRAND2_TEXT, FloatingObjectTransmittingBuoyOperationUI.BINDING_COUNTRY1_SELECTED_ITEM, FloatingObjectTransmittingBuoyOperationUI.BINDING_COUNTRY2_SELECTED_ITEM, FloatingObjectTransmittingBuoyOperationUI.BINDING_VESSEL1_SELECTED_ITEM, ===================================== dto/src/main/java/fr/ird/observe/binder/data/seine/TransmittingBuoyDtoReferenceBinder.java ===================================== @@ -41,7 +41,7 @@ public class TransmittingBuoyDtoReferenceBinder extends DataDtoReferenceBinder<T @Override public TransmittingBuoyReference toReference(ReferentialLocale referentialLocale, TransmittingBuoyDto dto) { return new TransmittingBuoyReference(dto, dto.getCode(), - dto.getBrand(), + dto.getComment(), dto.getTransmittingBuoyType().getLabel(), dto.getTransmittingBuoyOperation().getLabel()); } ===================================== dto/src/main/java/fr/ird/observe/dto/decoration/DecoratorService.java ===================================== @@ -1013,8 +1013,8 @@ public class DecoratorService extends DecoratorProvider { @Override public void initTransmittingBuoyDto() { registerDataAndDataReferenceDecorator(TransmittingBuoyDto.class, TransmittingBuoyReference.class, - "${transmittingBuoyType/label}$s##${transmittingBuoyOperation/label}$s##${code}$s", - "${transmittingBuoyTypeLabel}$s##${transmittingBuoyOperationLabel}$s##${code}$s"); + "${transmittingBuoyType/label}$s##${transmittingBuoyOperation/label}$s##${code}$s##${comment}$s", + "${transmittingBuoyTypeLabel}$s##${transmittingBuoyOperationLabel}$s##${code}$s##${comment}$s"); } @Override ===================================== dto/src/main/models/Observe.model ===================================== @@ -801,9 +801,8 @@ nature + {*:1} String discarded + {*:1} Boolean targetLength + {*} data.seine.TargetLength | ordered -data.seine.TransmittingBuoy > data.Data | references=code,brand,transmittingBuoyTypeLabel,transmittingBuoyOperationLabel +data.seine.TransmittingBuoy > data.Commentable | references=code,comment,transmittingBuoyTypeLabel,transmittingBuoyOperationLabel code + {*:1} String | mayNotNull -brand + {*:1} String ownership + {*:1} !fr.ird.observe.dto.data.seine.Ownership transmittingBuoyType {*:1} fr.ird.observe.dto.referential.seine.TransmittingBuoyTypeReference | notNull transmittingBuoyOperation {*:1} fr.ird.observe.dto.referential.seine.TransmittingBuoyOperationReference | notNull ===================================== persistence/src/main/java/fr/ird/observe/binder/data/seine/TransmittingBuoyEntityDtoBinder.java ===================================== @@ -44,7 +44,7 @@ public class TransmittingBuoyEntityDtoBinder extends DataEntityDtoBinderSupport< copyDtoDataFieldsToEntity(dto, entity); entity.setCode(dto.getCode()); - entity.setBrand(dto.getBrand()); + entity.setComment(dto.getComment()); entity.setOwnership(dto.getOwnership()); entity.setTransmittingBuoyOperation(toEntity(dto.getTransmittingBuoyOperation())); entity.setTransmittingBuoyType(toEntity(dto.getTransmittingBuoyType())); @@ -59,7 +59,7 @@ public class TransmittingBuoyEntityDtoBinder extends DataEntityDtoBinderSupport< copyEntityDataFieldsToDto(entity, dto); dto.setCode(entity.getCode()); - dto.setBrand(entity.getBrand()); + dto.setComment(entity.getComment()); dto.setOwnership(entity.getOwnership()); dto.setTransmittingBuoyOperation(toReferentialReference(referentialLocale, entity.getTransmittingBuoyOperation())); dto.setTransmittingBuoyType(toReferentialReference(referentialLocale, entity.getTransmittingBuoyType())); ===================================== persistence/src/main/java/fr/ird/observe/binder/data/seine/TransmittingBuoyEntityReferenceBinder.java ===================================== @@ -42,7 +42,7 @@ public class TransmittingBuoyEntityReferenceBinder extends DataEntityReferenceBi @Override public TransmittingBuoyReference toReference(ReferentialLocale referentialLocale, TransmittingBuoy entity) { return new TransmittingBuoyReference(entity, entity.getCode(), - entity.getBrand(), + entity.getComment(), entity.getTransmittingBuoyType().getLabel(referentialLocale), entity.getTransmittingBuoyOperation().getLabel(referentialLocale)); } ===================================== persistence/src/main/java/fr/ird/observe/persistence/migration/DataSourceMigrationForVersion_7_5.java ===================================== @@ -0,0 +1,47 @@ +package fr.ird.observe.persistence.migration; + +/*- + * #%L + * ObServe :: Persistence + * %% + * Copyright (C) 2008 - 2020 IRD, Code Lutin, Ultreia.io + * %% + * This program is free software: you can redistribute it and/or modify + * 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>. + * #L% + */ + +import com.google.auto.service.AutoService; +import org.nuiton.topia.service.migration.resources.MigrationVersionResource; +import org.nuiton.topia.service.migration.resources.MigrationVersionResourceExecutor; +import org.nuiton.version.Versions; + +/** + * @author Tony Chemit - dev(a)tchemit.fr + * @since 7.5.0 + */ +(a)AutoService(MigrationVersionResource.class) +public class DataSourceMigrationForVersion_7_5 extends MigrationVersionResource { + + public DataSourceMigrationForVersion_7_5() { + super(Versions.valueOf("7.5")); + } + + @Override + public void generateSqlScript(MigrationVersionResourceExecutor executor) { + executor.addScript("01", "migrate_TransmittingBuoyOperation_brand"); + } + +} + ===================================== persistence/src/main/models/Observe.model ===================================== @@ -837,9 +837,8 @@ nature + {*:1} String discarded + {*:1} Boolean targetLength + {*} seine.TargetLength | ordered -seine.TransmittingBuoy > ObserveDataEntity | entity +seine.TransmittingBuoy > CommentableEntity | entity code + {*:1} String -brand + {*:1} String ownership + {*:1} !fr.ird.observe.dto.data.seine.Ownership transmittingBuoyType {*:1} referentiel.seine.TransmittingBuoyType transmittingBuoyOperation {*:1} referentiel.seine.TransmittingBuoyOperation ===================================== persistence/src/main/resources/db/migration/7.5/01_migrate_TransmittingBuoyOperation_brand-H2.sql ===================================== @@ -0,0 +1,24 @@ +--- +-- #%L +-- ObServe :: Persistence +-- %% +-- Copyright (C) 2008 - 2020 IRD, Code Lutin, Ultreia.io +-- %% +-- This program is free software: you can redistribute it and/or modify +-- 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>. +-- #L% +--- +ALTER TABLE observe_seine.TransmittingBuoy ADD COLUMN comment VARCHAR(1024); +UPDATE observe_seine.TransmittingBuoy SET comment = brand, topiaVersion = topiaVersion + 1; +ALTER TABLE observe_seine.TransmittingBuoy DROP COLUMN brand; ===================================== persistence/src/main/resources/db/migration/7.5/01_migrate_TransmittingBuoyOperation_brand-PG.sql ===================================== @@ -0,0 +1,24 @@ +--- +-- #%L +-- ObServe :: Persistence +-- %% +-- Copyright (C) 2008 - 2020 IRD, Code Lutin, Ultreia.io +-- %% +-- This program is free software: you can redistribute it and/or modify +-- 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>. +-- #L% +--- +ALTER TABLE observe_seine.TransmittingBuoy ADD COLUMN comment VARCHAR(1024); +UPDATE observe_seine.TransmittingBuoy SET comment = brand, topiaVersion = topiaVersion + 1; +ALTER TABLE observe_seine.TransmittingBuoy DROP COLUMN brand CASCADE ; ===================================== pom.xml ===================================== @@ -149,7 +149,7 @@ <devMode>true</devMode>  - <observe.model.version>7.4</observe.model.version> + <observe.model.version>7.5</observe.model.version>  <maven.build.timestamp.format>dd/MM/yyyy HH:mm z</maven.build.timestamp.format> ===================================== test/src/main/resources/db/7.5/dataForTestLongline.sql.gz ===================================== Binary files /dev/null and b/test/src/main/resources/db/7.5/dataForTestLongline.sql.gz differ ===================================== test/src/main/resources/db/7.5/dataForTestSeine.sql.gz ===================================== Binary files /dev/null and b/test/src/main/resources/db/7.5/dataForTestSeine.sql.gz differ ===================================== test/src/main/resources/db/7.5/empty_h2.sql.gz ===================================== Binary files /dev/null and b/test/src/main/resources/db/7.5/empty_h2.sql.gz differ ===================================== test/src/main/resources/db/7.5/empty_pg.sql.gz ===================================== Binary files /dev/null and b/test/src/main/resources/db/7.5/empty_pg.sql.gz differ ===================================== test/src/main/resources/db/7.5/referentiel.sql.gz ===================================== Binary files /dev/null and b/test/src/main/resources/db/7.5/referentiel.sql.gz differ View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/commit/0b0ed7273ecffbc847bce1499… -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/commit/0b0ed7273ecffbc847bce1499… You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-observe][develop-7.x] 3 commits: Mauvais affichage d'une marée dans l'arbre de navigation - Closes #1457
by Tony CHEMIT 27 Mar '20

27 Mar '20

Tony CHEMIT pushed to branch develop-7.x at ultreiaio / ird-observe Commits: 952c8da4 by tchemit at 2020-03-27T17:32:14+01:00 Mauvais affichage d'une marée dans l'arbre de navigation - Closes #1457 - - - - - eb802bb7 by tchemit at 2020-03-27T17:32:28+01:00 move to version 7.5.0 - - - - - 86f385d7 by tchemit at 2020-03-27T17:32:28+01:00 Réusinage de la table transmittingbuoy - Closes #1456 - - - - - 30 changed files: - client-configuration/pom.xml - client-core/pom.xml - client-core/src/main/i18n/getters/jaxx.getter - client-core/src/main/java/fr/ird/observe/client/ui/content/data/seine/FloatingObjectTransmittingBuoyOperationUI.jaxx - client-core/src/main/java/fr/ird/observe/client/ui/content/data/seine/FloatingObjectTransmittingBuoyOperationUI.jcss - client-core/src/main/java/fr/ird/observe/client/ui/content/data/seine/FloatingObjectTransmittingBuoyOperationUIHandler.java - client-runner/pom.xml - dto/pom.xml - dto/src/main/i18n/getters/java.getter - dto/src/main/java/fr/ird/observe/binder/data/seine/TransmittingBuoyDtoReferenceBinder.java - dto/src/main/java/fr/ird/observe/dto/decoration/DecoratorService.java - dto/src/main/java/fr/ird/observe/dto/decoration/ObserveI18nLabelsBuilder.java - dto/src/main/java/fr/ird/observe/dto/decoration/decorators/DataReferenceDecorator.java - dto/src/main/models/Observe.model - observe-i18n/pom.xml - observe-i18n/src/main/i18n/translations/observe_en_GB.properties - observe-i18n/src/main/i18n/translations/observe_es_ES.properties - observe-i18n/src/main/i18n/translations/observe_fr_FR.properties - observe/pom.xml - persistence/pom.xml - persistence/src/main/java/fr/ird/observe/binder/data/seine/TransmittingBuoyEntityDtoBinder.java - persistence/src/main/java/fr/ird/observe/binder/data/seine/TransmittingBuoyEntityReferenceBinder.java - + persistence/src/main/java/fr/ird/observe/persistence/migration/DataSourceMigrationForVersion_7_5.java - persistence/src/main/models/Observe.model - + persistence/src/main/resources/db/migration/7.5/01_migrate_TransmittingBuoyOperation_brand-H2.sql - + persistence/src/main/resources/db/migration/7.5/01_migrate_TransmittingBuoyOperation_brand-PG.sql - pom.xml - server-configuration/pom.xml - server-core/pom.xml - server-runner/pom.xml The diff was not included because it is too large. View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/compare/3ce0b147c4f2faaee3b65df3… -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/compare/3ce0b147c4f2faaee3b65df3… You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-observe][develop] [SFA] LL/Logbook/Trips/activity date by default - Closes #1449
by Tony CHEMIT 27 Mar '20

27 Mar '20

Tony CHEMIT pushed to branch develop at ultreiaio / ird-observe Commits: 8faa6ceb by tchemit at 2020-03-27T14:24:35+01:00 [SFA] LL/Logbook/Trips/activity date by default - Closes #1449 - - - - - 2 changed files: - services-local/pom.xml - services-local/src/main/java/fr/ird/observe/services/local/service/data/ll/logbook/ActivityServiceLocal.java Changes: ===================================== services-local/pom.xml ===================================== @@ -127,6 +127,10 @@ <scope>runtime</scope> </dependency> + <dependency> + <groupId>io.ultreia.java4all</groupId> + <artifactId>java-util</artifactId> + </dependency> <dependency> <groupId>io.ultreia.java4all.http</groupId> <artifactId>http-api</artifactId> ===================================== services-local/src/main/java/fr/ird/observe/services/local/service/data/ll/logbook/ActivityServiceLocal.java ===================================== @@ -39,6 +39,8 @@ import fr.ird.observe.entities.referential.common.DataQuality; import fr.ird.observe.services.local.service.ObserveServiceLocal; import fr.ird.observe.services.local.service.data.ll.common.TripServiceLocal; import fr.ird.observe.services.service.data.ll.logbook.ActivityService; +import io.ultreia.java4all.util.Dates; +import org.nuiton.util.DateUtil; import java.util.Calendar; import java.util.Date; @@ -88,10 +90,13 @@ public class ActivityServiceLocal extends ObserveServiceLocal implements Activit // première activité, on utilise la date de début de marée (voir http://forge.codelutin.com/issues/6777) Calendar calendar = Calendar.getInstance(); calendar.setTime(trip.getStartDate()); - timestamp = calendar.getTime(); + timestamp = Dates.getDay(calendar.getTime()); } else { - // on reprend la date et l'heure de la dernière activité - timestamp = lastActivityLongline.getStartTimeStamp(); + // on reprend la date +1 de la dernière activité + Calendar calendar = Calendar.getInstance(); + calendar.setTime(lastActivityLongline.getStartTimeStamp()); + calendar.add(Calendar.DAY_OF_YEAR, 1); + timestamp = Dates.getDay(calendar.getTime()); } preCreated.setStartTimeStamp(timestamp); DataQuality defaultDataQuality = getTopiaPersistenceContext().getCommonDataQualityDao().forTopiaIdEquals(ProtectedIds.LL_LOGBOOK_ACTIVITY_DEFAULT_DATA_QUALITY_ID).findUnique(); View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/commit/8faa6ceba9388cb83c4ba64e9… -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/commit/8faa6ceba9388cb83c4ba64e9… You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-observe][develop] 8 commits: [SFA] Assouplissement de contrôles sur LL Logbooks - Closes #1450
by Tony CHEMIT 27 Mar '20

27 Mar '20

Tony CHEMIT pushed to branch develop at ultreiaio / ird-observe Commits: 0ebd1b61 by tchemit at 2020-03-27T11:00:01+01:00 [SFA] Assouplissement de contrôles sur LL Logbooks - Closes #1450 - - - - - f229daa6 by tchemit at 2020-03-27T12:42:55+01:00 [SFA] LL / Logbooks / Samples : modification d'espèce - Closes #1453 - - - - - a65028aa by tchemit at 2020-03-27T13:17:46+01:00 Fix backup accessible fields on none local data source - - - - - 47b3a04f by tchemit at 2020-03-27T13:18:29+01:00 Fix Trip reference decoration - - - - - 92c74483 by tchemit at 2020-03-27T13:18:50+01:00 Fix template (trip reference has changed) - - - - - 3df490df by tchemit at 2020-03-27T13:19:19+01:00 Fix topia persistence on table content ui (don't know what does that changed...) - - - - - b9434baa by tchemit at 2020-03-27T13:19:52+01:00 [SFA] LL / Logbooks / Samples : mode de saisie par défaut - Closes #1452 - - - - - a72385a0 by tchemit at 2020-03-27T14:06:44+01:00 [SFA] LL / Logbooks / Captures - Closes #1451 - - - - - 15 changed files: - client-datasource-editor-api/src/main/i18n/templates/dataSourceConnectionReport_en_GB.ftl - client-datasource-editor-api/src/main/i18n/templates/dataSourceConnectionReport_es_ES.ftl - client-datasource-editor-api/src/main/i18n/templates/dataSourceConnectionReport_fr_FR.ftl - client-datasource-editor-api/src/main/java/fr/ird/observe/client/datasource/editor/content/data/table/ContentTableUIModel.java - client-datasource-editor-api/src/main/java/fr/ird/observe/client/datasource/editor/wizard/StorageBackupUILauncher.java - client-datasource-editor-ll/src/main/i18n/getters/java.getter - client-datasource-editor-ll/src/main/java/fr/ird/observe/client/datasource/editor/content/data/ll/logbook/CatchUIHandler.java - client-datasource-editor-ll/src/main/java/fr/ird/observe/client/datasource/editor/content/data/ll/logbook/CatchUIModel.java - client-datasource-editor-ll/src/main/java/fr/ird/observe/client/datasource/editor/content/data/ll/logbook/SamplePartUIHandler.java - dto/src/main/i18n/getters/java.getter - dto/src/main/java/fr/ird/observe/dto/decoration/ObserveI18nLabelsBuilder.java - dto/src/main/models/Observe-31-data-ll-logbook.model - observe-i18n/src/main/i18n/translations/observe_en_GB.properties - observe-i18n/src/main/i18n/translations/observe_es_ES.properties - observe-i18n/src/main/i18n/translations/observe_fr_FR.properties Changes: ===================================== client-datasource-editor-api/src/main/i18n/templates/dataSourceConnectionReport_en_GB.ftl ===================================== @@ -83,7 +83,7 @@ <li>  - ${trip.getStartDate()?date?string.short} - ${trip.getEndDate()?date?string.short} - ${trip.getVesselLabel()} - ${trip.getObserverLabel()} + ${trip.getStartDate()?date?string.short} - ${trip.getEndDate()?date?string.short} - ${trip.getVessel().getLabel()} - ${trip.getObserverLabel()} </li> </#list> ===================================== client-datasource-editor-api/src/main/i18n/templates/dataSourceConnectionReport_es_ES.ftl ===================================== @@ -53,13 +53,8 @@ <#elseif selectDataModel.isDataFull()> -<<<<<<< HEAD - Todos los datos de observador deben ser exportados - (<#if selectDataModel.getSelectCedount() == 1> -======= Todos los datos del observador deben ser exportados - (<#if selectDataModel.selectDataSize() == 1> ->>>>>>> 64a0649... Templates de traduction mis à jour (fixes #8967) + (<#if selectDataModel.getSelectedCount() == 1> 1 marea <#else> ${selectDataModel.getSelectedCount()} mareas @@ -88,7 +83,7 @@ <li>  - ${trip.getStartDate()?date?string.short} - ${trip.getEndDate()?date?string.short} - ${trip.getVesselLabel()} - ${trip.getObserverLabel()} + ${trip.getStartDate()?date?string.short} - ${trip.getEndDate()?date?string.short} - ${trip.getVessel().getLabel()} - ${trip.getObserverLabel()} </li> </#list> ===================================== client-datasource-editor-api/src/main/i18n/templates/dataSourceConnectionReport_fr_FR.ftl ===================================== @@ -83,7 +83,7 @@ <li>  - ${trip.getStartDate()?date?string.short} - ${trip.getEndDate()?date?string.short} - ${trip.getVesselLabel()} - ${trip.getObserverLabel()} + ${trip.getStartDate()?date?string.short} - ${trip.getEndDate()?date?string.short} - ${trip.getVessel().getLabel()} - ${trip.getObserverLabel()} </li> </#list> ===================================== client-datasource-editor-api/src/main/java/fr/ird/observe/client/datasource/editor/content/data/table/ContentTableUIModel.java ===================================== @@ -36,6 +36,7 @@ import org.nuiton.util.beans.BinderModelBuilder; import javax.swing.DefaultListSelectionModel; import javax.swing.ListSelectionModel; import java.awt.Component; +import java.util.Date; import java.util.List; /** @@ -197,7 +198,9 @@ public abstract class ContentTableUIModel<D extends DataDto, C extends DataDto> } public C newTableEditBean() { - return Objects2.newInstance(getChildType()); + C c = Objects2.newInstance(getChildType()); + c.setCreateDate(new Date()); + return c; } public boolean isCanSaveRow() { ===================================== client-datasource-editor-api/src/main/java/fr/ird/observe/client/datasource/editor/wizard/StorageBackupUILauncher.java ===================================== @@ -78,7 +78,6 @@ public class StorageBackupUILauncher extends StorageUILauncher { if (source.isLocal()) { model.setCanUseLocalService(true); model.setDbMode(DbMode.USE_LOCAL); - model.setDoBackup(true); } else if (source.isRemote()) { model.setCanUseRemoteService(true); model.setDbMode(DbMode.USE_REMOTE); @@ -86,6 +85,7 @@ public class StorageBackupUILauncher extends StorageUILauncher { model.setCanUseServerService(true); model.setDbMode(DbMode.USE_SERVER); } + model.setDoBackup(true); model.setSteps(StorageStep.BACKUP, StorageStep.SELECT_DATA, StorageStep.CONFIRM); ui.setTitle(title); ===================================== client-datasource-editor-ll/src/main/i18n/getters/java.getter ===================================== @@ -105,6 +105,8 @@ observe.data.ll.logbook.Catch.table.discardHealthStatus observe.data.ll.logbook.Catch.table.discardHealthStatus.tip observe.data.ll.logbook.Catch.table.speciesCatch observe.data.ll.logbook.Catch.table.speciesCatch.tip +observe.data.ll.logbook.Catch.table.totalWeight +observe.data.ll.logbook.Catch.table.totalWeight.tip observe.data.ll.logbook.FloatlinesComposition.table.length observe.data.ll.logbook.FloatlinesComposition.table.length.tip observe.data.ll.logbook.FloatlinesComposition.table.lineType ===================================== client-datasource-editor-ll/src/main/java/fr/ird/observe/client/datasource/editor/content/data/ll/logbook/CatchUIHandler.java ===================================== @@ -126,6 +126,8 @@ public class CatchUIHandler extends ContentTableUIHandler<SetCatchDto, CatchDto, n("observe.data.ll.logbook.Catch.table.acquisitionMode.tip"), n("observe.data.ll.logbook.Catch.table.count"), n("observe.data.ll.logbook.Catch.table.count.tip"), + n("observe.data.ll.logbook.Catch.table.totalWeight"), + n("observe.data.ll.logbook.Catch.table.totalWeight.tip"), n("observe.data.ll.logbook.Catch.table.catchHealthStatus"), n("observe.data.ll.logbook.Catch.table.catchHealthStatus.tip"), n("observe.data.ll.logbook.Catch.table.catchFate"), @@ -143,12 +145,13 @@ public class CatchUIHandler extends ContentTableUIHandler<SetCatchDto, CatchDto, UIHelper.setTableColumnRenderer(table, 0, UIHelper.newReferentialReferenceDecorateTableCellRenderer(renderer, SpeciesReference.class)); UIHelper.setTableColumnRenderer(table, 1, UIHelper.newEnumTableCellRenderer(renderer, CatchAcquisitionMode.class)); UIHelper.setTableColumnRenderer(table, 2, UIHelper.newEmptyNumberTableCellRenderer(renderer)); - UIHelper.setTableColumnRenderer(table, 3, UIHelper.newReferentialReferenceDecorateTableCellRenderer(renderer, HealthStatusReference.class)); - UIHelper.setTableColumnRenderer(table, 4, UIHelper.newReferentialReferenceDecorateTableCellRenderer(renderer, CatchFateReference.class)); - UIHelper.setTableColumnRenderer(table, 5, UIHelper.newReferentialReferenceDecorateTableCellRenderer(renderer, HealthStatusReference.class)); - UIHelper.setTableColumnRenderer(table, 6, UIHelper.newBooleanTableCellRenderer(renderer)); - UIHelper.setTableColumnRenderer(table, 7, UIHelper.newEmptyNumberTableCellRenderer(renderer)); - UIHelper.setTableColumnRenderer(table, 8, UIHelper.newStringTableCellRenderer(renderer, 10, true)); + UIHelper.setTableColumnRenderer(table, 3, UIHelper.newEmptyNumberTableCellRenderer(renderer)); + UIHelper.setTableColumnRenderer(table, 4, UIHelper.newReferentialReferenceDecorateTableCellRenderer(renderer, HealthStatusReference.class)); + UIHelper.setTableColumnRenderer(table, 5, UIHelper.newReferentialReferenceDecorateTableCellRenderer(renderer, CatchFateReference.class)); + UIHelper.setTableColumnRenderer(table, 6, UIHelper.newReferentialReferenceDecorateTableCellRenderer(renderer, HealthStatusReference.class)); + UIHelper.setTableColumnRenderer(table, 7, UIHelper.newBooleanTableCellRenderer(renderer)); + UIHelper.setTableColumnRenderer(table, 8, UIHelper.newEmptyNumberTableCellRenderer(renderer)); + UIHelper.setTableColumnRenderer(table, 9, UIHelper.newStringTableCellRenderer(renderer, 10, true)); } getTableModel().addPropertyChangeListener(ContentTableModel.CREATE_PROPERTY, evt -> { ===================================== client-datasource-editor-ll/src/main/java/fr/ird/observe/client/datasource/editor/content/data/ll/logbook/CatchUIModel.java ===================================== @@ -78,6 +78,7 @@ public class CatchUIModel extends ContentTableUIModel<SetCatchDto, CatchDto> { ContentTableModel.newTableMeta(CatchDto.class, CatchDto.PROPERTY_SPECIES_CATCH, false), ContentTableModel.newTableMeta(CatchDto.class, CatchDto.PROPERTY_ACQUISITION_MODE, false), ContentTableModel.newTableMeta(CatchDto.class, CatchDto.PROPERTY_COUNT, false), + ContentTableModel.newTableMeta(CatchDto.class, CatchDto.PROPERTY_TOTAL_WEIGHT, false), ContentTableModel.newTableMeta(CatchDto.class, CatchDto.PROPERTY_CATCH_HEALTH_STATUS, false), ContentTableModel.newTableMeta(CatchDto.class, CatchDto.PROPERTY_CATCH_FATE, false), ContentTableModel.newTableMeta(CatchDto.class, CatchDto.PROPERTY_DISCARD_HEALTH_STATUS, false), ===================================== client-datasource-editor-ll/src/main/java/fr/ird/observe/client/datasource/editor/content/data/ll/logbook/SamplePartUIHandler.java ===================================== @@ -174,10 +174,9 @@ public class SamplePartUIHandler extends NotStandaloneContentTableUIHandler<Samp // on passe le mode de saisie en count ui.getAcquisitionModeGroup().setSelectedValue(null); - ui.getAcquisitionModeGroup().setSelectedValue(AcquisitionMode.byEffectif); + ui.getAcquisitionModeGroup().setSelectedValue(AcquisitionMode.byIndividu); } - availableSpecies = getModel().getReferenceCache().getReferentialReferences(SamplePartDto.PROPERTY_SPECIES); requestFocus = ui.getSpecies(); } else { @@ -189,10 +188,10 @@ public class SamplePartUIHandler extends NotStandaloneContentTableUIHandler<Samp ui.getAcquisitionModeGroup().setSelectedValue(null); ui.getAcquisitionModeGroup().setSelectedValue(enumValue); - availableSpecies = Collections.singletonList(species); sizeMeasureType = Optional.ofNullable(bean.getSizeMeasureType()); } + availableSpecies = getModel().getReferenceCache().getReferentialReferences(SamplePartDto.PROPERTY_SPECIES); ui.getSizeMeasureType().setSelectedItem(null); sizeMeasureType.ifPresent(sizeMeasureTypeDtoReferentialReference -> ui.getSizeMeasureType().setSelectedItem(sizeMeasureTypeDtoReferentialReference)); ===================================== dto/src/main/i18n/getters/java.getter ===================================== @@ -13,7 +13,6 @@ observe.Id.species observe.Id.weightMeasureType observe.Id.whenArriving observe.Id.whenLeaving -observe.common.WithStartEndDate.startEndDateLabel observe.common.WithStartEndDate.validityRangeLabel observe.common.gps.activity observe.common.gps.gpsPoint ===================================== dto/src/main/java/fr/ird/observe/dto/decoration/ObserveI18nLabelsBuilder.java ===================================== @@ -104,7 +104,6 @@ public class ObserveI18nLabelsBuilder extends BeanPropertyI18nKeyProducerSupport n("observe.referential.WithFormula.speciesLabel"); n("observe.referential.WithFormula.speciesFaoCode"); n("observe.common.WithStartEndDate.validityRangeLabel"); - n("observe.common.WithStartEndDate.startEndDateLabel"); } public ObserveI18nLabelsBuilder() { ===================================== dto/src/main/models/Observe-31-data-ll-logbook.model ===================================== @@ -47,8 +47,8 @@ hasSet + {*:1} Boolean data.ll.logbook.Set > data.Commentable | references=homeId number + {*:1} Integer | positiveNumber -basketsPerSectionCount + {*:1} Integer | notNull | positiveNumber -branchlinesPerBasketCount + {*:1} Integer | notNull positiveNumber +basketsPerSectionCount + {*:1} Integer | mayNotNull positiveNumber +branchlinesPerBasketCount + {*:1} Integer | mayNotNull positiveNumber totalSectionsCount + {*:1} Integer | notNull positiveNumber totalBasketsCount + {*:1} Integer | positiveNumber totalHooksCount + {*:1} Integer | positiveNumber ===================================== observe-i18n/src/main/i18n/translations/observe_en_GB.properties ===================================== @@ -1102,6 +1102,8 @@ observe.data.ll.logbook.Catch.table.sectionHaulingId=Section ° observe.data.ll.logbook.Catch.table.sectionHaulingId.tip=Section hauling id observe.data.ll.logbook.Catch.table.speciesCatch=Species observe.data.ll.logbook.Catch.table.speciesCatch.tip=Species +observe.data.ll.logbook.Catch.table.totalWeight=Total weight +observe.data.ll.logbook.Catch.table.totalWeight.tip=Total weight (kg) observe.data.ll.logbook.Catch.tagNumber=Tag number observe.data.ll.logbook.Catch.timeSinceContact=Time since contact observe.data.ll.logbook.Catch.title=Catches ===================================== observe-i18n/src/main/i18n/translations/observe_es_ES.properties ===================================== @@ -1102,6 +1102,8 @@ observe.data.ll.logbook.Catch.table.sectionHaulingId=N° sección observe.data.ll.logbook.Catch.table.sectionHaulingId.tip=Numero de arrastre de la sección observe.data.ll.logbook.Catch.table.speciesCatch=Especie observe.data.ll.logbook.Catch.table.speciesCatch.tip=Especie +observe.data.ll.logbook.Catch.table.totalWeight=Peso total +observe.data.ll.logbook.Catch.table.totalWeight.tip=Peso total (kg) observe.data.ll.logbook.Catch.tagNumber=Numéro d'échantillon \#TODO observe.data.ll.logbook.Catch.timeSinceContact=Tiempo desde el estallido observe.data.ll.logbook.Catch.title=Capturas ===================================== observe-i18n/src/main/i18n/translations/observe_fr_FR.properties ===================================== @@ -1102,6 +1102,8 @@ observe.data.ll.logbook.Catch.table.sectionHaulingId=N° section observe.data.ll.logbook.Catch.table.sectionHaulingId.tip=Numéro de virage de la section observe.data.ll.logbook.Catch.table.speciesCatch=Espèce observe.data.ll.logbook.Catch.table.speciesCatch.tip=Espèce +observe.data.ll.logbook.Catch.table.totalWeight=Poids total +observe.data.ll.logbook.Catch.table.totalWeight.tip=Poids total (kg) observe.data.ll.logbook.Catch.tagNumber=Id marque observe.data.ll.logbook.Catch.timeSinceContact=Temps depuis déclenchement observe.data.ll.logbook.Catch.title=Captures View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/compare/af09ead3231a161103594c42… -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/compare/af09ead3231a161103594c42… 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 26 Mar '20

26 Mar '20

Tony CHEMIT pushed to branch pages at ultreiaio / ird-observe Commits: 147adff6 by 166231 at 2020-03-26T10:49:06+00:00 Site checkin for project ObServe :: Pom - - - - - 14 changed files: - administration-web.html - architecture-logicielle.html - css/apache-maven-fluido-1.7.min.css → css/apache-maven-fluido-1.8.min.css - css/print.css - fonts/glyphicons-halflings-regular.eot - fonts/glyphicons-halflings-regular.svg - fonts/glyphicons-halflings-regular.ttf - fonts/glyphicons-halflings-regular.woff - img/architecture.svg - index.html - install-serverPG.html - install.html - js/apache-maven-fluido-1.7.min.js → js/apache-maven-fluido-1.8.min.js - + synchro-referential.html Changes: ===================================== administration-web.html ===================================== @@ -1,51 +1,53 @@ <!DOCTYPE html>  -<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="fr" lang="fr"> +<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.0" /> - <meta name="Date-Revision-yyyymmdd" content="20190916" /> - <meta http-equiv="Content-Language" content="fr" /> + <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 – Installation de lapplication web</title> - <link rel="stylesheet" href="./css/apache-maven-fluido-1.7.min.css" /> + <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 type="text/javascript" src="./js/apache-maven-fluido-1.7.min.js"></script> + <script src="./js/apache-maven-fluido-1.8.min.js"></script> </head> <body class="topBarDisabled"> <div class="container-fluid"> - <div id="banner"> - <div class="pull-left"><a href="index.html" id="bannerLeft"><img src="./img/logo-small.png" alt="ObServe :: Pom"/></a></div> - <div class="pull-right"></div> - <div class="clear"><hr/></div> - </div> + <header> + <div id="banner"> + <div class="pull-left"><a href="index.html" id="bannerLeft"><img src="./img/logo-small.png" alt="ObServe :: Pom"/></a></div> + <div class="pull-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"> + <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 ">Installation de lapplication web</li> - <li id="publishDate" class="pull-right"><span class="divider">|</span> Dernière publication: 2019-09-16</li> - <li id="projectVersion" class="pull-right"><span class="divider">|</span>Version: 7.1.1</li> + <li id="publishDate" class="pull-right"><span class="divider">|</span> Dernière publication: 2020-03-26</li> + <li id="projectVersion" class="pull-right"><span class="divider">|</span>Version: 7.4.0</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> + </ul> + </div> + </header> <div class="row-fluid"> - <div id="leftColumn" class="span2"> - <div class="well sidebar-nav"> - <ul class="nav nav-list"> - <li class="nav-header">Utilisateur</li> + <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 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 class="nav-header">Modélisation</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> @@ -53,36 +55,36 @@ <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 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> + </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 type="text/javascript">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> - <div class="clear"></div> +<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="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> </div> - </div> - <div id="bodyColumn" class="span10" > + </header> + <main id="bodyColumn" class="span10" > <h1>Installation de l’application web</h1> <p>L’application web est une application web classique à installer dans un conteneur web (tomcat).</p> <h1>Configuration de l’application web</h1> <p>La configuration de l’application web est regroupé dans un seul fichier à placer ici</p> -<div> -<div> -<pre class="source"> /etc/observe-server.conf +<div class="source"> +<div class="source"><pre class="prettyprint linenums"> /etc/observe-server.conf </pre></div></div> <p>La configuration de l’application possède des valeurs par défaut pour toutes les options, si vous utiliser ces valeurs par défaut, un minimum de configuration est requise.</p> @@ -96,12 +98,11 @@ <p>Par défaut, l’application utilise le répertoire <b>/var/local/observeweb</b> pour y stoquer ses données.</p> <p>Voici le contenu de ce dossier suite à un premier démarrage :</p> -<div> -<div> -<pre class="source"> /var/local/observeweb/{contextPath} +<div class="source"> +<div class="source"><pre class="prettyprint linenums"> /var/local/observeweb/{contextPath} |-- databases.yml # configuration des bases de données |-- log - | `-- observeweb-7.1.1.log # logs de l'application + | `-- observeweb-7.4.0.log # logs de l'application |-- observeweb-log4j2.xml # configuration des logs |-- temp # répertoire temporaire `-- users.yml # configuration des utilisateurs @@ -113,9 +114,8 @@ <p>Attention, à bien penser à échapper les <<>> par des «\» dans les options de répertoires.</p> <p>Par exemple :</p> -<div> -<div> -<pre class="source"> observeweb.adminApiKey=a +<div class="source"> +<div class="source"><pre class="prettyprint linenums"> observeweb.adminApiKey=a observeweb.apiUrl=http://localhost:8080/observeweb/api/v1 observeweb.baseDirectory=C:\\var\\local\\observeweb observeweb.sessionExpirationDelay=90 @@ -125,9 +125,8 @@ <p>Il s’agit donc ici bien uniquement de configuration de type postgresql.</p> <p>Par exemple :</p> -<div> -<div> -<pre class="source"> databases: +<div class="source"> +<div class="source"><pre class="prettyprint linenums"> databases: - name: production defaultDatabase: true roles: @@ -150,9 +149,8 @@ <p>Le fichier users.yml définit les utilisateurs de l’applications web ainsi que leur niveau de droit (mapping avec les droits des bases de données).</p> <p>Par exemple :</p> -<div> -<div> -<pre class="source"> users: +<div class="source"> +<div class="source"><pre class="prettyprint linenums"> users: - login: utilisateur-technicien password: a permissions: @@ -171,42 +169,37 @@ <p>L’utilisateur «<i>utilisateur-referentiel</i>» aura le droit d’accéder à la base de production uniquement avec le rôle «<i>referentiel</i>».</p> <p>Par défaut, l’application est déployée à l’adresse suivante :</p> -<div> -<div> -<pre class="source"> http://localhost:8080/observeweb +<div class="source"> +<div class="source"><pre class="prettyprint linenums"> http://localhost:8080/observeweb </pre></div></div> <p>Vous pouvez accéder à une seule page qui regroupe l’ensemble des configurations de l’application :</p> -<div> -<div> -<pre class="source"> http://localhost:8080/observeweb/admin/configuration?adminApiKey=changeme (ou la clef que vous avez configuré) +<div class="source"> +<div class="source"><pre class="prettyprint linenums"> http://localhost:8080/observeweb/admin/configuration?adminApiKey=changeme (ou la clef que vous avez configuré) </pre></div></div> <p>Si vous arrivez sur cette page, l’application est fonctionnelle.</p> <p>Vous pouvez recharger les configurations à chaud via l’adresse suivante :</p> -<div> -<div> -<pre class="source"> http://localhost:8080/observeweb/admin/reloadConfiguration?adminApiKey=chan… (ou la clef que vous avez configuré) +<div class="source"> +<div class="source"><pre class="prettyprint linenums"> http://localhost:8080/observeweb/admin/reloadConfiguration?adminApiKey=chan… (ou la clef que vous avez configuré) </pre></div></div> <p>Vous pouvez supprimer toutes les sessions utilisateurs via l’adresse suivante :</p> -<div> -<div> -<pre class="source"> http://localhost:8080/observeweb/admin/resetAuthenticationTokens?adminApiKe… (ou la clef que vous avez configuré) +<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> - </div> + </main> </div> </div> <hr/> <footer> <div class="container-fluid"> <div class="row-fluid"> - <p>Copyright ©2008–2019 -<a href="http://www.ird.fr/">IRD</a>. -All rights reserved.</p> + <p>Copyright © 2008–2020<a href="http://www.ird.fr/">IRD</a>. +.</p> </div> </div> </footer> ===================================== architecture-logicielle.html ===================================== @@ -1,51 +1,53 @@ <!DOCTYPE html>  -<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="fr" lang="fr"> +<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.0" /> - <meta name="Date-Revision-yyyymmdd" content="20190916" /> - <meta http-equiv="Content-Language" content="fr" /> + <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 – Architecture logicielle dObServe</title> - <link rel="stylesheet" href="./css/apache-maven-fluido-1.7.min.css" /> + <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 type="text/javascript" src="./js/apache-maven-fluido-1.7.min.js"></script> + <script src="./js/apache-maven-fluido-1.8.min.js"></script> </head> <body class="topBarDisabled"> <div class="container-fluid"> - <div id="banner"> - <div class="pull-left"><a href="index.html" id="bannerLeft"><img src="./img/logo-small.png" alt="ObServe :: Pom"/></a></div> - <div class="pull-right"></div> - <div class="clear"><hr/></div> - </div> + <header> + <div id="banner"> + <div class="pull-left"><a href="index.html" id="bannerLeft"><img src="./img/logo-small.png" alt="ObServe :: Pom"/></a></div> + <div class="pull-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"> + <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 ">Architecture logicielle dObServe</li> - <li id="publishDate" class="pull-right"><span class="divider">|</span> Dernière publication: 2019-09-16</li> - <li id="projectVersion" class="pull-right"><span class="divider">|</span>Version: 7.1.1</li> + <li id="publishDate" class="pull-right"><span class="divider">|</span> Dernière publication: 2020-03-26</li> + <li id="projectVersion" class="pull-right"><span class="divider">|</span>Version: 7.4.0</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> + </ul> + </div> + </header> <div class="row-fluid"> - <div id="leftColumn" class="span2"> - <div class="well sidebar-nav"> - <ul class="nav nav-list"> - <li class="nav-header">Utilisateur</li> + <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 class="nav-header">Modélisation</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> @@ -53,33 +55,34 @@ <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 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> + </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 type="text/javascript">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> - <div class="clear"></div> +<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="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> </div> - </div> - <div id="bodyColumn" class="span10" > + </header> + <main id="bodyColumn" class="span10" > <h1>Architecture logicielle d’ObServe</h1><section> <h2><a name="Abstract"></a>Abstract</h2> <p>Ce document décrit l’architecture logicielle du projet <i>ObServe</i>.</p></section><section> <h2><a name="Les_diff.C3.A9rentes_couches_de_l.E2.80.99application"></a>Les différentes couches de l’application</h2> -<p>Ce logiciel est une application de type “client lourd” totalement écrit en Java_.</p> +<p>Ce logiciel est une application de type “client lourd” totalement écrit en <code>Java</code>_.</p> <p>Il est basé sur une architecture n-tiers en couches, à savoir :</p> <ul> @@ -90,10 +93,10 @@ </ul> <p>.. image:: images/architecture.png :scale: 50 :align: center</p> <h1>La couche de Présentation</h1> -<p>Cette couche incarne l’IHM de l’application et est implémentée en <i>Java Swing</i>. Le rendu, quant à lui, utilise le style Nimbus_ disponible à partir de la version 6u10 de la <i>JRE</i> de Sun et qui sera le nouveau style par défaut à partir de la version 7 de <i>Java</i>.</p> +<p>Cette couche incarne l’IHM de l’application et est implémentée en <i>Java Swing</i>. Le rendu, quant à lui, utilise le style <code>Nimbus</code>_ disponible à partir de la version 6u10 de la <i>JRE</i> de Sun et qui sera le nouveau style par défaut à partir de la version 7 de <i>Java</i>.</p> <p>La couche de présentation respecte rigoureusement le modèle de conception <i>MVC</i> qui découple la vue du modèle et du contrôleur, et ne communique qu’avec la couche Métier et la couche de Services.</p></section><section> <h2><a name="Construction_des_interfaces_graphiques"></a>Construction des interfaces graphiques</h2> -<p>Les interfaces graphiques sont construites à l’aide de la technologie JAXX_ qui permet de spécifier les IHM en <i>xml</i> puis de les générer automatiquement à partir de ces spécifications.</p> +<p>Les interfaces graphiques sont construites à l’aide de la technologie <code>JAXX</code>_ qui permet de spécifier les IHM en <i>xml</i> puis de les générer automatiquement à partir de ces spécifications.</p> <p>Cette technologie permet, entre autre et de manière transparente, de gérer :</p> <ul> @@ -116,16 +119,16 @@ <li>Le service de Validation.</li> </ul></section><section> <h2><a name="le_service_de_Validation"></a>le service de Validation</h2> -<p>La validation des données est réalisée à partir du moteur de validation XWorks_ actuellement utilisé par le célébre framework web Struts 2_. Pour répondre aux besoins spécifiques du projet Observe, ce moteur a été “customisé” pour prendre en compte 2 niveaux de gravité d’erreurs : erreur ou anomalie.</p> +<p>La validation des données est réalisée à partir du moteur de validation <code>XWorks</code>_ actuellement utilisé par le célébre framework web <code>Struts 2</code>_. Pour répondre aux besoins spécifiques du projet Observe, ce moteur a été “customisé” pour prendre en compte 2 niveaux de gravité d’erreurs : erreur ou anomalie.</p> <p>L’implantation de la validation est “non intrusive” vis-à-vis des données quelle valide. Toutes les règles de validation sont externalisées et décrites dans des fichiers xml. Elles peuvent donc être modifiées et affinées sans avoir à recompiler. Elles sont rassemblées dans un <i>jar</i> indépendant pour en faciliter l’évolution.</p> <p>Ce service est utilisé par la couche Présentation lors de la saisie des formulaires et par la couche Métier lors de la consolidation des données (validation dite de “niveau 2”).</p> <h1>La couche de persistance</h1></section><section> <h2><a name="ToPIA"></a>ToPIA</h2> -<p>L’application utilise le composant <i>ToPIA-persistence</i> provenant framework ToPIA_ développé par la société Codelutin_. Ce composant assure l’accès aux différentes bases de données de manière transparente.</p> -<p>Actuellement <i>ToPIA-persistence</i> s’appuie sur Hibernate 3_ pour la persistance et les transactions. Prochainement <i>ToPIA-persistence</i> s’appuiera sur la norme <i>JPA</i> de persistance préconisée par Sun.</p></section><section> +<p>L’application utilise le composant <i>ToPIA-persistence</i> provenant framework <code>ToPIA</code>_ développé par la société <code>Codelutin</code>_. Ce composant assure l’accès aux différentes bases de données de manière transparente.</p> +<p>Actuellement <i>ToPIA-persistence</i> s’appuie sur <code>Hibernate 3</code>_ pour la persistance et les transactions. Prochainement <i>ToPIA-persistence</i> s’appuiera sur la norme <i>JPA</i> de persistance préconisée par Sun.</p></section><section> <h2><a name="Les_bases_de_donn.C3.A9es_de_l.E2.80.99application"></a>Les bases de données de l’application</h2> -<p>La base de données centrale Obstuna sera implantée sur un moteur PostgreSQL_.</p> -<p>Les bases de données déployées sur les Tablet-PC utiliseront un moteur h2<i>. Ce choix est conditionné par le fait que ce moteur est très léger (< à 1Moctets), ne nécessite aucune installation spécifique et fournit un mode Postgres</i> rendant une base de données h2_ compatible avec un moteur PostgreSQL_ (simplification des opérations de synchronisation entre bases de données locales et base de données centrale).</p> +<p>La base de données centrale <code>Obstuna</code> sera implantée sur un moteur <code>PostgreSQL</code>_.</p> +<p>Les bases de données déployées sur les Tablet-PC utiliseront un moteur <code>h2</code><i>. Ce choix est conditionné par le fait que ce moteur est très léger (< à 1Moctets), ne nécessite aucune installation spécifique et fournit un mode <code>Postgres</code></i> rendant une base de données <code>h2</code>_ compatible avec un moteur <code>PostgreSQL</code>_ (simplification des opérations de synchronisation entre bases de données locales et base de données centrale).</p> <p>.. _java: <a class="externalLink" href="http://java.sun.com/javase/">http://java.sun.com/javase/</a></p> <p>.. _Codelutin: <a class="externalLink" href="http://www.codelutin.com">http://www.codelutin.com</a></p> <p>.. _Nimbus: <a class="externalLink" href="http://java.sun.com/developer/technicalArticles/javase/java6u10/index.html">http://java.sun.com/developer/technicalArticles/javase/java6u10/index.html</a></p> @@ -137,16 +140,15 @@ <p>.. _h2: <a class="externalLink" href="http://www.h2database.com/html/main.html">http://www.h2database.com/html/main.html</a></p> <p>.. _Postgres: <a class="externalLink" href="http://www.postgresql.org/">http://www.postgresql.org/</a></p> <p>.. _PostgreSQL: <a class="externalLink" href="http://www.postgresql.org/">http://www.postgresql.org/</a></p></section> - </div> + </main> </div> </div> <hr/> <footer> <div class="container-fluid"> <div class="row-fluid"> - <p>Copyright ©2008–2019 -<a href="http://www.ird.fr/">IRD</a>. -All rights reserved.</p> + <p>Copyright © 2008–2020<a href="http://www.ird.fr/">IRD</a>. +.</p> </div> </div> </footer> ===================================== css/apache-maven-fluido-1.7.min.css → css/apache-maven-fluido-1.8.min.css ===================================== ===================================== css/print.css ===================================== @@ -17,7 +17,5 @@ * under the License. */ -/* $Id$ */ - #banner, #footer, #leftcol, #breadcrumbs, .docs #toc, .docs .courtesylinks, #leftColumn, #navColumn {display: none !important;} #bodyColumn, body.docs div.docs {margin: 0 !important;border: none !important} \ No newline at end of file ===================================== fonts/glyphicons-halflings-regular.eot ===================================== Binary files a/fonts/glyphicons-halflings-regular.eot and b/fonts/glyphicons-halflings-regular.eot differ ===================================== fonts/glyphicons-halflings-regular.svg ===================================== The diff for this file was not included because it is too large. ===================================== fonts/glyphicons-halflings-regular.ttf ===================================== Binary files a/fonts/glyphicons-halflings-regular.ttf and b/fonts/glyphicons-halflings-regular.ttf differ ===================================== fonts/glyphicons-halflings-regular.woff ===================================== Binary files a/fonts/glyphicons-halflings-regular.woff and b/fonts/glyphicons-halflings-regular.woff differ ===================================== img/architecture.svg ===================================== @@ -3,18 +3,18 @@ #%L ObServe :: Pom %% - Copyright (C) 2008 - 2019 IRD, Code Lutin, Ultreia.io + Copyright (C) 2008 - 2020 IRD, Code Lutin, Ultreia.io %% This program is free software: you can redistribute it and/or modify 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>. ===================================== index.html ===================================== @@ -1,51 +1,53 @@ <!DOCTYPE html>  -<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="fr" lang="fr"> +<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.0" /> - <meta name="Date-Revision-yyyymmdd" content="20190916" /> - <meta http-equiv="Content-Language" content="fr" /> + <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 – ObServe</title> - <link rel="stylesheet" href="./css/apache-maven-fluido-1.7.min.css" /> + <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 type="text/javascript" src="./js/apache-maven-fluido-1.7.min.js"></script> + <script src="./js/apache-maven-fluido-1.8.min.js"></script> </head> <body class="topBarDisabled"> <div class="container-fluid"> - <div id="banner"> - <div class="pull-left"><a href="index.html" id="bannerLeft"><img src="./img/logo-small.png" alt="ObServe :: Pom"/></a></div> - <div class="pull-right"></div> - <div class="clear"><hr/></div> - </div> + <header> + <div id="banner"> + <div class="pull-left"><a href="index.html" id="bannerLeft"><img src="./img/logo-small.png" alt="ObServe :: Pom"/></a></div> + <div class="pull-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"> + <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 ">ObServe</li> - <li id="publishDate" class="pull-right"><span class="divider">|</span> Dernière publication: 2019-09-16</li> - <li id="projectVersion" class="pull-right"><span class="divider">|</span>Version: 7.1.1</li> + <li id="publishDate" class="pull-right"><span class="divider">|</span> Dernière publication: 2020-03-26</li> + <li id="projectVersion" class="pull-right"><span class="divider">|</span>Version: 7.4.0</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> + </ul> + </div> + </header> <div class="row-fluid"> - <div id="leftColumn" class="span2"> - <div class="well sidebar-nav"> - <ul class="nav nav-list"> - <li class="nav-header">Utilisateur</li> + <header id="leftColumn" class="span2"> + <nav class="well sidebar-nav"> + <ul class="nav nav-list"> + <li class="nav-header">Utilisateur</li> <li class="active"><a href="#"><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 class="nav-header">Modélisation</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> @@ -53,45 +55,45 @@ <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 class="nav-header">Documentation sur le projet</li> <li><a href="project-info.html" title="Info Projet"><span class="icon-chevron-down"></span>Info Projet</a> - <ul class="nav nav-list"> - <li><a href="ci-management.html" title="Intégration continue"><span class="none"></span>Intégration continue</a></li> - <li><a href="dependency-convergence.html" title="Convergence des dépendances"><span class="none"></span>Convergence des dépendances</a></li> - <li><a href="dependency-info.html" title="Informations de dépendance"><span class="none"></span>Informations de dépendance</a></li> - <li><a href="dependency-management.html" title="Gestion des dépendances"><span class="none"></span>Gestion des dépendances</a></li> - <li><a href="distribution-management.html" title="Gestion de la distribution"><span class="none"></span>Gestion de la distribution</a></li> - <li class="active"><a href="#"><span class="none"></span>Bienvenue dans le projet</a></li> - <li><a href="issue-management.html" title="Contrôle des livraisons"><span class="none"></span>Contrôle des livraisons</a></li> - <li><a href="licenses.html" title="Licence du projet"><span class="none"></span>Licence du projet</a></li> - <li><a href="modules.html" title="Modules du projet"><span class="none"></span>Modules du projet</a></li> - <li><a href="plugin-management.html" title="Gestion des plugins"><span class="none"></span>Gestion des plugins</a></li> - <li><a href="plugins.html" title="Plugins du projet"><span class="none"></span>Plugins du projet</a></li> - <li><a href="scm.html" title="Dépôt de sources"><span class="none"></span>Dépôt de sources</a></li> - <li><a href="summary.html" title="Résumé du projet"><span class="none"></span>Résumé du projet</a></li> - <li><a href="team.html" title="Membres de ce projet"><span class="none"></span>Membres de ce projet</a></li> - </ul> -</li> + <ul class="nav nav-list"> + <li><a href="ci-management.html" title="Intégration continue"><span class="none"></span>Intégration continue</a></li> + <li><a href="dependency-convergence.html" title="Convergence des dépendances"><span class="none"></span>Convergence des dépendances</a></li> + <li><a href="dependency-info.html" title="Informations de dépendance"><span class="none"></span>Informations de dépendance</a></li> + <li><a href="dependency-management.html" title="Gestion des dépendances"><span class="none"></span>Gestion des dépendances</a></li> + <li><a href="distribution-management.html" title="Gestion de la distribution"><span class="none"></span>Gestion de la distribution</a></li> + <li class="active"><a href="#"><span class="none"></span>Bienvenue dans le projet</a></li> + <li><a href="issue-management.html" title="Contrôle des livraisons"><span class="none"></span>Contrôle des livraisons</a></li> + <li><a href="licenses.html" title="Licence du projet"><span class="none"></span>Licence du projet</a></li> + <li><a href="modules.html" title="Modules du projet"><span class="none"></span>Modules du projet</a></li> + <li><a href="plugin-management.html" title="Gestion des plugins"><span class="none"></span>Gestion des plugins</a></li> + <li><a href="plugins.html" title="Plugins du projet"><span class="none"></span>Plugins du projet</a></li> + <li><a href="scm.html" title="Dépôt de sources"><span class="none"></span>Dépôt de sources</a></li> + <li><a href="summary.html" title="Résumé du projet"><span class="none"></span>Résumé du projet</a></li> + <li><a href="team.html" title="Membres de ce projet"><span class="none"></span>Membres de ce projet</a></li> + </ul></li> <li><a href="project-reports.html" title="Rapports Projet"><span class="icon-chevron-right"></span>Rapports Projet</a></li> -</ul> + </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 type="text/javascript">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> - <div class="clear"></div> +<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="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> </div> - </div> - <div id="bodyColumn" class="span10" > + </header> + <main id="bodyColumn" class="span10" > <h1>ObServe</h1><section> <h2><a name="Pr.C3.A9sentation"></a>Présentation</h2> <p>Le logiciel <i>ObServe</i>… TODO</p> @@ -103,16 +105,15 @@ <li><a href="./administration-web.html">Administration web</a></li> <li><a href="./config-report.html">Configuration</a></li> </ul></section> - </div> + </main> </div> </div> <hr/> <footer> <div class="container-fluid"> <div class="row-fluid"> - <p>Copyright ©2008–2019 -<a href="http://www.ird.fr/">IRD</a>. -All rights reserved.</p> + <p>Copyright © 2008–2020<a href="http://www.ird.fr/">IRD</a>. +.</p> </div> </div> </footer> ===================================== install-serverPG.html ===================================== @@ -1,51 +1,53 @@ <!DOCTYPE html>  -<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="fr" lang="fr"> +<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.0" /> - <meta name="Date-Revision-yyyymmdd" content="20190916" /> - <meta http-equiv="Content-Language" content="fr" /> + <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 – Installation du serveur Obstuna</title> - <link rel="stylesheet" href="./css/apache-maven-fluido-1.7.min.css" /> + <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 type="text/javascript" src="./js/apache-maven-fluido-1.7.min.js"></script> + <script src="./js/apache-maven-fluido-1.8.min.js"></script> </head> <body class="topBarDisabled"> <div class="container-fluid"> - <div id="banner"> - <div class="pull-left"><a href="index.html" id="bannerLeft"><img src="./img/logo-small.png" alt="ObServe :: Pom"/></a></div> - <div class="pull-right"></div> - <div class="clear"><hr/></div> - </div> + <header> + <div id="banner"> + <div class="pull-left"><a href="index.html" id="bannerLeft"><img src="./img/logo-small.png" alt="ObServe :: Pom"/></a></div> + <div class="pull-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"> + <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 ">Installation du serveur Obstuna</li> - <li id="publishDate" class="pull-right"><span class="divider">|</span> Dernière publication: 2019-09-16</li> - <li id="projectVersion" class="pull-right"><span class="divider">|</span>Version: 7.1.1</li> + <li id="publishDate" class="pull-right"><span class="divider">|</span> Dernière publication: 2020-03-26</li> + <li id="projectVersion" class="pull-right"><span class="divider">|</span>Version: 7.4.0</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> + </ul> + </div> + </header> <div class="row-fluid"> - <div id="leftColumn" class="span2"> - <div class="well sidebar-nav"> - <ul class="nav nav-list"> - <li class="nav-header">Utilisateur</li> + <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 class="active"><a href="#"><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 class="nav-header">Modélisation</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> @@ -53,35 +55,36 @@ <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 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> + </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 type="text/javascript">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> - <div class="clear"></div> +<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="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> </div> - </div> - <div id="bodyColumn" class="span10" > + </header> + <main id="bodyColumn" class="span10" > <h1>Installation du serveur Obstuna</h1><section> <h2><a name="Pr.C3.A9-requis"></a>Pré-requis</h2> <ul> <li> -<p>Un certain nombre d’outils et scripts sont intégrés dans ObServe, il faut au préalable récupérer la dernière version de l’application. downloads_</p> +<p>Un certain nombre d’outils et scripts sont intégrés dans ObServe, il faut au préalable récupérer la dernière version de l’application. <code>downloads</code>_</p> </li> <li> @@ -117,9 +120,8 @@ <p>Pour créer une nouvelle instance d’obstuna, il faut au préalable avoir une base vierge (sans schéma) et les utilisateurs sur le serveur postgres.</p> <p>Il existe une script qui permet de faire ça en tant qu’utilisateur <i>postgres</i>.</p> -<div> -<div> -<pre class="source"> sudo su postgres +<div class="source"> +<div class="source"><pre class="prettyprint linenums"> sudo su postgres (cd scripts/postgresl/createdb ; ./create-ird_obstuna.sh) </pre></div></div> @@ -134,9 +136,8 @@ </ul> <p>Ce script a été conçu pour la configuration de l’ird, il ne fait qu’appeler un autre script bash avec les bons paramètres.</p> -<div> -<div> -<pre class="source"> scripts/postgresl/createdb/create-empty.sh +<div class="source"> +<div class="source"><pre class="prettyprint linenums"> scripts/postgresl/createdb/create-empty.sh </pre></div></div> <p>Il est donc très facile d’écrire un nouveau script de configuration avec le bon nom de la base, du propriétaire et des utilisateurs.</p> @@ -149,17 +150,15 @@ </ul> <p>on lance la commande :</p> -<div> -<div> -<pre class="source"> ( cd scripts/postgresl/createdb ; ./create-empty.sh obstuna-test admin-test "technicien-test utilisateur-test referentiel-test") +<div class="source"> +<div class="source"><pre class="prettyprint linenums"> ( cd scripts/postgresl/createdb ; ./create-empty.sh obstuna-test admin-test "technicien-test utilisateur-test referentiel-test") </pre></div></div> </section><section> <h3><a name="Phase_1_.28base_de_test.29"></a>Phase 1 (base de test)</h3> <p>Pour créer la base de test utilisée pour tous les tests d’intégration, on lance un autre script :</p> -<div> -<div> -<pre class="source"> sudo su postgres +<div class="source"> +<div class="source"><pre class="prettyprint linenums"> sudo su postgres (cd scripts/postgresl/createdb ; ./create-test_obstuna.sh) </pre></div></div> @@ -175,53 +174,46 @@ <h3><a name="Phase_2"></a>Phase 2</h3> <p>Ajouter une ligne dans le fichier de configuration pg_hba.conf</p> -<div> -<div> -<pre class="source"> host obstuna all 0.0.0.0/0 md5 +<div class="source"> +<div class="source"><pre class="prettyprint linenums"> host obstuna all 0.0.0.0/0 md5 </pre></div></div> <p>Pour la base de test ajouter en plus une ligne</p> -<div> -<div> -<pre class="source"> host obstuna-test all 0.0.0.0/0 md5 +<div class="source"> +<div class="source"><pre class="prettyprint linenums"> host obstuna-test all 0.0.0.0/0 md5 </pre></div></div> <p>Selon la configuration du serveur, il est possible de devoir aussi modifier le fichier de configuration postgresql.conf (pour renseigner la propriété listen_addresses=‘*’ pour autoriser le tcp depuis l’extérieur).</p> <p>Redémarrer le serveur postgres :</p> -<div> -<div> -<pre class="source"> sudo /etc/init.d/postgresql-8.3 restart +<div class="source"> +<div class="source"><pre class="prettyprint linenums"> sudo /etc/init.d/postgresql-8.3 restart </pre></div></div> <p>ou</p> -<div> -<div> -<pre class="source"> sudo service postgresql-8.3 restart +<div class="source"> +<div class="source"><pre class="prettyprint linenums"> sudo service postgresql-8.3 restart </pre></div></div> <p>tester la connexion</p> -<div> -<div> -<pre class="source"> psql -h localhost obstuna admin +<div class="source"> +<div class="source"><pre class="prettyprint linenums"> psql -h localhost obstuna admin </pre></div></div> </section><section> <h3><a name="Phase_3"></a>Phase 3</h3> <p>Il suffit enfin de lancer l’application en mode <i>création de base obstuna</i> via le raccourci suivant :</p> -<div> -<div> -<pre class="source"> (cd scripts/postgresl ; ./create.sh) +<div class="source"> +<div class="source"><pre class="prettyprint linenums"> (cd scripts/postgresl ; ./create.sh) </pre></div></div> <p>ou</p> -<div> -<div> -<pre class="source"> ./scripts/postgresl/create.bat +<div class="source"> +<div class="source"><pre class="prettyprint linenums"> ./scripts/postgresl/create.bat </pre></div></div> <p>Cela va effectuer les opérations suivantes après configuration de la base cible, de la base d’import de référentiel et des rôles de sécurité :</p> @@ -236,16 +228,14 @@ <h2><a name="Mise_.C3.A0_jour_d.E2.80.99une_base_obstuna"></a>Mise à jour d’une base obstuna</h2> <p>Pour mettre à jour une base obstuna via le service de migration intégré dans ObServe, il suffit de lancer l’application en mode <i>mise à jour obstuna</i> via le raccourci suivant :</p> -<div> -<div> -<pre class="source"> (cd scripts/postgresl ; ./update.sh) +<div class="source"> +<div class="source"><pre class="prettyprint linenums"> (cd scripts/postgresl ; ./update.sh) </pre></div></div> <p>ou</p> -<div> -<div> -<pre class="source"> ./scripts/postgresl/update.bat +<div class="source"> +<div class="source"><pre class="prettyprint linenums"> ./scripts/postgresl/update.bat </pre></div></div> <p>Ce mode va effectuer les opérations suivantes après configuration de la base cible et des rôles de sécurité :</p> @@ -265,16 +255,14 @@ </ul> <p>Pour appliquer la sécurité sur les utilisateurs d’une base obstuna, il suffit de lancer Observe en mode <i>mise à jour sécurité obstuna</i> via le raccourci suivant :</p> -<div> -<div> -<pre class="source"> (cd scripts/postgresl ; ./update-security.sh) +<div class="source"> +<div class="source"><pre class="prettyprint linenums"> (cd scripts/postgresl ; ./update-security.sh) </pre></div></div> <p>ou</p> -<div> -<div> -<pre class="source"> ./scripts/postgresl/update-security.bat +<div class="source"> +<div class="source"><pre class="prettyprint linenums"> ./scripts/postgresl/update-security.bat </pre></div></div> <p>Ce mode va effectuer les opérations suivantes après configuration de la base cible et des rôles de sécurité :</p> @@ -286,16 +274,14 @@ <h2><a name="Vider_une_base_obstuna"></a>Vider une base obstuna</h2> <p>Pour vider une base obstuna (ne vue de la recréer par exemple), il suffit de lancer ObServe en mode <i>suppression obstuna</i> via le raccourci suivant :</p> -<div> -<div> -<pre class="source"> (cd scripts/postgresl ; ./drop.sh) +<div class="source"> +<div class="source"><pre class="prettyprint linenums"> (cd scripts/postgresl ; ./drop.sh) </pre></div></div> <p>ou</p> -<div> -<div> -<pre class="source"> ./scripts/postgresl/drop.bat +<div class="source"> +<div class="source"><pre class="prettyprint linenums"> ./scripts/postgresl/drop.bat </pre></div></div> <p>Ce mode va effectuer les opérations suivantes après configuration de la base cible :</p> @@ -308,9 +294,8 @@ <p>Depuis la version 3.0, il est possible de lancer sur la base de scripts sql supplémentaires placé dans le répertoire <b>extra</b>.</p> <p>On lance ensuite la commande</p> -<div> -<div> -<pre class="source"> (cd scripts/postgresl ; ./apply-extra.sh) +<div class="source"> +<div class="source"><pre class="prettyprint linenums"> (cd scripts/postgresl ; ./apply-extra.sh) </pre></div></div> <p>Le script demande</p> @@ -319,16 +304,15 @@ <li>le nom de la base et l’utilisateur de connexion</li> <li>une confirmation d’exécution pour chaque script qu’il a trouvé dans le répertoire <b>extra</b></li> </ul></section> - </div> + </main> </div> </div> <hr/> <footer> <div class="container-fluid"> <div class="row-fluid"> - <p>Copyright ©2008–2019 -<a href="http://www.ird.fr/">IRD</a>. -All rights reserved.</p> + <p>Copyright © 2008–2020<a href="http://www.ird.fr/">IRD</a>. +.</p> </div> </div> </footer> ===================================== install.html ===================================== @@ -1,51 +1,53 @@ <!DOCTYPE html>  -<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="fr" lang="fr"> +<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.0" /> - <meta name="Date-Revision-yyyymmdd" content="20190916" /> - <meta http-equiv="Content-Language" content="fr" /> + <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 – Installation dObServe</title> - <link rel="stylesheet" href="./css/apache-maven-fluido-1.7.min.css" /> + <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 type="text/javascript" src="./js/apache-maven-fluido-1.7.min.js"></script> + <script src="./js/apache-maven-fluido-1.8.min.js"></script> </head> <body class="topBarDisabled"> <div class="container-fluid"> - <div id="banner"> - <div class="pull-left"><a href="index.html" id="bannerLeft"><img src="./img/logo-small.png" alt="ObServe :: Pom"/></a></div> - <div class="pull-right"></div> - <div class="clear"><hr/></div> - </div> + <header> + <div id="banner"> + <div class="pull-left"><a href="index.html" id="bannerLeft"><img src="./img/logo-small.png" alt="ObServe :: Pom"/></a></div> + <div class="pull-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"> + <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 ">Installation dObServe</li> - <li id="publishDate" class="pull-right"><span class="divider">|</span> Dernière publication: 2019-09-16</li> - <li id="projectVersion" class="pull-right"><span class="divider">|</span>Version: 7.1.1</li> + <li id="publishDate" class="pull-right"><span class="divider">|</span> Dernière publication: 2020-03-26</li> + <li id="projectVersion" class="pull-right"><span class="divider">|</span>Version: 7.4.0</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> + </ul> + </div> + </header> <div class="row-fluid"> - <div id="leftColumn" class="span2"> - <div class="well sidebar-nav"> - <ul class="nav nav-list"> - <li class="nav-header">Utilisateur</li> + <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 class="active"><a href="#"><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 class="nav-header">Modélisation</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> @@ -53,28 +55,29 @@ <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 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> + </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 type="text/javascript">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> - <div class="clear"></div> +<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="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> </div> - </div> - <div id="bodyColumn" class="span10" > + </header> + <main id="bodyColumn" class="span10" > <h1>Installation d’ObServe</h1><section> <h2><a name="Configuration_des_interfaces_graphiques"></a>Configuration des interfaces graphiques</h2> <p>Il est possible de modifier certains aspects de l’interfaces graphiques en modifiant le fichier ui.properties qui se trouve à la racine du jar principal sans pour autant à avoir à recompiler le projet :</p> @@ -99,16 +102,15 @@ <p>L’application crée un fichier de configuration sur chaque poste où elle est installé.</p> <p>Ce fichier se nomme .observe et se trouve dans le répertoire principal de l’utilisateur.</p> <p>TODO définir ce qu’il faut y mettre.</p></section> - </div> + </main> </div> </div> <hr/> <footer> <div class="container-fluid"> <div class="row-fluid"> - <p>Copyright ©2008–2019 -<a href="http://www.ird.fr/">IRD</a>. -All rights reserved.</p> + <p>Copyright © 2008–2020<a href="http://www.ird.fr/">IRD</a>. +.</p> </div> </div> </footer> ===================================== js/apache-maven-fluido-1.7.min.js → js/apache-maven-fluido-1.8.min.js ===================================== ===================================== synchro-referential.html ===================================== @@ -0,0 +1,132 @@ +<!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 – Synchronisation avancée du référentiel</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-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> + + <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 ">Synchronisation avancée du référentiel</li> + <li id="publishDate" class="pull-right"><span class="divider">|</span> Dernière publication: 2020-03-26</li> + <li id="projectVersion" class="pull-right"><span class="divider">|</span>Version: 7.4.0</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="./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="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> + </div> + </header> + <main id="bodyColumn" class="span10" > +<h1>Synchronisation avancée du référentiel</h1> +<p>Ce document décrit tous les cas possibles de la synchronisation avancée de référentiel.</p><section> +<h2><a name="Notations"></a>Notations</h2> +<p>On parle ici d’une synchronisation d’une base gauche (<code>1</code>) vers une base droite (<code>2</code>) avec des droits de mise à jour dans les deux sens.</p> +<p>On décrit dans la suite les différentes cas de modification d’un référentiel <code>A</code> (<code>A1</code> et <code>A2</code>).</p> +<p>Les propriétés modifiées sont notées <code>a, b, c, ...</code>.</p> +<p>Les dates de dernière mise à jour sera noté <code>t1</code> et <code>t2</code>, on les prime lors d’une modification.</p></section><section> +<h2><a name="Cas_.281.29_d.E2.80.99une_seule_propri.C3.A9t.C3.A9_.C3.A0_mettre_.C3.A0_jour_d.E2.80.99un_seul_c.C3.B4t.C3.A9"></a>Cas (1) d’une seule propriété à mettre à jour d’un seul côté</h2> +<p>On suppose ici que le référentiel <code>A</code> est uniquement modifié sur une seule propriété <code>a</code> sur la source de droite.</p> +<p>On a donc <code>t1 < t2</code>.</p> +<p>La mise à jour dans la base gauche rend alors les deux référentiels égaux :</p> +<ul> + +<li>toutes les propriétés métiers sont toutes identiques</li> +<li><code>t1' = t2</code></li> +</ul></section><section> +<h2><a name="Cas_.282.29_de_plusieurs_propri.C3.A9t.C3.A9s_.C3.A0_mettre_.C3.A0_jour_d.E2.80.99un_seul_c.C3.B4t.C3.A9"></a>Cas (2) de plusieurs propriétés à mettre à jour d’un seul côté</h2> +<p>On suppose ici que le référentiel <code>A</code> est uniquement modifié sur les propriétés <code>a</code> et <code>b</code> sur la source de droite.</p> +<p>On a donc <code>t1 < t2</code>.</p> +<p>Si on met à jour les deux propriétés, on se retrouve dans le cas (1).</p> +<p>Supposons désormais que l’on ne met à jour que la propriété <code>a</code>.</p> +<p>Afin de pouvoir ensuite lors d’une seconde mise à jour pouvoir encore mettre à jour <code>b</code>, il faut donc que <code>t1' != t2</code>.</p> +<p>On va donc positionner <code>t1'</code> arbitrairement entre son ancienne valeur et <code>t2</code> : <code>t1 < t1' < t2</code>.</p></section><section> +<h2><a name="Cas_.283.29_de_propri.C3.A9t.C3.A9s_.C3.A0_mettre_.C3.A0_jour_des_deux_c.C3.B4t.C3.A9s"></a>Cas (3) de propriétés à mettre à jour des deux côtés</h2> +<p>On suppose ici que le référentiel <code>A</code> est modifié sur les propriétés <code>a1</code> et <code>b1</code> sur la source de gauche et <code>a2</code> et <code>b2</code> sur la source droite.</p> +<p>On doit appliquer le même principe que précdemment pour pouvoir toujours voir les modifications non encore appliquées lors d’une prochaine synchronisation.</p> +<p>On conserve donc l’ordre induit par <code>t1</code> et <code>t2</code> sur <code>t1'</code> et <code>t2'</code>, juqu’à obtenir l’égalité lorsque toutes les propriétés métiers sont égales.</p></section><section> +<h2><a name="Cas_de_mise_.C3.A0_jour_avec_cascade"></a>Cas de mise à jour avec cascade</h2> +<p>Il s’agit de bien définir comment mettre à jour les associations multiples; normalement le cas est bien géré, mais il faudra s’en assurer.</p> +<p><code>TODO</code></p></section><section> +<h2><a name="Cas_de_suppression_avec_cascade"></a>Cas de suppression avec cascade</h2> +<p><code>TODO</code></p></section><section> +<h2><a name="Cas_d.E2.80.99une_insertion"></a>Cas d’une insertion</h2> +<p>On report exactement le référentiel, donc pas de question à se poser.</p></section><section> +<h2><a name="Cas_de_retour_en_arri.C3.A8re"></a>Cas de retour en arrière</h2> +<p>Il s’agit du cas inverse d’une mise à jour, les mêmes principes sont donc à appliquer.</p></section><section> +<h2><a name="Modification_dans_ToPIA_.3F"></a>Modification dans ToPIA ?</h2> +<p>Il semblerait opportun de remplacer le <code>topiaVersion</code> actuellement encodé en entier par directement la date de dernière mise à jour; car au final le <code>topiaVersion</code> actuel n’est pas satisfaisant.</p></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 View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/commit/147adff6a742a1c2fc3d68495… -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/commit/147adff6a742a1c2fc3d68495… You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-observe] Deleted branch release/7.4.0
by Tony CHEMIT 26 Mar '20

26 Mar '20

Tony CHEMIT deleted branch release/7.4.0 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.4.0
by Tony CHEMIT 26 Mar '20

26 Mar '20

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

1 0

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

26 Mar '20

Tony CHEMIT pushed to branch release/7.4.0 at ultreiaio / ird-observe Commits: a0dd0074 by tchemit at 2020-03-26T11:14:41+01:00 [jgitflow-maven-plugin]updating poms for branch'release/7.4.0' 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.4.0-SNAPSHOT</version> + <version>7.4.0</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.4.0-SNAPSHOT</version> + <version>7.4.0</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.4.0-SNAPSHOT</version> + <version>7.4.0</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.4.0-SNAPSHOT</version> + <version>7.4.0</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.4.0-SNAPSHOT</version> + <version>7.4.0</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.4.0-SNAPSHOT</version> + <version>7.4.0</version> </parent> <artifactId>observe</artifactId> ===================================== persistence/pom.xml ===================================== @@ -26,7 +26,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>ird-observe</artifactId> - <version>7.4.0-SNAPSHOT</version> + <version>7.4.0</version> </parent> <artifactId>persistence</artifactId> ===================================== pom.xml ===================================== @@ -31,7 +31,7 @@ <groupId>fr.ird.observe</groupId> <artifactId>ird-observe</artifactId> - <version>7.4.0-SNAPSHOT</version> + <version>7.4.0</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.4.0-SNAPSHOT</version> + <version>7.4.0</version> </parent> <artifactId>server-configuration</artifactId> ===================================== server-core/pom.xml ===================================== @@ -27,7 +27,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>ird-observe</artifactId> - <version>7.4.0-SNAPSHOT</version> + <version>7.4.0</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.4.0-SNAPSHOT</version> + <version>7.4.0</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.4.0-SNAPSHOT</version> + <version>7.4.0</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.4.0-SNAPSHOT</version> + <version>7.4.0</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.4.0-SNAPSHOT</version> + <version>7.4.0</version> </parent> <artifactId>services</artifactId> ===================================== test/pom.xml ===================================== @@ -26,7 +26,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>ird-observe</artifactId> - <version>7.4.0-SNAPSHOT</version> + <version>7.4.0</version> </parent> <artifactId>test</artifactId> ===================================== validation/pom.xml ===================================== @@ -26,7 +26,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>ird-observe</artifactId> - <version>7.4.0-SNAPSHOT</version> + <version>7.4.0</version> </parent> <artifactId>validation</artifactId> View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/commit/a0dd0074dede568e1390e2b95… -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/commit/a0dd0074dede568e1390e2b95… You're receiving this email because of your account on gitlab.com.

1 0