Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

story #12885: export dip with tree #1982

Merged
merged 1 commit into from
Aug 6, 2024
Merged

story #12885: export dip with tree #1982

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions ...ommons/src/main/java/fr/gouv/vitamui/archives/search/common/dto/ExportDipCriteriaDto.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -61,5 +61,6 @@ public class ExportDipCriteriaDto implements Serializable {
private Map<DataObjectVersionType, Set<QualifierVersion>> dataObjectVersionsPatterns;
private boolean lifeCycleLogs;
private boolean withoutObjects;
private boolean exportWithTree;
private String sedaVersion;
}
1 change: 1 addition & 0 deletions ...c/main/java/fr/gouv/vitamui/archive/internal/server/service/ExportDipInternalService.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
}
Expand Down
9 changes: 9 additions & 0 deletions ...ive-search/additional-actions-search/dip-request-create/dip-request-create.component.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -123,6 +123,15 @@
</mat-button-toggle-group>
</div>

<div class="gap-10">
<div class="text-text-medium-bold primary">{{ 'ARCHIVE_SEARCH.DIP.EXPORT_FORMAT' | translate }}</div>
<div class="col-6">
<vitamui-common-slide-toggle formControlName="exportWithTree">
{{ 'ARCHIVE_SEARCH.DIP.EXPORT_FORMAT_MESSAGE' | translate }}</vitamui-common-slide-toggle
>
</div>
</div>

<div class="gap-30">
<div class="gap-10">
<div class="text-text-medium-bold primary">{{ 'ARCHIVE_SEARCH.DIP.INCLUDE_OBJECTS' | translate }}</div>
Expand Down
2 changes: 2 additions & 0 deletions ...chive-search/additional-actions-search/dip-request-create/dip-request-create.component.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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({
Expand Down Expand Up @@ -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(
Expand Down
1 change: 1 addition & 0 deletions ui/ui-frontend/projects/archive-search/src/app/archive/models/dip.interface.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,6 +36,7 @@ export interface ExportDIPRequestDto {
dataObjectVersionsPatterns: { [key in ObjectQualifierTypeType]: QualifierVersion[] };
lifeCycleLogs: boolean;
withoutObjects: boolean;
exportWithTree: boolean;
sedaVersion: DIPSedaVersion;
}

Expand Down
2 changes: 2 additions & 0 deletions ui/ui-frontend/projects/vitamui-library/src/assets/shared-i18n/en.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down
2 changes: 2 additions & 0 deletions ui/ui-frontend/projects/vitamui-library/src/assets/shared-i18n/fr.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down