Commit 177a5363 authored by Quentin Ribac's avatar Quentin Ribac
Browse files

Merge branch 'fix/18424/21.03' into '21.03'

fix/18424/21.03

See merge request maarch/MaarchParapheur!101
parents 592a529a eb320e55
......@@ -27,5 +27,5 @@
<link rel="stylesheet" href="styles.8b6195db994dd1043497.css"></head>
<body>
<app-root></app-root>
<script src="runtime-es2015.6d764e26596b8259b2e2.js" type="module"></script><script src="runtime-es5.6d764e26596b8259b2e2.js" nomodule defer></script><script src="polyfills-es5.016de5c7b74a5782d968.js" nomodule defer></script><script src="polyfills-es2015.61606da6d5867aea9335.js" type="module"></script><script src="scripts.839aa34c61ed64fb6304.js" defer></script><script src="main-es2015.50ac5e99cb95101db152.js" type="module"></script><script src="main-es5.50ac5e99cb95101db152.js" nomodule defer></script></body>
<script src="runtime-es2015.6d764e26596b8259b2e2.js" type="module"></script><script src="runtime-es5.6d764e26596b8259b2e2.js" nomodule defer></script><script src="polyfills-es5.016de5c7b74a5782d968.js" nomodule defer></script><script src="polyfills-es2015.61606da6d5867aea9335.js" type="module"></script><script src="scripts.839aa34c61ed64fb6304.js" defer></script><script src="main-es2015.de83fd7f7dcf2956216b.js" type="module"></script><script src="main-es5.de83fd7f7dcf2956216b.js" nomodule defer></script></body>
</html>
......@@ -27,10 +27,11 @@
<ion-item lines="none" *ngIf="!creationMode">
<ion-label color="secondary">{{'lang.linkedUsers' | translate}} :</ion-label>
</ion-item>
<ion-card *ngIf="!creationMode" style="height: 400px;">
<ion-card *ngIf="!creationMode" style="height: 400px; overflow-y: auto;">
<ion-list>
<ion-item style="display: flex;">
<ion-label color="primary" matSort [matSortActive]="displayedColumns[1]" matSortDirection='asc'
<ion-item style="position: sticky;top:0px;z-index:1;">
<ng-container style="display: flex;align-items: center;justify-content: center;width: 100%;background: white;">
<ion-label color="primary" matSort [matSortActive]="displayedColumns[1]" matSortDirection='asc'
style="display: flex;font-size: 12px;align-items: center;" (matSortChange)="sortData($event)">
<ng-container *ngFor="let col of displayedColumns">
<div [mat-sort-header]="col" disableClear style="flex: 1" *ngIf="col!=='actions'">
......@@ -42,10 +43,11 @@
{{'lang.add' | translate}}
</ion-button>
</div>
</ion-label>
<ion-button slot="end" fill="clear" shape="round" disabled>
<ion-icon></ion-icon>
</ion-button>
</ion-label>
<ion-button slot="end" fill="clear" shape="round" disabled>
<ion-icon></ion-icon>
</ion-button>
</ng-container>
</ion-item>
<ion-virtual-scroll [items]="sortedData" approxItemHeight="50px">
<ion-item *virtualItem="let element" style="display: flex;">
......
Supports Markdown
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