Tony CHEMIT pushed to branch develop at ultreiaio / ird-observe

Commits:

4 changed files:

Changes:

  • core/persistence/report/src/main/resources/META-INF/report/default/ps/psLogbookTrip.report
    ... ... @@ -76,7 +76,7 @@ Left Join t.advancedSamplingAcquisitionStatus advancedSamplingAcquisitionStatus
    76 76 
     Where t.id In :tripId \
    77 77 
     Order By vessel.code,t.startDate,t.endDate
    78 78 
     columnRenderers.1.type=HighlightIfEquals18nReferentialValue
    79 
    -columnRenderers.1.parameters=14,15,16,17,18,19,20,21|fr.ird.referential.ps.common.AcquisitionStatus#1464000000000#999
    79 
    +columnRenderers.1.parameters=14,15,16,17,18,19,20,21|fr.ird.referential.ps.common.AcquisitionStatus#1464000000000#999|fr.ird.referential.ps.common.AcquisitionStatus#1464000000000#001
    80 80 
     columnRenderers.2.type=HighlightIfAbsoluteDeltaIsPositive
    81 81 
     columnRenderers.2.parameters=10|11|0.0001|0.5
    82 82 
     columnRenderers.3.type=HighlightIfAbsoluteDeltaIsPositive

  • src/site/markdown/report/embedded-column-renderers.md
    ... ... @@ -57,5 +57,5 @@ Exemple d'utilisation :
    57 57
    58 58 
     ```properties
    59 59 
     report.xxx.columnRenderers.1.type=HighlightIfEquals18nReferentialValue
    60 
    -report.xxx.columnRenderers.1.parameters=14,15,16,17,18,19,20,21|fr.ird.referential.ps.common.AcquisitionStatus#1464000000000#999
    60 
    +report.xxx.columnRenderers.1.parameters=14,15,16,17,18,19,20,21|fr.ird.referential.ps.common.AcquisitionStatus#1464000000000#999|fr.ird.referential.ps.common.AcquisitionStatus#1464000000000#000|fr.ird.referential.ps.common.AcquisitionStatus#1464000000000#001
    61 61 
     ```

  • toolkit/api-report/src/main/java/fr/ird/observe/report/renderers/HighlightIfEquals18nReferentialValue.java
    ... ... @@ -50,12 +50,12 @@ public class HighlightIfEquals18nReferentialValue implements ColumnRendererConsu
    50 50
    51 51 
         @Override
    52 52 
         public int parametersCount() {
    53 
    -        return 2;
    53 
    +        return 3;
    54 54 
         }
    55 55
    56 56 
         @Override
    57 57 
         public String parametersSyntax() {
    58 
    -        return "column1,column2,...,columnN|id";
    58 
    +        return "column1,column2,...,columnN|idError|idOk";
    59 59 
         }
    60 60
    61 61 
         @Override
    ... ... @@ -66,15 +66,17 @@ public class HighlightIfEquals18nReferentialValue implements ColumnRendererConsu
    66 66 
             for (String s : split2) {
    67 67 
                 columns.add(Integer.parseInt(s));
    68 68 
             }
    69 
    -        String id = split[1];
    70 
    -        return new Parameters(columns, id);
    69 
    +        String idError = split[1];
    70 
    +        String idOk = split[2];
    71 
    +        return new Parameters(columns, idError, idOk);
    71 72 
         }
    72 73
    73 74 
         @Override
    74 75 
         public Parameters createParameters(ReportRequestExecutor requestExecutor, String parameters) {
    75 76 
             Parameters result = ColumnRendererConsumer.super.createParameters(requestExecutor, parameters);
    76 
    -        String label = requestExecutor.getReferentialLabel(result.getId());
    77 
    -        return result.setLabel(label);
    77 
    +        String labelError = requestExecutor.getReferentialLabel(result.getIdError());
    78 
    +        String labelOk = requestExecutor.getReferentialLabel(result.getIdOk());
    79 
    +        return result.setLabel(labelError, labelOk);
    78 80 
         }
    79 81
    80 82 
         @Override
    ... ... @@ -82,8 +84,14 @@ public class HighlightIfEquals18nReferentialValue implements ColumnRendererConsu
    82 84 
             table.addHighlighter(new ColorHighlighter((renderer, adapter) -> {
    83 85 
                 Object value = adapter.getValue();
    84 86 
                 int column = adapter.convertColumnIndexToModel(adapter.column);
    85 
    -            return parameters.getColumns().contains(column) && Objects.equals(value, parameters.getLabel());
    87 
    +            return parameters.getColumns().contains(column) && Objects.equals(value, parameters.getLabelError());
    86 88 
             }, Color.RED, Color.BLACK));
    89 
    +
    90 
    +        table.addHighlighter(new ColorHighlighter((renderer, adapter) -> {
    91 
    +            Object value = adapter.getValue();
    92 
    +            int column = adapter.convertColumnIndexToModel(adapter.column);
    93 
    +            return parameters.getColumns().contains(column) && !Objects.equals(value, parameters.getLabelError()) && !Objects.equals(value, parameters.getLabelOk());
    94 
    +        }, Color.ORANGE, Color.BLACK));
    87 95 
         }
    88 96
    89 97 
         @Override
    ... ... @@ -93,24 +101,30 @@ public class HighlightIfEquals18nReferentialValue implements ColumnRendererConsu
    93 101
    94 102 
         @Override
    95 103 
         public String htmlInitCode(Parameters parameters) {
    96 
    -        return String.format("init%s(%s, '%s', result, data);\n", parameters.name(), parameters.getColumns(), parameters.getLabel());
    104 
    +        return String.format("init%s(%s, '%s', '%s', result, data);\n", parameters.name(), parameters.getColumns(), parameters.getLabelError(), parameters.getLabelOk());
    97 105 
         }
    98 106
    99 107 
         public static final class Parameters implements ColumnRendererParameters {
    100 108 
             private final Set<Integer> columns;
    101 
    -        private final String id;
    102 
    -        private final String label;
    109 
    +        private final String idError;
    110 
    +        private final String idOk;
    111 
    +        private final String labelError;
    112 
    +        private final String labelOk;
    103 113
    104 
    -        public Parameters(Set<Integer> columns, String id, String label) {
    114 
    +        public Parameters(Set<Integer> columns, String idError, String idOk, String labelError, String labelOk) {
    105 115 
                 this.columns = columns;
    106 
    -            this.id = id;
    107 
    -            this.label = label;
    116 
    +            this.idError = idError;
    117 
    +            this.idOk = idOk;
    118 
    +            this.labelError = labelError;
    119 
    +            this.labelOk = labelOk;
    108 120 
             }
    109 121
    110 
    -        public Parameters(Set<Integer> columns, String id) {
    122 
    +        public Parameters(Set<Integer> columns, String idError, String idOk) {
    111 123 
                 this.columns = columns;
    112 
    -            this.id = id;
    113 
    -            this.label = null;
    124 
    +            this.idError = idError;
    125 
    +            this.idOk = idOk;
    126 
    +            this.labelError = null;
    127 
    +            this.labelOk = null;
    114 128 
             }
    115 129
    116 130 
             @Override
    ... ... @@ -122,16 +136,24 @@ public class HighlightIfEquals18nReferentialValue implements ColumnRendererConsu
    122 136 
                 return columns;
    123 137 
             }
    124 138
    125 
    -        public String getId() {
    126 
    -            return id;
    139 
    +        public String getIdError() {
    140 
    +            return idError;
    141 
    +        }
    142 
    +
    143 
    +        public String getIdOk() {
    144 
    +            return idOk;
    145 
    +        }
    146 
    +
    147 
    +        public String getLabelError() {
    148 
    +            return labelError;
    127 149 
             }
    128 150
    129 
    -        public String getLabel() {
    130 
    -            return label;
    151 
    +        public String getLabelOk() {
    152 
    +            return labelOk;
    131 153 
             }
    132 154
    133 
    -        public Parameters setLabel(String label) {
    134 
    -            return new Parameters(columns, id, label);
    155 
    +        public Parameters setLabel(String labelError, String labelOk) {
    156 
    +            return new Parameters(columns, idError, idOk, labelError, labelOk);
    135 157 
             }
    136 158 
         }
    137 159 
     }

  • toolkit/api-report/src/main/resources/fr/ird/observe/report/renderers/HighlightIfEquals18nReferentialValue.js
    ... ... @@ -19,24 +19,22 @@
    19 19 
      * <http://www.gnu.org/licenses/gpl-3.0.html>.
    20 20 
      * #L%
    21 21 
      */
    22 
    -function HighlightIfEquals18nReferentialValue(cell, label) {
    23 
    -    if (!!!cell) {
    22 
    +function HighlightIfEquals18nReferentialValue(cell, labelError, labelOk) {
    23 
    +    if (!!!cell || cell === labelOk) {
    24 24 
             return;
    25 25 
         }
    26 
    -    if (cell === label) {
    27 
    -        return {
    28 
    -            'data-cell-content': cell,
    29 
    -            'class': 'gridjs-td cellError',
    30 
    -        };
    31 
    -    }
    26 
    +    return {
    27 
    +        'data-cell-content': cell,
    28 
    +        'class': 'gridjs-td ' + (cell === labelError ? "cellError" : "cellWarning"),
    29 
    +    };
    32 30 
     }
    33 31
    34 
    -function initHighlightIfEquals18nReferentialValue(columns, label, result, json) {
    32 
    +function initHighlightIfEquals18nReferentialValue(columns, labelError, labelOk, result, json) {
    35 33 
         for (let j = 0; j < columns.length; j++) {
    36 34 
             let column = columns[j];
    37 35 
             result [column] = {
    38 36 
                 name: result [column],
    39 
    -            attributes: cell => HighlightIfEquals18nReferentialValue(cell, label)
    37 
    +            attributes: cell => HighlightIfEquals18nReferentialValue(cell, labelError, labelOk)
    40 38 
             };
    41 39 
         }
    42 40 
     }

    • —
    View it on GitLab.
    You're receiving this email because of your account on gitlab.com. Manage all notifications · Help