Skip to content
Snippets Groups Projects
Verified Commit 9a8eac8a authored by Alex ORLUC's avatar Alex ORLUC
Browse files

FEAT #11643 TIME 1 add info folder in folder list

parent 6b5d4d45
No related branches found
No related tags found
No related merge requests found
Expand all Hide whitespace changes
Inline Side-by-side
Showing
with 139 additions and 50 deletions
src/frontend/app/folder/document-list/folder-document-list.component.html
+ 51
− 23
View file @ 9a8eac8a
......@@ -11,8 +11,9 @@
[selectedId]="folderInfo.id"></panel-folder>
</mat-sidenav>
<mat-sidenav-content>
<mat-card id="viewThumbnail" style="display:none;position: fixed;z-index: 2;margin-left: 1px;"><img
style="max-height: 100vh;" src="{{thumbnailUrl}}" /></mat-card>
<mat-card id="viewThumbnail" style="display:none;position: fixed;z-index: 2;margin-left: 1px;">
<img style="max-height: 100vh;" src="{{thumbnailUrl}}" />
</mat-card>
<div class="bg-head">
<div class="bg-head-title" [class.customContainerRight]="appService.getViewMode()">
<div class="bg-head-title-label">
......@@ -22,13 +23,38 @@
<header-right></header-right>
</div>
</div>
<div class="bg-head-content" [class.fullContainer]="appService.getViewMode()">
<div class="bg-head-content" [class.fullContainer]="appService.getViewMode()" style="padding-bottom: 20px;">
<app-filters-tool style="flex:1;overflow-x: auto;overflow-y: hidden;" #filtersTool
[listProperties]="this.listProperties" [snavR]="snav2" [totalRes]="allResInBasket.length"
[selectedRes]="selectedRes" [routeDatas]="'/rest/folders/' + folderInfo.id + '/filters'" (toggleAllRes)="toggleAllRes($event)"
(refreshEventAfterAction)="refreshDaoAfterAction()" (refreshEvent)="refreshDao()" [title]="lang.searchMailInFolder">
[selectedRes]="selectedRes" [routeDatas]="'/rest/folders/' + folderInfo.id + '/filters'"
(toggleAllRes)="toggleAllRes($event)" (refreshEventAfterAction)="refreshDaoAfterAction()"
(refreshEvent)="refreshDao()" [title]="lang.searchMailInFolder">
</app-filters-tool>
</div>
<div class="bg-head-content" [class.fullContainer]="appService.getViewMode()">
<div class="banner">
<div class="banner-title">
{{lang.informations}} du dossier
<div class="banner-title-divider"></div>
</div>
<div class="banner-content">
<div class="banner-content-item">
Propriétaire :<br /><b>{{folderInfo.ownerDisplayName}}</b>
</div>
<div *ngIf="folderInfo.entitiesSharing.length === 0" class="banner-content-item private">
Dossier privé
</div>
<div *ngIf="folderInfo.entitiesSharing.length > 0" class="banner-content-item">
Visible par :<br />
<div style="max-height: 100px;overflow: auto;">
<div *ngFor="let entity of folderInfo.entitiesSharing | sortBy">
<b color="secondary">{{entity}}</b>
</div>
</div>
</div>
</div>
</div>
</div>
</div>
<div class="container" [class.fullContainer]="appService.getViewMode()">
<div class="container-content">
......@@ -48,7 +74,8 @@
<div class="table-head-tool">
<span>
<app-folder-action-list #actionsList [contextMode]="false" [currentFolderInfo]="folderInfo"
[totalRes]="allResInBasket.length" [selectedRes]="selectedRes" (refreshEvent)="refreshDaoAfterAction()"
[totalRes]="allResInBasket.length" [selectedRes]="selectedRes"
(refreshEvent)="refreshDaoAfterAction()"
(refreshPanelFolders)="panelFolder.refreshFoldersTree()">
</app-folder-action-list>
</span>
......@@ -61,8 +88,8 @@
<div style="height:90%;overflow:auto;position:absolute;width:100%;">
<table #tableBasketListSort="matSort" cdkDropList id="folder-list"
[cdkDropListConnectedTo]="listTodrag()" [cdkDropListData]="data"
[cdkDropListDisabled]="dragInit || appService.getViewMode()" mat-table [dataSource]="data" matSort matSortActive="res_id"
matSortDisableClear matSortDirection="asc" style="width:100%;">
[cdkDropListDisabled]="dragInit || appService.getViewMode()" mat-table [dataSource]="data"
matSort matSortActive="res_id" matSortDisableClear matSortDirection="asc" style="width:100%;">
<ng-container matColumnDef="res_id">
<td mat-cell *matCellDef="let row"
......@@ -78,11 +105,7 @@
class="main-info-status">
<mat-icon *ngIf="row.isLocked !== true" title="{{row.statusLabel}}"
[ngStyle]="{'color': row.priorityColor}" color="primary"
class="{{row.statusImage.charAt(0)}}{{row.statusImage.charAt(1)}} {{row.statusImage}} {{row.statusImage.charAt(0)}}{{row.statusImage.charAt(1)}}-2x statusIcon">
</mat-icon>
<mat-icon *ngIf="row.isLocked !== true" title="{{row.statusLabel}}"
[ngStyle]="{'color': row.priorityColor}" color="primary"
class="fa fa-folder-open fa-2x">
class="{{row.statusImage.charAt(0)}}{{row.statusImage.charAt(1)}} {{row.statusImage}} {{row.statusImage.charAt(0)}}{{row.statusImage.charAt(1)}}-2x">
</mat-icon>
<span *ngIf="row.confidentiality === 'Y'"
class="watermark">{{lang.confidential}}</span>
......@@ -95,8 +118,8 @@
style="width:200px;text-align:center;cursor:pointer;">
<ng-container
*ngIf="row.alt_identifier == lang.undefined && row.barcode != lang.undefined">
<span style="color: rgba(0,0,0,0.4);font-size: 90%;"><i
title="{{lang.barcode}}" class="fas fa-barcode"></i>
<span style="color: rgba(0,0,0,0.4);font-size: 90%;">
<i title="{{lang.barcode}}" class="fas fa-barcode"></i>
{{row.barcode}}</span>
</ng-container>
<ng-container *ngIf="row.barcode == lang.undefined">
......@@ -104,7 +127,8 @@
</ng-container>
</span>
<span class="main-info-data" style="font-weight:bold;flex:1;cursor:pointer;"
[class.undefined]="row.subject == lang.undefined" title="{{row.subject}}">{{row.subject | shorten: 150: '...'}}</span>
[class.undefined]="row.subject == lang.undefined"
title="{{row.subject}}">{{row.subject | shorten: 150: '...'}}</span>
<span class="main-info-action">
<button mat-icon-button title="{{lang.notes}}"
(click)="$event.stopPropagation();togglePanel('note',row)"
......@@ -138,12 +162,15 @@
</td>
</ng-container>
<tr mat-row *matRowDef="let row; columns: displayedColumnsBasket;"
(contextmenu)="open($event,row);" (click)="open($event,row);" class="rowData" style="cursor: pointer;" [class.locked]="row.isLocked == true"
cdkDrag (cdkDragStarted)="selectSpecificRes(row);" [cdkDragData]="row">
(contextmenu)="open($event,row);" (click)="open($event,row);" class="rowData"
style="cursor: pointer;" [class.locked]="row.isLocked == true" cdkDrag
(cdkDragStarted)="selectSpecificRes(row);" [cdkDragData]="row">
<div class="example-custom-placeholder" *cdkDragPlaceholder></div>
<div class="dragPreview" *cdkDragPreview><i
class="fas fa-envelope-open-text fa-2x"></i><br />{{lang.classifyInFolder}} :
<b>{{row.alt_identifier}}</b></div>
<div class="dragPreview" *cdkDragPreview><i class="fas fa-envelope-open-text fa-2x"></i>
<br />
{{lang.classifyInFolder}} :
<b>{{row.alt_identifier}}</b>
</div>
</tr>
</table>
</div>
......@@ -168,6 +195,7 @@
<mat-divider></mat-divider>
</mat-sidenav>
</mat-sidenav-container>
<app-folder-action-list #actionsListContext [contextMode]="true" [currentFolderInfo]="folderInfo" [totalRes]="allResInBasket.length"
[selectedRes]="selectedRes" (refreshEvent)="refreshDaoAfterAction()" (refreshPanelFolders)="panelFolder.refreshFoldersTree()">
<app-folder-action-list #actionsListContext [contextMode]="true" [currentFolderInfo]="folderInfo"
[totalRes]="allResInBasket.length" [selectedRes]="selectedRes" (refreshEvent)="refreshDaoAfterAction()"
(refreshPanelFolders)="panelFolder.refreshFoldersTree()">
</app-folder-action-list>
\ No newline at end of file
src/frontend/app/folder/document-list/folder-document-list.component.scss
+ 54
− 8
View file @ 9a8eac8a
......@@ -9,12 +9,58 @@
color: $primary;
}
.statusIcon {
font-size: 10px;
position: absolute;
right: 0px;
background: white;
padding: 3px;
border-radius: 10px;
border: solid 1px;
.banner {
display: flex;
flex-direction: column;
margin: 10px;
border-radius: 20px;
border: solid 1px #ccc;
position: relative;
padding: 20px;
background: lighten($primary, 10%);
width: 100%;
&-title {
white-space: pre;
overflow: hidden;
max-width: 85%;
text-overflow: ellipsis;
z-index: 1;
font-size: 20px;
font-weight: bold;
letter-spacing: 2px;
position: absolute;
top: -18px;
left: 20px;
padding: 0px;
margin: 0px;
color: white;
&-divider {
position: absolute;
width: 99%;
z-index: -1;
top: 17px;
background: lighten($primary, 10%);
height: 1px;
}
}
&-content {
display: flex;
font-size: 16px;
&-item {
flex: 1;
padding-left: 20px;
padding-right: 20px;
}
.private {
font-style: italic;
display: flex;
justify-content: flex-end;
align-items: center;
}
}
}
\ No newline at end of file
src/frontend/app/folder/document-list/folder-document-list.component.ts
+ 3
− 1
View file @ 9a8eac8a
......@@ -133,7 +133,9 @@ export class FolderDocumentListComponent implements OnInit {
this.folderInfo =
{
'id': params['folderId'],
'label': data.folder.label
'label': data.folder.label,
'ownerDisplayName': data.folder.ownerDisplayName,
'entitiesSharing': data.folder.sharing.entities.map((entity: any) => entity.label),
};
this.headerService.setHeader(this.folderInfo.label, '', 'fa fa-folder-open');
......
src/frontend/css/maarch-material.css
+ 1
− 1
View file @ 9a8eac8a
This diff is collapsed.
src/frontend/css/maarch-material.scss
+ 4
− 0
View file @ 9a8eac8a
......@@ -56,6 +56,10 @@ $theme: mat-light-theme($primary, $accent, $warn);
color: mat-color($primary, 500);
}
[color=secondary] {
color: $secondary;
}
[color=warn] {
color: mat-color($warn, 500);
}
......
src/frontend/plugins/sorting.pipe.ts
+ 26
− 17
View file @ 9a8eac8a
import { Pipe } from '@angular/core';
import { LatinisePipe } from "ngx-pipes";
@Pipe({name: "sortBy"})
@Pipe({ name: "sortBy" })
export class SortPipe {
constructor(private latinisePipe: LatinisePipe) {}
constructor(private latinisePipe: LatinisePipe) { }
transform(array: Array<string>, args: string): Array<string> {
array.sort((a: any, b: any) => {
const normA=this.latinisePipe.transform(a[args]).toLocaleLowerCase();
const normB=this.latinisePipe.transform(b[args]).toLocaleLowerCase();
if ( normA < normB ){
return -1;
}else if( normA > normB ){
return 1;
}else{
return 0;
}
});
return array;
transform(array: Array<string>, args: string): Array<string> {
let normA = '';
let normB = '';
if (array !== undefined) {
array.sort((a: any, b: any) => {
if (args === undefined) {
normA = this.latinisePipe.transform(a).toLocaleLowerCase();
normB = this.latinisePipe.transform(b).toLocaleLowerCase();
} else {
normA = this.latinisePipe.transform(a[args]).toLocaleLowerCase();
normB = this.latinisePipe.transform(b[args]).toLocaleLowerCase();
}
if (normA < normB) {
return -1;
} else if (normA > normB) {
return 1;
} else {
return 0;
}
});
return array;
} else {
return [];
}
}
}
\ No newline at end of file
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment