GitLab

at 2023-09-05T13:19:59+02:00

Centralisdation de l'utilisation de formatter pour les dates et horodatage suivant la locale utilisée

Ajout de la configuration dans le rapport de validation - See #2215

     <meta charset="UTF-8">

     <meta lang="en">

     <meta content="text/html">

-    <title>Rapport de validation</title>

+    <title>Validation report</title>

     <style>

         #result {

             list-style-type: none;

 

         .caret::before {

             content: "\1f5c0";

-            /*content: "\25B6";*/

             color: #027BFF;

             display: inline-block;

             margin-right: 6px;

 

         .caretSymbol::before {

             content: "\1f5c0";

-            /*content: "\25B6";*/

             color: #027BFF;

             display: inline-block;

             margin-right: 6px;

         .caret-down::before {

             content: "\1f5c1";

             color: #027BFF;

-            /*transform: rotate(90deg);*/

         }

 

         #result .nested {

         }

 

         table {

-            /*font-family: arial, sans-serif;*/

             border-collapse: collapse;

             width: 90%;

-            /*margin-left: 20px;*/

             margin-top: 10px;

             margin-bottom: 10px;

         }

     </style>

 </head>

 <body>

-<b>TODO</b>

-<h1>Rapport de validation</h1>

+<h1>Validation report</h1>

 

 <h2>Configuration</h2>

 

 <ul>

-    <li>Rapport de validation généré le ${.data_model.now}</li>

-    <li>Niveau(x) de validation :

+    <li>Validation report generated at ${.data_model.now}</li>

+    <li>Type of data to validate: <#if .data_model.modelMode.name()=="DATA">Business data<#else>Referential</#if></li>

+    <li>Validation scope(s):

         <#list .data_model.scopes as scope>

             <span class="<#if scope.name() == "ERROR">error<#else>warning</#if>">${scope.label}</span>

         </#list>

     </li>

-    <li>Context : ${.data_model.contextName}</li>

+    <li>Max speed value used in activities speed validation: ${.data_model.validationSpeedMaxValue}</li>

+    <li>Force validation of activities speed: ${.data_model.validationSpeedEnable?string("yes", "no")}</li>

+    <li>Force validation of species length max: ${.data_model.validationLengthWeightEnable?string("yes", "no")}</li>

+    <li>To bypass validation of disabled referential (display them as warnings): ${.data_model.validationUseDisabledReferential?string("yes", "no")}</li>

+    <li>Dictionary of required observed systems per species on senne set: ...</li>

 </ul>

 

-<h2>Résultat</h2>

+<h2>Results</h2>

 <h3>Notes</h3>

-<div class="information">Pour déplier un nœud, cliquez sur l'icone <span class="caretSymbol"></span> (la combinaison avec la touche <b>Maj</b> effectue l'action sur le sous-arbre constitué de ses fils).</div>

-<div class="information">Pour replier un nœud, cliquez sur l'icone <span class="caret-down"></span> (la combinaison avec la touche <b>Maj</b> effectue l'action sur le sous-arbre constitué de ses fils).</div>

-<div class="information">Un clic sur un identifiant le sélectionne automatiquement.</div>

+<div class="information">To expand a node, click on icon <span class="caretSymbol"></span> (Combination with key <b>Shift</b> will also expand his inner sub-tree).</div>

+<div class="information">To collapse a note, click on icon <span class="caret-down"></span> (Combination with key <b>Shift</b> will also collapse his inner sub-tree).</div>

+<div class="information">A click on a id will select it automatically.</div>

 <br/>

 <#assign rootNode = .data_model.rootNode />

 <ul id="result">

 

 <script>

     function expand(node) {

-        // console.info("will expand child " + node.id);

         node.classList.add("caret-down");

         node.parentElement.querySelector(".nested").classList.add("active");

     }

     for (const caret of document.getElementsByClassName("caret")) {

         caret.addEventListener("click", function (event) {

             let expanded = this.classList.contains("caret-down");

-            // console.info("do click on " + this.id+", was expanded? "+expanded);

             toggle(expanded, this);

 

             if (event.shiftKey) {

-                // console.info("SHIFT on " + this.id+" was expanded? "+expanded);

                 for (const child of this.parentElement.querySelector(".nested").getElementsByClassName("caret")) {

                     toggle(expanded, child);

                 }

     <meta charset="UTF-8">

     <meta lang="es">

     <meta content="text/html">

-    <title>Rapport de validation</title>

+    <title>Validation report</title>

     <style>

         #result {

             list-style-type: none;

 

         .caret::before {

             content: "\1f5c0";

-            /*content: "\25B6";*/

             color: #027BFF;

             display: inline-block;

             margin-right: 6px;

 

         .caretSymbol::before {

             content: "\1f5c0";

-            /*content: "\25B6";*/

             color: #027BFF;

             display: inline-block;

             margin-right: 6px;

         .caret-down::before {

             content: "\1f5c1";

             color: #027BFF;

-            /*transform: rotate(90deg);*/

         }

 

         #result .nested {

         }

 

         table {

-            /*font-family: arial, sans-serif;*/

             border-collapse: collapse;

             width: 90%;

-            /*margin-left: 20px;*/

             margin-top: 10px;

             margin-bottom: 10px;

         }

     </style>

 </head>

 <body>

-<h1>Rapport de validation</h1>

+<b>TODO</b>

+<h1>Validation report</h1>

 

 <h2>Configuration</h2>

 

 <ul>

-    <li>Rapport de validation généré le ${.data_model.now}</li>

-    <li>Niveau(x) de validation :

+    <li>Validation report generated at ${.data_model.now}</li>

+    <li>Tipo de datos a validar: <#if .data_model.modelMode.name()=="DATA">Datos<#else>Referencial</#if></li>

+    <li>Validation scope(s):

         <#list .data_model.scopes as scope>

             <span class="<#if scope.name() == "ERROR">error<#else>warning</#if>">${scope.label}</span>

         </#list>

     </li>

-    <li>Context : ${.data_model.contextName}</li>

+    <li>Velocidad máxima autorizada en el control de las velocidades de las actividades: ${.data_model.validationSpeedMaxValue}</li>

+    <li>Forzar la validación de las velocidades de las actividades: ${.data_model.validationSpeedEnable?string("yes", "no")}</li>

+    <li>Forzar la validación de la talla de especies min/max: ${.data_model.validationLengthWeightEnable?string("yes", "no")}</li>

+    <li>Para que la utilización de referenciales obsoletos sea autorizado (se advertirá en los mensajes de validación): ${.data_model.validationUseDisabledReferential?string("yes", "no")}</li>

+    <li>Diccionario de sistemas observados requeridos por especies en la modalidad de cerco: ...</li>

 </ul>

 

-<h2>Résultat</h2>

+<h2>Results</h2>

 <h3>Notes</h3>

-<div class="information">Pour déplier un nœud, cliquez sur l'icone <span class="caretSymbol"></span> (la combinaison avec la touche <b>Maj</b> effectue l'action sur le sous-arbre constitué de ses fils).</div>

-<div class="information">Pour replier un nœud, cliquez sur l'icone <span class="caret-down"></span> (la combinaison avec la touche <b>Maj</b> effectue l'action sur le sous-arbre constitué de ses fils).</div>

-<div class="information">Un clic sur un identifiant le sélectionne automatiquement.</div>

+<div class="information">To expand a node, click on icon <span class="caretSymbol"></span> (Combination with key <b>Shift</b> will also expand his inner sub-tree).</div>

+<div class="information">To collapse a note, click on icon <span class="caret-down"></span> (Combination with key <b>Shift</b> will also collapse his inner sub-tree).</div>

+<div class="information">A click on a id will select it automatically.</div>

 <br/>

 <#assign rootNode = .data_model.rootNode />

 <ul id="result">

 

 <script>

     function expand(node) {

-        // console.info("will expand child " + node.id);

         node.classList.add("caret-down");

         node.parentElement.querySelector(".nested").classList.add("active");

     }

     for (const caret of document.getElementsByClassName("caret")) {

         caret.addEventListener("click", function (event) {

             let expanded = this.classList.contains("caret-down");

-            // console.info("do click on " + this.id+", was expanded? "+expanded);

             toggle(expanded, this);

 

             if (event.shiftKey) {

-                // console.info("SHIFT on " + this.id+" was expanded? "+expanded);

                 for (const child of this.parentElement.querySelector(".nested").getElementsByClassName("caret")) {

                     toggle(expanded, child);

                 }

 

         .caret::before {

             content: "\1f5c0";

-            /*content: "\25B6";*/

             color: #027BFF;

             display: inline-block;

             margin-right: 6px;

 

         .caretSymbol::before {

             content: "\1f5c0";

-            /*content: "\25B6";*/

             color: #027BFF;

             display: inline-block;

             margin-right: 6px;

         .caret-down::before {

             content: "\1f5c1";

             color: #027BFF;

-            /*transform: rotate(90deg);*/

         }

 

         #result .nested {

         }

 

         table {

-            /*font-family: arial, sans-serif;*/

             border-collapse: collapse;

             width: 90%;

             margin-left: 20px;

 

 <ul>

     <li>Rapport de validation généré le ${.data_model.now}</li>

+    <li>Type de données à valider : <#if .data_model.modelMode.name()=="DATA">Données métiers<#else>Référentiel</#if></li>

     <li>Niveau(x) de validation :

         <#list .data_model.scopes as scope>

             <span class="<#if scope.name() == "ERROR">error<#else>warning</#if>">${scope.label}</span>

         </#list>

     </li>

-    <li>Context : ${.data_model.contextName}</li>

+    <li>Vitesse maximale autorisée dans le contrôle des vitesses d'activités : ${.data_model.validationSpeedMaxValue}</li>

+    <li>Forcer la validation des vitesses d'activités : ${.data_model.validationSpeedEnable?string("Oui", "Non")}</li>

+    <li>Forcer la validation des bornes min/max de taille d'espèce : ${.data_model.validationLengthWeightEnable?string("Oui", "Non")}</li>

+    <li>Pour autoriser l'utilisation de référentiels obsolètes (les messages de validation passent en avertissement): ${.data_model.validationUseDisabledReferential?string("Oui", "Non")}</li>

+    <li>Dictionnaire des systèmes observées requis par espèces dans le modèle Seine:  ...</li>

 </ul>

 

 <h2>Résultat</h2>

         <JSeparator orientation='{JSeparator.HORIZONTAL}'/>

       </cell>

       </row>

-      <!--      TODO See https://gitlab.com/ultreiaio/ird-observe/-/issues/2212-->

       <row>

         <cell anchor="west">

           <JLabel id='validationSpeedMaxValueLabel' styleClass="skipI18n"/>

 import fr.ird.observe.datasource.configuration.ObserveDataSourceInformation;

 import fr.ird.observe.decoration.DecoratorService;

 import fr.ird.observe.dto.BusinessDto;

+import fr.ird.observe.dto.I18nDecoratorHelper;

 import fr.ird.observe.dto.ToolkitIdLabel;

 import fr.ird.observe.dto.referential.ReferentialDto;

 import fr.ird.observe.dto.validation.DtoValidationContext;

 import io.ultreia.java4all.application.template.spi.GenerateTemplate;

 import io.ultreia.java4all.bean.spi.GenerateJavaBeanDefinition;

 import io.ultreia.java4all.decoration.Decorator;

+import io.ultreia.java4all.i18n.I18n;

 import io.ultreia.java4all.lang.Strings;

 import org.apache.logging.log4j.LogManager;

 import org.apache.logging.log4j.Logger;

      */

     private static final String REPORT_PATTERN = "report-%1$tF--%1$tk-%1$tM-%1$tS.html";

     private static final Logger log = LogManager.getLogger(ValidateModel.class);

-    private static final SimpleDateFormat df = new SimpleDateFormat("dd/MM/yyy HH:mm");

+    /**

+     * Timestamp formatter.

+     */

+    private final SimpleDateFormat timestampFormatter;

     /**

      * les scopes a utiliser

      */

     public ValidateModel() {

         super(AdminStep.VALIDATE);

         scopes = EnumSet.noneOf(NuitonValidatorScope.class);

+        timestampFormatter = I18nDecoratorHelper.newTimestampFormat(I18n.getDefaultLocale());

     }

 

     @Override

     }

 

     public String getNow() {

-        return df.format(new Date());

+        return timestampFormatter.format(new Date());

     }

 

     public boolean withoutMessages() {

 

         ValidationResult result;

 

-        //FIXME Ajouter la configuration dans le rapport généré

-        //FIXME Ajouter la configuration de la base dans le rapport généré

         ValidationRequestConfiguration configuration = stepModel.toValidationRequestConfiguration();

         if (dataModel.getConfig().isLoadReferential()) {

 

         request.setScopes(new LinkedHashSet<>(Arrays.asList(NuitonValidatorScope.ERROR, NuitonValidatorScope.WARNING)));

         request.setValidationContext(DtoValidationContext.UPDATE_VALIDATION_CONTEXT);

         configuration.setValidationSpeedEnable(true);

+        configuration.setValidationSpeedMaxValue(30f);

         configuration.setValidationLengthWeightEnable(true);

 

         ValidationResult result = dataSource.getValidateService().validateData(configuration, request);

         model.addScope(NuitonValidatorScope.ERROR);

         model.addScope(NuitonValidatorScope.WARNING);

         model.setContextName(request.getValidationContext());

+        model.setValidationSpeedMaxValue(configuration.getValidationSpeedMaxValue());

         model.setModelMode(ValidationModelMode.DATA);

         model.setValidationResult(result);

         String content = ValidateModelTemplate.generate(model);

 

 import com.google.common.collect.ArrayListMultimap;

 import com.google.common.collect.Multimap;

+import fr.ird.observe.dto.I18nDecoratorHelper;

 import fr.ird.observe.dto.ToolkitIdLabel;

 import io.ultreia.java4all.decoration.DecoratorDefinition;

 import org.apache.logging.log4j.LogManager;

 import java.text.SimpleDateFormat;

 import java.util.List;

 import java.util.Locale;

-import java.util.Objects;

 import java.util.Set;

 

 /**

  */

 public class ToolkitIdLabelDecoratorRenderer extends JavaBeanDecoratorRenderer<ToolkitIdLabel> {

     private static final Logger log = LogManager.getLogger(ToolkitIdLabelDecoratorRenderer.class);

-    public final SimpleDateFormat frenchDateFormat = new SimpleDateFormat("dd/MM/yyyy");

-    public final SimpleDateFormat frenchTimestampFormat = new SimpleDateFormat("dd/MM/yyyy HH:mm");

-    public final SimpleDateFormat dateFormat = new SimpleDateFormat("yyyy-MM-dd");

-    public final SimpleDateFormat timestampFormat = new SimpleDateFormat("yyyy-MM-dd HH:mm");

 

     public ToolkitIdLabelDecoratorRenderer(Set<String> codeProperties) {

         super(ToolkitIdLabel.class);

         }

         if (isDate(propertyName)) {

             // sort on date, can not use toString render to sort (wrong order when using date pattern dd/MM/yyyy)

-            sortByDate(pos, Objects.equals(locale.getLanguage(), "fr") ? frenchDateFormat : dateFormat, dataList);

+            sortByDate(pos, I18nDecoratorHelper.newDateFormat(locale), dataList);

             return;

         }

         if (isTimestamp(propertyName)) {

             // sort on timestamp, can not use toString render to sort (wrong order when using date pattern dd/MM/yyyy HH:mm)

-            sortByDate(pos, Objects.equals(locale.getLanguage(), "fr") ? frenchTimestampFormat : timestampFormat, dataList);

+            sortByDate(pos, I18nDecoratorHelper.newTimestampFormat(locale), dataList);

             return;

         }

         // always sort as using natural order from numbers

 import io.ultreia.java4all.lang.Numbers;

 import io.ultreia.java4all.lang.Strings;

 

+import java.text.SimpleDateFormat;

 import java.util.Date;

 import java.util.Iterator;

 import java.util.Locale;

+import java.util.Objects;

 import java.util.ServiceLoader;

 

 import static io.ultreia.java4all.i18n.I18n.getDefaultLocale;

         return INSTANCE;

     }

 

+    public static SimpleDateFormat newDateFormat(Locale locale) {

+        return Objects.equals(locale.getLanguage(), "fr") ? new SimpleDateFormat("dd/MM/yyyy") : new SimpleDateFormat("yyyy-MM-dd");

+    }

+    public static SimpleDateFormat newTimestampFormat(Locale locale) {

+        return Objects.equals(locale.getLanguage(), "fr") ? new SimpleDateFormat("dd/MM/yyyy HH:mm") : new SimpleDateFormat("yyyy-MM-dd HH:mm");

+    }

 

     public static String getTypeKey(Class<?> key) {

         return getPropertyI18nKey(key, "type");

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

Commits:

9 changed files:

Changes: