From 35ec8ce77cbb24082f662d3d4e4ad3c8fd28c4f6 Mon Sep 17 00:00:00 2001
From: Alex ORLUC <alex.orluc@maarch.org>
Date: Thu, 17 Sep 2020 10:11:40 +0200
Subject: [PATCH] FEAT #13271 TIME 0:10 fix build prod
---
.../app/administration/administration.module.ts | 15 +--------------
.../criteria-tool/criteria-tool.component.html | 4 ++--
src/frontend/app/app-common.module.ts | 17 +++++++++++++++++
src/frontend/app/app.module.ts | 12 ------------
src/lang/lang-fr.json | 2 +-
5 files changed, 21 insertions(+), 29 deletions(-)
diff --git a/src/frontend/app/administration/administration.module.ts b/src/frontend/app/administration/administration.module.ts
index e1ababd3d68..6ae785ec75b 100755
--- a/src/frontend/app/administration/administration.module.ts
+++ b/src/frontend/app/administration/administration.module.ts
@@ -76,14 +76,6 @@ import { IssuingSiteListComponent } from './registered-mail/issuing-site/issuing
import { IssuingSiteComponent } from './registered-mail/issuing-site/issuing-site.component';
import { RegisteredMailListComponent } from './registered-mail/registered-mail-list.component';
-// DOCUMENT FORM
-import { IndexingFormComponent } from '../indexation/indexing-form/indexing-form.component';
-import { TagInputComponent } from '../tag/indexing/tag-input.component';
-import { FolderInputComponent } from '../../app/folder/indexing/folder-input.component';
-import { IssuingSiteInputComponent } from '../../app/administration/registered-mail/issuing-site/indexing/issuing-site-input.component';
-import { RegisteredMailRecipientInputComponent } from '../../app/administration/registered-mail/indexing/recipient-input.component';
-
-
@NgModule({
imports: [
SharedModule,
@@ -164,12 +156,7 @@ import { RegisteredMailRecipientInputComponent } from '../../app/administration/
RegisteredMailComponent,
IssuingSiteListComponent,
IssuingSiteComponent,
- RegisteredMailListComponent,
- IndexingFormComponent,
- TagInputComponent,
- FolderInputComponent,
- IssuingSiteInputComponent,
- RegisteredMailRecipientInputComponent
+ RegisteredMailListComponent
],
entryComponents: [
AccountLinkComponent,
diff --git a/src/frontend/app/adv-search/criteria-tool/criteria-tool.component.html b/src/frontend/app/adv-search/criteria-tool/criteria-tool.component.html
index d0f45fff72e..b697d764812 100755
--- a/src/frontend/app/adv-search/criteria-tool/criteria-tool.component.html
+++ b/src/frontend/app/adv-search/criteria-tool/criteria-tool.component.html
@@ -6,7 +6,7 @@
<mat-icon class="fas fa-clipboard-list"></mat-icon>
</button>
<mat-autocomplete [class]="hideCriteriaList ? 'hide' : ''" #autoCriteria="matAutocomplete"
- (closed)="hideCriteriaList = true;" (optionSelected)="addCriteria($event.option.value)" [showPanel]="false">
+ (closed)="hideCriteriaList = true;" (optionSelected)="addCriteria($event.option.value)">
<mat-optgroup [label]="'Ajouter un critère de recherche'" class="criteria-list">
<input matInput type="text" #searchCriteriaInput [formControl]="getFilterControl()"
style="margin-left:5px;width:150px !important;height: 20px;border: 1px solid #6666663d;padding: 10px;border-radius: 5px;"
@@ -59,7 +59,7 @@
</span>
<mat-form-field class="input-form">
<input [id]="field.identifier" type="number" matInput [formControl]="field.control"
- [placeholder]="!adminMode ? this.translate.instant('lang.typeValue') : this.translate.instant('lang.defaultValue')"
+ [placeholder]="'lang.typeValue' | translate"
min="0" step="0.1">
</mat-form-field>
</ng-container>
diff --git a/src/frontend/app/app-common.module.ts b/src/frontend/app/app-common.module.ts
index 37f63c176b8..315e88efc8b 100755
--- a/src/frontend/app/app-common.module.ts
+++ b/src/frontend/app/app-common.module.ts
@@ -36,6 +36,13 @@ import { BasketHomeComponent } from './basket/basket-home.component';
import { FieldListComponent } from './indexation/field-list/field-list.component';
+// DOCUMENT FORM
+import { IndexingFormComponent } from './indexation/indexing-form/indexing-form.component';
+import { TagInputComponent } from './tag/indexing/tag-input.component';
+import { FolderInputComponent } from '../app/folder/indexing/folder-input.component';
+import { IssuingSiteInputComponent } from '../app/administration/registered-mail/issuing-site/indexing/issuing-site-input.component';
+import { RegisteredMailRecipientInputComponent } from '../app/administration/registered-mail/indexing/recipient-input.component';
+
/*MODAL*/
import { AlertComponent } from '../plugins/modal/alert.component';
import { ConfirmComponent } from '../plugins/modal/confirm.component';
@@ -95,6 +102,11 @@ import { TranslateService } from '@ngx-translate/core';
SmdFabSpeedDialComponent,
SmdFabSpeedDialTrigger,
SmdFabSpeedDialActions,
+ IndexingFormComponent,
+ TagInputComponent,
+ FolderInputComponent,
+ IssuingSiteInputComponent,
+ RegisteredMailRecipientInputComponent,
AlertComponent,
ConfirmComponent,
PluginAutocomplete,
@@ -162,6 +174,11 @@ import { TranslateService } from '@ngx-translate/core';
LinkedResourceListComponent,
NotesListComponent,
NoteEditorComponent,
+ IndexingFormComponent,
+ TagInputComponent,
+ FolderInputComponent,
+ IssuingSiteInputComponent,
+ RegisteredMailRecipientInputComponent,
],
providers: [],
entryComponents: [
diff --git a/src/frontend/app/app.module.ts b/src/frontend/app/app.module.ts
index 752943d7375..bdd2dd2197d 100755
--- a/src/frontend/app/app.module.ts
+++ b/src/frontend/app/app.module.ts
@@ -22,13 +22,6 @@ import { ActionsService } from './actions/actions.service';
import { AppComponent } from './app.component';
-// DOCUMENT FORM
-import { IndexingFormComponent } from './indexation/indexing-form/indexing-form.component';
-import { TagInputComponent } from './tag/indexing/tag-input.component';
-import { FolderInputComponent } from '../app/folder/indexing/folder-input.component';
-import { IssuingSiteInputComponent } from '../app/administration/registered-mail/issuing-site/indexing/issuing-site-input.component';
-import { RegisteredMailRecipientInputComponent } from '../app/administration/registered-mail/indexing/recipient-input.component';
-
import { CriteriaToolComponent } from './adv-search/criteria-tool/criteria-tool.component';
// ACTIONS
@@ -147,11 +140,6 @@ export class MyHammerConfig extends HammerGestureConfig {
],
declarations: [
AppComponent,
- IndexingFormComponent,
- TagInputComponent,
- FolderInputComponent,
- IssuingSiteInputComponent,
- RegisteredMailRecipientInputComponent,
ProcessComponent,
IndexationComponent,
LinkResourceModalComponent,
diff --git a/src/lang/lang-fr.json b/src/lang/lang-fr.json
index c2381902fcb..94b444d72ad 100644
--- a/src/lang/lang-fr.json
+++ b/src/lang/lang-fr.json
@@ -1981,7 +1981,7 @@
"arAlreadyReceived": "Cet AR a déjà été reçu",
"contactsOfFile": "Contact du fichier",
"infoImportcontacts": "La colonne <b>id</b> est utilisée pour identifier un contact",
- "infoImportcontacts2": "Les valeurs <b>vide</b> ne sont <b>pas</b> prise en compte par défaut lors de modifications de contacts",
+ "infoImportcontacts2": "Les valeurs <b>vides</b> ne sont <b>pas</b> prises en compte par défaut lors de modifications de contacts",
"importContacts": "Importer des contacts",
"argumentCivilityNotCorrect": "La donnée civility n'est pas une civilité valide pour un contact",
"argumentLastnameAndCompanyEmpty": "Les données lastname et company sont vides pour un contact",
--
GitLab