diff --git a/src/frontend/app/list/basket-list.component.html b/src/frontend/app/list/basket-list.component.html index d9852952cc4b501741fae626489a60e72c54c10d..2f616f85db9fc9cd61d1e44cd704f43ab95ebf72 100644 --- a/src/frontend/app/list/basket-list.component.html +++ b/src/frontend/app/list/basket-list.component.html @@ -67,7 +67,11 @@ padding-right: 5px;" [class.hasEvent]="data.event && data.displayValue !== this.translate.instant('lang.undefined')" (click)="launchEventSubData(data, row)"> <ng-container *ngIf="data.value == 'getCreationAndProcessLimitDates'"> <ng-container *ngIf="row.closing_date != this.translate.instant('lang.undefined')"> - <i class="fa fa-lock" title="{{'lang.closingDate' | translate}}"></i> <span + <i class="fa fa-calendar" + title="{{'lang.creationDate' | translate}}"></i> <span + [innerHTML]="data.displayValue.creationDate | timeAgo" + title='{{data.displayValue.creationDate | fullDate}}'></span> + - <i class="fa fa-lock" title="{{'lang.closingDate' | translate}}"></i> <span [innerHTML]="row.closing_date | timeAgo" title='{{row.closing_date | fullDate}}'></span> </ng-container> diff --git a/src/frontend/app/search/result-list/search-result-list.component.html b/src/frontend/app/search/result-list/search-result-list.component.html index 510528eab5a7005ec3c5cd36ab72d5c5f28bf852..868edb74b5851e6c363a73311ef7a70fe6b2a5b4 100644 --- a/src/frontend/app/search/result-list/search-result-list.component.html +++ b/src/frontend/app/search/result-list/search-result-list.component.html @@ -123,7 +123,12 @@ (click)="launchEventSubData(data, row)"> <ng-container *ngIf="data.value == 'getCreationAndProcessLimitDates'"> <ng-container *ngIf="row.closing_date != this.translate.instant('lang.undefined')"> - <i class="fa fa-lock" title="{{'lang.closingDate' | translate}}"></i> <span + <i class="fa fa-calendar" title="{{'lang.creationDate' | translate}}"></i> <span + [class.highlightResult]="data.displayValue.creationDateHighlighted" + [innerHTML]="data.displayValue.creationDate | timeAgo" + title='{{data.displayValue.creationDate | fullDate}}'></span> + - <i class="fa fa-lock" title="{{'lang.closingDate' | translate}}"></i> <span + [class.highlightResult]="data.displayValue.closingDateHighlighted" [innerHTML]="row.closing_date | timeAgo" title='{{row.closing_date | fullDate}}'></span> </ng-container> diff --git a/src/frontend/app/search/result-list/search-result-list.component.ts b/src/frontend/app/search/result-list/search-result-list.component.ts index 43cf78d942d1d6591490966e6db378bb95b56918..74e975cc312d26a3d75065412c539f5450a484b8 100644 --- a/src/frontend/app/search/result-list/search-result-list.component.ts +++ b/src/frontend/app/search/result-list/search-result-list.component.ts @@ -589,6 +589,9 @@ export class SearchResultListComponent implements OnInit, OnDestroy { if (Object.keys(this.criteria).indexOf('processLimitDate') > -1) { data.displayValue.processLimitDateHighlighted = true; } + if (Object.keys(this.criteria).indexOf('closingDate') > -1) { + data.displayValue.closingDateHighlighted = true; + } } else if (data.value.match(regex) !== null && Object.keys(this.criteria).indexOf(data.value) > -1) { if (Array.isArray(this.criteria[data.value].values)) { this.criteria[data.value].values.forEach((val: any) => {