From 8d897161d07bc77e1dde59d638a684096e016e22 Mon Sep 17 00:00:00 2001 From: Baptiste Toulemonde Date: Mon, 7 Mar 2022 15:12:52 +0100 Subject: [PATCH 01/16] change css --- .../file-tree-metadata.component.html | 47 +++++++++++-------- .../file-tree-metadata.component.ts | 7 +++ 2 files changed, 35 insertions(+), 19 deletions(-) diff --git a/ui/ui-frontend/projects/pastis/src/app/profile/edit-profile/file-tree-metadata/file-tree-metadata.component.html b/ui/ui-frontend/projects/pastis/src/app/profile/edit-profile/file-tree-metadata/file-tree-metadata.component.html index a941f1fdc..830e7fdc1 100644 --- a/ui/ui-frontend/projects/pastis/src/app/profile/edit-profile/file-tree-metadata/file-tree-metadata.component.html +++ b/ui/ui-frontend/projects/pastis/src/app/profile/edit-profile/file-tree-metadata/file-tree-metadata.component.html @@ -224,7 +224,7 @@ -
+

@@ -233,9 +233,9 @@

-
+
- + {{country.label}} @@ -257,14 +257,16 @@ translate}} -
- - {{'PROFILE.EDIT_PROFILE.FILE_TREE_METADATA.FORMATAGE_PREDEFINI' | - translate}}: - -
- - +
+
+
+ + {{'PROFILE.EDIT_PROFILE.FILE_TREE_METADATA.FORMATAGE_PREDEFINI' | + translate}}: + +
+
+ {{country.label}} @@ -275,19 +277,26 @@ keyboard_arrow_down
+
+
+
+
+
+
+ + +
+
+ +
- +
-
- - - - -
+
diff --git a/ui/ui-frontend/projects/pastis/src/app/profile/edit-profile/file-tree-metadata/file-tree-metadata.component.ts b/ui/ui-frontend/projects/pastis/src/app/profile/edit-profile/file-tree-metadata/file-tree-metadata.component.ts index 0e256894e..522fdf2e0 100644 --- a/ui/ui-frontend/projects/pastis/src/app/profile/edit-profile/file-tree-metadata/file-tree-metadata.component.ts +++ b/ui/ui-frontend/projects/pastis/src/app/profile/edit-profile/file-tree-metadata/file-tree-metadata.component.ts @@ -428,6 +428,13 @@ export class FileTreeMetadataComponent { } } + isAloneAndSimple(metadatas: MatTableDataSource): boolean { + if (metadatas.data.length === 1 && !this.isElementComplex(metadatas.data[0].nomDuChamp)) { + return true; + } + return false; + } + onAddNode() { if (this.clickedNode.name === 'DescriptiveMetadata') { console.log("Yes") -- GitLab From c0cc0e9ae8300f0fe791318f6cf01e87a99ec50d Mon Sep 17 00:00:00 2001 From: naji Date: Tue, 8 Mar 2022 17:18:10 +0100 Subject: [PATCH 02/16] =?UTF-8?q?Remonter=20les=20valeurs=20s=C3=A9lection?= =?UTF-8?q?ner=20pas=20la=20popup=20to=20filetree-metadata?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../file-tree-metadata.component.ts | 56 +++++++++++++--- .../add-pua-control.component.html | 5 -- .../add-pua-control.component.ts | 65 ++++++++++++------- 3 files changed, 89 insertions(+), 37 deletions(-) diff --git a/ui/ui-frontend/projects/pastis/src/app/profile/edit-profile/file-tree-metadata/file-tree-metadata.component.ts b/ui/ui-frontend/projects/pastis/src/app/profile/edit-profile/file-tree-metadata/file-tree-metadata.component.ts index 7bdf05f46..8615a9632 100644 --- a/ui/ui-frontend/projects/pastis/src/app/profile/edit-profile/file-tree-metadata/file-tree-metadata.component.ts +++ b/ui/ui-frontend/projects/pastis/src/app/profile/edit-profile/file-tree-metadata/file-tree-metadata.component.ts @@ -131,6 +131,12 @@ export class FileTreeMetadataComponent { isStandalone: boolean = environment.standalone; + enumerationControl: boolean; + valueControl: boolean; + lengthControl: boolean; + expressionControl: boolean; + arrayControl: string[]; + public breadcrumbDataTop: Array; public breadcrumbDataMetadata: Array; @@ -145,6 +151,9 @@ export class FileTreeMetadataComponent { popupSousTitre: string popupValider: string popupAnnuler: string + popupControlTitleDialog: string + popupControlSubTitleDialog: string + popupControlOkLabel: string @Output() public insertItem: EventEmitter = new EventEmitter(); @@ -217,6 +226,9 @@ export class FileTreeMetadataComponent { this.popupSousTitre= "Edition des attributs de" this.popupValider= "Valider" this.popupAnnuler= "Annuler" + this.popupControlTitleDialog = "Veuillez séléctionner un ou plusieurs contrôles"; + this.popupControlSubTitleDialog = "Ajouter des contrôles supplémentaires à"; + this.popupControlOkLabel = 'AJOUTER LES CONTROLES' } @@ -528,16 +540,44 @@ export class FileTreeMetadataComponent { let popData = {} as PastisDialogData; if (fileNodeId) { popData.fileNode = this.fileService.findChildById(fileNodeId, this.clickedNode); - popData.titleDialog = "Veuillez séléctionner un ou plusieurs contrôles"; - popData.subTitleDialog = "Ajouter des contrôles supplémentaires à Title"; - popData.width = '1120px'; - popData.component = UserActionAddPuaControlComponent - popData.okLabel = 'AJOUTER LES CONTROLES' - popData.cancelLabel = this.popupAnnuler + popData.titleDialog = this.popupControlTitleDialog; + popData.subTitleDialog = this.popupControlSubTitleDialog + ' "' + popData.fileNode.name + '"'; + popData.width = '800px'; + popData.component = UserActionAddPuaControlComponent; + popData.okLabel = this.popupControlOkLabel; + popData.cancelLabel = this.popupAnnuler; + + let popUpAnswer = await this.fileService.openPopup(popData); + console.log("The answer for arrays control was ", popUpAnswer); + if(popUpAnswer){ + this.arrayControl = popUpAnswer; + this.setControlsVues(this.arrayControl) + } + } + } - let popUpAnswer = await this.fileService.openPopup(popData); - console.log("The answer for edit attributte was ", popUpAnswer); + resetContols(){ + this.arrayControl = []; + this.enumerationControl = false; + this.expressionControl = false; + this.lengthControl = false; + this.valueControl = false; + } + + setControlsVues(elements: string[]){ + if(elements.includes("Enumération")){ + this.enumerationControl = true; + } + if(elements.includes("Expression régulière")){ + this.expressionControl = true; } + if(elements.includes("Longueur Min/Max")){ + this.lengthControl = true; + } + if(elements.includes("Valeur Min/Max")){ + this.valueControl = true; + } + } onDeleteNode(nodeId: number) { diff --git a/ui/ui-frontend/projects/pastis/src/app/user-actions/add-pua-control/add-pua-control.component.html b/ui/ui-frontend/projects/pastis/src/app/user-actions/add-pua-control/add-pua-control.component.html index f847c09e8..779edab7f 100644 --- a/ui/ui-frontend/projects/pastis/src/app/user-actions/add-pua-control/add-pua-control.component.html +++ b/ui/ui-frontend/projects/pastis/src/app/user-actions/add-pua-control/add-pua-control.component.html @@ -40,9 +40,4 @@ - -

- {{'USER_ACTION.ADD_METADATA.MESSAGE_PLUS_METADONNEE' | translate}}

- -
diff --git a/ui/ui-frontend/projects/pastis/src/app/user-actions/add-pua-control/add-pua-control.component.ts b/ui/ui-frontend/projects/pastis/src/app/user-actions/add-pua-control/add-pua-control.component.ts index 92bece8b2..bce846d08 100644 --- a/ui/ui-frontend/projects/pastis/src/app/user-actions/add-pua-control/add-pua-control.component.ts +++ b/ui/ui-frontend/projects/pastis/src/app/user-actions/add-pua-control/add-pua-control.component.ts @@ -57,12 +57,11 @@ export class UserActionAddPuaControlComponent implements OnInit { btnIsDisabled: boolean; sedaData: SedaData; - allowedChildren: string[] = [ - "Enumération", - "Expression régulière", - "Longueur Min/Max", - "Valeur Min/Max" - ] + enumerationsLabel: string = "Enumération"; + expressionReguliereLabel: string = "Expression régulière"; + lengthMinMaxLabel: string = "Longueur Min/Max"; + valueMinMaxLabel: string = "Valeur Min/Max"; + allowedChildren: string[]; namesFiltered: any = []; sedaNodeFound: SedaData; selectedSedaNode: SedaData; @@ -78,7 +77,9 @@ export class UserActionAddPuaControlComponent implements OnInit { constructor(public dialogRef: MatDialogRef, private fileService: FileService, private sedaService: SedaService, - private popUpService: PopupService, private sedaLanguageService: PastisPopupMetadataLanguageService) { } + private popUpService: PopupService, private sedaLanguageService: PastisPopupMetadataLanguageService) { + this.refreshAllowedChildren(); + } ngOnInit() { this.sedaLanguageSub = this.sedaLanguageService.sedaLanguage.subscribe( @@ -109,10 +110,14 @@ export class UserActionAddPuaControlComponent implements OnInit { } onRemoveSelectedElement(element: string) { - let indexOfElement = this.addedItems.indexOf(element) - console.log(indexOfElement) - if (indexOfElement >= 0) { - this.allowedChildren.push(this.addedItems.splice(indexOfElement, 1)[0]) + if(this.isExclusive(element)){ + this.refreshAllowedChildren(); + }else{ + let indexOfElement = this.addedItems.indexOf(element) + console.log(indexOfElement) + if (indexOfElement >= 0) { + this.allowedChildren.push(this.addedItems.splice(indexOfElement, 1)[0]) + } } console.error(this.allowedChildren) this.addedItems.length > 0 ? this.atLeastOneIsSelected = true : this.atLeastOneIsSelected = false @@ -121,8 +126,11 @@ export class UserActionAddPuaControlComponent implements OnInit { onAddSelectedElement(element: string) { this.addedItems.push(element); - - this.allowedChildren = this.allowedChildren.filter(e => e != element); + if(this.isExclusive(element)){ + this.refreshAllowedChildren(element); + }else{ + this.allowedChildren = this.allowedChildren.filter(e => e != element); + } this.addedItems.length > 0 ? this.atLeastOneIsSelected = true : this.atLeastOneIsSelected = false this.upateButtonStatusAndDataToSend(); } @@ -154,21 +162,30 @@ export class UserActionAddPuaControlComponent implements OnInit { this.dialogRef.close(); } - onResolveName(element: SedaData): string { - if (this.sedaLanguage) { - return element.Name; - } - else { - if (element.NameFr) { - return element.NameFr; - } - } - return element.Name; - } ngOnDestroy(): void { if (this.sedaLanguageSub != null) { this.sedaLanguageSub.unsubscribe(); } } + isExclusive(element: string): boolean{ + return element === this.valueMinMaxLabel || element === this.enumerationsLabel; + } + + refreshAllowedChildren(element?: string){ + + if(element){ + this.addedItems = [element]; + this.allowedChildren = []; + }else{ + this.allowedChildren = [ + this.enumerationsLabel, + this.valueMinMaxLabel, + this.lengthMinMaxLabel, + this.expressionReguliereLabel + ]; + this.addedItems = []; + } + } + } -- GitLab From b89f2d17d621937fbf25e1c30be0d38f005a779e Mon Sep 17 00:00:00 2001 From: naji Date: Tue, 8 Mar 2022 18:14:35 +0100 Subject: [PATCH 03/16] Work in progress - refacto - need juste translate --- .../add-pua-control.component.html | 2 +- .../add-pua-control.component.ts | 72 ++++--------------- 2 files changed, 13 insertions(+), 61 deletions(-) diff --git a/ui/ui-frontend/projects/pastis/src/app/user-actions/add-pua-control/add-pua-control.component.html b/ui/ui-frontend/projects/pastis/src/app/user-actions/add-pua-control/add-pua-control.component.html index 779edab7f..8fd573863 100644 --- a/ui/ui-frontend/projects/pastis/src/app/user-actions/add-pua-control/add-pua-control.component.html +++ b/ui/ui-frontend/projects/pastis/src/app/user-actions/add-pua-control/add-pua-control.component.html @@ -13,7 +13,7 @@
- + Les contrôles à ajouter diff --git a/ui/ui-frontend/projects/pastis/src/app/user-actions/add-pua-control/add-pua-control.component.ts b/ui/ui-frontend/projects/pastis/src/app/user-actions/add-pua-control/add-pua-control.component.ts index bce846d08..d9b7dd20e 100644 --- a/ui/ui-frontend/projects/pastis/src/app/user-actions/add-pua-control/add-pua-control.component.ts +++ b/ui/ui-frontend/projects/pastis/src/app/user-actions/add-pua-control/add-pua-control.component.ts @@ -35,17 +35,12 @@ same conditions as regards security. The fact that you are presently reading this means that you have had knowledge of the CeCILL-C license and that you accept its terms. */ -import { Component, OnInit, TemplateRef } from '@angular/core'; -import { SedaData, SedaElementConstants } from '../../models/seda-data'; -import { FileNode } from '../../models/file-node'; -import { FileService } from '../../core/services/file.service'; -import { SedaService } from '../../core/services/seda.service'; +import { Component, OnInit } from '@angular/core'; +import { SedaData } from '../../models/seda-data'; import { MatDialogRef } from '@angular/material/dialog'; import { PastisDialogConfirmComponent } from '../../shared/pastis-dialog/pastis-dialog-confirm/pastis-dialog-confirm.component'; import { PastisDialogData } from '../../shared/pastis-dialog/classes/pastis-dialog-data'; import { PopupService } from '../../core/services/popup.service'; -import { Subscription } from 'rxjs'; -import { PastisPopupMetadataLanguageService } from '../../shared/pastis-popup-metadata-language/pastis-popup-metadata-language.service'; @Component({ selector: 'pastis-user-action-add-metadata', @@ -61,40 +56,21 @@ export class UserActionAddPuaControlComponent implements OnInit { expressionReguliereLabel: string = "Expression régulière"; lengthMinMaxLabel: string = "Longueur Min/Max"; valueMinMaxLabel: string = "Valeur Min/Max"; + enumerationsDefinition: string = "Signaler les valeurs autorisées"; + expressionReguliereDefinition: string = "Définir une expression régulière pour la valeur de la métadonnée"; allowedChildren: string[]; - namesFiltered: any = []; - sedaNodeFound: SedaData; - selectedSedaNode: SedaData; addedItems: string[] = []; dialogData: PastisDialogData; atLeastOneIsSelected: boolean; - customTemplate: TemplateRef - fileNode: FileNode; - sedaLanguage: boolean; - sedaLanguageSub: Subscription; constructor(public dialogRef: MatDialogRef, - private fileService: FileService, private sedaService: SedaService, - private popUpService: PopupService, private sedaLanguageService: PastisPopupMetadataLanguageService) { + private popUpService: PopupService) { this.refreshAllowedChildren(); } ngOnInit() { - this.sedaLanguageSub = this.sedaLanguageService.sedaLanguage.subscribe( - (value: boolean) => { - this.sedaLanguage = value; - }, - (error) => { - console.log(error) - } - ); - this.fileService.nodeChange.subscribe(fileNode => { this.fileNode = fileNode }) - this.sedaData = this.sedaService.sedaRules[0]; - - this.sedaNodeFound = this.fileNode.sedaData; - // Subscribe observer to button status and // set the inital state of the ok button to disabled this.popUpService.btnYesShoudBeDisabled.subscribe(status => { @@ -102,24 +78,15 @@ export class UserActionAddPuaControlComponent implements OnInit { }) } - - isElementSelected(element: string) { - if (this.addedItems) { - return this.addedItems.includes(element); - } - } - onRemoveSelectedElement(element: string) { if(this.isExclusive(element)){ this.refreshAllowedChildren(); }else{ let indexOfElement = this.addedItems.indexOf(element) - console.log(indexOfElement) if (indexOfElement >= 0) { this.allowedChildren.push(this.addedItems.splice(indexOfElement, 1)[0]) } } - console.error(this.allowedChildren) this.addedItems.length > 0 ? this.atLeastOneIsSelected = true : this.atLeastOneIsSelected = false this.upateButtonStatusAndDataToSend(); } @@ -140,32 +107,17 @@ export class UserActionAddPuaControlComponent implements OnInit { this.popUpService.disableYesButton(!this.atLeastOneIsSelected) } - onAllItemsAdded() { - return this.allowedChildren.length === this.addedItems.length; - } - - isElementComplex(element: SedaData) { - if (element) { - return element.Element === SedaElementConstants.complex; + getDefinition(element: string): string { + if(element === this.enumerationsLabel){ + return this.enumerationsDefinition } - } - - getDefinition(element: SedaData): string { - return element ? element.Definition : ''; - } - - onYesClick(): void { - console.log("Clicked ok on dialog : %o", this.selectedSedaNode); - - } - onNoClick(): void { - this.dialogRef.close(); + if(element === this.expressionReguliereLabel){ + return this.expressionReguliereDefinition + } + return ''; } ngOnDestroy(): void { - if (this.sedaLanguageSub != null) { - this.sedaLanguageSub.unsubscribe(); - } } isExclusive(element: string): boolean{ -- GitLab From 2927d17bed217f056a9f5eeee9d573e1bbfd6a13 Mon Sep 17 00:00:00 2001 From: naji Date: Wed, 9 Mar 2022 08:36:52 +0100 Subject: [PATCH 04/16] traduction --- .../file-tree-metadata.component.ts | 1 + .../add-pua-control.component.ts | 40 +++++++++++++++---- .../projects/pastis/src/assets/i18n/en.json | 11 ++++- .../projects/pastis/src/assets/i18n/fr.json | 11 ++++- 4 files changed, 54 insertions(+), 9 deletions(-) diff --git a/ui/ui-frontend/projects/pastis/src/app/profile/edit-profile/file-tree-metadata/file-tree-metadata.component.ts b/ui/ui-frontend/projects/pastis/src/app/profile/edit-profile/file-tree-metadata/file-tree-metadata.component.ts index 8615a9632..ed6fdfbaf 100644 --- a/ui/ui-frontend/projects/pastis/src/app/profile/edit-profile/file-tree-metadata/file-tree-metadata.component.ts +++ b/ui/ui-frontend/projects/pastis/src/app/profile/edit-profile/file-tree-metadata/file-tree-metadata.component.ts @@ -80,6 +80,7 @@ function constantToTranslate() { this.popupSousTitre = this.translated('.POPUP_SOUS_TITRE'); this.popupValider = this.translated('.POPUP_VALIDER'); this.popupAnnuler = this.translated('.POPUP_ANNULER'); + this.popupControlOkLabel = this.translated('.POPUP_CONTROL_OK_BUTTON_LABEL'); } @Component({ diff --git a/ui/ui-frontend/projects/pastis/src/app/user-actions/add-pua-control/add-pua-control.component.ts b/ui/ui-frontend/projects/pastis/src/app/user-actions/add-pua-control/add-pua-control.component.ts index d9b7dd20e..ca81db210 100644 --- a/ui/ui-frontend/projects/pastis/src/app/user-actions/add-pua-control/add-pua-control.component.ts +++ b/ui/ui-frontend/projects/pastis/src/app/user-actions/add-pua-control/add-pua-control.component.ts @@ -36,11 +36,25 @@ The fact that you are presently reading this means that you have had knowledge of the CeCILL-C license and that you accept its terms. */ import { Component, OnInit } from '@angular/core'; -import { SedaData } from '../../models/seda-data'; import { MatDialogRef } from '@angular/material/dialog'; import { PastisDialogConfirmComponent } from '../../shared/pastis-dialog/pastis-dialog-confirm/pastis-dialog-confirm.component'; import { PastisDialogData } from '../../shared/pastis-dialog/classes/pastis-dialog-data'; import { PopupService } from '../../core/services/popup.service'; +import { environment } from 'projects/pastis/src/environments/environment'; +import { LangChangeEvent, TranslateService } from '@ngx-translate/core'; + + +const ADD_PUA_CONTROL_TRANSLATE_PATH = 'USER_ACTION.ADD_PUA_CONTROL'; + +function constantToTranslate() { + this.enumerationsLabel = this.translated('.ENUMERATIONS_LABEL'); + this.expressionReguliereLabel = this.translated('.EXPRESSION_REGULIERE_LABEL'); + this.lengthMinMaxLabel = this.translated('.LENGTH_MIN_MAX_LABEL'); + this.valueMinMaxLabel = this.translated('.VALUE_MIN_MAX_LABEL'); + this.enumerationsDefinition = this.translated('.ENUMERATIONS_DEFINITION'); + this.expressionReguliereDefinition = this.translated('.EXPRESSION_REGULIERE_DEFINITION'); +} + @Component({ selector: 'pastis-user-action-add-metadata', @@ -50,8 +64,6 @@ import { PopupService } from '../../core/services/popup.service'; export class UserActionAddPuaControlComponent implements OnInit { btnIsDisabled: boolean; - - sedaData: SedaData; enumerationsLabel: string = "Enumération"; expressionReguliereLabel: string = "Expression régulière"; lengthMinMaxLabel: string = "Longueur Min/Max"; @@ -63,10 +75,15 @@ export class UserActionAddPuaControlComponent implements OnInit { dialogData: PastisDialogData; atLeastOneIsSelected: boolean; + isStandalone: boolean = environment.standalone; constructor(public dialogRef: MatDialogRef, - private popUpService: PopupService) { + private popUpService: PopupService, private translateService: TranslateService) { + if(!this.isStandalone){ + constantToTranslate.call(this); + this.translatedOnChange(); + } this.refreshAllowedChildren(); } @@ -117,9 +134,6 @@ export class UserActionAddPuaControlComponent implements OnInit { return ''; } - ngOnDestroy(): void { - } - isExclusive(element: string): boolean{ return element === this.valueMinMaxLabel || element === this.enumerationsLabel; } @@ -140,4 +154,16 @@ export class UserActionAddPuaControlComponent implements OnInit { } } + translatedOnChange(): void { + this.translateService.onLangChange + .subscribe((event: LangChangeEvent) => { + constantToTranslate.call(this); + console.log(event.lang); + }); + } + + translated(nameOfFieldToTranslate: string): string { + return this.translateService.instant(ADD_PUA_CONTROL_TRANSLATE_PATH + nameOfFieldToTranslate); + } + } diff --git a/ui/ui-frontend/projects/pastis/src/assets/i18n/en.json b/ui/ui-frontend/projects/pastis/src/assets/i18n/en.json index 7d701f8c2..a10de77cc 100644 --- a/ui/ui-frontend/projects/pastis/src/assets/i18n/en.json +++ b/ui/ui-frontend/projects/pastis/src/assets/i18n/en.json @@ -182,7 +182,8 @@ "NOM_ATTRIBUT": "Attribute name", "VALEUR_FIXE": "Fixed value", "COMMENTAIRE": "Comment" - } + }, + "POPUP_CONTROL_OK_BUTTON_LABEL": "ADD CONTROLS" } }, "LIST_PROFILE": { @@ -214,6 +215,14 @@ "METADATA_ADD": "The metadata to add", "BOUTON_AJOUTER": "Add", "MESSAGE_PLUS_METADONNEE": "There is no more metadata to add" + }, + "ADD_PUA_CONTROL": { + "ENUMERATIONS_LABEL": "Enumeration", + "EXPRESSION_REGULIERE_LABEL": "Regular expression", + "LENGTH_MIN_MAX_LABEL": "Length Min/Max", + "VALUE_MIN_MAX_LABEL": "Value Min/Max", + "ENUMERATIONS_DEFINITION": "Report allowed values", + "EXPRESSION_REGULIERE_DEFINITION": "Define a regular expression for the metadata value" } }, "COMMON": { diff --git a/ui/ui-frontend/projects/pastis/src/assets/i18n/fr.json b/ui/ui-frontend/projects/pastis/src/assets/i18n/fr.json index 03151e5ae..490100c5a 100644 --- a/ui/ui-frontend/projects/pastis/src/assets/i18n/fr.json +++ b/ui/ui-frontend/projects/pastis/src/assets/i18n/fr.json @@ -182,7 +182,8 @@ "NOM_ATTRIBUT": "Nom de l'attribut", "VALEUR_FIXE": "Valeur fixe", "COMMENTAIRE": "Commentaire" - } + }, + "POPUP_CONTROL_OK_BUTTON_LABEL": "AJOUTER LES CONTROLES" } }, "LIST_PROFILE": { @@ -214,6 +215,14 @@ "METADATA_ADD": "Les métadonnées à ajouter", "BOUTON_AJOUTER": "Ajouter", "MESSAGE_PLUS_METADONNEE": "Il n'y a plus de métadonnées à ajouter" + }, + "ADD_PUA_CONTROL": { + "ENUMERATIONS_LABEL": "Enumération", + "EXPRESSION_REGULIERE_LABEL": "Expression régulière", + "LENGTH_MIN_MAX_LABEL": "Longueur Min/Max", + "VALUE_MIN_MAX_LABEL": "Valeur Min/Max", + "ENUMERATIONS_DEFINITION": "Signaler les valeurs autorisées", + "EXPRESSION_REGULIERE_DEFINITION": "Définir une expression régulière pour la valeur de la métadonnée" } }, "COMMON": { -- GitLab From 42a5d927986c0b8a6904835ff0a672021dddc750 Mon Sep 17 00:00:00 2001 From: naji Date: Wed, 9 Mar 2022 09:16:03 +0100 Subject: [PATCH 05/16] fix: traduction pour version vitamui --- .../file-tree-metadata.component.ts | 11 +++++++---- .../projects/pastis/src/assets/i18n/en.json | 4 +++- .../projects/pastis/src/assets/i18n/fr.json | 4 +++- 3 files changed, 13 insertions(+), 6 deletions(-) diff --git a/ui/ui-frontend/projects/pastis/src/app/profile/edit-profile/file-tree-metadata/file-tree-metadata.component.ts b/ui/ui-frontend/projects/pastis/src/app/profile/edit-profile/file-tree-metadata/file-tree-metadata.component.ts index ed6fdfbaf..c64ffc128 100644 --- a/ui/ui-frontend/projects/pastis/src/app/profile/edit-profile/file-tree-metadata/file-tree-metadata.component.ts +++ b/ui/ui-frontend/projects/pastis/src/app/profile/edit-profile/file-tree-metadata/file-tree-metadata.component.ts @@ -72,6 +72,7 @@ import {UserActionAddPuaControlComponent} from '../../../user-actions/add-pua-co const FILE_TREE_METADATA_TRANSLATE_PATH = 'PROFILE.EDIT_PROFILE.FILE_TREE_METADATA'; +const ADD_PUA_CONTROL_TRANSLATE_PATH = 'USER_ACTION.ADD_PUA_CONTROL'; function constantToTranslate() { this.notificationAjoutMetadonnee = this.translated('.NOTIFICATION_AJOUT_METADONNEE'); @@ -81,6 +82,8 @@ function constantToTranslate() { this.popupValider = this.translated('.POPUP_VALIDER'); this.popupAnnuler = this.translated('.POPUP_ANNULER'); this.popupControlOkLabel = this.translated('.POPUP_CONTROL_OK_BUTTON_LABEL'); + this.popupControlSubTitleDialog = this.translated('.POPUP_CONTROL_SUB_TITLE_DIALOG'); + this.popupControlTitleDialog = this.translated('.POPUP_CONTROL_TITLE_DIALOG'); } @Component({ @@ -566,16 +569,16 @@ export class FileTreeMetadataComponent { } setControlsVues(elements: string[]){ - if(elements.includes("Enumération")){ + if((this.isStandalone && elements.includes("Enumération")) || elements.includes(this.translated(ADD_PUA_CONTROL_TRANSLATE_PATH + '.ENUMERATIONS_LABEL'))){ this.enumerationControl = true; } - if(elements.includes("Expression régulière")){ + if((this.isStandalone && elements.includes("Expression régulière")) || elements.includes(this.translated(ADD_PUA_CONTROL_TRANSLATE_PATH + '.EXPRESSION_REGULIERE_LABEL'))){ this.expressionControl = true; } - if(elements.includes("Longueur Min/Max")){ + if((this.isStandalone && elements.includes("Longueur Min/Max")) || elements.includes(this.translated(ADD_PUA_CONTROL_TRANSLATE_PATH + '.LENGTH_MIN_MAX_LABEL'))){ this.lengthControl = true; } - if(elements.includes("Valeur Min/Max")){ + if((this.isStandalone && elements.includes("Valeur Min/Max")) || elements.includes(this.translated(ADD_PUA_CONTROL_TRANSLATE_PATH + '.VALUE_MIN_MAX_LABEL'))){ this.valueControl = true; } diff --git a/ui/ui-frontend/projects/pastis/src/assets/i18n/en.json b/ui/ui-frontend/projects/pastis/src/assets/i18n/en.json index a10de77cc..d80d2fc91 100644 --- a/ui/ui-frontend/projects/pastis/src/assets/i18n/en.json +++ b/ui/ui-frontend/projects/pastis/src/assets/i18n/en.json @@ -183,7 +183,9 @@ "VALEUR_FIXE": "Fixed value", "COMMENTAIRE": "Comment" }, - "POPUP_CONTROL_OK_BUTTON_LABEL": "ADD CONTROLS" + "POPUP_CONTROL_OK_BUTTON_LABEL": "ADD CONTROLS", + "POPUP_CONTROL_SUB_TITLE_DIALOG": "Add additional controls to", + "POPUP_CONTROL_TITLE_DIALOG": "Please select one or more controls" } }, "LIST_PROFILE": { diff --git a/ui/ui-frontend/projects/pastis/src/assets/i18n/fr.json b/ui/ui-frontend/projects/pastis/src/assets/i18n/fr.json index 490100c5a..916462a4e 100644 --- a/ui/ui-frontend/projects/pastis/src/assets/i18n/fr.json +++ b/ui/ui-frontend/projects/pastis/src/assets/i18n/fr.json @@ -183,7 +183,9 @@ "VALEUR_FIXE": "Valeur fixe", "COMMENTAIRE": "Commentaire" }, - "POPUP_CONTROL_OK_BUTTON_LABEL": "AJOUTER LES CONTROLES" + "POPUP_CONTROL_OK_BUTTON_LABEL": "AJOUTER LES CONTROLES", + "POPUP_CONTROL_SUB_TITLE_DIALOG": "Ajouter des contrôles supplémentaires à", + "POPUP_CONTROL_TITLE_DIALOG": "Veuillez séléctionner un ou plusieurs contrôles" } }, "LIST_PROFILE": { -- GitLab From 6e435400255fa92c89fe33f88b6a22e1b1b4ed6f Mon Sep 17 00:00:00 2001 From: naji Date: Wed, 9 Mar 2022 09:30:32 +0100 Subject: [PATCH 06/16] feat: display only regularExpression and enumeration control --- .../user-actions/add-pua-control/add-pua-control.component.ts | 2 -- 1 file changed, 2 deletions(-) diff --git a/ui/ui-frontend/projects/pastis/src/app/user-actions/add-pua-control/add-pua-control.component.ts b/ui/ui-frontend/projects/pastis/src/app/user-actions/add-pua-control/add-pua-control.component.ts index ca81db210..5897e77ff 100644 --- a/ui/ui-frontend/projects/pastis/src/app/user-actions/add-pua-control/add-pua-control.component.ts +++ b/ui/ui-frontend/projects/pastis/src/app/user-actions/add-pua-control/add-pua-control.component.ts @@ -146,8 +146,6 @@ export class UserActionAddPuaControlComponent implements OnInit { }else{ this.allowedChildren = [ this.enumerationsLabel, - this.valueMinMaxLabel, - this.lengthMinMaxLabel, this.expressionReguliereLabel ]; this.addedItems = []; -- GitLab From 54b1de5e2789982a31865ea3bfc24a60691bf913 Mon Sep 17 00:00:00 2001 From: Baptiste Toulemonde Date: Wed, 9 Mar 2022 09:41:18 +0100 Subject: [PATCH 07/16] test 201 fonctionelle wip --- .../file-tree-metadata.component.html | 66 ++++++++++++------- .../file-tree-metadata.component.ts | 7 +- 2 files changed, 50 insertions(+), 23 deletions(-) diff --git a/ui/ui-frontend/projects/pastis/src/app/profile/edit-profile/file-tree-metadata/file-tree-metadata.component.html b/ui/ui-frontend/projects/pastis/src/app/profile/edit-profile/file-tree-metadata/file-tree-metadata.component.html index 8502d8c50..1dd928dc9 100644 --- a/ui/ui-frontend/projects/pastis/src/app/profile/edit-profile/file-tree-metadata/file-tree-metadata.component.html +++ b/ui/ui-frontend/projects/pastis/src/app/profile/edit-profile/file-tree-metadata/file-tree-metadata.component.html @@ -203,11 +203,11 @@ - -
-
-
-

- - {{'PROFILE.EDIT_PROFILE.FILE_TREE_METADATA.ENUMERATION_CONTROLE' | - translate}} - +
+
+
+
+

+ {{'PROFILE.EDIT_PROFILE.FILE_TREE_METADATA.ENUMERATION_CONTROLE' | + translate}} + + + {{this.clickedControl | json}} +

+
+
+
-

- {{country.label}} +
@@ -251,13 +261,25 @@
-
-

+
+
+
+

+ + {{'PROFILE.EDIT_PROFILE.FILE_TREE_METADATA.EXPRESSION_CONTROLE' | + translate}} + + +

+ +
+
+
- {{'PROFILE.EDIT_PROFILE.FILE_TREE_METADATA.EXPRESSION_CONTROLE' | - translate}} - -

@@ -269,8 +291,8 @@
- - {{country.label}} + + {{predefiniElement}}
@@ -288,7 +310,7 @@
-
+
@@ -309,4 +331,4 @@ - + \ No newline at end of file diff --git a/ui/ui-frontend/projects/pastis/src/app/profile/edit-profile/file-tree-metadata/file-tree-metadata.component.ts b/ui/ui-frontend/projects/pastis/src/app/profile/edit-profile/file-tree-metadata/file-tree-metadata.component.ts index 7ea9e4f14..b8f262f80 100644 --- a/ui/ui-frontend/projects/pastis/src/app/profile/edit-profile/file-tree-metadata/file-tree-metadata.component.ts +++ b/ui/ui-frontend/projects/pastis/src/app/profile/edit-profile/file-tree-metadata/file-tree-metadata.component.ts @@ -136,6 +136,9 @@ export class FileTreeMetadataComponent { lengthControl: boolean; expressionControl: boolean; arrayControl: string[]; + clickedControl: FileNode; + + formatagePredefini: string[] = ["Date AAAA-MM-JJ", "Date AAAA", "Adresse mail"]; public breadcrumbDataTop: Array; public breadcrumbDataMetadata: Array; @@ -543,12 +546,12 @@ export class FileTreeMetadataComponent { } async onEditControlClick(fileNodeId: number) { - alert(fileNodeId) let popData = {} as PastisDialogData; if (fileNodeId) { popData.fileNode = this.fileService.findChildById(fileNodeId, this.clickedNode); popData.titleDialog = this.popupControlTitleDialog; popData.subTitleDialog = this.popupControlSubTitleDialog + ' "' + popData.fileNode.name + '"'; + this.clickedControl = popData.fileNode; popData.width = '800px'; popData.component = UserActionAddPuaControlComponent; popData.okLabel = this.popupControlOkLabel; @@ -755,4 +758,6 @@ export class FileTreeMetadataComponent { return this.sedaService.isDuplicated(nomDuChamp, this.selectedSedaNode); } + + } -- GitLab From 3375a5d7f275132e200582c685bea54cc5d9f3a0 Mon Sep 17 00:00:00 2001 From: naji Date: Wed, 9 Mar 2022 10:21:57 +0100 Subject: [PATCH 08/16] =?UTF-8?q?Chercher=20les=20enumeration=20d=C3=A9fin?= =?UTF-8?q?it=20dans=20seda=20pour=20les=20metadonnes?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../file-tree-metadata.component.html | 7 +++---- .../file-tree-metadata/file-tree-metadata.component.ts | 10 ++++++---- 2 files changed, 9 insertions(+), 8 deletions(-) diff --git a/ui/ui-frontend/projects/pastis/src/app/profile/edit-profile/file-tree-metadata/file-tree-metadata.component.html b/ui/ui-frontend/projects/pastis/src/app/profile/edit-profile/file-tree-metadata/file-tree-metadata.component.html index 1dd928dc9..6811d1ad0 100644 --- a/ui/ui-frontend/projects/pastis/src/app/profile/edit-profile/file-tree-metadata/file-tree-metadata.component.html +++ b/ui/ui-frontend/projects/pastis/src/app/profile/edit-profile/file-tree-metadata/file-tree-metadata.component.html @@ -235,7 +235,6 @@ translate}} - {{this.clickedControl | json}}
diff --git a/ui/ui-frontend/projects/pastis/src/app/profile/edit-profile/file-tree-metadata/file-tree-metadata.component.ts b/ui/ui-frontend/projects/pastis/src/app/profile/edit-profile/file-tree-metadata/file-tree-metadata.component.ts index dbc213bf9..8d00555c7 100644 --- a/ui/ui-frontend/projects/pastis/src/app/profile/edit-profile/file-tree-metadata/file-tree-metadata.component.ts +++ b/ui/ui-frontend/projects/pastis/src/app/profile/edit-profile/file-tree-metadata/file-tree-metadata.component.ts @@ -764,6 +764,8 @@ export class FileTreeMetadataComponent { return this.sedaService.isDuplicated(nomDuChamp, this.selectedSedaNode); } - - + isEmptyEnumeration(enumerations: string[]): boolean{ + return enumerations.length === 0; + } + } -- GitLab From a99f5802d1df29bb95de6616b2679295c0d118aa Mon Sep 17 00:00:00 2001 From: naji Date: Wed, 9 Mar 2022 15:56:38 +0100 Subject: [PATCH 10/16] export ok avec control enum editer manuelement --- .../pastis/src/app/models/pua-data.ts | 18 +++++----- .../file-tree-metadata.component.html | 24 +++++++++++-- .../file-tree-metadata.component.scss | 6 ++++ .../file-tree-metadata.component.ts | 36 +++++++++++++++++-- 4 files changed, 71 insertions(+), 13 deletions(-) diff --git a/ui/ui-frontend/projects/pastis/src/app/models/pua-data.ts b/ui/ui-frontend/projects/pastis/src/app/models/pua-data.ts index 62508789f..760e95db5 100644 --- a/ui/ui-frontend/projects/pastis/src/app/models/pua-data.ts +++ b/ui/ui-frontend/projects/pastis/src/app/models/pua-data.ts @@ -1,12 +1,12 @@ export interface PuaData { - additionalProperties: boolean; - Enum: string[]; - pattern: string; - minLenght: number; - maxLenght: number; - minimum: number; - maximum: number; - exclusiveMinimum: boolean; - exclusiveMaximum: boolean; + additionalProperties?: boolean; + enum?: string[]; + pattern?: string; + minLenght?: number; + maxLenght?: number; + minimum?: number; + maximum?: number; + exclusiveMinimum?: boolean; + exclusiveMaximum?: boolean; } diff --git a/ui/ui-frontend/projects/pastis/src/app/profile/edit-profile/file-tree-metadata/file-tree-metadata.component.html b/ui/ui-frontend/projects/pastis/src/app/profile/edit-profile/file-tree-metadata/file-tree-metadata.component.html index 2934c0f0a..9e5208a87 100644 --- a/ui/ui-frontend/projects/pastis/src/app/profile/edit-profile/file-tree-metadata/file-tree-metadata.component.html +++ b/ui/ui-frontend/projects/pastis/src/app/profile/edit-profile/file-tree-metadata/file-tree-metadata.component.html @@ -225,6 +225,7 @@
+
@@ -257,11 +258,22 @@
- - + +
+
+
+
+ + {{item}} + + + × +
+
+
+
+ + +
+
diff --git a/ui/ui-frontend/projects/pastis/src/app/profile/edit-profile/file-tree-metadata/file-tree-metadata.component.scss b/ui/ui-frontend/projects/pastis/src/app/profile/edit-profile/file-tree-metadata/file-tree-metadata.component.scss index 7baefd740..484012708 100644 --- a/ui/ui-frontend/projects/pastis/src/app/profile/edit-profile/file-tree-metadata/file-tree-metadata.component.scss +++ b/ui/ui-frontend/projects/pastis/src/app/profile/edit-profile/file-tree-metadata/file-tree-metadata.component.scss @@ -9,6 +9,12 @@ @import '~ui-frontend-common/sass/icons/vitamui-icons'; @import '~ui-frontend-common/sass/variables/colors'; @import '~ui-frontend-common/sass/editable-field'; +@import '../../../user-actions/add-metadata/add-metadata.component.scss'; + + +.pastis-container-selected-items{ + margin-top: 10px; +} td { diff --git a/ui/ui-frontend/projects/pastis/src/app/profile/edit-profile/file-tree-metadata/file-tree-metadata.component.ts b/ui/ui-frontend/projects/pastis/src/app/profile/edit-profile/file-tree-metadata/file-tree-metadata.component.ts index 8d00555c7..9d984ee31 100644 --- a/ui/ui-frontend/projects/pastis/src/app/profile/edit-profile/file-tree-metadata/file-tree-metadata.component.ts +++ b/ui/ui-frontend/projects/pastis/src/app/profile/edit-profile/file-tree-metadata/file-tree-metadata.component.ts @@ -142,6 +142,8 @@ export class FileTreeMetadataComponent { arrayControl: string[]; clickedControl: FileNode; enumerationsSedaControl: string[]; + enumsControlSeleted: string[] = []; + editedEnumControl: string; formatagePredefini: string[] = ["Date AAAA-MM-JJ", "Date AAAA", "Adresse mail"]; @@ -552,7 +554,8 @@ export class FileTreeMetadataComponent { async onEditControlClick(fileNodeId: number) { let popData = {} as PastisDialogData; - if (fileNodeId) { + if (fileNodeId && fileNodeId === this.clickedNode.id) { + this.resetContols(); popData.fileNode = this.fileService.findChildById(fileNodeId, this.clickedNode); popData.titleDialog = this.popupControlTitleDialog; popData.subTitleDialog = this.popupControlSubTitleDialog + ' "' + popData.fileNode.name + '"'; @@ -767,5 +770,34 @@ export class FileTreeMetadataComponent { isEmptyEnumeration(enumerations: string[]): boolean{ return enumerations.length === 0; } - + + onSubmitControls(){ + if(this.enumerationControl && this.enumsControlSeleted.length > 0){ + if(this.clickedNode.puaData){ + this.clickedNode.puaData.enum = this.enumsControlSeleted; + }else{ + this.clickedNode.puaData = { + enum: this.enumsControlSeleted + } + } + + } + if(this.expressionControl){ + + } + } + + onRemoveEnumsControl(element: string) { + alert(element) + let indexOfElement = this.enumsControlSeleted.indexOf(element) + if (indexOfElement >= 0) { + this.enumsControlSeleted.splice(indexOfElement, 1)[0] + } + if(this.enumsControlSeleted.length === 0) this.editedEnumControl = null; + } + + addEnumsControl(element: string){ + this.enumsControlSeleted.push(element); + } + } -- GitLab From 23a6c81fc7569f3efc99d5c4ef2106b3e9e467d5 Mon Sep 17 00:00:00 2001 From: Baptiste Toulemonde Date: Wed, 9 Mar 2022 15:57:49 +0100 Subject: [PATCH 11/16] us33 wip --- .../file-tree-metadata.component.html | 21 ++++++++++++------- .../file-tree-metadata.component.scss | 1 + .../file-tree-metadata.component.ts | 20 +++++++++++++++++- .../pastis/src/assets/i18n-old/en.json | 1 + .../pastis/src/assets/i18n-old/fr.json | 1 + 5 files changed, 35 insertions(+), 9 deletions(-) diff --git a/ui/ui-frontend/projects/pastis/src/app/profile/edit-profile/file-tree-metadata/file-tree-metadata.component.html b/ui/ui-frontend/projects/pastis/src/app/profile/edit-profile/file-tree-metadata/file-tree-metadata.component.html index 2934c0f0a..e5d8f7b4c 100644 --- a/ui/ui-frontend/projects/pastis/src/app/profile/edit-profile/file-tree-metadata/file-tree-metadata.component.html +++ b/ui/ui-frontend/projects/pastis/src/app/profile/edit-profile/file-tree-metadata/file-tree-metadata.component.html @@ -271,7 +271,10 @@

{{'PROFILE.EDIT_PROFILE.FILE_TREE_METADATA.EXPRESSION_CONTROLE' | - translate}} + translate}}

@@ -282,20 +285,21 @@ close
- +
- + {{'PROFILE.EDIT_PROFILE.FILE_TREE_METADATA.FORMATAGE_PREDEFINI' | translate}}:
- - - {{predefiniElement}} + + + {{predefiniElement.label}}
@@ -310,17 +314,18 @@
- +
+ translate" (ngModeChange)="setPatternExpressionReguliere(clickedNode, $event)">
+
diff --git a/ui/ui-frontend/projects/pastis/src/app/profile/edit-profile/file-tree-metadata/file-tree-metadata.component.scss b/ui/ui-frontend/projects/pastis/src/app/profile/edit-profile/file-tree-metadata/file-tree-metadata.component.scss index 7baefd740..0dcca92a9 100644 --- a/ui/ui-frontend/projects/pastis/src/app/profile/edit-profile/file-tree-metadata/file-tree-metadata.component.scss +++ b/ui/ui-frontend/projects/pastis/src/app/profile/edit-profile/file-tree-metadata/file-tree-metadata.component.scss @@ -157,6 +157,7 @@ td { } + .commentaire-pastis { .editable-field { min-height: 50px !important; diff --git a/ui/ui-frontend/projects/pastis/src/app/profile/edit-profile/file-tree-metadata/file-tree-metadata.component.ts b/ui/ui-frontend/projects/pastis/src/app/profile/edit-profile/file-tree-metadata/file-tree-metadata.component.ts index 8d00555c7..6e6cb8337 100644 --- a/ui/ui-frontend/projects/pastis/src/app/profile/edit-profile/file-tree-metadata/file-tree-metadata.component.ts +++ b/ui/ui-frontend/projects/pastis/src/app/profile/edit-profile/file-tree-metadata/file-tree-metadata.component.ts @@ -69,6 +69,7 @@ import {NotificationService} from '../../../core/services/notification.service'; import {PastisDialogData} from '../../../shared/pastis-dialog/classes/pastis-dialog-data'; import {environment} from 'projects/pastis/src/environments/environment'; import {UserActionAddPuaControlComponent} from '../../../user-actions/add-pua-control/add-pua-control.component'; +import { PuaData } from '../../../models/pua-data'; const FILE_TREE_METADATA_TRANSLATE_PATH = 'PROFILE.EDIT_PROFILE.FILE_TREE_METADATA'; @@ -109,6 +110,7 @@ export class FileTreeMetadataComponent { @ViewChild('autosize', {static: false}) autosize: CdkTextareaAutosize; displayedColumns: string[] = ['nomDuChamp', 'valeurFixe', 'cardinalite', 'commentaire', 'menuoption']; + selectedpattern: string = ""; clickedNode: FileNode = {} as FileNode; @@ -143,7 +145,14 @@ export class FileTreeMetadataComponent { clickedControl: FileNode; enumerationsSedaControl: string[]; - formatagePredefini: string[] = ["Date AAAA-MM-JJ", "Date AAAA", "Adresse mail"]; + radioExpressionReguliere: string; + + formatagePredefini: Array<{label: string, value: string}> = + [ + { label : "Date AAAA-MM-JJ", value: "^([0-8][0-9]{3}-(0[1-9]|1[0-2])-(0[1-9]|[12][0-9]|3[01]))$" }, + { label: "Date AAAA", value: "[0-9]{4}-[0-9]{2}-[0-9]{2}" }, + { label: "Adresse mail", value: "[a-z0-9._%+-]+@[a-z0-9.-]+\.[a-z]{2,4}$" } + ]; public breadcrumbDataTop: Array; public breadcrumbDataMetadata: Array; @@ -767,5 +776,14 @@ export class FileTreeMetadataComponent { isEmptyEnumeration(enumerations: string[]): boolean{ return enumerations.length === 0; } + + setPatternExpressionReguliere(node: FileNode, pattern: string) { + + if(!node.puaData){ + node.puaData = {} as PuaData; + } + node.puaData.pattern = pattern; + console.log(node) + } } diff --git a/ui/ui-frontend/projects/pastis/src/assets/i18n-old/en.json b/ui/ui-frontend/projects/pastis/src/assets/i18n-old/en.json index 2f3e41d73..f2176a459 100644 --- a/ui/ui-frontend/projects/pastis/src/assets/i18n-old/en.json +++ b/ui/ui-frontend/projects/pastis/src/assets/i18n-old/en.json @@ -87,6 +87,7 @@ "DUPLIQUER": "Duplicate", "CONTROLE_METADONNEE": "Metadata control", "ATTRIBUT_METADONNEE": "Metadata attributes", + "INFO_EXPRESSION": "List to perform predefined checks for certain values (e.g. date or email address)", "SUPPRIMER": "Remove", "MESSAGE_METADONNEE_SANS_FILLES": { "PARTIEUN": "The metadata", diff --git a/ui/ui-frontend/projects/pastis/src/assets/i18n-old/fr.json b/ui/ui-frontend/projects/pastis/src/assets/i18n-old/fr.json index e202c3ff4..aaf5aab7f 100644 --- a/ui/ui-frontend/projects/pastis/src/assets/i18n-old/fr.json +++ b/ui/ui-frontend/projects/pastis/src/assets/i18n-old/fr.json @@ -84,6 +84,7 @@ "DUPLIQUER": "Dupliquer", "CONTROLE_METADONNEE": "Contrôle de métadonnée", "ATTRIBUT_METADONNEE": "Attributs de métadonnée", + "INFO_EXPRESSION": "Liste permettant d'effectuer des contrôles prédéfinis pour certaines valeurs (par ex. une date ou une adresse email)", "SUPPRIMER": "Supprimer", "MESSAGE_METADONNEE_SANS_FILLES": { "PARTIEUN": "La métadonnée", -- GitLab From 80f7cb89f903e9322169b8bc8ba2d539bc950c6c Mon Sep 17 00:00:00 2001 From: Baptiste Toulemonde Date: Thu, 10 Mar 2022 10:10:58 +0100 Subject: [PATCH 12/16] checkbox dans select enum --- .../file-tree-metadata.component.html | 13 +++++++------ .../file-tree-metadata.component.ts | 7 ++++--- 2 files changed, 11 insertions(+), 9 deletions(-) diff --git a/ui/ui-frontend/projects/pastis/src/app/profile/edit-profile/file-tree-metadata/file-tree-metadata.component.html b/ui/ui-frontend/projects/pastis/src/app/profile/edit-profile/file-tree-metadata/file-tree-metadata.component.html index 114185185..2e93c6fb6 100644 --- a/ui/ui-frontend/projects/pastis/src/app/profile/edit-profile/file-tree-metadata/file-tree-metadata.component.html +++ b/ui/ui-frontend/projects/pastis/src/app/profile/edit-profile/file-tree-metadata/file-tree-metadata.component.html @@ -246,12 +246,13 @@
- - - - {{element}} + + + + {{element}} +

{{element}}

keyboard_arrow_up keyboard_arrow_down @@ -263,8 +264,8 @@
-
-
+
+
{{item}} diff --git a/ui/ui-frontend/projects/pastis/src/app/profile/edit-profile/file-tree-metadata/file-tree-metadata.component.ts b/ui/ui-frontend/projects/pastis/src/app/profile/edit-profile/file-tree-metadata/file-tree-metadata.component.ts index d0f6451d4..bca824046 100644 --- a/ui/ui-frontend/projects/pastis/src/app/profile/edit-profile/file-tree-metadata/file-tree-metadata.component.ts +++ b/ui/ui-frontend/projects/pastis/src/app/profile/edit-profile/file-tree-metadata/file-tree-metadata.component.ts @@ -59,7 +59,7 @@ import {ProfileService} from '../../../core/services/profile.service'; import {BreadcrumbDataMetadata, BreadcrumbDataTop} from '../../../models/breadcrumb'; import {StartupService} from 'ui-frontend-common'; import {Router} from '@angular/router'; -import {Subscription} from "rxjs"; +import { Subscription} from "rxjs"; import {MatCheckboxChange} from "@angular/material/checkbox"; import {PastisPopupMetadataLanguageService} from '../../../shared/pastis-popup-metadata-language/pastis-popup-metadata-language.service'; import {FileTreeService} from '../file-tree/file-tree.service'; @@ -806,10 +806,9 @@ export class FileTreeMetadataComponent { } onRemoveEnumsControl(element: string) { - alert(element) let indexOfElement = this.enumsControlSeleted.indexOf(element) if (indexOfElement >= 0) { - this.enumsControlSeleted.splice(indexOfElement, 1)[0] + this.enumsControlSeleted.splice(indexOfElement, 1)[0]; } if(this.enumsControlSeleted.length === 0) this.editedEnumControl = null; } @@ -818,4 +817,6 @@ export class FileTreeMetadataComponent { this.enumsControlSeleted.push(element); } + + } -- GitLab From 9b9faa688d28b43cb7adc1dcad516ac39de51354 Mon Sep 17 00:00:00 2001 From: naji Date: Thu, 10 Mar 2022 14:53:43 +0100 Subject: [PATCH 13/16] fix: displaying windows --- .../file-tree-metadata.component.html | 18 +++++----- .../file-tree-metadata.component.scss | 6 ++-- .../file-tree-metadata.component.ts | 33 +++++++++++++++---- 3 files changed, 39 insertions(+), 18 deletions(-) diff --git a/ui/ui-frontend/projects/pastis/src/app/profile/edit-profile/file-tree-metadata/file-tree-metadata.component.html b/ui/ui-frontend/projects/pastis/src/app/profile/edit-profile/file-tree-metadata/file-tree-metadata.component.html index 2e93c6fb6..95c02f51f 100644 --- a/ui/ui-frontend/projects/pastis/src/app/profile/edit-profile/file-tree-metadata/file-tree-metadata.component.html +++ b/ui/ui-frontend/projects/pastis/src/app/profile/edit-profile/file-tree-metadata/file-tree-metadata.component.html @@ -226,7 +226,7 @@
-
+
@@ -239,7 +239,7 @@
@@ -247,12 +247,11 @@
- - - {{element}} + + + {{element}} -

{{element}}

keyboard_arrow_up keyboard_arrow_down @@ -310,8 +309,7 @@
- + {{predefiniElement.label}} @@ -341,9 +339,9 @@
-
+
- diff --git a/ui/ui-frontend/projects/pastis/src/app/profile/edit-profile/file-tree-metadata/file-tree-metadata.component.scss b/ui/ui-frontend/projects/pastis/src/app/profile/edit-profile/file-tree-metadata/file-tree-metadata.component.scss index b9183a753..36fbca670 100644 --- a/ui/ui-frontend/projects/pastis/src/app/profile/edit-profile/file-tree-metadata/file-tree-metadata.component.scss +++ b/ui/ui-frontend/projects/pastis/src/app/profile/edit-profile/file-tree-metadata/file-tree-metadata.component.scss @@ -13,9 +13,11 @@ .pastis-container-selected-items{ - margin-top: 10px; + margin-left: 50px; +} +.pastis-container-button-submit-controls{ + margin-left: 50px; } - td { padding-right: 20px !important; diff --git a/ui/ui-frontend/projects/pastis/src/app/profile/edit-profile/file-tree-metadata/file-tree-metadata.component.ts b/ui/ui-frontend/projects/pastis/src/app/profile/edit-profile/file-tree-metadata/file-tree-metadata.component.ts index bca824046..56fbfb54b 100644 --- a/ui/ui-frontend/projects/pastis/src/app/profile/edit-profile/file-tree-metadata/file-tree-metadata.component.ts +++ b/ui/ui-frontend/projects/pastis/src/app/profile/edit-profile/file-tree-metadata/file-tree-metadata.component.ts @@ -145,13 +145,14 @@ export class FileTreeMetadataComponent { clickedControl: FileNode; enumerationsSedaControl: string[]; enumsControlSeleted: string[] = []; - editedEnumControl: string; + editedEnumControl: string[]; + openControls: boolean; radioExpressionReguliere: string; - formatagePredefini: Array<{label: string, value: string}> = + formatagePredefini: Array<{label: string, value: string}> = [ - { label : "Date AAAA-MM-JJ", value: "^([0-8][0-9]{3}-(0[1-9]|1[0-2])-(0[1-9]|[12][0-9]|3[01]))$" }, + { label : "Date AAAA-MM-JJ", value: "^([0-8][0-9]{3}-(0[1-9]|1[0-2])-(0[1-9]|[12][0-9]|3[01]))$" }, { label: "Date AAAA", value: "[0-9]{4}-[0-9]{2}-[0-9]{2}" }, { label: "Adresse mail", value: "[a-z0-9._%+-]+@[a-z0-9.-]+\.[a-z]{2,4}$" } ]; @@ -579,6 +580,7 @@ export class FileTreeMetadataComponent { if(popUpAnswer){ this.arrayControl = popUpAnswer; this.setControlsVues(this.arrayControl, popData.fileNode.name) + this.openControls = true; } } } @@ -589,6 +591,9 @@ export class FileTreeMetadataComponent { this.expressionControl = false; this.lengthControl = false; this.valueControl = false; + this.enumsControlSeleted = []; + this.editedEnumControl = []; + this.openControls = false; } setControlsVues(elements: string[], sedaName: string){ @@ -781,14 +786,14 @@ export class FileTreeMetadataComponent { } setPatternExpressionReguliere(node: FileNode, pattern: string) { - + if(!node.puaData){ node.puaData = {} as PuaData; } node.puaData.pattern = pattern; console.log(node) } - + onSubmitControls(){ if(this.enumerationControl && this.enumsControlSeleted.length > 0){ if(this.clickedNode.puaData){ @@ -803,12 +808,22 @@ export class FileTreeMetadataComponent { if(this.expressionControl){ } + this.resetContols() } onRemoveEnumsControl(element: string) { let indexOfElement = this.enumsControlSeleted.indexOf(element) if (indexOfElement >= 0) { this.enumsControlSeleted.splice(indexOfElement, 1)[0]; + this.editedEnumControl = [] + this.enumsControlSeleted.forEach( e => { + this.editedEnumControl.push(e) + }) + } + + if(this.editedEnumControl.includes(element)){ + indexOfElement = this.editedEnumControl.indexOf(element) + this.editedEnumControl.splice(indexOfElement, 1)[0]; } if(this.enumsControlSeleted.length === 0) this.editedEnumControl = null; } @@ -816,7 +831,13 @@ export class FileTreeMetadataComponent { addEnumsControl(element: string){ this.enumsControlSeleted.push(element); } + addEnumsControlList(elements: string[]){ + this.enumsControlSeleted = elements; + } - + closeControlsVue(){ + this.openControls = false; + this.resetContols(); + } } -- GitLab From 76bf97bdc1845e3d07fde01ac37403f1c9989db1 Mon Sep 17 00:00:00 2001 From: naji Date: Thu, 10 Mar 2022 15:03:26 +0100 Subject: [PATCH 14/16] diminer la largeur de champs d'entre enums --- .../file-tree-metadata/file-tree-metadata.component.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ui/ui-frontend/projects/pastis/src/app/profile/edit-profile/file-tree-metadata/file-tree-metadata.component.html b/ui/ui-frontend/projects/pastis/src/app/profile/edit-profile/file-tree-metadata/file-tree-metadata.component.html index 95c02f51f..b82775155 100644 --- a/ui/ui-frontend/projects/pastis/src/app/profile/edit-profile/file-tree-metadata/file-tree-metadata.component.html +++ b/ui/ui-frontend/projects/pastis/src/app/profile/edit-profile/file-tree-metadata/file-tree-metadata.component.html @@ -245,7 +245,7 @@
-
+
-- GitLab From d311e7d182086f790f08b80d154f3ff3536c0df0 Mon Sep 17 00:00:00 2001 From: naji Date: Thu, 10 Mar 2022 15:26:14 +0100 Subject: [PATCH 15/16] Allow to print pattern in exported json if exist --- .../gouv/vitamui/pastis/common/dto/pua/PuaMetadataDetails.java | 1 + .../gouv/vitamui/pastis/common/service/PuaPastisValidator.java | 3 +++ 2 files changed, 4 insertions(+) diff --git a/api/api-pastis/pastis-commons/src/main/java/fr/gouv/vitamui/pastis/common/dto/pua/PuaMetadataDetails.java b/api/api-pastis/pastis-commons/src/main/java/fr/gouv/vitamui/pastis/common/dto/pua/PuaMetadataDetails.java index 2214356dc..d6416c80a 100644 --- a/api/api-pastis/pastis-commons/src/main/java/fr/gouv/vitamui/pastis/common/dto/pua/PuaMetadataDetails.java +++ b/api/api-pastis/pastis-commons/src/main/java/fr/gouv/vitamui/pastis/common/dto/pua/PuaMetadataDetails.java @@ -56,4 +56,5 @@ public class PuaMetadataDetails { List required; PuaMetadata items; List enums; + String pattern; } diff --git a/api/api-pastis/pastis-commons/src/main/java/fr/gouv/vitamui/pastis/common/service/PuaPastisValidator.java b/api/api-pastis/pastis-commons/src/main/java/fr/gouv/vitamui/pastis/common/service/PuaPastisValidator.java index 14ffa7354..7b542a5c5 100644 --- a/api/api-pastis/pastis-commons/src/main/java/fr/gouv/vitamui/pastis/common/service/PuaPastisValidator.java +++ b/api/api-pastis/pastis-commons/src/main/java/fr/gouv/vitamui/pastis/common/service/PuaPastisValidator.java @@ -619,6 +619,9 @@ public class PuaPastisValidator { puaMetadataDetails.setMinItems(0); puaMetadataDetails.setMaxItems(1); } + if(!sedaElement.getElement().equals(COMPLEX) && el.getPuaData() != null && el.getPuaData().getPattern() != null){ + puaMetadataDetails.setPattern(el.getPuaData().getPattern()); + } if(el.getPuaData() != null && el.getPuaData().getEnum() != null){ puaMetadataDetails.setEnums(el.getPuaData().getEnum()); }else{ -- GitLab From a87971960080e99552563b9bdd3024e5760b24db Mon Sep 17 00:00:00 2001 From: Baptiste Toulemonde Date: Thu, 10 Mar 2022 16:38:17 +0100 Subject: [PATCH 16/16] us33 tests passed front side --- .../pastis/src/app/models/file-node.ts | 6 + .../projects/pastis/src/app/models/models.ts | 2 +- .../file-tree-metadata.component.html | 116 ++++++++++-------- .../file-tree-metadata.component.scss | 1 - .../file-tree-metadata.component.ts | 49 +++++--- .../projects/pastis/src/assets/seda.json | 26 ++-- 6 files changed, 120 insertions(+), 80 deletions(-) diff --git a/ui/ui-frontend/projects/pastis/src/app/models/file-node.ts b/ui/ui-frontend/projects/pastis/src/app/models/file-node.ts index ac97385d4..d6b3b90dc 100644 --- a/ui/ui-frontend/projects/pastis/src/app/models/file-node.ts +++ b/ui/ui-frontend/projects/pastis/src/app/models/file-node.ts @@ -93,6 +93,12 @@ export enum ValueOrDataConstants { undefined = 'undefined' } +export enum DateFormatType { + dateType = 'DateType', + date = 'date', + dateTime = "dateTime" +} + export interface FileNode { id: number; parentId: number; diff --git a/ui/ui-frontend/projects/pastis/src/app/models/models.ts b/ui/ui-frontend/projects/pastis/src/app/models/models.ts index 8764048e9..4cde83d10 100644 --- a/ui/ui-frontend/projects/pastis/src/app/models/models.ts +++ b/ui/ui-frontend/projects/pastis/src/app/models/models.ts @@ -49,4 +49,4 @@ export interface MetadataHeaders { cardinalite: string[]; commentaire: string; enumeration: string[]; - } + } \ No newline at end of file diff --git a/ui/ui-frontend/projects/pastis/src/app/profile/edit-profile/file-tree-metadata/file-tree-metadata.component.html b/ui/ui-frontend/projects/pastis/src/app/profile/edit-profile/file-tree-metadata/file-tree-metadata.component.html index 2e93c6fb6..1311c297e 100644 --- a/ui/ui-frontend/projects/pastis/src/app/profile/edit-profile/file-tree-metadata/file-tree-metadata.component.html +++ b/ui/ui-frontend/projects/pastis/src/app/profile/edit-profile/file-tree-metadata/file-tree-metadata.component.html @@ -239,20 +239,21 @@
- - - - {{element}} + + + + {{element}} -

{{element}}

keyboard_arrow_up keyboard_arrow_down @@ -267,9 +268,9 @@
- - {{item}} - + + {{item}} + ×
@@ -284,10 +285,9 @@

{{'PROFILE.EDIT_PROFILE.FILE_TREE_METADATA.EXPRESSION_CONTROLE' | - translate}} + translate}}

@@ -299,52 +299,66 @@
-
-
-
- - {{'PROFILE.EDIT_PROFILE.FILE_TREE_METADATA.FORMATAGE_PREDEFINI' | - translate}}: - -
-
- - - - {{predefiniElement.label}} - - -
- keyboard_arrow_up - keyboard_arrow_down -
- + +
+
+
+ + {{'PROFILE.EDIT_PROFILE.FILE_TREE_METADATA.FORMATAGE_PREDEFINI' | + translate}}: + +
+
+ + + + + + {{predefiniElement.label}} + + + + + + + + {{predefiniElement.label}} + + + +
+ keyboard_arrow_up + keyboard_arrow_down +
+ +
-
-
-
-
- - -
-
- - +
+
+
+ + +
+
+ + +
-
-
- +
+
-
@@ -360,4 +374,4 @@ - + \ No newline at end of file diff --git a/ui/ui-frontend/projects/pastis/src/app/profile/edit-profile/file-tree-metadata/file-tree-metadata.component.scss b/ui/ui-frontend/projects/pastis/src/app/profile/edit-profile/file-tree-metadata/file-tree-metadata.component.scss index b9183a753..5231e6066 100644 --- a/ui/ui-frontend/projects/pastis/src/app/profile/edit-profile/file-tree-metadata/file-tree-metadata.component.scss +++ b/ui/ui-frontend/projects/pastis/src/app/profile/edit-profile/file-tree-metadata/file-tree-metadata.component.scss @@ -217,7 +217,6 @@ td { margin: 5px; } - table { width: 100%; @include mat-table-columns(( diff --git a/ui/ui-frontend/projects/pastis/src/app/profile/edit-profile/file-tree-metadata/file-tree-metadata.component.ts b/ui/ui-frontend/projects/pastis/src/app/profile/edit-profile/file-tree-metadata/file-tree-metadata.component.ts index bca824046..53c2133fa 100644 --- a/ui/ui-frontend/projects/pastis/src/app/profile/edit-profile/file-tree-metadata/file-tree-metadata.component.ts +++ b/ui/ui-frontend/projects/pastis/src/app/profile/edit-profile/file-tree-metadata/file-tree-metadata.component.ts @@ -44,6 +44,7 @@ import {SedaService} from '../../../core/services/seda.service'; import { CardinalityConstants, DataTypeConstants, + DateFormatType, FileNode, FileNodeInsertAttributeParams, FileNodeInsertParams, @@ -64,7 +65,7 @@ import {MatCheckboxChange} from "@angular/material/checkbox"; import {PastisPopupMetadataLanguageService} from '../../../shared/pastis-popup-metadata-language/pastis-popup-metadata-language.service'; import {FileTreeService} from '../file-tree/file-tree.service'; import {LangChangeEvent, TranslateService} from "@ngx-translate/core"; -import {CardinalityValues, MetadataHeaders} from '../../../models/models'; +import {CardinalityValues, MetadataHeaders } from '../../../models/models'; import {NotificationService} from '../../../core/services/notification.service'; import {PastisDialogData} from '../../../shared/pastis-dialog/classes/pastis-dialog-data'; import {environment} from 'projects/pastis/src/environments/environment'; @@ -110,7 +111,8 @@ export class FileTreeMetadataComponent { @ViewChild('autosize', {static: false}) autosize: CdkTextareaAutosize; displayedColumns: string[] = ['nomDuChamp', 'valeurFixe', 'cardinalite', 'commentaire', 'menuoption']; - selectedpattern: string = ""; + + selectedRegex: string = ""; clickedNode: FileNode = {} as FileNode; @@ -147,13 +149,16 @@ export class FileTreeMetadataComponent { enumsControlSeleted: string[] = []; editedEnumControl: string; - radioExpressionReguliere: string; - + radioExpressionReguliere: string = "select"; + regex: string; + customRegex: string; formatagePredefini: Array<{label: string, value: string}> = [ - { label : "Date AAAA-MM-JJ", value: "^([0-8][0-9]{3}-(0[1-9]|1[0-2])-(0[1-9]|[12][0-9]|3[01]))$" }, - { label: "Date AAAA", value: "[0-9]{4}-[0-9]{2}-[0-9]{2}" }, - { label: "Adresse mail", value: "[a-z0-9._%+-]+@[a-z0-9.-]+\.[a-z]{2,4}$" } + { label: 'AAAA-MM-JJ', value: '[0-9]{4}-[0-9]{2}-[0-9]{2}' }, + { label: 'AAAA-MM-JJTHH:MM:SS', value: '[0-9]{4}-[0-9]{2}-[0-9]{2}T[0-9]{2}:[0-9]{2}:[0-9]{2}' }, + { label: 'AAAA', value: '[0-9]{4}' }, + { label: 'AAAA-MM', value: '[0-9]{4}-[0-9]{2}' }, + { label: 'Adresse mail', value: '[a-z0-9._%+-]+@[a-z0-9.-]+\\.[a-z]{2,4}' } ]; public breadcrumbDataTop: Array; @@ -598,6 +603,22 @@ export class FileTreeMetadataComponent { } if((this.isStandalone && elements.includes("Expression régulière")) || elements.includes(this.translated(ADD_PUA_CONTROL_TRANSLATE_PATH + '.EXPRESSION_REGULIERE_LABEL'))){ this.expressionControl = true; + let type: string = this.sedaService.findSedaChildByName(sedaName, this.selectedSedaNode).Type; + switch (type) { + case DateFormatType.date: + this.formatagePredefini = this.formatagePredefini.filter(e => e.label === 'AAAA-MM-JJ'); + break; + case DateFormatType.dateTime: + this.formatagePredefini = this.formatagePredefini.filter(e => e.label === 'AAAA-MM-JJTHH:MM:SS'); + break; + case DateFormatType.dateType: + this.formatagePredefini.pop(); + break; + default: + this.formatagePredefini = this.formatagePredefini.filter(e => e.label === 'AAAA-MM-JJ' || e.label === 'AAAA' || e.label === 'Adresse mail'); + break; + } + this.regex = this.formatagePredefini[0].value; } if((this.isStandalone && elements.includes("Longueur Min/Max")) || elements.includes(this.translated(ADD_PUA_CONTROL_TRANSLATE_PATH + '.LENGTH_MIN_MAX_LABEL'))){ this.lengthControl = true; @@ -780,13 +801,13 @@ export class FileTreeMetadataComponent { return enumerations.length === 0; } - setPatternExpressionReguliere(node: FileNode, pattern: string) { - - if(!node.puaData){ - node.puaData = {} as PuaData; + setPatternExpressionReguliere() { + if(!this.selectedSedaNode.puaData){ + this.selectedSedaNode.puaData = {} as PuaData; } - node.puaData.pattern = pattern; - console.log(node) + + this.selectedSedaNode.puaData.pattern = (this.radioExpressionReguliere === 'select') ? this.regex : this.customRegex; + console.log(this.selectedSedaNode) } onSubmitControls(){ @@ -801,7 +822,7 @@ export class FileTreeMetadataComponent { } if(this.expressionControl){ - + this.setPatternExpressionReguliere(); } } diff --git a/ui/ui-frontend/projects/pastis/src/assets/seda.json b/ui/ui-frontend/projects/pastis/src/assets/seda.json index ca12001dd..0dab491dc 100644 --- a/ui/ui-frontend/projects/pastis/src/assets/seda.json +++ b/ui/ui-frontend/projects/pastis/src/assets/seda.json @@ -7248,7 +7248,7 @@ "NameFr": "Date de naissance", "Element": "Simple", "Cardinality": "0-1", - "Type": "token", + "Type": "date", "Choice": "no", "Extensible": "no", "Enumeration": [], @@ -7353,7 +7353,7 @@ "NameFr": "Date de décès", "Element": "Simple", "Cardinality": "0-1", - "Type": "token", + "Type": "date", "Choice": "no", "Extensible": "no", "Enumeration": [], @@ -10571,7 +10571,7 @@ "NameFr": "Date de création", "Element": "Simple", "Cardinality": "0-1", - "Type": "token", + "Type": "DateType", "Choice": "no", "Extensible": "no", "Enumeration": [], @@ -10584,7 +10584,7 @@ "NameFr": "Date de la transaction", "Element": "Simple", "Cardinality": "0-1", - "Type": "token", + "Type": "DateType", "Choice": "no", "Extensible": "no", "Enumeration": [], @@ -10597,7 +10597,7 @@ "NameFr": "Date de numérisation", "Element": "Simple", "Cardinality": "0-1", - "Type": "token", + "Type": "DateType", "Choice": "no", "Extensible": "no", "Enumeration": [], @@ -10610,7 +10610,7 @@ "NameFr": "Date d’envoi", "Element": "Simple", "Cardinality": "0-1", - "Type": "token", + "Type": "DateType", "Choice": "no", "Extensible": "no", "Enumeration": [], @@ -10623,7 +10623,7 @@ "NameFr": "Date de réception", "Element": "Simple", "Cardinality": "0-1", - "Type": "token", + "Type": "DateType", "Choice": "no", "Extensible": "no", "Enumeration": [], @@ -10636,7 +10636,7 @@ "NameFr": "Date d’enregistrement", "Element": "Simple", "Cardinality": "0-1", - "Type": "token", + "Type": "DateType", "Choice": "no", "Extensible": "no", "Enumeration": [], @@ -10649,7 +10649,7 @@ "NameFr": "Date de début", "Element": "Simple", "Cardinality": "0-1", - "Type": "token", + "Type": "DateType", "Choice": "no", "Extensible": "no", "Enumeration": [], @@ -10662,7 +10662,7 @@ "NameFr": "Date de fin", "Element": "Simple", "Cardinality": "0-1", - "Type": "token", + "Type": "DateType", "Choice": "no", "Extensible": "no", "Enumeration": [], @@ -10726,7 +10726,7 @@ "NameFr": "Date et heure de l'événement", "Element": "Simple", "Cardinality": "1", - "Type": "token", + "Type": "DateType", "Choice": "no", "Extensible": "no", "Enumeration": [], @@ -11158,7 +11158,7 @@ "NameFr": "Date de signature", "Element": "Simple", "Cardinality": "1", - "Type": "token", + "Type": "dateTime", "Choice": "no", "Extensible": "no", "Enumeration": [], @@ -11634,7 +11634,7 @@ "NameFr": "Date de la validation de la signature", "Element": "Simple", "Cardinality": "1", - "Type": "token", + "Type": "dateTime", "Choice": "no", "Extensible": "no", "Enumeration": [], -- GitLab