diff --git a/api/api-archive-search/archive-search-commons/src/main/java/fr/gouv/vitamui/archives/search/common/dto/ExportDipCriteriaDto.java b/api/api-archive-search/archive-search-commons/src/main/java/fr/gouv/vitamui/archives/search/common/dto/ExportDipCriteriaDto.java index 5443e2f4eb3..ad01555634b 100644 --- a/api/api-archive-search/archive-search-commons/src/main/java/fr/gouv/vitamui/archives/search/common/dto/ExportDipCriteriaDto.java +++ b/api/api-archive-search/archive-search-commons/src/main/java/fr/gouv/vitamui/archives/search/common/dto/ExportDipCriteriaDto.java @@ -61,5 +61,6 @@ public class ExportDipCriteriaDto implements Serializable { private Map> dataObjectVersionsPatterns; private boolean lifeCycleLogs; private boolean withoutObjects; + private boolean exportWithTree; private String sedaVersion; } diff --git a/api/api-archive-search/archive-search-internal/src/main/java/fr/gouv/vitamui/archive/internal/server/service/ExportDipInternalService.java b/api/api-archive-search/archive-search-internal/src/main/java/fr/gouv/vitamui/archive/internal/server/service/ExportDipInternalService.java index d605dff6f47..879b327bd10 100644 --- a/api/api-archive-search/archive-search-internal/src/main/java/fr/gouv/vitamui/archive/internal/server/service/ExportDipInternalService.java +++ b/api/api-archive-search/archive-search-internal/src/main/java/fr/gouv/vitamui/archive/internal/server/service/ExportDipInternalService.java @@ -81,6 +81,7 @@ private DipRequest prepareDipRequestBody(final ExportDipCriteriaDto exportDipCri dipRequest.setDataObjectVersionToExport(dataObjectVersionToExport); dipRequest.setDipRequestParameters(exportDipCriteriaDto.getDipRequestParameters()); dipRequest.setSedaVersion(exportDipCriteriaDto.getSedaVersion()); + dipRequest.setExportWithTree(exportDipCriteriaDto.isExportWithTree()); } return dipRequest; } diff --git a/ui/ui-frontend/projects/archive-search/src/app/archive/archive-search/additional-actions-search/dip-request-create/dip-request-create.component.html b/ui/ui-frontend/projects/archive-search/src/app/archive/archive-search/additional-actions-search/dip-request-create/dip-request-create.component.html index 25f12082483..79ac3a4dc1c 100644 --- a/ui/ui-frontend/projects/archive-search/src/app/archive/archive-search/additional-actions-search/dip-request-create/dip-request-create.component.html +++ b/ui/ui-frontend/projects/archive-search/src/app/archive/archive-search/additional-actions-search/dip-request-create/dip-request-create.component.html @@ -123,6 +123,15 @@ +
+
{{ 'ARCHIVE_SEARCH.DIP.EXPORT_FORMAT' | translate }}
+
+ + {{ 'ARCHIVE_SEARCH.DIP.EXPORT_FORMAT_MESSAGE' | translate }} +
+
+
{{ 'ARCHIVE_SEARCH.DIP.INCLUDE_OBJECTS' | translate }}
diff --git a/ui/ui-frontend/projects/archive-search/src/app/archive/archive-search/additional-actions-search/dip-request-create/dip-request-create.component.ts b/ui/ui-frontend/projects/archive-search/src/app/archive/archive-search/additional-actions-search/dip-request-create/dip-request-create.component.ts index a873b9a75fd..1194d951bcd 100644 --- a/ui/ui-frontend/projects/archive-search/src/app/archive/archive-search/additional-actions-search/dip-request-create/dip-request-create.component.ts +++ b/ui/ui-frontend/projects/archive-search/src/app/archive/archive-search/additional-actions-search/dip-request-create/dip-request-create.component.ts @@ -109,6 +109,7 @@ export class DipRequestCreateComponent implements OnInit, OnDestroy { this.fb.group({ includeLifeCycleLogs: [false], sedaVersion: ['2.2'], + exportWithTree: false, includeObjects: [UsageVersionEnum.ALL], usages: this.fb.array([ this.fb.group({ @@ -188,6 +189,7 @@ export class DipRequestCreateComponent implements OnInit, OnDestroy { lifeCycleLogs: step2Values.includeLifeCycleLogs, withoutObjects: step2Values.includeObjects === UsageVersionEnum.NONE, sedaVersion: step2Values.sedaVersion, + exportWithTree: step2Values.exportWithTree, }; this.archiveService.exportDIPService(exportDIPRequestDto).subscribe( diff --git a/ui/ui-frontend/projects/archive-search/src/app/archive/models/dip.interface.ts b/ui/ui-frontend/projects/archive-search/src/app/archive/models/dip.interface.ts index 921ed993fff..d3a7e23c29e 100644 --- a/ui/ui-frontend/projects/archive-search/src/app/archive/models/dip.interface.ts +++ b/ui/ui-frontend/projects/archive-search/src/app/archive/models/dip.interface.ts @@ -36,6 +36,7 @@ export interface ExportDIPRequestDto { dataObjectVersionsPatterns: { [key in ObjectQualifierTypeType]: QualifierVersion[] }; lifeCycleLogs: boolean; withoutObjects: boolean; + exportWithTree: boolean; sedaVersion: DIPSedaVersion; } diff --git a/ui/ui-frontend/projects/vitamui-library/src/assets/shared-i18n/en.json b/ui/ui-frontend/projects/vitamui-library/src/assets/shared-i18n/en.json index ecc08843c57..bf53bf69e23 100644 --- a/ui/ui-frontend/projects/vitamui-library/src/assets/shared-i18n/en.json +++ b/ui/ui-frontend/projects/vitamui-library/src/assets/shared-i18n/en.json @@ -3427,6 +3427,8 @@ "LOGS": "Lifecycle logs presence", "SEDA_VERSION": "SEDA version to apply", "INCLUDE_OBJECTS": "Objects presence", + "EXPORT_FORMAT": "Export format", + "EXPORT_FORMAT_MESSAGE": "Format the DIP for use on an office workstation", "TARGET_USAGE_#": "Target usage #{{i}}", "INCLUDE": "Include", "EXCLUDE": "Exclude", diff --git a/ui/ui-frontend/projects/vitamui-library/src/assets/shared-i18n/fr.json b/ui/ui-frontend/projects/vitamui-library/src/assets/shared-i18n/fr.json index 1a6abc4c71d..6d126faffab 100644 --- a/ui/ui-frontend/projects/vitamui-library/src/assets/shared-i18n/fr.json +++ b/ui/ui-frontend/projects/vitamui-library/src/assets/shared-i18n/fr.json @@ -4881,6 +4881,8 @@ "LOGS": "Présence des journaux de cycle de vie", "SEDA_VERSION": "Version du SEDA à appliquer", "INCLUDE_OBJECTS": "Présence des objets", + "EXPORT_FORMAT": "Format de l'export", + "EXPORT_FORMAT_MESSAGE": "Formater le DIP pour une exploitation sur un poste bureautique", "TARGET_USAGE_#": "Usage cible {{i}}", "INCLUDE": "Inclure", "EXCLUDE": "Exclure",