diff --git a/src/frontend/app/indexation/indexing-form/indexing-form.component.html b/src/frontend/app/indexation/indexing-form/indexing-form.component.html index f3ebaf3ba182b812841beb3fcd62cbd03a7d5b0a..9a7314b63f8451aa4c2b9913691f9481121a51a5 100644 --- a/src/frontend/app/indexation/indexing-form/indexing-form.component.html +++ b/src/frontend/app/indexation/indexing-form/indexing-form.component.html @@ -44,19 +44,19 @@ <ng-container *ngIf="field.type === 'string'"> <mat-form-field class="input-form" floatLabel="never"> <textarea matInput [formControl]="arrFormControl[field.identifier]" - [placeholder]="field.system ? lang[field.type + 'Input'] : lang.defaultValue" + [placeholder]="!adminMode ? lang.typeValue : lang.defaultValue" matTextareaAutosize matAutosizeMinRows="1" cdkAutosizeMaxRows="6"></textarea> </mat-form-field> </ng-container> <ng-container *ngIf="field.type === 'integer'"> <mat-form-field class="input-form" floatLabel="never"> <input type="number" matInput [formControl]="arrFormControl[field.identifier]" - [placeholder]="field.system ? lang[field.type + 'Input'] : lang.defaultValue"> + [placeholder]="!adminMode ? lang.typeValue : lang.defaultValue"> </mat-form-field> </ng-container> <ng-container *ngIf="field.type === 'select'"> <plugin-select-search [showResetOption]="adminMode" - [placeholderLabel]="field.system ? lang[field.type + 'Input'] : lang.defaultValue" + [placeholderLabel]="!adminMode ? lang.chooseValue : lang.defaultValue" [formControlSelect]="arrFormControl[field.identifier]" [datas]="field.values" style="width:100%;"></plugin-select-search> </ng-container> @@ -71,7 +71,7 @@ <mat-form-field class="input-form" floatLabel="never" (click)="picker.open()"> <input [formControl]="arrFormControl[field.identifier]" matInput [matDatepicker]="picker" - [placeholder]="field.system ? lang[field.type + 'Input'] : lang.defaultValue" + [placeholder]="!adminMode ? lang.chooseDate : lang.defaultValue" [min]="getMinDate(field.startDate)" [max]="getMaxDate(field.endDate)"> <mat-datepicker-toggle matSuffix [for]="picker"> </mat-datepicker-toggle> @@ -103,7 +103,7 @@ </mat-chip-list> </ng-container> <ng-container *ngIf="field.type === 'autocomplete'"> - <plugin-autocomplete [labelPlaceholder]="lang.chooseValue" + <plugin-autocomplete [labelPlaceholder]="lang.searchValue" [routeDatas]="[field.values[0]]" [targetSearchKey]="'idToDisplay'" [size]="'small'" [control]="arrFormControl[field.identifier]" style="width:100%;"></plugin-autocomplete> diff --git a/src/frontend/app/indexation/indexing-form/indexing-form.component.ts b/src/frontend/app/indexation/indexing-form/indexing-form.component.ts index 049fa741da385fb72a085a818277ab3a4fdc7c9f..2181f5326071bee430e4fd3eb1ae2ecde94ace25 100644 --- a/src/frontend/app/indexation/indexing-form/indexing-form.component.ts +++ b/src/frontend/app/indexation/indexing-form/indexing-form.component.ts @@ -77,7 +77,7 @@ export class IndexingFormComponent implements OnInit { values: [] }, { - identifier: 'contact', + identifier: 'getSenders', label: this.lang.getSenders, unit: 'contact', type: 'autocomplete', @@ -119,9 +119,9 @@ export class IndexingFormComponent implements OnInit { availableFields: any[] = [ { - identifier: 'recipient', + identifier: 'getRecipients', label: this.lang.getRecipients, - type: 'string', + type: 'autocomplete', values: [] }, { @@ -488,7 +488,6 @@ export class IndexingFormComponent implements OnInit { let indexFound = this.availableFields.map(avField => avField.identifier).indexOf(field.identifier); if (indexFound > -1) { - field.label = this.availableFields[indexFound].label; field.values = this.availableFields[indexFound].values; field.type = this.availableFields[indexFound].type; this.availableFields.splice(indexFound, 1); @@ -508,7 +507,6 @@ export class IndexingFormComponent implements OnInit { indexFound = this.indexingModelsCore.map(info => info.identifier).indexOf(field.identifier); if (indexFound > -1) { - field.label = this.indexingModelsCore[indexFound].label; field.values = this.indexingModelsCore[indexFound].values; field.type = this.indexingModelsCore[indexFound].type; fieldExist = true; diff --git a/src/frontend/lang/lang-en.ts b/src/frontend/lang/lang-en.ts index 14520372acb8dbbea310fb786ec00e859508fcf5..a88269b0b7b4cff65c9004a536a0237e7b379b6a 100755 --- a/src/frontend/lang/lang-en.ts +++ b/src/frontend/lang/lang-en.ts @@ -1117,5 +1117,6 @@ export const LANG_EN = { "indexingModelUpdated" : "Indexing model updated", "indexingModelCreation" : "Indexing model creation", "integerInput" : "Input number", - "noSelectedValue" : "No selected value", + "noSelectedValue" : "No selected value", + "searchValue" : "Search a value", }; diff --git a/src/frontend/lang/lang-fr.ts b/src/frontend/lang/lang-fr.ts index 0f80ef8cb609255ea777cb341da31ff54035dcfb..f19777710fbec0584d7bc69c8e4413e762ea2a56 100755 --- a/src/frontend/lang/lang-fr.ts +++ b/src/frontend/lang/lang-fr.ts @@ -1155,4 +1155,5 @@ export const LANG_FR = { "indexingModelCreation" : "Création d'un modèle d'enregistrement", "integerInput" : "Champ numérique", "noSelectedValue" : "Aucun élément sélectionné", + "searchValue" : "Rechercher un élément", }; diff --git a/src/frontend/lang/lang-nl.ts b/src/frontend/lang/lang-nl.ts index b4ae7ed8a1e8b922b835ace93b1e9d6238377bd3..ec088113bb6baf7766acb4a035ada432293b34fb 100755 --- a/src/frontend/lang/lang-nl.ts +++ b/src/frontend/lang/lang-nl.ts @@ -1144,4 +1144,5 @@ export const LANG_NL = { "indexingModelCreation" : "Indexing model creation", //_TO_TRANSLATE "integerInput" : "Input number", //_TO_TRANSLATE "noSelectedValue" : "No selected value", //_TO_TRANSLATE + "searchValue" : "Search a value", //_TO_TRANSLATE };