From 85c28928f789ccea7e116f712d7c6351b0ba0e4a Mon Sep 17 00:00:00 2001
From: descamps <descamps@cines.fr>
Date: Tue, 1 Jun 2021 17:30:10 +0200
Subject: [PATCH] KDE - 01/06/2021 - Changement colonne commentaire editable et
changement taille tableau
---
.../file-tree-metadata.component.html | 13 +++---
.../file-tree-metadata.component.scss | 45 ++++++++++++++++---
.../file-tree/file-tree.module.ts | 44 +++++++++---------
.../pastis/src/assets/css/_layout.scss | 1 +
4 files changed, 71 insertions(+), 32 deletions(-)
diff --git a/ui/ui-frontend/projects/pastis/src/app/profile/edit-profile/file-tree-metadata/file-tree-metadata.component.html b/ui/ui-frontend/projects/pastis/src/app/profile/edit-profile/file-tree-metadata/file-tree-metadata.component.html
index f47cc08c9..5f40b443c 100644
--- a/ui/ui-frontend/projects/pastis/src/app/profile/edit-profile/file-tree-metadata/file-tree-metadata.component.html
+++ b/ui/ui-frontend/projects/pastis/src/app/profile/edit-profile/file-tree-metadata/file-tree-metadata.component.html
@@ -123,12 +123,14 @@
<ng-container matColumnDef="commentaire">
<th mat-header-cell *matHeaderCellDef class="pastis-font-table-header pastis-col"> Commentaire</th>
<td mat-cell *matCellDef="let element;index as i" class="pastis-metadata-table-col-large">
- <textarea matInput [ngModel]="element.commentaire" (ngModelChange)="setDocumentation(element,$event)"
- class="comment-text-area ">
- </textarea>
-
+ <div style="width: 203px ; height:50px ; position: relative">
+ <vitamui-common-editable-textarea [maxlength]="120" [ngModel]="element.commentaire" (ngModelChange)="setDocumentation(element,$event)" class="commentaire-pastis">
+ </vitamui-common-editable-textarea>
+ </div>
<!--Menu options-->
- <mat-menu #menu="matMenu" [overlapTrigger]="false" class="pastis-menu-item-vitam" xPosition="before"
+
+
+<mat-menu #menu="matMenu" [overlapTrigger]="false" class="pastis-menu-item-vitam" xPosition="before"
yPosition="below">
<!-- Dupliquer-->
<button mat-menu-item>
@@ -168,7 +170,6 @@
</button>
</div>
</td>
-
</ng-container>
<tr mat-header-row *matHeaderRowDef="displayedColumns;sticky: true" class="pastis-table-row-header"></tr>
diff --git a/ui/ui-frontend/projects/pastis/src/app/profile/edit-profile/file-tree-metadata/file-tree-metadata.component.scss b/ui/ui-frontend/projects/pastis/src/app/profile/edit-profile/file-tree-metadata/file-tree-metadata.component.scss
index 8c7c65478..97feb4c80 100644
--- a/ui/ui-frontend/projects/pastis/src/app/profile/edit-profile/file-tree-metadata/file-tree-metadata.component.scss
+++ b/ui/ui-frontend/projects/pastis/src/app/profile/edit-profile/file-tree-metadata/file-tree-metadata.component.scss
@@ -6,6 +6,8 @@
@import "../../../../assets/css/input";
@import '~ui-frontend-common/sass/material/menu';
@import '~ui-frontend-common/sass/icons/vitamui-icons';
+@import '~ui-frontend-common/sass/variables/colors';
+@import '~ui-frontend-common/sass/editable-field';
td {
padding-right: 6px !important;
@@ -31,6 +33,7 @@ td {
.mat-select {
@extend .dropdown;
@extend .pastis-dropdown-border-button1-enabled;
+ max-height: 50px;
}
// Inital content text
@@ -130,7 +133,7 @@ td {
padding: 0px;
width: 80%;
color:#212121;
- height:40px;
+ height:50px;
@extend .pastis-table-input-border;
display: flex;
align-items: center;
@@ -164,11 +167,43 @@ td {
float: left;
text-align: left;
text-indent: 10px;
- text-overflow: ellipsis;
- // overflow: hidden;
width: 80%;
- //overflow-y: hidden;
}
+
+
+
+
+.commentaire-pastis {
+ .editable-field {
+ min-height: 50px !important;
+ }
+
+ .display-all {
+ white-space: nowrap !important;
+ }
+
+ .vitamui-input:not(.disabled) {
+ @extend .select-border
+ }
+
+ @extend .editable-field-content;
+ .editable-field-text-content {
+ text-overflow: ellipsis;
+ overflow: hidden;
+ margin-top: 0 !important;
+
+ //styleName: Text/Text-medium;
+ font-family: Mulish, sans-serif;
+ font-size: 16px;
+ font-style: normal;
+ font-weight: 400;
+ line-height: 24px;
+ letter-spacing: 0px;
+ text-align: left;
+ }
+}
+
+
.radio-group {
display: flex;
flex-direction: column;
@@ -415,7 +450,7 @@ dp-day-calendar .dp-day-calendar-container {
.pastis-metadata-table-col-large textarea {
- height: 40px;
+ height: 50px;
text-indent: 10px;
}
diff --git a/ui/ui-frontend/projects/pastis/src/app/profile/edit-profile/file-tree/file-tree.module.ts b/ui/ui-frontend/projects/pastis/src/app/profile/edit-profile/file-tree/file-tree.module.ts
index 16a9aeb1c..52fe7e6ae 100644
--- a/ui/ui-frontend/projects/pastis/src/app/profile/edit-profile/file-tree/file-tree.module.ts
+++ b/ui/ui-frontend/projects/pastis/src/app/profile/edit-profile/file-tree/file-tree.module.ts
@@ -1,25 +1,25 @@
/*
-Copyright © CINES - Centre Informatique National pour l'Enseignement Supérieur (2020)
+Copyright © CINES - Centre Informatique National pour l'Enseignement Supérieur (2020)
[dad@cines.fr]
-This software is a computer program whose purpose is to provide
-a web application to create, edit, import and export archive
+This software is a computer program whose purpose is to provide
+a web application to create, edit, import and export archive
profiles based on the french SEDA standard
(https://redirect.francearchives.fr/seda/).
This software is governed by the CeCILL-C license under French law and
-abiding by the rules of distribution of free software. You can use,
+abiding by the rules of distribution of free software. You can use,
modify and/ or redistribute the software under the terms of the CeCILL-C
license as circulated by CEA, CNRS and INRIA at the following URL
-"http://www.cecill.info".
+"http://www.cecill.info".
As a counterpart to the access to the source code and rights to copy,
modify and redistribute granted by the license, users are provided only
with a limited warranty and the software's author, the holder of the
economic rights, and the successive licensors have only limited
-liability.
+liability.
In this respect, the user's attention is drawn to the risks associated
with loading, using, modifying and/or developing or reproducing the
@@ -28,9 +28,9 @@ that may mean that it is complicated to manipulate, and that also
therefore means that it is reserved for developers and experienced
professionals having in-depth computer knowledge. Users are therefore
encouraged to load and test the software's suitability as regards their
-requirements in conditions enabling the security of their systems and/or
-data to be ensured and, more generally, to use and operate it in the
-same conditions as regards security.
+requirements in conditions enabling the security of their systems and/or
+data to be ensured and, more generally, to use and operate it in the
+same conditions as regards security.
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.
@@ -54,25 +54,27 @@ import { FiletreeFilterPipe } from './pipes/file-tree-filter.pipe';
import { AttributesPopupComponent } from '../file-tree-metadata/attributes/attributes.component';
import { PastisDialogConfirmComponent } from '../../../shared/pastis-dialog/pastis-dialog-confirm/pastis-dialog-confirm.component';
import { CoreModule } from 'projects/pastis/src/app/core';
+import {EditableFieldModule} from "ui-frontend-common";
@NgModule({
- imports: [
- CommonModule,
- PastisMaterialModule,
- FormsModule,
- CoreModule,
- ReactiveFormsModule,
- MatTableModule,
- SharedModule,
- UserActionsModule,
- DpDatePickerModule
- ],
+ imports: [
+ CommonModule,
+ PastisMaterialModule,
+ FormsModule,
+ CoreModule,
+ ReactiveFormsModule,
+ MatTableModule,
+ SharedModule,
+ UserActionsModule,
+ DpDatePickerModule,
+ EditableFieldModule
+ ],
exports: [
FileTreeComponent,
FileTreeMetadataComponent
],
providers:[{provide: MAT_RIPPLE_GLOBAL_OPTIONS, useValue: {disabled: true}}],
- declarations: [FileTreeMetadataComponent, FileTreeComponent,FiletreeFilterPipe,
+ declarations: [FileTreeMetadataComponent, FileTreeComponent,FiletreeFilterPipe,
AttributesPopupComponent],
entryComponents: [FileTreeComponent,FileTreeMetadataComponent,PastisDialogConfirmComponent,AttributesPopupComponent]
})
diff --git a/ui/ui-frontend/projects/pastis/src/assets/css/_layout.scss b/ui/ui-frontend/projects/pastis/src/assets/css/_layout.scss
index cd0865b1e..e548553fe 100644
--- a/ui/ui-frontend/projects/pastis/src/assets/css/_layout.scss
+++ b/ui/ui-frontend/projects/pastis/src/assets/css/_layout.scss
@@ -354,6 +354,7 @@
border-color: transparent;
background-color: #FFFFFF;
border-radius: 5px;
+ height: 60px !important;
}
.pastis-table-row {
--
GitLab