diff --git a/src/app/trusted-summary/component/summary-panel/summary-panel.component.html b/src/app/trusted-summary/component/summary-panel/summary-panel.component.html index 3b10ac769a..ba54e4e047 100644 --- a/src/app/trusted-summary/component/summary-panel/summary-panel.component.html +++ b/src/app/trusted-summary/component/summary-panel/summary-panel.component.html @@ -81,7 +81,10 @@ {{ activity.startDate }} <ng-container i18n="@@shared.to" - *ngIf="activity.endDate || showToPresent" + *ngIf=" + (activity.endDate || showToPresent) && + activity.type !== 'distinction' + " >to</ng-container > </ng-container> @@ -89,7 +92,12 @@ {{ activity.endDate }} </ng-container> <ng-container - *ngIf="!activity.endDate && activity.startDate && showToPresent" + *ngIf=" + !activity.endDate && + activity.startDate && + showToPresent && + activity.type !== 'distinction' + " i18n="@@shared.present" > present diff --git a/src/app/trusted-summary/pages/trusted-summary/trusted-summary.component.html b/src/app/trusted-summary/pages/trusted-summary/trusted-summary.component.html index 92a49add9f..c8ed3cef64 100644 --- a/src/app/trusted-summary/pages/trusted-summary/trusted-summary.component.html +++ b/src/app/trusted-summary/pages/trusted-summary/trusted-summary.component.html @@ -150,9 +150,15 @@ <h2 class="orc-font-small-print" i18n="@@summary.keyDates"> i18n="@@summary.recordCreated" >Record created</label > - <label class="orc-font-body-small">{{ + <label class="orc-font-body-small" *ngIf="!createdToday">{{ creationDateWithOffset | date }}</label> + <label + class="orc-font-body-small" + *ngIf="createdToday" + i18n="@@shared.today" + >Today</label + > </div> </li> <li *ngIf="lastUpdateDate"> @@ -162,15 +168,9 @@ <h2 class="orc-font-small-print" i18n="@@summary.keyDates"> i18n="@@summary.lastUpdated" >Last updated</label > - <label class="orc-font-body-small" *ngIf="!modifiedToday">{{ + <label class="orc-font-body-small">{{ lastUpdateDate | date }}</label> - <label - class="orc-font-body-small" - *ngIf="modifiedToday" - i18n="@@shared.today" - >Today</label - > </div> </li> </ul> @@ -248,7 +248,6 @@ <h2 class="orc-font-small-print" i18n="@@summary.funding">FUNDING</h2> [count]="trustedSummary.professionalActivitiesCount" [moreLabel]="labelMoreProfessionalActivities" [moreLabelSingular]="labelMoreProfessionalActivitie" - [showToPresent]="false" ></app-summary-panel> </ng-container> <ng-container *ngIf="externalIdentifiers?.length">