diff --git a/ui/ui-frontend/projects/pastis/src/app/notice/notice.component.html b/ui/ui-frontend/projects/pastis/src/app/notice/notice.component.html
index 20c66c96cfeb5d6098c5e9d7480df564e72dc84a..147ff461463219860de3bb76cfdaa01a60c255de 100644
--- a/ui/ui-frontend/projects/pastis/src/app/notice/notice.component.html
+++ b/ui/ui-frontend/projects/pastis/src/app/notice/notice.component.html
@@ -31,7 +31,7 @@
<pastis-user-action-save-profile></pastis-user-action-save-profile>
</div>
<!--Button setting-->
- <div class="panel-buttons" tooltip="Télécharger le manuel d'utilisation de PASTIS" placement="top"
+ <div class="panel-buttons" tooltip="Paramètres" placement="top"
show-delay="0" tooltip-class="pastis-tooltip-class">
<pastis-user-action-download-doc (click)="openChoicePopup()"></pastis-user-action-download-doc>
<div class="vitamui-pastis-choice-language">
diff --git a/ui/ui-frontend/projects/pastis/src/app/notice/notice.component.ts b/ui/ui-frontend/projects/pastis/src/app/notice/notice.component.ts
index b96fcbb25b76ba1813c3c1d0cf754c3ce569fdda..a16b18c8780a753e2fad8601b9105f7a8a3dd282 100644
--- a/ui/ui-frontend/projects/pastis/src/app/notice/notice.component.ts
+++ b/ui/ui-frontend/projects/pastis/src/app/notice/notice.component.ts
@@ -124,7 +124,7 @@ export class NoticeComponent implements OnInit, OnDestroy {
}
ngOnInit() {
this.languagePopup = false;
- this.docPath = 'assets/doc/VITAM UI - Documentation APP - PASTIS.pdf';
+ this.docPath = this.isStandalone ? 'assets/doc/Standalone - Documentation APP - PASTIS.pdf' : 'assets/doc/VITAM UI - Documentation APP - PASTIS.pdf';
this.profileModeLabel = this.profileService.profileMode==='PUA'?"PROFILE.EDIT_PROFILE.BREADCRUMB.PUA":"PROFILE.EDIT_PROFILE.BREADCRUMB.PA";
this.breadcrumbDataTop = [{ label: "PROFILE.EDIT_PROFILE.BREADCRUMB.PORTAIL", url: this.startupService.getPortalUrl(), external: true},{ label: "PROFILE.EDIT_PROFILE.BREADCRUMB.CREER_ET_GERER_PROFIL", url: '/'}, { label: this.profileModeLabel }];
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 2768a3673b8563167d405fc7458bdd6f80ba3137..d30aa26d01634ae81033eaa13732497e7cf51d92 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
@@ -210,7 +210,7 @@ export class FileTreeMetadataComponent {
}
- this.docPath = 'assets/doc/VITAM UI - Documentation APP - PASTIS.pdf';
+ this.docPath = this.isStandalone ? 'assets/doc/Standalone - Documentation APP - PASTIS.pdf' : 'assets/doc/VITAM UI - Documentation APP - PASTIS.pdf';
this.languagePopup = false;
this._sedalanguageSub = this.metadataLanguageService.sedaLanguage.subscribe(
(value: boolean) => {
diff --git a/ui/ui-frontend/projects/pastis/src/app/user-actions/add-metadata/add-metadata.component.html b/ui/ui-frontend/projects/pastis/src/app/user-actions/add-metadata/add-metadata.component.html
index 42275d3359b727afe3ad06a238b393851f5db0d0..5fb2c0cdc60c7d3b65287b1baf822a6a7ea3d943 100644
--- a/ui/ui-frontend/projects/pastis/src/app/user-actions/add-metadata/add-metadata.component.html
+++ b/ui/ui-frontend/projects/pastis/src/app/user-actions/add-metadata/add-metadata.component.html
@@ -30,10 +30,10 @@
<mat-divider class="pastis-popup-separator"></mat-divider>
<mat-selection-list [disableRipple]="true" [ngModel]="addedItems"
(ngModelChange)="selectSedaElement($event)" class="list-box">
- <mat-list *ngFor="let elementName of allowedChildrenNames | filterByName:filterName;"
+ <mat-list *ngFor="let element of allowedChildren | filterByName:filterName:sedaLanguage;"
class="list-item">
<span class="list-box-content">
- <i id ="pastis-ico-complex-element" *ngIf="isElementComplex(elementName)" class="vitamui-icon vitamui-icon-complex-element-1-1">
+ <i id ="pastis-ico-complex-element" *ngIf="isElementComplex(element.Name)" class="vitamui-icon vitamui-icon-complex-element-1-1">
<span class="path1"></span><span class="path2"></span>
<span class="path3"></span><span class="path4"></span>
<span class="path5"></span>
@@ -41,12 +41,12 @@
<span
class="text normal"
- tooltip={{getDefinition(elementName)}}
+ tooltip={{getDefinition(element.Name)}}
placement="right"
show-delay="0"
- tooltip-class="pastis-tooltip-class">{{onResolveName(elementName)}}</span>
+ tooltip-class="pastis-tooltip-class">{{onResolveName(element.Name)}}</span>
</span>
- <span class="ajouter" (click)="onAddSelectedElement(elementName)">{{'USER_ACTION.ADD_METADATA.BOUTON_AJOUTER' | translate}}</span>
+ <span class="ajouter" (click)="onAddSelectedElement(element.Name)">{{'USER_ACTION.ADD_METADATA.BOUTON_AJOUTER' | translate}}</span>
<mat-divider class="pastis-popup-separator"></mat-divider>
</mat-list>
diff --git a/ui/ui-frontend/projects/pastis/src/app/user-actions/add-metadata/add-metadata.component.ts b/ui/ui-frontend/projects/pastis/src/app/user-actions/add-metadata/add-metadata.component.ts
index 4a6554ca5bd0e225301ed7d5fb267ef4d82de2ea..3ceacf0d8e8306f7953bf26cf54ebfeffe5ea381 100644
--- a/ui/ui-frontend/projects/pastis/src/app/user-actions/add-metadata/add-metadata.component.ts
+++ b/ui/ui-frontend/projects/pastis/src/app/user-actions/add-metadata/add-metadata.component.ts
@@ -129,7 +129,6 @@ export class UserActionAddMetadataComponent implements OnInit {
})
this.addedItems.length > 0 ? this.atLeastOneIsSelected = true : this.atLeastOneIsSelected = false
this.upateButtonStatusAndDataToSend();
- this.allowedChildrenNames = new FilterByNamePipe().transform(this.allowedChildrenNames,this.filterName);
}
onAddSelectedElement(elementName: string){
@@ -196,9 +195,14 @@ export class UserActionAddMetadataComponent implements OnInit {
@Pipe({name: 'filterByName'})
export class FilterByNamePipe implements PipeTransform {
- transform(listOfNames: string[], nameToFilter: string): string[] {
- if(!listOfNames) return null;
- if(!nameToFilter) return listOfNames;
- return listOfNames.filter(name => name.toLowerCase().indexOf(nameToFilter.toLowerCase()) >= 0);
+ transform(listOfElements: SedaData[], nameToFilter: string, sedaLanguage: boolean): SedaData[] {
+ if(!listOfElements) return null;
+ if(!nameToFilter) return listOfElements;
+ if(sedaLanguage){
+ return listOfElements.filter(element => element.Name != undefined).filter(element => element.Name.toLowerCase().indexOf(nameToFilter.toLowerCase()) >= 0);
+ }else{
+ return listOfElements.filter(element => element.NameFr != undefined).filter(element => element.NameFr.toLowerCase().indexOf(nameToFilter.toLowerCase()) >= 0);
+ }
+
}
}
diff --git a/ui/ui-frontend/projects/pastis/src/assets/css/_layout.scss b/ui/ui-frontend/projects/pastis/src/assets/css/_layout.scss
index 3ed7e9017710b8d9de88bd9527d85a5e35e370d7..704f101c1f10b801da1033f54e4f4129e53baed9 100644
--- a/ui/ui-frontend/projects/pastis/src/assets/css/_layout.scss
+++ b/ui/ui-frontend/projects/pastis/src/assets/css/_layout.scss
@@ -157,7 +157,7 @@
/* width */
::-webkit-scrollbar {
width: 12px;
-
+ height: 12px;
}
/* Track */
diff --git a/ui/ui-frontend/projects/pastis/src/assets/doc/Standalone - Documentation APP - PASTIS.pdf b/ui/ui-frontend/projects/pastis/src/assets/doc/Standalone - Documentation APP - PASTIS.pdf
new file mode 100644
index 0000000000000000000000000000000000000000..bed212e2b22c5619cc7b1223399a6691d47163a3
Binary files /dev/null and b/ui/ui-frontend/projects/pastis/src/assets/doc/Standalone - Documentation APP - PASTIS.pdf differ
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 09a293bd63e8c7ff8fe5e7e45f7c3d76a8f7b6e0..17f1f52e48c95b00a4e899e8f6ab9ed37c511e0e 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
@@ -80,7 +80,7 @@
"POPUP_VALIDER": "Validate",
"POPUP_ANNULER": "Cancel",
"ENREGISTRER_PROFIL_TOOLTIP": "Save profile",
- "TELECHARGER_MANUEL_TOOLTIP": "Download the PASTIS user manual",
+ "TELECHARGER_MANUEL_TOOLTIP": "Setting",
"NOM_METADONNEE": "Metadata name",
"VALEUR_FIXE": "Fixed value",
"CARDINALITE ": "Cardinality",
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 bd8a1346b0970f098476edd3487a21c5bd59cb85..ecd57451c1adaaf4c29c4c7b7c04293d3f37c7da 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
@@ -82,7 +82,7 @@
"POPUP_ANNULER": "Annuler",
"ENREGISTRER_PROFIL_TOOLTIP": "Enregistrer le profil",
- "TELECHARGER_MANUEL_TOOLTIP": "Télécharger le manuel d'utilisation de PASTIS",
+ "TELECHARGER_MANUEL_TOOLTIP": "Paramètres",
"NOM_METADONNEE": "Nom de la métadonnée",
"VALEUR_FIXE": "Valeur fixe",
"CARDINALITE ": "Cardinalité",
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 bab29807bfa8e87362e0c9a2763836c34c697dcf..f02f19ba3d064a0582373abb546f9896dc36f868 100644
--- a/ui/ui-frontend/projects/pastis/src/assets/i18n/en.json
+++ b/ui/ui-frontend/projects/pastis/src/assets/i18n/en.json
@@ -70,10 +70,11 @@
"POPUP_DUPLICATE_SEDA_ELEMENT_ATTRIBUT": "Attribute",
"POPUP_DUPLICATE_SEDA_ELEMENT_METADONNEE": "Metadata ",
"POPUP_DUPLICATE_TITRE": "Do you want to duplicate",
- "POPUP_DUPLICATE_SOUS_TITRE_ATTRIBUT": "Deleting an attribute",
- "POPUP_DUPLICATE_DELETE_TYPE_TEXT_M": " deleted ",
- "POPUP_DUPLICATE_DELETE_TYPE_TEXT_F": " deleted ",
- "POPUP_DUPLICATE_TITRE_TWO'": "its content and configuration (cardinalities and comments)"
+ "POPUP_DUPLICATE_SOUS_TITRE_ATTRIBUT": "Duplication of an attribute",
+ "POPUP_DUPLICATE_SOUS_TITRE_METADONNEE": "Duplication of metadata",
+ "POPUP_DUPLICATE_DELETE_TYPE_TEXT_M": " duplicated ",
+ "POPUP_DUPLICATE_DELETE_TYPE_TEXT_F": " duplicated ",
+ "POPUP_DUPLICATE_TITRE_TWO": "its content and configuration (cardinalities and comments)"
},
"FILE_TREE_METADATA": {
"PUA": "Archiving Unit Profile",
@@ -86,7 +87,7 @@
"POPUP_VALIDER": "Validate",
"POPUP_ANNULER": "Cancel",
"ENREGISTRER_PROFIL_TOOLTIP": "Save profile",
- "TELECHARGER_MANUEL_TOOLTIP": "Download the PASTIS user manual",
+ "TELECHARGER_MANUEL_TOOLTIP": "Setting",
"NOM_METADONNEE": "Metadata name",
"VALEUR_FIXE": "Fixed value",
"CARDINALITE": "Cardinality",
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 556f46d927169d5a7b3af5a12b4364ec00381429..0e6a3b604138a0d174d2c7c8552b5e8b0766d3ca 100644
--- a/ui/ui-frontend/projects/pastis/src/assets/i18n/fr.json
+++ b/ui/ui-frontend/projects/pastis/src/assets/i18n/fr.json
@@ -70,11 +70,12 @@
"POPUP_ADD_OK_LABEL": "Ajouter les métadonnées",
"POPUP_DUPLICATE_SEDA_ELEMENT_ATTRIBUT": "L'attribut",
"POPUP_DUPLICATE_SEDA_ELEMENT_METADONNEE": "La métadonnée ",
- "POPUP_DUPLICATE_TITRE": "Voulez-vous supprimer",
- "POPUP_DUPLICATE_SOUS_TITRE_ATTRIBUT": "Suppression d'un attribut",
- "POPUP_DUPLICATE_DELETE_TYPE_TEXT_M": " supprimé ",
- "POPUP_DUPLICATE_DELETE_TYPE_TEXT_F": " supprimée ",
- "POPUP_DUPLICATE_TITRE_TWO'": "son contenu et son paramétrage (cardinalités et commentaire)"
+ "POPUP_DUPLICATE_TITRE": "Voulez-vous dupliquer",
+ "POPUP_DUPLICATE_SOUS_TITRE_ATTRIBUT": "Duplication d'un attribut",
+ "POPUP_DUPLICATE_SOUS_TITRE_METADONNEE": "Duplication d'un métadonnée",
+ "POPUP_DUPLICATE_DELETE_TYPE_TEXT_M": " dupliqué ",
+ "POPUP_DUPLICATE_DELETE_TYPE_TEXT_F": " dupliquée ",
+ "POPUP_DUPLICATE_TITRE_TWO": "son contenu et son paramétrage (cardinalités et commentaire)"
},
"FILE_TREE_METADATA": {
"PUA": "Profil d'Unité Archivistique",
@@ -87,7 +88,7 @@
"POPUP_VALIDER": "Valider",
"POPUP_ANNULER": "Annuler",
"ENREGISTRER_PROFIL_TOOLTIP": "Enregistrer le profil",
- "TELECHARGER_MANUEL_TOOLTIP": "Télécharger le manuel d'utilisation de PASTIS",
+ "TELECHARGER_MANUEL_TOOLTIP": "Paramètres",
"NOM_METADONNEE": "Nom de la métadonnée",
"VALEUR_FIXE": "Valeur fixe",
"CARDINALITE": "Cardinalité",