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

[Git][ultreiaio/ird-observe][pages] Remove old versions
by Tony CHEMIT (＠tchemit) 09 Sep '24

09 Sep '24

Tony CHEMIT pushed to branch pages at ultreiaio / ird-observe Commits: d3256682 by Tony Chemit at 2024-09-09T12:02:42+02:00 Remove old versions - - - - - 12 changed files: - − 9.3.5/CHANGELOG.html - − 9.3.5/architecture-logicielle.html - − 9.3.5/avdth/common.html - − 9.3.5/avdth/index.html - − 9.3.5/avdth/landing.html - − 9.3.5/avdth/local_market.html - − 9.3.5/avdth/logbook.html - − 9.3.5/avdth/referential.html - − 9.3.5/avdth/sample.html - − 9.3.5/changelog.html - − 9.3.5/changes-report.html - − 9.3.5/ci-management.html The diff was not included because it is too large. View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/commit/d3256682ff4578d4b4e87bf48… -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/commit/d3256682ff4578d4b4e87bf48… You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-observe][develop] Update changelog for v.9.3.7 [skip CI]
by Tony CHEMIT (＠tchemit) 06 Sep '24

06 Sep '24

Tony CHEMIT pushed to branch develop at ultreiaio / ird-observe Commits: 8c7782f6 by Tony Chemit at 2024-09-06T14:05:36+02:00 Update changelog for v.9.3.7 [skip CI] - - - - - 1 changed file: - CHANGELOG.md Changes: ===================================== CHANGELOG.md ===================================== The diff for this file was not included because it is too large. View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/commit/8c7782f6d52605ac881f917c5… -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/commit/8c7782f6d52605ac881f917c5… You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-observe][develop] 4 commits: update decorator and pom
by Tony CHEMIT (＠tchemit) 06 Sep '24

06 Sep '24

Tony CHEMIT pushed to branch develop at ultreiaio / ird-observe Commits: 7e07db53 by Tony Chemit at 2024-09-06T13:09:19+02:00 update decorator and pom - - - - - 42d1aa35 by Tony Chemit at 2024-09-06T13:09:19+02:00 override DecoratorSorted.getComparator - - - - - 36216614 by Tony Chemit at 2024-09-06T13:09:19+02:00 use Decorator comparator in RowSorter - - - - - b4144587 by Tony Chemit at 2024-09-06T13:10:02+02:00 Merge branch 'feature/issue_1203' into develop Utilisation des décorateurs des colonnes de type décorable pour fournir l'ordre lors d'un tri d'une telle colonne - Closes #1203 - - - - - 5 changed files: - client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/content/data/table/ContentTableUITableModel.java - pom.xml - toolkit/api-decoration/src/main/java/fr/ird/observe/decoration/DefaultDecoratorRenderer.java - toolkit/api-decoration/src/main/java/fr/ird/observe/decoration/JavaBeanDecoratorRenderer.java - toolkit/api-decoration/src/main/java/fr/ird/observe/decoration/ToolkitIdLabelDecoratorRenderer.java Changes: ===================================== client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/content/data/table/ContentTableUITableModel.java ===================================== @@ -26,11 +26,16 @@ import fr.ird.observe.client.datasource.editor.api.content.data.table.actions.en import fr.ird.observe.client.datasource.editor.api.content.ui.table.EditableTable; import fr.ird.observe.client.util.UIHelper; import fr.ird.observe.client.util.table.EditableTableModelWithCache; +import fr.ird.observe.decoration.DecoratorService; import fr.ird.observe.dto.IdDto; import fr.ird.observe.dto.data.ContainerChildDto; import fr.ird.observe.dto.data.DataDto; import fr.ird.observe.dto.data.WithIndex; import io.ultreia.java4all.bean.JavaBean; +import io.ultreia.java4all.decoration.Decorated; +import io.ultreia.java4all.decoration.DecoratedSorter; +import io.ultreia.java4all.decoration.Decorator; +import io.ultreia.java4all.decoration.DecoratorDefinition; import io.ultreia.java4all.i18n.I18n; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; @@ -189,6 +194,20 @@ public abstract class ContentTableUITableModel<D extends DataDto, C extends Cont if (getColumnMeta(0).getType().equals(int.class)) { sorter.setComparator(0, Comparator.comparingInt(v -> (int) v)); } + int index=-1; + for (ContentTableMeta<C> meta : metas) { + index++; + Class<?> type = meta.getType(); + if (Decorated.class.isAssignableFrom(type)) { + DecoratorService decoratorService = getContext().getModel().getDecoratorService(); + Decorator decorator = decoratorService.getDecoratorByType(type); + int decoratorIndex = decorator.configuration().getIndex(); + DecoratedSorter<?> decoratedSorter = decorator.definition().sorter(); + Comparator<?> comparator = decoratedSorter.getComparator((DecoratorDefinition) decorator.definition(), decoratorService.getReferentialLocale().getLocale(), decoratorIndex); + sorter.setComparator(index, comparator); + } + } + table.setSortable(true); } ===================================== pom.xml ===================================== @@ -23,7 +23,7 @@ <parent> <groupId>io.ultreia.maven</groupId> <artifactId>pom</artifactId> - <version>2024.34</version> + <version>2024.36</version> </parent> <groupId>fr.ird.observe</groupId> <artifactId>ird-observe</artifactId> ===================================== toolkit/api-decoration/src/main/java/fr/ird/observe/decoration/DefaultDecoratorRenderer.java ===================================== @@ -144,4 +144,8 @@ public class DefaultDecoratorRenderer<O> extends DecoratorRenderer<O> { return propertyName.toLowerCase().contains("timestamp"); } + protected boolean isTemporal(String propertyName) { + return isDate(propertyName) || isTimestamp(propertyName) || propertyName.toLowerCase().contains("time"); + } + } ===================================== toolkit/api-decoration/src/main/java/fr/ird/observe/decoration/JavaBeanDecoratorRenderer.java ===================================== @@ -34,6 +34,7 @@ import io.ultreia.java4all.lang.Strings; import java.util.ArrayList; import java.util.Collection; +import java.util.Comparator; import java.util.Date; import java.util.List; import java.util.Locale; @@ -96,6 +97,36 @@ public class JavaBeanDecoratorRenderer<O extends JavaBean> extends DefaultDecora defaultSort(propertyName, definition, locale, pos, dataList); } + @Override + public Comparator<O> getComparator(DecoratorDefinition<O, ?> definition, Locale locale, int pos) { + String propertyName = definition.properties().get(pos); + if (getCodeProperties().contains(propertyName)) { + return Comparator.comparing(d -> { + Object context = d.get(propertyName); + if (context == null) { + return null; + } + String text = String.valueOf(context); + return sortByCodeFunction(text); + }); + } + if (isTemporal(propertyName)) { + // sort on date, can not use toString render to sort (wrong order when using date pattern dd/MM/yyyy) + return Comparator.comparing(d -> ((Date) d.get(propertyName)).getTime()); + } + JavaBeanPropertyDefinition<JavaBean, Object> propertyDefinition = getJavaBeanDefinition().readProperty(propertyName); + if (Number.class.isAssignableFrom(propertyDefinition.type()) || + int.class.isAssignableFrom(propertyDefinition.type()) || + float.class.isAssignableFrom(propertyDefinition.type()) || + long.class.isAssignableFrom(propertyDefinition.type())) { + return Comparator.comparing(d -> d.get(propertyName)); + } + if (StatisticValue.class.isAssignableFrom(propertyDefinition.type())) { + return Comparator.comparingLong(d -> ((StatisticValue) d.get(propertyName)).getValue()); + } + return Comparator.comparing(d -> definition.decorate(locale, d, pos)); + } + protected void defaultSort(String propertyName, DecoratorDefinition<O, ?> definition, Locale locale, int pos, List<O> dataList) { super.sort(definition, locale, pos, dataList); } ===================================== toolkit/api-decoration/src/main/java/fr/ird/observe/decoration/ToolkitIdLabelDecoratorRenderer.java ===================================== @@ -32,6 +32,7 @@ import org.apache.logging.log4j.Logger; import java.text.ParseException; import java.text.SimpleDateFormat; +import java.util.Comparator; import java.util.List; import java.util.Locale; import java.util.Set; @@ -71,6 +72,43 @@ public class ToolkitIdLabelDecoratorRenderer extends JavaBeanDecoratorRenderer<T sortByCode(pos, dataList); } + @Override + public Comparator<ToolkitIdLabel> getComparator(DecoratorDefinition<ToolkitIdLabel, ?> definition, Locale locale, int pos) { + String propertyName = definition.properties().get(pos); + if (isDate(propertyName)) { + + // sort on date, can not use toString render to sort (wrong order when using date pattern dd/MM/yyyy) + SimpleDateFormat dateFormat = I18nDecoratorHelper.newDateFormat(locale); + return Comparator.comparingLong(d -> { + String o = d.getText(pos); + try { + return dateFormat.parse(o).getTime(); + } catch (ParseException e) { + return 0; + } + + }); + } + if (isTimestamp(propertyName)) { + // sort on timestamp, can not use toString render to sort (wrong order when using date pattern dd/MM/yyyy HH:mm) + SimpleDateFormat dateFormat = I18nDecoratorHelper.newTimestampFormat(locale); + return Comparator.comparingLong(d -> { + String o = d.getText(pos); + try { + return dateFormat.parse(o).getTime(); + } catch (ParseException e) { + return 0; + } + + }); + } + return Comparator.comparing(d -> { + String o = d.getText(pos); + return sortByCodeFunction(o); + + }); + } + protected void sortByDate(int pos, SimpleDateFormat dateFormat, List<ToolkitIdLabel> dataList) { Multimap<Long, ToolkitIdLabel> dataToDate = ArrayListMultimap.create(); for (ToolkitIdLabel data : dataList) { View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/compare/f518f0e1541d1ce0fa340e81… -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/compare/f518f0e1541d1ce0fa340e81… You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-observe] Deleted branch feature/issue_1203
by Tony CHEMIT (＠tchemit) 06 Sep '24

06 Sep '24

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

1 0

[Git][ultreiaio/ird-observe][develop] Deleted 4 commits: update decorator and pom
by Tony CHEMIT (＠tchemit) 06 Sep '24

06 Sep '24

Tony CHEMIT pushed to branch develop at ultreiaio / ird-observe WARNING: The push did not contain any new commits, but force pushed to delete the commits and changes below. Deleted commits: d16efe06 by Tony Chemit at 2024-09-06T12:42:50+02:00 update decorator and pom - - - - - 9daea82d by Tony Chemit at 2024-09-06T12:52:39+02:00 override DecoratorSorted.getComparator - - - - - 62e6eeaf by Tony Chemit at 2024-09-06T12:52:39+02:00 use Decorator comparator in RowSorter - - - - - e78ff0dd by Tony Chemit at 2024-09-06T12:53:14+02:00 Merge branch 'feature/issue_1203' into develop Tableaux de saisie (captures, échantillons, équipements...) - Classement en cliquant sur les en-têtes de colonnes - Closes #1203 - - - - - 5 changed files: - client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/content/data/table/ContentTableUITableModel.java - pom.xml - toolkit/api-decoration/src/main/java/fr/ird/observe/decoration/DefaultDecoratorRenderer.java - toolkit/api-decoration/src/main/java/fr/ird/observe/decoration/JavaBeanDecoratorRenderer.java - toolkit/api-decoration/src/main/java/fr/ird/observe/decoration/ToolkitIdLabelDecoratorRenderer.java Changes: ===================================== client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/content/data/table/ContentTableUITableModel.java ===================================== @@ -26,11 +26,16 @@ import fr.ird.observe.client.datasource.editor.api.content.data.table.actions.en import fr.ird.observe.client.datasource.editor.api.content.ui.table.EditableTable; import fr.ird.observe.client.util.UIHelper; import fr.ird.observe.client.util.table.EditableTableModelWithCache; +import fr.ird.observe.decoration.DecoratorService; import fr.ird.observe.dto.IdDto; import fr.ird.observe.dto.data.ContainerChildDto; import fr.ird.observe.dto.data.DataDto; import fr.ird.observe.dto.data.WithIndex; import io.ultreia.java4all.bean.JavaBean; +import io.ultreia.java4all.decoration.Decorated; +import io.ultreia.java4all.decoration.DecoratedSorter; +import io.ultreia.java4all.decoration.Decorator; +import io.ultreia.java4all.decoration.DecoratorDefinition; import io.ultreia.java4all.i18n.I18n; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; @@ -189,6 +194,20 @@ public abstract class ContentTableUITableModel<D extends DataDto, C extends Cont if (getColumnMeta(0).getType().equals(int.class)) { sorter.setComparator(0, Comparator.comparingInt(v -> (int) v)); } + int index=-1; + for (ContentTableMeta<C> meta : metas) { + index++; + Class<?> type = meta.getType(); + if (Decorated.class.isAssignableFrom(type)) { + DecoratorService decoratorService = getContext().getModel().getDecoratorService(); + Decorator decorator = decoratorService.getDecoratorByType(type); + int decoratorIndex = decorator.configuration().getIndex(); + DecoratedSorter<?> decoratedSorter = decorator.definition().sorter(); + Comparator<?> comparator = decoratedSorter.getComparator((DecoratorDefinition) decorator.definition(), decoratorService.getReferentialLocale().getLocale(), decoratorIndex); + sorter.setComparator(index, comparator); + } + } + table.setSortable(true); } ===================================== pom.xml ===================================== @@ -23,7 +23,7 @@ <parent> <groupId>io.ultreia.maven</groupId> <artifactId>pom</artifactId> - <version>2024.34</version> + <version>2024.36-SNAPSHOT</version> </parent> <groupId>fr.ird.observe</groupId> <artifactId>ird-observe</artifactId> ===================================== toolkit/api-decoration/src/main/java/fr/ird/observe/decoration/DefaultDecoratorRenderer.java ===================================== @@ -144,4 +144,8 @@ public class DefaultDecoratorRenderer<O> extends DecoratorRenderer<O> { return propertyName.toLowerCase().contains("timestamp"); } + protected boolean isTemporal(String propertyName) { + return isDate(propertyName) || isTimestamp(propertyName) || propertyName.toLowerCase().contains("time"); + } + } ===================================== toolkit/api-decoration/src/main/java/fr/ird/observe/decoration/JavaBeanDecoratorRenderer.java ===================================== @@ -34,6 +34,7 @@ import io.ultreia.java4all.lang.Strings; import java.util.ArrayList; import java.util.Collection; +import java.util.Comparator; import java.util.Date; import java.util.List; import java.util.Locale; @@ -96,6 +97,36 @@ public class JavaBeanDecoratorRenderer<O extends JavaBean> extends DefaultDecora defaultSort(propertyName, definition, locale, pos, dataList); } + @Override + public Comparator<O> getComparator(DecoratorDefinition<O, ?> definition, Locale locale, int pos) { + String propertyName = definition.properties().get(pos); + if (getCodeProperties().contains(propertyName)) { + return Comparator.comparing(d -> { + Object context = d.get(propertyName); + if (context == null) { + return null; + } + String text = String.valueOf(context); + return sortByCodeFunction(text); + }); + } + if (isTemporal(propertyName)) { + // sort on date, can not use toString render to sort (wrong order when using date pattern dd/MM/yyyy) + return Comparator.comparing(d -> ((Date) d.get(propertyName)).getTime()); + } + JavaBeanPropertyDefinition<JavaBean, Object> propertyDefinition = getJavaBeanDefinition().readProperty(propertyName); + if (Number.class.isAssignableFrom(propertyDefinition.type()) || + int.class.isAssignableFrom(propertyDefinition.type()) || + float.class.isAssignableFrom(propertyDefinition.type()) || + long.class.isAssignableFrom(propertyDefinition.type())) { + return Comparator.comparing(d -> d.get(propertyName)); + } + if (StatisticValue.class.isAssignableFrom(propertyDefinition.type())) { + return Comparator.comparingLong(d -> ((StatisticValue) d.get(propertyName)).getValue()); + } + return Comparator.comparing(d -> definition.decorate(locale, d, pos)); + } + protected void defaultSort(String propertyName, DecoratorDefinition<O, ?> definition, Locale locale, int pos, List<O> dataList) { super.sort(definition, locale, pos, dataList); } ===================================== toolkit/api-decoration/src/main/java/fr/ird/observe/decoration/ToolkitIdLabelDecoratorRenderer.java ===================================== @@ -32,6 +32,7 @@ import org.apache.logging.log4j.Logger; import java.text.ParseException; import java.text.SimpleDateFormat; +import java.util.Comparator; import java.util.List; import java.util.Locale; import java.util.Set; @@ -71,6 +72,43 @@ public class ToolkitIdLabelDecoratorRenderer extends JavaBeanDecoratorRenderer<T sortByCode(pos, dataList); } + @Override + public Comparator<ToolkitIdLabel> getComparator(DecoratorDefinition<ToolkitIdLabel, ?> definition, Locale locale, int pos) { + String propertyName = definition.properties().get(pos); + if (isDate(propertyName)) { + + // sort on date, can not use toString render to sort (wrong order when using date pattern dd/MM/yyyy) + SimpleDateFormat dateFormat = I18nDecoratorHelper.newDateFormat(locale); + return Comparator.comparingLong(d -> { + String o = d.getText(pos); + try { + return dateFormat.parse(o).getTime(); + } catch (ParseException e) { + return 0; + } + + }); + } + if (isTimestamp(propertyName)) { + // sort on timestamp, can not use toString render to sort (wrong order when using date pattern dd/MM/yyyy HH:mm) + SimpleDateFormat dateFormat = I18nDecoratorHelper.newTimestampFormat(locale); + return Comparator.comparingLong(d -> { + String o = d.getText(pos); + try { + return dateFormat.parse(o).getTime(); + } catch (ParseException e) { + return 0; + } + + }); + } + return Comparator.comparing(d -> { + String o = d.getText(pos); + return sortByCodeFunction(o); + + }); + } + protected void sortByDate(int pos, SimpleDateFormat dateFormat, List<ToolkitIdLabel> dataList) { Multimap<Long, ToolkitIdLabel> dataToDate = ArrayListMultimap.create(); for (ToolkitIdLabel data : dataList) { View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/compare/f518f0e1541d1ce0fa340e81… -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/compare/f518f0e1541d1ce0fa340e81… You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-observe] Pushed new branch feature/issue_1203
by Tony CHEMIT (＠tchemit) 06 Sep '24

06 Sep '24

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

1 0

[Git][ultreiaio/ird-observe][develop] 4 commits: update decorator and pom
by Tony CHEMIT (＠tchemit) 06 Sep '24

06 Sep '24

Tony CHEMIT pushed to branch develop at ultreiaio / ird-observe Commits: d16efe06 by Tony Chemit at 2024-09-06T12:42:50+02:00 update decorator and pom - - - - - 9daea82d by Tony Chemit at 2024-09-06T12:52:39+02:00 override DecoratorSorted.getComparator - - - - - 62e6eeaf by Tony Chemit at 2024-09-06T12:52:39+02:00 use Decorator comparator in RowSorter - - - - - e78ff0dd by Tony Chemit at 2024-09-06T12:53:14+02:00 Merge branch 'feature/issue_1203' into develop Tableaux de saisie (captures, échantillons, équipements...) - Classement en cliquant sur les en-têtes de colonnes - Closes #1203 - - - - - 5 changed files: - client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/content/data/table/ContentTableUITableModel.java - pom.xml - toolkit/api-decoration/src/main/java/fr/ird/observe/decoration/DefaultDecoratorRenderer.java - toolkit/api-decoration/src/main/java/fr/ird/observe/decoration/JavaBeanDecoratorRenderer.java - toolkit/api-decoration/src/main/java/fr/ird/observe/decoration/ToolkitIdLabelDecoratorRenderer.java Changes: ===================================== client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/content/data/table/ContentTableUITableModel.java ===================================== @@ -26,11 +26,16 @@ import fr.ird.observe.client.datasource.editor.api.content.data.table.actions.en import fr.ird.observe.client.datasource.editor.api.content.ui.table.EditableTable; import fr.ird.observe.client.util.UIHelper; import fr.ird.observe.client.util.table.EditableTableModelWithCache; +import fr.ird.observe.decoration.DecoratorService; import fr.ird.observe.dto.IdDto; import fr.ird.observe.dto.data.ContainerChildDto; import fr.ird.observe.dto.data.DataDto; import fr.ird.observe.dto.data.WithIndex; import io.ultreia.java4all.bean.JavaBean; +import io.ultreia.java4all.decoration.Decorated; +import io.ultreia.java4all.decoration.DecoratedSorter; +import io.ultreia.java4all.decoration.Decorator; +import io.ultreia.java4all.decoration.DecoratorDefinition; import io.ultreia.java4all.i18n.I18n; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; @@ -189,6 +194,20 @@ public abstract class ContentTableUITableModel<D extends DataDto, C extends Cont if (getColumnMeta(0).getType().equals(int.class)) { sorter.setComparator(0, Comparator.comparingInt(v -> (int) v)); } + int index=-1; + for (ContentTableMeta<C> meta : metas) { + index++; + Class<?> type = meta.getType(); + if (Decorated.class.isAssignableFrom(type)) { + DecoratorService decoratorService = getContext().getModel().getDecoratorService(); + Decorator decorator = decoratorService.getDecoratorByType(type); + int decoratorIndex = decorator.configuration().getIndex(); + DecoratedSorter<?> decoratedSorter = decorator.definition().sorter(); + Comparator<?> comparator = decoratedSorter.getComparator((DecoratorDefinition) decorator.definition(), decoratorService.getReferentialLocale().getLocale(), decoratorIndex); + sorter.setComparator(index, comparator); + } + } + table.setSortable(true); } ===================================== pom.xml ===================================== @@ -23,7 +23,7 @@ <parent> <groupId>io.ultreia.maven</groupId> <artifactId>pom</artifactId> - <version>2024.34</version> + <version>2024.36-SNAPSHOT</version> </parent> <groupId>fr.ird.observe</groupId> <artifactId>ird-observe</artifactId> ===================================== toolkit/api-decoration/src/main/java/fr/ird/observe/decoration/DefaultDecoratorRenderer.java ===================================== @@ -144,4 +144,8 @@ public class DefaultDecoratorRenderer<O> extends DecoratorRenderer<O> { return propertyName.toLowerCase().contains("timestamp"); } + protected boolean isTemporal(String propertyName) { + return isDate(propertyName) || isTimestamp(propertyName) || propertyName.toLowerCase().contains("time"); + } + } ===================================== toolkit/api-decoration/src/main/java/fr/ird/observe/decoration/JavaBeanDecoratorRenderer.java ===================================== @@ -34,6 +34,7 @@ import io.ultreia.java4all.lang.Strings; import java.util.ArrayList; import java.util.Collection; +import java.util.Comparator; import java.util.Date; import java.util.List; import java.util.Locale; @@ -96,6 +97,36 @@ public class JavaBeanDecoratorRenderer<O extends JavaBean> extends DefaultDecora defaultSort(propertyName, definition, locale, pos, dataList); } + @Override + public Comparator<O> getComparator(DecoratorDefinition<O, ?> definition, Locale locale, int pos) { + String propertyName = definition.properties().get(pos); + if (getCodeProperties().contains(propertyName)) { + return Comparator.comparing(d -> { + Object context = d.get(propertyName); + if (context == null) { + return null; + } + String text = String.valueOf(context); + return sortByCodeFunction(text); + }); + } + if (isTemporal(propertyName)) { + // sort on date, can not use toString render to sort (wrong order when using date pattern dd/MM/yyyy) + return Comparator.comparing(d -> ((Date) d.get(propertyName)).getTime()); + } + JavaBeanPropertyDefinition<JavaBean, Object> propertyDefinition = getJavaBeanDefinition().readProperty(propertyName); + if (Number.class.isAssignableFrom(propertyDefinition.type()) || + int.class.isAssignableFrom(propertyDefinition.type()) || + float.class.isAssignableFrom(propertyDefinition.type()) || + long.class.isAssignableFrom(propertyDefinition.type())) { + return Comparator.comparing(d -> d.get(propertyName)); + } + if (StatisticValue.class.isAssignableFrom(propertyDefinition.type())) { + return Comparator.comparingLong(d -> ((StatisticValue) d.get(propertyName)).getValue()); + } + return Comparator.comparing(d -> definition.decorate(locale, d, pos)); + } + protected void defaultSort(String propertyName, DecoratorDefinition<O, ?> definition, Locale locale, int pos, List<O> dataList) { super.sort(definition, locale, pos, dataList); } ===================================== toolkit/api-decoration/src/main/java/fr/ird/observe/decoration/ToolkitIdLabelDecoratorRenderer.java ===================================== @@ -32,6 +32,7 @@ import org.apache.logging.log4j.Logger; import java.text.ParseException; import java.text.SimpleDateFormat; +import java.util.Comparator; import java.util.List; import java.util.Locale; import java.util.Set; @@ -71,6 +72,43 @@ public class ToolkitIdLabelDecoratorRenderer extends JavaBeanDecoratorRenderer<T sortByCode(pos, dataList); } + @Override + public Comparator<ToolkitIdLabel> getComparator(DecoratorDefinition<ToolkitIdLabel, ?> definition, Locale locale, int pos) { + String propertyName = definition.properties().get(pos); + if (isDate(propertyName)) { + + // sort on date, can not use toString render to sort (wrong order when using date pattern dd/MM/yyyy) + SimpleDateFormat dateFormat = I18nDecoratorHelper.newDateFormat(locale); + return Comparator.comparingLong(d -> { + String o = d.getText(pos); + try { + return dateFormat.parse(o).getTime(); + } catch (ParseException e) { + return 0; + } + + }); + } + if (isTimestamp(propertyName)) { + // sort on timestamp, can not use toString render to sort (wrong order when using date pattern dd/MM/yyyy HH:mm) + SimpleDateFormat dateFormat = I18nDecoratorHelper.newTimestampFormat(locale); + return Comparator.comparingLong(d -> { + String o = d.getText(pos); + try { + return dateFormat.parse(o).getTime(); + } catch (ParseException e) { + return 0; + } + + }); + } + return Comparator.comparing(d -> { + String o = d.getText(pos); + return sortByCodeFunction(o); + + }); + } + protected void sortByDate(int pos, SimpleDateFormat dateFormat, List<ToolkitIdLabel> dataList) { Multimap<Long, ToolkitIdLabel> dataToDate = ArrayListMultimap.create(); for (ToolkitIdLabel data : dataList) { View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/compare/f518f0e1541d1ce0fa340e81… -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/compare/f518f0e1541d1ce0fa340e81… You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-observe][develop] 6 commits: fix license header
by Tony CHEMIT (＠tchemit) 05 Sep '24

05 Sep '24

Tony CHEMIT pushed to branch develop at ultreiaio / ird-observe Commits: 093c30be by Tony Chemit at 2024-09-05T13:50:20+02:00 fix license header - - - - - 79bfcae5 by Tony Chemit at 2024-09-05T13:54:44+02:00 Hide species ids option (Will be re-add in #2931) - Closes #2929 - - - - - 0749d0a9 by Tony Chemit at 2024-09-05T13:54:56+02:00 Remove FloatingObjectPresetsManager and use now only a FloatingObjectPresetsStorage - - - - - 6aadd14d by Tony Chemit at 2024-09-05T13:54:56+02:00 Use now only one client configuration option and simplify dcp-presets directory layout - - - - - 88dde538 by Tony Chemit at 2024-09-05T13:54:56+02:00 Review FloatingObjectPresetsUI (remove tabs and rename FloatingObjectPresetsTabUI to FloatingObjectPresetsEditorUI) - - - - - f518f0e1 by Tony Chemit at 2024-09-05T13:55:03+02:00 Merge branch 'feature/issue-2826' into develop Permettre le renommage, la suppression, éventuellement l'édition des présélections de FOB - Closes #2826 - - - - - 30 changed files: - client/configuration/src/main/config/Client.ini - client/configuration/src/main/dcp-presets/ps/common/01-standard-fad-deployment-preset.yml → client/configuration/src/main/dcp-presets/01-standard-fad-deployment-preset.yml - client/configuration/src/main/dcp-presets/ps/common/02-standard-fad-removal-preset.yml → client/configuration/src/main/dcp-presets/02-standard-fad-removal-preset.yml - client/configuration/src/main/dcp-presets/ps/common/03-standard-fad-update-preset.yml → client/configuration/src/main/dcp-presets/03-standard-fad-update-preset.yml - client/configuration/src/main/dcp-presets/ps/common/04-standard-fad-abandonned-preset.yml → client/configuration/src/main/dcp-presets/04-standard-fad-abandonned-preset.yml - client/configuration/src/main/dcp-presets/ps/common/05-standard-fad-endOfUse-preset.yml → client/configuration/src/main/dcp-presets/05-standard-fad-endOfUse-preset.yml - client/configuration/src/main/dcp-presets/ps/common/README.TXT → client/configuration/src/main/dcp-presets/README.TXT - − client/configuration/src/main/dcp-presets/ps/logbook/README.TXT - − client/configuration/src/main/dcp-presets/ps/observation/README.TXT - client/configuration/src/main/i18n/getters/config.getter - client/configuration/src/main/java/fr/ird/observe/client/configuration/ClientConfig.java - client/configuration/src/test/java/fr/ird/observe/client/configuration/ClientConfigTest.java - client/core/src/main/java/fr/ird/observe/client/ClientUIContext.java - client/core/src/main/java/fr/ird/observe/client/ClientUIContextApi.java - client/core/src/main/java/fr/ird/observe/client/WithClientUIContextApi.java - client/core/src/main/java/fr/ird/observe/client/datasource/api/ObserveSwingDataSource.java - client/core/src/main/java/fr/ird/observe/client/main/body/ClientConfigUI.java - client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/loading/LoadingDataSourceContext.java - client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/loading/open/OpenDataSourceActionStep.java - client/datasource/editor/ps/src/main/java/fr/ird/observe/client/datasource/editor/ps/data/dcp/DcpUIModelStates.java - client/datasource/editor/ps/src/main/java/fr/ird/observe/client/datasource/editor/ps/data/dcp/actions/AddFloatingObjectPreset.java - client/datasource/editor/ps/src/main/java/fr/ird/observe/client/datasource/editor/ps/data/dcp/presets/FloatingObjectPresetsTabUI.jaxx → client/datasource/editor/ps/src/main/java/fr/ird/observe/client/datasource/editor/ps/data/dcp/presets/FloatingObjectPresetsEditorUI.jaxx - client/datasource/editor/ps/src/main/java/fr/ird/observe/client/datasource/editor/ps/data/dcp/presets/FloatingObjectPresetsTabUI.jcss → client/datasource/editor/ps/src/main/java/fr/ird/observe/client/datasource/editor/ps/data/dcp/presets/FloatingObjectPresetsEditorUI.jcss - client/datasource/editor/ps/src/main/java/fr/ird/observe/client/datasource/editor/ps/data/dcp/presets/FloatingObjectPresetsTabUIHandler.java → client/datasource/editor/ps/src/main/java/fr/ird/observe/client/datasource/editor/ps/data/dcp/presets/FloatingObjectPresetsEditorUIHandler.java - client/datasource/editor/ps/src/main/java/fr/ird/observe/client/datasource/editor/ps/data/dcp/presets/FloatingObjectPresetsTabUIModel.java → client/datasource/editor/ps/src/main/java/fr/ird/observe/client/datasource/editor/ps/data/dcp/presets/FloatingObjectPresetsEditorUIModel.java - client/datasource/editor/ps/src/main/java/fr/ird/observe/client/datasource/editor/ps/data/dcp/presets/FloatingObjectPresetsUI.jaxx - client/datasource/editor/ps/src/main/java/fr/ird/observe/client/datasource/editor/ps/data/dcp/presets/FloatingObjectPresetsUIHandler.java - client/datasource/editor/ps/src/main/java/fr/ird/observe/client/datasource/editor/ps/data/dcp/presets/FloatingObjectPresetsUIModel.java - client/datasource/editor/ps/src/main/java/fr/ird/observe/client/datasource/editor/ps/data/dcp/presets/actions/CancelEdit.java - client/datasource/editor/ps/src/main/java/fr/ird/observe/client/datasource/editor/ps/data/dcp/presets/actions/Delete.java The diff was not included because it is too large. View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/compare/c9a055b71968ccb9cce25e1e… -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/compare/c9a055b71968ccb9cce25e1e… You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-observe][develop] 4 commits: Remove ObserveSwingSession (use directly SwingSession)
by Tony CHEMIT (＠tchemit) 05 Sep '24

05 Sep '24

Tony CHEMIT pushed to branch develop at ultreiaio / ird-observe Commits: eab2fdac by Tony Chemit at 2024-09-05T12:48:01+02:00 Remove ObserveSwingSession (use directly SwingSession) - - - - - efb846a1 by Tony Chemit at 2024-09-05T12:48:28+02:00 Remove ObServeSwingSessionConfig - - - - - 0c970bb0 by Tony Chemit at 2024-09-05T12:48:59+02:00 do not use any longer ObserveSwingSessionHelper in ContentUIInitializer (everything is managed now by SwingSession) - - - - - c9a055b7 by Tony Chemit at 2024-09-05T12:49:04+02:00 Merge branch 'feature/issue-2834' into develop Suppression du système de préférences d'ui codé en dure - Closes #2834 - - - - - 15 changed files: - client/configuration/src/main/config/Client.ini - client/configuration/src/main/i18n/getters/config.getter - client/configuration/src/main/i18n/getters/java.getter - − client/configuration/src/main/java/fr/ird/observe/client/ObServeSwingSessionConfig.java - − client/configuration/src/main/java/fr/ird/observe/client/ObserveSwingSession.java - client/configuration/src/main/java/fr/ird/observe/client/configuration/ClientConfig.java - client/configuration/src/main/java/fr/ird/observe/client/configuration/ClientResources.java - client/core/src/main/java/fr/ird/observe/client/ClientUIContext.java - client/core/src/main/java/fr/ird/observe/client/main/body/ClientConfigUI.java - client/core/src/main/java/fr/ird/observe/client/util/session/ObserveSwingSessionHelper.java - − client/core/src/main/resources/observe-swing-preferences.properties - client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/content/ContentUIInitializer.java - client/runner/src/main/i18n/translations/client-runner_en_GB.properties - client/runner/src/main/i18n/translations/client-runner_es_ES.properties - client/runner/src/main/i18n/translations/client-runner_fr_FR.properties Changes: ===================================== client/configuration/src/main/config/Client.ini ===================================== @@ -395,14 +395,6 @@ defaultValue = ${instance.resources.directory}/config/ObserveSwingSession.ui.xml final = true transient = true -[option swingPreferencesFile] -description = observe.config.swingPreferencesFile.description -key = instance.swingPreferencesFile -type = file -defaultValue = ${instance.resources.directory}/config/observe-swing-preferences.properties -final = true -transient = true - [option temporaryDirectory] description = observe.config.temporaryDirectory.description key = instance.temporary.directory ===================================== client/configuration/src/main/i18n/getters/config.getter ===================================== @@ -118,7 +118,6 @@ observe.config.speciesList.seine.observation.objectObservedSpecies observe.config.speciesList.seine.observation.objectSchoolEstimate observe.config.speciesList.seine.observation.schoolEstimate observe.config.speciesList.seine.sample -observe.config.swingPreferencesFile.description observe.config.swingSessionFile.description observe.config.temperature.format observe.config.temporaryDirectory.description ===================================== client/configuration/src/main/i18n/getters/java.getter ===================================== @@ -3,7 +3,6 @@ observe.init.no.local.db.detected observe.runner.copy.default.dcp.file observe.runner.copy.default.map.file observe.runner.copy.default.report.file -observe.runner.copy.default.swing.preferences.file observe.runner.copy.default.ui.file observe.runner.copy.embedded.keystore.file observe.runner.loading.ui.configuration ===================================== client/configuration/src/main/java/fr/ird/observe/client/ObServeSwingSessionConfig.java deleted ===================================== @@ -1,31 +0,0 @@ -package fr.ird.observe.client; - -/*- - * #%L - * ObServe Client :: Configuration - * %% - * Copyright (C) 2008 - 2023 IRD, 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 java.io.File; - -public interface ObServeSwingSessionConfig { - - File getSwingSessionFile(); - File getSwingPreferencesFile(); -} ===================================== client/configuration/src/main/java/fr/ird/observe/client/ObserveSwingSession.java deleted ===================================== @@ -1,100 +0,0 @@ -package fr.ird.observe.client; - -/*- - * #%L - * ObServe Client :: Configuration - * %% - * Copyright (C) 2008 - 2023 IRD, 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 io.ultreia.java4all.jaxx.widgets.combobox.FilterableComboBox; -import io.ultreia.java4all.jaxx.widgets.combobox.session.FilterableComboBoxState; -import io.ultreia.java4all.jaxx.widgets.length.nautical.NauticalLengthEditor; -import io.ultreia.java4all.jaxx.widgets.length.nautical.session.NauticalLengthEditorState; -import io.ultreia.java4all.jaxx.widgets.list.DoubleList; -import io.ultreia.java4all.jaxx.widgets.list.ListHeader; -import io.ultreia.java4all.jaxx.widgets.list.session.DoubleListState; -import io.ultreia.java4all.jaxx.widgets.list.session.ListHeaderState; -import io.ultreia.java4all.util.SortedProperties; -import org.nuiton.jaxx.runtime.swing.session.State; -import org.nuiton.jaxx.runtime.swing.session.SwingSession; -import org.nuiton.jaxx.widgets.gis.absolute.CoordinatesEditor; -import org.nuiton.jaxx.widgets.gis.absolute.session.CoordinatesEditorState; -import org.nuiton.jaxx.widgets.temperature.TemperatureEditor; -import org.nuiton.jaxx.widgets.temperature.session.TemperatureEditorState; - -import java.io.BufferedReader; -import java.io.File; -import java.io.IOException; -import java.nio.charset.StandardCharsets; -import java.nio.file.Files; -import java.util.Map; -import java.util.Properties; - -/** - * Extends SwingSession with - * Created on 07/07/2022. - * - * @author Tony Chemit - dev(a)tchemit.fr - * @since 9.0.7 - */ -public class ObserveSwingSession extends SwingSession { - - private final File preferencesFile; - - private final Properties preferences; - - public ObserveSwingSession(File file, boolean autoSave, File preferencesFile) { - super(file, autoSave, Map.of(FilterableComboBox.class, new FilterableComboBoxState(), - DoubleList.class, new DoubleListState(), - ListHeader.class, new ListHeaderState(), - TemperatureEditor.class, new TemperatureEditorState(), - NauticalLengthEditor.class, new NauticalLengthEditorState(), - CoordinatesEditor.class, new CoordinatesEditorState() - )); - this.preferencesFile = preferencesFile; - this.preferences = new SortedProperties(); - loadPreferences(preferencesFile); - } - - public ObserveSwingSession(File file, boolean autoSave, Map<Class, State> additionalStates, File preferencesFile) { - super(file, autoSave, additionalStates); - this.preferencesFile = preferencesFile; - this.preferences = new SortedProperties(); - loadPreferences(preferencesFile); - } - - public File getPreferencesFile() { - return preferencesFile; - } - - public Properties getPreferences() { - return preferences; - } - - private void loadPreferences(File preferencesFile) { - if (preferencesFile.exists()) { - try (BufferedReader reader = Files.newBufferedReader(preferencesFile.toPath(), StandardCharsets.UTF_8)) { - preferences.load(reader); - } catch (IOException e) { - throw new RuntimeException(String.format("Could not load preferences file at %s", preferencesFile), e); - } - } - } - -} ===================================== client/configuration/src/main/java/fr/ird/observe/client/configuration/ClientConfig.java ===================================== @@ -24,7 +24,6 @@ package fr.ird.observe.client.configuration; import com.google.common.io.MoreFiles; import com.google.common.io.RecursiveDeleteOption; import com.google.gson.Gson; -import fr.ird.observe.client.ObServeSwingSessionConfig; import fr.ird.observe.consolidation.data.ps.dcp.SimplifiedObjectTypeSpecializedRules; import fr.ird.observe.datasource.configuration.DataSourceConnectMode; import fr.ird.observe.datasource.configuration.DataSourceCreateMode; @@ -121,10 +120,10 @@ import static org.nuiton.jaxx.runtime.swing.SwingUtil.ICON_PREFIX; * @author Tony Chemit - dev(a)tchemit.fr * @since 1.0 */ -@GenerateApplicationComponent(name = "ObServe client config", hints = {TripMapConfig.class, TemplateGeneratorConfig.class, ObServeSwingSessionConfig.class, CleanTemporaryFilesTaskConfiguration.class}, instantiateStrategy = ApplicationComponentInstantiateStrategy.SUPPLIER, instantiateSupplier = ClientConfigFinder.class) +@GenerateApplicationComponent(name = "ObServe client config", hints = {TripMapConfig.class, TemplateGeneratorConfig.class, CleanTemporaryFilesTaskConfiguration.class}, instantiateStrategy = ApplicationComponentInstantiateStrategy.SUPPLIER, instantiateSupplier = ClientConfigFinder.class) @GenerateTemplate(template = "about.ftl") @GenerateJavaBeanDefinition -public class ClientConfig extends GeneratedClientConfig implements TripMapConfig, TemplateGeneratorConfig, JavaBean, ObServeSwingSessionConfig, CleanTemporaryFilesTaskConfiguration { +public class ClientConfig extends GeneratedClientConfig implements TripMapConfig, TemplateGeneratorConfig, JavaBean, CleanTemporaryFilesTaskConfiguration { public static final String DB_NAME = "obstuna"; public static final List<ClientConfigOption> MAP_LAYERS = List.of(ClientConfigOption.MAP_LAYER1, ClientConfigOption.MAP_LAYER2, ClientConfigOption.MAP_LAYER3, ClientConfigOption.MAP_LAYER4, ClientConfigOption.MAP_LAYER5, ClientConfigOption.MAP_LAYER6, ClientConfigOption.MAP_LAYER7, ClientConfigOption.MAP_LAYER8, ClientConfigOption.MAP_LAYER9, ClientConfigOption.MAP_LAYER10); @@ -392,7 +391,6 @@ public class ClientConfig extends GeneratedClientConfig implements TripMapConfig File resourcesDirectory = createDirectory(ClientConfigOption.RESOURCES_DIRECTORY); log.debug("user resource data directory : {}", resourcesDirectory); - createParentDirectory(ClientConfigOption.SWING_PREFERENCES_FILE); // 5 - resources report @@ -452,18 +450,10 @@ public class ClientConfig extends GeneratedClientConfig implements TripMapConfig ClientResources.dcp.copyResource(dcpFile); } - // 10 - swing preferences - File preferencesFile = getSwingPreferencesFile(); - if (versionSnapshot || !preferencesFile.exists()) { - String message = t("observe.runner.copy.default.swing.preferences.file", preferencesFile); - log.info(message); - ClientResources.ObserveSwingPreferences.copyResource(preferencesFile); - } - - // 11 - export directory + // 10 - export directory createDirectory(ClientConfigOption.EXPORT_DIRECTORY); - // 12 - Add custom keystore (See https://gitlab.com/ultreiaio/ird-observe/-/issues/2791) + // 11 - Add custom keystore (See https://gitlab.com/ultreiaio/ird-observe/-/issues/2791) Path keystore = resourcesDirectory.toPath().resolve("observe.jks"); if (Files.notExists(keystore)) { ===================================== client/configuration/src/main/java/fr/ird/observe/client/configuration/ClientResources.java ===================================== @@ -33,7 +33,6 @@ import io.ultreia.java4all.config.ConfigResource; */ public final class ClientResources { public static final ConfigResource CONFIG = new ConfigResource("/META-INF/configuration/observe-client.conf"); - public static final ConfigResource ObserveSwingPreferences = new ConfigResource("/observe-swing-preferences.properties"); public static final ConfigResource ui = new ConfigResource("/observe-ui.properties"); public static final ConfigResource ui_navigation_common = new ConfigResource("/observe-ui-navigation-common.properties"); public static final ConfigResource ui_navigation_ps = new ConfigResource("/observe-ui-navigation-ps.properties"); ===================================== client/core/src/main/java/fr/ird/observe/client/ClientUIContext.java ===================================== @@ -85,7 +85,7 @@ public class ClientUIContext implements Closeable, ClientUIContextApi { public ClientUIContext(ClientConfig clientConfig) { ClientConfig.initDecoratorService(clientConfig.getReferentialLocale()); this.clientConfig = clientConfig; - this.observeSwingSessionHelper = new ObserveSwingSessionHelper(clientConfig); + this.observeSwingSessionHelper = new ObserveSwingSessionHelper(clientConfig.getSwingSessionFile()); this.floatingObjectPresetsManager = clientConfig.newFloatingObjectPresetsManager(); this.serviceFactory = new ObserveServiceMainFactory(); this.editModel = new Project(); ===================================== client/core/src/main/java/fr/ird/observe/client/main/body/ClientConfigUI.java ===================================== @@ -431,7 +431,6 @@ public class ClientConfigUI extends JXTitledPanel implements WithClientUIContext helper.addOption(ClientConfigOption.RESOURCES_DIRECTORY); helper.addOption(ClientConfigOption.AVDTH_DIRECTORY); helper.addOption(ClientConfigOption.SWING_SESSION_FILE); - helper.addOption(ClientConfigOption.SWING_PREFERENCES_FILE); helper.addOption(ClientConfigOption.SIMPLIFIED_OBJECT_TYPE_SPECIALIZED_RULES_FILE); helper.addOption(ClientConfigOption.H2_LOGIN); ===================================== client/core/src/main/java/fr/ird/observe/client/util/session/ObserveSwingSessionHelper.java ===================================== @@ -22,21 +22,28 @@ package fr.ird.observe.client.util.session; * #L% */ -import fr.ird.observe.client.ObServeSwingSessionConfig; -import fr.ird.observe.client.ObserveSwingSession; import io.ultreia.java4all.jaxx.widgets.combobox.FilterableComboBox; +import io.ultreia.java4all.jaxx.widgets.combobox.session.FilterableComboBoxState; +import io.ultreia.java4all.jaxx.widgets.length.nautical.NauticalLengthEditor; +import io.ultreia.java4all.jaxx.widgets.length.nautical.session.NauticalLengthEditorState; import io.ultreia.java4all.jaxx.widgets.list.DoubleList; import io.ultreia.java4all.jaxx.widgets.list.ListHeader; +import io.ultreia.java4all.jaxx.widgets.list.session.DoubleListState; +import io.ultreia.java4all.jaxx.widgets.list.session.ListHeaderState; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; -import org.nuiton.jaxx.runtime.JAXXObject; +import org.nuiton.jaxx.runtime.swing.session.SwingSession; +import org.nuiton.jaxx.widgets.gis.absolute.CoordinatesEditor; +import org.nuiton.jaxx.widgets.gis.absolute.session.CoordinatesEditorState; +import org.nuiton.jaxx.widgets.temperature.TemperatureEditor; +import org.nuiton.jaxx.widgets.temperature.session.TemperatureEditorState; -import javax.swing.JComponent; import java.awt.Component; import java.io.Closeable; +import java.io.File; import java.io.IOException; import java.nio.file.Files; -import java.util.function.Consumer; +import java.util.Map; /** * Created on 07/11/16. @@ -48,16 +55,21 @@ public class ObserveSwingSessionHelper implements Closeable { private static final Logger log = LogManager.getLogger(ObserveSwingSessionHelper.class); - private final ObserveSwingSession session; + private final SwingSession session; - public ObserveSwingSessionHelper(ObServeSwingSessionConfig file) { + public ObserveSwingSessionHelper(File file) { //FIXME Add additional states (auto detect from JaxxUIResourcesProvider ?) - session = new ObserveSwingSession(file.getSwingSessionFile(), false, file.getSwingPreferencesFile());/*, Map.of( - FilterableComboBox.class, new FilterableComboBoxState() - ));*/ + session = new SwingSession(file, + false, + Map.of(FilterableComboBox.class, new FilterableComboBoxState(), + DoubleList.class, new DoubleListState(), + ListHeader.class, new ListHeaderState(), + TemperatureEditor.class, new TemperatureEditorState(), + NauticalLengthEditor.class, new NauticalLengthEditorState(), + CoordinatesEditor.class, new CoordinatesEditorState())); } - public ObserveSwingSession getSession() { + public SwingSession getSession() { return session; } @@ -65,10 +77,6 @@ public class ObserveSwingSessionHelper implements Closeable { session.add(c, replace); } - public void removeComponent(Component c) { - session.remove(c); - } - public void save() { try { if (Files.notExists(session.getFile().toPath())) { @@ -80,33 +88,8 @@ public class ObserveSwingSessionHelper implements Closeable { } } - public void initComboBox(JAXXObject ui, FilterableComboBox<?> editor) { - initDecorator(ui, editor, editor::setIndex, editor.getModel()::setReverseSort); - } - - public void initListHeader(JAXXObject ui, ListHeader<?> editor) { - initDecorator(ui, editor, editor::setIndex, editor::setReverseSort); - } - - public void initDoubleList(JAXXObject ui, DoubleList<?> editor) { - initDecorator(ui, editor, editor::setIndex, editor::setReverseSort); - } - @Override public void close() { save(); } - - - private void initDecorator(JAXXObject ui, JComponent editor, Consumer<Integer> indexSetter, Consumer<Boolean> orderSetter) { - String key = ui.getClass().getName() + "." + editor.getName() + ".sort."; - int index = Integer.parseInt(session.getPreferences().getProperty(key + "index", "0")); - boolean reverseOrder = Boolean.parseBoolean(session.getPreferences().getProperty(key + "order", "false")); - if (index != 0) { - indexSetter.accept(index); - } - if (reverseOrder) { - orderSetter.accept(true); - } - } } ===================================== client/core/src/main/resources/observe-swing-preferences.properties deleted ===================================== @@ -1,33 +0,0 @@ -### -# #%L -# ObServe Client :: Core -# %% -# Copyright (C) 2008 - 2023 IRD, 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% -### -fr.ird.observe.client.datasource.editor.ll.data.observation.SetCatchUI.section.sort.index=1 -fr.ird.observe.client.datasource.editor.ll.data.observation.SetCatchUI.basket.sort.index=1 -fr.ird.observe.client.datasource.editor.ll.data.observation.SetCatchUI.branchline.sort.index=1 -fr.ird.observe.client.datasource.editor.ps.data.logbook.FloatingObjectUI.vessel1.sort.index=1 -fr.ird.observe.client.datasource.editor.ps.data.logbook.FloatingObjectUI.vessel2.sort.index=1 -fr.ird.observe.client.datasource.editor.ps.data.logbook.FloatingObjectUI.country1.sort.index=1 -fr.ird.observe.client.datasource.editor.ps.data.logbook.FloatingObjectUI.country2.sort.index=1 -fr.ird.observe.client.datasource.editor.ps.data.observation.FloatingObjectUI.vessel1.sort.index=1 -fr.ird.observe.client.datasource.editor.ps.data.observation.FloatingObjectUI.vessel2.sort.index=1 -fr.ird.observe.client.datasource.editor.ps.data.observation.FloatingObjectUI.country1.sort.index=1 -fr.ird.observe.client.datasource.editor.ps.data.observation.FloatingObjectUI.country2.sort.index=1 - ===================================== client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/content/ContentUIInitializer.java ===================================== @@ -329,7 +329,6 @@ public class ContentUIInitializer<UI extends ContentUI> extends UIInitializerSup } else { prepareDataFilterableComboBox(referenceType, editor); } - getObserveSwingSessionHelper().initComboBox(ui, editor); } @SuppressWarnings({"unchecked", "rawtypes"}) @@ -343,7 +342,6 @@ public class ContentUIInitializer<UI extends ContentUI> extends UIInitializerSup } else { prepareDataEntityList(referenceType, (ListHeader) editor); } - getObserveSwingSessionHelper().initListHeader(ui, editor); } public void addDecoratorClassifier(ListHeader<?> editor) { @@ -363,7 +361,6 @@ public class ContentUIInitializer<UI extends ContentUI> extends UIInitializerSup } else { prepareDataDoubleList(referenceType, editor); } - getObserveSwingSessionHelper().initDoubleList(ui, editor); } protected void init(TimeEditor editor) { ===================================== client/runner/src/main/i18n/translations/client-runner_en_GB.properties ===================================== @@ -135,7 +135,6 @@ observe.config.speciesList.seine.observation.objectObservedSpecies=Species for o observe.config.speciesList.seine.observation.objectSchoolEstimate=Species for object school estimates observe.config.speciesList.seine.observation.schoolEstimate=Species for school estimates observe.config.speciesList.seine.sample=Species for sample -observe.config.swingPreferencesFile.description=Swing preferences file. observe.config.swingSessionFile.description=Swing session file. observe.config.temperature.format=Default temperature unit observe.config.temporaryDirectory.description=Default temporary directory used by application and clean at each launch. ===================================== client/runner/src/main/i18n/translations/client-runner_es_ES.properties ===================================== @@ -135,7 +135,6 @@ observe.config.speciesList.seine.observation.objectObservedSpecies=Especies que observe.config.speciesList.seine.observation.objectSchoolEstimate=Especies para las estimaciones de banco objeto observe.config.speciesList.seine.observation.schoolEstimate=Especies para las estimaciones observe.config.speciesList.seine.sample=Species for sample \#TODO -observe.config.swingPreferencesFile.description=Swing preferences file. observe.config.swingSessionFile.description=Copia de seguridad del estado del UI. observe.config.temperature.format=Unidad de temperatura observe.config.temporaryDirectory.description=Directorio temporal por defecto ===================================== client/runner/src/main/i18n/translations/client-runner_fr_FR.properties ===================================== @@ -135,7 +135,6 @@ observe.config.speciesList.seine.observation.objectObservedSpecies=Espèces pour observe.config.speciesList.seine.observation.objectSchoolEstimate=Espèces pour les estimations banc objet observe.config.speciesList.seine.observation.schoolEstimate=Espèces pour les estimations observe.config.speciesList.seine.sample=Espèces pour l'échantillonnage au port -observe.config.swingPreferencesFile.description=Fichier de sauvegarde des préférences des UI. observe.config.swingSessionFile.description=Fichier de sauvegarde des états des UI. observe.config.temperature.format=Unité de température observe.config.temporaryDirectory.description=Le répertoire temporaire par défaut View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/compare/1995338fe84cd9ca0ee12fdc… -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/compare/1995338fe84cd9ca0ee12fdc… You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-observe][develop] 3 commits: Add new client configuration option showSensibleCriteriaInTripBulkChanges
by Tony CHEMIT (＠tchemit) 05 Sep '24

05 Sep '24

Tony CHEMIT pushed to branch develop at ultreiaio / ird-observe Commits: de95fb1f by Tony Chemit at 2024-09-05T12:26:25+02:00 Add new client configuration option showSensibleCriteriaInTripBulkChanges - - - - - b7bc8cf9 by Tony Chemit at 2024-09-05T12:26:53+02:00 use new client configuration option showSensibleCriteriaInTripBulkChanges in BulkModify ui - - - - - 1995338f by Tony Chemit at 2024-09-05T12:26:58+02:00 Merge branch 'feature/issue-2816' into develop Fonction de changement de programme en masse - Closes #2816 - - - - - 8 changed files: - client/configuration/src/main/config/Client.ini - client/configuration/src/main/i18n/getters/config.getter - client/core/src/main/java/fr/ird/observe/client/main/body/ClientConfigUI.java - client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/content/data/rlist/actions/BulkModify.java - client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/content/data/rlist/bulk/BulkModifyUIModel.java - client/runner/src/main/i18n/translations/client-runner_en_GB.properties - client/runner/src/main/i18n/translations/client-runner_es_ES.properties - client/runner/src/main/i18n/translations/client-runner_fr_FR.properties Changes: ===================================== client/configuration/src/main/config/Client.ini ===================================== @@ -955,6 +955,12 @@ key = ui.nauticalLength.format type = io.ultreia.java4all.jaxx.widgets.length.nautical.NauticalLengthFormat defaultValue = M +[option showSensibleCriteriaInTripBulkChanges] +description = observe.config.showSensibleCriteriaInTripBulkChanges +key = ui.showSensibleCriteriaInTripBulkChanges +type = Boolean +defaultValue = false + [option treeGroupByName] description = observe.config.ui.tree.groupByName key = ui.tree.config.groupByName ===================================== client/configuration/src/main/i18n/getters/config.getter ===================================== @@ -96,6 +96,7 @@ observe.config.navigationIconsPath.description observe.config.pg.can.migrate.description observe.config.remoteDataSourceConfigurations.description observe.config.serverDataSourceConfigurations.description +observe.config.showSensibleCriteriaInTripBulkChanges observe.config.showSql observe.config.simplifiedObjectTypeSpecializedRules.description observe.config.sizeMeasureType.seine.localmarket.sample ===================================== client/core/src/main/java/fr/ird/observe/client/main/body/ClientConfigUI.java ===================================== @@ -386,32 +386,32 @@ public class ClientConfigUI extends JXTitledPanel implements WithClientUIContext private void addExpertOptions(ObserveConfigUIBuilder helper) { helper.addCategory(n("observe.config.category.expert"), - n("observe.config.category.expert.description"), - "application"); + n("observe.config.category.expert.description")); - helper.addOption(ClientConfigOption.LOAD_LOCAL_STORAGE); + helper.addOption(ClientConfigOption.LOAD_LOCAL_STORAGE).setOptionCallBack("application"); - helper.addOption(ClientConfigOption.BACKUP_USE); - helper.addOption(ClientConfigOption.BACKUP_DELAY); - helper.addOption(ClientConfigOption.BACKUP_AT_CLOSE); + helper.addOption(ClientConfigOption.BACKUP_USE).setOptionCallBack("application"); + helper.addOption(ClientConfigOption.BACKUP_DELAY).setOptionCallBack("application"); + helper.addOption(ClientConfigOption.BACKUP_AT_CLOSE).setOptionCallBack("application"); - helper.addOption(ClientConfigOption.REPORT_DIRECTORY); + helper.addOption(ClientConfigOption.REPORT_DIRECTORY).setOptionCallBack("application"); - helper.addOption(ClientConfigOption.TEMPORARY_FILES_TIMEOUT); - helper.addOption(ClientConfigOption.LOG_FILES_TIMEOUT); - helper.addOption(ClientConfigOption.FEEDBACK_FILES_TIMEOUT); - helper.addOption(ClientConfigOption.BACKUP_FILES_TIMEOUT); + helper.addOption(ClientConfigOption.TEMPORARY_FILES_TIMEOUT).setOptionCallBack("application"); + helper.addOption(ClientConfigOption.LOG_FILES_TIMEOUT).setOptionCallBack("application"); + helper.addOption(ClientConfigOption.FEEDBACK_FILES_TIMEOUT).setOptionCallBack("application"); + helper.addOption(ClientConfigOption.BACKUP_FILES_TIMEOUT).setOptionCallBack("application"); - helper.addOption(ClientConfigOption.CHANGE_SYNCHRO_SRC); - helper.addOption(ClientConfigOption.H2_CAN_MIGRATE); - helper.addOption(ClientConfigOption.OBSTUNA_CAN_MIGRATE); - helper.addOption(ClientConfigOption.H2_SERVER_PORT); - helper.addOption(ClientConfigOption.H2_CAN_EDIT_REFERENTIAL); - helper.addOption(ClientConfigOption.AVDTH_FORCE_IMPORT); + helper.addOption(ClientConfigOption.CHANGE_SYNCHRO_SRC).setOptionCallBack("application"); + helper.addOption(ClientConfigOption.H2_CAN_MIGRATE).setOptionCallBack("application"); + helper.addOption(ClientConfigOption.OBSTUNA_CAN_MIGRATE).setOptionCallBack("application"); + helper.addOption(ClientConfigOption.H2_SERVER_PORT).setOptionCallBack("application"); + helper.addOption(ClientConfigOption.H2_CAN_EDIT_REFERENTIAL).setOptionCallBack("ui"); + helper.addOption(ClientConfigOption.AVDTH_FORCE_IMPORT).setOptionCallBack("ui"); helper.addOption(ClientConfigOption.SHOW_SQL); helper.addOption(ClientConfigOption.USE_JVM_KEY_STORE); - helper.addOption(ClientConfigOption.SKIP_CONSOLIDATE_STEP_FOR_REPORT); + helper.addOption(ClientConfigOption.SKIP_CONSOLIDATE_STEP_FOR_REPORT).setOptionCallBack("ui"); + helper.addOption(ClientConfigOption.SHOW_SENSIBLE_CRITERIA_IN_TRIP_BULK_CHANGES).setOptionCallBack("ui"); } ===================================== client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/content/data/rlist/actions/BulkModify.java ===================================== @@ -71,6 +71,7 @@ public class BulkModify<D extends RootOpenableDto, R extends DataDtoReference, U String moduleName = navigationTreeConfig.getModuleName(); BusinessModule businessModule = ObserveBusinessProject.get().getBusinessModuleByName(moduleName); BulkModifyUIModel<R> model = new BulkModifyUIModel<>(navigationTreeConfig, + getClientConfig().isShowSensibleCriteriaInTripBulkChanges(), new ModuleGroupByHelper(businessModule), getMainUI().getBusyModel(), ui.getModel().getStates().createReferenceCache(!navigationTreeConfig.isLoadDisabledGroupBy()), ===================================== client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/content/data/rlist/bulk/BulkModifyUIModel.java ===================================== @@ -22,6 +22,7 @@ package fr.ird.observe.client.datasource.editor.api.content.data.rlist.bulk; * #L% */ +import fr.ird.observe.client.configuration.ClientConfig; import fr.ird.observe.client.datasource.api.cache.ReferencesCache; import fr.ird.observe.dto.data.DataGroupByDtoDefinition; import fr.ird.observe.dto.reference.DataDtoReference; @@ -36,6 +37,7 @@ import javax.swing.ComboBoxModel; import javax.swing.DefaultComboBoxModel; import java.util.List; import java.util.Objects; +import java.util.Set; import java.util.stream.Collectors; /** @@ -50,6 +52,16 @@ public class BulkModifyUIModel<R extends DataDtoReference> extends AbstractJavaB public static final String PROPERTY_SELECTED_CRITERIA = "selectedCriteria"; public static final String PROPERTY_SELECTED_VALUE = "selectedValue"; public static final String PROPERTY_CAN_APPLY = "canApply"; + /** + * Sensible criteria to hide if client configuration option is off. + * <p> + * See {@link ClientConfig#isShowSensibleCriteriaInTripBulkChanges()} + */ + private static final Set<String> SENSIBLE_CRITERIA = Set.of( + "dataLlCommonTripGroupByOcean", + "dataPsCommonTripGroupByOcean", + "dataPsCommonTripGroupByLandingHarbour" + ); /** * Module groupBy helper. */ @@ -88,6 +100,7 @@ public class BulkModifyUIModel<R extends DataDtoReference> extends AbstractJavaB private ReferentialDtoReference selectedValue; public BulkModifyUIModel(NavigationTreeConfig navigationTreeConfig, + boolean showSensibleCriteriaInTripBulkChanges, ModuleGroupByHelper moduleGroupByHelper, BusyModel busyModel, ReferencesCache referencesCache, @@ -96,18 +109,24 @@ public class BulkModifyUIModel<R extends DataDtoReference> extends AbstractJavaB this.navigationTreeConfig = Objects.requireNonNull(navigationTreeConfig); this.moduleGroupByHelper = Objects.requireNonNull(moduleGroupByHelper); this.busyModel = Objects.requireNonNull(busyModel); - this.availableCriteria.addAll(moduleGroupByHelper.getGroupByDefinitions().stream().filter(BulkModifyUIModel::acceptCriteria).collect(Collectors.toList())); + this.availableCriteria.addAll(moduleGroupByHelper.getGroupByDefinitions().stream().filter(c -> acceptCriteria(c, showSensibleCriteriaInTripBulkChanges)).collect(Collectors.toList())); this.referencesCache = Objects.requireNonNull(referencesCache); this.data = Objects.requireNonNull(data); this.navigationCriteriaDefinition = getModuleGroupByHelper().getDefinition(navigationTreeConfig.getGroupByName()); // Using the navigation tree config criteria (if possible) - if (BulkModifyUIModel.acceptCriteria(navigationCriteriaDefinition)) { + if (BulkModifyUIModel.acceptCriteria(navigationCriteriaDefinition, showSensibleCriteriaInTripBulkChanges)) { setSelectedCriteria(navigationCriteriaDefinition); + } else { + // otherwise use the first available criteria + setSelectedCriteria(availableCriteria.getElementAt(0)); } } - public static boolean acceptCriteria(DataGroupByDtoDefinition<?, ?> d) { - return d.isQualitative() && !d.isQualitativeWithSecondLevel(); + public static boolean acceptCriteria(DataGroupByDtoDefinition<?, ?> d, boolean showSensibleCriteriaInTripBulkChanges) { + if (!d.isQualitative() || d.isQualitativeWithSecondLevel()) { + return false; + } + return showSensibleCriteriaInTripBulkChanges || !SENSIBLE_CRITERIA.contains(d.getName()); } public DataGroupByDtoDefinition<?, ?> getNavigationCriteriaDefinition() { ===================================== client/runner/src/main/i18n/translations/client-runner_en_GB.properties ===================================== @@ -113,6 +113,7 @@ observe.config.navigationIconsPath.description=Default navigation icons path. observe.config.pg.can.migrate.description=Flat sets to true when you can migrate remote data sources observe.config.remoteDataSourceConfigurations.description=Remote data source configurations observe.config.serverDataSourceConfigurations.description=Server data source configurations +observe.config.showSensibleCriteriaInTripBulkChanges=Show sensible criteria (ocean, landing harbour, ...) in Trip bulk changes observe.config.showSql=Show sql observe.config.simplifiedObjectTypeSpecializedRules.description=simplified object type specialized rules observe.config.sizeMeasureType.seine.localmarket.sample=Authorized size measure type on local market ===================================== client/runner/src/main/i18n/translations/client-runner_es_ES.properties ===================================== @@ -113,6 +113,7 @@ observe.config.navigationIconsPath.description=Default navigation icons path. \# observe.config.pg.can.migrate.description=Autorizar la actualización de las bases remotas (debe ser el propietario de la base) observe.config.remoteDataSourceConfigurations.description=Conexiónes a fuentes remotas observe.config.serverDataSourceConfigurations.description=Conexiones a servidores remotos +observe.config.showSensibleCriteriaInTripBulkChanges=Show sensible criteria (ocean, landing harbour, ...) in Trip bulk changes \#TODO observe.config.showSql=Mostrar en todas las consultas sql ejecutadas observe.config.simplifiedObjectTypeSpecializedRules.description=simplified object type specialized rules \#TODO observe.config.sizeMeasureType.seine.localmarket.sample=Authorized size measure type on local market ===================================== client/runner/src/main/i18n/translations/client-runner_fr_FR.properties ===================================== @@ -113,6 +113,7 @@ observe.config.navigationIconsPath.description=Chemin vers les icônes de naviga observe.config.pg.can.migrate.description=Autoriser la mise à jour des bases distantes (il faut être propriétaire de la base) observe.config.remoteDataSourceConfigurations.description=connexions à des sources distantes observe.config.serverDataSourceConfigurations.description=connexions à des serveurs distantes +observe.config.showSensibleCriteriaInTripBulkChanges=Pour autoriser la modification en masse de marées sur des criètres dit « sensibles » observe.config.showSql=Afficher dans les logs toutes les requêtes sql exécutées observe.config.simplifiedObjectTypeSpecializedRules.description=Liste des règles supplémentaires pour la détermination du type simplifié d'un DCP observe.config.sizeMeasureType.seine.localmarket.sample=Type de mesure autorisées pour les échantillons du marché local View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/compare/77540b5fdeace22ff6b2e168… -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/compare/77540b5fdeace22ff6b2e168… You're receiving this email because of your account on gitlab.com.

1 0