From 2e14c3d05c21714a1bffad137e49275de7cd2f07 Mon Sep 17 00:00:00 2001 From: Alex ORLUC <alex.orluc@maarch.org> Date: Mon, 7 Jan 2019 11:05:00 +0100 Subject: [PATCH] FEAT #8956 add ellipsis long text > 150 car --- src/frontend/app/app-common.module.ts | 1 + src/frontend/app/list/basket-list.component.html | 9 +++++---- src/frontend/app/list/basket-list.component.ts | 5 ++--- 3 files changed, 8 insertions(+), 7 deletions(-) diff --git a/src/frontend/app/app-common.module.ts b/src/frontend/app/app-common.module.ts index 96f8afbc023..c0e174e39f2 100755 --- a/src/frontend/app/app-common.module.ts +++ b/src/frontend/app/app-common.module.ts @@ -85,6 +85,7 @@ export class MyHammerConfig extends HammerGestureConfig { TimeAgoPipe, TimeLimitPipe, FilterListPipe, + NgStringPipesModule, SmdFabSpeedDialComponent, SmdFabSpeedDialTrigger, SmdFabSpeedDialActions, diff --git a/src/frontend/app/list/basket-list.component.html b/src/frontend/app/list/basket-list.component.html index e87bd6debb1..33b1aee4cb3 100644 --- a/src/frontend/app/list/basket-list.component.html +++ b/src/frontend/app/list/basket-list.component.html @@ -51,10 +51,10 @@ </ng-container> <ng-container *ngIf="data.id == 'category_id'"> <span *ngIf="!lang[row.category_id]" style="opacity: 0.5" title="id: {{row.category_id}}">_UNDEFINED</span> - <span *ngIf="lang[row.category_id]">{{lang[row.category_id]}}</span> + <span *ngIf="lang[row.category_id]" title="{{row[data.id]}}">{{lang[row.category_id]}}</span> </ng-container> <ng-container *ngIf="data.id != 'status_label' && data.id != 'date' && data.id != 'category_id'"> - <span [class.undefined]="row[data.id] == lang.undefined">{{row[data.id]}}</span> + <span [class.undefined]="row[data.id] == lang.undefined" title="{{row[data.id]}}" >{{row[data.id] | shorten: 150: '...'}}</span> </ng-container> </div> </mat-toolbar> @@ -84,10 +84,11 @@ </ng-container> <ng-container *ngIf="data.id == 'category_id'"> - {{lang[row.category_id]}} + <span *ngIf="!lang[row.category_id]" style="opacity: 0.5" title="id: {{row.category_id}}">_UNDEFINED</span> + <span *ngIf="lang[row.category_id]" title="{{row[data.id]}}">{{lang[row.category_id]}}</span> </ng-container> <ng-container *ngIf="data.id != 'status_label' && data.id != 'date' && data.id != 'category_id' && data.id != 'alt_identifier'"> - {{row[data.id]}} + <span [class.undefined]="row[data.id] == lang.undefined" title="{{row[data.id]}}" >{{row[data.id] | shorten: 150: '...'}}</span> </ng-container> </div> <mat-button-toggle-group #group="matButtonToggleGroup" class="actions" multiple> diff --git a/src/frontend/app/list/basket-list.component.ts b/src/frontend/app/list/basket-list.component.ts index 07d456dbd57..9510b399f27 100755 --- a/src/frontend/app/list/basket-list.component.ts +++ b/src/frontend/app/list/basket-list.component.ts @@ -17,7 +17,6 @@ import { DiffusionsListComponent } from '../diffusions/diffusions-list.component import { FiltersToolComponent } from './filters/filters-tool.component'; - declare function $j(selector: any): any; declare var angularGlobals: any; @@ -25,7 +24,7 @@ declare var angularGlobals: any; @Component({ templateUrl: "basket-list.component.html", styleUrls: ['basket-list.component.scss'], - providers: [NotificationService] + providers: [NotificationService], }) export class BasketListComponent implements OnInit { @@ -176,7 +175,7 @@ export class BasketListComponent implements OnInit { // Flip flag to show that loading has finished. this.isLoadingResults = false; data = this.processPostData(data); - console.log(data); + //console.log(data); this.resultsLength = data.count; this.headerService.setHeader(data.basketLabel, this.resultsLength + ' ' + this.lang.entries); return data.resources; -- GitLab