From ce9b273a57ff8ddf4b360a4464c640359a73c76b Mon Sep 17 00:00:00 2001
From: Alex Orluc <alex.orluc@maarch.org>
Date: Thu, 31 Oct 2019 20:32:26 +0100
Subject: [PATCH] FEAT #12074 TIME 0:20 add unique modal module
---
.../app/process/process.component.html | 52 +++++++++++--------
.../app/process/process.component.scss | 13 ++++-
src/frontend/app/process/process.component.ts | 8 +++
3 files changed, 51 insertions(+), 22 deletions(-)
diff --git a/src/frontend/app/process/process.component.html b/src/frontend/app/process/process.component.html
index 1b381b6e29d..ad2ff267f1f 100644
--- a/src/frontend/app/process/process.component.html
+++ b/src/frontend/app/process/process.component.html
@@ -63,24 +63,34 @@
</div>
</div>
</ng-container>
- <button mat-icon-button (click)="createModal()">
- <mat-icon class="fas fa-external-link-alt"></mat-icon>
- </button>
- <app-notes-list *ngIf="currentTool === 'notes'" #appNotesList [editMode]="true"
- [resId]="currentResourceInformations.resId">
- </app-notes-list>
- <app-diffusions-list *ngIf="currentTool === 'diffusionList'" #appDiffusionsList [adminMode]="false"
- [resId]="currentResourceInformations.resId">
- </app-diffusions-list>
- <app-visa-workflow *ngIf="currentTool === 'visa'" #appVisaWorkflow
- [resId]="currentResourceInformations.resId"></app-visa-workflow>
- <app-avis-workflow *ngIf="currentTool === 'avis'" #appAvisWorkflow
- [resId]="currentResourceInformations.resId"></app-avis-workflow>
- <app-attachments-list *ngIf="currentTool === 'attachments'" #appAttachmentsList
- [resId]="currentResourceInformations.resId" (reloadBadgeAttachments)="reloadBadgeAttachments($event)">
- </app-attachments-list>
- <app-indexing-form *ngIf="currentTool === 'info'" #indexingForm [groupId]="currentGroupId"
- [indexingFormId]="1"></app-indexing-form>
+ <div *ngIf="!isModalOpen()" style="display: flex;justify-content: flex-end;">
+ <button mat-icon-button (click)="createModal()" color="primary">
+ <mat-icon class="fas fa-external-link-alt"></mat-icon>
+ </button>
+ </div>
+ <ng-container *ngIf="!isModalOpen(); else elseTemplate">
+ <app-notes-list *ngIf="currentTool === 'notes'" #appNotesList [editMode]="true"
+ [resId]="currentResourceInformations.resId">
+ </app-notes-list>
+ <app-diffusions-list *ngIf="currentTool === 'diffusionList'" #appDiffusionsList [adminMode]="false"
+ [resId]="currentResourceInformations.resId">
+ </app-diffusions-list>
+ <app-visa-workflow *ngIf="currentTool === 'visa'" #appVisaWorkflow
+ [resId]="currentResourceInformations.resId"></app-visa-workflow>
+ <app-avis-workflow *ngIf="currentTool === 'avis'" #appAvisWorkflow
+ [resId]="currentResourceInformations.resId"></app-avis-workflow>
+ <app-attachments-list *ngIf="currentTool === 'attachments'" #appAttachmentsList
+ [resId]="currentResourceInformations.resId">
+ </app-attachments-list>
+ <app-indexing-form *ngIf="currentTool === 'info'" #indexingForm [groupId]="currentGroupId"
+ [indexingFormId]="1"></app-indexing-form>
+ </ng-container>
+ <ng-template #elseTemplate>
+ <div class="openedModal">
+ <i class="fas fa-external-link-alt"></i>
+ Ouvert dans une modal
+ </div>
+ </ng-template>
</div>
<div class="actions-indexing-form">
<ng-container *ngIf="actionsList.length > 0 && selectedAction !== undefined">
@@ -169,11 +179,11 @@
[ngStyle]="{'width': appService.getViewMode() ? '80%' : '30%'}" autoFocus="false">
</mat-sidenav>
</mat-sidenav-container>
-<div class="modal-module" cdkDrag *ngFor="let modal of modalModule; let i=index">
- <div class="modal-module-title">
+<div class="modal-module" cdkDrag *ngFor="let modal of modalModule; let i=index" cdkDragBoundary=".maarch-container">
+ <div class="modal-module-title" cdkDragHandle>
<span>
{{modal.label}}
- </span>
+ </span>
<button mat-icon-button (click)="removeModal(i)">
<mat-icon class="fas fa-times"></mat-icon>
</button>
diff --git a/src/frontend/app/process/process.component.scss b/src/frontend/app/process/process.component.scss
index b1ace91d4c5..b385bc12aad 100644
--- a/src/frontend/app/process/process.component.scss
+++ b/src/frontend/app/process/process.component.scss
@@ -342,7 +342,8 @@
&-title {
cursor: move;
color: white;
- padding: 10px;
+ padding-left: 10px;
+ padding-right: 10px;
background: $primary;
margin-top: -10px;
margin-left: -10px;
@@ -362,4 +363,14 @@
overflow: auto;
max-height: 500px;
}
+}
+.openedModal {
+ display: flex;
+ flex-direction: column;
+ height: 100%;
+ justify-content: center;
+ align-items: center;
+ font-size: 30px;
+ font-weight: bold;
+ opacity: 0.2;
}
\ No newline at end of file
diff --git a/src/frontend/app/process/process.component.ts b/src/frontend/app/process/process.component.ts
index c17d60902d7..b4142351c88 100644
--- a/src/frontend/app/process/process.component.ts
+++ b/src/frontend/app/process/process.component.ts
@@ -221,4 +221,12 @@ export class ProcessComponent implements OnInit {
removeModal(index: number) {
this.modalModule.splice(index, 1);
}
+
+ isModalOpen() {
+ if (this.modalModule.map(module => module.id).indexOf(this.currentTool) > -1) {
+ return true;
+ } else {
+ return false;
+ }
+ }
}
\ No newline at end of file
--
GitLab