Skip to content
Snippets Groups Projects
Unverified Commit d66efc50 authored by Thierry Devillechabrolle's avatar Thierry Devillechabrolle Committed by GitHub
Browse files

Merge pull request #619 from ProgrammeVitam/vas_bug_9120_8911_save_search_criteria_issue

[VAS] BUG 9120 8911 save search criteria issue
parents 711060b9 fd21ad1d
No related branches found
No related tags found
3 merge requests!65Retour vitamui pull request,!64Retour commentaires vitamui pull request,!62Ajout de l'application pastis dans le portail des application web de vitam
...@@ -35,6 +35,7 @@ import lombok.NoArgsConstructor; ...@@ -35,6 +35,7 @@ import lombok.NoArgsConstructor;
@AllArgsConstructor @AllArgsConstructor
@NoArgsConstructor @NoArgsConstructor
public class CriteriaValue { public class CriteriaValue {
private String id;
private String value; private String value;
private String beginInterval; private String beginInterval;
private String endInterval; private String endInterval;
......
...@@ -16,3 +16,7 @@ ...@@ -16,3 +16,7 @@
.margin-btn { .margin-btn {
margin-right: 140px; margin-right: 140px;
} }
::ng-deep.mat-menu-panel {
max-width: fit-content !important;
}
<div class="list-div"> <div class="list-div">
<ng-container *ngFor="let criteria of searchCriteriaHistory"> <ng-container *ngFor="let criteria of searchCriteriaHistory">
<button mat-menu-item (click)="storedSearchCriteriaHistory.emit(criteria)" matTooltip="{{ criteria.name }}" <button
matTooltipClass="vitamui-tooltip" [matTooltipShowDelay]="300"> mat-menu-item
<div class="grid-container"> (click)="storedSearchCriteriaHistory.emit(criteria)"
<div class="criteria-name-date"> matTooltip="{{ criteria.name }}"
<span class="criteria-name">{{ criteria.name | truncate:30 }}</span> - <span class="criteria-date">{{ criteria.savingDate | date: 'dd/MM/yyyy' }}</span> matTooltipClass="vitamui-tooltip"
</div> [matTooltipShowDelay]="300"
<div> >
<i class="material-icons btn-delete" (click)="deleteSearchCriteriaHistory(criteria)">delete</i> <div class="grid-container">
</div> <div class="criteria-name-date">
</div> <span class="criteria-name">{{ criteria.name | truncate: 30 }}</span> -
</button> <span class="criteria-date">{{ criteria.savingDate | date: 'dd/MM/yyyy' }}</span>
</div>
<div>
<i class="material-icons btn-delete" (click)="deleteSearchCriteriaHistory(criteria)">delete</i>
</div>
</div>
</button>
</ng-container> </ng-container>
<button mat-menu-item *ngIf="searchCriteriaHistory !== undefined && searchCriteriaHistory.length === 0"> <button mat-menu-item *ngIf="searchCriteriaHistory !== undefined && searchCriteriaHistory.length === 0">
{{'ARCHIVE_SEARCH.SEARCH_CRITERIA_SAVER.NO_RESULTS' | translate }} {{ 'ARCHIVE_SEARCH.SEARCH_CRITERIA_SAVER.NO_RESULTS' | translate }}
</button> </button>
<div class="center-spinner" *ngIf="pending"> <div class="center-spinner" *ngIf="pending">
<mat-spinner diameter="50" color="accent"></mat-spinner> <mat-spinner diameter="50" color="accent"></mat-spinner>
</div> </div>
</div> </div>
\ 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