From 5bcae388519f1ba02c1c38cd7440f31d30cfc0cf Mon Sep 17 00:00:00 2001
From: KASSEM Passam <passam.kassem@gmail.com>
Date: Mon, 26 Jul 2021 15:44:26 +0200
Subject: [PATCH] =?UTF-8?q?[VAS]=20Item=208359=20:=20correction=20suite=20?=
=?UTF-8?q?recette=20m=C3=A9tier=20(#376)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Co-authored-by: KASSEM Passam <depysk@gmail.com>
---
.../common/dto/IngestContractDto.java | 8 ++++----
.../ingestcontract/IngestContractConverter.java | 16 ++++++++--------
.../src/app/modules/logbook/logbook.module.ts | 2 ++
.../src/assets/shared-i18n/en.json | 6 +++++-
.../src/assets/shared-i18n/fr.json | 6 +++++-
.../ingest-contract-create.component.html | 3 ++-
.../ingest-contract-list.component.html | 2 +-
.../ingest-contract-node-update.component.ts | 4 +---
.../ingest-contract-information-tab.component.ts | 4 ++--
9 files changed, 30 insertions(+), 21 deletions(-)
diff --git a/api/api-referential/referential-commons/src/main/java/fr/gouv/vitamui/referential/common/dto/IngestContractDto.java b/api/api-referential/referential-commons/src/main/java/fr/gouv/vitamui/referential/common/dto/IngestContractDto.java
index 99004d321..f921332cb 100644
--- a/api/api-referential/referential-commons/src/main/java/fr/gouv/vitamui/referential/common/dto/IngestContractDto.java
+++ b/api/api-referential/referential-commons/src/main/java/fr/gouv/vitamui/referential/common/dto/IngestContractDto.java
@@ -65,13 +65,13 @@ public class IngestContractDto extends IdDto implements Serializable {
private ActivationStatus status;
- private String creationDate;
+ private String creationdate;
- private String lastUpdate;
+ private String lastupdate;
- private String activationDate;
+ private String activationdate;
- private String deactivationDate;
+ private String deactivationdate;
private String checkParentLink;
diff --git a/api/api-referential/referential-internal/src/main/java/fr/gouv/vitamui/referential/internal/server/ingestcontract/IngestContractConverter.java b/api/api-referential/referential-internal/src/main/java/fr/gouv/vitamui/referential/internal/server/ingestcontract/IngestContractConverter.java
index 6798d030f..e6f0d0e68 100644
--- a/api/api-referential/referential-internal/src/main/java/fr/gouv/vitamui/referential/internal/server/ingestcontract/IngestContractConverter.java
+++ b/api/api-referential/referential-internal/src/main/java/fr/gouv/vitamui/referential/internal/server/ingestcontract/IngestContractConverter.java
@@ -60,10 +60,10 @@ public class IngestContractConverter {
ingestContract.setCheckParentLink(IngestContractCheckState.valueOf(dto.getCheckParentLink()));
}
- ingestContract.setCreationdate(dto.getCreationDate());
- ingestContract.setLastupdate(dto.getLastUpdate());
- ingestContract.setActivationdate(dto.getActivationDate());
- ingestContract.setDeactivationdate(dto.getDeactivationDate());
+ ingestContract.setCreationdate(dto.getCreationdate());
+ ingestContract.setLastupdate(dto.getLastupdate());
+ ingestContract.setActivationdate(dto.getActivationdate());
+ ingestContract.setDeactivationdate(dto.getDeactivationdate());
ingestContract.setComputeInheritedRulesAtIngest(dto.isComputeInheritedRulesAtIngest());
return ingestContract;
@@ -92,10 +92,10 @@ public class IngestContractConverter {
dto.setComputeInheritedRulesAtIngest(ingestContract.isComputeInheritedRulesAtIngest());
}
- dto.setCreationDate(ingestContract.getCreationdate());
- dto.setLastUpdate(ingestContract.getLastupdate());
- dto.setActivationDate(ingestContract.getActivationdate());
- dto.setDeactivationDate(ingestContract.getDeactivationdate());
+ dto.setCreationdate(ingestContract.getCreationdate());
+ dto.setLastupdate(ingestContract.getLastupdate());
+ dto.setActivationdate(ingestContract.getActivationdate());
+ dto.setDeactivationdate(ingestContract.getDeactivationdate());
return dto;
}
diff --git a/ui/ui-frontend-common/src/app/modules/logbook/logbook.module.ts b/ui/ui-frontend-common/src/app/modules/logbook/logbook.module.ts
index c0e9cb314..9b2e655ec 100644
--- a/ui/ui-frontend-common/src/app/modules/logbook/logbook.module.ts
+++ b/ui/ui-frontend-common/src/app/modules/logbook/logbook.module.ts
@@ -36,6 +36,7 @@
*/
import { CommonModule } from '@angular/common';
import { NgModule } from '@angular/core';
+import {TranslateModule} from "@ngx-translate/core";
import { EventTypeLabelModule } from './event-type-label/event-type-label.module';
import { HistoryModule } from './history/history.module';
@@ -46,6 +47,7 @@ import { HistoryModule } from './history/history.module';
CommonModule,
HistoryModule,
EventTypeLabelModule,
+ TranslateModule
],
exports: [
HistoryModule,
diff --git a/ui/ui-frontend-common/src/assets/shared-i18n/en.json b/ui/ui-frontend-common/src/assets/shared-i18n/en.json
index 4b8e5fac4..12230aec5 100644
--- a/ui/ui-frontend-common/src/assets/shared-i18n/en.json
+++ b/ui/ui-frontend-common/src/assets/shared-i18n/en.json
@@ -20,6 +20,10 @@
"UNDO_MODAL": {
"TITLE": "Close the window",
"UNDO_MESSAGE": "Modified data won't be saved. Are you sure you want to close the window ?"
+ },
+ "HISTORY": {
+ "NO_HISTORY": "No history",
+ "OPERATIONS": "Logbook"
}
},
"COLOR": {
@@ -2943,4 +2947,4 @@
"EXT_VITAMUI_CREATE_USER": "User creation",
"EXT_VITAMUI_UPDATE_USER": "User modification"
}
-}
\ No newline at end of file
+}
diff --git a/ui/ui-frontend-common/src/assets/shared-i18n/fr.json b/ui/ui-frontend-common/src/assets/shared-i18n/fr.json
index 90039c368..5b19c971a 100644
--- a/ui/ui-frontend-common/src/assets/shared-i18n/fr.json
+++ b/ui/ui-frontend-common/src/assets/shared-i18n/fr.json
@@ -20,6 +20,10 @@
"UNDO_MODAL": {
"TITLE": "Fermer la fenêtre",
"UNDO_MESSAGE": "Les données modifiées ne seront pas sauvegardées. Êtes-vous sûr de vouloir fermer la fenêtre ?"
+ },
+ "HISTORY": {
+ "NO_HISTORY": "Aucun historique",
+ "OPERATIONS": "Journal des opérations"
}
},
"COLOR": {
@@ -2963,4 +2967,4 @@
"EXT_VITAMUI_CREATE_USER": "Création de l'utilisateur",
"EXT_VITAMUI_UPDATE_USER": "Modification de l'utilisateur"
}
-}
\ No newline at end of file
+}
diff --git a/ui/ui-frontend/projects/referential/src/app/ingest-contract/ingest-contract-create/ingest-contract-create.component.html b/ui/ui-frontend/projects/referential/src/app/ingest-contract/ingest-contract-create/ingest-contract-create.component.html
index 4d73ef868..c5aa95542 100644
--- a/ui/ui-frontend/projects/referential/src/app/ingest-contract/ingest-contract-create/ingest-contract-create.component.html
+++ b/ui/ui-frontend/projects/referential/src/app/ingest-contract/ingest-contract-create/ingest-contract-create.component.html
@@ -257,7 +257,8 @@
</vitamui-common-slide-toggle>
<i
class="material-icons field-tooltip"
- matTooltip="Importer une liste d'identifiants au format csv"
+ matTooltip="Indexation des unités archivistiques indiquée comme invalide lors de leur entrée afin
+ qu'elles fassent l'objet d'un calcul lors d'un processus automatique déclenché périodiquement"
matTooltipClass="vitamui-tooltip"
>info</i
>
diff --git a/ui/ui-frontend/projects/referential/src/app/ingest-contract/ingest-contract-list/ingest-contract-list.component.html b/ui/ui-frontend/projects/referential/src/app/ingest-contract/ingest-contract-list/ingest-contract-list.component.html
index b874a46e1..bd6d28cb3 100644
--- a/ui/ui-frontend/projects/referential/src/app/ingest-contract/ingest-contract-list/ingest-contract-list.component.html
+++ b/ui/ui-frontend/projects/referential/src/app/ingest-contract/ingest-contract-list/ingest-contract-list.component.html
@@ -100,7 +100,7 @@
</td>
<!-- TODO: Add date pipe -->
<td class="clickable" (click)="ingestContractClick.emit(ingestContract)">
- {{ ingestContract?.creationdate | date: 'dd/MM/yyyy' }}
+ {{ ingestContract?.creationDate | date: 'dd/MM/yyyy' }}
</td>
<td class="clickable" (click)="ingestContractClick.emit(ingestContract)">
{{ ingestContract?.archiveProfiles?.length }}
diff --git a/ui/ui-frontend/projects/referential/src/app/ingest-contract/ingest-contract-preview/ingest-contract-attachment-tab/ingest-contract-nodes-update/ingest-contract-node-update.component.ts b/ui/ui-frontend/projects/referential/src/app/ingest-contract/ingest-contract-preview/ingest-contract-attachment-tab/ingest-contract-nodes-update/ingest-contract-node-update.component.ts
index 42b227c51..fd4fe34b8 100644
--- a/ui/ui-frontend/projects/referential/src/app/ingest-contract/ingest-contract-preview/ingest-contract-attachment-tab/ingest-contract-nodes-update/ingest-contract-node-update.component.ts
+++ b/ui/ui-frontend/projects/referential/src/app/ingest-contract/ingest-contract-preview/ingest-contract-attachment-tab/ingest-contract-nodes-update/ingest-contract-node-update.component.ts
@@ -34,7 +34,7 @@
* 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, Inject, OnInit, ViewChild } from '@angular/core';
+import { Component, Inject, OnInit } from '@angular/core';
import { FormBuilder, FormControl, FormGroup, Validators } from '@angular/forms';
import { MAT_DIALOG_DATA, MatDialogRef } from '@angular/material/dialog';
import { FilingPlanMode } from 'projects/vitamui-library/src/lib/components/filing-plan/filing-plan.service';
@@ -62,8 +62,6 @@ export class IngestContractNodeUpdateComponent implements OnInit {
linkParentIdControl = new FormControl();
checkParentIdControl = new FormControl();
- @ViewChild('fileSearch', { static: false }) fileSearch: any;
-
constructor(
public dialogRef: MatDialogRef<IngestContractNodeUpdateComponent>,
@Inject(MAT_DIALOG_DATA) public data: { ingestContract: IngestContract; accessContractId: string; tenantIdentifier: number },
diff --git a/ui/ui-frontend/projects/referential/src/app/ingest-contract/ingest-contract-preview/ingest-contract-information-tab/ingest-contract-information-tab.component.ts b/ui/ui-frontend/projects/referential/src/app/ingest-contract/ingest-contract-preview/ingest-contract-information-tab/ingest-contract-information-tab.component.ts
index 74e3ba821..849e3c765 100644
--- a/ui/ui-frontend/projects/referential/src/app/ingest-contract/ingest-contract-preview/ingest-contract-information-tab/ingest-contract-information-tab.component.ts
+++ b/ui/ui-frontend/projects/referential/src/app/ingest-contract/ingest-contract-preview/ingest-contract-information-tab/ingest-contract-information-tab.component.ts
@@ -130,10 +130,10 @@ export class IngestContractInformationTabComponent implements OnInit {
if (formData.status) {
if (formData.status === 'ACTIVE') {
formData.activationDate = new Date();
- formData.deactivationDate = '';
+ formData.deactivationDate = null;
} else {
formData.status = 'INACTIVE';
- formData.activationDate = '';
+ formData.activationDate = null;
formData.deactivationDate = new Date();
}
}
--
GitLab